===================================================================
RCS file: /cvs/mandoc/man_term.c,v
retrieving revision 1.28
retrieving revision 1.37
diff -u -p -r1.28 -r1.37
--- mandoc/man_term.c	2009/08/21 08:41:05	1.28
+++ mandoc/man_term.c	2009/10/18 11:14:04	1.37
@@ -1,4 +1,4 @@
-/*	$Id: man_term.c,v 1.28 2009/08/21 08:41:05 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
@@ -61,10 +64,8 @@ struct	termact {
 
 static	int		  pre_B(DECL_ARGS);
 static	int		  pre_BI(DECL_ARGS);
-static	int		  pre_BR(DECL_ARGS);
 static	int		  pre_HP(DECL_ARGS);
 static	int		  pre_I(DECL_ARGS);
-static	int		  pre_IB(DECL_ARGS);
 static	int		  pre_IP(DECL_ARGS);
 static	int		  pre_IR(DECL_ARGS);
 static	int		  pre_PP(DECL_ARGS);
@@ -76,6 +77,7 @@ static	int		  pre_SS(DECL_ARGS);
 static	int		  pre_TP(DECL_ARGS);
 static	int		  pre_br(DECL_ARGS);
 static	int		  pre_fi(DECL_ARGS);
+static	int		  pre_ign(DECL_ARGS);
 static	int		  pre_nf(DECL_ARGS);
 static	int		  pre_r(DECL_ARGS);
 static	int		  pre_sp(DECL_ARGS);
@@ -90,7 +92,7 @@ static	void		  post_SS(DECL_ARGS);
 static	void		  post_TP(DECL_ARGS);
 static	void		  post_i(DECL_ARGS);
 
-static const struct termact termacts[MAN_MAX] = {
+static	const struct termact termacts[MAN_MAX] = {
 	{ pre_br, NULL }, /* br */
 	{ NULL, NULL }, /* TH */
 	{ pre_SH, post_SH }, /* SH */
@@ -104,8 +106,8 @@ static const struct termact termacts[MAN_MAX] = {
 	{ NULL, NULL }, /* SM */
 	{ pre_B, post_B }, /* SB */
 	{ pre_BI, NULL }, /* BI */
-	{ pre_IB, NULL }, /* IB */
-	{ pre_BR, NULL }, /* BR */
+	{ pre_BI, NULL }, /* IB */
+	{ pre_RB, NULL }, /* BR */
 	{ pre_RB, NULL }, /* RB */
 	{ NULL, NULL }, /* R */
 	{ pre_B, post_B }, /* B */
@@ -120,7 +122,8 @@ static const struct termact termacts[MAN_MAX] = {
 	{ pre_r, NULL }, /* r */
 	{ NULL, NULL }, /* RE */
 	{ pre_RS, post_RS }, /* RS */
-	{ NULL, NULL }, /* DT */
+	{ pre_ign, NULL }, /* DT */
+	{ pre_ign, NULL }, /* UC */
 };
 
 #ifdef __linux__
@@ -136,28 +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 *);
 
 
-int
-man_run(struct termp *p, const struct man *m)
+void
+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;
-	assert(man_node(m));
-	assert(MAN_ROOT == man_node(m)->type);
 
 	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));
-
-	return(1);
+	if (n->child)
+		print_body(p, &mt, n->child, m);
+	print_foot(p, m);
 }
 
 
@@ -179,30 +196,51 @@ 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);
+	if ( ! a2roffsu(p, &su)) 
+		return(-1);
 
-	p = n->string;
+	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 (0 == (len = (int)strlen(p)))
-		return(-1);
+	if (r < 0.0)
+		r = 0.0;
+	return((int)/* LINTED */
+			r);
+}
 
-	for (i = 0; i < len; i++) 
-		if ( ! isdigit((u_char)p[i]))
-			break;
 
-	if (i == len - 1)  {
-		if ('n' == p[len - 1] || 'm' == p[len - 1])
-			return(atoi(p));
-	} else if (i == len)
-		return(atoi(p));
+/* ARGSUSED */
+static int
+pre_ign(DECL_ARGS)
+{
 
-	return(-1);
+	return(0);
 }
 
 
