lib/metanorma/m3aawg/isodoc.rng in metanorma-m3aawg-2.0.1 vs lib/metanorma/m3aawg/isodoc.rng in metanorma-m3aawg-2.0.2
- old
+ new
@@ -30,10 +30,60 @@
<attribute name="abbreviation"/>
</optional>
<ref name="DocumentType"/>
</element>
</define>
+ <define name="index">
+ <element name="index">
+ <optional>
+ <attribute name="to">
+ <data type="IDREF"/>
+ </attribute>
+ </optional>
+ <element name="primary">
+ <oneOrMore>
+ <choice>
+ <ref name="PureTextElement"/>
+ <ref name="stem"/>
+ </choice>
+ </oneOrMore>
+ </element>
+ <optional>
+ <element name="secondary">
+ <oneOrMore>
+ <choice>
+ <ref name="PureTextElement"/>
+ <ref name="stem"/>
+ </choice>
+ </oneOrMore>
+ </element>
+ </optional>
+ <optional>
+ <element name="tertiary">
+ <oneOrMore>
+ <choice>
+ <ref name="PureTextElement"/>
+ <ref name="stem"/>
+ </choice>
+ </oneOrMore>
+ </element>
+ </optional>
+ </element>
+ </define>
+ <define name="bibitem">
+ <element name="bibitem">
+ <attribute name="id">
+ <data type="ID"/>
+ </attribute>
+ <optional>
+ <attribute name="hidden">
+ <data type="boolean"/>
+ </attribute>
+ </optional>
+ <ref name="BibliographicItem"/>
+ </element>
+ </define>
<define name="section-title">
<element name="title">
<zeroOrMore>
<ref name="TextElement"/>
</zeroOrMore>
@@ -688,10 +738,11 @@
<choice>
<ref name="clause"/>
<ref name="terms"/>
<ref name="term-clause"/>
<ref name="definitions"/>
+ <ref name="floating-title"/>
</choice>
</oneOrMore>
</element>
</define>
<define name="references">
@@ -1011,10 +1062,30 @@
<ref name="index"/>
</choice>
</zeroOrMore>
</element>
</define>
+ <define name="sub">
+ <element name="sub">
+ <zeroOrMore>
+ <choice>
+ <ref name="PureTextElement"/>
+ <ref name="stem"/>
+ </choice>
+ </zeroOrMore>
+ </element>
+ </define>
+ <define name="sup">
+ <element name="sup">
+ <zeroOrMore>
+ <choice>
+ <ref name="PureTextElement"/>
+ <ref name="stem"/>
+ </choice>
+ </zeroOrMore>
+ </element>
+ </define>
<define name="pagebreak">
<element name="pagebreak">
<optional>
<attribute name="orientation">
<choice>
@@ -1678,10 +1749,11 @@
<oneOrMore>
<choice>
<ref name="clause-subsection"/>
<ref name="terms"/>
<ref name="definitions"/>
+ <ref name="floating-title"/>
</choice>
</oneOrMore>
</choice>
</define>
<define name="Annex-Section">
@@ -1720,10 +1792,11 @@
<choice>
<ref name="annex-subsection"/>
<ref name="terms"/>
<ref name="definitions"/>
<ref name="references"/>
+ <ref name="floating-title"/>
</choice>
</zeroOrMore>
</group>
</define>
<define name="clause-subsection">
@@ -2198,11 +2271,22 @@
<optional>
<attribute name="multilingual-rendering">
<ref name="MultilingualRenderingType"/>
</attribute>
</optional>
- <ref name="paragraph"/>
+ <oneOrMore>
+ <choice>
+ <ref name="formula"/>
+ <ref name="ul"/>
+ <ref name="ol"/>
+ <ref name="dl"/>
+ <ref name="quote"/>
+ <ref name="sourcecode"/>
+ <ref name="paragraph"/>
+ <ref name="figure"/>
+ </choice>
+ </oneOrMore>
</element>
</define>
<define name="termsource">
<element name="termsource">
<attribute name="status">
@@ -2530,8 +2614,21 @@
</attribute>
</optional>
<oneOrMore>
<ref name="BasicBlock"/>
</oneOrMore>
+ </element>
+ </define>
+ <define name="floating-title">
+ <element name="floating-title">
+ <attribute name="id">
+ <data type="ID"/>
+ </attribute>
+ <attribute name="depth">
+ <data type="int"/>
+ </attribute>
+ <zeroOrMore>
+ <ref name="TextElement"/>
+ </zeroOrMore>
</element>
</define>
</grammar>