===================================================================
RCS file: /cvs/mandoc/Attic/mdocterm.c,v
retrieving revision 1.12
retrieving revision 1.15
diff -u -p -r1.12 -r1.15
--- mandoc/Attic/mdocterm.c	2009/02/25 15:12:26	1.12
+++ mandoc/Attic/mdocterm.c	2009/02/26 17:11:38	1.15
@@ -1,4 +1,4 @@
-/* $Id: mdocterm.c,v 1.12 2009/02/25 15:12:26 kristaps Exp $ */
+/* $Id: mdocterm.c,v 1.15 2009/02/26 17:11:38 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -168,7 +168,7 @@ flushln(struct termp *p)
 		 * the line with TERMP_NOBREAK).
 		 */
 
-		if (vis && vis + vsz >= maxvis) {
+		if (vis && vis + vsz > maxvis) {
 			/* FIXME */
 			if (p->flags & TERMP_NOBREAK)
 				errx(1, "word breaks right margin");
@@ -176,7 +176,7 @@ flushln(struct termp *p)
 			for (j = 0; j < p->offset; j++)
 				putchar(' ');
 			vis = 0;
-		} else if (vis + vsz >= maxvis)
+		} else if (vis + vsz > maxvis)
 			/* FIXME */
 			errx(1, "word breaks right margin");
 
@@ -203,8 +203,9 @@ flushln(struct termp *p)
 	 */
 
 	if (p->flags & TERMP_NOBREAK) {
-		for ( ; vis < maxvis; vis++)
-			putchar(' ');
+		if ( ! (p->flags & TERMP_NORPAD))
+			for ( ; vis < maxvis; vis++)
+				putchar(' ');
 	} else
 		putchar('\n');
 
@@ -345,6 +346,8 @@ pescape(struct termp *p, const char *word, size_t *i, 
 			/* FALLTHROUGH */
 		case ('-'):
 			/* FALLTHROUGH */
+		case (' '):
+			/* FALLTHROUGH */
 		case ('.'):
 			chara(p, word[*i]);
 		default:
@@ -372,7 +375,8 @@ pword(struct termp *p, const char *word, size_t len)
 			! (p->flags & TERMP_LITERAL))
 		chara(p, ' ');
 
-	p->flags &= ~TERMP_NOSPACE;
+	if ( ! (p->flags & TERMP_NONOSPACE))
+		p->flags &= ~TERMP_NOSPACE;
 
 	if (p->flags & TERMP_BOLD)
 		style(p, STYLE_BOLD);
@@ -484,7 +488,6 @@ footer(struct termp *p, const struct mdoc_meta *meta)
 {
 	struct tm	*tm;
 	char		*buf, *os;
-	size_t		 sz, osz, ssz, i;
 
 	if (NULL == (buf = malloc(p->rmargin)))
 		err(1, "malloc");
@@ -500,27 +503,25 @@ footer(struct termp *p, const struct mdoc_meta *meta)
 #endif
 		err(1, "strftime");
 
-	osz = strlcpy(os, meta->os, p->rmargin);
+	(void)strlcpy(os, meta->os, p->rmargin);
 
-	sz = strlen(buf);
-	ssz = sz + osz + 1;
+	vspace(p);
 
-	if (ssz > p->rmargin) {
-		ssz -= p->rmargin;
-		assert(ssz <= osz);
-		os[osz - ssz] = 0;
-		ssz = 1;
-	} else
-		ssz = p->rmargin - ssz + 1;
+	p->flags |= TERMP_NOSPACE | TERMP_NOBREAK;
+	p->rmargin = p->maxrmargin - strlen(buf);
+	p->offset = 0;
 
-	printf("\n");
-	printf("%s", os);
-	for (i = 0; i < ssz; i++)
-		printf(" ");
+	word(p, os);
+	flushln(p);
 
-	printf("%s\n", buf);
-	fflush(stdout);
+	p->flags |= TERMP_NOLPAD | TERMP_NOSPACE;
+	p->offset = p->rmargin;
+	p->rmargin = p->maxrmargin;
+	p->flags &= ~TERMP_NOBREAK;
 
+	word(p, buf);
+	flushln(p);
+
 	free(buf);
 	free(os);
 }
@@ -530,8 +531,7 @@ static void
 header(struct termp *p, const struct mdoc_meta *meta)
 {
 	char		*buf, *title;
-	const char	*pp, *msec;
-	size_t		 ssz, tsz, ttsz, i;;
+	const char	*pp;
 
 	if (NULL == (buf = malloc(p->rmargin)))
 		err(1, "malloc");
@@ -568,50 +568,43 @@ header(struct termp *p, const struct mdoc_meta *meta)
 				pp = mdoc_msec2a(MSEC_local);
 			break;
 		}
-	assert(pp);
 
-	tsz = strlcpy(buf, pp, p->rmargin);
-	assert(tsz < p->rmargin);
+	if (mdoc_arch2a(meta->arch))
+		(void)snprintf(buf, p->rmargin, "%s(%s)",
+				pp, mdoc_arch2a(meta->arch));
+	else
+		(void)strlcpy(buf, pp, p->rmargin);
 
-	if ((pp = mdoc_arch2a(meta->arch))) {
-		tsz = strlcat(buf, " (", p->rmargin);
-		assert(tsz < p->rmargin);
-		tsz = strlcat(buf, pp, p->rmargin);
-		assert(tsz < p->rmargin);
-		tsz = strlcat(buf, ")", p->rmargin);
-		assert(tsz < p->rmargin);
-	}
+	pp = mdoc_msec2a(meta->msec);
 
-	ttsz = strlcpy(title, meta->title, p->rmargin);
+	(void)snprintf(title, p->rmargin, "%s(%s)",
+			meta->title, pp ? pp : "");
 
-	if (NULL == (msec = mdoc_msec2a(meta->msec)))
-		msec = "";
+	p->offset = 0;
+	p->rmargin = (p->maxrmargin - strlen(buf)) / 2;
+	p->flags |= TERMP_NOBREAK | TERMP_NOSPACE;
 
-	ssz = (2 * (ttsz + 2 + strlen(msec))) + tsz + 2;
+	word(p, title);
+	flushln(p);
 
-	if (ssz > p->rmargin) {
-		if ((ssz -= p->rmargin) % 2)
-			ssz++;
-		ssz /= 2;
-	
-		assert(ssz <= ttsz);
-		title[ttsz - ssz] = 0;
-		ssz = 1;
-	} else
-		ssz = ((p->rmargin - ssz) / 2) + 1;
+	p->flags |= TERMP_NOLPAD | TERMP_NOSPACE;
+	p->offset = p->rmargin;
+	p->rmargin = p->maxrmargin - strlen(title);
 
-	printf("%s(%s)", title, msec);
+	word(p, buf);
+	flushln(p);
 
-	for (i = 0; i < ssz; i++)
-		printf(" ");
+	p->offset = p->rmargin;
+	p->rmargin = p->maxrmargin;
+	p->flags &= ~TERMP_NOBREAK;
+	p->flags |= TERMP_NOLPAD | TERMP_NOSPACE;
 
-	printf("%s", buf);
+	word(p, title);
+	flushln(p);
 
-	for (i = 0; i < ssz; i++)
-		printf(" ");
-
-	printf("%s(%s)\n", title, msec);
-	fflush(stdout);
+	p->rmargin = p->maxrmargin;
+	p->offset = 0;
+	p->flags &= ~TERMP_NOSPACE;
 
 	free(title);
 	free(buf);