===================================================================
RCS file: /cvs/mandoc/term.c,v
retrieving revision 1.100
retrieving revision 1.104
diff -u -p -r1.100 -r1.104
--- mandoc/term.c	2009/09/16 15:08:31	1.100
+++ mandoc/term.c	2009/10/10 11:05:23	1.104
@@ -1,4 +1,4 @@
-/*	$Id: term.c,v 1.100 2009/09/16 15:08:31 kristaps Exp $ */
+/*	$Id: term.c,v 1.104 2009/10/10 11:05:23 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -20,10 +20,14 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "chars.h"
 #include "term.h"
 #include "man.h"
 #include "mdoc.h"
 
+/* FIXME: accomodate non-breaking, non-collapsing white-space. */
+/* FIXME: accomodate non-breaking, collapsing white-space. */
+
 extern	void		  man_run(struct termp *, 
 				const struct man *);
 extern	void		  mdoc_run(struct termp *, 
@@ -56,7 +60,7 @@ terminal_man(void *arg, const struct man *man)
 
 	p = (struct termp *)arg;
 	if (NULL == p->symtab)
-		p->symtab = term_ascii2htab();
+		p->symtab = chars_init(CHARS_ASCII);
 
 	man_run(p, man);
 }
@@ -69,7 +73,7 @@ terminal_mdoc(void *arg, const struct mdoc *mdoc)
 
 	p = (struct termp *)arg;
 	if (NULL == p->symtab)
-		p->symtab = term_ascii2htab();
+		p->symtab = chars_init(CHARS_ASCII);
 
 	mdoc_run(p, mdoc);
 }
@@ -89,8 +93,8 @@ term_free(struct termp *p)
 
 	if (p->buf)
 		free(p->buf);
-	if (TERMENC_ASCII == p->enc && p->symtab)
-		term_asciifree(p->symtab);
+	if (p->symtab)
+		chars_free(p->symtab);
 
 	free(p);
 }
@@ -155,7 +159,7 @@ void
 term_flushln(struct termp *p)
 {
 	int		 i, j;
-	size_t		 vbl, vsz, vis, maxvis, mmax, bp;
+	size_t		 vbl, vsz, vis, maxvis, mmax, bp, os;
 	static int	 overstep = 0;
 
 	/*
@@ -168,6 +172,9 @@ term_flushln(struct termp *p)
 	assert(p->offset < p->rmargin);
 	assert((int)(p->rmargin - p->offset) - overstep > 0);
 
+	/* Save the overstep. */
+	os = (size_t)overstep;
+
 	maxvis = /* LINTED */
 		p->rmargin - p->offset - overstep;
 	mmax = /* LINTED */
@@ -229,6 +236,9 @@ term_flushln(struct termp *p)
 					putchar(' ');
 				vis = 0;
 			}
+			/* Remove the overstep width. */
+			bp += os;
+			os = 0;
 		} else {
 			for (j = 0; j < (int)vbl; j++)
 				putchar(' ');
@@ -331,7 +341,7 @@ do_special(struct termp *p, const char *word, size_t l
 	size_t		 sz;
 	int		 i;
 
-	rhs = term_a2ascii(p->symtab, word, len, &sz);
+	rhs = chars_a2ascii(p->symtab, word, len, &sz);
 
 	if (NULL == rhs) {
 #if 0
@@ -354,7 +364,7 @@ do_reserved(struct termp *p, const char *word, size_t 
 	size_t		 sz;
 	int		 i;
 
-	rhs = term_a2res(p->symtab, word, len, &sz);
+	rhs = chars_a2res(p->symtab, word, len, &sz);
 
 	if (NULL == rhs) {
 #if 0