mdocml: Partial implementation of \h (horizontal line drawing function).

mdocml: Partial implementation of \h (horizontal line drawing function).

[schwarze]

Log Message:
-----------
Partial implementation of \h (horizontal line drawing function).
A full implementation would require access to output device properties
and state variables (both only available after the main parser has 
finalized the parse tree) before numerical expansions in the roff 
preprocessor (i.e., before the main parser is even started).  

Not trying to pull that stunt right now because the static-width
implementation committed here is sufficient for tcl-style manual pages 
and already more complicated than i would have suspected.

Modified Files:
--------------
    mdocml:
        mandoc.c
        mandoc.h
        roff.7
        term.c

Revision Data
-------------
Index: term.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/term.c,v
retrieving revision 1.261
retrieving revision 1.262
diff -Lterm.c -Lterm.c -u -p -r1.261 -r1.262
--- term.c
+++ term.c
@@ -404,7 +404,7 @@ term_word(struct termp *p, const char *w
 	const char	 nbrsp[2] = { ASCII_NBRSP, 0 };
 	const char	*seq, *cp;
 	int		 sz, uc;
-	size_t		 ssz;
+	size_t		 csz, lsz, ssz;
 	enum mandoc_esc	 esc;
 
 	if ( ! (TERMP_NOSPACE & p->flags)) {
@@ -508,6 +508,62 @@ term_word(struct termp *p, const char *w
 					p->ti -= p->offset;
 					p->offset = 0;
 				}
+			}
+			continue;
+		case ESCAPE_HLINE:
+			if (a2roffsu(seq, &su, SCALE_EM) == 0)
+				continue;
+			uc = term_hspan(p, &su) / 24;
+			if (uc <= 0) {
+				if (p->rmargin <= p->offset)
+					continue;
+				lsz = p->rmargin - p->offset;
+			} else
+				lsz = uc;
+			while (sz &&
+			    strchr(" %&()*+-./0123456789:<=>", *seq)) {
+				seq++;
+				sz--;
+			}
+			if (sz && strchr("cifMmnPpuv", *seq)) {
+				seq++;
+				sz--;
+			}
+			if (sz == 0)
+				uc = -1;
+			else if (*seq == '\\') {
+				seq++;
+				esc = mandoc_escape(&seq, &cp, &sz);
+				switch (esc) {
+				case ESCAPE_UNICODE:
+					uc = mchars_num2uc(cp + 1, sz - 1);
+					break;
+				case ESCAPE_NUMBERED:
+					uc = mchars_num2char(cp, sz);
+					break;
+				case ESCAPE_SPECIAL:
+					uc = mchars_spec2cp(cp, sz);
+					break;
+				default:
+					uc = -1;
+					break;
+				}
+			} else
+				uc = *seq;
+			if (uc < 0x20 || (uc > 0x7E && uc < 0xA0))
+				uc = '_';
+			if (p->enc == TERMENC_ASCII) {
+				cp = ascii_uc2str(uc);
+				csz = term_strlen(p, cp);
+				ssz = strlen(cp);
+			} else
+				csz = (*p->width)(p, uc);
+			while (lsz >= csz) {
+				if (p->enc == TERMENC_ASCII)
+					encode(p, cp, ssz);
+				else
+					encode1(p, uc);
+				lsz -= csz;
 			}
 			continue;
 		case ESCAPE_SKIPCHAR:
Index: roff.7
===================================================================
RCS file: /home/cvs/mdocml/mdocml/roff.7,v
retrieving revision 1.81
retrieving revision 1.82
diff -Lroff.7 -Lroff.7 -u -p -r1.81 -r1.82
--- roff.7
+++ roff.7
@@ -1939,9 +1939,11 @@ and
 .Ss \eL\(aq Ns Ar number Ns Oo Ar c Oc Ns \(aq
 Vertical line drawing function; ignored by
 .Xr mandoc 1 .
-.Ss \el\(aq Ns Ar number Ns Oo Ar c Oc Ns \(aq
-Horizontal line drawing function; ignored by
-.Xr mandoc 1 .
+.Ss \el\(aq Ns Ar width Ns Oo Ar c Oc Ns \(aq
+Draw a horizontal line of
+.Ar width
+using the glyph
+.Ar c .
 .Ss \eM[ Ns Ar name ]
 Set fill (background) color (groff extension); ignored by
 .Xr mandoc 1 .
Index: mandoc.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/mandoc.c,v
retrieving revision 1.99
retrieving revision 1.100
diff -Lmandoc.c -Lmandoc.c -u -p -r1.99 -r1.100
--- mandoc.c
+++ mandoc.c
@@ -1,7 +1,7 @@
 /*	$Id$ */
 /*
  * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2011-2015 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2011-2015, 2017 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -175,7 +175,17 @@ mandoc_escape(const char **end, const ch
 				++*end;
 			return ESCAPE_ERROR;
 		}
-		gly = (*start)[-1] == 'h' ? ESCAPE_HORIZ : ESCAPE_IGNORE;
+		switch ((*start)[-1]) {
+		case 'h':
+			gly = ESCAPE_HORIZ;
+			break;
+		case 'l':
+			gly = ESCAPE_HLINE;
+			break;
+		default:
+			gly = ESCAPE_IGNORE;
+			break;
+		}
 		term = **start;
 		*start = ++*end;
 		break;
Index: mandoc.h
===================================================================
RCS file: /home/cvs/mdocml/mdocml/mandoc.h,v
retrieving revision 1.220
retrieving revision 1.221
diff -Lmandoc.h -Lmandoc.h -u -p -r1.220 -r1.221
--- mandoc.h
+++ mandoc.h
@@ -412,6 +412,7 @@ enum	mandoc_esc {
 	ESCAPE_UNICODE, /* a unicode codepoint */
 	ESCAPE_NOSPACE, /* suppress space if the last on a line */
 	ESCAPE_HORIZ, /* horizontal movement */
+	ESCAPE_HLINE, /* horizontal line drawing */
 	ESCAPE_SKIPCHAR, /* skip the next character */
 	ESCAPE_OVERSTRIKE /* overstrike all chars in the argument */
 };
--
 To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv