relaton-gb 0.12.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 852074eca70e37185fece3ea6d720f0b23af4144ba7d4f28c8c4a04a3516abee
-  data.tar.gz: e22768cb97a2b566cc89845be62064a77ea7626bf928aee4a2b93304f9a7ebb9
+  metadata.gz: 5c8881c66b2a0b4eb2ba511988cd00d42d056e53bbf9001327af6d98cd72bb6c
+  data.tar.gz: 04ebe30f467ba5d667a04a9186c69e3a1a593a4792d63ee10915959b80884267
 SHA512:
-  metadata.gz: 12790bcbf1c3837ba7d01647fb2fbc6e5cc70a372841c1f444ef6aa6c8d387f146190c03279578c73f652ce9875c73441453136ff1e12d717ef7863ffd5be63d
-  data.tar.gz: 61b70387d0f4d67984726d6696b055dc2b6ea35a1095ae9749dc7c5207bad34b9207108f842a665a2b478e686eb3fc1d8fe3bd72fdc7f507db0e3001a4abe2ac
+  metadata.gz: 62399e3df8996206f682b7d5b0a81387dc71aa5121033f4ee1374d470808dc0d166b00f6b7339494d2966d2b2646383991b62ff1ff20d421641cdca4cf89f251
+  data.tar.gz: 232c19d3f34bdfb938dacc2325a640850a93e24f8c9cd7eb5e42e2f6b4d8810aafa9bb66b4b386996b22d722ad2e1e22e1c713be55aa5021f2b9fd05449ecfdc

data/grammars/basicdoc.rng

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+  <include href="biblio.rng"/>
   <start>
     <ref name="document"/>
   </start>
-  <include href="biblio.rng" />
   <define name="document">
     <element name="document">
       <optional>
@@ -42,12 +42,6 @@
         <data type="ID"/>
       </attribute>
     </optional>
-    <optional>
-      <attribute name="language"/>
-    </optional>
-    <optional>
-      <attribute name="script"/>
-    </optional>
     <optional>
       <ref name="section-title"/>
     </optional>
@@ -194,14 +188,6 @@
           <data type="boolean"/>
         </attribute>
       </optional>
-      <optional>
-        <attribute name="subsequence"/>
-      </optional>
-      <optional>
-        <attribute name="inequality">
-          <data type="boolean"/>
-        </attribute>
-      </optional>
       <ref name="stem"/>
       <optional>
         <ref name="dl"/>
@@ -255,9 +241,6 @@
           <data type="boolean"/>
         </attribute>
       </optional>
-      <optional>
-        <attribute name="subsequence"/>
-      </optional>
       <optional>
         <attribute name="lang"/>
       </optional>
@@ -302,15 +285,9 @@
           <data type="boolean"/>
         </attribute>
       </optional>
-      <optional>
-        <attribute name="subsequence"/>
-      </optional>
       <optional>
         <attribute name="alt"/>
       </optional>
-      <optional>
-        <attribute name="summary"/>
-      </optional>
       <optional>
         <attribute name="uri">
           <data type="anyURI"/>
@@ -336,9 +313,12 @@
   </define>
   <define name="tname">
     <element name="name">
-      <oneOrMore>
-        <ref name="PureTextElement"/>
-      </oneOrMore>
+      <text/>
+    </element>
+  </define>
+  <define name="tclass">
+    <element name="name">
+      <text/>
     </element>
   </define>
   <define name="thead">
@@ -437,12 +417,6 @@
           <data type="boolean"/>
         </attribute>
       </optional>
-      <optional>
-        <attribute name="subsequence"/>
-      </optional>
-      <optional>
-        <ref name="tname"/>
-      </optional>
       <oneOrMore>
         <choice>
           <ref name="formula"/>
@@ -506,26 +480,18 @@
           <data type="boolean"/>
         </attribute>
       </optional>
-      <optional>
-        <attribute name="subsequence"/>
-      </optional>
-      <optional>
-        <attribute name="class"/>
-      </optional>
       <optional>
         <ref name="source"/>
       </optional>
       <optional>
         <ref name="tname"/>
       </optional>
+      <optional>
+        <ref name="tclass"/>
+      </optional>
       <choice>
         <ref name="image"/>
