lib/metanorma/ietf/isodoc.rng in metanorma-ietf-3.2.2 vs lib/metanorma/ietf/isodoc.rng in metanorma-ietf-3.2.3

@@ -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.4 -->
+<!-- VERSION v1.2.6 -->
 <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">
@@ -483,10 +483,12 @@
         </optional>
         <oneOrMore>
           <choice>
             <text/>
             <ref name="callout"/>
+            <ref name="xref"/>
+            <ref name="eref"/>
           </choice>
         </oneOrMore>
         <zeroOrMore>
           <ref name="annotation"/>
         </zeroOrMore>
@@ -863,10 +865,11 @@
         <zeroOrMore>
           <choice>
             <ref name="PureTextElement"/>
             <ref name="stem"/>
             <ref name="index"/>
+            <ref name="index-xref"/>
             <ref name="eref"/>
             <ref name="erefstack"/>
             <ref name="xref"/>
             <ref name="hyperlink"/>
           </choice>
@@ -878,10 +881,11 @@
         <zeroOrMore>
           <choice>
             <ref name="PureTextElement"/>
             <ref name="stem"/>
             <ref name="index"/>
+            <ref name="index-xref"/>
             <ref name="eref"/>
             <ref name="erefstack"/>
             <ref name="xref"/>
             <ref name="hyperlink"/>
           </choice>
@@ -892,10 +896,11 @@
       <element name="tt">
         <zeroOrMore>
           <choice>
             <ref name="PureTextElement"/>
             <ref name="index"/>
+            <ref name="index-xref"/>
             <ref name="eref"/>
             <ref name="erefstack"/>
             <ref name="xref"/>
             <ref name="hyperlink"/>
           </choice>
@@ -906,40 +911,44 @@
       <element name="keyword">
         <zeroOrMore>
           <choice>
             <ref name="PureTextElement"/>
             <ref name="index"/>
+            <ref name="index-xref"/>
           </choice>
         </zeroOrMore>
       </element>
     </define>
     <define name="strike">
       <element name="strike">
         <zeroOrMore>
           <choice>
             <ref name="PureTextElement"/>
             <ref name="index"/>
+            <ref name="index-xref"/>
           </choice>
         </zeroOrMore>
       </element>
     </define>
     <define name="underline">
       <element name="underline">
         <zeroOrMore>
           <choice>
             <ref name="PureTextElement"/>
             <ref name="index"/>
+            <ref name="index-xref"/>
           </choice>
         </zeroOrMore>
       </element>
     </define>
     <define name="smallcap">
       <element name="smallcap">
         <zeroOrMore>
           <choice>
             <ref name="PureTextElement"/>
             <ref name="index"/>
+            <ref name="index-xref"/>
           </choice>
         </zeroOrMore>
       </element>
     </define>
     <define name="sub">
@@ -1002,10 +1011,18 @@
           <ref name="AnyElement"/>
         </choice>
       </oneOrMore>
     </element>
   </define>
+  <define name="BasicBlock" combine="choice">
+    <ref name="columnbreak"/>
+  </define>
+  <define name="columnbreak">
+    <element name="columnbreak">
+      <empty/>
+    </element>
+  </define>
   <define name="MultilingualRenderingType">
     <choice>
       <value>common</value>
       <value>all-columns</value>
       <value>parallel</value>
@@ -1045,10 +1062,12 @@
         <ref name="erefstack"/>
         <ref name="stem"/>
         <ref name="keyword"/>
         <ref name="xref"/>
         <ref name="hyperlink"/>
+        <ref name="index"/>
+        <ref name="index-xref"/>
       </choice>
     </element>
   </define>
   <define name="del">
     <element name="del">
@@ -1058,10 +1077,12 @@
         <ref name="erefstack"/>
         <ref name="stem"/>
         <ref name="keyword"/>
         <ref name="xref"/>
         <ref name="hyperlink"/>
+        <ref name="index"/>
+        <ref name="index-xref"/>
       </choice>
     </element>
   </define>
   <define name="span">
     <element name="span">
@@ -1124,19 +1145,23 @@
         <element name="refterm">
           <zeroOrMore>
             <choice>
               <ref name="PureTextElement"/>
               <ref name="stem"/>
+              <ref name="index"/>
+              <ref name="index-xref"/>
             </choice>
           </zeroOrMore>
         </element>
       </optional>
       <optional>
         <element name="renderterm">
           <zeroOrMore>
             <choice>
               <ref name="PureTextElement"/>
               <ref name="stem"/>
+              <ref name="index"/>
+              <ref name="index-xref"/>
             </choice>
           </zeroOrMore>
         </element>
       </optional>
       <choice>