grammars/basicdoc.rng in relaton-iso-bib-0.9.2 vs grammars/basicdoc.rng in relaton-iso-bib-1.0.0

@@ -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">
-  <include href="biblio.rng" />
+  <include href="biblio.rng"/>
   <start>
     <ref name="document"/>
   </start>
-  <!-- </include> -->
   <define name="document">
     <element name="document">
       <optional>
         <attribute name="identifier"/>
       </optional>
@@ -42,16 +41,10 @@
       <attribute name="id">
         <data type="ID"/>
       </attribute>
     </optional>
     <optional>
-      <attribute name="language"/>
-    </optional>
-    <optional>
-      <attribute name="script"/>
-    </optional>
-    <optional>
       <ref name="section-title"/>
     </optional>
     <optional>
       <ref name="BasicBlock"/>
     </optional>
@@ -193,18 +186,10 @@
       <optional>
         <attribute name="unnumbered">
           <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"/>
       </optional>
       <zeroOrMore>
@@ -255,13 +240,10 @@
         <attribute name="unnumbered">
           <data type="boolean"/>
         </attribute>
       </optional>
       <optional>
-        <attribute name="subsequence"/>
-      </optional>
-      <optional>
         <attribute name="lang"/>
       </optional>
       <optional>
         <ref name="tname"/>
       </optional>
@@ -302,19 +284,13 @@
         <attribute name="unnumbered">
           <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"/>
         </attribute>
       </optional>
       <optional>
@@ -335,15 +311,18 @@
       </optional>
     </element>
   </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">
     <element name="thead">
       <ref name="tr"/>
     </element>
   </define>
@@ -436,16 +415,10 @@
       <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"/>
@@ -506,29 +479,21 @@
         <attribute name="unnumbered">
           <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>
       </choice>
       <zeroOrMore>
@@ -812,21 +777,18 @@
       </optional>
       <optional>
         <attribute name="alt"/>
       </optional>
       <optional>
-        <attribute name="title"/>
-      </optional>
-      <optional>
         <attribute name="longdesc">
           <data type="anyURI"/>
         </attribute>
       </optional>
     </element>
   </define>
   <define name="video">
-    <element name="video">
+    <element name="image">
       <attribute name="id">
         <data type="ID"/>
       </attribute>
       <attribute name="src">
         <data type="anyURI"/>
@@ -853,24 +815,21 @@
       </optional>
       <optional>
         <attribute name="alt"/>
       </optional>
       <optional>
-        <attribute name="title"/>
-      </optional>
-      <optional>
         <attribute name="longdesc">
           <data type="anyURI"/>
         </attribute>
       </optional>
       <zeroOrMore>
         <ref name="altsource"/>
       </zeroOrMore>
     </element>
   </define>
   <define name="audio">
-    <element name="audio">
+    <element name="image">
       <attribute name="id">
         <data type="ID"/>
       </attribute>
       <attribute name="src">
         <data type="anyURI"/>
@@ -879,12 +838,9 @@
       <optional>
         <attribute name="filename"/>
       </optional>
       <optional>
         <attribute name="alt"/>
-      </optional>
-      <optional>
-        <attribute name="title"/>
       </optional>
       <optional>
         <attribute name="longdesc">
           <data type="anyURI"/>
         </attribute>