isostandard.rng in relaton-cen-1.9.0

- old
+ new

@@ -37,10 +37,13 @@
       </element>
     </define>
     <define name="BibDataExtensionType">
       <ref name="doctype"/>
       <optional>
+        <ref name="docsubtype"/>
+      </optional>
+      <optional>
         <ref name="horizontal"/>
       </optional>
       <ref name="editorialgroup"/>
       <zeroOrMore>
         <ref name="ics"/>
@@ -96,11 +99,15 @@
         </optional>
         <optional>
           <ref name="definitions"/>
         </optional>
         <oneOrMore>
-          <ref name="clause"/>
+          <choice>
+            <ref name="clause"/>
+            <ref name="term-clause"/>
+            <ref name="terms"/>
+          </choice>
         </oneOrMore>
       </element>
     </define>
     <define name="Clause-Section">
       <optional>
@@ -131,11 +138,11 @@
         <attribute name="type"/>
       </optional>
       <optional>
         <ref name="section-title"/>
       </optional>
-      <group>
+      <choice>
         <choice>
           <group>
             <oneOrMore>
               <ref name="BasicBlock"/>
             </oneOrMore>
@@ -146,11 +153,11 @@
           <ref name="amend"/>
         </choice>
         <oneOrMore>
           <ref name="clause-subsection"/>
         </oneOrMore>
-      </group>
+      </choice>
     </define>
     <define name="term">
       <element name="term">
         <optional>
           <attribute name="id">
@@ -255,9 +262,17 @@
         <value>international-workshop-agreement</value>
         <value>guide</value>
         <value>amendment</value>
         <value>technical-corrigendum</value>
         <value>directive</value>
+      </choice>
+    </define>
+    <define name="DocumentSubtype">
+      <choice>
+        <value>specification</value>
+        <value>method-of-test</value>
+        <value>vocabulary</value>
+        <value>code-of-practice</value>
       </choice>
     </define>
     <define name="structuredidentifier">
       <element name="structuredidentifier">
         <optional>