From: schwarze <schwarze@openbsd.org>
Date: Mon, 12 Oct 2015 15:27:53 +0000 (+0000)
Subject: Use "-" rather than "\(hy" for the heads of .Bl -dash and -hyphen lists.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=ad68a70f3efb3d9ebe4256645bcf74d6a51cfeb4;p=openbsd

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 5e3d659572c..9c740556d88 100644
--- 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
index 00000000000..93abd8d3caa
--- /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)
+
+NNAAMMEE
+     BBll--ddaasshh – dash and hyphen lists
+
+DDEESSCCRRIIPPTTIIOONN
+     -- x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x
+   x x x x
+
+     -- x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x
+    x x x x
+
+     -- x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x
+     x x x x
+
+     -- x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x
+      x x x x
+
+     -- x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x
+       x x x x
+
+     --  x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x
+        x x x x x
+
+     --   x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x
+         x x x x x
+
+     --    x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x
+          x x x x x x
+
+     --     x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x
+           x x x x x x
+
+     --      x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x
+            x x x x x x x
+
+     --       x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x
+             x x x x x x x
+
+     --        x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x
+              x x x x x x x x
+     --   x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x
+         x x x x x
+     --   x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x
+         x x x x x
+     --   x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x
+         x x x x x
+     --   x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x
+         x x x x x
+     --   x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x
+         x x x x x
+     --   x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x
+         x x x x x
+     --   x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x
+         x x x x x
+     --   x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x
+         x x x x x
+     --   x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x
+         x x x x x
+     --   x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x
+         x x x x x
+     --   x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x
+         x x x x x
+     --   x x x x x x x x x x x x x x x x 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 3dd4357b5b3..c5547f7cc15 100644
--- 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: