===================================================================
RCS file: /cvs/mandoc/term.c,v
retrieving revision 1.103
retrieving revision 1.106
diff -u -p -r1.103 -r1.106
--- mandoc/term.c	2009/09/23 11:02:21	1.103
+++ mandoc/term.c	2009/10/18 13:34:17	1.106
@@ -1,4 +1,4 @@
-/*	$Id: term.c,v 1.103 2009/09/23 11:02:21 kristaps Exp $ */
+/*	$Id: term.c,v 1.106 2009/10/18 13:34:17 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -24,15 +24,12 @@
 #include "term.h"
 #include "man.h"
 #include "mdoc.h"
+#include "main.h"
+#include "out.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 *, 
-				const struct mdoc *);
-
 static	struct termp	 *term_alloc(enum termenc);
 static	void		  term_free(struct termp *);
 
@@ -54,32 +51,6 @@ ascii_alloc(void)
 
 
 void
-terminal_man(void *arg, const struct man *man)
-{
-	struct termp	*p;
-
-	p = (struct termp *)arg;
-	if (NULL == p->symtab)
-		p->symtab = chars_init(CHARS_ASCII);
-
-	man_run(p, man);
-}
-
-
-void
-terminal_mdoc(void *arg, const struct mdoc *mdoc)
-{
-	struct termp	*p;
-
-	p = (struct termp *)arg;
-	if (NULL == p->symtab)
-		p->symtab = chars_init(CHARS_ASCII);
-
-	mdoc_run(p, mdoc);
-}
-
-
-void
 terminal_free(void *arg)
 {
 
@@ -159,7 +130,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;
 
 	/*
@@ -172,6 +143,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 */
@@ -233,6 +207,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(' ');
@@ -582,3 +559,85 @@ encode(struct termp *p, char c)
 	}
 	buffer(p, c);
 }
+
+
+int
+a2height(const char *p)
+{
+	struct roffsu	 su;
+	double		 r;
+
+	if ( ! a2roffsu(p, &su)) 
+		return(-1);
+
+	switch (su.unit) {
+	case (SCALE_CM):
+		r = su.scale * 2;
+		break;
+	case (SCALE_IN):
+		r = su.scale * 6;
+		break;
+	case (SCALE_PC):
+		r = su.scale;
+		break;
+	case (SCALE_PT):
+		r = su.scale / 8;
+		break;
+	case (SCALE_MM):
+		r = su.scale / 1000;
+		break;
+	case (SCALE_VS):
+		r = su.scale;
+		break;
+	default:
+		r = su.scale - 1;
+		break;
+	}
+
+	if (r < 0.0)
+		r = 0.0;
+	return(/* LINTED */(int)
+			r);
+}
+
+
+int
+a2width(const char *p)
+{
+	struct roffsu	 su;
+	double		 r;
+
+	if ( ! a2roffsu(p, &su)) 
+		return(-1);
+
+	switch (su.unit) {
+	case (SCALE_CM):
+		r = (4 * su.scale) + 2; /* FIXME: double-check. */
+		break;
+	case (SCALE_IN):
+		r = (10 * su.scale) + 2; /* FIXME: double-check. */
+		break;
+	case (SCALE_PC):
+		r = (10 * su.scale) / 6; /* FIXME: double-check. */
+		break;
+	case (SCALE_PT):
+		r = (10 * su.scale) / 72; /* FIXME: double-check. */
+		break;
+	case (SCALE_MM):
+		r = su.scale / 1000; /* FIXME: double-check. */
+		break;
+	case (SCALE_VS):
+		r = su.scale * 2 - 1; /* FIXME: double-check. */
+		break;
+	default:
+		r = su.scale + 2;
+		break;
+	}
+
+	if (r < 0.0)
+		r = 0.0;
+	return((int)/* LINTED */
+			r);
+}
+
+