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 61c4dcc7 for ; Sun, 7 Apr 2019 13:52:23 -0500 (EST) Date: Sun, 7 Apr 2019 13:52:23 -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: handle glossaries just like variablelists X-Mailer: activitymail 1.26, http://search.cpan.org/dist/activitymail/ Content-Type: text/plain; charset=utf-8 Message-ID: Log Message: ----------- handle glossaries just like variablelists Modified Files: -------------- docbook2mdoc: docbook2mdoc.c parse.c statistics.c Revision Data ------------- Index: statistics.c =================================================================== RCS file: /home/cvs/mdocml/docbook2mdoc/statistics.c,v retrieving revision 1.16 retrieving revision 1.17 diff -Lstatistics.c -Lstatistics.c -u -p -r1.16 -r1.17 --- statistics.c +++ statistics.c @@ -366,6 +366,15 @@ main(int argc, char *argv[]) table_add("funcsynopsis", "funcsynopsisinfo"); table_add("funcsynopsisinfo", "TEXT"); table_add("function", "TEXT"); + table_add("glossary", "glossdiv"); + table_add("glossary", "glossentry"); + table_add("glossdef", "para"); + table_add("glossdiv", "glossentry"); + table_add("glossentry", "glossdef"); + table_add("glossentry", "glossterm"); + table_add("glossentry", "indexterm"); + table_add("glosslist", "glossentry"); + table_add("glossterm", "TEXT"); table_add("indexterm", "primary"); table_add("indexterm", "secondary"); table_add("informaltable", "tgroup"); Index: docbook2mdoc.c =================================================================== RCS file: /home/cvs/mdocml/docbook2mdoc/docbook2mdoc.c,v retrieving revision 1.98 retrieving revision 1.99 diff -Ldocbook2mdoc.c -Ldocbook2mdoc.c -u -p -r1.98 -r1.99 --- docbook2mdoc.c +++ docbook2mdoc.c @@ -111,7 +111,9 @@ pnode_printpara(struct format *p, struct switch (pp->node) { case NODE_ENTRY: + case NODE_GLOSSTERM: case NODE_LISTITEM: + case NODE_TERM: return; case NODE_PREFACE: case NODE_SECTION: @@ -597,7 +599,7 @@ pnode_printvarlistentry(struct format *p macro_close(p); macro_open(p, "It"); TAILQ_FOREACH(pp, &pn->childq, child) { - if (pp->node != NODE_TERM) + if (pp->node != NODE_TERM && pp->node != NODE_GLOSSTERM) continue; if ( ! first) macro_addarg(p, ",", 0); @@ -606,7 +608,7 @@ pnode_printvarlistentry(struct format *p } macro_close(p); TAILQ_FOREACH(pp, &pn->childq, child) - if (pp->node != NODE_TERM) + if (pp->node != NODE_TERM && pp->node != NODE_GLOSSTERM) pnode_print(p, pp); pnode_unlinksub(pn); } @@ -792,6 +794,7 @@ pnode_print(struct format *p, struct pno break; case NODE_EMPHASIS: case NODE_FIRSTTERM: + case NODE_GLOSSTERM: macro_open(p, "Em"); break; case NODE_ENVAR: Index: parse.c =================================================================== RCS file: /home/cvs/mdocml/docbook2mdoc/parse.c,v retrieving revision 1.20 retrieving revision 1.21 diff -Lparse.c -Lparse.c -u -p -r1.20 -r1.21 --- parse.c +++ parse.c @@ -101,6 +101,11 @@ static const struct element elements[] = { "funcsynopsis", NODE_FUNCSYNOPSIS }, { "funcsynopsisinfo", NODE_FUNCSYNOPSISINFO }, { "function", NODE_FUNCTION }, + { "glossary", NODE_VARIABLELIST }, + { "glossdef", NODE_IGNORE }, + { "glossdiv", NODE_IGNORE }, + { "glossentry", NODE_VARLISTENTRY }, + { "glosslist", NODE_VARIABLELIST }, { "glossterm", NODE_GLOSSTERM }, { "group", NODE_GROUP }, { "holder", NODE_HOLDER }, -- To unsubscribe send an email to source+unsubscribe@mandoc.bsd.lv