=================================================================== RCS file: /cvs/docbook2mdoc/Attic/rules.c,v retrieving revision 1.18 retrieving revision 1.22 diff -u -p -r1.18 -r1.22 --- docbook2mdoc/Attic/rules.c 2014/04/30 09:04:40 1.18 +++ docbook2mdoc/Attic/rules.c 2014/04/30 13:18:38 1.22 @@ -215,6 +215,16 @@ isparent(enum nodeid node, enum nodeid parent) 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): @@ -267,6 +277,8 @@ isparent(enum nodeid node, enum nodeid parent) case (NODE_COPYRIGHT): switch (parent) { case (NODE_INFO): + case (NODE_REFENTRYINFO): + case (NODE_REFMETAINFO): return(1); default: break; @@ -345,6 +357,28 @@ isparent(enum nodeid node, enum nodeid parent) 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): @@ -446,6 +480,7 @@ isparent(enum nodeid node, enum nodeid parent) case (NODE_CMDSYNOPSIS): case (NODE_FUNCSYNOPSIS): case (NODE_FUNCSYNOPSISINFO): + case (NODE_INFORMALTABLE): case (NODE_ITEMIZEDLIST): case (NODE_NOTE): case (NODE_ORDEREDLIST): @@ -509,6 +544,7 @@ isparent(enum nodeid node, enum nodeid parent) case (NODE_LINK): case (NODE_LITERAL): case (NODE_MANVOLNUM): + case (NODE_MODIFIER): case (NODE_OPTION): case (NODE_PARA): case (NODE_PARAMDEF): @@ -524,6 +560,8 @@ isparent(enum nodeid node, enum nodeid parent) case (NODE_SCREEN): case (NODE_SYNOPSIS): case (NODE_TERM): + case (NODE_TRADEMARK): + case (NODE_TYPE): case (NODE_ULINK): case (NODE_USERINPUT): case (NODE_VARNAME): @@ -577,6 +615,31 @@ isparent(enum nodeid node, enum nodeid parent) 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): @@ -782,6 +845,8 @@ isparent(enum nodeid node, enum nodeid parent) } case (NODE_REFMETA): return(parent == NODE_REFENTRY); + case (NODE_REFMETAINFO): + return(parent == NODE_REFMETA); case (NODE_REFMISCINFO): return(parent == NODE_REFMETA); case (NODE_REFNAME): @@ -835,6 +900,7 @@ isparent(enum nodeid node, enum nodeid parent) case (NODE_LINK): case (NODE_LITERAL): case (NODE_MANVOLNUM): + case (NODE_MODIFIER): case (NODE_OPTION): case (NODE_PARA): case (NODE_PARAMDEF): @@ -853,6 +919,8 @@ isparent(enum nodeid node, enum nodeid parent) case (NODE_SYNOPSIS): case (NODE_TERM): case (NODE_TITLE): + case (NODE_TRADEMARK): + case (NODE_TYPE): case (NODE_ULINK): case (NODE_USERINPUT): case (NODE_VARNAME): @@ -976,6 +1044,8 @@ isparent(enum nodeid node, enum nodeid parent) break; } return(0); + case (NODE_INFORMALTABLE): + /* FALLTHROUGH */ case (NODE_TABLE): switch (parent) { case (NODE_CAUTION): @@ -1003,12 +1073,20 @@ isparent(enum nodeid node, enum nodeid parent) case (NODE_TFOOT): return(NODE_TGROUP == parent); case (NODE_TGROUP): - return(NODE_TABLE == parent); + switch (parent) { + case (NODE_INFORMALTABLE): + case (NODE_TABLE): + return(1); + default: + break; + } + return(0); case (NODE_THEAD): return(NODE_TGROUP == parent); case (NODE_TITLE): switch (parent) { case (NODE_INFO): + case (NODE_INFORMALTABLE): case (NODE_ITEMIZEDLIST): case (NODE_ORDEREDLIST): case (NODE_REFENTRYINFO): @@ -1050,6 +1128,55 @@ isparent(enum nodeid node, enum nodeid parent) break; } return(0); + case (NODE_TRADEMARK): + switch (parent) { + case (NODE_ACRONYM): + case (NODE_EMPHASIS): + case (NODE_ENTRY): + 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_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): @@ -1100,6 +1227,7 @@ isparent(enum nodeid node, enum nodeid parent) case (NODE_CODE): case (NODE_EMPHASIS): case (NODE_ENTRY): + case (NODE_FIELDSYNOPSIS): case (NODE_FUNCSYNOPSISINFO): case (NODE_LINK): case (NODE_PARA):