=================================================================== RCS file: /cvs/docbook2mdoc/Attic/rules.c,v retrieving revision 1.17 retrieving revision 1.20 diff -u -p -r1.17 -r1.20 --- docbook2mdoc/Attic/rules.c 2014/04/02 12:12:41 1.17 +++ docbook2mdoc/Attic/rules.c 2014/04/30 09:43:55 1.20 @@ -240,11 +240,44 @@ isparent(enum nodeid node, enum nodeid parent) break; } return(0); + case (NODE_CONSTANT): + switch (parent) { + 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): + case (NODE_USERINPUT): + return(1); + default: + break; + } + return(0); + case (NODE_COPYRIGHT): + switch (parent) { + case (NODE_INFO): + return(1); + default: + break; + } + return(0); case (NODE_DATE): switch (parent) { case (NODE_EMPHASIS): case (NODE_ENTRY): case (NODE_FUNCSYNOPSISINFO): + case (NODE_INFO): case (NODE_LINK): case (NODE_PARA): case (NODE_PROGRAMLISTING): @@ -389,21 +422,45 @@ isparent(enum nodeid node, enum nodeid parent) break; } return(0); - case (NODE_ITEMIZEDLIST): + case (NODE_GROUP): switch (parent) { + case (NODE_ARG): + case (NODE_CMDSYNOPSIS): + case (NODE_GROUP): + return(1); + default: + break; + } + return(0); + case (NODE_HOLDER): + switch (parent) { + case (NODE_COPYRIGHT): + return(1); + default: + break; + } + return(0); + case (NODE_INFO): + switch (parent) { case (NODE_CAUTION): - case (NODE_ENTRY): + case (NODE_CMDSYNOPSIS): + case (NODE_FUNCSYNOPSIS): + case (NODE_FUNCSYNOPSISINFO): + case (NODE_INFORMALTABLE): case (NODE_ITEMIZEDLIST): - case (NODE_LISTITEM): case (NODE_NOTE): case (NODE_ORDEREDLIST): case (NODE_PARA): + case (NODE_PROGRAMLISTING): + case (NODE_REFENTRY): case (NODE_REFSECT1): case (NODE_REFSECT2): case (NODE_REFSECT3): case (NODE_REFSECTION): case (NODE_REFSYNOPSISDIV): - case (NODE_TIP): + case (NODE_SCREEN): + case (NODE_SYNOPSIS): + case (NODE_TABLE): case (NODE_VARIABLELIST): case (NODE_WARNING): return(1); @@ -411,11 +468,23 @@ isparent(enum nodeid node, enum nodeid parent) break; } return(0); - case (NODE_GROUP): + case (NODE_ITEMIZEDLIST): switch (parent) { - case (NODE_ARG): - case (NODE_CMDSYNOPSIS): - case (NODE_GROUP): + 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; @@ -429,6 +498,7 @@ isparent(enum nodeid node, enum nodeid parent) case (NODE_ARG): case (NODE_CODE): case (NODE_COMMAND): + case (NODE_CONSTANT): case (NODE_EMPHASIS): case (NODE_ENTRY): case (NODE_ENVAR): @@ -436,6 +506,7 @@ isparent(enum nodeid node, enum nodeid parent) case (NODE_FUNCDEF): case (NODE_FUNCSYNOPSISINFO): case (NODE_FUNCTION): + case (NODE_HOLDER): case (NODE_LINK): case (NODE_LITERAL): case (NODE_MANVOLNUM): @@ -454,10 +525,12 @@ isparent(enum nodeid node, enum nodeid parent) case (NODE_SCREEN): case (NODE_SYNOPSIS): case (NODE_TERM): + case (NODE_TRADEMARK): case (NODE_ULINK): case (NODE_USERINPUT): case (NODE_VARNAME): case (NODE_WORDASWORD): + case (NODE_YEAR): return(1); default: break; @@ -751,6 +824,7 @@ isparent(enum nodeid node, enum nodeid parent) case (NODE_ARG): case (NODE_CODE): case (NODE_COMMAND): + case (NODE_CONSTANT): case (NODE_EMPHASIS): case (NODE_ENTRY): case (NODE_ENVAR): @@ -759,6 +833,7 @@ isparent(enum nodeid node, enum nodeid parent) case (NODE_FUNCSYNOPSISINFO): case (NODE_FUNCTION): case (NODE_GROUP): + case (NODE_HOLDER): case (NODE_LINK): case (NODE_LITERAL): case (NODE_MANVOLNUM): @@ -780,10 +855,12 @@ isparent(enum nodeid node, enum nodeid parent) case (NODE_SYNOPSIS): case (NODE_TERM): case (NODE_TITLE): + case (NODE_TRADEMARK): case (NODE_ULINK): case (NODE_USERINPUT): case (NODE_VARNAME): case (NODE_WORDASWORD): + case (NODE_YEAR): default: return(1); } @@ -902,6 +979,8 @@ isparent(enum nodeid node, enum nodeid parent) break; } return(0); + case (NODE_INFORMALTABLE): + /* FALLTHROUGH */ case (NODE_TABLE): switch (parent) { case (NODE_CAUTION): @@ -929,11 +1008,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): @@ -975,6 +1063,30 @@ 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_USERINPUT): switch (parent) { case (NODE_EMPHASIS): @@ -1086,6 +1198,14 @@ isparent(enum nodeid node, enum nodeid parent) case (NODE_TERM): case (NODE_TITLE): case (NODE_ULINK): + return(1); + default: + break; + } + return(0); + case (NODE_YEAR): + switch (parent) { + case (NODE_COPYRIGHT): return(1); default: break;