make index terms be elements not attributes, to preserve formatting: m…

…etanorma/metanorma-bipm#67
metanorma · Dec 16, 2020 · 85ae49e · 85ae49e
1 parent 07ce52d
commit 85ae49e
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/grammars/basicdoc.rnc b/grammars/basicdoc.rnc
@@ -226,9 +226,9 @@ hr = element hr { empty }
 pagebreak = element pagebreak { empty }
 
 index = element index {
-  attribute primary { text },
-  attribute secondary { text }?,
-  attribute tertiary { text }?
+  element primary { PureTextElement+ },
+  element secondary { PureTextElement+ }?,
+  element tertiary { PureTextElement+ }?
 }
 
 index-xref = element index-xref {

diff --git a/grammars/basicdoc.rng b/grammars/basicdoc.rng
@@ -729,12 +729,24 @@
   </define>
   <define name="index">
     <element name="index">
-      <attribute name="primary"/>
+      <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>
     </element>
   </define>