metanorma-csand 1.2.2 → 1.2.3

data/lib/asciidoctor/csand/biblio.rng

@@ -73,6 +73,9 @@
   <define name="edition">
     <a:documentation>ISO-15924: Latn</a:documentation>
     <element name="edition">
+      <optional>
+        <attribute name="number"/>
+      </optional>
       <text/>
     </element>
   </define>
@@ -184,29 +187,35 @@
   </define>
   <define name="fullname">
     <element name="name">
-      <choice>
-        <group>
-          <zeroOrMore>
-            <ref name="prefix"/>
-          </zeroOrMore>
-          <zeroOrMore>
-            <ref name="forename"/>
-          </zeroOrMore>
-          <zeroOrMore>
-            <ref name="initial"/>
-          </zeroOrMore>
-          <ref name="surname"/>
-          <zeroOrMore>
-            <ref name="addition"/>
-          </zeroOrMore>
-        </group>
-        <ref name="completeName"/>
-      </choice>
-      <zeroOrMore>
-        <ref name="biblionote"/>
-      </zeroOrMore>
+      <ref name="FullNameType"/>
     </element>
   </define>
+  <define name="FullNameType">
+    <choice>
+      <group>
+        <zeroOrMore>
+          <ref name="prefix"/>
+        </zeroOrMore>
+        <zeroOrMore>
+          <ref name="forename"/>
+        </zeroOrMore>
+        <zeroOrMore>
+          <ref name="initial"/>
+        </zeroOrMore>
+        <ref name="surname"/>
+        <zeroOrMore>
+          <ref name="addition"/>
+        </zeroOrMore>
+      </group>
+      <ref name="completeName"/>
+    </choice>
+    <zeroOrMore>
+      <ref name="biblionote"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="variantname"/>
+    </zeroOrMore>
+  </define>
   <define name="prefix">
     <element name="prefix">
       <ref name="LocalizedString"/>
@@ -237,6 +246,12 @@
       <ref name="LocalizedString"/>
     </element>
   </define>
+  <define name="variantname">
+    <element name="variant">
+      <attribute name="type"/>
+      <ref name="FullNameType"/>
+    </element>
+  </define>
   <define name="affiliation">
     <element name="affiliation">
       <optional>
@@ -280,13 +295,40 @@
   </define>
   <define name="orgname">
     <element name="name">
-      <ref name="LocalizedString"/>
+      <choice>
+        <ref name="LocalizedString"/>
+        <ref name="NameWithVariants"/>
+      </choice>
     </element>
   </define>
   <define name="subdivision">
     <element name="subdivision">
+      <choice>
+        <ref name="LocalizedString"/>
+        <ref name="NameWithVariants"/>
+      </choice>
+    </element>
+  </define>
+  <define name="NameWithVariants">
+    <element name="primary">
+      <ref name="LocalizedString"/>
+    </element>
+    <zeroOrMore>
+      <element name="variant">
+        <ref name="NameWithVariants1"/>
+      </element>
+    </zeroOrMore>
+  </define>
+  <define name="NameWithVariants1">
+    <attribute name="type"/>
+    <element name="primary">
       <ref name="LocalizedString"/>
     </element>
+    <zeroOrMore>
+      <element name="variant">
+        <ref name="NameWithVariants1"/>
+      </element>
+    </zeroOrMore>
   </define>
   <define name="abbreviation">
     <element name="abbreviation">
@@ -423,14 +465,16 @@
     <attribute name="type">
       <ref name="LocalityType"/>
     </attribute>
-    <ref name="referenceFrom"/>
+    <optional>
+      <ref name="referenceFrom"/>
+    </optional>
     <optional>
       <ref name="referenceTo"/>
     </optional>
   </define>
   <define name="LocalityType">
     <data type="string">
-      <param name="pattern">section|clause|part|paragraph|chapter|page|whole|table|annex|figure|note|list|example|volume|issue|locality:[a-zA-Z0-9_]+</param>
+      <param name="pattern">section|clause|part|paragraph|chapter|page|whole|table|annex|figure|note|list|example|volume|issue|time|locality:[a-zA-Z0-9_]+</param>
     </data>
   </define>
   <define name="referenceFrom">
@@ -476,7 +520,6 @@
       <value>article</value>
       <value>book</value>
       <value>booklet</value>
-      <value>conference</value>
       <value>manual</value>
       <value>proceedings</value>
       <value>presentation</value>
@@ -490,6 +533,7 @@
       <value>film</value>
       <value>video</value>
       <value>broadcast</value>
+      <value>software</value>
       <value>graphic_work</value>
       <value>music</value>
       <value>patent</value>
