index-xref: metanorma/metanorma-bipm#67

metanorma · Dec 11, 2020 · 07ce52d · 07ce52d
1 parent b5b6715
commit 07ce52d
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 15 deletions.
diff --git a/grammars/basicdoc.rnc b/grammars/basicdoc.rnc
@@ -231,12 +231,12 @@ index = element index {
   attribute tertiary { text }?
 }
 
-index = element index {
-  attribute primary { text },
-  attribute secondary { text }?,
-  attribute tertiary { text }?,
-  attribute target { text },
-  attribute also { xsd:boolean }
+index-xref = element index-xref {
+  attribute also { xsd:boolean },
+  element primary { PureTextElement+ },
+  element secondary { PureTextElement+ }?,
+  element tertiary { PureTextElement+ }?,
+  element target { PureTextElement+ }
 }
 
 

diff --git a/grammars/basicdoc.rng b/grammars/basicdoc.rng
@@ -738,19 +738,35 @@
       </optional>
     </element>
   </define>
-  <define name="index">
-    <element name="index">
-      <attribute name="primary"/>
+  <define name="index-xref">
+    <element name="index-xref">
+      <attribute name="also">
+        <data type="boolean"/>
+      </attribute>
+      <element name="primary">
+        <oneOrMore>
+          <ref name="PureTextElement"/>
+        </oneOrMore>
+      </element>
       <optional>
-        <attribute name="secondary"/>
+        <element name="secondary">
+          <oneOrMore>
+            <ref name="PureTextElement"/>
+          </oneOrMore>
+        </element>
       </optional>
       <optional>
-        <attribute name="tertiary"/>
+        <element name="tertiary">
+          <oneOrMore>
+            <ref name="PureTextElement"/>
+          </oneOrMore>
+        </element>
       </optional>
-      <attribute name="target"/>
-      <attribute name="also">
-        <data type="boolean"/>
-      </attribute>
+      <element name="target">
+        <oneOrMore>
+          <ref name="PureTextElement"/>
+        </oneOrMore>
+      </element>
     </element>
   </define>
   <!-- bare ID element, used for referencing arbitrary spans of text -->