summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitri van Heesch <doxygen@gmail.com>2019-07-30 09:53:37 (GMT)
committerDimitri van Heesch <doxygen@gmail.com>2019-07-30 09:53:37 (GMT)
commit473fe1a14eab7b3d67e1eee35efc4487983a34b7 (patch)
tree7c8e380e04e2482e81e29d098c07e9cb29fda1b8
parent25d7cd240edb02510bed86677d3021a2cfd96cd1 (diff)
parentff037ff363d2799c3e090162d436b84b9035c49f (diff)
downloadDoxygen-473fe1a14eab7b3d67e1eee35efc4487983a34b7.zip
Doxygen-473fe1a14eab7b3d67e1eee35efc4487983a34b7.tar.gz
Doxygen-473fe1a14eab7b3d67e1eee35efc4487983a34b7.tar.bz2
Merge branch 'albert-github-feature/bug_xml_msc_schema'
-rw-r--r--templates/xml/compound.xsd28
1 files changed, 12 insertions, 16 deletions
diff --git a/templates/xml/compound.xsd b/templates/xml/compound.xsd
index e4ca883..4729d4b 100644
--- a/templates/xml/compound.xsd
+++ b/templates/xml/compound.xsd
@@ -423,9 +423,9 @@
<xsd:element name="rtfonly" type="xsd:string" />
<xsd:element name="latexonly" type="xsd:string" />
<xsd:element name="image" type="docImageType" />
- <xsd:element name="dot" type="xsd:string" />
- <xsd:element name="msc" type="xsd:string" />
- <xsd:element name="plantuml" type="xsd:string" />
+ <xsd:element name="dot" type="docImageType" />
+ <xsd:element name="msc" type="docImageType" />
+ <xsd:element name="plantuml" type="docImageType" />
<xsd:element name="anchor" type="docAnchorType" />
<xsd:element name="formula" type="docFormulaType" />
<xsd:element name="ref" type="docRefTextType" />
@@ -456,9 +456,9 @@
<xsd:element name="table" type="docTableType" />
<xsd:element name="heading" type="docHeadingType" />
<xsd:element name="image" type="docImageType" />
- <xsd:element name="dotfile" type="docFileType" />
- <xsd:element name="mscfile" type="docFileType" />
- <xsd:element name="diafile" type="docFileType" />
+ <xsd:element name="dotfile" type="docImageType" />
+ <xsd:element name="mscfile" type="docImageType" />
+ <xsd:element name="diafile" type="docImageType" />
<xsd:element name="toclist" type="docTocListType" />
<xsd:element name="language" type="docLanguageType" />
<xsd:element name="parameterlist" type="docParamListType" />
@@ -578,16 +578,12 @@
<xsd:complexType name="docImageType" mixed="true">
<xsd:group ref="docTitleCmdGroup" minOccurs="0" maxOccurs="unbounded" />
- <xsd:attribute name="type" type="DoxImageKind" />
- <xsd:attribute name="name" type="xsd:string" />
- <xsd:attribute name="width" type="xsd:string" />
- <xsd:attribute name="height" type="xsd:string" />
- <xsd:attribute name="inline" type="DoxBool" />
- </xsd:complexType>
-
- <xsd:complexType name="docFileType" mixed="true">
- <xsd:group ref="docTitleCmdGroup" minOccurs="0" maxOccurs="unbounded" />
- <xsd:attribute name="name" type="xsd:string" />
+ <xsd:attribute name="type" type="DoxImageKind" use="optional"/>
+ <xsd:attribute name="name" type="xsd:string" use="optional"/>
+ <xsd:attribute name="width" type="xsd:string" use="optional"/>
+ <xsd:attribute name="height" type="xsd:string" use="optional"/>
+ <xsd:attribute name="inline" type="DoxBool" use="optional"/>
+ <xsd:attribute name="caption" type="xsd:string" use="optional"/>
</xsd:complexType>
<xsd:complexType name="docTocItemType" mixed="true">