-        <ref name="video"/>
-        <ref name="audio"/>
         <ref name="pre"/>
-        <oneOrMore>
-          <ref name="paragraph-with-footnote"/>
-        </oneOrMore>
         <zeroOrMore>
           <ref name="figure"/>
         </zeroOrMore>
@@ -812,9 +778,6 @@
       <optional>
         <attribute name="alt"/>
       </optional>
-      <optional>
-        <attribute name="title"/>
-      </optional>
       <optional>
         <attribute name="longdesc">
           <data type="anyURI"/>
@@ -823,7 +786,7 @@
     </element>
   </define>
   <define name="video">
-    <element name="video">
+    <element name="image">
       <attribute name="id">
         <data type="ID"/>
       </attribute>
@@ -853,9 +816,6 @@
       <optional>
         <attribute name="alt"/>
       </optional>
-      <optional>
-        <attribute name="title"/>
-      </optional>
       <optional>
         <attribute name="longdesc">
           <data type="anyURI"/>
@@ -867,7 +827,7 @@
     </element>
   </define>
   <define name="audio">
-    <element name="audio">
+    <element name="image">
       <attribute name="id">
         <data type="ID"/>
       </attribute>
@@ -881,9 +841,6 @@
       <optional>
         <attribute name="alt"/>
       </optional>
-      <optional>
-        <attribute name="title"/>
-      </optional>
       <optional>
         <attribute name="longdesc">
           <data type="anyURI"/>

data/grammars/biblio.rng

@@ -49,11 +49,17 @@
   </define>
   <define name="stage">
     <element name="stage">
+      <optional>
+        <attribute name="abbreviation"/>
+      </optional>
       <text/>
     </element>
   </define>
   <define name="substage">
     <element name="substage">
+      <optional>
+        <attribute name="abbreviation"/>
+      </optional>
       <text/>
     </element>
   </define>
@@ -452,9 +458,14 @@
     <attribute name="bibitemid">
       <data type="IDREF"/>
     </attribute>
-    <zeroOrMore>
-      <ref name="locality"/>
-    </zeroOrMore>
+    <choice>
+      <zeroOrMore>
+        <ref name="locality"/>
+      </zeroOrMore>
+      <zeroOrMore>
+        <ref name="localityStack"/>
+      </zeroOrMore>
+    </choice>
     <optional>
       <ref name="date"/>
     </optional>
@@ -469,6 +480,25 @@
       <ref name="BibItemLocality"/>
     </element>
   </define>
+  <define name="localityStack">
+    <element name="localityStack">
+      <zeroOrMore>
+        <ref name="locality"/>
+      </zeroOrMore>
+    </element>
+  </define>
+  <define name="sourceLocality">
+    <element name="sourceLocality">
+      <ref name="BibItemLocality"/>
+    </element>
+  </define>
+  <define name="sourceLocalityStack">
+    <element name="sourceLocalityStack">
+      <zeroOrMore>
+        <ref name="sourceLocality"/>
+      </zeroOrMore>
+    </element>
+  </define>
   <define name="BibItemLocality">
     <attribute name="type">
       <ref name="LocalityType"/>
@@ -703,21 +733,11 @@
   </define>
   <define name="TypedTitleString">
     <optional>
-      <attribute name="type">
-        <ref name="TitleType"/>
-      </attribute>
+      <attribute name="type"/>
     </optional>
     <ref name="FormattedString"/>
   </define>
-  <define name="TitleType">
-    <choice>
-      <value>alternative</value>
-      <value>original</value>
-      <value>unofficial</value>
-      <value>subtitle</value>
-      <value>main</value>
-    </choice>
-  </define>
+  <!-- TitleType = ( "alternative" | "original" | "unofficial" | "subtitle" | "main" ) -->
   <define name="TypedUri">
     <optional>
       <attribute name="type"/>
@@ -1038,12 +1058,30 @@
       <attribute name="type">
         <ref name="DocRelationType"/>
       </attribute>
+      <optional>
+        <element name="description">
+          <ref name="FormattedString"/>
+        </element>
+      </optional>
       <element name="bibitem">
         <ref name="BibliographicItem"/>
       </element>
