reqt.rng in metanorma-bipm-1.1.7

- old
+ new

@@ -62,13 +62,13 @@
       <ref name="reqtitle"/>
     </optional>
     <optional>
       <ref name="label"/>
     </optional>
-    <optional>
+    <zeroOrMore>
       <ref name="subject"/>
-    </optional>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="reqinherit"/>
     </zeroOrMore>
     <zeroOrMore>
       <ref name="classification"/>
@@ -78,10 +78,11 @@
         <ref name="measurementtarget"/>
         <ref name="specification"/>
         <ref name="verification"/>
         <ref name="import"/>
         <ref name="description"/>
+        <ref name="component"/>
       </choice>
     </zeroOrMore>
     <optional>
       <ref name="reqt_references"/>
     </optional>
@@ -103,16 +104,20 @@
       <text/>
     </element>
   </define>
   <define name="subject">
     <element name="subject">
-      <text/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="reqinherit">
     <element name="inherit">
-      <text/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="measurementtarget">
     <element name="measurement-target">
       <ref name="RequirementSubpart"/>
@@ -133,9 +138,15 @@
       <ref name="RequirementSubpart"/>
     </element>
   </define>
   <define name="description">
     <element name="description">
+      <ref name="RequirementSubpart"/>
+    </element>
+  </define>
+  <define name="component">
+    <element name="component">
+      <attribute name="class"/>
       <ref name="RequirementSubpart"/>
     </element>
   </define>
   <define name="reqt_references">
     <element name="references">