lib/metanorma/csa/isodoc.rng in metanorma-csa-2.2.4 vs lib/metanorma/csa/isodoc.rng in metanorma-csa-2.2.5
- old
+ new
@@ -218,29 +218,12 @@
<define name="ul">
<element name="ul">
<attribute name="id">
<data type="ID"/>
</attribute>
+ <ref name="BlockAttributes"/>
<optional>
- <attribute name="keep-with-next">
- <data type="boolean"/>
- </attribute>
- </optional>
- <optional>
- <attribute name="keep-lines-together">
- <data type="boolean"/>
- </attribute>
- </optional>
- <optional>
- <attribute name="tag"/>
- </optional>
- <optional>
- <attribute name="multilingual-rendering">
- <ref name="MultilingualRenderingType"/>
- </attribute>
- </optional>
- <optional>
<ref name="tname"/>
</optional>
<oneOrMore>
<ref name="ul_li"/>
</oneOrMore>
@@ -252,29 +235,12 @@
<define name="ol">
<element name="ol">
<attribute name="id">
<data type="ID"/>
</attribute>
+ <ref name="BlockAttributes"/>
<optional>
- <attribute name="keep-with-next">
- <data type="boolean"/>
- </attribute>
- </optional>
- <optional>
- <attribute name="keep-lines-together">
- <data type="boolean"/>
- </attribute>
- </optional>
- <optional>
- <attribute name="tag"/>
- </optional>
- <optional>
- <attribute name="multilingual-rendering">
- <ref name="MultilingualRenderingType"/>
- </attribute>
- </optional>
- <optional>
<attribute name="type">
<choice>
<value>roman</value>
<value>alphabet</value>
<value>arabic</value>
@@ -297,34 +263,17 @@
<define name="dl">
<element name="dl">
<attribute name="id">
<data type="ID"/>
</attribute>
+ <ref name="BlockAttributes"/>
<optional>
- <attribute name="keep-with-next">
- <data type="boolean"/>
- </attribute>
- </optional>
- <optional>
- <attribute name="keep-lines-together">
- <data type="boolean"/>
- </attribute>
- </optional>
- <optional>
<attribute name="key">
<data type="boolean"/>
</attribute>
</optional>
<optional>
- <attribute name="tag"/>
- </optional>
- <optional>
- <attribute name="multilingual-rendering">
- <ref name="MultilingualRenderingType"/>
- </attribute>
- </optional>
- <optional>
<ref name="tname"/>
</optional>
<oneOrMore>
<ref name="dt"/>
<ref name="dd"/>
@@ -360,29 +309,12 @@
<attribute name="subsequence"/>
</optional>
<optional>
<attribute name="number"/>
</optional>
+ <ref name="BlockAttributes"/>
<optional>
- <attribute name="keep-with-next">
- <data type="boolean"/>
- </attribute>
- </optional>
- <optional>
- <attribute name="keep-lines-together">
- <data type="boolean"/>
- </attribute>
- </optional>
- <optional>
- <attribute name="tag"/>
- </optional>
- <optional>
- <attribute name="multilingual-rendering">
- <ref name="MultilingualRenderingType"/>
- </attribute>
- </optional>
- <optional>
<ref name="tname"/>
</optional>
<oneOrMore>
<choice>
<ref name="formula"/>
@@ -426,31 +358,14 @@
<attribute name="uri">
<data type="anyURI"/>
</attribute>
</optional>
<optional>
- <attribute name="keep-with-next">
- <data type="boolean"/>
- </attribute>
- </optional>
- <optional>
- <attribute name="keep-lines-together">
- <data type="boolean"/>
- </attribute>
- </optional>
- <optional>
<attribute name="width"/>
</optional>
+ <ref name="BlockAttributes"/>
<optional>
- <attribute name="tag"/>
- </optional>
- <optional>
- <attribute name="multilingual-rendering">
- <ref name="MultilingualRenderingType"/>
- </attribute>
- </optional>
- <optional>
<ref name="colgroup"/>
</optional>
<optional>
<ref name="tname"/>
</optional>
@@ -484,31 +399,14 @@
</optional>
<optional>
<attribute name="subsequence"/>
</optional>
<optional>
- <attribute name="keep-with-next">
- <data type="boolean"/>
- </attribute>
- </optional>
- <optional>
- <attribute name="keep-lines-together">
- <data type="boolean"/>
- </attribute>
- </optional>
- <optional>
<attribute name="class"/>
</optional>
+ <ref name="BlockAttributes"/>
<optional>
- <attribute name="tag"/>
- </optional>
- <optional>
- <attribute name="multilingual-rendering">
- <ref name="MultilingualRenderingType"/>
- </attribute>
- </optional>
- <optional>
<ref name="source"/>
</optional>
<optional>
<ref name="tname"/>
</optional>
@@ -550,31 +448,14 @@
</optional>
<optional>
<attribute name="subsequence"/>
</optional>
<optional>
- <attribute name="keep-with-next">
- <data type="boolean"/>
- </attribute>
- </optional>
- <optional>
- <attribute name="keep-lines-together">
- <data type="boolean"/>
- </attribute>
- </optional>
- <optional>
<attribute name="lang"/>
</optional>
+ <ref name="BlockAttributes"/>
<optional>
- <attribute name="tag"/>
- </optional>
- <optional>
- <attribute name="multilingual-rendering">
- <ref name="MultilingualRenderingType"/>
- </attribute>
- </optional>
- <optional>
<attribute name="linenums">
<data type="boolean"/>
</attribute>
</optional>
<optional>
@@ -609,32 +490,15 @@
</optional>
<optional>
<attribute name="subsequence"/>
</optional>
<optional>
- <attribute name="keep-with-next">
- <data type="boolean"/>
- </attribute>
- </optional>
- <optional>
- <attribute name="keep-lines-together">
- <data type="boolean"/>
- </attribute>
- </optional>
- <optional>
<attribute name="inequality">
<data type="boolean"/>
</attribute>
</optional>
- <optional>
- <attribute name="tag"/>
- </optional>
- <optional>
- <attribute name="multilingual-rendering">
- <ref name="MultilingualRenderingType"/>
- </attribute>
- </optional>
+ <ref name="BlockAttributes"/>
<ref name="stem"/>
<optional>
<ref name="dl"/>
</optional>
<zeroOrMore>
@@ -649,31 +513,11 @@
<optional>
<attribute name="align">
<ref name="Alignments"/>
</attribute>
</optional>
- <optional>
- <attribute name="keep-with-next">
- <data type="boolean"/>
- </attribute>
- </optional>
- <optional>
- <attribute name="keep-lines-together">
- <data type="boolean"/>
- </attribute>
- </optional>
- <optional>
- <attribute name="tag"/>
- </optional>
- <optional>
- <attribute name="type"/>
- </optional>
- <optional>
- <attribute name="multilingual-rendering">
- <ref name="MultilingualRenderingType"/>
- </attribute>
- </optional>
+ <ref name="BlockAttributes"/>
<zeroOrMore>
<ref name="TextElement"/>
</zeroOrMore>
<zeroOrMore>
<ref name="note"/>
@@ -688,30 +532,13 @@
<attribute name="align">
<ref name="Alignments"/>
</attribute>
</optional>
<optional>
- <attribute name="keep-with-next">
- <data type="boolean"/>
- </attribute>
- </optional>
- <optional>
- <attribute name="keep-lines-together">
- <data type="boolean"/>
- </attribute>
- </optional>
- <optional>
- <attribute name="tag"/>
- </optional>
- <optional>
<attribute name="type"/>
</optional>
- <optional>
- <attribute name="multilingual-rendering">
- <ref name="MultilingualRenderingType"/>
- </attribute>
- </optional>
+ <ref name="BlockAttributes"/>
<zeroOrMore>
<choice>
<ref name="TextElement"/>
<ref name="fn"/>
</choice>
@@ -729,29 +556,12 @@
<optional>
<attribute name="alignment">
<ref name="Alignments"/>
</attribute>
</optional>
+ <ref name="BlockAttributes"/>
<optional>
- <attribute name="keep-with-next">
- <data type="boolean"/>
- </attribute>
- </optional>
- <optional>
- <attribute name="keep-lines-together">
- <data type="boolean"/>
- </attribute>
- </optional>
- <optional>
- <attribute name="tag"/>
- </optional>
- <optional>
- <attribute name="multilingual-rendering">
- <ref name="MultilingualRenderingType"/>
- </attribute>
- </optional>
- <optional>
<ref name="quote-source"/>
</optional>
<optional>
<ref name="quote-author"/>
</optional>
@@ -827,40 +637,23 @@
</optional>
<optional>
<attribute name="subsequence"/>
</optional>
<optional>
- <attribute name="keep-with-next">
- <data type="boolean"/>
- </attribute>
- </optional>
- <optional>
- <attribute name="keep-lines-together">
- <data type="boolean"/>
- </attribute>
- </optional>
- <optional>
<attribute name="type"/>
</optional>
<optional>
- <attribute name="tag"/>
- </optional>
- <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>
+ <ref name="BlockAttributes"/>
<oneOrMore>
<choice>
<ref name="paragraph"/>
<ref name="ul"/>
<ref name="ol"/>
@@ -1330,18 +1123,11 @@
<attribute name="name"/>
<attribute name="action"/>
<optional>
<attribute name="class"/>
</optional>
- <optional>
- <attribute name="tag"/>
- </optional>
- <optional>
- <attribute name="multilingual-rendering">
- <ref name="MultilingualRenderingType"/>
- </attribute>
- </optional>
+ <ref name="BlockAttributes"/>
<zeroOrMore>
<choice>
<ref name="TextElement"/>
<ref name="FormInput"/>
</choice>
@@ -1906,11 +1692,14 @@
<zeroOrMore>
<ref name="BasicBlock"/>
</zeroOrMore>
<choice>
<oneOrMore>
- <ref name="term"/>
+ <choice>
+ <ref name="term"/>
+ <ref name="terms"/>
+ </choice>
</oneOrMore>
<group>
<zeroOrMore>
<ref name="terms"/>
</zeroOrMore>
@@ -1932,18 +1721,11 @@
<attribute name="language"/>
</optional>
<optional>
<attribute name="script"/>
</optional>
- <optional>
- <attribute name="tag"/>
- </optional>
- <optional>
- <attribute name="multilingual-rendering">
- <ref name="MultilingualRenderingType"/>
- </attribute>
- </optional>
+ <ref name="BlockAttributes"/>
<oneOrMore>
<ref name="preferred"/>
</oneOrMore>
<zeroOrMore>
<ref name="admitted"/>
@@ -2280,28 +2062,11 @@
<attribute name="number"/>
</optional>
<optional>
<attribute name="subsequence"/>
</optional>
- <optional>
- <attribute name="keep-with-next">
- <data type="boolean"/>
- </attribute>
- </optional>
- <optional>
- <attribute name="keep-lines-together">
- <data type="boolean"/>
- </attribute>
- </optional>
- <optional>
- <attribute name="tag"/>
- </optional>
- <optional>
- <attribute name="multilingual-rendering">
- <ref name="MultilingualRenderingType"/>
- </attribute>
- </optional>
+ <ref name="BlockAttributes"/>
<oneOrMore>
<choice>
<ref name="paragraph"/>
<ref name="ul"/>
<ref name="ol"/>
@@ -2314,28 +2079,11 @@
<define name="termexample">
<element name="termexample">
<attribute name="id">
<data type="ID"/>
</attribute>
- <optional>
- <attribute name="keep-with-next">
- <data type="boolean"/>
- </attribute>
- </optional>
- <optional>
- <attribute name="keep-lines-together">
- <data type="boolean"/>
- </attribute>
- </optional>
- <optional>
- <attribute name="tag"/>
- </optional>
- <optional>
- <attribute name="multilingual-rendering">
- <ref name="MultilingualRenderingType"/>
- </attribute>
- </optional>
+ <ref name="BlockAttributes"/>
<oneOrMore>
<choice>
<ref name="formula"/>
<ref name="ul"/>
<ref name="ol"/>
@@ -2458,19 +2206,12 @@
<attribute name="path_end"/>
</optional>
<optional>
<attribute name="title"/>
</optional>
+ <ref name="BlockAttributes"/>
<optional>
- <attribute name="tag"/>
- </optional>
- <optional>
- <attribute name="multilingual-rendering">
- <ref name="MultilingualRenderingType"/>
- </attribute>
- </optional>
- <optional>
<element name="location">
<zeroOrMore>
<ref name="locality"/>
</zeroOrMore>
</element>
@@ -2525,18 +2266,11 @@
<text/>
</element>
</define>
<define name="imagemap">
<element name="imagemap">
- <optional>
- <attribute name="tag"/>
- </optional>
- <optional>
- <attribute name="multilingual-rendering">
- <ref name="MultilingualRenderingType"/>
- </attribute>
- </optional>
+ <ref name="BlockAttributes"/>
<ref name="figure"/>
<zeroOrMore>
<element name="area">
<attribute name="type">
<choice>
@@ -2578,18 +2312,11 @@
</zeroOrMore>
</element>
</define>
<define name="svgmap">
<element name="svgmap">
- <optional>
- <attribute name="tag"/>
- </optional>
- <optional>
- <attribute name="multilingual-rendering">
- <ref name="MultilingualRenderingType"/>
- </attribute>
- </optional>
+ <ref name="BlockAttributes"/>
<ref name="figure"/>
<zeroOrMore>
<element name="target">
<attribute name="href">
<data type="anyURI"/>
@@ -2691,9 +2418,32 @@
<element name="eref">
<ref name="erefTypeWithConnective"/>
</element>
</oneOrMore>
</element>
+ </define>
+ <define name="BlockAttributes">
+ <optional>
+ <attribute name="keep-with-next">
+ <data type="boolean"/>
+ </attribute>
+ </optional>
+ <optional>
+ <attribute name="keep-lines-together">
+ <data type="boolean"/>
+ </attribute>
+ </optional>
+ <optional>
+ <attribute name="tag"/>
+ </optional>
+ <optional>
+ <attribute name="multilingual-rendering">
+ <ref name="MultilingualRenderingType"/>
+ </attribute>
+ </optional>
+ <optional>
+ <attribute name="columns"/>
+ </optional>
</define>
<start>
<ref name="standard-document"/>
</start>
</grammar>