X-Git-Url: https://git.cameronkatri.com/mandoc.git/blobdiff_plain/f52cdc4437cb37e93dbd03a14742e01eb654df7e..c6e959568733601f6b74e21b18a4243e63f53f3b:/mdocterm.c

diff --git a/mdocterm.c b/mdocterm.c
index d4df8a39..7a0e1230 100644
--- a/mdocterm.c
+++ b/mdocterm.c
@@ -1,4 +1,4 @@
-/* $Id: mdocterm.c,v 1.22 2009/03/01 13:06:49 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,7 +189,6 @@ flushln(struct termp *p)
 			} else
 				vsz++;
 		}
-		assert(vsz > 0);
 
 		/*
 		 * If we're breaking normally...
@@ -199,7 +200,8 @@ flushln(struct termp *p)
 		 *
 		 * If we're not breaking...
 		 *
-		 * Don't let the visible size exceed the full margin.
+		 * Don't let the visible size exceed the full right
+		 * margin.
 		 */
 
 		if ( ! (TERMP_NOBREAK & p->flags)) {
@@ -210,8 +212,12 @@ flushln(struct termp *p)
 				vis = 0;
 			} else if (vis + vsz > maxvis)
 				errx(1, "word breaks right margin");
-		} else if (vis + vsz > p->maxrmargin)
-			errx(1, "word breaks right margin");
+		} else if (vis + vsz > p->maxrmargin - p->offset) {
+			putchar('\n');
+			for (j = 0; j < p->rmargin; j++)
+				putchar(' ');
+			vis = p->rmargin;
+		}
 
 		/* 
 		 * Write out the word and a trailing space.  Omit the
@@ -424,6 +430,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)
 {
@@ -499,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
@@ -529,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]);
 	}