lib/metanorma/ietf/isodoc.rng in metanorma-ietf-3.2.3 vs lib/metanorma/ietf/isodoc.rng in metanorma-ietf-3.2.4
- old
+ new
@@ -15,11 +15,11 @@
DO NOT introduce a namespace here. We do not want a distinct namespace
for these elements, and a distinct namespace for any grammar inheriting
these elements; we just want one namespace for any child grammars
of this.
-->
-<!-- VERSION v1.2.6 -->
+<!-- VERSION v1.2.8 -->
<grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
<include href="reqt.rng"/>
<include href="basicdoc.rng">
<define name="admonition">
<element name="admonition">
@@ -1052,10 +1052,21 @@
<ref name="span"/>
<ref name="erefstack"/>
<ref name="date_inline"/>
</choice>
</define>
+ <define name="PureTextElement" combine="choice">
+ <ref name="passthrough_inline"/>
+ </define>
+ <define name="passthrough_inline">
+ <element name="passthrough">
+ <optional>
+ <attribute name="formats"/>
+ </optional>
+ <text/>
+ </element>
+ </define>
<define name="add">
<element name="add">
<choice>
<ref name="PureTextElement"/>
<ref name="eref"/>
@@ -1090,10 +1101,13 @@
<attribute name="class"/>
</optional>
<optional>
<attribute name="style"/>
</optional>
+ <optional>
+ <attribute name="custom-charset"/>
+ </optional>
<oneOrMore>
<ref name="TextElement"/>
</oneOrMore>
</element>
</define>
@@ -1393,10 +1407,13 @@
</optional>
<optional>
<attribute name="number"/>
</optional>
<optional>
+ <attribute name="branch-number"/>
+ </optional>
+ <optional>
<attribute name="obligation">
<choice>
<value>normative</value>
<value>informative</value>
</choice>
@@ -1616,10 +1633,13 @@
</optional>
<optional>
<attribute name="number"/>
</optional>
<optional>
+ <attribute name="branch-number"/>
+ </optional>
+ <optional>
<attribute name="type"/>
</optional>
<optional>
<ref name="section-title"/>
</optional>
@@ -1667,10 +1687,13 @@
</optional>
<optional>
<attribute name="number"/>
</optional>
<optional>
+ <attribute name="branch-number"/>
+ </optional>
+ <optional>
<ref name="section-title"/>
</optional>
<choice>
<choice>
<oneOrMore>
@@ -1762,9 +1785,12 @@
<optional>
<attribute name="type"/>
</optional>
<optional>
<attribute name="number"/>
+ </optional>
+ <optional>
+ <attribute name="branch-number"/>
</optional>
<optional>
<attribute name="obligation">
<choice>
<value>normative</value>