diff options
| author |   Ingo Schwarze <schwarze@openbsd.org> | 2019-06-27 12:20:18 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@openbsd.org> | 2019-06-27 12:20:18 +0000 |
| commit | b6723d5f5a8ba2f1931221d8b92823fd4654722f (patch) | |
| tree | 5b76c593392113d5b6d4a9008dcf0b6559f4d41f /mdoc_term.c | |
| parent | 304ecda43472e85a726c792ca5c88b3f2655a892 (diff) | |
| download | mandoc-b6723d5f5a8ba2f1931221d8b92823fd4654722f.tar.gz mandoc-b6723d5f5a8ba2f1931221d8b92823fd4654722f.tar.zst mandoc-b6723d5f5a8ba2f1931221d8b92823fd4654722f.zip | |
Improve "man -h" output.
1. For pages lacking a SYNOPSIS, show the NAME section rather than nothing.
2. Do not print a stray blank before the beginning of a SYNOPSIS.
Both issues reported by, and patch OK'ed by, tb@.
Diffstat (limited to 'mdoc_term.c')
| -rw-r--r-- | mdoc_term.c | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/mdoc_term.c b/mdoc_term.c index c2f265c4..18f0ff09 100644 --- a/mdoc_term.c +++ b/mdoc_term.c @@ -1,4 +1,4 @@ -/* $Id: mdoc_term.c,v 1.373 2019/06/03 19:50:33 schwarze Exp $ */ +/* $Id: mdoc_term.c,v 1.374 2019/06/27 12:20:18 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2010, 2012-2019 Ingo Schwarze <schwarze@openbsd.org> @@ -253,7 +253,7 @@ static int fn_prio; void terminal_mdoc(void *arg, const struct roff_meta *mdoc) { - struct roff_node *n; + struct roff_node *n, *nn; struct termp *p; size_t save_defindent; @@ -265,16 +265,20 @@ terminal_mdoc(void *arg, const struct roff_meta *mdoc) n = mdoc->first->child; if (p->synopsisonly) { - while (n != NULL) { - if (n->tok == MDOC_Sh && n->sec == SEC_SYNOPSIS) { - if (n->child->next->child != NULL) - print_mdoc_nodelist(p, NULL, - mdoc, n->child->next->child); - term_newln(p); + for (nn = NULL; n != NULL; n = n->next) { + if (n->tok != MDOC_Sh) + continue; + if (n->sec == SEC_SYNOPSIS) break; - } - n = n->next; + if (nn == NULL && n->sec == SEC_NAME) + nn = n; } + if (n == NULL) + n = nn; + p->flags |= TERMP_NOSPACE; + if (n != NULL && (n = n->child->next->child) != NULL) + print_mdoc_nodelist(p, NULL, mdoc, n); + term_newln(p); } else { save_defindent = p->defindent; if (p->defindent == 0) |