From: schwarze@mandoc.bsd.lv
To: source@mandoc.bsd.lv
Subject: docbook2mdoc: Clean up the <refnamediv> mess to get rid of the worst
Date: Fri, 12 Apr 2019 06:20:01 -0500 (EST) [thread overview]
Message-ID: <e3fdb5792c4e1a18@fantadrom.bsd.lv> (raw)
Log Message:
-----------
Clean up the <refnamediv> mess to get rid of the worst "sv" user:
Explicit loop over <refname> elements in <refnamediv>.
Treat stray <refname> elements just like <command>.
Modified Files:
--------------
docbook2mdoc:
docbook2mdoc.c
Revision Data
-------------
Index: docbook2mdoc.c
===================================================================
RCS file: /home/cvs/mdocml/docbook2mdoc/docbook2mdoc.c,v
retrieving revision 1.109
retrieving revision 1.110
diff -Ldocbook2mdoc.c -Ldocbook2mdoc.c -u -p -r1.109 -r1.110
--- docbook2mdoc.c
+++ docbook2mdoc.c
@@ -150,6 +150,27 @@ pnode_printpara(struct format *f, struct
macro_line(f, "Pp");
}
+static void
+pnode_printrefnamediv(struct format *f, struct pnode *n)
+{
+ struct pnode *nc, *nn;
+ int comma;
+
+ macro_line(f, "Sh NAME");
+ comma = 0;
+ TAILQ_FOREACH_SAFE(nc, &n->childq, child, nn) {
+ if (nc->node != NODE_REFNAME)
+ continue;
+ if (comma)
+ macro_addarg(f, ",", ARG_SPACE);
+ macro_open(f, "Nm");
+ macro_addnode(f, nc, ARG_SPACE);
+ pnode_unlink(nc);
+ comma = 1;
+ }
+ macro_close(f);
+}
+
/*
* If the SYNOPSIS macro has a superfluous title, kill it.
*/
@@ -964,13 +985,11 @@ pnode_print(struct format *f, struct pno
pnode_unlinksub(n);
break;
case NODE_REFNAME:
- /* Suppress non-text children... */
+ /* More often, these appear inside NODE_REFNAMEDIV. */
macro_open(f, "Nm");
- macro_addnode(f, n, ARG_SPACE | ARG_SINGLE);
- pnode_unlinksub(n);
break;
case NODE_REFNAMEDIV:
- macro_line(f, "Sh NAME");
+ pnode_printrefnamediv(f, n);
break;
case NODE_REFPURPOSE:
macro_open(f, "Nd");
@@ -1071,20 +1090,6 @@ pnode_print(struct format *f, struct pno
macro_close(f);
sv = f->linestate;
macro_open(f, "Qc");
- if (sv == LINE_NEW)
- macro_close(f);
- break;
- case NODE_REFNAME:
- /*
- * If we're in the NAME macro and we have multiple
- * <refname> macros in sequence, then print out a
- * trailing comma before the newline.
- */
- if (n->parent != NULL &&
- n->parent->node == NODE_REFNAMEDIV &&
- TAILQ_NEXT(n, child) != NULL &&
- TAILQ_NEXT(n, child)->node == NODE_REFNAME)
- macro_addarg(f, ",", ARG_SPACE);
if (sv == LINE_NEW)
macro_close(f);
break;
--
To unsubscribe send an email to source+unsubscribe@mandoc.bsd.lv
reply other threads:[~2019-04-12 11: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=e3fdb5792c4e1a18@fantadrom.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).