@@ -211,7 +249,7 @@ static int
 pre_I(DECL_ARGS)
 {
 
-	p->flags |= TERMP_UNDER;
+	p->under++;
 	return(1);
 }
 
@@ -221,8 +259,7 @@ static int
 pre_r(DECL_ARGS)
 {
 
-	p->flags &= ~TERMP_UNDER;
-	p->flags &= ~TERMP_BOLD;
+	p->bold = p->under = 0;
 	return(1);
 }
 
@@ -233,7 +270,7 @@ post_i(DECL_ARGS)
 {
 
 	if (n->nchild)
-		p->flags &= ~TERMP_UNDER;
+		p->under--;
 }
 
 
@@ -242,7 +279,7 @@ static void
 post_I(DECL_ARGS)
 {
 
-	p->flags &= ~TERMP_UNDER;
+	p->under--;
 }
 
 
@@ -276,12 +313,12 @@ pre_IR(DECL_ARGS)
 
 	for (i = 0, nn = n->child; nn; nn = nn->next, i++) {
 		if ( ! (i % 2))
-			p->flags |= TERMP_UNDER;
+			p->under++;
 		if (i > 0)
 			p->flags |= TERMP_NOSPACE;
 		print_node(p, mt, nn, m);
 		if ( ! (i % 2))
-			p->flags &= ~TERMP_UNDER;
+			p->under--;
 	}
 	return(0);
 }
@@ -289,37 +326,26 @@ pre_IR(DECL_ARGS)
 
 /* ARGSUSED */
 static int
-pre_IB(DECL_ARGS)
-{
-	const struct man_node *nn;
-	int		 i;
-
-	for (i = 0, nn = n->child; nn; nn = nn->next, i++) {
-		p->flags |= i % 2 ? TERMP_BOLD : TERMP_UNDER;
-		if (i > 0)
-			p->flags |= TERMP_NOSPACE;
-		print_node(p, mt, nn, m);
-		p->flags &= i % 2 ? ~TERMP_BOLD : ~TERMP_UNDER;
-	}
-	return(0);
-}
-
-
-/* ARGSUSED */
-static int
 pre_RB(DECL_ARGS)
 {
 	const struct man_node *nn;
 	int		 i;
 
 	for (i = 0, nn = n->child; nn; nn = nn->next, i++) {
-		if (i % 2)
-			p->flags |= TERMP_BOLD;
+		if (i % 2 && MAN_RB == n->tok)
+			p->bold++;
+		else if ( ! (i % 2) && MAN_RB != n->tok)
+			p->bold++;
+
 		if (i > 0)
 			p->flags |= TERMP_NOSPACE;
+
 		print_node(p, mt, nn, m);
-		if (i % 2)
-			p->flags &= ~TERMP_BOLD;
+
+		if (i % 2 && MAN_RB == n->tok)
+			p->bold--;
+		else if ( ! (i % 2) && MAN_RB != n->tok)
+			p->bold--;
 	}
 	return(0);
 }
@@ -334,12 +360,12 @@ pre_RI(DECL_ARGS)
 
 	for (i = 0, nn = n->child; nn; nn = nn->next, i++) {
 		if ( ! (i % 2))
-			p->flags |= TERMP_UNDER;
+			p->under++;
 		if (i > 0)
 			p->flags |= TERMP_NOSPACE;
 		print_node(p, mt, nn, m);
 		if ( ! (i % 2))
-			p->flags &= ~TERMP_UNDER;
+			p->under--;
 	}
 	return(0);
 }
@@ -347,37 +373,33 @@ pre_RI(DECL_ARGS)
 
 /* ARGSUSED */
 static int
