===================================================================
RCS file: /cvs/docbook2mdoc/Attic/rules.c,v
retrieving revision 1.7
retrieving revision 1.14
diff -u -p -r1.7 -r1.14
--- docbook2mdoc/Attic/rules.c	2014/03/30 16:57:06	1.7
+++ docbook2mdoc/Attic/rules.c	2014/04/02 10:06:14	1.14
@@ -8,12 +8,26 @@ isattrkey(enum nodeid node, enum attrkey key)
 
 	switch (key) {
 	case (ATTRKEY_CHOICE):
-		return(node == NODE_ARG);
+		switch (node) {
+		case (NODE_ARG):
+		case (NODE_GROUP):
+			return(1);
+		default:
+			break;
+		}
+		return(0);
 	case (ATTRKEY_ID):
 		/* Common to all. */
 		return(1);
 	case (ATTRKEY_REP):
-		return(node == NODE_ARG);
+		switch (node) {
+		case (NODE_ARG):
+		case (NODE_GROUP):
+			return(1);
+		default:
+			break;
+		}
+		return(0);
 	default:
 		break;
 	}
@@ -52,10 +66,54 @@ isparent(enum nodeid node, enum nodeid parent)
 	switch (node) {
 	case (NODE_ROOT):
 		return(0);
+	case (NODE_ACRONYM):
+		switch (parent) {
+		case (NODE_EMPHASIS):
+		case (NODE_ENTRY):
+		case (NODE_FUNCSYNOPSISINFO):
+		case (NODE_PARA):
+		case (NODE_PROGRAMLISTING):
+		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_APPLICATION):
+		switch (parent) {
+		case (NODE_EMPHASIS):
+		case (NODE_ENTRY):
+		case (NODE_FUNCSYNOPSISINFO):
+		case (NODE_LINK):
+		case (NODE_PARA):
+		case (NODE_PROGRAMLISTING):
+		case (NODE_REFCLASS):
+		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_ULINK):
+			return(1);
+		default:
+			break;
+		}
+		return(0);
 	case (NODE_ARG):
 		switch (parent) {
 		case (NODE_ARG):
 		case (NODE_CMDSYNOPSIS):
+		case (NODE_GROUP):
 			return(1);
 		default:
 			break;
@@ -64,6 +122,7 @@ isparent(enum nodeid node, enum nodeid parent)
 	case (NODE_CITEREFENTRY):
 		switch (parent) {
 		case (NODE_EMPHASIS):
+		case (NODE_ENTRY):
 		case (NODE_FUNCSYNOPSISINFO):
 		case (NODE_LINK):
 		case (NODE_PARA):
@@ -72,6 +131,7 @@ isparent(enum nodeid node, enum nodeid parent)
 		case (NODE_REFENTRYTITLE):
 		case (NODE_REFNAME):
 		case (NODE_REFPURPOSE):
+		case (NODE_SCREEN):
 		case (NODE_SYNOPSIS):
 		case (NODE_TERM):
 		case (NODE_TITLE):
@@ -83,8 +143,10 @@ isparent(enum nodeid node, enum nodeid parent)
 		return(0);
 	case (NODE_CMDSYNOPSIS):
 		switch (parent) {
+		case (NODE_ENTRY):
 		case (NODE_ITEMIZEDLIST):
 		case (NODE_LISTITEM):
+		case (NODE_ORDEREDLIST):
 		case (NODE_PARA):
 		case (NODE_REFSECT1):
 		case (NODE_REFSECT2):
@@ -98,6 +160,7 @@ isparent(enum nodeid node, enum nodeid parent)
 	case (NODE_CODE):
 		switch (parent) {
 		case (NODE_EMPHASIS):
+		case (NODE_ENTRY):
 		case (NODE_FUNCSYNOPSISINFO):
 		case (NODE_LINK):
 		case (NODE_PARA):
@@ -106,10 +169,12 @@ isparent(enum nodeid node, enum nodeid parent)
 		case (NODE_REFENTRYTITLE):
 		case (NODE_REFNAME):
 		case (NODE_REFPURPOSE):
+		case (NODE_SCREEN):
 		case (NODE_SYNOPSIS):
 		case (NODE_TERM):
 		case (NODE_TITLE):
 		case (NODE_ULINK):
+		case (NODE_USERINPUT):
 			return(1);
 		default:
 			break;
@@ -119,6 +184,7 @@ isparent(enum nodeid node, enum nodeid parent)
 		switch (parent) {
 		case (NODE_CMDSYNOPSIS):
 		case (NODE_EMPHASIS):
+		case (NODE_ENTRY):
 		case (NODE_FUNCSYNOPSISINFO):
 		case (NODE_LINK):
 		case (NODE_PARA):
@@ -127,10 +193,12 @@ isparent(enum nodeid node, enum nodeid parent)
 		case (NODE_REFENTRYTITLE):
 		case (NODE_REFNAME):
 		case (NODE_REFPURPOSE):
+		case (NODE_SCREEN):
 		case (NODE_SYNOPSIS):
 		case (NODE_TERM):
 		case (NODE_TITLE):
 		case (NODE_ULINK):
+		case (NODE_USERINPUT):
 			return(1);
 		default:
 			break;
@@ -139,6 +207,7 @@ isparent(enum nodeid node, enum nodeid parent)
 	case (NODE_DATE):
 		switch (parent) {
 		case (NODE_EMPHASIS):
+		case (NODE_ENTRY):
 		case (NODE_FUNCSYNOPSISINFO):
 		case (NODE_LINK):
 		case (NODE_PARA):
@@ -148,6 +217,7 @@ isparent(enum nodeid node, enum nodeid parent)
 		case (NODE_REFENTRYTITLE):
 		case (NODE_REFNAME):
 		case (NODE_REFPURPOSE):
+		case (NODE_SCREEN):
 		case (NODE_SYNOPSIS):
 		case (NODE_TITLE):
 		case (NODE_ULINK):
@@ -159,6 +229,7 @@ isparent(enum nodeid node, enum nodeid parent)
 	case (NODE_EMPHASIS):
 		switch (parent) {
 		case (NODE_EMPHASIS):
+		case (NODE_ENTRY):
 		case (NODE_FUNCSYNOPSISINFO):
 		case (NODE_LINK):
 		case (NODE_PARA):
@@ -167,6 +238,7 @@ isparent(enum nodeid node, enum nodeid parent)
 		case (NODE_REFENTRYTITLE):
 		case (NODE_REFNAME):
 		case (NODE_REFPURPOSE):
+		case (NODE_SCREEN):
 		case (NODE_SYNOPSIS):
 		case (NODE_TERM):
 		case (NODE_TITLE):
@@ -176,9 +248,35 @@ isparent(enum nodeid node, enum nodeid parent)
 			break;
 		}
 		return(0);
+	case (NODE_ENTRY):
+		return(NODE_ROW == parent);
+	case (NODE_ENVAR):
+		switch (parent) {
+		case (NODE_EMPHASIS):
+		case (NODE_ENTRY):
+		case (NODE_FUNCSYNOPSISINFO):
+		case (NODE_LINK):
+		case (NODE_PARA):
+		case (NODE_PROGRAMLISTING):
+		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_ULINK):
+		case (NODE_USERINPUT):
+			return(1);
+		default:
+			break;
+		}
+		return(0);
 	case (NODE_FILENAME):
 		switch (parent) {
 		case (NODE_EMPHASIS):
+		case (NODE_ENTRY):
 		case (NODE_FUNCSYNOPSISINFO):
 		case (NODE_LINK):
 		case (NODE_PARA):
@@ -187,10 +285,12 @@ isparent(enum nodeid node, enum nodeid parent)
 		case (NODE_REFENTRYTITLE):
 		case (NODE_REFNAME):
 		case (NODE_REFPURPOSE):
+		case (NODE_SCREEN):
 		case (NODE_SYNOPSIS):
 		case (NODE_TERM):
 		case (NODE_TITLE):
 		case (NODE_ULINK):
+		case (NODE_USERINPUT):
 			return(1);
 		default:
 			break;
@@ -202,8 +302,10 @@ isparent(enum nodeid node, enum nodeid parent)
 		return(NODE_FUNCSYNOPSIS == parent);
 	case (NODE_FUNCSYNOPSIS):
 		switch (parent) {
+		case (NODE_ENTRY):
 		case (NODE_ITEMIZEDLIST):
 		case (NODE_LISTITEM):
+		case (NODE_ORDEREDLIST):
 		case (NODE_PARA):
 		case (NODE_REFSECT1):
 		case (NODE_REFSECT2):
@@ -220,6 +322,7 @@ isparent(enum nodeid node, enum nodeid parent)
 		switch (parent) {
 		case (NODE_CODE):
 		case (NODE_EMPHASIS):
+		case (NODE_ENTRY):
 		case (NODE_FUNCDEF):
 		case (NODE_FUNCSYNOPSISINFO):
 		case (NODE_LINK):
@@ -229,6 +332,7 @@ isparent(enum nodeid node, enum nodeid parent)
 		case (NODE_REFENTRYTITLE):
 		case (NODE_REFNAME):
 		case (NODE_REFPURPOSE):
+		case (NODE_SCREEN):
 		case (NODE_SYNOPSIS):
 		case (NODE_TERM):
 		case (NODE_TITLE):
@@ -240,8 +344,10 @@ isparent(enum nodeid node, enum nodeid parent)
 		return(0);
 	case (NODE_ITEMIZEDLIST):
 		switch (parent) {
+		case (NODE_ENTRY):
 		case (NODE_ITEMIZEDLIST):
 		case (NODE_LISTITEM):
+		case (NODE_ORDEREDLIST):
 		case (NODE_REFSECT1):
 		case (NODE_REFSECT2):
 		case (NODE_REFSYNOPSISDIV):
@@ -251,13 +357,27 @@ isparent(enum nodeid node, enum nodeid parent)
 			break;
 		}
 		return(0);
+	case (NODE_GROUP):
+		switch (parent) {
+		case (NODE_ARG):
+		case (NODE_CMDSYNOPSIS):
+		case (NODE_GROUP):
+			return(1);
+		default:
+			break;
+		}
+		return(0);
 	case (NODE_LINK):
 	case (NODE_ULINK): /* Synonyms. */
 		switch (parent) {
+		case (NODE_ACRONYM):
+		case (NODE_APPLICATION):
 		case (NODE_ARG):
 		case (NODE_CODE):
 		case (NODE_COMMAND):
 		case (NODE_EMPHASIS):
+		case (NODE_ENTRY):
+		case (NODE_ENVAR):	
 		case (NODE_FILENAME):
 		case (NODE_FUNCDEF):
 		case (NODE_FUNCSYNOPSISINFO):
@@ -270,14 +390,18 @@ isparent(enum nodeid node, enum nodeid parent)
 		case (NODE_PARAMDEF):
 		case (NODE_PARAMETER):
 		case (NODE_PROGRAMLISTING):
+		case (NODE_PROMPT):
 		case (NODE_REFDESCRIPTOR):
 		case (NODE_REFENTRYTITLE):
 		case (NODE_REFMISCINFO):
 		case (NODE_REFNAME):
 		case (NODE_REPLACEABLE):
+		case (NODE_SCREEN):
 		case (NODE_SYNOPSIS):
 		case (NODE_TERM):
 		case (NODE_ULINK):
+		case (NODE_USERINPUT):
+		case (NODE_VARNAME):
 			return(1);
 		default:
 			break;
@@ -286,6 +410,7 @@ isparent(enum nodeid node, enum nodeid parent)
 	case (NODE_LISTITEM):
 		switch (parent) {
 		case (NODE_ITEMIZEDLIST):
+		case (NODE_ORDEREDLIST):
 		case (NODE_VARLISTENTRY):
 			return(1);
 		default:
@@ -295,6 +420,7 @@ isparent(enum nodeid node, enum nodeid parent)
 	case (NODE_LITERAL):
 		switch (parent) {
 		case (NODE_EMPHASIS):
+		case (NODE_ENTRY):
 		case (NODE_FUNCSYNOPSISINFO):
 		case (NODE_LINK):
 		case (NODE_PARA):
@@ -303,10 +429,12 @@ isparent(enum nodeid node, enum nodeid parent)
 		case (NODE_REFENTRYTITLE):
 		case (NODE_REFNAME):
 		case (NODE_REFPURPOSE):
+		case (NODE_SCREEN):
 		case (NODE_SYNOPSIS):
 		case (NODE_TERM):
 		case (NODE_TITLE):
 		case (NODE_ULINK):
+		case (NODE_USERINPUT):
 			return(1);
 		default:
 			break;
@@ -325,7 +453,9 @@ isparent(enum nodeid node, enum nodeid parent)
 		switch (parent) {
 		case (NODE_ARG):
 		case (NODE_EMPHASIS):
+		case (NODE_ENTRY):
 		case (NODE_FUNCSYNOPSISINFO):
+		case (NODE_GROUP):
 		case (NODE_LINK):
 		case (NODE_PARA):
 		case (NODE_PROGRAMLISTING):
@@ -333,19 +463,39 @@ isparent(enum nodeid node, enum nodeid parent)
 		case (NODE_REFENTRYTITLE):
 		case (NODE_REFNAME):
 		case (NODE_REFPURPOSE):
+		case (NODE_SCREEN):
 		case (NODE_SYNOPSIS):
 		case (NODE_TERM):
 		case (NODE_TITLE):
 		case (NODE_ULINK):
+		case (NODE_USERINPUT):
 			return(1);
 		default:
 			break;
 		}
 		return(0);
+	case (NODE_ORDEREDLIST):
+		switch (parent) {
+		case (NODE_ENTRY):
+		case (NODE_ITEMIZEDLIST):
+		case (NODE_LISTITEM):
+		case (NODE_ORDEREDLIST):
+		case (NODE_PARA):
+		case (NODE_REFSECT1):
+		case (NODE_REFSECT2):
+		case (NODE_REFSYNOPSISDIV):
+		case (NODE_VARIABLELIST):
+			return(1);
+		default:
+			break;
+		}
+		return(0);
 	case (NODE_PARA):
 		switch (parent) {
+		case (NODE_ENTRY):
 		case (NODE_ITEMIZEDLIST):
 		case (NODE_LISTITEM):
+		case (NODE_ORDEREDLIST):
 		case (NODE_REFSECT1):
 		case (NODE_REFSECT2):
 		case (NODE_REFSYNOPSISDIV):
@@ -360,6 +510,7 @@ isparent(enum nodeid node, enum nodeid parent)
 	case (NODE_PARAMETER):
 		switch (parent) {
 		case (NODE_CODE):
+		case (NODE_ENTRY):
 		case (NODE_FUNCSYNOPSISINFO):
 		case (NODE_LINK):
 		case (NODE_PARA):
@@ -369,10 +520,12 @@ isparent(enum nodeid node, enum nodeid parent)
 		case (NODE_REFENTRYTITLE):
 		case (NODE_REFNAME):
 		case (NODE_REFPURPOSE):
+		case (NODE_SCREEN):
 		case (NODE_SYNOPSIS):
 		case (NODE_TERM):
 		case (NODE_TITLE):
 		case (NODE_ULINK):
+		case (NODE_USERINPUT):
 			return(1);
 		default:
 			break;
@@ -380,17 +533,43 @@ isparent(enum nodeid node, enum nodeid parent)
 		return(0);
 	case (NODE_PROGRAMLISTING):
 		switch (parent) {
+		case (NODE_ENTRY):
 		case (NODE_ITEMIZEDLIST):
 		case (NODE_LISTITEM):
+		case (NODE_ORDEREDLIST):
 		case (NODE_PARA):
 		case (NODE_REFSECT1):
 		case (NODE_REFSECT2):
 		case (NODE_REFSYNOPSISDIV):
+		case (NODE_VARIABLELIST):
 			return(1);
 		default:
 			break;
 		}
 		return(0);
+	case (NODE_PROMPT):
+		switch (parent) {
+		case (NODE_EMPHASIS):
+		case (NODE_ENTRY):
+		case (NODE_FUNCSYNOPSISINFO):
+		case (NODE_LINK):
+		case (NODE_PARA):
+		case (NODE_PROGRAMLISTING):
+		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_ULINK):
+		case (NODE_USERINPUT):
+			return(1);
+		default:
+			break;
+		}
+		return(0);
 	case (NODE_REFCLASS):
 		return(parent == NODE_REFNAMEDIV);
 	case (NODE_REFDESCRIPTOR):
@@ -432,14 +611,19 @@ isparent(enum nodeid node, enum nodeid parent)
 		return(parent == NODE_REFENTRY);
 	case (NODE_REPLACEABLE):
 		switch (parent) {
+		case (NODE_ACRONYM):
+		case (NODE_APPLICATION):
 		case (NODE_ARG):
 		case (NODE_CODE):
 		case (NODE_COMMAND):
 		case (NODE_EMPHASIS):
+		case (NODE_ENTRY):
+		case (NODE_ENVAR):	
 		case (NODE_FILENAME):
 		case (NODE_FUNCDEF):
 		case (NODE_FUNCSYNOPSISINFO):
 		case (NODE_FUNCTION):
+		case (NODE_GROUP):
 		case (NODE_LINK):
 		case (NODE_LITERAL):
 		case (NODE_MANVOLNUM):
@@ -448,29 +632,60 @@ isparent(enum nodeid node, enum nodeid parent)
 		case (NODE_PARAMDEF):
 		case (NODE_PARAMETER):
 		case (NODE_PROGRAMLISTING):
+		case (NODE_PROMPT):
 		case (NODE_REFDESCRIPTOR):
 		case (NODE_REFENTRYTITLE):
 		case (NODE_REFMISCINFO):
 		case (NODE_REFNAME):
 		case (NODE_REFPURPOSE):
 		case (NODE_REPLACEABLE):
+		case (NODE_SCREEN):
 		case (NODE_SYNOPSIS):
 		case (NODE_TERM):
 		case (NODE_TITLE):
 		case (NODE_ULINK):
+		case (NODE_USERINPUT):
+		case (NODE_VARNAME):
 		default:
 			return(1);
 		}
 		return(0);
+	case (NODE_ROW):
+		switch (parent) {
+		case (NODE_TBODY):
+		case (NODE_TFOOT):
+		case (NODE_THEAD):
+			return(1);
+		default:
+			break;
+		}
+		return(0);
 	case (NODE_SBR):
 		switch (parent) {
 		case (NODE_ARG):
 		case (NODE_CMDSYNOPSIS):
+		case (NODE_GROUP):
 			return(1);
 		default:
 			break;
 		}
 		return(0);
+	case (NODE_SCREEN):
+		switch (parent) {
+		case (NODE_ENTRY):
+		case (NODE_ITEMIZEDLIST):
+		case (NODE_LISTITEM):
+		case (NODE_ORDEREDLIST):
+		case (NODE_PARA):
+		case (NODE_REFSECT1):
+		case (NODE_REFSECT2):
+		case (NODE_REFSYNOPSISDIV):
+		case (NODE_VARIABLELIST):
+			return(1);
+		default:
+			break;
+		}
+		return(0);
 	case (NODE_STRUCTNAME):
 		switch (parent) {
 		case (NODE_CODE):
@@ -493,8 +708,10 @@ isparent(enum nodeid node, enum nodeid parent)
 		return(0);
 	case (NODE_SYNOPSIS):
 		switch (parent) {
+		case (NODE_ENTRY):
 		case (NODE_ITEMIZEDLIST):
 		case (NODE_LISTITEM):
+		case (NODE_ORDEREDLIST):
 		case (NODE_REFSYNOPSISDIV):
 		case (NODE_REFSECT1):
 		case (NODE_REFSECT2):
@@ -503,13 +720,38 @@ isparent(enum nodeid node, enum nodeid parent)
 			break;
 		}
 		return(0);
+	case (NODE_TABLE):
+		switch (parent) {
+		case (NODE_ENTRY):
+		case (NODE_ITEMIZEDLIST):
+		case (NODE_LISTITEM):
+		case (NODE_ORDEREDLIST):
+		case (NODE_PARA):
+		case (NODE_REFSECT1):
+		case (NODE_REFSYNOPSISDIV):
+		case (NODE_VARIABLELIST):
+			return(1);
+		default:
+			break;
+		}
+		return(0);
+	case (NODE_TBODY):
+		return(NODE_TGROUP == parent);
+	case (NODE_TFOOT):
+		return(NODE_TGROUP == parent);
+	case (NODE_TGROUP):
+		return(NODE_TABLE == parent);
+	case (NODE_THEAD):
+		return(NODE_TGROUP == parent);
 	case (NODE_TITLE):
 		switch (parent) {
 		case (NODE_ITEMIZEDLIST):
+		case (NODE_ORDEREDLIST):
 		case (NODE_REFENTRYINFO):
 		case (NODE_REFSECT1):
 		case (NODE_REFSECT2):
 		case (NODE_REFSYNOPSISDIV):
+		case (NODE_TABLE):
 		case (NODE_VARIABLELIST):
 			return(1);
 		default:
@@ -520,14 +762,62 @@ isparent(enum nodeid node, enum nodeid parent)
 		return(NODE_VARLISTENTRY == parent);
 	case (NODE_TEXT):
 		return(1);
+	case (NODE_USERINPUT):
+		switch (parent) {
+		case (NODE_EMPHASIS):
+		case (NODE_ENTRY):
+		case (NODE_FUNCSYNOPSISINFO):
+		case (NODE_LINK):
+		case (NODE_PARA):
+		case (NODE_PROGRAMLISTING):
+		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_ULINK):
+		case (NODE_USERINPUT):
+			return(1);
+		default:
+			break;
+		}
+		return(0);
 	case (NODE_VARIABLELIST):
 		switch (parent) {
+		case (NODE_ENTRY):
 		case (NODE_ITEMIZEDLIST):
+		case (NODE_ORDEREDLIST):
 		case (NODE_PARA):
 		case (NODE_REFSECT1):
 		case (NODE_REFSECT2):
 		case (NODE_REFSYNOPSISDIV):
 		case (NODE_VARIABLELIST):
+			return(1);
+		default:
+			break;
+		}
+		return(0);
+	case (NODE_VARNAME):
+		switch (parent) {
+		case (NODE_CODE):
+		case (NODE_EMPHASIS):
+		case (NODE_ENTRY):
+		case (NODE_FUNCSYNOPSISINFO):
+		case (NODE_LINK):
+		case (NODE_PARA):
+		case (NODE_PROGRAMLISTING):
+		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_ULINK):
 			return(1);
 		default:
 			break;