@@ -497,6 +541,15 @@
       <value>incollection</value>
       <value>inproceedings</value>
       <value>journal</value>
+      <value>website</value>
+      <value>webresource</value>
+      <value>dataset</value>
+      <value>archival</value>
+      <value>social_media</value>
+      <value>alert</value>
+      <value>message</value>
+      <value>conversation</value>
+      <value>misc</value>
     </choice>
   </define>
   <define name="BibliographicItem">
@@ -545,7 +598,7 @@
       <ref name="script"/>
     </zeroOrMore>
     <zeroOrMore>
-      <ref name="abstract"/>
+      <ref name="bibabstract"/>
     </zeroOrMore>
     <optional>
       <ref name="status"/>
@@ -565,15 +618,24 @@
     <zeroOrMore>
       <ref name="bplace"/>
     </zeroOrMore>
+    <zeroOrMore>
+      <ref name="bprice"/>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="extent"/>
     </zeroOrMore>
     <zeroOrMore>
       <ref name="accesslocation"/>
     </zeroOrMore>
+    <zeroOrMore>
+      <ref name="license"/>
+    </zeroOrMore>
     <optional>
       <ref name="bclassification"/>
     </optional>
+    <zeroOrMore>
+      <ref name="bkeyword"/>
+    </zeroOrMore>
     <optional>
       <ref name="validity"/>
     </optional>
@@ -593,6 +655,11 @@
       <ref name="FormattedString"/>
     </element>
   </define>
+  <define name="license">
+    <element name="license">
+      <text/>
+    </element>
+  </define>
   <define name="fetched">
     <element name="fetched">
       <ref name="ISO8601DateTime"/>
@@ -671,6 +738,7 @@
       <value>copied</value>
       <value>unchanged</value>
       <value>circulated</value>
+      <value>adapted</value>
     </choice>
   </define>
   <define name="bdate">
@@ -681,21 +749,26 @@
           <text/>
         </choice>
       </attribute>
-      <choice>
-        <group>
-          <element name="from">
-            <ref name="ISO8601Date"/>
-          </element>
-          <optional>
-            <element name="to">
+      <optional>
+        <attribute name="text"/>
+      </optional>
+      <optional>
+        <choice>
+          <group>
+            <element name="from">
               <ref name="ISO8601Date"/>
             </element>
-          </optional>
-        </group>
-        <element name="on">
-          <ref name="ISO8601Date"/>
-        </element>
-      </choice>
+            <optional>
+              <element name="to">
+                <ref name="ISO8601Date"/>
+              </element>
+            </optional>
+          </group>
+          <element name="on">
+            <ref name="ISO8601Date"/>
+          </element>
+        </choice>
+      </optional>
     </element>
   </define>
   <define name="docidentifier">
@@ -703,6 +776,9 @@
       <optional>
         <attribute name="type"/>
       </optional>
+      <optional>
+        <attribute name="scope"/>
+      </optional>
       <text/>
     </element>
   </define>
@@ -721,14 +797,37 @@
   </define>
   <define name="bplace">
     <element name="place">
+      <optional>
+        <attribute name="uri">
+          <data type="anyURI"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="region"/>
+      </optional>
+      <text/>
+    </element>
+  </define>
+  <define name="bprice">
+    <element name="price">
+      <attribute name="currency"/>
       <text/>
     </element>
   </define>
   <define name="medium">
     <element name="medium">
+      <optional>
+        <ref name="bcontent"/>
+      </optional>
+      <optional>
+        <ref name="genre"/>
+      </optional>
       <optional>
         <ref name="form"/>
       </optional>
+      <optional>
+        <ref name="carrier"/>
+      </optional>
       <optional>
         <ref name="size"/>
       </optional>
@@ -737,11 +836,26 @@
       </optional>
     </element>
   </define>
+  <define name="bcontent">
+    <element name="content">
+      <text/>
+    </element>
+  </define>
+  <define name="genre">
+    <element name="genre">
+      <text/>
+    </element>
+  </define>
   <define name="form">
     <element name="form">
       <text/>
     </element>
   </define>
+  <define name="carrier">
+    <element name="carrier">
+      <text/>
+    </element>
+  </define>
   <define name="size">
     <element name="size">
       <text/>
@@ -794,6 +908,9 @@
           <optional>
             <ref name="seriespartnumber"/>
           </optional>
+          <optional>
+            <ref name="seriesrun"/>
+          </optional>
         </group>
       </choice>
     </element>
@@ -829,6 +946,11 @@
       <text/>
     </element>
   </define>
+  <define name="seriesrun">
+    <element name="run">
+      <text/>
+    </element>
+  </define>
   <define name="biblionote">
     <element name="note">
       <optional>
