rsd.rng in asciidoctor-rsd-0.3.3

- old
+ new

@@ -1,12 +1,11 @@
 <?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/rsd"
     Currently we inherit from a namespaced grammar, isostandard. Until we inherit from isodoc,
     we cannot have a new default namespace: we will end up with a grammar with two different
-    namespaces, one for isostandard and one for rsd additions. And we do not want that.
+    namespaces, one for isostandard and one for csand additions. And we do not want that.
   -->
   <include href="isostandard.rng">
     <start>
       <ref name="rsd-standard"/>
     </start>
@@ -23,23 +22,10 @@
     <define name="btitle">
       <element name="title">
         <ref name="FormattedString"/>
       </element>
     </define>
-    <define name="status">
-      <element name="status">
-        <choice>
-          <value>proposal</value>
-          <value>working-draft</value>
-          <value>committee-draft</value>
-          <value>draft-standard</value>
-          <value>final-draft</value>
-          <value>published</value>
-          <value>withdrawn</value>
-        </choice>
-      </element>
-    </define>
     <define name="figure">
       <element name="figure">
         <attribute name="id">
           <data type="ID"/>
         </attribute>
@@ -68,10 +54,24 @@
             </optional>
           </group>
         </choice>
       </element>
     </define>
+    <define name="status">
+      <element name="status">
+        <choice>
+          <value>proposal</value>
+          <value>working-draft</value>
+          <value>committee-draft</value>
+          <value>draft-standard</value>
+          <value>final-draft</value>
+          <value>published</value>
+          <value>withdrawn</value>
+          <ref name="LocalizedString"/>
+        </choice>
+      </element>
+    </define>
     <!-- TextElement |= keyword -->
     <define name="TextElement">
       <choice>
         <text/>
         <ref name="em"/>
@@ -90,26 +90,104 @@
         <ref name="pagebreak"/>
         <ref name="bookmark"/>
         <ref name="keyword"/>
       </choice>
     </define>
+    <define name="BibItemType" combine="choice">
+      <choice>
+        <value>policy-and-procedures</value>
+        <value>best-practices</value>
+        <value>supporting-document</value>
+        <value>report</value>
+        <value>legal</value>
+        <value>directives</value>
+        <value>proposal</value>
+        <value>standard</value>
+      </choice>
+    </define>
+    <define name="editorialgroup">
+      <element name="editorialgroup">
+        <ref name="committee"/>
+      </element>
+    </define>
+    <define name="BibData">
+      <optional>
+        <attribute name="type">
+          <ref name="BibItemType"/>
+        </attribute>
+      </optional>
+      <oneOrMore>
+        <ref name="btitle"/>
+      </oneOrMore>
+      <optional>
+        <ref name="formattedref"/>
+      </optional>
+      <zeroOrMore>
+        <ref name="bsource"/>
+      </zeroOrMore>
+      <zeroOrMore>
+        <ref name="docidentifier"/>
+      </zeroOrMore>
+      <zeroOrMore>
+        <ref name="bdate"/>
+      </zeroOrMore>
+      <zeroOrMore>
+        <ref name="contributor"/>
+      </zeroOrMore>
+      <optional>
+        <ref name="edition"/>
+      </optional>
+      <zeroOrMore>
+        <ref name="biblionote"/>
+      </zeroOrMore>
+      <zeroOrMore>
+        <ref name="language"/>
+      </zeroOrMore>
+      <zeroOrMore>
+        <ref name="script"/>
+      </zeroOrMore>
+      <zeroOrMore>
+        <ref name="abstract"/>
+      </zeroOrMore>
+      <optional>
+        <ref name="status"/>
+      </optional>
+      <ref name="copyright"/>
+      <zeroOrMore>
+        <ref name="docrelation"/>
+      </zeroOrMore>
+      <ref name="editorialgroup"/>
+      <zeroOrMore>
+        <ref name="ics"/>
+      </zeroOrMore>
+      <optional>
+        <ref name="security"/>
+      </optional>
+    </define>
   </include>
-  <define name="BibItemType" combine="choice">
-    <choice>
-      <value>code</value>
-      <value>presentation</value>
-      <value>proposal</value>
-      <value>standard</value>
-      <value>report</value>
-    </choice>
+  <define name="committee">
+    <element name="committee">
+      <attribute name="type">
+        <choice>
+          <value>technical</value>
+          <value>provisional</value>
+        </choice>
+      </attribute>
+      <text/>
+    </element>
   </define>
   <define name="pre">
     <element name="pre">
       <text/>
     </element>
   </define>
   <define name="keyword">
     <element name="keyword">
+      <text/>
+    </element>
+  </define>
+  <define name="security">
+    <element name="security">
       <text/>
     </element>
   </define>
   <define name="rsd-standard">
     <element name="rsd-standard">