lib/metanorma/m3aawg/isodoc.rng in metanorma-m3aawg-2.0.8 vs lib/metanorma/m3aawg/isodoc.rng in metanorma-m3aawg-2.1.0
- old
+ new
@@ -30,10 +30,47 @@
<attribute name="abbreviation"/>
</optional>
<ref name="DocumentType"/>
</element>
</define>
+ <define name="admonition">
+ <element name="admonition">
+ <attribute name="type">
+ <ref name="AdmonitionType"/>
+ </attribute>
+ <optional>
+ <attribute name="class"/>
+ </optional>
+ <attribute name="id">
+ <data type="ID"/>
+ </attribute>
+ <optional>
+ <attribute name="uri">
+ <data type="anyURI"/>
+ </attribute>
+ </optional>
+ <optional>
+ <attribute name="coverpage">
+ <data type="boolean"/>
+ </attribute>
+ </optional>
+ <optional>
+ <attribute name="notag">
+ <data type="boolean"/>
+ </attribute>
+ </optional>
+ <optional>
+ <ref name="tname"/>
+ </optional>
+ <zeroOrMore>
+ <ref name="paragraph-with-footnote"/>
+ </zeroOrMore>
+ <zeroOrMore>
+ <ref name="note"/>
+ </zeroOrMore>
+ </element>
+ </define>
<define name="index">
<element name="index">
<optional>
<attribute name="to">
<data type="IDREF"/>
@@ -849,10 +886,20 @@
<optional>
<attribute name="multilingual-rendering">
<ref name="MultilingualRenderingType"/>
</attribute>
</optional>
+ <optional>
+ <attribute name="coverpage">
+ <data type="boolean"/>
+ </attribute>
+ </optional>
+ <optional>
+ <attribute name="notag">
+ <data type="boolean"/>
+ </attribute>
+ </optional>
<oneOrMore>
<choice>
<ref name="paragraph"/>
<ref name="ul"/>
<ref name="ol"/>
@@ -1176,10 +1223,11 @@
<define name="TextElement" combine="choice">
<choice>
<ref name="concept"/>
<ref name="add"/>
<ref name="del"/>
+ <ref name="span"/>
</choice>
</define>
<define name="add">
<element name="add">
<choice>
@@ -1200,9 +1248,17 @@
<ref name="stem"/>
<ref name="keyword"/>
<ref name="xref"/>
<ref name="hyperlink"/>
</choice>
+ </element>
+ </define>
+ <define name="span">
+ <element name="span">
+ <attribute name="class"/>
+ <oneOrMore>
+ <ref name="TextElement"/>
+ </oneOrMore>
</element>
</define>
<define name="concept">
<element name="concept">
<optional>