===================================================================
RCS file: /cvs/mandoc/man_term.c,v
retrieving revision 1.37
retrieving revision 1.42
diff -u -p -r1.37 -r1.42
--- mandoc/man_term.c	2009/10/18 11:14:04	1.37
+++ mandoc/man_term.c	2009/10/21 03:31:49	1.42
@@ -1,4 +1,4 @@
-/*	$Id: man_term.c,v 1.37 2009/10/18 11:14:04 kristaps Exp $ */
+/*	$Id: man_term.c,v 1.42 2009/10/21 03:31:49 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -23,11 +23,11 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "out.h"
 #include "man.h"
 #include "term.h"
 #include "chars.h"
 #include "main.h"
-#include "out.h"
 
 #define	INDENT		  7
 #define	HALFINDENT	  3
@@ -62,6 +62,23 @@ struct	termact {
 	void		(*post)(DECL_ARGS);
 };
 
+#ifdef __linux__
+extern	size_t		  strlcpy(char *, const char *, size_t);
+extern	size_t		  strlcat(char *, const char *, size_t);
+#endif
+
+static	int		  arg2width(const struct man_node *);
+static	int		  arg2height(const struct man_node *);
+
+static	void		  print_head(struct termp *, 
+				const struct man_meta *);
+static	void		  print_body(DECL_ARGS);
+static	void		  print_node(DECL_ARGS);
+static	void		  print_foot(struct termp *, 
+				const struct man_meta *);
+static	void		  print_bvspace(struct termp *, 
+				const struct man_node *);
+
 static	int		  pre_B(DECL_ARGS);
 static	int		  pre_BI(DECL_ARGS);
 static	int		  pre_HP(DECL_ARGS);
@@ -126,22 +143,8 @@ static	const struct termact termacts[MAN_MAX] = {
 	{ pre_ign, NULL }, /* UC */
 };
 
-#ifdef __linux__
-extern	size_t		  strlcpy(char *, const char *, size_t);
-extern	size_t		  strlcat(char *, const char *, size_t);
-#endif
 
-static	void		  print_head(struct termp *, 
-				const struct man_meta *);
-static	void		  print_body(DECL_ARGS);
-static	void		  print_node(DECL_ARGS);
-static	void		  print_foot(struct termp *, 
-				const struct man_meta *);
-static	void		  fmt_block_vspace(struct termp *, 
-				const struct man_node *);
-static	int		  a2width(const char *);
 
-
 void
 terminal_man(void *arg, const struct man *man)
 {
@@ -178,8 +181,36 @@ terminal_man(void *arg, const struct man *man)
 }
 
 
+static int
+arg2height(const struct man_node *n)
+{
+	struct roffsu	 su;
+
+	assert(MAN_TEXT == n->type);
+	assert(n->string);
+	if ( ! a2roffsu(n->string, &su, SCALE_VS))
+		SCALE_VS_INIT(&su, strlen(n->string));
+
+	return((int)term_vspan(&su));
+}
+
+
+static int
+arg2width(const struct man_node *n)
+{
+	struct roffsu	 su;
+
+	assert(MAN_TEXT == n->type);
+	assert(n->string);
+	if ( ! a2roffsu(n->string, &su, SCALE_BU))
+		return(-1);
+
+	return((int)term_hspan(&su));
+}
+
+
 static void
-fmt_block_vspace(struct termp *p, const struct man_node *n)
+print_bvspace(struct termp *p, const struct man_node *n)
 {
 	term_newln(p);
 
@@ -195,46 +226,6 @@ fmt_block_vspace(struct termp *p, const struct man_nod
 }
 
 
-static 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;
-		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 (r < 0.0)
-		r = 0.0;
-	return((int)/* LINTED */
-			r);
-}
-
-
 /* ARGSUSED */
 static int
 pre_ign(DECL_ARGS)
