From: schwarze@mandoc.bsd.lv
To: source@mandoc.bsd.lv
Subject: mandoc: Improve "man -h" output.
Date: Thu, 27 Jun 2019 07:20:48 -0500 (EST) [thread overview]
Message-ID: <8629afbd9dc2f78d@mandoc.bsd.lv> (raw)
Log Message:
-----------
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@.
Modified Files:
--------------
mandoc:
man_term.c
mdoc_term.c
Revision Data
-------------
Index: man_term.c
===================================================================
RCS file: /home/cvs/mandoc/mandoc/man_term.c,v
retrieving revision 1.228
retrieving revision 1.229
diff -Lman_term.c -Lman_term.c -u -p -r1.228 -r1.229
--- man_term.c
+++ man_term.c
@@ -146,7 +146,7 @@ terminal_man(void *arg, const struct rof
{
struct mtermp mt;
struct termp *p;
- struct roff_node *n;
+ struct roff_node *n, *nc, *nn;
size_t save_defindent;
p = (struct termp *)arg;
@@ -165,18 +165,23 @@ terminal_man(void *arg, const struct rof
n = man->first->child;
if (p->synopsisonly) {
- while (n != NULL) {
- if (n->tok == MAN_SH &&
- n->child->child->type == ROFFT_TEXT &&
- !strcmp(n->child->child->string, "SYNOPSIS")) {
- if (n->child->next->child != NULL)
- print_man_nodelist(p, &mt,
- n->child->next->child, man);
- term_newln(p);
+ for (nn = NULL; n != NULL; n = n->next) {
+ if (n->tok != MAN_SH)
+ continue;
+ nc = n->child->child;
+ if (nc->type != ROFFT_TEXT)
+ continue;
+ if (strcmp(nc->string, "SYNOPSIS") == 0)
break;
- }
- n = n->next;
+ if (nn == NULL && strcmp(nc->string, "NAME") == 0)
+ nn = n;
}
+ if (n == NULL)
+ n = nn;
+ p->flags |= TERMP_NOSPACE;
+ if (n != NULL && (n = n->child->next->child) != NULL)
+ print_man_nodelist(p, &mt, n, man);
+ term_newln(p);
} else {
term_begin(p, print_man_head, print_man_foot, man);
p->flags |= TERMP_NOSPACE;
Index: mdoc_term.c
===================================================================
RCS file: /home/cvs/mandoc/mandoc/mdoc_term.c,v
retrieving revision 1.373
retrieving revision 1.374
diff -Lmdoc_term.c -Lmdoc_term.c -u -p -r1.373 -r1.374
--- mdoc_term.c
+++ mdoc_term.c
@@ -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 ro
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)
--
To unsubscribe send an email to source+unsubscribe@mandoc.bsd.lv
reply other threads:[~2019-06-27 12:20 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8629afbd9dc2f78d@mandoc.bsd.lv \
--to=schwarze@mandoc.bsd.lv \
--cc=source@mandoc.bsd.lv \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).