Arbitrary horizontal and vertical scaling widths now handled by -mdoc -Tascii.

Terminal scaling backend pushed into term.c.

4 files changed, 186 insertions, 173 deletions

diff --git a/man_term.c b/man_term.c
index b5196503..7010ccd4 100644
--- a/man_term.c
+++ b/man_term.c
@@ -1,4 +1,4 @@
-/*	$Id: man_term.c,v 1.38 2009/10/18 11:52:18 kristaps Exp $ */
+/*	$Id: man_term.c,v 1.39 2009/10/18 13:34:16 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -27,7 +27,6 @@
 #include "term.h"
 #include "chars.h"
 #include "main.h"
-#include "out.h"
 
 #define	INDENT		  7
 #define	HALFINDENT	  3
@@ -62,6 +61,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,21 +142,6 @@ 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 *);
-static	int		  a2height(const char *);
 
 
 void
@@ -179,100 +180,45 @@ terminal_man(void *arg, const struct man *man)
 }
 
 
-static void
-fmt_block_vspace(struct termp *p, const struct man_node *n)
+static int
+arg2height(const struct man_node *n)
 {
-	term_newln(p);
+	int		r;
 
-	if (NULL == n->prev)
-		return;
+	assert(MAN_TEXT == n->type);
+	assert(n->string);
 
-	if (MAN_SS == n->prev->tok)
-		return;
-	if (MAN_SH == n->prev->tok)
-		return;
+	if ((r = a2height(n->string)) < 0)
+		return(1);
 
-	term_vspace(p);
+	return(r);
 }
 
 
 static int
-a2height(const char *p)
+arg2width(const struct man_node *n)
 {
-	struct roffsu	 su;
-	double		 r;
 
-	if ( ! a2roffsu(p, &su)) 
-		return(1);
-
-	switch (su.unit) {
-	case (SCALE_CM):
-		r = su.scale * 2;
-		break;
-	case (SCALE_IN):
-		r = su.scale * 6;
-		break;
-	case (SCALE_PC):
-		r = su.scale;
-		break;
-	case (SCALE_PT):
-		r = su.scale / 8;
-		break;
-	case (SCALE_MM):
-		r = su.scale / 1000;
-		break;
-	case (SCALE_VS):
-		r = su.scale;
-		break;
-	default:
-		r = su.scale - 1;
-		break;
-	}
-
-	if (r < 0.0)
-		r = 0.0;
-	return(/* LINTED */(int)
-			r);
+	assert(MAN_TEXT == n->type);
+	assert(n->string);
+	return(a2width(n->string));
 }
 
 
-static int
-a2width(const char *p)
+static void
+print_bvspace(struct termp *p, const struct man_node *n)
 {
-	struct roffsu	 su;
-	double		 r;
+	term_newln(p);
 
-	if ( ! a2roffsu(p, &su)) 
-		return(-1);
+	if (NULL == n->prev)
+		return;
 
-	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 (MAN_SS == n->prev->tok)
+		return;
+	if (MAN_SH == n->prev->tok)
+		return;
 
-	if (r < 0.0)
-		r = 0.0;
-	return((int)/* LINTED */
-			r);
+	term_vspace(p);
 }
 
 
@@ -471,13 +417,7 @@ pre_sp(DECL_ARGS)
 {
 	int		 i, len;
 
-	if (NULL == n->child) {
-		term_vspace(p);
-		return(0);
-	}
-
-	assert(MAN_TEXT == n->child->type);
-	len = a2height(n->child->string);
+	len = n->child ? arg2height(n->child) : 1;
 
 	if (0 == len)
 		term_newln(p);
@@ -508,7 +448,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;
@@ -523,11 +463,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;
@@ -572,7 +510,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;
@@ -601,7 +539,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);
@@ -616,8 +554,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;
 		}
 
@@ -691,7 +628,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);
@@ -703,11 +640,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):
@@ -884,8 +819,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;
diff --git a/mdoc_term.c b/mdoc_term.c
index beae7984..0e0d1f39 100644
--- a/mdoc_term.c
+++ b/mdoc_term.c
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_term.c,v 1.90 2009/10/15 01:33:12 kristaps Exp $ */
+/*	$Id: mdoc_term.c,v 1.91 2009/10/18 13:34:17 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -242,14 +242,16 @@ extern	size_t	  strlcpy(char *, const char *, size_t);
 extern	size_t	  strlcat(char *, const char *, size_t);
 #endif
 
+static	size_t	  arg2width(const struct mdoc_argv *, int);
+static	size_t	  arg2height(const struct mdoc_node *);
+static	size_t	  arg2offs(const struct mdoc_argv *);
+
 static	int	  arg_hasattr(int, const struct mdoc_node *);
 static	int	  arg_getattrs(const int *, int *, size_t,
 			const struct mdoc_node *);
 static	int	  arg_getattr(int, const struct mdoc_node *);
-static	size_t	  arg_offset(const struct mdoc_argv *);
-static	size_t	  arg_width(const struct mdoc_argv *, int);
 static	int	  arg_listtype(const struct mdoc_node *);
-static	void	  fmt_block_vspace(struct termp *,
+static	void	  print_bvspace(struct termp *,
 			const struct mdoc_node *,
 			const struct mdoc_node *);
 static	void  	  print_node(DECL_ARGS);
@@ -470,30 +472,34 @@ print_head(DECL_ARGS)
 }
 
 
-/* FIXME: put in utility file for front-ends. */
 static size_t