@@ -430,12 +421,8 @@ pre_sp(DECL_ARGS)
 {
 	int		 i, len;
 
-	if (NULL == n->child) {
-		term_vspace(p);
-		return(0);
-	}
+	len = n->child ? arg2height(n->child) : 1;
 
-	len = atoi(n->child->string);
 	if (0 == len)
 		term_newln(p);
 	for (i = 0; i < len; i++)
@@ -465,7 +452,7 @@ pre_HP(DECL_ARGS)
 
 	switch (n->type) {
 	case (MAN_BLOCK):
-		fmt_block_vspace(p, n);
+		print_bvspace(p, n);
 		return(1);
 	case (MAN_BODY):
 		p->flags |= TERMP_NOBREAK;
@@ -480,11 +467,9 @@ pre_HP(DECL_ARGS)
 
 	/* Calculate offset. */
 
-	if (NULL != (nn = n->parent->head->child)) {
-		assert(MAN_TEXT == nn->type);
-		if ((ival = a2width(nn->string)) >= 0)
+	if (NULL != (nn = n->parent->head->child))
+		if ((ival = arg2width(nn)) >= 0)
 			len = (size_t)ival;
-	}
 
 	if (0 == len)
 		len = 1;
@@ -529,7 +514,7 @@ pre_PP(DECL_ARGS)
 	switch (n->type) {
 	case (MAN_BLOCK):
 		mt->lmargin = INDENT;
-		fmt_block_vspace(p, n);
+		print_bvspace(p, n);
 		break;
 	default:
 		p->offset = mt->offset;
@@ -558,7 +543,7 @@ pre_IP(DECL_ARGS)
 		p->flags |= TERMP_TWOSPACE;
 		break;
 	case (MAN_BLOCK):
-		fmt_block_vspace(p, n);
+		print_bvspace(p, n);
 		/* FALLTHROUGH */
 	default:
 		return(1);
@@ -573,8 +558,7 @@ pre_IP(DECL_ARGS)
 		if (NULL != (nn = nn->next)) {
 			for ( ; nn->next; nn = nn->next)
 				/* Do nothing. */ ;
-			assert(MAN_TEXT == nn->type);
-			if ((ival = a2width(nn->string)) >= 0)
+			if ((ival = arg2width(nn)) >= 0)
 				len = (size_t)ival;
 		}
 
@@ -648,7 +632,7 @@ pre_TP(DECL_ARGS)
 		p->flags |= TERMP_NOSPACE;
 		break;
 	case (MAN_BLOCK):
-		fmt_block_vspace(p, n);
+		print_bvspace(p, n);
 		/* FALLTHROUGH */
 	default:
 		return(1);
@@ -660,11 +644,9 @@ pre_TP(DECL_ARGS)
 	/* Calculate offset. */
 
 	if (NULL != (nn = n->parent->head->child))
-		if (NULL != nn->next) {
-			assert(MAN_TEXT == nn->type);
-			if ((ival = a2width(nn->string)) >= 0)
+		if (NULL != nn->next)
+			if ((ival = arg2width(nn)) >= 0)
 				len = (size_t)ival;
-		}
 
 	switch (n->type) {
 	case (MAN_HEAD):
@@ -841,8 +823,7 @@ pre_RS(DECL_ARGS)
 		return(1);
 	}
 
-	assert(MAN_TEXT == nn->type);
-	if ((ival = a2width(nn->string)) < 0)
+	if ((ival = arg2width(nn)) < 0)
 		return(1);
 
 	mt->offset = INDENT + (size_t)ival;
@@ -933,7 +914,7 @@ print_foot(struct termp *p, const struct man_meta *met
 
 	tm = localtime(&meta->date);
 
-	if (0 == strftime(buf, p->rmargin, "%B %d, %Y", tm))
+	if (0 == strftime(buf, p->rmargin, "%B %e, %Y", tm))
 		(void)strlcpy(buf, "(invalid date)", BUFSIZ);
 
 	term_vspace(p);