===================================================================
RCS file: /cvs/mandoc/Attic/mdocterm.c,v
retrieving revision 1.19
retrieving revision 1.24
diff -u -p -r1.19 -r1.24
--- mandoc/Attic/mdocterm.c	2009/02/28 14:43:35	1.19
+++ mandoc/Attic/mdocterm.c	2009/03/02 12:09:32	1.24
@@ -1,4 +1,4 @@
-/* $Id: mdocterm.c,v 1.19 2009/02/28 14:43:35 kristaps Exp $ */
+/* $Id: mdocterm.c,v 1.24 2009/03/02 12:09:32 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -85,6 +85,7 @@ static	void		  footer(struct termp *,
 static	void		  pword(struct termp *, const char *, size_t);
 static	void		  pescape(struct termp *, 
 				const char *, size_t *, size_t);
+static	void		  pgraph(struct termp *, char);
 static	void		  nescape(struct termp *, 
 				const char *, size_t);
 static	void		  chara(struct termp *, char);
@@ -173,9 +174,10 @@ flushln(struct termp *p)
 	for (i = 0; i < p->col; i++) {
 		/*
 		 * Count up visible word characters.  Control sequences
-		 * (starting with the CSI) aren't counted. 
+		 * (starting with the CSI) aren't counted.  A space
+		 * generates a non-printing word, which is valid (the
+		 * space is printed according to regular spacing rules).
 		 */
-		assert( ! xisspace(p->buf[i]));
 
 		/* LINTED */
 		for (j = i, vsz = 0; j < p->col; j++) {
@@ -187,27 +189,35 @@ flushln(struct termp *p)
 			} else
 				vsz++;
 		}
-		assert(vsz > 0);
 
 		/*
+		 * If we're breaking normally...
+		 *
 		 * If a word is too long and we're within a line, put it
 		 * on the next line.  Puke if we're being asked to write
 		 * something that will exceed the right margin (i.e.,
-		 * from a fresh line or when we're not allowed to break
-		 * the line with TERMP_NOBREAK).
+		 * from a fresh line).
+		 *
+		 * If we're not breaking...
+		 *
+		 * Don't let the visible size exceed the full right
+		 * margin.
 		 */
 
-		/* FIXME: allow selective right-margin breaking. */
-
-		if (vis && vis + vsz > maxvis) {
-			if (p->flags & TERMP_NOBREAK)
+		if ( ! (TERMP_NOBREAK & p->flags)) {
+			if (vis && vis + vsz > maxvis) {
+				putchar('\n');
+				for (j = 0; j < p->offset; j++)
+					putchar(' ');
+				vis = 0;
+			} else if (vis + vsz > maxvis)
 				errx(1, "word breaks right margin");
+		} else if (vis + vsz > p->maxrmargin - p->offset) {
 			putchar('\n');
-			for (j = 0; j < p->offset; j++)
+			for (j = 0; j < p->rmargin; j++)
 				putchar(' ');
-			vis = 0;
-		} else if (vis + vsz > maxvis)
-			errx(1, "word breaks right margin");
+			vis = p->rmargin;
+		}
 
 		/* 
 		 * Write out the word and a trailing space.  Omit the
@@ -226,15 +236,22 @@ flushln(struct termp *p)
 		}
 	}
 
+	if ((TERMP_NOBREAK & p->flags) && vis >= maxvis) {
+		putchar('\n');
+		for (i = 0; i < p->rmargin; i++)
+			putchar(' ');
+		p->col = 0;
+		return;
+	}
+
 	/*
 	 * If we're not to right-marginalise it (newline), then instead
 	 * pad to the right margin and stay off.
 	 */
 
 	if (p->flags & TERMP_NOBREAK) {
-		if ( ! (p->flags & TERMP_NORPAD))
-			for ( ; vis < maxvis; vis++)
-				putchar(' ');
+		for ( ; vis < maxvis; vis++)
+			putchar(' ');
 	} else
 		putchar('\n');
 
@@ -414,6 +431,26 @@ nescape(struct termp *p, const char *word, size_t len)
 
 
 static void
+pgraph(struct termp *p, char byte)
+{
+	int		 i;
+
+	switch (byte) {
+	case (' '):
+		chara(p, ' ');
+		break;
+	case ('\t'):
+		for (i = 0; i < INDENT; i++)
+			chara(p, ' ');
+		break;
+	default:
+		warnx("unknown non-graphing character");
+		break;
+	}
+}
+
+
+static void
 pescape(struct termp *p, const char *word, size_t *i, size_t len)
 {
 	size_t		 j;
@@ -465,6 +502,10 @@ pescape(struct termp *p, const char *word, size_t *i, 
 			/* FALLTHROUGH */
 		case ('.'):
 			chara(p, word[*i]);
+			break;
+		case ('e'):
+			chara(p, '\\');
+			break;
 		default:
 			break;
 		}
@@ -484,8 +525,6 @@ pword(struct termp *p, const char *word, size_t len)
 {
 	size_t		 i;
 
-	/*assert(len > 0);*/ /* Can be, if literal. */
-
 	/*
 	 * Handle pwords, partial words, which may be either a single
 	 * word or a phrase that cannot be broken down (such as a
@@ -514,6 +553,10 @@ pword(struct termp *p, const char *word, size_t len)
 			pescape(p, word, &i, len);
 			continue;
 		}
+		if ( ! isgraph((int)word[i])) {
+			pgraph(p, word[i]);
+			continue;
+		}
 		chara(p, word[i]);
 	}
 
@@ -554,7 +597,14 @@ word(struct termp *p, const char *word)
 		if ( ! xisspace(word[i])) {
 			j++;
 			continue;
+		} 
+		
+		/* Escaped spaces don't delimit... */
+		if (i > 0 && xisspace(word[i]) && '\\' == word[i - 1]) {
+			j++;
+			continue;
 		}
+
 		if (0 == j)
 			continue;
 		assert(i >= j);