-arg_width(const struct mdoc_argv *arg, int pos)
+arg2height(const struct mdoc_node *n)
 {
-	int		 i, len;
-	const char	*p;
+	int		 r;
 
-	assert(pos < (int)arg->sz && pos >= 0);
-	assert(arg->value[pos]);
+	assert(MDOC_TEXT == n->type);
+	assert(n->string);
 
-	p = arg->value[pos];
+	if ((r = a2height(n->string)) < 0)
+		return(1);
 
-	if (0 == (len = (int)strlen(p)))
-		return(0);
+	return((size_t)r);
+}
 
-	for (i = 0; i < len - 1; i++) 
-		if ( ! isdigit((u_char)p[i]))
-			break;
 
-	if (i == len - 1) 
-		if ('n' == p[len - 1] || 'm' == p[len - 1])
-			return((size_t)atoi(p) + 2);
+static size_t
+arg2width(const struct mdoc_argv *arg, int pos)
+{
+	int		 r;
+
+	assert(arg->value[pos]);
+	if ('\0' == arg->value[pos][0])
+		return(2);
 
-	return((size_t)len + 2);
+	if ((r = a2width(arg->value[pos])) >= 0)
+		return((size_t)r);
+
+	return(strlen(arg->value[pos]) + 2);
 }
 
 
@@ -539,35 +545,23 @@ arg_listtype(const struct mdoc_node *n)
 }
 
 
-/* FIXME: put in utility file for front-ends. */
 static size_t
-arg_offset(const struct mdoc_argv *arg)
+arg2offs(const struct mdoc_argv *arg)
 {
-	int		 len, i;
-	const char	*p;
-
-	assert(*arg->value);
-	p = *arg->value;
+	int		 r;
 
-	if (0 == strcmp(p, "left"))
+	if ('\0' == arg->value[0][0])
 		return(0);
-	if (0 == strcmp(p, "indent"))
+	else if (0 == strcmp(arg->value[0], "left"))
+		return(0);
+	else if (0 == strcmp(arg->value[0], "indent"))
 		return(INDENT + 1);
-	if (0 == strcmp(p, "indent-two"))
+	else if (0 == strcmp(arg->value[0], "indent-two"))
 		return((INDENT + 1) * 2);
+	else if ((r = a2width(arg->value[0])) >= 0)
+		return((size_t)r);
 
-	if (0 == (len = (int)strlen(p)))
-		return(0);
-
-	for (i = 0; i < len - 1; i++) 
-		if ( ! isdigit((u_char)p[i]))
-			break;
-
-	if (i == len - 1) 
-		if ('n' == p[len - 1] || 'm' == p[len - 1])
-			return((size_t)atoi(p));
-
-	return((size_t)len);
+	return(strlen(arg->value[0]));
 }
 
 
@@ -607,9 +601,8 @@ arg_getattrs(const int *keys, int *vals,
 }
 
 
-/* ARGSUSED */
 static void
