-diag fixed (allows quoted parameters)

Versioned up.

diff --git a/Makefile b/Makefile
index 7f6b29bdc1051ac8976da1a3d4bc407756342459..8f944d54a86ae1e91973a82d687fe5d8d72950ed 100644 (file)
--- 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 8ad5d662ff223b4d3e4b395cbfdcd3be45bec86c..413f5deeb14e9df0304296849ac59e26be7c6daf 100644 (file)
--- a/argv.c
+++ b/argv.c
@@ -1,4 +1,4 @@
-/* $Id: argv.c,v 1.34 2009/02/28 12:16:02 kristaps Exp $ */
+/* $Id: argv.c,v 1.35 2009/03/03 22:28:21 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -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 1d552adfa5c0b42fa8385824b745c5718c3b4f49..7888980b66f2aa8d14ce41c69f4c04a07af0f3ac 100644 (file)
--- a/term.c
+++ b/term.c
@@ -1,4 +1,4 @@
-/* $Id: term.c,v 1.37 2009/03/03 22:17:19 kristaps Exp $ */
+/* $Id: term.c,v 1.38 2009/03/03 22:28:21 kristaps Exp $ */
 /*
  * Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -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 */