===================================================================
RCS file: /cvs/mandoc/man_term.c,v
retrieving revision 1.35
retrieving revision 1.37
diff -u -p -r1.35 -r1.37
--- mandoc/man_term.c	2009/10/08 23:00:15	1.35
+++ mandoc/man_term.c	2009/10/18 11:14:04	1.37
@@ -1,4 +1,4 @@
-/*	$Id: man_term.c,v 1.35 2009/10/08 23:00:15 kristaps Exp $ */
+/*	$Id: man_term.c,v 1.37 2009/10/18 11:14:04 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -23,8 +23,11 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "term.h"
 #include "man.h"
+#include "term.h"
+#include "chars.h"
+#include "main.h"
+#include "out.h"
 
 #define	INDENT		  7
 #define	HALFINDENT	  3
@@ -136,24 +139,42 @@ static	void		  print_foot(struct termp *, 
 				const struct man_meta *);
 static	void		  fmt_block_vspace(struct termp *, 
 				const struct man_node *);
-static	int		  arg_width(const struct man_node *);
+static	int		  a2width(const char *);
 
 
 void
-man_run(struct termp *p, const struct man *m)
+terminal_man(void *arg, const struct man *man)
 {
-	struct mtermp	 mt;
+	struct termp		*p;
+	const struct man_node	*n;
+	const struct man_meta	*m;
+	struct mtermp		 mt;
 
-	print_head(p, man_meta(m));
+	p = (struct termp *)arg;
+
+	if (NULL == p->symtab)
+		switch (p->enc) {
+		case (TERMENC_ASCII):
+			p->symtab = chars_init(CHARS_ASCII);
+			break;
+		default:
+			abort();
+			/* NOTREACHED */
+		}
+
+	n = man_node(man);
+	m = man_meta(man);
+
+	print_head(p, m);
 	p->flags |= TERMP_NOSPACE;
 
 	mt.fl = 0;
 	mt.lmargin = INDENT;
 	mt.offset = INDENT;
 
-	if (man_node(m)->child)
-		print_body(p, &mt, man_node(m)->child, man_meta(m));
-	print_foot(p, man_meta(m));
+	if (n->child)
+		print_body(p, &mt, n->child, m);
+	print_foot(p, m);
 }
 
 
@@ -175,30 +196,42 @@ fmt_block_vspace(struct termp *p, const struct man_nod
 
 
 static int
-arg_width(const struct man_node *n)
+a2width(const char *p)
 {
-	int		 i, len;
-	const char	*p;
+	struct roffsu	 su;
+	double		 r;
 
-	assert(MAN_TEXT == n->type);
-	assert(n->string);
-
-	p = n->string;
-
-	if (0 == (len = (int)strlen(p)))
+	if ( ! a2roffsu(p, &su)) 
 		return(-1);
 
-	for (i = 0; i < len; i++) 
-		if ( ! isdigit((u_char)p[i]))
-			break;
+	switch (su.unit) {
+	case (SCALE_CM):
+		r = 4 * su.scale;
+		break;
+	case (SCALE_IN):
+		r = 10 * su.scale;
+		break;
+	case (SCALE_PC):
+		r = 2 * su.scale;
+		break;
+	case (SCALE_PT):
+		r = (su.scale / 10) + 1;
+		break;
+	case (SCALE_MM):
+		r = su.scale / 1000;
+		break;
+	case (SCALE_VS):
+		r = su.scale * 2 - 1;
+		break;
+	default:
+		r = su.scale + 1;
+		break;
+	}
 
-	if (i == len - 1)  {
-		if ('n' == p[len - 1] || 'm' == p[len - 1])
-			return(atoi(p));
-	} else if (i == len)
-		return(atoi(p));
-
-	return(-1);
+	if (r < 0.0)
+		r = 0.0;
+	return((int)/* LINTED */
+			r);
 }
 
 
@@ -447,9 +480,11 @@ pre_HP(DECL_ARGS)
 
 	/* Calculate offset. */
 
-	if (NULL != (nn = n->parent->head->child))
-		if ((ival = arg_width(nn)) >= 0)
+	if (NULL != (nn = n->parent->head->child)) {
+		assert(MAN_TEXT == nn->type);
+		if ((ival = a2width(nn->string)) >= 0)
 			len = (size_t)ival;
+	}
 
 	if (0 == len)
 		len = 1;
@@ -538,7 +573,8 @@ pre_IP(DECL_ARGS)
 		if (NULL != (nn = nn->next)) {
 			for ( ; nn->next; nn = nn->next)
 				/* Do nothing. */ ;
-			if ((ival = arg_width(nn)) >= 0)
+			assert(MAN_TEXT == nn->type);
+			if ((ival = a2width(nn->string)) >= 0)
 				len = (size_t)ival;
 		}
 
@@ -624,9 +660,11 @@ pre_TP(DECL_ARGS)
 	/* Calculate offset. */
 
 	if (NULL != (nn = n->parent->head->child))
-		if (NULL != nn->next)
-			if ((ival = arg_width(nn)) >= 0)
+		if (NULL != nn->next) {
+			assert(MAN_TEXT == nn->type);
+			if ((ival = a2width(nn->string)) >= 0)
 				len = (size_t)ival;
+		}
 
 	switch (n->type) {
 	case (MAN_HEAD):
@@ -803,7 +841,8 @@ pre_RS(DECL_ARGS)
 		return(1);
 	}
 
-	if ((ival = arg_width(nn)) < 0)
+	assert(MAN_TEXT == nn->type);
+	if ((ival = a2width(nn->string)) < 0)
 		return(1);
 
 	mt->offset = INDENT + (size_t)ival;