From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from krisdoz.my.domain (kristaps@localhost [127.0.0.1]) by krisdoz.my.domain (8.14.5/8.14.5) with ESMTP id s3UDIcxT025965 for ; Wed, 30 Apr 2014 09:18:38 -0400 (EDT) Received: (from kristaps@localhost) by krisdoz.my.domain (8.14.5/8.14.3/Submit) id s3UDIcZE006029; Wed, 30 Apr 2014 09:18:38 -0400 (EDT) Date: Wed, 30 Apr 2014 09:18:38 -0400 (EDT) Message-Id: <201404301318.s3UDIcZE006029@krisdoz.my.domain> X-Mailinglist: mdocml-source Reply-To: source@mdocml.bsd.lv MIME-Version: 1.0 From: kristaps@mdocml.bsd.lv To: source@mdocml.bsd.lv Subject: docbook2mdoc: Add type, modifier, and fieldsynopsis. X-Mailer: activitymail 1.26, http://search.cpan.org/dist/activitymail/ Content-Type: text/plain; charset=utf-8 Log Message: ----------- Add type, modifier, and fieldsynopsis. Modified Files: -------------- docbook2mdoc: docbook2mdoc.c rules.c extern.h Revision Data ------------- Index: extern.h =================================================================== RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/docbook2mdoc/extern.h,v retrieving revision 1.21 retrieving revision 1.22 diff -Lextern.h -Lextern.h -u -p -r1.21 -r1.22 --- extern.h +++ extern.h @@ -15,6 +15,7 @@ enum nodeid { NODE_CITEREFENTRY, NODE_CMDSYNOPSIS, NODE_CODE, + NODE_COLSPEC, NODE_COMMAND, NODE_CONSTANT, NODE_COPYRIGHT, @@ -22,6 +23,7 @@ enum nodeid { NODE_EMPHASIS, NODE_ENTRY, NODE_ENVAR, + NODE_FIELDSYNOPSIS, NODE_FILENAME, NODE_FUNCDEF, NODE_FUNCPROTOTYPE, @@ -37,6 +39,7 @@ enum nodeid { NODE_LISTITEM, NODE_LITERAL, NODE_MANVOLNUM, + NODE_MODIFIER, NODE_NOTE, NODE_OPTION, NODE_ORDEREDLIST, @@ -79,6 +82,7 @@ enum nodeid { NODE_TIP, NODE_TITLE, NODE_TRADEMARK, + NODE_TYPE, NODE_ULINK, NODE_USERINPUT, NODE_VARIABLELIST, Index: docbook2mdoc.c =================================================================== RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/docbook2mdoc/docbook2mdoc.c,v retrieving revision 1.38 retrieving revision 1.39 diff -Ldocbook2mdoc.c -Ldocbook2mdoc.c -u -p -r1.38 -r1.39 --- docbook2mdoc.c +++ docbook2mdoc.c @@ -96,6 +96,7 @@ static const struct node nodes[NODE__MAX { "citerefentry", NODE_IGNTEXT }, { "cmdsynopsis", NODE_IGNTEXT }, { "code", 0 }, + { "colspec", NODE_IGNTEXT }, { "command", 0 }, { "constant", 0 }, { "copyright", NODE_IGNTEXT }, @@ -103,6 +104,7 @@ static const struct node nodes[NODE__MAX { "emphasis", 0 }, { "entry", 0 }, { "envar", 0 }, + { "fieldsynopsis", NODE_IGNTEXT }, { "filename", 0 }, { "funcdef", 0 }, { "funcprototype", NODE_IGNTEXT }, @@ -118,6 +120,7 @@ static const struct node nodes[NODE__MAX { "listitem", NODE_IGNTEXT }, { "literal", 0 }, { "manvolnum", 0 }, + { "modifier", 0 }, { "note", NODE_IGNTEXT }, { "option", 0 }, { "orderedlist", NODE_IGNTEXT }, @@ -160,6 +163,7 @@ static const struct node nodes[NODE__MAX { "tip", NODE_IGNTEXT }, { "title", 0 }, { "trademark", 0 }, + { "type", 0 }, { "ulink", 0 }, { "userinput", 0 }, { "variablelist", NODE_IGNTEXT }, @@ -1338,6 +1342,10 @@ pnode_print(struct parse *p, struct pnod } p->newln = 0; break; + case (NODE_TYPE): + pnode_printmopen(p); + fputs("Vt", stdout); + break; case (NODE_USERINPUT): pnode_printmopen(p); fputs("Li", stdout); @@ -1382,6 +1390,7 @@ pnode_print(struct parse *p, struct pnod case (NODE_SGMLTAG): case (NODE_STRUCTNAME): case (NODE_TEXT): + case (NODE_TYPE): case (NODE_USERINPUT): case (NODE_VARNAME): pnode_printmclosepunct(p, pn, sv); Index: rules.c =================================================================== RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/docbook2mdoc/rules.c,v retrieving revision 1.21 retrieving revision 1.22 diff -Lrules.c -Lrules.c -u -p -r1.21 -r1.22 --- rules.c +++ rules.c @@ -215,6 +215,16 @@ isparent(enum nodeid node, enum nodeid p break; } return(0); + case (NODE_COLSPEC): + switch (parent) { + case (NODE_TFOOT): + case (NODE_THEAD): + case (NODE_TGROUP): + return(1); + default: + break; + } + return(0); case (NODE_COMMAND): switch (parent) { case (NODE_CMDSYNOPSIS): @@ -347,6 +357,28 @@ isparent(enum nodeid node, enum nodeid p break; } return(0); + case (NODE_FIELDSYNOPSIS): + switch (parent) { + case (NODE_CAUTION): + case (NODE_ENTRY): + case (NODE_ITEMIZEDLIST): + case (NODE_LISTITEM): + case (NODE_NOTE): + case (NODE_ORDEREDLIST): + case (NODE_PARA): + case (NODE_REFSECT1): + case (NODE_REFSECT2): + case (NODE_REFSECT3): + case (NODE_REFSECTION): + case (NODE_REFSYNOPSISDIV): + case (NODE_TIP): + case (NODE_VARIABLELIST): + case (NODE_WARNING): + return(1); + default: + break; + } + return(0); case (NODE_FILENAME): switch (parent) { case (NODE_EMPHASIS): @@ -512,6 +544,7 @@ isparent(enum nodeid node, enum nodeid p case (NODE_LINK): case (NODE_LITERAL): case (NODE_MANVOLNUM): + case (NODE_MODIFIER): case (NODE_OPTION): case (NODE_PARA): case (NODE_PARAMDEF): @@ -528,6 +561,7 @@ isparent(enum nodeid node, enum nodeid p case (NODE_SYNOPSIS): case (NODE_TERM): case (NODE_TRADEMARK): + case (NODE_TYPE): case (NODE_ULINK): case (NODE_USERINPUT): case (NODE_VARNAME): @@ -581,6 +615,31 @@ isparent(enum nodeid node, enum nodeid p break; } return(0); + case (NODE_MODIFIER): + switch (parent) { + case (NODE_CODE): + case (NODE_EMPHASIS): + case (NODE_ENTRY): + case (NODE_FIELDSYNOPSIS): + case (NODE_FUNCSYNOPSISINFO): + case (NODE_LINK): + case (NODE_ULINK): + case (NODE_PARA): + case (NODE_PROGRAMLISTING): + case (NODE_QUOTE): + case (NODE_REFDESCRIPTOR): + case (NODE_REFENTRYTITLE): + case (NODE_REFNAME): + case (NODE_REFPURPOSE): + case (NODE_SCREEN): + case (NODE_SYNOPSIS): + case (NODE_TERM): + case (NODE_TITLE): + return(1); + default: + break; + } + return(0); case (NODE_NOTE): switch (parent) { case (NODE_CAUTION): @@ -841,6 +900,7 @@ isparent(enum nodeid node, enum nodeid p case (NODE_LINK): case (NODE_LITERAL): case (NODE_MANVOLNUM): + case (NODE_MODIFIER): case (NODE_OPTION): case (NODE_PARA): case (NODE_PARAMDEF): @@ -860,6 +920,7 @@ isparent(enum nodeid node, enum nodeid p case (NODE_TERM): case (NODE_TITLE): case (NODE_TRADEMARK): + case (NODE_TYPE): case (NODE_ULINK): case (NODE_USERINPUT): case (NODE_VARNAME): @@ -1091,6 +1152,31 @@ isparent(enum nodeid node, enum nodeid p break; } return(0); + case (NODE_TYPE): + switch (parent) { + case (NODE_CODE): + case (NODE_EMPHASIS): + case (NODE_ENTRY): + case (NODE_FIELDSYNOPSIS): + case (NODE_FUNCSYNOPSISINFO): + case (NODE_LINK): + case (NODE_ULINK): + case (NODE_PARA): + case (NODE_PROGRAMLISTING): + case (NODE_QUOTE): + case (NODE_REFDESCRIPTOR): + case (NODE_REFENTRYTITLE): + case (NODE_REFNAME): + case (NODE_REFPURPOSE): + case (NODE_SCREEN): + case (NODE_SYNOPSIS): + case (NODE_TERM): + case (NODE_TITLE): + return(1); + default: + break; + } + return(0); case (NODE_USERINPUT): switch (parent) { case (NODE_EMPHASIS): @@ -1141,6 +1227,7 @@ isparent(enum nodeid node, enum nodeid p case (NODE_CODE): case (NODE_EMPHASIS): case (NODE_ENTRY): + case (NODE_FIELDSYNOPSIS): case (NODE_FUNCSYNOPSISINFO): case (NODE_LINK): case (NODE_PARA): -- To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv