Release-1.3.3

1 files changed, 352 insertions, 2 deletions

diff --git a/src/compound_xsd.h b/src/compound_xsd.h
index f914e0e..ca866bb 100644
--- a/src/compound_xsd.h
+++ b/src/compound_xsd.h
@@ -120,9 +120,11 @@
 "    <xsd:attribute name=\"mutable\" type=\"DoxBool\" />\n"
 "  </xsd:complexType>\n"
 "\n"
-"  <xsd:complexType name=\"descriptionType\" mixed=\"true\">\n"
+"  <xsd:complexType name=\"descriptionType\">\n"
 "    <xsd:sequence>\n"
-"      <xsd:any processContents=\"lax\" minOccurs=\"0\" maxOccurs=\"unbounded\"/>\n"
+"      <xsd:element name=\"para\" type=\"docParaType\" minOccurs=\"0\" maxOccurs=\"unbounded\" />\n"
+"      <xsd:element name=\"sect1\" type=\"docSect1Type\" minOccurs=\"0\" maxOccurs=\"unbounded\" />\n"
+"      <xsd:element name=\"internal\" type=\"docInternalType\" minOccurs=\"0\" />\n"
 "    </xsd:sequence>\n"
 "  </xsd:complexType>\n"
 "\n"
@@ -226,6 +228,312 @@
 "    <xsd:attribute name=\"bodyend\" type=\"xsd:integer\" />\n"
 "  </xsd:complexType>\n"
 "\n"
