===================================================================
RCS file: /cvs/mandoc/term.c,v
retrieving revision 1.106
retrieving revision 1.112
diff -u -p -r1.106 -r1.112
--- mandoc/term.c	2009/10/18 13:34:17	1.106
+++ mandoc/term.c	2009/10/26 09:06:03	1.112
@@ -1,4 +1,4 @@
-/*	$Id: term.c,v 1.106 2009/10/18 13:34:17 kristaps Exp $ */
+/*	$Id: term.c,v 1.112 2009/10/26 09:06:03 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -21,11 +21,11 @@
 #include <string.h>
 
 #include "chars.h"
+#include "out.h"
 #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. */
@@ -130,7 +130,7 @@ void
 term_flushln(struct termp *p)
 {
 	int		 i, j;
-	size_t		 vbl, vsz, vis, maxvis, mmax, bp, os;
+	size_t		 vbl, vsz, vis, maxvis, mmax, bp;
 	static int	 overstep = 0;
 
 	/*
@@ -143,9 +143,6 @@ 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 */
@@ -153,7 +150,6 @@ term_flushln(struct termp *p)
 
 	bp = TERMP_NOBREAK & p->flags ? mmax : maxvis;
 	vis = 0;
-	overstep = 0;
 
 	/*
 	 * If in the standard case (left-justified), then begin with our
@@ -208,8 +204,9 @@ term_flushln(struct termp *p)
 				vis = 0;
 			}
 			/* Remove the overstep width. */
-			bp += os;
-			os = 0;
+			bp += (int)/* LINTED */
+				overstep;
+			overstep = 0;
 		} else {
 			for (j = 0; j < (int)vbl; j++)
 				putchar(' ');
@@ -226,7 +223,9 @@ term_flushln(struct termp *p)
 		}
 		vis += vsz;
 	}
+
 	p->col = 0;
+	overstep = 0;
 
 	if ( ! (TERMP_NOBREAK & p->flags)) {
 		putchar('\n');
@@ -548,95 +547,90 @@ encode(struct termp *p, char c)
 {
 	
 	if (' ' != c) {
-		if (p->bold) {
-			buffer(p, c);
-			buffer(p, 8);
-		}
 		if (p->under) {
 			buffer(p, '_');
 			buffer(p, 8);
 		}
+		if (p->bold) {
+			buffer(p, c);
+			buffer(p, 8);
+		}
 	}
 	buffer(p, c);
 }
 
 
-int
-a2height(const char *p)
+size_t
+term_vspan(const struct roffsu *su)
 {
-	struct roffsu	 su;
 	double		 r;
 
-	if ( ! a2roffsu(p, &su)) 
-		return(-1);
-
-	switch (su.unit) {
+	switch (su->unit) {
 	case (SCALE_CM):
-		r = su.scale * 2;
+		r = su->scale * 2;
 		break;
 	case (SCALE_IN):
-		r = su.scale * 6;
+		r = su->scale * 6;
 		break;
 	case (SCALE_PC):
-		r = su.scale;
+		r = su->scale;
 		break;
 	case (SCALE_PT):
-		r = su.scale / 8;
+		r = su->scale / 8;
 		break;
 	case (SCALE_MM):
-		r = su.scale / 1000;
+		r = su->scale / 1000;
 		break;
 	case (SCALE_VS):
-		r = su.scale;
+		r = su->scale;
 		break;
 	default:
-		r = su.scale - 1;
+		r = su->scale - 1;
 		break;
 	}
 
 	if (r < 0.0)
 		r = 0.0;
-	return(/* LINTED */(int)
+	return(/* LINTED */(size_t)
 			r);
 }
 
 
-int
-a2width(const char *p)
+size_t
+term_hspan(const struct roffsu *su)
 {
-	struct roffsu	 su;
 	double		 r;
 
-	if ( ! a2roffsu(p, &su)) 
-		return(-1);
+	/* XXX: CM, IN, and PT are approximations. */
 
-	switch (su.unit) {
+	switch (su->unit) {
 	case (SCALE_CM):
-		r = (4 * su.scale) + 2; /* FIXME: double-check. */
+		r = 4 * su->scale;
 		break;
 	case (SCALE_IN):
-		r = (10 * su.scale) + 2; /* FIXME: double-check. */
+		/* XXX: this is an approximation. */
+		r = 10 * su->scale;
 		break;
 	case (SCALE_PC):
-		r = (10 * su.scale) / 6; /* FIXME: double-check. */
+		r = (10 * su->scale) / 6;
 		break;
 	case (SCALE_PT):
-		r = (10 * su.scale) / 72; /* FIXME: double-check. */
+		r = (10 * su->scale) / 72;
 		break;
 	case (SCALE_MM):
-		r = su.scale / 1000; /* FIXME: double-check. */
+		r = su->scale / 1000; /* FIXME: double-check. */
 		break;
 	case (SCALE_VS):
-		r = su.scale * 2 - 1; /* FIXME: double-check. */
+		r = su->scale * 2 - 1; /* FIXME: double-check. */
 		break;
 	default:
-		r = su.scale + 2;
+		r = su->scale;
 		break;
 	}
 
 	if (r < 0.0)
 		r = 0.0;
-	return((int)/* LINTED */
+	return((size_t)/* LINTED */
 			r);
 }