relaton-itu.rng in metanorma-itu-2.4.5

- old
+ new

@@ -20,11 +20,14 @@
         <value>question</value>
       </choice>
     </define>
     <define name="editorialgroup">
       <element name="editorialgroup">
-        <ref name="bureau"/>
+        <choice>
+          <ref name="bureau"/>
+          <ref name="sector"/>
+        </choice>
         <optional>
           <ref name="group"/>
         </optional>
         <optional>
           <ref name="subgroup"/>
@@ -65,12 +68,17 @@
         <ref name="doctype"/>
       </optional>
       <optional>
         <ref name="docsubtype"/>
       </optional>
-      <ref name="editorialgroup"/>
+      <oneOrMore>
+        <ref name="editorialgroup"/>
+      </oneOrMore>
       <zeroOrMore>
+        <ref name="question"/>
+      </zeroOrMore>
+      <zeroOrMore>
         <ref name="ics"/>
       </zeroOrMore>
       <optional>
         <ref name="recommendationstatus"/>
       </optional>
@@ -194,10 +202,15 @@
         <value>D</value>
         <value>R</value>
       </choice>
     </element>
   </define>
+  <define name="sector">
+    <element name="sector">
+      <text/>
+    </element>
+  </define>
   <define name="group">
     <element name="group">
       <ref name="ItuGroup"/>
     </element>
   </define>
@@ -207,25 +220,36 @@
     </element>
   </define>
   <define name="ItuGroup">
     <optional>
       <attribute name="type">
-        <choice>
-          <value>tsag</value>
-          <value>study-group</value>
-          <value>work-group</value>
-        </choice>
+        <ref name="ItuGroupType"/>
       </attribute>
     </optional>
     <ref name="tname"/>
     <optional>
       <ref name="groupacronym"/>
     </optional>
     <optional>
       <ref name="groupperiod"/>
     </optional>
   </define>
+  <define name="ItuGroupType">
+    <choice>
+      <value>tsag</value>
+      <value>study-group</value>
+      <value>focus-group</value>
+      <value>adhoc-group</value>
+      <value>correspondence-group</value>
+      <value>joint-coordination-activity</value>
+      <value>working-party</value>
+      <value>working-group</value>
+      <value>rapporteur-group</value>
+      <value>intersector-rapporteur-group</value>
+      <value>regional-group</value>
+    </choice>
+  </define>
   <define name="groupacronym">
     <element name="acronym">
       <text/>
     </element>
   </define>
@@ -248,8 +272,20 @@
     </element>
   </define>
   <define name="workgroup">
     <element name="workgroup">
       <ref name="ItuGroup"/>
+    </element>
+  </define>
+  <define name="question">
+    <element name="question">
+      <element name="identifier">
+        <text/>
+      </element>
+      <optional>
+        <element name="name">
+          <text/>
+        </element>
+      </optional>
     </element>
   </define>
 </grammar>