From: schwarze@mandoc.bsd.lv
To: source@mandoc.bsd.lv
Subject: docbook2mdoc: Fix an assertion failure when content inside a term causes
Date: Fri, 12 Apr 2019 04:39:51 -0500 (EST) [thread overview]
Message-ID: <e3fdb40bd2144e98@fantadrom.bsd.lv> (raw)
Log Message:
-----------
Fix an assertion failure when content inside a term causes an output
line break. The solution isn't perfect: content from the <term>
still leaks into the .It body, but fixing *that* is a much more
complex task than merely fixing the assertion.
Modified Files:
--------------
docbook2mdoc:
docbook2mdoc.c
Revision Data
-------------
Index: docbook2mdoc.c
===================================================================
RCS file: /home/cvs/mdocml/docbook2mdoc/docbook2mdoc.c,v
retrieving revision 1.107
retrieving revision 1.108
diff -Ldocbook2mdoc.c -Ldocbook2mdoc.c -u -p -r1.107 -r1.108
--- docbook2mdoc.c
+++ docbook2mdoc.c
@@ -641,25 +641,36 @@ pnode_printprologue(struct format *f, st
static void
pnode_printvarlistentry(struct format *f, struct pnode *n)
{
- struct pnode *nc;
+ struct pnode *nc, *nn;
int first = 1;
- macro_close(f);
macro_open(f, "It");
f->flags |= FMT_IMPL;
- TAILQ_FOREACH(nc, &n->childq, child) {
+ TAILQ_FOREACH_SAFE(nc, &n->childq, child, nn) {
if (nc->node != NODE_TERM && nc->node != NODE_GLOSSTERM)
continue;
- if ( ! first)
- macro_addarg(f, ",", 0);
+ if (first == 0) {
+ switch (f->linestate) {
+ case LINE_NEW:
+ break;
+ case LINE_TEXT:
+ print_text(f, ",", 0);
+ break;
+ case LINE_MACRO:
+ macro_addarg(f, ",", 0);
+ break;
+ }
+ }
pnode_print(f, nc);
+ pnode_unlink(nc);
first = 0;
}
macro_close(f);
- TAILQ_FOREACH(nc, &n->childq, child)
- if (nc->node != NODE_TERM && nc->node != NODE_GLOSSTERM)
- pnode_print(f, nc);
- pnode_unlinksub(n);
+ while ((nc = TAILQ_FIRST(&n->childq)) != NULL) {
+ pnode_print(f, nc);
+ pnode_unlink(nc);
+ }
+ macro_close(f);
}
static void
--
To unsubscribe send an email to source+unsubscribe@mandoc.bsd.lv
reply other threads:[~2019-04-12 9:39 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=e3fdb40bd2144e98@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).