From 45523d60760f6291fb81789a01f1bcf2b8e80a69 Mon Sep 17 00:00:00 2001
From: Kristaps Dzonsons <kristaps@bsd.lv>
Date: Sun, 18 Oct 2009 11:14:04 +0000
Subject: Added horizontal scaling units to -Tman -Tascii.

---
 man_term.c  | 73 ++++++++++++++++++++++++++++++++++++++-----------------------
 mdoc_html.c |  6 ++++-
 2 files changed, 51 insertions(+), 28 deletions(-)

diff --git a/man_term.c b/man_term.c
index a95420af..d6582d59 100644
--- a/man_term.c
+++ b/man_term.c
@@ -1,4 +1,4 @@
-/*	$Id: man_term.c,v 1.36 2009/10/13 10:57:25 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>
  *
@@ -27,6 +27,7 @@
 #include "term.h"
 #include "chars.h"
 #include "main.h"
+#include "out.h"
 
 #define	INDENT		  7
 #define	HALFINDENT	  3
@@ -138,7 +139,7 @@ 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
@@ -195,30 +196,42 @@ fmt_block_vspace(struct termp *p, const struct man_node *n)
 
 
 static int
-arg_width(const struct man_node *n)
+a2width(const char *p)
 {
-	int		 i, len;
-	const char	*p;
-
-	assert(MAN_TEXT == n->type);
-	assert(n->string);
-
-	p = n->string;
+	struct roffsu	 su;
+	double		 r;
 
-	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;
-
-	if (i == len - 1)  {
-		if ('n' == p[len - 1] || 'm' == p[len - 1])
-			return(atoi(p));
-	} else if (i == len)
-		return(atoi(p));
+	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;
+	}
 
-	return(-1);
+	if (r < 0.0)
+		r = 0.0;
+	return((int)/* LINTED */
+			r);
 }
 
 
@@ -467,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;
@@ -558,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;
 		}
 
@@ -644,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):
@@ -823,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;
diff --git a/mdoc_html.c b/mdoc_html.c
index c04280f2..0697d35d 100644
--- a/mdoc_html.c
+++ b/mdoc_html.c
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_html.c,v 1.30 2009/10/15 01:33:12 kristaps Exp $ */
+/*	$Id: mdoc_html.c,v 1.31 2009/10/18 11:14:04 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -343,6 +343,8 @@ static void
 a2offs(const char *p, struct roffsu *su)
 {
 
+	/* FIXME: "right"? */
+
 	if (0 == strcmp(p, "left"))
 		SCALE_HS_INIT(su, 0);
 	else if (0 == strcmp(p, "indent"))
@@ -1372,6 +1374,8 @@ mdoc_bd_pre(MDOC_ARGS)
 			break;
 		}
 
+	/* FIXME: -centered, etc. formatting. */
+
 	if (MDOC_BLOCK == n->type) {
 		bufcat_su(h, "margin-left", &su);
 		for (nn = n; nn && ! comp; nn = nn->parent) {
-- 
cgit v1.2.3-56-ge451