lib/metanorma/csa/isodoc.rng in metanorma-csa-2.4.6 vs lib/metanorma/csa/isodoc.rng in metanorma-csa-2.4.7

@@ -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.3.0 -->
+<!-- VERSION v1.3.1 -->
 <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="amend">
       <element name="amend">
@@ -1344,43 +1344,46 @@
           <ref name="reference-clause"/>
         </choice>
       </oneOrMore>
     </element>
   </define>
+  <define name="Section-Attributes">
+    <optional>
+      <attribute name="id">
+        <data type="ID"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="language"/>
+    </optional>
+    <optional>
+      <attribute name="script"/>
+    </optional>
+    <optional>
+      <attribute name="inline-header">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="number"/>
+    </optional>
+    <optional>
+      <attribute name="branch-number"/>
+    </optional>
+    <optional>
+      <attribute name="obligation">
+        <choice>
+          <value>normative</value>
+          <value>informative</value>
+        </choice>
+      </attribute>
+    </optional>
+  </define>
   <define name="reference-clause">
     <element name="clause">
+      <ref name="Section-Attributes"/>
       <optional>
-        <attribute name="id">
-          <data type="ID"/>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="language"/>
-      </optional>
-      <optional>
-        <attribute name="script"/>
-      </optional>
-      <optional>
-        <attribute name="inline-header">
-          <data type="boolean"/>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="number"/>
-      </optional>
-      <optional>
-        <attribute name="branch-number"/>
-      </optional>
-      <optional>
-        <attribute name="obligation">
-          <choice>
-            <value>normative</value>
-            <value>informative</value>
-          </choice>
-        </attribute>
-      </optional>
-      <optional>
         <ref name="section-title"/>
       </optional>
       <zeroOrMore>
         <ref name="BasicBlock"/>
       </zeroOrMore>
@@ -1564,41 +1567,12 @@
     <element name="clause">
       <ref name="Content-Section"/>
     </element>
   </define>
   <define name="Content-Section">
+    <ref name="Section-Attributes"/>
     <optional>
-      <attribute name="id">
-        <data type="ID"/>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="language"/>
-    </optional>
-    <optional>
-      <attribute name="script"/>
-    </optional>
-    <optional>
-      <attribute name="inline-header">
-        <data type="boolean"/>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="obligation">
-        <choice>
-          <value>normative</value>
-          <value>informative</value>
-        </choice>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="number"/>
-    </optional>
-    <optional>
-      <attribute name="branch-number"/>
-    </optional>
-    <optional>
       <attribute name="type"/>
     </optional>
     <optional>
       <ref name="section-title"/>
     </optional>
@@ -1615,44 +1589,15 @@
     <element name="clause">
       <ref name="Clause-Section"/>
     </element>
   </define>
   <define name="Clause-Section">
+    <ref name="Section-Attributes"/>
     <optional>
-      <attribute name="id">
-        <data type="ID"/>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="language"/>
-    </optional>
-    <optional>
-      <attribute name="script"/>
-    </optional>
-    <optional>
-      <attribute name="inline-header">
-        <data type="boolean"/>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="obligation">
-        <choice>
-          <value>normative</value>
-          <value>informative</value>
-        </choice>
-      </attribute>
-    </optional>
-    <optional>
       <attribute name="type"/>
     </optional>
     <optional>
-      <attribute name="number"/>
-    </optional>
-    <optional>
-      <attribute name="branch-number"/>
-    </optional>
-    <optional>
       <ref name="section-title"/>
     </optional>
     <choice>
       <choice>
         <oneOrMore>
@@ -1728,36 +1673,12 @@
       <ref name="Annex-Section"/>
     </element>
   </define>
   <define name="terms">
     <element name="terms">
+      <ref name="Section-Attributes"/>
       <optional>
-        <attribute name="id">
-          <data type="ID"/>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="language"/>
-      </optional>
-      <optional>
-        <attribute name="script"/>
-      </optional>
-      <optional>
         <attribute name="type"/>
-      </optional>
-      <optional>
-        <attribute name="number"/>
-      </optional>
-      <optional>
-        <attribute name="branch-number"/>
-      </optional>
-      <optional>
-        <attribute name="obligation">
-          <choice>
-            <value>normative</value>
-            <value>informative</value>
-          </choice>
-        </attribute>
       </optional>
       <optional>
         <ref name="section-title"/>
       </optional>
       <zeroOrMore>