isodoc.rng in metanorma-ietf-3.0.13

- old
+ new

@@ -175,15 +175,11 @@
             <data type="boolean"/>
           </attribute>
         </optional>
         <optional>
           <attribute name="style">
-            <choice>
-              <value>basic</value>
-              <value>full</value>
-              <value>short</value>
-            </choice>
+            <ref name="XrefStyleType"/>
           </attribute>
         </optional>
         <ref name="XrefBody"/>
       </element>
     </define>
@@ -1029,10 +1025,11 @@
           <choice>
             <ref name="PureTextElement"/>
             <ref name="stem"/>
             <ref name="index"/>
             <ref name="eref"/>
+            <ref name="erefstack"/>
             <ref name="xref"/>
             <ref name="hyperlink"/>
           </choice>
         </zeroOrMore>
       </element>
@@ -1043,10 +1040,11 @@
           <choice>
             <ref name="PureTextElement"/>
             <ref name="stem"/>
             <ref name="index"/>
             <ref name="eref"/>
+            <ref name="erefstack"/>
             <ref name="xref"/>
             <ref name="hyperlink"/>
           </choice>
         </zeroOrMore>
       </element>
@@ -1056,10 +1054,11 @@
         <zeroOrMore>
           <choice>
             <ref name="PureTextElement"/>
             <ref name="index"/>
             <ref name="eref"/>
+            <ref name="erefstack"/>
             <ref name="xref"/>
             <ref name="hyperlink"/>
           </choice>
         </zeroOrMore>
       </element>
@@ -1193,17 +1192,19 @@
     <choice>
       <ref name="concept"/>
       <ref name="add"/>
       <ref name="del"/>
       <ref name="span"/>
+      <ref name="erefstack"/>
     </choice>
   </define>
   <define name="add">
     <element name="add">
       <choice>
         <ref name="PureTextElement"/>
         <ref name="eref"/>
+        <ref name="erefstack"/>
         <ref name="stem"/>
         <ref name="keyword"/>
         <ref name="xref"/>
         <ref name="hyperlink"/>
       </choice>
@@ -1212,10 +1213,11 @@
   <define name="del">
     <element name="del">
       <choice>
         <ref name="PureTextElement"/>
         <ref name="eref"/>
+        <ref name="erefstack"/>
         <ref name="stem"/>
         <ref name="keyword"/>
         <ref name="xref"/>
         <ref name="hyperlink"/>
       </choice>
@@ -1276,10 +1278,11 @@
           </zeroOrMore>
         </element>
       </optional>
       <choice>
         <ref name="eref"/>
+        <ref name="erefstack"/>
         <ref name="xref"/>
         <ref name="termref"/>
       </choice>
     </element>
   </define>
@@ -1968,10 +1971,11 @@
       <element name="preferred">
         <ref name="Designation"/>
       </element>
       <choice>
         <ref name="eref"/>
+        <ref name="erefstack"/>
         <ref name="xref"/>
         <ref name="termref"/>
       </choice>
     </element>
   </define>
@@ -2523,10 +2527,11 @@
           </attribute>
           <choice>
             <ref name="xref"/>
             <ref name="hyperlink"/>
             <ref name="eref"/>
+            <ref name="erefstack"/>
           </choice>
           <oneOrMore>
             <element name="coords">
               <attribute name="x">
                 <data type="float"/>
@@ -2570,10 +2575,11 @@
           </attribute>
           <choice>
             <ref name="xref"/>
             <ref name="hyperlink"/>
             <ref name="eref"/>
+            <ref name="erefstack"/>
           </choice>
         </element>
       </zeroOrMore>
     </element>
   </define>
@@ -2618,25 +2624,53 @@
     </zeroOrMore>
     <oneOrMore>
       <ref name="PureTextElement"/>
     </oneOrMore>
   </define>
+  <define name="XrefConnectiveType">
+    <choice>
+      <value>and</value>
+      <value>or</value>
+      <value>from</value>
+      <value>to</value>
+      <value/>
+    </choice>
+  </define>
   <define name="XrefTarget">
     <element name="location">
       <attribute name="target">
         <data type="string">
           <param name="pattern">\i\c*|\c+#\c+</param>
         </data>
       </attribute>
       <attribute name="connective">
-        <choice>
-          <value>and</value>
-          <value>or</value>
-          <value>from</value>
-          <value>to</value>
-          <value/>
-        </choice>
+        <ref name="XrefConnectiveType"/>
       </attribute>
+    </element>
+  </define>
+  <define name="XrefStyleType">
+    <choice>
+      <value>basic</value>
+      <value>full</value>
+      <value>short</value>
+      <value>id</value>
+    </choice>
+  </define>
+  <define name="erefTypeWithConnective">
+    <optional>
+      <attribute name="connective">
+        <ref name="XrefConnectiveType"/>
+      </attribute>
+    </optional>
+    <ref name="erefType"/>
+  </define>
+  <define name="erefstack">
+    <element name="erefstack">
+      <oneOrMore>
+        <element name="eref">
+          <ref name="erefTypeWithConnective"/>
+        </element>
+      </oneOrMore>
     </element>
   </define>
   <start>
     <ref name="standard-document"/>
   </start>