diff options
| author |   Kristaps Dzonsons <kristaps@bsd.lv> | 2009-03-10 15:01:54 +0000 |
|---|---|---|
| committer | Kristaps Dzonsons <kristaps@bsd.lv> | 2009-03-10 15:01:54 +0000 |
| commit | 1730c3f7be321f16ec6b7afdfd0fb10a265d23bc (patch) | |
| tree | d67b563172781b8123d08c04f527bb6d2c3f209d /macro.c | |
| parent | d9011dcb574a3608fa48cc49f1d616812090bcb8 (diff) | |
| download | mandoc-1730c3f7be321f16ec6b7afdfd0fb10a265d23bc.tar.gz mandoc-1730c3f7be321f16ec6b7afdfd0fb10a265d23bc.tar.zst mandoc-1730c3f7be321f16ec6b7afdfd0fb10a265d23bc.zip | |
Bug-fix in mdoc_argv.
Added some documentation to macro.c.
Version-up.
Diffstat (limited to 'macro.c')
| -rw-r--r-- | macro.c | 12 |
1 files changed, 9 insertions, 3 deletions
@@ -1,4 +1,4 @@ -/* $Id: macro.c,v 1.64 2009/03/09 14:19:59 kristaps Exp $ */ +/* $Id: macro.c,v 1.65 2009/03/10 15:01:54 kristaps Exp $ */ /* * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se> * @@ -30,6 +30,8 @@ * macro. */ +/* FIXME: .Fl, .Ar, .Cd handling of `|'. */ + static int macro_obsolete(MACRO_PROT_ARGS); static int macro_constant(MACRO_PROT_ARGS); static int macro_constant_scoped(MACRO_PROT_ARGS); @@ -798,7 +800,7 @@ macro_text(MACRO_PROT_ARGS) for (;;) { la = *pos; w = mdoc_args(mdoc, line, pos, buf, tok, &p); - assert(ARGS_PHRASE != c); + assert(ARGS_PHRASE != w); if (ARGS_ERROR == w) return(0); @@ -807,9 +809,13 @@ macro_text(MACRO_PROT_ARGS) if (ARGS_PUNCT == w) break; + /* Quoted words shouldn't be looked-up. */ + c = ARGS_QWORD == w ? MDOC_MAX : lookup(mdoc, line, la, tok, p); + /* MDOC_MAX (not a macro) or -1 (error). */ + if (MDOC_MAX != c && -1 != c) { if (0 == lastpunct && ! rewind_elem(mdoc, tok)) return(0); @@ -822,7 +828,7 @@ macro_text(MACRO_PROT_ARGS) } else if (-1 == c) return(0); - /* FIXME: .Fl and .Ar handling of `|'. */ + /* Non-quote-enclosed punctuation. */ if (ARGS_QWORD != w && mdoc_isdelim(p)) { if (0 == lastpunct && ! rewind_elem(mdoc, tok)) |