===================================================================
RCS file: /cvs/mandoc/term.c,v
retrieving revision 1.114
retrieving revision 1.122
diff -u -p -r1.114 -r1.122
--- mandoc/term.c	2009/10/27 08:05:39	1.114
+++ mandoc/term.c	2009/11/05 08:40:16	1.122
@@ -1,4 +1,4 @@
-/*	$Id: term.c,v 1.114 2009/10/27 08:05:39 kristaps Exp $ */
+/*	$Id: term.c,v 1.122 2009/11/05 08:40:16 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -15,7 +15,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include <assert.h>
-#include <err.h>
+#include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -77,9 +77,11 @@ term_alloc(enum termenc enc)
 {
 	struct termp *p;
 
-	if (NULL == (p = malloc(sizeof(struct termp))))
-		return(NULL);
-	bzero(p, sizeof(struct termp));
+	p = calloc(1, sizeof(struct termp));
+	if (NULL == p) {
+		perror(NULL);
+		exit(EXIT_FAILURE);
+	}
 	p->maxrmargin = 78;
 	p->enc = enc;
 	return(p);
@@ -139,17 +141,25 @@ term_flushln(struct termp *p)
 	 * First, establish the maximum columns of "visible" content.
 	 * This is usually the difference between the right-margin and
 	 * an indentation, but can be, for tagged lists or columns, a
-	 * small set of values.
+	 * small set of values. 
 	 */
 
 	assert(p->offset < p->rmargin);
 
 	maxvis = (int)(p->rmargin - p->offset) - overstep < 0 ?
-			0 : p->rmargin - p->offset - overstep;
+		/* LINTED */ 
+		0 : p->rmargin - p->offset - overstep;
 	mmax = (int)(p->maxrmargin - p->offset) - overstep < 0 ?
-			0 : p->maxrmargin - p->offset - overstep;
+		/* LINTED */
+		0 : p->maxrmargin - p->offset - overstep;
 
 	bp = TERMP_NOBREAK & p->flags ? mmax : maxvis;
+
+	/* 
+	 * FIXME: if bp is zero, we still output the first word before
+	 * breaking the line.
+	 */
+
 	vis = 0;
 
 	/*
@@ -220,7 +230,12 @@ term_flushln(struct termp *p)
 		for ( ; i < (int)p->col; i++) {
 			if (' ' == p->buf[i])
 				break;
-			putchar(p->buf[i]);
+
+			/* The unit sep. is a non-breaking space. */
+			if (31 == p->buf[i])
+				putchar(' ');
+			else
+				putchar(p->buf[i]);
 		}
 		vis += vsz;
 	}
@@ -359,7 +374,7 @@ do_reserved(struct termp *p, const char *word, size_t 
 static void
 do_escaped(struct termp *p, const char **word)
 {
-	int		 j, type;
+	int		 j, type, sv;
 	const char	*wp;
 
 	wp = *word;
@@ -414,16 +429,29 @@ do_escaped(struct termp *p, const char **word)
 		}
 
 		switch (*wp) {
+		case ('3'):
+			/* FALLTHROUGH */
 		case ('B'):
-			p->bold++;
+			p->metamask = p->metafont;
+			p->metafont |= METAF_BOLD;
 			break;
+		case ('2'):
+			/* FALLTHROUGH */
 		case ('I'):
-			p->under++;
+			p->metamask = p->metafont;
+			p->metafont |= METAF_UNDER;
 			break;
 		case ('P'):
+			sv = p->metamask;
+			p->metamask = p->metafont;
+			p->metafont = sv;
+			break;
+		case ('1'):
 			/* FALLTHROUGH */
 		case ('R'):
-			p->bold = p->under = 0;
+			p->metamask = p->metafont;
+			p->metafont &= ~METAF_UNDER;
+			p->metafont &= ~METAF_BOLD;
 			break;
 		default:
 			break;
@@ -535,8 +563,10 @@ buffer(struct termp *p, char c)
 			p->maxcols = 256;
 		s = p->maxcols * 2;
 		p->buf = realloc(p->buf, s);
-		if (NULL == p->buf)
-			err(1, "realloc"); /* FIXME: shouldn't be here! */
+		if (NULL == p->buf) {
+			perror(NULL);
+			exit(EXIT_FAILURE);
+		}
 		p->maxcols = s;
 	}
 	p->buf[(int)(p->col)++] = c;
@@ -547,12 +577,12 @@ static void
 encode(struct termp *p, char c)
 {
 	
-	if (' ' != c) {
-		if (p->under) {
+	if (isgraph((u_char)c)) {
+		if (p->under || METAF_UNDER & p->metafont) {
 			buffer(p, '_');
 			buffer(p, 8);
 		}
-		if (p->bold) {
+		if (p->bold || METAF_BOLD & p->metafont) {
 			buffer(p, c);
 			buffer(p, 8);
 		}