=================================================================== RCS file: /cvs/docbook2mdoc/Attic/rules.c,v retrieving revision 1.18 retrieving revision 1.20 diff -u -p -r1.18 -r1.20 --- docbook2mdoc/Attic/rules.c 2014/04/30 09:04:40 1.18 +++ docbook2mdoc/Attic/rules.c 2014/04/30 09:43:55 1.20 @@ -446,6 +446,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): @@ -524,6 +525,7 @@ 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): @@ -853,6 +855,7 @@ 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): @@ -976,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): @@ -1003,12 +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): @@ -1045,6 +1058,30 @@ isparent(enum nodeid node, enum nodeid parent) case (NODE_TIP): case (NODE_VARIABLELIST): case (NODE_WARNING): + return(1); + default: + 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;