diff options
author | 2011-04-04 16:15:58 +0000 | |
---|---|---|
committer | 2011-04-04 16:15:58 +0000 | |
commit | ad92e664dabe64a7f625ea4f57463e6bc8935da4 (patch) | |
tree | c1f1bb29b5c2cb977df012eafc8230699388849e /mdoc_term.c | |
parent | ff49641309c9bb3053faf3bd907f83e568cceef8 (diff) | |
download | mandoc-ad92e664dabe64a7f625ea4f57463e6bc8935da4.tar.gz mandoc-ad92e664dabe64a7f625ea4f57463e6bc8935da4.tar.zst mandoc-ad92e664dabe64a7f625ea4f57463e6bc8935da4.zip |
Fully fix the `Rv' and `Ex' handlers for -T[x]html and -Tascii. This
includes an unreported bug where `Ex' wasn't properly adding a newline.
Diffstat (limited to 'mdoc_term.c')
-rw-r--r-- | mdoc_term.c | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/mdoc_term.c b/mdoc_term.c index d48e2396..f6f966a2 100644 --- a/mdoc_term.c +++ b/mdoc_term.c @@ -1,4 +1,4 @@ -/* $Id: mdoc_term.c,v 1.223 2011/04/04 16:05:36 kristaps Exp $ */ +/* $Id: mdoc_term.c,v 1.224 2011/04/04 16:15:58 kristaps Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org> @@ -1189,11 +1189,11 @@ termp_rv_pre(DECL_ARGS) term_word(p, "The"); nchild = n->nchild; - for (n = n->child; n; n = n->next) { term_fontpush(p, TERMFONT_BOLD); term_word(p, n->string); term_fontpop(p); + p->flags |= TERMP_NOSPACE; term_word(p, "()"); @@ -1229,31 +1229,34 @@ termp_rv_pre(DECL_ARGS) static int termp_ex_pre(DECL_ARGS) { - const struct mdoc_node *nn; + int nchild; + term_newln(p); term_word(p, "The"); - for (nn = n->child; nn; nn = nn->next) { + nchild = n->nchild; + for (n = n->child; n; n = n->next) { term_fontpush(p, TERMFONT_BOLD); - term_word(p, nn->string); + term_word(p, n->string); term_fontpop(p); - p->flags |= TERMP_NOSPACE; - if (nn->next && NULL == nn->next->next) - term_word(p, ", and"); - else if (nn->next) + + if (nchild > 2 && n->next) { + p->flags |= TERMP_NOSPACE; term_word(p, ","); - else - p->flags &= ~TERMP_NOSPACE; + } + + if (n->next && NULL == n->next->next) + term_word(p, "and"); } - if (n->child && n->child->next) + if (nchild > 1) term_word(p, "utilities exit"); else term_word(p, "utility exits"); term_word(p, "0 on success, and >0 if an error occurs."); - p->flags |= TERMP_SENTENCE; + p->flags |= TERMP_SENTENCE; return(0); } |