@@ -837,7 +959,7 @@
       <ref name="FormattedString"/>
     </element>
   </define>
-  <define name="abstract">
+  <define name="bibabstract">
     <element name="abstract">
       <ref name="FormattedString"/>
     </element>
@@ -869,11 +991,15 @@
   <define name="DocRelationType">
     <choice>
       <value>obsoletes</value>
+      <value>obsoletedBy</value>
+      <value>supersedes</value>
+      <value>supersededBy</value>
       <value>updates</value>
       <value>updatedBy</value>
       <value>complements</value>
       <value>derivedFrom</value>
       <value>translatedFrom</value>
+      <value>hasTranslation</value>
       <value>adoptedFrom</value>
       <value>equivalent</value>
       <value>identical</value>
@@ -881,8 +1007,19 @@
       <value>includedIn</value>
       <value>includes</value>
       <value>instance</value>
+      <value>instanceOf</value>
       <value>partOf</value>
+      <value>hasPart</value>
       <value>hasDraft</value>
+      <value>draftOf</value>
+      <value>merges</value>
+      <value>splits</value>
+      <value>amends</value>
+      <value>amendedBy</value>
+      <value>corrects</value>
+      <value>correctedBy</value>
+      <value>revises</value>
+      <value>revisedBy</value>
     </choice>
   </define>
   <define name="docrelation">
@@ -923,6 +1060,51 @@
       <text/>
     </element>
   </define>