-      <zeroOrMore>
-        <ref name="locality"/>
-      </zeroOrMore>
+      <choice>
+        <zeroOrMore>
+          <ref name="locality"/>
+        </zeroOrMore>
+        <zeroOrMore>
+          <ref name="localityStack"/>
+        </zeroOrMore>
+      </choice>
+      <choice>
+        <zeroOrMore>
+          <ref name="sourceLocality"/>
+        </zeroOrMore>
+        <zeroOrMore>
+          <ref name="sourceLocalityStack"/>
+        </zeroOrMore>
+      </choice>
     </element>
   </define>
   <define name="version">

data/grammars/gbstandard.rng

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-  <!-- default namespace = "http://riboseinc.com/gbstandard" -->
+  <!-- default namespace = "https://www.metanorma.com/ns/gb" -->
   <!--
     Currently we inherit from a namespaced grammar, isostandard. Unless we inherit from isodoc,
     we cannot have a new default namespace: we will end up with a grammar with two different
@@ -67,6 +67,9 @@
         <ref name="ics"/>
       </zeroOrMore>
       <ref name="structuredidentifier"/>
+      <optional>
+        <ref name="stagename"/>
+      </optional>
       <ref name="gbtype"/>
       <oneOrMore>
         <ref name="gbccs"/>

data/grammars/isodoc.rng

@@ -24,21 +24,91 @@
     <start>
       <ref name="standard-document"/>
     </start>
+    <define name="hyperlink">
+      <element name="link">
+        <attribute name="target">
+          <data type="anyURI"/>
+        </attribute>
+        <optional>
+          <attribute name="type">
+            <ref name="ReferenceFormat"/>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="alt"/>
+        </optional>
+        <text/>
+      </element>
+    </define>
+    <define name="xref">
+      <element name="xref">
+        <attribute name="target">
+          <data type="IDREF"/>
+        </attribute>
+        <optional>
+          <attribute name="type">
+            <ref name="ReferenceFormat"/>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="alt"/>
+        </optional>
+        <text/>
+      </element>
+    </define>
+    <define name="example">
+      <element name="example">
+        <attribute name="id">
+          <data type="ID"/>
+        </attribute>
+        <optional>
+          <attribute name="unnumbered">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="subsequence"/>
+        </optional>
+        <optional>
+          <ref name="tname"/>
+        </optional>
+        <oneOrMore>
+          <choice>
+            <ref name="formula"/>
+            <ref name="ul"/>
+            <ref name="ol"/>
+            <ref name="dl"/>
+            <ref name="quote"/>
+            <ref name="sourcecode"/>
+            <ref name="paragraph-with-footnote"/>
+            <ref name="figure"/>
+          </choice>
+        </oneOrMore>
+        <zeroOrMore>
+          <ref name="note"/>
+        </zeroOrMore>
+      </element>
+    </define>
     <define name="BibDataExtensionType">
       <ref name="doctype"/>
+      <optional>
+        <ref name="editorialgroup"/>
+      </optional>
+      <zeroOrMore>
+        <ref name="ics"/>
+      </zeroOrMore>
       <zeroOrMore>
         <ref name="structuredidentifier"/>
       </zeroOrMore>
     </define>
-    <define name="TitleType">
-      <text/>
-    </define>
+    <!-- TitleType = text -->
     <define name="sections">
       <element name="sections">
         <oneOrMore>
           <choice>
             <ref name="clause"/>
             <ref name="terms"/>
+            <ref name="term-clause"/>
             <ref name="definitions"/>
           </choice>
         </oneOrMore>
@@ -51,21 +121,300 @@
             <data type="ID"/>
           </attribute>
         </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>
+        <zeroOrMore>
+          <ref name="note"/>
+        </zeroOrMore>
         <zeroOrMore>
           <ref name="bibitem"/>
           <zeroOrMore>
             <ref name="note"/>
           </zeroOrMore>
         </zeroOrMore>