-fmt_block_vspace(struct termp *p, 
+print_bvspace(struct termp *p, 
 		const struct mdoc_node *bl, 
 		const struct mdoc_node *n)
 {
@@ -689,7 +682,7 @@ termp_it_pre(DECL_ARGS)
 	size_t		        width, offset;
 
 	if (MDOC_BLOCK == n->type) {
-		fmt_block_vspace(p, n->parent->parent, n);
+		print_bvspace(p, n->parent->parent, n);
 		return(1);
 	}
 
@@ -732,23 +725,23 @@ termp_it_pre(DECL_ARGS)
 		for (i = 0, nn = n->prev; nn && 
 				i < (int)bl->args->argv[vals[2]].sz; 
 				nn = nn->prev, i++)
-			offset += arg_width 
+			offset += arg2width 
 				(&bl->args->argv[vals[2]], i);
 
 		/* Whether exceeds maximum column. */
 		if (i < (int)bl->args->argv[vals[2]].sz)
-			width = arg_width(&bl->args->argv[vals[2]], i);
+			width = arg2width(&bl->args->argv[vals[2]], i);
 		else
 			width = 0;
 
 		if (vals[1] >= 0) 
-			offset += arg_offset(&bl->args->argv[vals[1]]);
+			offset += arg2offs(&bl->args->argv[vals[1]]);
 		break;
 	default:
 		if (vals[0] >= 0) 
-			width = arg_width(&bl->args->argv[vals[0]], 0);
+			width = arg2width(&bl->args->argv[vals[0]], 0);
 		if (vals[1] >= 0) 
-			offset += arg_offset(&bl->args->argv[vals[1]]);
+			offset += arg2offs(&bl->args->argv[vals[1]]);
 		break;
 	}
 
@@ -1550,7 +1543,7 @@ termp_bd_pre(DECL_ARGS)
 	const struct mdoc_node	*nn;
 
 	if (MDOC_BLOCK == n->type) {
-		fmt_block_vspace(p, n, n);
+		print_bvspace(p, n, n);
 		return(1);
 	} else if (MDOC_BODY != n->type)
 		return(1);
@@ -1571,7 +1564,7 @@ termp_bd_pre(DECL_ARGS)
 			type = nn->args->argv[i].arg;
 			break;
 		case (MDOC_Offset):
-			p->offset += arg_offset(&nn->args->argv[i]);
+			p->offset += arg2offs(&nn->args->argv[i]);
 			break;
 		default:
 			break;
@@ -1822,11 +1815,11 @@ termp_in_post(DECL_ARGS)
 static int
 termp_sp_pre(DECL_ARGS)
 {
-	int		 i, len;
+	size_t		 i, len;
 
 	switch (n->tok) {
 	case (MDOC_sp):
-		len = n->child ? atoi(n->child->string) : 1;
+		len = n->child ? arg2height(n->child) : 1;
 		break;
 	case (MDOC_br):
 		len = 0;
diff --git a/term.c b/term.c
index e945b95f..93f40395 100644
--- a/term.c
+++ b/term.c
@@ -1,4 +1,4 @@
-/*	$Id: term.c,v 1.105 2009/10/13 10:57:25 kristaps Exp $ */
+/*	$Id: term.c,v 1.106 2009/10/18 13:34:17 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -25,6 +25,7 @@
 #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. */
@@ -558,3 +559,85 @@ encode(struct termp *p, char c)
 	}
 	buffer(p, c);
 }
+
+
+int
+a2height(const char *p)
+{
+	struct roffsu	 su;
+	double		 r;
+
+	if ( ! a2roffsu(p, &su)) 
+		return(-1);
+
+	switch (su.unit) {
+	case (SCALE_CM):
+		r = su.scale * 2;
+		break;
+	case (SCALE_IN):
+		r = su.scale * 6;
+		break;
+	case (SCALE_PC):
+		r = su.scale;
+		break;
+	case (SCALE_PT):
+		r = su.scale / 8;
+		break;
+	case (SCALE_MM):
+		r = su.scale / 1000;
+		break;
+	case (SCALE_VS):
+		r = su.scale;
+		break;
+	default:
+		r = su.scale - 1;
+		break;
+	}
+
+	if (r < 0.0)
+		r = 0.0;
+	return(/* LINTED */(int)
+			r);
+}
+
+
+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) + 2; /* FIXME: double-check. */
+		break;
+	case (SCALE_IN):
+		r = (10 * su.scale) + 2; /* FIXME: double-check. */
+		break;
+	case (SCALE_PC):
+		r = (10 * su.scale) / 6; /* FIXME: double-check. */
+		break;
+	case (SCALE_PT):
+		r = (10 * su.scale) / 72; /* FIXME: double-check. */
+		break;
+	case (SCALE_MM):
+		r = su.scale / 1000; /* FIXME: double-check. */
+		break;
+	case (SCALE_VS):
+		r = su.scale * 2 - 1; /* FIXME: double-check. */
+		break;
+	default:
+		r = su.scale + 2;
+		break;
+	}
+
+	if (r < 0.0)
+		r = 0.0;
+	return((int)/* LINTED */
+			r);
+}
+
+
diff --git a/term.h b/term.h
index 5824f2a5..ee761bd8 100644
--- a/term.h
+++ b/term.h
@@ -1,4 +1,4 @@
-/*	$Id: term.h,v 1.47 2009/09/17 07:41:28 kristaps Exp $ */
+/*	$Id: term.h,v 1.48 2009/10/18 13:34:17 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -53,6 +53,9 @@ void		  term_vspace(struct termp *);
 void		  term_word(struct termp *, const char *);
 void		  term_flushln(struct termp *);
 
+int		  a2width(const char *);
+int		  a2height(const char *);
+
 __END_DECLS
 
 #endif /*!TERM_H*/