===================================================================
RCS file: /cvs/mandoc/term.c,v
retrieving revision 1.23
retrieving revision 1.27
diff -u -p -r1.23 -r1.27
--- mandoc/term.c	2009/02/25 23:18:50	1.23
+++ mandoc/term.c	2009/02/27 09:39:40	1.27
@@ -1,4 +1,4 @@
-/* $Id: term.c,v 1.23 2009/02/25 23:18:50 kristaps Exp $ */
+/* $Id: term.c,v 1.27 2009/02/27 09:39:40 kristaps Exp $ */
 /*
  * Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -17,6 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 #include <assert.h>
+#include <ctype.h>
 #include <err.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -24,7 +25,7 @@
 
 #include "term.h"
 
-#define	INDENT		  4
+#define	INDENT		  6
 
 /*
  * Performs actions on nodes of the abstract syntax tree.  Both pre- and
@@ -276,9 +277,29 @@ const struct termact *termacts = __termacts;
 static size_t
 arg_width(const struct mdoc_arg *arg)
 {
+	size_t		 v;
+	int		 i, len;
 
-	/* TODO */
 	assert(*arg->value);
+	if (0 == strcmp(*arg->value, "indent"))
+		return(INDENT);
+	if (0 == strcmp(*arg->value, "indent-two"))
+		return(INDENT * 2);
+
+	len = (int)strlen(*arg->value);
+	assert(len > 0);
+
+	for (i = 0; i < len - 1; i++) 
+		if ( ! isdigit((int)(*arg->value)[i]))
+			break;
+
+	if (i == len - 1) {
+		if ('n' == (*arg->value)[len - 1]) {
+			v = (size_t)atoi(*arg->value);
+			return(v);
+		}
+
+	}
 	return(strlen(*arg->value));
 }
 
@@ -293,7 +314,6 @@ arg_offset(const struct mdoc_arg *arg)
 		return(INDENT);
 	if (0 == strcmp(*arg->value, "indent-two"))
 		return(INDENT * 2);
-
 	return(strlen(*arg->value));
 }
 
@@ -381,7 +401,7 @@ termp_it_pre(DECL_ARGS)
 
 	/* Get our list type. */
 
-	for (i = 0; i < (int)bl->argc; i++) 
+	for (type = -1, i = 0; i < (int)bl->argc; i++) 
 		switch (bl->argv[i].arg) {
 		case (MDOC_Bullet):
 			/* FALLTHROUGH */
@@ -391,27 +411,19 @@ termp_it_pre(DECL_ARGS)
 			/* FALLTHROUGH */
 		case (MDOC_Hyphen):
 			/* FALLTHROUGH */
-		case (MDOC_Item):
-			/* FALLTHROUGH */
 		case (MDOC_Tag):
 			/* FALLTHROUGH */
 		case (MDOC_Ohang):
 			type = bl->argv[i].arg;
 			i = (int)bl->argc;
 			break;
-		case (MDOC_Inset):
-			/* FALLTHROUGH */
-		case (MDOC_Hang):
-			/* FALLTHROUGH */
-		case (MDOC_Diag):
-			/* FALLTHROUGH */
-		case (MDOC_Column):
+		default:
 			errx(1, "list type not supported");
 			/* NOTREACHED */
-		default:
-			break;
 		}
 
+	assert(-1 != type);
+
 	/* Save our existing (inherited) margin and offset. */
 
 	pair->offset = p->offset;
@@ -419,7 +431,6 @@ termp_it_pre(DECL_ARGS)
 
 	/* Get list width and offset. */
 
-	/* FIXME: auto-size. */
 	i = arg_getattr(MDOC_Width, bl->argc, bl->argv);
 	width = i >= 0 ? arg_width(&bl->argv[i]) : 0;
 
@@ -439,6 +450,7 @@ termp_it_pre(DECL_ARGS)
 		width = width > 6 ? width : 6;
 		break;
 	case (MDOC_Tag):
+		/* FIXME: auto-size. */
 		if (0 == width)
 			errx(1, "need non-zero -width");
 		break;
@@ -465,7 +477,7 @@ termp_it_pre(DECL_ARGS)
 		else if (MDOC_BODY == node->type)
 			p->flags |= TERMP_NOLPAD;
 		break;
-	case (MDOC_Ohang):
+	default:
 		break;
 	}
 
@@ -475,6 +487,7 @@ termp_it_pre(DECL_ARGS)
 	 */
 
 	tp = NULL;
+
 	if (MDOC_HEAD == node->type) {
 		if (arg_hasattr(MDOC_Bullet, bl->argc, bl->argv))
 			tp = "\\[bu]";
@@ -488,8 +501,6 @@ termp_it_pre(DECL_ARGS)
 		}
 		if (arg_hasattr(MDOC_Hyphen, bl->argc, bl->argv))
 			tp = "\\-";
-		if (arg_hasattr(MDOC_Item, bl->argc, bl->argv))
-			tp = "";
 	}
 
 	/* Margin control. */
@@ -505,23 +516,19 @@ termp_it_pre(DECL_ARGS)
 		/* FALLTHROUGH */
 	case (MDOC_Hyphen):
 		/* FALLTHROUGH */
-	case (MDOC_Item):
-		/* FALLTHROUGH */
 	case (MDOC_Tag):
 		if (MDOC_HEAD == node->type)
 			p->rmargin = p->offset + width;
 		else if (MDOC_BODY == node->type) 
 			p->offset += width;
 		break;
-	case (MDOC_Ohang):
+	default:
 		break;
 	}
 
 	if (NULL == tp)
 		return(1);
 
-	/* XXX - ignoring children. */
-
 	word(p, tp);
 	return(0);
 }
@@ -1323,7 +1330,7 @@ termp_bq_pre(DECL_ARGS)
 
 	if (MDOC_BODY != node->type)
 		return(1);
-	word(p, "[");
+	word(p, "\\[");
 	p->flags |= TERMP_NOSPACE;
 	return(1);
 }
@@ -1347,7 +1354,7 @@ termp_pq_pre(DECL_ARGS)
 
 	if (MDOC_BODY != node->type)
 		return(1);
-	word(p, "(");
+	word(p, "\\&(");
 	p->flags |= TERMP_NOSPACE;
 	return(1);
 }