lib/metanorma/csa/isodoc.rng in metanorma-csa-2.4.4 vs lib/metanorma/csa/isodoc.rng in metanorma-csa-2.4.5
- old
+ new
@@ -154,48 +154,11 @@
</oneOrMore>
</element>
</define>
<define name="xref">
<element name="xref">
- <attribute name="target">
- <data type="string">
- <param name="pattern">\i\c*|\c+#\c+</param>
- </data>
- </attribute>
- <optional>
- <attribute name="to">
- <data type="string">
- <param name="pattern">\i\c*|\c+#\c+</param>
- </data>
- </attribute>
- </optional>
- <optional>
- <attribute name="type">
- <ref name="ReferenceFormat"/>
- </attribute>
- </optional>
- <optional>
- <attribute name="alt"/>
- </optional>
- <optional>
- <attribute name="case">
- <choice>
- <value>capital</value>
- <value>lowercase</value>
- </choice>
- </attribute>
- </optional>
- <optional>
- <attribute name="droploc">
- <data type="boolean"/>
- </attribute>
- </optional>
- <optional>
- <attribute name="style">
- <ref name="XrefStyleType"/>
- </attribute>
- </optional>
+ <ref name="XrefAttributes"/>
<ref name="XrefBody"/>
</element>
</define>
<define name="erefType">
<optional>
@@ -405,27 +368,11 @@
</optional>
</element>
</define>
<define name="figure">
<element name="figure">
- <attribute name="id">
- <data type="ID"/>
- </attribute>
- <optional>
- <attribute name="unnumbered">
- <data type="boolean"/>
- </attribute>
- </optional>
- <optional>
- <attribute name="number"/>
- </optional>
- <optional>
- <attribute name="subsequence"/>
- </optional>
- <optional>
- <attribute name="class"/>
- </optional>
+ <ref name="FigureAttributes"/>
<ref name="BlockAttributes"/>
<optional>
<ref name="tname"/>
</optional>
<choice>
@@ -2448,10 +2395,53 @@
<zeroOrMore>
<ref name="TextElement"/>
</zeroOrMore>
</element>
</define>
+ <define name="XrefAttributes">
+ <attribute name="target">
+ <data type="string">
+ <param name="pattern">\i\c*|\c+#\c+</param>
+ </data>
+ </attribute>
+ <optional>
+ <attribute name="to">
+ <data type="string">
+ <param name="pattern">\i\c*|\c+#\c+</param>
+ </data>
+ </attribute>
+ </optional>
+ <optional>
+ <attribute name="type">
+ <ref name="ReferenceFormat"/>
+ </attribute>
+ </optional>
+ <optional>
+ <attribute name="alt"/>
+ </optional>
+ <optional>
+ <attribute name="case">
+ <choice>
+ <value>capital</value>
+ <value>lowercase</value>
+ </choice>
+ </attribute>
+ </optional>
+ <optional>
+ <attribute name="droploc">
+ <data type="boolean"/>
+ </attribute>
+ </optional>
+ <optional>
+ <attribute name="style">
+ <ref name="XrefStyleType"/>
+ </attribute>
+ </optional>
+ <optional>
+ <attribute name="label"/>
+ </optional>
+ </define>
<define name="XrefBody">
<zeroOrMore>
<ref name="XrefTarget"/>
</zeroOrMore>
<oneOrMore>
@@ -2524,9 +2514,31 @@
<ref name="MultilingualRenderingType"/>
</attribute>
</optional>
<optional>
<attribute name="columns"/>
+ </optional>
+ </define>
+ <define name="FigureAttributes">
+ <attribute name="id">
+ <data type="ID"/>
+ </attribute>
+ <optional>
+ <attribute name="unnumbered">
+ <data type="boolean"/>
+ </attribute>
+ </optional>
+ <optional>
+ <attribute name="number"/>
+ </optional>
+ <optional>
+ <attribute name="subsequence"/>
+ </optional>
+ <optional>
+ <attribute name="class"/>
+ </optional>
+ <optional>
+ <attribute name="width"/>
</optional>
</define>
<start>
<ref name="standard-document"/>
</start>