From: schwarze@mandoc.bsd.lv
To: source@mandoc.bsd.lv
Subject: docbook2mdoc: handle <appendix>, <article>, <book>, and <legalnotice>
Date: Sun, 7 Apr 2019 14:33:58 -0500 (EST) [thread overview]
Message-ID: <e3fd73bd2fb8fb4d@fantadrom.bsd.lv> (raw)
Log Message:
-----------
handle <appendix>, <article>, <book>, and <legalnotice> similar to <section>
Modified Files:
--------------
docbook2mdoc:
docbook2mdoc.c
node.h
parse.c
statistics.c
Revision Data
-------------
Index: node.h
===================================================================
RCS file: /home/cvs/mdocml/docbook2mdoc/node.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -Lnode.h -Lnode.h -u -p -r1.11 -r1.12
--- node.h
+++ node.h
@@ -31,12 +31,12 @@ enum nodeid {
NODE_IGNORE,
/* Alpha-ordered hereafter. */
NODE_AFFILIATION,
+ NODE_APPENDIX,
NODE_APPLICATION,
NODE_ARG,
NODE_AUTHOR,
NODE_AUTHORGROUP,
NODE_BLOCKQUOTE,
- NODE_BOOK,
NODE_BOOKINFO,
NODE_CAUTION,
NODE_CITEREFENTRY,
Index: parse.c
===================================================================
RCS file: /home/cvs/mdocml/docbook2mdoc/parse.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -Lparse.c -Lparse.c -u -p -r1.21 -r1.22
--- parse.c
+++ parse.c
@@ -66,12 +66,14 @@ static const struct element elements[] =
{ "acronym", NODE_IGNORE },
{ "affiliation", NODE_AFFILIATION },
{ "anchor", NODE_DELETE },
+ { "appendix", NODE_APPENDIX },
{ "application", NODE_APPLICATION },
{ "arg", NODE_ARG },
+ { "article", NODE_SECTION },
{ "author", NODE_AUTHOR },
{ "authorgroup", NODE_AUTHORGROUP },
{ "blockquote", NODE_BLOCKQUOTE },
- { "book", NODE_BOOK },
+ { "book", NODE_SECTION },
{ "bookinfo", NODE_BOOKINFO },
{ "caution", NODE_CAUTION },
{ "chapter", NODE_SECTION },
@@ -468,6 +470,7 @@ xml_elem_start(struct parse *ps, const c
*/
switch (dat->node = elem->node) {
+ case NODE_APPENDIX:
case NODE_AUTHORGROUP:
case NODE_BLOCKQUOTE:
case NODE_BOOKINFO:
Index: docbook2mdoc.c
===================================================================
RCS file: /home/cvs/mdocml/docbook2mdoc/docbook2mdoc.c,v
retrieving revision 1.99
retrieving revision 1.100
diff -Ldocbook2mdoc.c -Ldocbook2mdoc.c -u -p -r1.99 -r1.100
--- docbook2mdoc.c
+++ docbook2mdoc.c
@@ -115,6 +115,8 @@ pnode_printpara(struct format *p, struct
case NODE_LISTITEM:
case NODE_TERM:
return;
+ case NODE_APPENDIX:
+ case NODE_LEGALNOTICE:
case NODE_PREFACE:
case NODE_SECTION:
if (p->level < 3)
@@ -180,6 +182,12 @@ pnode_printrefsect(struct format *p, str
case NODE_PREFACE:
title = "Preface";
break;
+ case NODE_APPENDIX:
+ title = "Appendix";
+ break;
+ case NODE_LEGALNOTICE:
+ title = "Legal Notice";
+ break;
case NODE_CAUTION:
title = "Caution";
break;
@@ -217,7 +225,7 @@ pnode_printrefsect(struct format *p, str
macro_addnode(p, pp, flags);
pnode_unlink(pp);
} else
- macro_addarg(p, title, ARG_SPACE | ARG_QUOTED);
+ macro_addarg(p, title, flags | ARG_QUOTED);
macro_close(p);
}
@@ -832,9 +840,6 @@ pnode_print(struct format *p, struct pno
case NODE_KEYSYM:
macro_open(p, "Sy");
break;
- case NODE_LEGALNOTICE:
- macro_line(p, "Sh LEGAL NOTICE");
- break;
case NODE_LINK:
pnode_printlink(p, pn);
break;
@@ -905,6 +910,8 @@ pnode_print(struct format *p, struct pno
break;
case NODE_PREFACE:
case NODE_SECTION:
+ case NODE_APPENDIX:
+ case NODE_LEGALNOTICE:
case NODE_NOTE:
case NODE_TIP:
case NODE_CAUTION:
@@ -1041,6 +1048,8 @@ pnode_print(struct format *p, struct pno
break;
case NODE_PREFACE:
case NODE_SECTION:
+ case NODE_APPENDIX:
+ case NODE_LEGALNOTICE:
case NODE_NOTE:
case NODE_TIP:
case NODE_CAUTION:
Index: statistics.c
===================================================================
RCS file: /home/cvs/mdocml/docbook2mdoc/statistics.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -Lstatistics.c -Lstatistics.c -u -p -r1.17 -r1.18
--- statistics.c
+++ statistics.c
@@ -350,7 +350,10 @@ main(int argc, char *argv[])
if (show_all == 0) {
table_add("ROOT", "refentry");
table_add("acronym", "TEXT");
+ table_add("appendix", NULL);
+ table_add("article", NULL);
table_add("blockquote", NULL);
+ table_add("book", NULL);
table_add("chapter", NULL);
table_add("code", "TEXT");
table_add("constant", "TEXT");
@@ -379,11 +382,13 @@ main(int argc, char *argv[])
table_add("indexterm", "secondary");
table_add("informaltable", "tgroup");
table_add("itemizedlist", "listitem");
+ table_add("legalnotice", NULL);
table_add("link", NULL);
table_add("listitem", NULL);
table_add("literal", "TEXT");
table_add("literallayout", NULL);
table_add("member", "TEXT");
+ table_add("note", NULL);
table_add("orderedlist", "listitem");
table_add("para", NULL);
table_add("paramdef", "parameter");
--
To unsubscribe send an email to source+unsubscribe@mandoc.bsd.lv
reply other threads:[~2019-04-07 19:33 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=e3fd73bd2fb8fb4d@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).