-pre_BR(DECL_ARGS)
-{
-	const struct man_node *nn;
-	int		 i;
-
-	for (i = 0, nn = n->child; nn; nn = nn->next, i++) {
-		if ( ! (i % 2))
-			p->flags |= TERMP_BOLD;
-		if (i > 0)
-			p->flags |= TERMP_NOSPACE;
-		print_node(p, mt, nn, m);
-		if ( ! (i % 2))
-			p->flags &= ~TERMP_BOLD;
-	}
-	return(0);
-}
-
-
-/* ARGSUSED */
-static int
 pre_BI(DECL_ARGS)
 {
-	const struct man_node *nn;
-	int		 i;
+	const struct man_node	*nn;
+	int			 i;
 
 	for (i = 0, nn = n->child; nn; nn = nn->next, i++) {
-		p->flags |= i % 2 ? TERMP_UNDER : TERMP_BOLD;
-		if (i > 0)
+		if (i % 2 && MAN_BI == n->tok)
+			p->under++;
+		else if (i % 2)
+			p->bold++;
+		else if (MAN_BI == n->tok)
+			p->bold++;
+		else
+			p->under++;
+
+		if (i)
 			p->flags |= TERMP_NOSPACE;
 		print_node(p, mt, nn, m);
-		p->flags &= i % 2 ? ~TERMP_UNDER : ~TERMP_BOLD;
+
+		if (i % 2 && MAN_BI == n->tok)
+			p->under--;
+		else if (i % 2)
+			p->bold--;
+		else if (MAN_BI == n->tok)
+			p->bold--;
+		else
+			p->under--;
 	}
 	return(0);
 }
@@ -388,7 +410,7 @@ static int
 pre_B(DECL_ARGS)
 {
 
-	p->flags |= TERMP_BOLD;
+	p->bold++;
 	return(1);
 }
 
@@ -398,7 +420,7 @@ static void
 post_B(DECL_ARGS)
 {
 
-	p->flags &= ~TERMP_BOLD;
+	p->bold--;
 }
 
 
@@ -458,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;
@@ -549,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;
 		}
 
@@ -635,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):
@@ -709,7 +736,7 @@ pre_SS(DECL_ARGS)
 		term_vspace(p);
 		break;
 	case (MAN_HEAD):
-		p->flags |= TERMP_BOLD;
+		p->bold++;
 		p->offset = HALFINDENT;
 		break;
 	case (MAN_BODY):
@@ -731,7 +758,7 @@ post_SS(DECL_ARGS)
 	switch (n->type) {
 	case (MAN_HEAD):
 		term_newln(p);
-		p->flags &= ~TERMP_BOLD;
+		p->bold--;
 		break;
 	case (MAN_BODY):
 		term_newln(p);
@@ -758,7 +785,7 @@ pre_SH(DECL_ARGS)
 		term_vspace(p);
 		break;
 	case (MAN_HEAD):
-		p->flags |= TERMP_BOLD;
+		p->bold++;
 		p->offset = 0;
 		break;
 	case (MAN_BODY):
@@ -780,7 +807,7 @@ post_SH(DECL_ARGS)
 	switch (n->type) {
 	case (MAN_HEAD):
 		term_newln(p);
-		p->flags &= ~TERMP_BOLD;
+		p->bold--;
 		break;
 	case (MAN_BODY):
 		term_newln(p);
@@ -814,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;
@@ -901,15 +929,12 @@ static void
 print_foot(struct termp *p, const struct man_meta *meta)
 {
 	struct tm	*tm;
-	char		*buf;
+	char		 buf[BUFSIZ];
 
-	if (NULL == (buf = malloc(p->rmargin)))
-		err(1, "malloc");
-
 	tm = localtime(&meta->date);
 
 	if (0 == strftime(buf, p->rmargin, "%B %d, %Y", tm))
-		err(1, "strftime");
+		(void)strlcpy(buf, "(invalid date)", BUFSIZ);
 
 	term_vspace(p);
 
@@ -930,8 +955,6 @@ print_foot(struct termp *p, const struct man_meta *met
 
 	term_word(p, buf);
 	term_flushln(p);
-
-	free(buf);
 }
 
 
@@ -944,9 +967,9 @@ print_head(struct termp *p, const struct man_meta *met
 	p->offset = 0;
 
 	if (NULL == (buf = malloc(p->rmargin)))
-		err(1, "malloc");
+		err(EXIT_FAILURE, "malloc");
 	if (NULL == (title = malloc(p->rmargin)))
-		err(1, "malloc");
+		err(EXIT_FAILURE, "malloc");
 
 	if (meta->vol)
 		(void)strlcpy(buf, meta->vol, p->rmargin);