diff options
| author |   Kristaps Dzonsons <kristaps@bsd.lv> | 2011-04-04 16:05:36 +0000 |
|---|---|---|
| committer | Kristaps Dzonsons <kristaps@bsd.lv> | 2011-04-04 16:05:36 +0000 |
| commit | ff49641309c9bb3053faf3bd907f83e568cceef8 (patch) | |
| tree | 53249dc65654a396c23f5a829511f02cb275d4c0 /mdoc_term.c | |
| parent | 279e3bd082808b213b41302831a195b058be9883 (diff) | |
| download | mandoc-ff49641309c9bb3053faf3bd907f83e568cceef8.tar.gz mandoc-ff49641309c9bb3053faf3bd907f83e568cceef8.tar.zst mandoc-ff49641309c9bb3053faf3bd907f83e568cceef8.zip | |
Clean up -Tascii in the same way as -T[x]html regarding `Rv' arguments.
Diffstat (limited to 'mdoc_term.c')
| -rw-r--r-- | mdoc_term.c | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/mdoc_term.c b/mdoc_term.c index 3ade072b..d48e2396 100644 --- a/mdoc_term.c +++ b/mdoc_term.c @@ -1,4 +1,4 @@ -/* $Id: mdoc_term.c,v 1.222 2011/03/22 14:05:45 kristaps Exp $ */ +/* $Id: mdoc_term.c,v 1.223 2011/04/04 16:05:36 kristaps Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org> @@ -1183,25 +1183,30 @@ termp_rs_pre(DECL_ARGS) static int termp_rv_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) - term_word(p, "(),"); - else - term_word(p, "()"); + term_word(p, "()"); + + if (nchild > 2 && n->next) { + p->flags |= TERMP_NOSPACE; + term_word(p, ","); + } + + if (n->next && NULL == n->next->next) + term_word(p, "and"); } - if (n->child && n->child->next) + if (nchild > 1) term_word(p, "functions return"); else term_word(p, "function returns"); |