===================================================================
RCS file: /cvs/mandoc/term.c,v
retrieving revision 1.91
retrieving revision 1.94
diff -u -p -r1.91 -r1.94
--- mandoc/term.c	2009/07/21 13:34:13	1.91
+++ mandoc/term.c	2009/07/27 12:02:49	1.94
@@ -1,4 +1,4 @@
-/*	$Id: term.c,v 1.91 2009/07/21 13:34:13 kristaps Exp $ */
+/*	$Id: term.c,v 1.94 2009/07/27 12:02:49 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -34,6 +34,8 @@ static	void		  term_free(struct termp *);
 static	void		  term_pescape(struct termp *, const char **);
 static	void		  term_nescape(struct termp *,
 				const char *, size_t);
+static	void		  term_sescape(struct termp *,
+				const char *, size_t);
 static	void		  term_chara(struct termp *, char);
 static	void		  term_encodea(struct termp *, char);
 static	int		  term_isopendelim(const char *);
@@ -227,8 +229,13 @@ term_flushln(struct termp *p)
 	 */
 
 	assert(p->offset < p->rmargin);
-	maxvis = p->rmargin - p->offset - overstep;
-	mmax = p->maxrmargin - p->offset - overstep;
+	assert((int)(p->rmargin - p->offset) - overstep > 0);
+
+	maxvis = /* LINTED */
+		p->rmargin - p->offset - overstep;
+	mmax = /* LINTED */
+		p->maxrmargin - p->offset - overstep;
+
 	bp = TERMP_NOBREAK & p->flags ? mmax : maxvis;
 	vis = 0;
 	overstep = 0;
@@ -254,7 +261,7 @@ term_flushln(struct termp *p)
 
 		/* LINTED */
 		for (j = i, vsz = 0; j < (int)p->col; j++) {
-			if (' ' == p->buf[j]) 
+			if (j && ' ' == p->buf[j]) 
 				break;
 			else if (8 == p->buf[j])
 				vsz--;
@@ -309,30 +316,36 @@ term_flushln(struct termp *p)
 	}
 
 	if (TERMP_HANG & p->flags) {
-
 		/* We need one blank after the tag. */
-		overstep = vis - maxvis + 1;
+		overstep = /* LINTED */
+			vis - maxvis + 1;
 
 		/*
 		 * Behave exactly the same way as groff:
-		 * If we have overstepped the margin, temporarily move it
-		 * to the right and flag the rest of the line to be shorter.
+		 * If we have overstepped the margin, temporarily move
+		 * it to the right and flag the rest of the line to be
+		 * shorter.
 		 * If we landed right at the margin, be happy.
-		 * If we are one step before the margin, temporarily move it
-		 * one step LEFT and flag the rest of the line to be longer.
+		 * If we are one step before the margin, temporarily
+		 * move it one step LEFT and flag the rest of the line
+		 * to be longer.
 		 */
-		if (overstep >= -1)
+		if (overstep >= -1) {
+			assert((int)maxvis + overstep >= 0);
+			/* LINTED */
 			maxvis += overstep;
-		else
+		} else
 			overstep = 0;
 
 	} else if (TERMP_DANGLE & p->flags)
 		return;
 
-	if (maxvis > vis + ((TERMP_TWOSPACE & p->flags) ? 1 : 0))  /* pad */
+	/* Right-pad. */
+	if (maxvis > vis + /* LINTED */
+			((TERMP_TWOSPACE & p->flags) ? 1 : 0))  
 		for ( ; vis < maxvis; vis++)
 			putchar(' ');
-	else {	/* break */
+	else {	/* ...or newline break. */
 		putchar('\n');
 		for (i = 0; i < (int)p->rmargin; i++)
 			putchar(' ');
@@ -388,12 +401,29 @@ term_nescape(struct termp *p, const char *word, size_t
 
 	rhs = term_a2ascii(p->symtab, word, len, &sz);
 
-	if (rhs)
-		for (i = 0; i < (int)sz; i++) 
-			term_encodea(p, rhs[i]);
+	if (NULL == rhs)
+		return;
+	for (i = 0; i < (int)sz; i++) 
+		term_encodea(p, rhs[i]);
 }
 
 
+static void
+term_sescape(struct termp *p, const char *word, size_t len)
+{
+	const char	*rhs;
+	size_t		 sz;
+	int		 i;
+
+	rhs = term_a2res(p->symtab, word, len, &sz);
+
+	if (NULL == rhs)
+		return;
+	for (i = 0; i < (int)sz; i++) 
+		term_encodea(p, rhs[i]);
+}
+
+
 /*
  * Handle an escape sequence: determine its length and pass it to the
  * escape-symbol look table.  Note that we assume mdoc(3) has validated
@@ -437,13 +467,13 @@ term_pescape(struct termp *p, const char **word)
 				return;
 			}
 
-			term_nescape(p, wp, 2);
+			term_sescape(p, wp, 2);
 			*word = ++wp;
 			return;
 		case ('['):
 			break;
 		default:
-			term_nescape(p, wp, 1);
+			term_sescape(p, wp, 1);
 			*word = wp;
 			return;
 		}