[jbosstools-commits] JBoss Tools SVN: r25021 - in trunk/vpe: tests/org.jboss.tools.vpe.test/scheme and 1 other directory.

Author: dvinnichek Date: 2010-09-20 08:18:12 -0400 (Mon, 20 Sep 2010) New Revision: 25021 Modified: trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/vpe-templates-docbook.xml trunk/vpe/tests/org.jboss.tools.vpe.test/scheme/scheme.xsd Log: fixes for org.jboss.tools.vpe.test.TemplateSchemeValidateTest Modified: trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/vpe-templates-docbook.xml =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/vpe-templates-docbook.xml 2010-09-20 12:02:36 UTC (rev 25020) +++ trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/vpe-templates-docbook.xml 2010-09-20 12:18:12 UTC (rev 25021) @@ -523,9 +523,9 @@ </vpe:tag> <vpe:tag name="citetitle" case-sensitive="yes" docbook="yes"> <vpe:template children="no" modify="yes"> - <i> - <vpe:value expr="{tagtext()}" /> - </i> + <span> + <i><vpe:value expr="{tagtext()}" /></i> + </span> </vpe:template> </vpe:tag> <vpe:tag name="term" case-sensitive="yes" docbook="yes"> @@ -624,14 +624,14 @@ <vpe:tag name="important" case-sensitive="yes" docbook="yes"> <vpe:template children="yes" modify="yes"> <div style="background-color: #ECF3FF; border: 1px solid black;"> - <h2>Important</h2> + <h2><vpe:value expr="Important" /></h2> </div> </vpe:template> </vpe:tag> <vpe:tag name="warning" case-sensitive="yes" docbook="yes"> <vpe:template children="yes" modify="yes"> - <div style="background-color: #ECF3FF; border: 1px solid red"> - <h2>Warning</h2> + <div style="background-color: #ECF3FF; border: 1px solid red;"> + <h2><vpe:value expr="Warning" /></h2> </div> </vpe:template> </vpe:tag> @@ -808,14 +808,14 @@ <vpe:tag name="answer" case-sensitive="yes" docbook="yes"> <vpe:template children="yes" modify="yes"> <div> - <b>A: </b> + <b><vpe:value expr="A: " /></b> </div> </vpe:template> </vpe:tag> <vpe:tag name="question" case-sensitive="yes" docbook="yes"> <vpe:template children="yes" modify="yes"> <div> - <b>Q: </b> + <b><vpe:value expr="Q: " /></b> </div> </vpe:template> </vpe:tag> @@ -1957,7 +1957,7 @@ </vpe:tag> <vpe:tag name="sbr" matching-mode="yes"> <vpe:template children="no" modify="yes"> - <br /> + <div /> </vpe:template> </vpe:tag> <vpe:tag name="screenco" matching-mode="yes"> @@ -2181,7 +2181,7 @@ </vpe:tag> <vpe:tag name="tbody" case-sensitive="yes" docbook="yes"> <vpe:template children="yes" modify="yes"> - <tbody/> + <div/> </vpe:template> </vpe:tag> <vpe:tag name="td" case-sensitive="yes" docbook="yes"> @@ -2223,22 +2223,17 @@ </vpe:tag> <vpe:tag name="tfoot" case-sensitive="yes" docbook="yes"> <vpe:template children="yes" modify="yes"> - <tfoot/> + <div/> </vpe:template> </vpe:tag> - <vpe:tag name="tgroup" case-sensitive="yes" docbook="yes"> - <vpe:template children="yes" modify="yes"> - <tgroup/> - </vpe:template> - </vpe:tag> <vpe:tag name="th" case-sensitive="yes" docbook="yes"> <vpe:template children="yes" modify="yes"> - <th/> + <div/> </vpe:template> </vpe:tag> <vpe:tag name="thead" case-sensitive="yes" docbook="yes"> <vpe:template children="yes" modify="yes"> - <thead/> + <div/> </vpe:template> </vpe:tag> <vpe:tag name="titleabbrev" case-sensitive="yes" docbook="yes"> Modified: trunk/vpe/tests/org.jboss.tools.vpe.test/scheme/scheme.xsd =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.test/scheme/scheme.xsd 2010-09-20 12:02:36 UTC (rev 25020) +++ trunk/vpe/tests/org.jboss.tools.vpe.test/scheme/scheme.xsd 2010-09-20 12:18:12 UTC (rev 25021) @@ -329,6 +329,8 @@ <xsd:element name="copy" type="vpe:COPY" minOccurs="0"/> <xsd:element name="input" type="vpe:HTML_INPUT" minOccurs="0" form="unqualified" /> <xsd:element name="label" type="vpe:HTML_LABEL" minOccurs="0" form="unqualified" /> + <xsd:element name="b" type="vpe:HTML_B" minOccurs="0" form="unqualified" /> + <xsd:element name="i" type="vpe:HTML_I" minOccurs="0" form="unqualified" /> </xsd:sequence> <xsd:attribute name="id" type="xsd:string" use="optional"/> <xsd:attribute name="style" type="xsd:string" use="optional"/> @@ -477,6 +479,9 @@ </xsd:complexType> <!-- --> <xsd:complexType name="HTML_A" mixed="true"> + <xsd:choice maxOccurs="unbounded"> + <xsd:element name="value" minOccurs="0" type="vpe:VALUE" /> + </xsd:choice> <xsd:attribute name="href" type="xsd:string" use="optional"/> <xsd:attribute name="style" type="xsd:string" use="optional"/> <xsd:attribute name="class" type="xsd:string" use="optional"/> @@ -564,7 +569,11 @@ <!-- --> <xsd:complexType name="HTML_OL"/> <!-- --> - <xsd:complexType name="HTML_I"/> + <xsd:complexType name="HTML_I" mixed="true"> + <xsd:sequence maxOccurs="unbounded"> + <xsd:element name="value" type="vpe:VALUE" minOccurs="0"/> + </xsd:sequence> + </xsd:complexType> <!-- --> <xsd:complexType name="HTML_EM"/> <!-- --> @@ -578,7 +587,11 @@ <xsd:attribute name="style" type="xsd:string" use="optional"/> </xsd:complexType> <!-- --> - <xsd:complexType name="HTML_LI" mixed="true" /> + <xsd:complexType name="HTML_LI" mixed="true"> + <xsd:choice maxOccurs="unbounded"> + <xsd:element name="h1" minOccurs="0" type="vpe:HTML_H" form="unqualified"/> + </xsd:choice> + </xsd:complexType> <!-- --> <xsd:complexType name="HTML_P"/> <!-- -->