+"  <xsd:complexType name=\"docSect1Type\" mixed=\"true\">\n"
+"    <xsd:sequence>\n"
+"      <xsd:element name=\"title\" type=\"xsd:string\" />	    \n"
+"      <xsd:element name=\"para\" type=\"docParaType\" minOccurs=\"0\" maxOccurs=\"unbounded\" />\n"
+"      <xsd:element name=\"sect2\" type=\"docSect2Type\" minOccurs=\"0\" maxOccurs=\"unbounded\" />\n"
+"      <xsd:element name=\"internal\" type=\"docInternalS1Type\" minOccurs=\"0\" />\n"
+"    </xsd:sequence>\n"
+"    <xsd:attribute name=\"id\" />\n"
+"  </xsd:complexType>\n"
+"\n"
+"  <xsd:complexType name=\"docSect2Type\" mixed=\"true\">\n"
+"    <xsd:sequence>\n"
+"      <xsd:element name=\"title\" type=\"xsd:string\" />	    \n"
+"      <xsd:element name=\"para\" type=\"docParaType\" minOccurs=\"0\" maxOccurs=\"unbounded\" />\n"
+"      <xsd:element name=\"sect3\" type=\"docSect3Type\" minOccurs=\"0\" maxOccurs=\"unbounded\" />\n"
+"      <xsd:element name=\"internal\" type=\"docInternalS2Type\" minOccurs=\"0\" />\n"
+"    </xsd:sequencee\n"
+"    <xsd:attribute name=\"id\" />\n"
+"  </xsd:complexType>\n"
+"\n"
+"  <xsd:complexType name=\"docSect3Type\" mixed=\"true\">\n"
+"    <xsd:sequence>\n"
+"      <xsd:element name=\"title\" type=\"xsd:string\" />	    \n"
+"      <xsd:element name=\"para\" type=\"docParaType\" minOccurs=\"0\" maxOccurs=\"unbounded\" />\n"
+"      <xsd:element name=\"sect4\" type=\"docSect4Type\" minOccurs=\"0\" maxOccurs=\"unbounded\" />\n"
+"      <xsd:element name=\"internal\" type=\"docInternalS3Type\" minOccurs=\"0\" />\n"
+"    </xsd:sequence>\n"
+"    <xsd:attribute name=\"id\" />\n"
+"  </xsd:complexType>\n"
+"\n"
+"  <xsd:complexType name=\"docSect4Type\" mixed=\"true\">\n"
+"    <xsd:sequence>\n"
+"      <xsd:element name=\"title\" type=\"xsd:string\" />	    \n"
+"      <xsd:element name=\"para\" type=\"docParaType\" minOccurs=\"0\" maxOccurs=\"unbounded\" />\n"
+"      <xsd:element name=\"internal\" type=\"docInternalS4Type\" minOccurs=\"0\" />\n"
+"    </xsd:sequence>\n"
+"    <xsd:attribute name=\"id\" />\n"
+"  </xsd:complexType>\n"
+"\n"
+"  <xsd:complexType name=\"docInternalType\" mixed=\"true\">\n"
+"    <xsd:sequence>\n"
+"      <xsd:element name=\"para\"  type=\"docParaType\"  minOccurs=\"0\" maxOccurs=\"unbounded\" />\n"
+"      <xsd:element name=\"sect1\" type=\"docSect1Type\" minOccurs=\"0\" maxOccurs=\"unbounded\" />\n"
+"    </xsd:sequence>\n"
+"  </xsd:complexType>\n"
+"\n"
+"  <xsd:complexType name=\"docInternalS1Type\" mixed=\"true\">\n"
+"    <xsd:sequence>\n"
+"      <xsd:element name=\"para\"  type=\"docParaType\"  minOccurs=\"0\" maxOccurs=\"unbounded\" />\n"
+"      <xsd:element name=\"sect2\" type=\"docSect2Type\" minOccurs=\"0\" maxOccurs=\"unbounded\" />\n"
+"    </xsd:sequence>\n"
+"  </xsd:complexType>\n"
+"\n"
+"  <xsd:complexType name=\"docInternalS2Type\" mixed=\"true\">\n"
+"    <xsd:sequence>\n"
+"      <xsd:element name=\"para\"  type=\"docParaType\"  minOccurs=\"0\" maxOccurs=\"unbounded\" />\n"
+"      <xsd:element name=\"sect3\" type=\"docSect3Type\" minOccurs=\"0\" maxOccurs=\"unbounded\" />\n"
+"    </xsd:sequence>\n"
+"  </xsd:complexType>\n"
+"\n"
+"  <xsd:complexType name=\"docInternalS3Type\" mixed=\"true\">\n"
+"    <xsd:sequence>\n"
+"      <xsd:element name=\"para\"  type=\"docParaType\"  minOccurs=\"0\" maxOccurs=\"unbounded\" />\n"
+"      <xsd:element name=\"sect3\" type=\"docSect4Type\" minOccurs=\"0\" maxOccurs=\"unbounded\" />\n"
+"    </xsd:sequence>\n"
+"  </xsd:complexType>\n"
+"\n"
+"  <xsd:complexType name=\"docInternalS4Type\" mixed=\"true\">\n"
+"    <xsd:sequence>\n"
+"      <xsd:element name=\"para\"  type=\"docParaType\"  minOccurs=\"0\" maxOccurs=\"unbounded\" />\n"
+"    </xsd:sequence>\n"
+"  </xsd:complexType>\n"
+" \n"
+"  <xsd:group name=\"docTitleCmdGroup\">\n"
+"    <xsd:choice>\n"
+"      <xsd:element name=\"ulink\" type=\"docURLLink\" />\n"
+"      <xsd:element name=\"bold\" type=\"docMarkupType\" />\n"
+"      <xsd:element name=\"emphasis\" type=\"docMarkupType\" />\n"
+"      <xsd:element name=\"computeroutput\" type=\"docMarkupType\" />\n"
+"      <xsd:element name=\"subscript\" type=\"docMarkupType\" />\n"
+"      <xsd:element name=\"superscript\" type=\"docMarkupType\" />\n"
+"      <xsd:element name=\"center\" type=\"docMarkupType\" />\n"
+"      <xsd:element name=\"small\" type=\"docMarkupType\" />\n"
+"      <xsd:element name=\"htmlonly\" type=\"xsd:string\" />\n"
+"      <xsd:element name=\"latexonly\" type=\"xsd:string\" />\n"
+"      <xsd:element name=\"anchor\" type=\"docAnchorType\" />\n"
+"      <xsd:element name=\"formula\" type=\"docFormulaType\" />\n"
+"      <xsd:element name=\"ref\" type=\"docRefTextType\" />\n"
+"      <xsd:element name=\"copy\" type=\"docEmptyType\" />\n"
+"      <xsd:element name=\"trademark\" type=\"docEmptyType\" />\n"
+"      <xsd:element name=\"registered\" type=\"docEmptyType\" />\n"
+"      <xsd:element name=\"umlaut\" type=\"docCharType\" />\n"
+"      <xsd:element name=\"acute\" type=\"docCharType\" />\n"
+"      <xsd:element name=\"grave\" type=\"docCharType\" />\n"
+"      <xsd:element name=\"circ\" type=\"docCharType\" />\n"
+"      <xsd:element name=\"tilde\" type=\"docCharType\" />\n"
+"      <xsd:element name=\"cedil\" type=\"docCharType\" />\n"
+"      <xsd:element name=\"ring\" type=\"docCharType\" />\n"
+"      <xsd:element name=\"szlig\" type=\"docEmptyType\" />\n"
+"      <xsd:element name=\"nonbreakablespace\" type=\"docEmptyType\" />\n"
+"    </xsd:choice>\n"
+"  </xsd:group>\n"
+"\n"
+"  <xsd:complexType name=\"docTitleType\" mixed=\"true\">\n"
+"    <xsd:group ref=\"docTitleCmdGroup\" minOccurs=\"0\" maxOccurs=\"unbounded\" />\n"
+"  </xsd:complexType>\n"
+"\n"
+"  <xsd:group name=\"docCmdGroup\">\n"
+"    <xsd:choice>\n"
+"      <xsd:group ref=\"docTitleCmdGroup\"/>\n"
+"      <xsd:element name=\"linebreak\" type=\"docEmptyType\" />\n"
+"      <xsd:element name=\"hruler\" type=\"docEmptyType\" />\n"
+"      <xsd:element name=\"preformatted\" type=\"docMarkupType\" />\n"
+"      <xsd:element name=\"programlisting\" type=\"listingType\" />\n"
+"      <xsd:element name=\"verbatim\" type=\"xsd:string\" />\n"
+"      <xsd:element name=\"indexentry\" type=\"docIndexEntryType\" />\n"
+"      <xsd:element name=\"orderedlist\" type=\"docListType\" />\n"
+"      <xsd:element name=\"itemizedlist\" type=\"docListType\" />\n"
+"      <xsd:element name=\"simplesect\" type=\"docSimpleSectType\" />\n"
+"      <xsd:element name=\"title\" type=\"docTitleType\" />\n"
+"      <xsd:element name=\"variablelist\" type=\"docVariableListType\" />\n"
+"      <xsd:element name=\"table\" type=\"docTableType\" />\n"
+"      <xsd:element name=\"heading\" type=\"docHeadingType\" />\n"
+"      <xsd:element name=\"image\" type=\"docImageType\" />\n"
+"      <xsd:element name=\"dotfile\" type=\"docDotFileType\" />\n"
+"      <xsd:element name=\"toclist\" type=\"docTocListType\" />\n"
+"      <xsd:element name=\"language\" type=\"docLanguageType\" />\n"
+"      <xsd:element name=\"parameterlist\" type=\"docParamListType\" />\n"
+"      <xsd:element name=\"xrefsect\" type=\"docXRefSectType\" />\n"
+"      <xsd:element name=\"copydoc\" type=\"docCopyType\" />\n"
+"    </xsd:choice>\n"
+"  </xsd:group>\n"
+"\n"
+"  <xsd:complexType name=\"docParaType\" mixed=\"true\">\n"
+"    <xsd:group ref=\"docCmdGroup\" minOccurs=\"0\" maxOccurs=\"unbounded\" />\n"
+"  </xsd:complexType>\n"
+"\n"
+"  <xsd:complexType name=\"docMarkupType\" mixed=\"true\">\n"
+"    <xsd:group ref=\"docCmdGroup\" minOccurs=\"0\" maxOccurs=\"unbounded\" />\n"
+"  </xsd:complexType>\n"
+"\n"
+"  <xsd:complexType name=\"docURLLink\" mixed=\"true\">\n"
+"    <xsd:group ref=\"docTitleCmdGroup\" minOccurs=\"0\" maxOccurs=\"unbounded\" />\n"
+"    <xsd:attribute name=\"url\" type=\"xsd:string\" />\n"
+"  </xsd:complexType>\n"
+"\n"
+"  <xsd:complexType name=\"docAnchorType\" mixed=\"true\">\n"
+"    <xsd:attribute name=\"id\" />\n"
+"  </xsd:complexType>\n"
+"\n"
+"  <xsd:complexType name=\"docFormulaType\" mixed=\"true\">\n"
+"    <xsd:attribute name=\"id\" />\n"
+"  </xsd:complexType>\n"
+"\n"
+"  <xsd:complexType name=\"docIndexEntryType\">\n"
+"    <xsd:sequence>\n"
+"      <xsd:element name=\"primaryie\" type=\"xsd:string\" />\n"
+"      <xsd:element name=\"secondaryie\" type=\"xsd:string\" />\n"
+"    </xsd:sequence>\n"
+"  </xsd:complexType>\n"
+"\n"
+"  <xsd:complexType name=\"docListType\">\n"
+"    <xsd:sequence>\n"
+"      <xsd:element name=\"listitem\" type=\"docListItemType\" maxOccurs=\"unbounded\" />\n"
+"    </xsd:sequence>\n"
+"  </xsd:complexType>\n"
+"\n"
+"  <xsd:complexType name=\"docListItemType\">\n"
+"    <xsd:sequence>\n"
+"      <xsd:element name=\"para\" type=\"docParaType\" minOccurs=\"0\" maxOccurs=\"unbounded\" />\n"
+"    </xsd:sequence>\n"
+"  </xsd:complexType>\n"
+"\n"
+"  <xsd:complexType name=\"docSimpleSectType\">\n"
+"    <xsd:sequence>\n"
+"      <xsd:element name=\"title\" type=\"docTitleType\" minOccurs=\"0\" />\n"
+"      <xsd:element name=\"para\" type=\"docParaType\" minOccurs=\"0\" maxOccurs=\"unbounded\" />\n"
+"    </xsd:sequence>\n"
+"    <xsd:attribute name=\"kind\" type=\"DoxSimpleSectKind\" />\n"
+"  </xsd:complexType>\n"
+"\n"
+"  <xsd:complexType name=\"docVarListEntryType\">\n"
+"    <xsd:sequence>\n"
+"      <xsd:element name=\"term\" type=\"docTitleType\" />\n"
+"    </xsd:sequence>\n"
+"  </xsd:complexType>\n"
+"\n"
+"  <xsd:group name=\"docVariableListGroup\">\n"
+"    <xsd:sequence>\n"
+"      <xsd:element name=\"varlistentry\" type=\"docVarListEntryType\" />\n"
+"      <xsd:element name=\"listitem\" type=\"docListItemType\" />\n"
+"    </xsd:sequence>\n"
+"  </xsd:group>\n"
+"\n"
+"  <xsd:complexType name=\"docVariableListType\">\n"
+"    <xsd:sequence>\n"
+"      <xsd:group ref=\"docVariableListGroup\" maxOccurs=\"unbounded\" />\n"
+"    </xsd:sequence>\n"
+"  </xsd:complexType>\n"
+"\n"
+"  <xsd:complexType name=\"docRefTextType\" mixed=\"true\">\n"
+"    <xsd:group ref=\"docTitleCmdGroup\" minOccurs=\"0\" maxOccurs=\"unbounded\" />\n"
+"    <xsd:attribute name=\"refid\" />\n"
+"    <xsd:attribute name=\"kindref\" />\n"
+"    <xsd:attribute name=\"external\" />\n"
+"  </xsd:complexType>\n"
+"\n"
+"  <xsd:complexType name=\"docTableType\">\n"
+"    <xsd:sequence>\n"
+"      <xsd:element name=\"row\" type=\"docRowType\" minOccurs=\"0\" maxOccurs=\"unbounded\" />\n"
+"      <xsd:element name=\"caption\" type=\"docCaptionType\" minOccurs=\"0\" />\n"
+"    </xsd:sequence>\n"
+"    <xsd:attribute name=\"rows\" type=\"xsd:integer\" />\n"
+"    <xsd:attribute name=\"cols\" type=\"xsd:integer\" />\n"
+"  </xsd:complexType>\n"
+"\n"
+"  <xsd:complexType name=\"docRowType\">\n"
+"    <xsd:sequence>\n"
+"      <xsd:element name=\"entry\" type=\"docEntryType\" minOccurs=\"0\" maxOccurs=\"unbounded\" />\n"
+"    </xsd:sequence>\n"
+"  </xsd:complexType>\n"
+"\n"
+"  <xsd:complexType name=\"docEntryType\">\n"
+"    <xsd:sequence>\n"
+"      <xsd:element name=\"para\" type=\"docParaType\" minOccurs=\"0\" maxOccurs=\"unbounded\" />\n"
+"    </xsd:sequence>\n"
+"    <xsd:attribute name=\"thead\" type=\"DoxBool\" />\n"
+"  </xsd:complexType>\n"
+"\n"
+"  <xsd:complexType name=\"docCaptionType\" mixed=\"true\">\n"
+"    <xsd:group ref=\"docTitleCmdGroup\" minOccurs=\"0\" maxOccurs=\"unbounded\" />\n"
+"  </xsd:complexType>\n"
+"\n"
+"  <xsd:complexType name=\"docHeadingType\" mixed=\"true\">\n"
+"    <xsd:group ref=\"docTitleCmdGroup\" minOccurs=\"0\" maxOccurs=\"unbounded\" />\n"
+"    <xsd:attribute name=\"level\" type=\"xsd:integer\" /> <!-- todo: range 1-6 -->\n"
+"  </xsd:complexType>\n"
+"\n"
+"  <xsd:complexType name=\"docImageType\" mixed=\"true\">\n"
+"    <xsd:group ref=\"docTitleCmdGroup\" minOccurs=\"0\" maxOccurs=\"unbounded\" />\n"
+"    <xsd:attribute name=\"type\" type=\"DoxImageKind\" /> \n"
+"    <xsd:attribute name=\"name\" type=\"xsd:string\" /> \n"
+"    <xsd:attribute name=\"width\" type=\"xsd:string\" /> \n"
+"    <xsd:attribute name=\"height\" type=\"xsd:string\" /> \n"
+"  </xsd:complexType>\n"
+"\n"
+"  <xsd:complexType name=\"docDotFileType\" mixed=\"true\">\n"
+"    <xsd:group ref=\"docTitleCmdGroup\" minOccurs=\"0\" maxOccurs=\"unbounded\" />\n"
+"    <xsd:attribute name=\"name\" type=\"xsd:string\" /> \n"
+"  </xsd:complexType>\n"
+"\n"
+"  <xsd:complexType name=\"docTocItemType\" mixed=\"true\">\n"
+"    <xsd:group ref=\"docTitleCmdGroup\" minOccurs=\"0\" maxOccurs=\"unbounded\" />\n"
+"    <xsd:attribute name=\"id\" /> \n"
+"  </xsd:complexType>\n"
+"\n"
+"  <xsd:complexType name=\"docTocListType\">\n"
+"    <xsd:sequence>\n"
+"      <xsd:element name=\"tocitem\" type=\"docTocItemType\" minOccurs=\"0\" maxOccurs=\"unbounded\" />\n"
+"    </xsd:sequence>\n"
+"  </xsd:complexType>\n"
+"\n"
+"  <xsd:complexType name=\"docLanguageType\">\n"
+"    <xsd:sequence>\n"
+"      <xsd:element name=\"para\" type=\"docParaType\" minOccurs=\"0\" maxOccurs=\"unbounded\" />\n"
+"    </xsd:sequence>\n"
+"    <xsd:attribute name=\"langid\" type=\"xsd:string\" /> \n"
+"  </xsd:complexType>\n"
+"\n"
+"  <xsd:group name=\"docParamListGroup\">\n"
+"    <xsd:sequence>\n"
+"      <xsd:element name=\"parametername\" type=\"xsd:string\" minOccurs=\"0\" maxOccurs=\"unbounded\" />\n"
+"      <xsd:element name=\"parameterdescription\" type=\"descriptionType\" />\n"
+"    </xsd:sequence>\n"
+"  </xsd:group>\n"
+"\n"
+"  <xsd:complexType name=\"docParamListType\">\n"
+"    <xsd:sequence>\n"
+"      <xsd:group ref=\"docParamListGroup\" maxOccurs=\"unbounded\" />\n"
+"    </xsd:sequence>\n"
+"    <xsd:attribute name=\"kind\" type=\"DoxParamListKind\" /> \n"
+"  </xsd:complexType>\n"
+"\n"
+"  <xsd:complexType name=\"docXRefSectType\">\n"
+"    <xsd:sequence>\n"
+"      <xsd:element name=\"xreftitle\" type=\"xsd:string\" minOccurs=\"0\" maxOccurs=\"unbounded\" />\n"
+"      <xsd:element name=\"xrefdescription\" type=\"descriptionType\" />\n"
+"    </xsd:sequence>\n"
+"    <xsd:attribute name=\"id\" /> \n"
+"  </xsd:complexType>\n"
+"\n"
+"  <xsd:complexType name=\"docCopyType\">\n"
+"    <xsd:sequence>\n"
+"      <xsd:element name=\"para\" type=\"docParaType\" minOccurs=\"0\" maxOccurs=\"unbounded\" />\n"
+"      <xsd:element name=\"sect1\" type=\"docSect1Type\" minOccurs=\"0\" maxOccurs=\"unbounded\" />\n"
+"      <xsd:element name=\"internal\" type=\"docInternalType\" minOccurs=\"0\" />\n"
+"    </xsd:sequence>\n"
+"    <xsd:attribute name=\"link\" /> \n"
+"  </xsd:complexType>\n"
+"\n"
+"  <xsd:complexType name=\"docCharType\">\n"
+"    <xsd:attribute name=\"char\" type=\"DoxCharRange\"/> \n"
+"  </xsd:complexType>\n"
+"\n"
+"  <xsd:complexType name=\"docEmptyType\"/>\n"
+"\n"
 "  <!-- Simple types -->\n"
 "\n"
 "  <xsd:simpleType name=\"DoxBool\">\n"
