From: schwarze@mandoc.bsd.lv
To: source@mandoc.bsd.lv
Subject: docbook2mdoc: Improve robustness by allowing macro_close() in any state.
Date: Wed, 3 Apr 2019 08:43:05 -0500 (EST) [thread overview]
Message-ID: <e3fd32629ceb00b3@fantadrom.bsd.lv> (raw)
Log Message:
-----------
Improve robustness by allowing macro_close() in any state.
This is relevant because pnode_print() may change state.
Modified Files:
--------------
docbook2mdoc:
docbook2mdoc.c
macro.c
Revision Data
-------------
Index: docbook2mdoc.c
===================================================================
RCS file: /home/cvs/mdocml/docbook2mdoc/docbook2mdoc.c,v
retrieving revision 1.83
retrieving revision 1.84
diff -Ldocbook2mdoc.c -Ldocbook2mdoc.c -u -p -r1.83 -r1.84
--- docbook2mdoc.c
+++ docbook2mdoc.c
@@ -565,8 +565,7 @@ pnode_printtgroup2(struct format *f, str
break;
macro_open(f, "It");
pnode_print(f, ne);
- if (f->linestate == LINE_MACRO)
- macro_close(f);
+ macro_close(f);
pnode_unlink(ne);
pnode_print(f, nr);
pnode_unlink(nr);
Index: macro.c
===================================================================
RCS file: /home/cvs/mdocml/docbook2mdoc/macro.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -Lmacro.c -Lmacro.c -u -p -r1.3 -r1.4
--- macro.c
+++ macro.c
@@ -47,7 +47,8 @@ macro_open(struct format *f, const char
void
macro_close(struct format *f)
{
- assert(f->linestate == LINE_MACRO);
+ if (f->linestate == LINE_NEW)
+ return;
putchar('\n');
f->linestate = LINE_NEW;
}
--
To unsubscribe send an email to source+unsubscribe@mandoc.bsd.lv
reply other threads:[~2019-04-03 13:43 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=e3fd32629ceb00b3@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).