From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from localhost (fantadrom.bsd.lv [local]) by fantadrom.bsd.lv (OpenSMTPD) with ESMTPA id 8d98b746 for ; Wed, 3 Apr 2019 08:43:05 -0500 (EST) Date: Wed, 3 Apr 2019 08:43:05 -0500 (EST) X-Mailinglist: mandoc-source Reply-To: source@mandoc.bsd.lv MIME-Version: 1.0 From: schwarze@mandoc.bsd.lv To: source@mandoc.bsd.lv Subject: docbook2mdoc: Improve robustness by allowing macro_close() in any state. X-Mailer: activitymail 1.26, http://search.cpan.org/dist/activitymail/ Content-Type: text/plain; charset=utf-8 Message-ID: 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