@@ -350,12 +658,54 @@
 "    </xsd:restriction>\n"
 "  </xsd:simpleType>\n"
 "\n"
+"  <xsd:simpleType name=\"DoxSimpleSectKind\">\n"
+"    <xsd:restriction base=\"xsd:string\">\n"
+"      <xsd:enumeration value=\"see\" />\n"
+"      <xsd:enumeration value=\"return\" />\n"
+"      <xsd:enumeration value=\"author\" />\n"
+"      <xsd:enumeration value=\"authors\" />\n"
+"      <xsd:enumeration value=\"version\" />\n"
+"      <xsd:enumeration value=\"since\" />\n"
+"      <xsd:enumeration value=\"date\" />\n"
+"      <xsd:enumeration value=\"note\" />\n"
+"      <xsd:enumeration value=\"warning\" />\n"
+"      <xsd:enumeration value=\"pre\" />\n"
+"      <xsd:enumeration value=\"post\" />\n"
+"      <xsd:enumeration value=\"invariant\" />\n"
+"      <xsd:enumeration value=\"remark\" />\n"
+"      <xsd:enumeration value=\"attention\" />\n"
+"      <xsd:enumeration value=\"par\" />\n"
+"      <xsd:enumeration value=\"rcs\" />\n"
+"    </xsd:restriction>\n"
+"  </xsd:simpleType>\n"
+"\n"
 "  <xsd:simpleType name=\"DoxVersionNumber\">\n"
 "    <xsd:restriction base=\"xsd:string\">\n"
 "      <xsd:pattern value=\"\\d+\\.\\d+.*\" />\n"
 "    </xsd:restriction>\n"
 "  </xsd:simpleType>\n"
 "\n"
+"  <xsd:simpleType name=\"DoxImageKind\">\n"
+"    <xsd:restriction base=\"xsd:string\">\n"
+"      <xsd:enumeration value=\"html\" />\n"
+"      <xsd:enumeration value=\"latex\" />\n"
+"      <xsd:enumeration value=\"rtf\" />\n"
+"    </xsd:restriction>\n"
+"  </xsd:simpleType>\n"
+"\n"
+"  <xsd:simpleType name=\"DoxParamListKind\">\n"
+"    <xsd:restriction base=\"xsd:string\">\n"
+"      <xsd:enumeration value=\"param\" />\n"
+"      <xsd:enumeration value=\"retval\" />\n"
+"      <xsd:enumeration value=\"exception\" />\n"
+"    </xsd:restriction>\n"
+"  </xsd:simpleType>\n"
+"\n"
+"  <xsd:simpleType name=\"DoxCharRange\">\n"
+"    <xsd:restriction base=\"xsd:string\">\n"
+"      <xsd:pattern value=\"[aeiouncAEIOUNC]\" />\n"
+"    </xsd:restriction>\n"
+"  </xsd:simpleType>\n"
 "\n"
 "</xsd:schema>\n"
 "\n"