+        <zeroOrMore>
+          <ref name="references"/>
+        </zeroOrMore>
+      </element>
+    </define>
+    <define name="note">
+      <element name="note">
+        <attribute name="id">
+          <data type="ID"/>
+        </attribute>
+        <oneOrMore>
+          <choice>
+            <ref name="paragraph"/>
+            <ref name="ul"/>
+            <ref name="ol"/>
+            <ref name="dl"/>
+            <ref name="formula"/>
+          </choice>
+        </oneOrMore>
+      </element>
+    </define>
+    <define name="Basic-Section">
+      <optional>
+        <attribute name="id">
+          <data type="ID"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="language"/>
+      </optional>
+      <optional>
+        <attribute name="script"/>
+      </optional>
+      <optional>
+        <attribute name="obligation">
+          <choice>
+            <value>normative</value>
+            <value>informative</value>
+          </choice>
+        </attribute>
+      </optional>
+      <optional>
+        <ref name="section-title"/>
+      </optional>
+      <group>
+        <oneOrMore>
+          <ref name="BasicBlock"/>
+        </oneOrMore>
+        <zeroOrMore>
+          <ref name="note"/>
+        </zeroOrMore>
+      </group>
+    </define>
+    <define name="li">
+      <element name="li">
+        <group>
+          <optional>
+            <attribute name="id">
+              <data type="ID"/>
+            </attribute>
+          </optional>
+          <oneOrMore>
+            <ref name="BasicBlock"/>
+          </oneOrMore>
+        </group>
+        <!-- exclude figures? -->
+      </element>
+    </define>
+    <define name="dd">
+      <element name="dd">
+        <zeroOrMore>
+          <!-- exclude figures? -->
+          <ref name="BasicBlock"/>
+        </zeroOrMore>
       </element>
     </define>
+    <define name="thead">
+      <element name="thead">
+        <oneOrMore>
+          <ref name="tr"/>
+        </oneOrMore>
+      </element>
+    </define>
+    <define name="td">
+      <element name="td">
+        <optional>
+          <attribute name="colspan"/>
+        </optional>
+        <optional>
+          <attribute name="rowspan"/>
+        </optional>
+        <optional>
+          <attribute name="align">
+            <choice>
+              <value>left</value>
+              <value>right</value>
+              <value>center</value>
+            </choice>
+          </attribute>
+        </optional>
+        <choice>
+          <zeroOrMore>
+            <choice>
+              <ref name="TextElement"/>
+              <ref name="fn"/>
+            </choice>
+          </zeroOrMore>
+          <oneOrMore>
+            <choice>
+              <ref name="paragraph-with-footnote"/>
+              <ref name="dl"/>
+              <ref name="ul"/>
+              <ref name="ol"/>
+              <ref name="figure"/>
+            </choice>
+          </oneOrMore>
+        </choice>
+      </element>
+    </define>
+    <define name="th">
+      <element name="th">
+        <optional>
+          <attribute name="colspan"/>
+        </optional>
+        <optional>
+          <attribute name="rowspan"/>
+        </optional>
+        <optional>
+          <attribute name="align">
+            <choice>
+              <value>left</value>
+              <value>right</value>
+              <value>center</value>
+            </choice>
+          </attribute>
+        </optional>
+        <choice>
+          <zeroOrMore>
+            <choice>
+              <ref name="TextElement"/>
+              <ref name="fn"/>
+            </choice>
+          </zeroOrMore>
+          <oneOrMore>
+            <ref name="paragraph-with-footnote"/>
+          </oneOrMore>
+        </choice>
+      </element>
+    </define>
+    <define name="table-note">
+      <element name="note">
+        <optional>
+          <attribute name="id">
+            <data type="ID"/>
+          </attribute>
+        </optional>
+        <ref name="paragraph"/>
+      </element>
+    </define>
+    <define name="TextElement" combine="choice">
+      <ref name="concept"/>
+    </define>
   </include>
