Use "-" rather than "\(hy" for the heads of .Bl -dash and -hyphen lists.

In UTF-8 output, that renders as ASCII HYPHEN-MINUS (U+002D)
rather than HYPHEN (U+2010), which looks better and matches groff.
In ASCII output, it makes no difference.
Suggested by naddy@.

diff --git a/regress/usr.bin/mandoc/mdoc/Bl/Makefile b/regress/usr.bin/mandoc/mdoc/Bl/Makefile
index 5e3d659..9c74055 100644 (file)
--- a/regress/usr.bin/mandoc/mdoc/Bl/Makefile
+++ b/regress/usr.bin/mandoc/mdoc/Bl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.28 2015/02/06 02:04:35 schwarze Exp $
+# $OpenBSD: Makefile,v 1.29 2015/10/12 15:27:53 schwarze Exp $
 
 REGRESS_TARGETS  = item inset diag ohang bullet dash enum hang tag
 REGRESS_TARGETS += column extend nested offset secstart
@@ -7,6 +7,8 @@ REGRESS_TARGETS += notype multitype badargs
 REGRESS_TARGETS += empty noIt emptyhead emptytag emptyitem multitag
 REGRESS_TARGETS += bareIt bareTa unclosed break breakingIt broken
 
+UTF8_TARGETS    = dash
+
 LINT_TARGETS    = column notype badargs
 LINT_TARGETS   += empty noIt emptyhead emptytag emptyitem
 LINT_TARGETS   += bareIt bareTa break breakingIt broken

diff --git a/regress/usr.bin/mandoc/mdoc/Bl/dash.out_utf8 b/regress/usr.bin/mandoc/mdoc/Bl/dash.out_utf8
new file mode 100644 (file)
index 0000000..93abd8d
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/Bl/dash.out_utf8
@@ -0,0 +1,67 @@
+BL-DASH(1)                  General Commands Manual                 BL-DASH(1)
+
+N\bNA\bAM\bME\bE
+     B\bBl\bl-\b-d\bda\bas\bsh\bh – dash and hyphen lists
+
+D\bDE\bES\bSC\bCR\bRI\bIP\bPT\bTI\bIO\bON\bN
+     -\b- x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x
+   x x x x
+
+     -\b- x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x
+    x x x x
+
+     -\b- x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x
+     x x x x
+
+     -\b- x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x
+      x x x x
+
+     -\b- x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x
+       x x x x
+
+     -\b-  x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x
+        x x x x x
+
+     -\b-   x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x
+         x x x x x
+
+     -\b-    x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x
+          x x x x x x
+
+     -\b-     x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x
+           x x x x x x
+
+     -\b-      x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x
+            x x x x x x x
+
+     -\b-       x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x
+             x x x x x x x
+
+     -\b-        x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x
+              x x x x x x x x
+     -\b-   x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x
+         x x x x x
+     -\b-   x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x
+         x x x x x
+     -\b-   x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x
+         x x x x x
+     -\b-   x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x
+         x x x x x
+     -\b-   x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x
+         x x x x x
+     -\b-   x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x
+         x x x x x
+     -\b-   x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x
+         x x x x x
+     -\b-   x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x
+         x x x x x
+     -\b-   x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x
+         x x x x x
+     -\b-   x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x
+         x x x x x
+     -\b-   x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x
+         x x x x x
+     -\b-   x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x
+         x x x x x
+
+OpenBSD                        December 25, 2014                       OpenBSD

diff --git a/usr.bin/mandoc/mdoc_term.c b/usr.bin/mandoc/mdoc_term.c
index 3dd4357..c5547f7 100644 (file)
--- a/usr.bin/mandoc/mdoc_term.c
+++ b/usr.bin/mandoc/mdoc_term.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: mdoc_term.c,v 1.228 2015/10/12 00:07:27 schwarze Exp $ */
+/*     $OpenBSD: mdoc_term.c,v 1.229 2015/10/12 15:27:53 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2012-2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -885,7 +885,7 @@ termp_it_pre(DECL_ARGS)
                case LIST_dash:
                case LIST_hyphen:
                        term_fontpush(p, TERMFONT_BOLD);
-                       term_word(p, "\\(hy");
+                       term_word(p, "-");
                        term_fontpop(p);
                        break;
                case LIST_enum: