diff options
| -rw-r--r-- | TODO | 3 | ||||
| -rw-r--r-- | mdoc_macro.c | 16 |
2 files changed, 13 insertions, 6 deletions
@@ -12,9 +12,6 @@ and then triggers an unknown macro error reported by naddy@ Sun, 3 Jul 2011 21:52:24 +0200 -- .It is parsed in general, except in .Bl -diag - deraadt@ Mon, 07 Nov 2011 11:10:52 -0700 - ************************************************************************ * formatter bugs ************************************************************************ diff --git a/mdoc_macro.c b/mdoc_macro.c index 0400e3f2..add440b3 100644 --- a/mdoc_macro.c +++ b/mdoc_macro.c @@ -228,7 +228,6 @@ mdoc_macroend(struct mdoc *m) static enum mdoct lookup(enum mdoct from, const char *p) { - /* FIXME: make -diag lists be un-PARSED. */ if ( ! (MDOC_PARSED & mdoc_macros[from].flags)) return(MDOC_MAX); @@ -984,7 +983,7 @@ in_line(MACRO_PROT_ARGS) static int blk_full(MACRO_PROT_ARGS) { - int la, nl; + int la, nl, nparsed; struct mdoc_arg *arg; struct mdoc_node *head; /* save of head macro */ struct mdoc_node *body; /* save of body macro */ @@ -995,6 +994,16 @@ blk_full(MACRO_PROT_ARGS) enum margverr av; char *p; + /* + * Exception: `-diag' lists are not parsed, but lists in general + * are parsed. + */ + nparsed = 0; + if (MDOC_It == tok && NULL != m->last && + MDOC_Bl == m->last->tok && + LIST_diag == m->last->norm->Bl.type) + nparsed = 1; + nl = MDOC_NEWLINE & m->flags; /* Close out prior implicit scope. */ @@ -1146,7 +1155,8 @@ blk_full(MACRO_PROT_ARGS) continue; } - ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p); + ntok = nparsed || ARGS_QWORD == ac ? + MDOC_MAX : lookup(tok, p); if (MDOC_MAX == ntok) { if ( ! dword(m, line, la, p, DELIM_MAX)) |