1.11.7 regression: bold and underlined hyphens

[Ingo Schwarze <schwarze@usta.de>]

CVSROOT:	/cvs
Module name:	src
Changes by:	schwarze@cvs.openbsd.org	2011/09/18 14:38:02

Modified files:
	usr.bin/mandoc : term.c 

Log message:
fix a regression introduced in 1.11.7:
even a breakable hyphen may be bold or underlined

With this fix, 1.11.7 reduces the groff/mandoc differences in
base by about 10% (100k -> 90k lines of diffs) with respect to 1.11.5.


OK to commit to bsd.lv as well?
  Ingo


Index: term.c
===================================================================
RCS file: /cvs/src/usr.bin/mandoc/term.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- term.c	29 May 2011 21:22:18 -0000	1.59
+++ term.c	18 Sep 2011 20:38:02 -0000	1.60
@@ -572,13 +572,16 @@ encode(struct termp *p, const char *word
 		adjbuf(p, p->col + 1 + (len * 3));
 
 	for (i = 0; i < len; i++) {
-		if ( ! isgraph((unsigned char)word[i])) {
+		if (ASCII_HYPH != word[i] &&
+		    ! isgraph((unsigned char)word[i])) {
 			p->buf[p->col++] = word[i];
 			continue;
 		}
 
 		if (TERMFONT_UNDER == f)
 			p->buf[p->col++] = '_';
+		else if (ASCII_HYPH == word[i])
+			p->buf[p->col++] = '-';
 		else
 			p->buf[p->col++] = word[i];
 
--
 To unsubscribe send an email to tech+unsubscribe@mdocml.bsd.lv