+  <!-- end overrides -->
+  <define name="concept">
+    <element name="concept">
+      <optional>
+        <attribute name="term"/>
+      </optional>
+      <choice>
+        <ref name="eref"/>
+        <ref name="xref"/>
+        <ref name="termref"/>
+      </choice>
+    </element>
+  </define>
+  <define name="BasicBlock" combine="choice">
+    <choice>
+      <ref name="requirement"/>
+      <ref name="recommendation"/>
+      <ref name="permission"/>
+    </choice>
+  </define>
+  <define name="bibliography">
+    <element name="bibliography">
+      <oneOrMore>
+        <choice>
+          <ref name="references"/>
+          <ref name="reference-clause"/>
+        </choice>
+      </oneOrMore>
+    </element>
+  </define>
+  <define name="reference-clause">
+    <element name="clause">
+      <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>
+        <ref name="section-title"/>
+      </optional>
+      <zeroOrMore>
+        <ref name="BasicBlock"/>
+      </zeroOrMore>
+      <zeroOrMore>
+        <ref name="note"/>
+      </zeroOrMore>
+      <choice>
+        <oneOrMore>
+          <ref name="reference-clause"/>
+        </oneOrMore>
+        <zeroOrMore>
+          <ref name="references"/>
+        </zeroOrMore>
+      </choice>
+    </element>
+  </define>
+  <define name="editorialgroup">
+    <element name="editorialgroup">
+      <oneOrMore>
+        <ref name="technical-committee"/>
+      </oneOrMore>
+    </element>
+  </define>
+  <define name="technical-committee">
+    <element name="technical-committee">
+      <ref name="IsoWorkgroup"/>
+    </element>
+  </define>
+  <define name="IsoWorkgroup">
+    <optional>
+      <attribute name="number">
+        <data type="int"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="type"/>
+    </optional>
+    <text/>
+  </define>
+  <define name="ics">
+    <element name="ics">
+      <element name="code">
+        <text/>
+      </element>
+      <element name="text">
+        <text/>
+      </element>
+    </element>
+  </define>
   <define name="standard-document">
     <element name="standard-document">
       <ref name="bibdata"/>
@@ -89,7 +438,7 @@
       <oneOrMore>
         <choice>
           <ref name="content"/>
-          <ref name="abstract"/>
+          <ref name="preface_abstract"/>
           <ref name="foreword"/>
           <ref name="introduction"/>
           <ref name="acknowledgements"/>
@@ -156,6 +505,14 @@
       <optional>
         <attribute name="script"/>
       </optional>
+      <optional>
+        <attribute name="obligation">
+          <choice>
+            <value>normative</value>
+            <value>informative</value>
+          </choice>
+        </attribute>
+      </optional>
       <optional>
         <ref name="section-title"/>
       </optional>
@@ -163,6 +520,9 @@
         <zeroOrMore>
           <ref name="BasicBlock"/>
         </zeroOrMore>
+        <zeroOrMore>
+          <ref name="note"/>
+        </zeroOrMore>
         <ref name="dl"/>
       </oneOrMore>
     </element>
@@ -202,22 +562,35 @@
     <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>
       <ref name="section-title"/>
     </optional>
-    <choice>
+    <group>
       <group>
-        <optional>
+        <zeroOrMore>
           <ref name="BasicBlock"/>
-        </optional>
+        </zeroOrMore>
         <zeroOrMore>
           <ref name="note"/>
         </zeroOrMore>
       </group>
-      <oneOrMore>
+      <zeroOrMore>
         <ref name="content-subsection"/>
-      </oneOrMore>
-    </choice>
+      </zeroOrMore>
+    </group>
   </define>
   <define name="clause">
     <element name="clause">
@@ -239,32 +612,97 @@
     <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>
       <ref name="section-title"/>
     </optional>
-    <choice>
+    <group>
       <group>
-        <optional>
+        <zeroOrMore>
           <ref name="BasicBlock"/>
-        </optional>
+        </zeroOrMore>
         <zeroOrMore>
           <ref name="note"/>
         </zeroOrMore>
       </group>
-      <oneOrMore>
+      <zeroOrMore>
         <choice>
           <ref name="clause-subsection"/>
           <ref name="terms"/>
           <ref name="definitions"/>
         </choice>
-      </oneOrMore>
-    </choice>
+      </zeroOrMore>
+    </group>
+  </define>
+  <define name="Annex-Section">
+    <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>
+      <ref name="section-title"/>
+    </optional>
+    <group>
+      <group>
+        <zeroOrMore>
+          <ref name="BasicBlock"/>
+        </zeroOrMore>
+        <zeroOrMore>
+          <ref name="note"/>
+        </zeroOrMore>
+      </group>
+      <zeroOrMore>
+        <choice>
+          <ref name="annex-subsection"/>
+          <ref name="terms"/>
+          <ref name="definitions"/>
+          <ref name="references"/>
+        </choice>
+      </zeroOrMore>
+    </group>
   </define>
   <define name="clause-subsection">
     <element name="clause">
       <ref name="Clause-Section"/>
     </element>
   </define>
