From: schwarze@mandoc.bsd.lv
To: source@mandoc.bsd.lv
Subject: docbook2mdoc: Make macro_addnode() more flexible: Iteratively descend
Date: Wed, 3 Apr 2019 10:04:33 -0500 (EST) [thread overview]
Message-ID: <e3fd335f2427d1d8@fantadrom.bsd.lv> (raw)
Log Message:
-----------
Make macro_addnode() more flexible:
Iteratively descend singleton children to find a singleton text node.
Modified Files:
--------------
docbook2mdoc:
macro.c
Revision Data
-------------
Index: macro.c
===================================================================
RCS file: /home/cvs/mdocml/docbook2mdoc/macro.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -Lmacro.c -Lmacro.c -u -p -r1.4 -r1.5
--- macro.c
+++ macro.c
@@ -153,6 +153,7 @@ macro_argline(struct format *f, const ch
void
macro_addnode(struct format *f, struct pnode *pn, int flags)
{
+ struct pnode *nc;
int quote_now;
assert(f->linestate == LINE_MACRO);
@@ -162,10 +163,11 @@ macro_addnode(struct format *f, struct p
* that text, letting macro_addarg() decide about quoting.
*/
- if (pn->node == NODE_TEXT || pn->node == NODE_ESCAPE ||
- ((pn = TAILQ_FIRST(&pn->childq)) != NULL &&
- (pn->node == NODE_TEXT || pn->node == NODE_ESCAPE) &&
- TAILQ_NEXT(pn, child) == NULL)) {
+ while ((nc = TAILQ_FIRST(&pn->childq)) != NULL &&
+ TAILQ_NEXT(nc, child) == NULL)
+ pn = nc;
+
+ if (pn->node == NODE_TEXT || pn->node == NODE_ESCAPE) {
macro_addarg(f, pn->b, flags);
return;
}
@@ -194,9 +196,9 @@ macro_addnode(struct format *f, struct p
* inserting whitespace between nodes.
*/
- while (pn != NULL) {
- macro_addnode(f, pn, flags);
- pn = TAILQ_NEXT(pn, child);
+ while (nc != NULL) {
+ macro_addnode(f, nc, flags);
+ nc = TAILQ_NEXT(nc, child);
flags |= ARG_SPACE;
}
if (quote_now)
--
To unsubscribe send an email to source+unsubscribe@mandoc.bsd.lv
reply other threads:[~2019-04-03 15:04 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=e3fd335f2427d1d8@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).