diff options
-rw-r--r-- | Makefile | 4 | ||||
-rw-r--r-- | argv.c | 20 | ||||
-rw-r--r-- | term.c | 5 |
3 files changed, 19 insertions, 10 deletions
@@ -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 @@ -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; + } } } @@ -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 */ |