3 files changed, 17 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index 7f6b29bd..8f944d54 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 .SUFFIXES:	.html .sgml
 
-VERSION	= 1.3.15
-VDATE	= 02 March 2009
+VERSION	= 1.3.17
+VDATE	= 03 March 2009
 
 BINDIR		= $(PREFIX)/bin
 INCLUDEDIR	= $(PREFIX)/include
diff --git a/argv.c b/argv.c
index 77864950..ba3b1d2d 100644
--- a/argv.c
+++ b/argv.c
@@ -251,11 +251,19 @@ mdoc_args(struct mdoc *mdoc, int line,
 
 		/* LINTED */
 		for (i = 0; i < c; i++) {
-			if (MDOC_Column != n->data.block.argv[i].arg)
-				continue;
-			fl |= ARGS_TABSEP;
-			fl &= ~ARGS_DELIM;
-			break;
+			switch (n->data.block.argv[i].arg) {
+			case (MDOC_Column):
+				fl |= ARGS_TABSEP;
+				fl &= ~ARGS_DELIM;
+				i = c;
+				break;
+			case (MDOC_Diag):
+				fl |= ARGS_QUOTED;
+				i = c;
+				break;
+			default:
+				break;
+			}
 		}
 	}
 
diff --git a/term.c b/term.c
index 42febf65..0d3e7f1b 100644
--- a/term.c
+++ b/term.c
@@ -455,7 +455,7 @@ termp_it_pre(DECL_ARGS)
 	case (MDOC_Enum):
 		/* FALLTHROUGH */
 	case (MDOC_Hyphen):
-		width = width > 6 ? width : 6;
+		width = width > 4 ? width : 4;
 		break;
 	case (MDOC_Tag):
 		if (0 == width)
@@ -469,6 +469,7 @@ termp_it_pre(DECL_ARGS)
 
 	switch (type) {
 	case (MDOC_Diag):
+		/* XXX - ignore child macros!? */
 		if (MDOC_HEAD == node->type)
 			TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_DIAG]);
 		/* FALLTHROUGH */