===================================================================
RCS file: /cvs/mandoc/term.c,v
retrieving revision 1.76
retrieving revision 1.80
diff -u -p -r1.76 -r1.80
--- mandoc/term.c	2009/06/11 07:26:35	1.76
+++ mandoc/term.c	2009/06/22 10:40:04	1.80
@@ -1,4 +1,4 @@
-/*	$Id: term.c,v 1.76 2009/06/11 07:26:35 kristaps Exp $ */
+/*	$Id: term.c,v 1.80 2009/06/22 10:40:04 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -37,8 +37,7 @@ static	void		  term_pescape(struct termp *, 
 static	void		  term_nescape(struct termp *,
 				const char *, size_t);
 static	void		  term_chara(struct termp *, char);
-static	void		  term_stringa(struct termp *, 
-				const char *, size_t);
+static	void		  term_encodea(struct termp *, char);
 static	int		  term_isopendelim(const char *, int);
 static	int		  term_isclosedelim(const char *, int);
 
@@ -106,7 +105,7 @@ term_alloc(enum termenc enc)
 	if (NULL == (p = malloc(sizeof(struct termp))))
 		err(1, "malloc");
 	bzero(p, sizeof(struct termp));
-	p->maxrmargin = 80;
+	p->maxrmargin = 78;
 	p->enc = enc;
 	return(p);
 }
@@ -272,22 +271,20 @@ term_flushln(struct termp *p)
 			vis = p->rmargin - p->offset;
 		}
 
-		/* 
-		 * Write out the word and a trailing space.  Omit the
-		 * space if we're the last word in the line or beyond
-		 * our breakpoint.
+		/*
+		 * Prepend a space if we're not already at the beginning
+		 * of the line, then the word.
 		 */
 
+		if (0 < vis++)
+			putchar(' ');
+
 		for ( ; i < (int)p->col; i++) {
 			if (' ' == p->buf[i])
 				break;
 			putchar(p->buf[i]);
 		}
 		vis += vsz;
-		if (i < (int)p->col && vis <= bp) {
-			putchar(' ');
-			vis++;
-		}
 	}
 
 	/*
@@ -295,7 +292,7 @@ term_flushln(struct termp *p)
 	 * cause a newline and offset at the right margin.
 	 */
 
-	if ((TERMP_NOBREAK & p->flags) && vis >= maxvis) {
+	if ((TERMP_NOBREAK & p->flags) && vis > maxvis) {
 		if ( ! (TERMP_NONOBREAK & p->flags)) {
 			putchar('\n');
 			for (i = 0; i < (int)p->rmargin; i++)
@@ -312,7 +309,7 @@ term_flushln(struct termp *p)
 
 	if (p->flags & TERMP_NOBREAK) {
 		if ( ! (TERMP_NONOBREAK & p->flags))
-			for ( ; vis < maxvis; vis++)
+			for ( ; vis <= maxvis; vis++)
 				putchar(' ');
 	} else
 		putchar('\n');
@@ -409,10 +406,11 @@ term_nescape(struct termp *p, const char *word, size_t
 {
 	const char	*rhs;
 	size_t		 sz;
+	int		 i;
 
-	if (NULL == (rhs = term_a2ascii(p->symtab, word, len, &sz))) 
-		return;
-	term_stringa(p, rhs, sz);
+	if ((rhs = term_a2ascii(p->symtab, word, len, &sz))) 
+		for (i = 0; i < (int)sz; i++) 
+			term_encodea(p, rhs[i]);
 }
 
 
@@ -521,61 +519,18 @@ term_pword(struct termp *p, const char *word, int len)
 	 * before the word.
 	 */
 
-	for (i = 0; i < len; i++) {
-		if ('\\' == word[i]) {
+	for (i = 0; i < len; i++) 
+		if ('\\' == word[i]) 
 			term_pescape(p, word, &i, len);
-			continue;
-		}
+		else
+			term_encodea(p, word[i]);
 
-		if (TERMP_STYLE & p->flags) {
-			if (TERMP_BOLD & p->flags) {
-				term_chara(p, word[i]);
-				term_chara(p, 8);
-			}
-			if (TERMP_UNDER & p->flags) {
-				term_chara(p, '_');
-				term_chara(p, 8);
-			}
-		}
-
-		term_chara(p, word[i]);
-	}
-
 	if (term_isopendelim(word, len))
 		p->flags |= TERMP_NOSPACE;
 }
 
 
 /*
- * Like term_chara() but for arbitrary-length buffers.  Resize the
- * buffer by a factor of two (if the buffer is less than that) or the
- * buffer's size.
- */
-static void
-term_stringa(struct termp *p, const char *c, size_t sz)
-{
-	size_t		 s;
-
-	if (0 == sz)
-		return;
-
-	assert(c);
-	if (p->col + sz >= p->maxcols) {
-		if (0 == p->maxcols)
-			p->maxcols = 256;
-		s = sz > p->maxcols * 2 ? sz : p->maxcols * 2;
-		p->buf = realloc(p->buf, s);
-		if (NULL == p->buf)
-			err(1, "realloc");
-		p->maxcols = s;
-	}
-
-	(void)memcpy(&p->buf[(int)p->col], c, sz);
-	p->col += sz;
-}
-
-
-/*
  * Insert a single character into the line-buffer.  If the buffer's
  * space is exceeded, then allocate more space by doubling the buffer
  * size.
@@ -597,3 +552,20 @@ term_chara(struct termp *p, char c)
 	p->buf[(int)(p->col)++] = c;
 }
 
+
+static void
+term_encodea(struct termp *p, char c)
+{
+
+	if (TERMP_STYLE & p->flags) {
+		if (TERMP_BOLD & p->flags) {
+			term_chara(p, c);
+			term_chara(p, 8);
+		}
+		if (TERMP_UNDER & p->flags) {
+			term_chara(p, '_');
+			term_chara(p, 8);
+		}
+	}
+	term_chara(p, c);
+}