diff options
| author | Ingo Schwarze <schwarze@openbsd.org> | 2014-12-13 13:14:39 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@openbsd.org> | 2014-12-13 13:14:39 +0000 |
| commit | 4f8810a6b21aaef198d7405a74feb429f74a0091 (patch) | |
| tree | da80cf883750d6ffd9b033fcf97375e8ac098859 | |
| parent | 97f753b93ce2400cb818cd376221849188e66969 (diff) | |
| download | mandoc-4f8810a6b21aaef198d7405a74feb429f74a0091.tar.gz | |
Fix a regression found by Carsten dot Kunze at arcor dot de:
Do not show bogus quotes when .Bl -column phrases are quoted.
| -rw-r--r-- | TODO | 11 | ||||
| -rw-r--r-- | mdoc_macro.c | 6 |
2 files changed, 12 insertions, 5 deletions
@@ -299,9 +299,18 @@ are mere guesses, and some may be wrong. * formatting issues: ugly output ************************************************************************ -- a column list with blank `Ta' cells triggers a spurrious +- revisit empty in-line macros + look at the difference between "Em x Em ." and "Sq x Em ." + Carsten Kunze Fri, 12 Dec 2014 00:15:41 +0100 + loc *** exist *** algo *** size * imp ** + +- a column list with blank `Ta' cells triggers a spurious start-with-whitespace printing of a newline +- In .Bl -column, .It a<tab>"b<tab>c" + shows the quotes in groff, but not in mandoc + loc * exist *** algo ** size * imp ** + - In .Bl -column, .It Em Authentication<tab>Key Length ought to render "Key Length" with emphasis, too, diff --git a/mdoc_macro.c b/mdoc_macro.c index 6d1556b4..f2f59962 100644 --- a/mdoc_macro.c +++ b/mdoc_macro.c @@ -672,11 +672,9 @@ macro_or_word(MACRO_PROT_ARGS, int parsed) p = buf + ppos; ntok = MDOC_MAX; - if (mdoc->flags & MDOC_PHRASELIT) - /* nothing */; - else if (*p == '"') + if (*p == '"') p++; - else if (parsed) + else if (parsed && ! (mdoc->flags & MDOC_PHRASELIT)) ntok = lookup(mdoc, tok, line, ppos, p); if (ntok == MDOC_MAX) { |