+  <define name="annex-subsection">
+    <element name="clause">
+      <ref name="Annex-Section"/>
+    </element>
+  </define>
   <define name="annex">
     <element name="annex">
       <optional>
@@ -278,6 +716,11 @@
       <optional>
         <attribute name="script"/>
       </optional>
+      <optional>
+        <attribute name="inline-header">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
       <attribute name="obligation">
         <choice>
           <value>normative</value>
@@ -287,19 +730,24 @@
       <optional>
         <ref name="section-title"/>
       </optional>
-      <choice>
+      <group>
         <group>
-          <optional>
+          <zeroOrMore>
             <ref name="BasicBlock"/>
-          </optional>
+          </zeroOrMore>
           <zeroOrMore>
             <ref name="note"/>
           </zeroOrMore>
         </group>
-        <oneOrMore>
-          <ref name="clause-subsection"/>
-        </oneOrMore>
-      </choice>
+        <zeroOrMore>
+          <choice>
+            <ref name="annex-subsection"/>
+            <ref name="terms"/>
+            <ref name="definitions"/>
+            <ref name="references"/>
+          </choice>
+        </zeroOrMore>
+      </group>
     </element>
   </define>
   <define name="terms">
@@ -315,12 +763,36 @@
       <optional>
         <attribute name="script"/>
       </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>
-      <oneOrMore>
-        <ref name="term"/>
-      </oneOrMore>
+      <zeroOrMore>
+        <ref name="note"/>
+      </zeroOrMore>
+      <choice>
+        <oneOrMore>
+          <ref name="term"/>
+        </oneOrMore>
+        <group>
+          <zeroOrMore>
+            <ref name="terms"/>
+          </zeroOrMore>
+          <optional>
+            <ref name="definitions"/>
+          </optional>
+        </group>
+      </choice>
     </element>
   </define>
   <define name="term">
@@ -413,7 +885,13 @@
   </define>
   <define name="definition">
     <element name="definition">
-      <ref name="paragraph"/>
+      <oneOrMore>
+        <choice>
+          <ref name="paragraph"/>
+          <ref name="figure"/>
+          <ref name="formula"/>
+        </choice>
+      </oneOrMore>
     </element>
   </define>
   <define name="termnote">
@@ -448,7 +926,10 @@
   </define>
   <define name="origin">
     <element name="origin">
-      <ref name="erefType"/>
+      <choice>
+        <ref name="erefType"/>
+        <ref name="termref"/>
+      </choice>
     </element>
   </define>
   <define name="modification">
@@ -456,6 +937,15 @@
       <ref name="paragraph"/>
     </element>
   </define>
+  <define name="termref">
+    <element name="termref">
+      <attribute name="base"/>
+      <attribute name="target"/>
+      <optional>
+        <text/>
+      </optional>
+    </element>
+  </define>
   <define name="structuredidentifier">
     <element name="structuredidentifier">
       <optional>
@@ -511,4 +1001,58 @@
       </optional>
     </element>
   </define>
+  <define name="preface_abstract">
+    <element name="abstract">
+      <ref name="Basic-Section"/>
+    </element>
+  </define>
+  <define name="term-clause">
+    <element name="clause">
+      <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>
+        <ref name="section-title"/>
+      </optional>
+      <zeroOrMore>
+        <ref name="BasicBlock"/>
+      </zeroOrMore>
+      <zeroOrMore>
+        <ref name="note"/>
+      </zeroOrMore>
+      <zeroOrMore>
+        <choice>
+          <ref name="term-clause"/>
+          <ref name="terms"/>
+          <ref name="definitions"/>
+        </choice>
+      </zeroOrMore>
+    </element>
+  </define>
+  <define name="termdocsource">
+    <element name="termdocsource">
+      <ref name="CitationType"/>
+    </element>
+  </define>
 </grammar>