+  <define name="bkeyword">
+    <element name="keyword">
+      <choice>
+        <ref name="LocalizedString"/>
+        <group>
+          <element name="vocab">
+            <ref name="LocalizedString"/>
+          </element>
+          <oneOrMore>
+            <ref name="vocabid"/>
+          </oneOrMore>
+        </group>
+        <group>
+          <oneOrMore>
+            <element name="taxon">
+              <ref name="LocalizedString"/>
+            </element>
+          </oneOrMore>
+          <oneOrMore>
+            <ref name="vocabid"/>
+          </oneOrMore>
+        </group>
+      </choice>
+    </element>
+  </define>
+  <define name="vocabid">
+    <element name="vocabid">
+      <attribute name="type"/>
+      <optional>
+        <attribute name="uri">
+          <data type="anyURI"/>
+        </attribute>
+      </optional>
+      <optional>
+        <element name="code">
+          <text/>
+        </element>
+      </optional>
+      <optional>
+        <element name="term">
+          <text/>
+        </element>
+      </optional>
+    </element>
+  </define>
   <!--
     Anycontents = mixed {
     https://github.com/relaxng/jing-trang/issues/211

data/lib/asciidoctor/csand/isodoc.rng

@@ -19,10 +19,32 @@
 -->
 <grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <include href="reqt.rng"/>
-  <include href="biblio.rng"/>
-  <start>
-    <ref name="standard-document"/>
-  </start>
+  <!-- include "biblio.rnc" { } -->
+  <include href="basicdoc.rng">
+    <start>
+      <ref name="standard-document"/>
+    </start>
+    <define name="BibDataExtensionType">
+      <ref name="doctype"/>
+      <zeroOrMore>
+        <ref name="structuredidentifier"/>
+      </zeroOrMore>
+    </define>
+    <define name="TitleType">
+      <text/>
+    </define>
+    <define name="sections">
+      <element name="sections">
+        <oneOrMore>
+          <choice>
+            <ref name="clause"/>
+            <ref name="terms"/>
+            <ref name="definitions"/>
+          </choice>
+        </oneOrMore>
+      </element>
+    </define>
+  </include>
   <define name="standard-document">
     <element name="standard-document">
       <ref name="bibdata"/>
@@ -41,18 +63,29 @@
       </zeroOrMore>
     </element>
   </define>
-  <define name="bibdata">
-    <element name="bibdata">
-      <ref name="BibData"/>
-    </element>
-  </define>
   <define name="preface">
     <element name="preface">
       <oneOrMore>
-        <ref name="content"/>
+        <choice>
+          <ref name="content"/>
+          <ref name="abstract"/>
+          <ref name="foreword"/>
+          <ref name="introduction"/>
+          <ref name="acknowledgements"/>
+        </choice>
       </oneOrMore>
     </element>
   </define>
+  <define name="foreword">
+    <element name="foreword">
+      <ref name="Content-Section"/>
+    </element>
+  </define>
+  <define name="introduction">
+    <element name="introduction">
+      <ref name="Content-Section"/>
+    </element>
+  </define>
   <define name="boilerplate">
     <element name="boilerplate">
       <optional>
@@ -89,18 +122,6 @@
       <ref name="Content-Section"/>
     </element>
   </define>
-  <define name="sections">
-    <element name="sections">
-      <oneOrMore>
-        <choice>
-          <ref name="content"/>
-          <ref name="clause"/>
-          <ref name="terms"/>
-          <ref name="definitions"/>
-        </choice>
-      </oneOrMore>
-    </element>
-  </define>
   <define name="definitions">
     <element name="definitions">
       <optional>
@@ -108,59 +129,66 @@
           <data type="ID"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="language"/>
+      </optional>
+      <optional>
+        <attribute name="script"/>
+      </optional>
       <optional>
         <ref name="section-title"/>
       </optional>
-      <ref name="dl"/>
+      <oneOrMore>
+        <zeroOrMore>
+          <ref name="BasicBlock"/>
+        </zeroOrMore>
+        <ref name="dl"/>
+      </oneOrMore>
     </element>
   </define>
-  <define name="section-title">
-    <element name="title">
-      <zeroOrMore>
-        <ref name="TextElement"/>
-      </zeroOrMore>
+  <define name="content">
+    <element name="clause">
+      <ref name="Content-Section"/>
     </element>
   </define>
-  <define name="content">
-    <element name="content">
+  <define name="abstract">
+    <element name="abstract">
+      <ref name="Content-Section"/>
+    </element>
+  </define>
+  <define name="acknowledgements">
+    <element name="acknowledgements">
       <ref name="Content-Section"/>
     </element>
   </define>
   <define name="content-subsection">
     <element name="clause">
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <ref name="Content-Section"/>
     </element>
   </define>
-  <define name="Basic-Section">
+  <define name="Content-Section">
     <optional>
       <attribute name="id">
         <data type="ID"/>
       </attribute>
     </optional>
     <optional>
-      <ref name="section-title"/>
+      <attribute name="language"/>
     </optional>
-    <oneOrMore>
-      <ref name="BasicBlock"/>
-    </oneOrMore>
-    <zeroOrMore>
-      <ref name="note"/>
-    </zeroOrMore>
-  </define>
-  <define name="Content-Section">
     <optional>
-      <attribute name="id">
-        <data type="ID"/>
-      </attribute>
+      <attribute name="script"/>
     </optional>
     <optional>
       <ref name="section-title"/>
     </optional>
     <choice>
       <group>
-        <oneOrMore>
+        <optional>
           <ref name="BasicBlock"/>
-        </oneOrMore>
+        </optional>
         <zeroOrMore>
           <ref name="note"/>
         </zeroOrMore>
@@ -172,6 +200,9 @@
   </define>
   <define name="clause">
     <element name="clause">
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <ref name="Clause-Section"/>
     </element>
   </define>
@@ -181,14 +212,20 @@
         <data type="ID"/>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="language"/>
+    </optional>
+    <optional>
+      <attribute name="script"/>
+    </optional>
     <optional>
       <ref name="section-title"/>
     </optional>
     <choice>
       <group>
-        <oneOrMore>
+        <optional>
           <ref name="BasicBlock"/>
-        </oneOrMore>
+        </optional>
         <zeroOrMore>
           <ref name="note"/>
         </zeroOrMore>
@@ -210,6 +247,12 @@
           <data type="ID"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="language"/>
+      </optional>
+      <optional>
+        <attribute name="script"/>
+      </optional>
       <attribute name="obligation">
         <choice>
           <value>normative</value>
@@ -221,9 +264,9 @@
       </optional>
       <choice>
         <group>
-          <oneOrMore>
+          <optional>
             <ref name="BasicBlock"/>
-          </oneOrMore>
+          </optional>
           <zeroOrMore>
             <ref name="note"/>
           </zeroOrMore>
@@ -234,28 +277,22 @@
       </choice>
     </element>
   </define>
-  <define name="references">
-    <element name="references">
+  <define name="terms">
+    <element name="terms">
       <optional>
         <attribute name="id">
           <data type="ID"/>
         </attribute>
       </optional>
       <optional>
-        <ref name="section-title"/>
+        <attribute name="language"/>
       </optional>
-      <zeroOrMore>
-        <ref name="bibitem"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <define name="terms">
-    <element name="terms">
       <optional>
-        <attribute name="id">
-          <data type="ID"/>
-        </attribute>
+        <attribute name="script"/>
       </optional>
+      <zeroOrMore>
+        <ref name="BasicBlock"/>
+      </zeroOrMore>
       <oneOrMore>
         <ref name="term"/>
       </oneOrMore>
@@ -274,12 +311,18 @@
       <zeroOrMore>
         <ref name="admitted"/>
       </zeroOrMore>
+      <zeroOrMore>
+        <ref name="related"/>
+      </zeroOrMore>
       <zeroOrMore>
         <ref name="deprecates"/>
       </zeroOrMore>
       <optional>
         <ref name="termdomain"/>
       </optional>
+      <zeroOrMore>
+        <ref name="termgrammar"/>
+      </zeroOrMore>
       <ref name="definition"/>
       <zeroOrMore>
         <ref name="termnote"/>
@@ -306,6 +349,22 @@
       </oneOrMore>
     </element>
   </define>
+  <define name="related">
+    <element name="related">
+      <optional>
+        <attribute name="type">
+          <choice>
+            <value>compare</value>
+            <value>contrast</value>
+            <value>see</value>
+          </choice>
+        </attribute>
+      </optional>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
+    </element>
+  </define>
   <define name="deprecates">
     <element name="deprecates">
       <oneOrMore>
@@ -320,6 +379,13 @@
       </oneOrMore>
     </element>
   </define>
+  <define name="termgrammar">
+    <element name="grammar">
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
+    </element>
+  </define>
   <define name="definition">
     <element name="definition">
       <ref name="paragraph"/>
@@ -365,768 +431,59 @@
       <ref name="paragraph"/>
     </element>
   </define>
-  <define name="BasicBlock">
-    <choice>
-      <ref name="paragraph-with-footnote"/>
-      <ref name="table"/>
-      <ref name="formula"/>
-      <ref name="admonition"/>
-      <ref name="ol"/>
-      <ref name="ul"/>
-      <ref name="dl"/>
-      <ref name="figure"/>
-      <ref name="quote"/>
-      <ref name="sourcecode"/>
-      <ref name="example"/>
-      <ref name="review"/>
-      <ref name="pre"/>
-    </choice>
-  </define>
-  <define name="paragraph">
-    <element name="p">
-      <ref name="ParagraphType"/>
-    </element>
-  </define>
-  <define name="Alignments">
-    <choice>
-      <value>left</value>
-      <value>right</value>
-      <value>center</value>
-      <value>justified</value>
-    </choice>
-  </define>
-  <define name="ParagraphType">
-    <attribute name="id">
-      <data type="ID"/>
-    </attribute>
-    <optional>
-      <attribute name="align">
-        <ref name="Alignments"/>
-      </attribute>
-    </optional>
-    <zeroOrMore>
-      <ref name="TextElement"/>
-    </zeroOrMore>
-    <zeroOrMore>
-      <ref name="note"/>
-    </zeroOrMore>
-  </define>
-  <define name="paragraph-with-footnote">
-    <element name="p">
-      <attribute name="id">
-        <data type="ID"/>
-      </attribute>
-      <optional>
-        <attribute name="align">
-          <ref name="Alignments"/>
-        </attribute>
-      </optional>
-      <zeroOrMore>
-        <choice>
-          <ref name="TextElement"/>
-          <ref name="fn"/>
-        </choice>
-      </zeroOrMore>
-      <zeroOrMore>
-        <ref name="note"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <define name="note">
-    <element name="note">
-      <attribute name="id">
-        <data type="ID"/>
-      </attribute>
-      <oneOrMore>
-        <ref name="paragraph"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <define name="review">
-    <element name="review">
-      <attribute name="id">
-        <data type="ID"/>
-      </attribute>
-      <attribute name="reviewer"/>
-      <optional>
-        <attribute name="date">
-          <data type="dateTime"/>
-        </attribute>
-      </optional>
-      <attribute name="from">
-        <data type="IDREF"/>
-      </attribute>
-      <optional>
-        <attribute name="to">
-          <data type="IDREF"/>
-        </attribute>
-      </optional>
-      <oneOrMore>
-        <ref name="paragraph"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <define name="formula">
-    <element name="formula">
-      <attribute name="id">
-        <data type="ID"/>
-      </attribute>
-      <optional>
-        <attribute name="unnumbered">
-          <data type="boolean"/>
-        </attribute>
-      </optional>
-      <ref name="stem"/>
-      <optional>
-        <ref name="dl"/>
-      </optional>
-      <zeroOrMore>
-        <ref name="note"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <define name="quote">
-    <element name="quote">
-      <attribute name="id">
-        <data type="ID"/>
-      </attribute>
-      <optional>
-        <attribute name="alignment">
-          <ref name="Alignments"/>
-        </attribute>
-      </optional>
-      <optional>
-        <ref name="quote-source"/>
-      </optional>
-      <optional>
-        <ref name="quote-author"/>
-      </optional>
-      <oneOrMore>
-        <ref name="paragraph-with-footnote"/>
-      </oneOrMore>
-      <zeroOrMore>
-        <ref name="note"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <define name="quote-source">
-    <element name="source">
-      <ref name="erefType"/>
-    </element>
-  </define>
-  <define name="quote-author">
-    <element name="author">
-      <text/>
-    </element>
-  </define>
-  <define name="sourcecode">
-    <element name="sourcecode">
-      <attribute name="id">
-        <data type="ID"/>
-      </attribute>
-      <optional>
-        <attribute name="unnumbered">
-          <data type="boolean"/>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="lang"/>
-      </optional>
+  <define name="structuredidentifier">
+    <element name="structuredidentifier">
       <optional>
-        <ref name="tname"/>
+        <attribute name="type"/>
       </optional>
       <oneOrMore>
-        <choice>
+        <element name="agency">
           <text/>
-          <ref name="callout"/>
-        </choice>
-      </oneOrMore>
-      <zeroOrMore>
-        <ref name="annotation"/>
-      </zeroOrMore>
-      <zeroOrMore>
-        <ref name="note"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <define name="pre">
-    <element name="pre">
-      <attribute name="id">
-        <data type="ID"/>
-      </attribute>
-      <optional>
-        <ref name="tname"/>
-      </optional>
-      <text/>
-      <zeroOrMore>
-        <ref name="note"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <define name="table">
-    <element name="table">
-      <attribute name="id">
-        <data type="ID"/>
-      </attribute>
-      <optional>
-        <attribute name="unnumbered">
-          <data type="boolean"/>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="alt"/>
-      </optional>
-      <optional>
-        <ref name="tname"/>
-      </optional>
-      <optional>
-        <ref name="thead"/>
-      </optional>
-      <ref name="tbody"/>
-      <optional>
-        <ref name="tfoot"/>
-      </optional>
-      <zeroOrMore>
-        <ref name="table-note"/>
-      </zeroOrMore>
-      <optional>
-        <ref name="dl"/>
-      </optional>
-    </element>
-  </define>
-  <define name="tname">
-    <element name="name">
-      <text/>
-    </element>
-  </define>
-  <define name="thead">
-    <element name="thead">
-      <ref name="tr"/>
-    </element>
-  </define>
-  <define name="tfoot">
-    <element name="tfoot">
-      <ref name="tr"/>
-    </element>
-  </define>
-  <define name="tbody">
-    <element name="tbody">
-      <oneOrMore>
-        <ref name="tr"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <define name="table-note">
-    <element name="note">
-      <ref name="paragraph"/>
-    </element>
-  </define>
-  <define name="tr">
-    <element name="tr">
-      <oneOrMore>
-        <choice>
-          <ref name="td"/>
-          <ref name="th"/>
-        </choice>
-      </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>
-          <ref name="TextElement"/>
-        </zeroOrMore>
-        <oneOrMore>
-          <ref name="paragraph-with-footnote"/>
-        </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>
-          <ref name="TextElement"/>
-        </zeroOrMore>
-        <oneOrMore>
-          <ref name="paragraph-with-footnote"/>
-        </oneOrMore>
-      </choice>
-    </element>
-  </define>
-  <define name="example">
-    <element name="example">
-      <attribute name="id">
-        <data type="ID"/>
-      </attribute>
-      <optional>
-        <attribute name="unnumbered">
-          <data type="boolean"/>
-        </attribute>
-      </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"/>
-        </choice>
+        </element>
       </oneOrMore>
-      <zeroOrMore>
-        <ref name="note"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <define name="admonition">
-    <element name="admonition">
-      <attribute name="type">
-        <choice>
-          <value>warning</value>
-          <value>note</value>
-          <value>tip</value>
-          <value>important</value>
-          <value>caution</value>
-        </choice>
-      </attribute>
-      <attribute name="id">
-        <data type="ID"/>
-      </attribute>
-      <zeroOrMore>
-        <ref name="paragraph-with-footnote"/>
-      </zeroOrMore>
-      <zeroOrMore>
-        <ref name="note"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <define name="figure">
-    <element name="figure">
-      <attribute name="id">
-        <data type="ID"/>
-      </attribute>
-      <optional>
-        <attribute name="unnumbered">
-          <data type="boolean"/>
-        </attribute>
-      </optional>
       <optional>
-        <ref name="source"/>
+        <element name="class">
+          <text/>
+        </element>
       </optional>
+      <element name="docnumber">
+        <text/>
+      </element>
       <optional>
-        <ref name="tname"/>
+        <element name="partnumber">
+          <text/>
+        </element>
       </optional>
-      <choice>
-        <ref name="image"/>
-        <ref name="pre"/>
-        <zeroOrMore>
-          <ref name="figure"/>
-        </zeroOrMore>
-      </choice>
-      <zeroOrMore>
-        <ref name="fn"/>
-      </zeroOrMore>
       <optional>
-        <ref name="dl"/>
+        <element name="edition">
+          <text/>
+        </element>
       </optional>
-      <zeroOrMore>
-        <ref name="note"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <define name="TextElement">
-    <choice>
-      <text/>
-      <ref name="em"/>
-      <ref name="eref"/>
-      <ref name="strong"/>
-      <ref name="stem"/>
-      <ref name="sub"/>
-      <ref name="sup"/>
-      <ref name="tt"/>
-      <ref name="keyword"/>
-      <ref name="strike"/>
-      <ref name="smallcap"/>
-      <ref name="xref"/>
-      <ref name="br"/>
-      <ref name="hyperlink"/>
-      <ref name="hr"/>
-      <ref name="pagebreak"/>
-      <ref name="bookmark"/>
-    </choice>
-  </define>
-  <define name="PureTextElement">
-    <choice>
-      <text/>
-      <ref name="em"/>
-      <ref name="strong"/>
-      <ref name="sub"/>
-      <ref name="sup"/>
-      <ref name="tt"/>
-      <ref name="keyword"/>
-      <ref name="strike"/>
-      <ref name="smallcap"/>
-      <ref name="br"/>
-    </choice>
-  </define>
-  <define name="source">
-    <element name="source">
-      <ref name="TypedUri"/>
-    </element>
-  </define>
-  <define name="em">
-    <element name="em">
-      <zeroOrMore>
-        <ref name="PureTextElement"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <define name="strong">
-    <element name="strong">
-      <zeroOrMore>
-        <ref name="PureTextElement"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <define name="tt">
-    <element name="tt">
-      <zeroOrMore>
-        <ref name="PureTextElement"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <define name="keyword">
-    <element name="keyword">
-      <zeroOrMore>
-        <ref name="PureTextElement"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <define name="sub">
-    <element name="sub">
-      <zeroOrMore>
-        <ref name="PureTextElement"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <define name="sup">
-    <element name="sup">
-      <zeroOrMore>
-        <ref name="PureTextElement"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <define name="strike">
-    <element name="strike">
-      <zeroOrMore>
-        <ref name="PureTextElement"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <define name="smallcap">
-    <element name="smallcap">
-      <zeroOrMore>
-        <ref name="PureTextElement"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <define name="br">
-    <element name="br">
-      <empty/>
-    </element>
-  </define>
-  <define name="hr">
-    <element name="hr">
-      <empty/>
-    </element>
-  </define>
-  <define name="pagebreak">
-    <element name="pagebreak">
-      <empty/>
-    </element>
-  </define>
-  <!-- bare ID element, used for referencing arbitrary spans of text -->
-  <define name="bookmark">
-    <element name="bookmark">
-      <attribute name="id">
-        <data type="ID"/>
-      </attribute>
-      <empty/>
-    </element>
-  </define>
-  <define name="ReferenceFormat">
-    <choice>
-      <value>external</value>
-      <value>inline</value>
-      <value>footnote</value>
-      <value>callout</value>
-    </choice>
-  </define>
-  <define name="eref">
-    <element name="eref">
-      <ref name="erefType"/>
-    </element>
-  </define>
-  <define name="erefType">
-    <optional>
-      <attribute name="normative">
-        <data type="boolean"/>
-      </attribute>
-    </optional>
-    <attribute name="citeas"/>
-    <attribute name="type">
-      <ref name="ReferenceFormat"/>
-    </attribute>
-    <ref name="CitationType"/>
-    <text/>
-  </define>
-  <define name="hyperlink">
-    <element name="link">
-      <attribute name="target">
-        <data type="anyURI"/>
-      </attribute>
-      <attribute name="type">
-        <ref name="ReferenceFormat"/>
-      </attribute>
       <optional>
-        <attribute name="alt"/>
+        <element name="version">
+          <text/>
+        </element>
       </optional>
-      <text/>
-    </element>
-  </define>
-  <define name="xref">
-    <element name="xref">
-      <attribute name="target">
-        <data type="IDREF"/>
-      </attribute>
-      <attribute name="type">
-        <ref name="ReferenceFormat"/>
-      </attribute>
-      <text/>
-    </element>
-  </define>
-  <define name="fn">
-    <element name="fn">
-      <attribute name="reference"/>
-      <oneOrMore>
-        <ref name="paragraph"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <!--
-    This is xref with fixed @type="footnote", and @target built in as paragraph+
-    @reference replaces ReferenceElement/text
-    so <fn reference="2"><p>This is a footnote</p></fn>
-    corresponds to 
-    <eref type="footnote" target="fn2">2</xref> <p id="fn2">This is a footnote</p>
-  -->
-  <define name="callout">
-    <element name="callout">
-      <attribute name="target">
-        <data type="IDREF"/>
-      </attribute>
-      <text/>
-    </element>
-  </define>
-  <!--
-    This is xref with fixed @type="callout"; the target by convention is in an annotation in the same source code snippet
-    so <callout target="xyz">1</callout>
-    corresponds to <xref type="callout" target="xyz">1</xref>
-  -->
-  <define name="image">
-    <element name="image">
-      <attribute name="id">
-        <data type="ID"/>
-      </attribute>
       <optional>
-        <attribute name="src">
-          <data type="anyURI"/>
-        </attribute>
+        <element name="supplementtype">
+          <text/>
+        </element>
       </optional>
-      <attribute name="imagetype">
-        <choice>
-          <value>SVG</value>
-          <value>JPEG</value>
-          <value>GIF</value>
-          <value>PNG</value>
-          <value>PDF</value>
-        </choice>
-      </attribute>
       <optional>
-        <attribute name="width">
-          <choice>
-            <data type="int"/>
-            <value>auto</value>
-          </choice>
-        </attribute>
+        <element name="supplementnumber">
+          <text/>
+        </element>
       </optional>
       <optional>
-        <attribute name="height">
-          <choice>
-            <data type="int"/>
-            <value>auto</value>
-          </choice>
-        </attribute>
+        <element name="language">
+          <text/>
+        </element>
       </optional>
       <optional>
-        <attribute name="alt"/>
-      </optional>
-    </element>
-  </define>
-  <define name="stem">
-    <element name="stem">
-      <attribute name="type">
-        <choice>
-          <value>MathML</value>
-          <value>AsciiMath</value>
-        </choice>
-      </attribute>
-      <oneOrMore>
-        <choice>
+        <element name="year">
           <text/>
-          <ref name="AnyElement"/>
-        </choice>
-      </oneOrMore>
-    </element>
-  </define>
-  <define name="annotation">
-    <element name="annotation">
-      <attribute name="id">
-        <data type="ID"/>
-      </attribute>
-      <ref name="paragraph"/>
-    </element>
-  </define>
-  <define name="ul">
-    <element name="ul">
-      <attribute name="id">
-        <data type="ID"/>
-      </attribute>
-      <oneOrMore>
-        <ref name="li"/>
-      </oneOrMore>
-      <zeroOrMore>
-        <ref name="note"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <define name="li">
-    <element name="li">
-      <optional>
-        <attribute name="id">
-          <data type="ID"/>
-        </attribute>
+        </element>
       </optional>
-      <oneOrMore>
-        <ref name="paragraph-with-footnote"/>
-      </oneOrMore>
     </element>
   </define>
-  <define name="ol">
-    <element name="ol">
-      <attribute name="id">
-        <data type="ID"/>
-      </attribute>
-      <attribute name="type">
-        <choice>
-          <value>roman</value>
-          <value>alphabet</value>
-          <value>arabic</value>
-          <value>roman_upper</value>
-          <value>alphabet_upper</value>
-        </choice>
-      </attribute>
-      <oneOrMore>
-        <ref name="li"/>
-      </oneOrMore>
-      <zeroOrMore>
-        <ref name="note"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <define name="dl">
-    <element name="dl">
-      <attribute name="id">
-        <data type="ID"/>
-      </attribute>
-      <oneOrMore>
-        <ref name="dt"/>
-        <ref name="dd"/>
-      </oneOrMore>
-      <zeroOrMore>
-        <ref name="note"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <define name="dt">
-    <element name="dt">
-      <zeroOrMore>
-        <ref name="TextElement"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <define name="dd">
-    <element name="dd">
-      <zeroOrMore>
-        <ref name="paragraph-with-footnote"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <define name="ext">
-    <element name="ext">
-      <ref name="BibDataExtensionType"/>
-    </element>
-  </define>
-  <define name="BibDataExtensionType">
-    <optional>
-      <ref name="doctype"/>
-    </optional>
-  </define>
-  <define name="doctype">
-    <element name="doctype">
-      <ref name="DocumentType"/>
-    </element>
-  </define>
-  <define name="DocumentType">
-    <value>document</value>
-  </define>
-  <define name="BibData">
-    <ref name="BibliographicItem"/>
-    <optional>
-      <ref name="ext"/>
-    </optional>
-  </define>
 </grammar>