* docbook2mdoc: Make macro_addnode() more flexible: Iteratively descend
@ 2019-04-03 15:04 schwarze
0 siblings, 0 replies; only message in thread
From: schwarze @ 2019-04-03 15:04 UTC (permalink / raw)
To: source
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
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2019-04-03 15:04 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-04-03 15:04 docbook2mdoc: Make macro_addnode() more flexible: Iteratively descend schwarze
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).