metanorma-un 0.6.11 → 0.7.1

data/lib/asciidoctor/un/reqt.rng

@@ -58,6 +58,14 @@
     <optional>
       <attribute name="type"/>
     </optional>
+    <optional>
+      <attribute name="tag"/>
+    </optional>
+    <optional>
+      <attribute name="multilingual-rendering">
+        <ref name="MultilingualRenderingType"/>
+      </attribute>
+    </optional>
     <optional>
       <ref name="reqtitle"/>
     </optional>
@@ -101,7 +109,9 @@
   </define>
   <define name="label">
     <element name="label">
-      <text/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="subject">
@@ -175,8 +185,19 @@
         <data type="boolean"/>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="tag"/>
+    </optional>
+    <optional>
+      <attribute name="multilingual-rendering">
+        <ref name="MultilingualRenderingType"/>
+      </attribute>
+    </optional>
     <oneOrMore>
-      <ref name="BasicBlock"/>
+      <choice>
+        <ref name="BasicBlock"/>
+        <ref name="component"/>
+      </choice>
     </oneOrMore>
   </define>
   <define name="ObligationType">

data/lib/asciidoctor/un/un.rng

@@ -178,14 +178,9 @@
         <ref name="section-title"/>
       </optional>
       <group>
-        <group>
-          <zeroOrMore>
-            <ref name="BasicBlock"/>
-          </zeroOrMore>
-          <zeroOrMore>
-            <ref name="note"/>
-          </zeroOrMore>
-        </group>
+        <zeroOrMore>
+          <ref name="BasicBlock"/>
+        </zeroOrMore>
         <zeroOrMore>
           <choice>
             <ref name="clause-subsection"/>
@@ -229,14 +224,9 @@
         <ref name="section-title"/>
       </optional>
       <group>
-        <group>
-          <zeroOrMore>
-            <ref name="BasicBlock"/>
-          </zeroOrMore>
-          <zeroOrMore>
-            <ref name="note"/>
-          </zeroOrMore>
-        </group>
+        <zeroOrMore>
+          <ref name="BasicBlock"/>
+        </zeroOrMore>
         <zeroOrMore>
           <choice>
             <ref name="annex-subsection"/>

data/lib/isodoc/un/html/wordstyle.css

@@ -149,6 +149,7 @@ p.MsoListParagraphCxSpLast, li.MsoListParagraphCxSpLast, div.MsoListParagraphCxS
 p.MsoCommentText, li.MsoCommentText, div.MsoCommentText {
   mso-style-noshow: yes;
   mso-style-unhide: no;
+  mso-style-name: "Comment Text";
   margin: 0cm;
   margin-bottom: .0001pt;
   mso-pagination: widow-orphan;
@@ -369,6 +370,7 @@ h1 {
   mso-style-priority: 1;
   mso-style-unhide: no;
   mso-style-qformat: yes;
+  mso-style-name: "Heading 1";
   mso-style-link: "Heading 1 Char";
   mso-style-next: Normal;
   margin-top: 13.5pt;
@@ -452,6 +454,7 @@ h2 {
   mso-style-priority: 2;
   mso-style-unhide: no;
   mso-style-qformat: yes;
+  mso-style-name: "Heading 2";
   mso-style-parent: "Heading 1";
   mso-style-link: "Heading 2 Char";
   mso-style-next: Normal;
@@ -478,7 +481,8 @@ h3 {
   mso-style-priority: 3;
   mso-style-unhide: no;
   mso-style-qformat: yes;
-  mso-style-parent: "Heading 1";
+  mso-style-name: "Heading 3";
+  mso-style-parent: "Heading 2";
   mso-style-link: "Heading 3 Char";
   mso-style-next: Normal;
   margin-top: 3.0pt;
@@ -504,6 +508,7 @@ h4 {
   mso-style-priority: 4;
   mso-style-unhide: no;
   mso-style-qformat: yes;
+  mso-style-name: "Heading 4";
   mso-style-parent: "Heading 3";
   mso-style-link: "Heading 4 Char";
   mso-style-next: Normal;
@@ -530,6 +535,7 @@ h5 {
   mso-style-priority: 5;
   mso-style-unhide: no;
   mso-style-qformat: yes;
+  mso-style-name: "Heading 5";
   mso-style-parent: "Heading 4";
   mso-style-link: "Heading 5 Char";
   mso-style-next: Normal;
@@ -556,6 +562,7 @@ h6 {
   mso-style-priority: 6;
   mso-style-unhide: no;
   mso-style-qformat: yes;
+  mso-style-name: "Heading 6";
   mso-style-parent: "Heading 5";
   mso-style-link: "Heading 6 Char";
   mso-style-next: Normal;
@@ -581,6 +588,7 @@ h6 {
 p.MsoToc1, li.MsoToc1, div.MsoToc1 {
   mso-style-priority: 39;
   mso-style-unhide: no;
+  mso-style-name: "TOC 1";
   mso-style-next: Normal;
   margin-top: 6.0pt;
   margin-right: 25.0pt;
@@ -603,6 +611,7 @@ p.MsoToc2, li.MsoToc2, div.MsoToc2 {
   mso-style-noshow: yes;
   mso-style-priority: 39;
   mso-style-unhide: no;
+  mso-style-name: "TOC 2";
   mso-style-parent: "TOC 1";
   mso-style-next: Normal;
   margin-top: 0cm;
@@ -626,6 +635,7 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3 {
   mso-style-noshow: yes;
   mso-style-priority: 39;
   mso-style-unhide: no;
+  mso-style-name: "TOC 3";
   mso-style-parent: "TOC 2";
   mso-style-next: Normal;
   margin-top: 0cm;
@@ -647,6 +657,7 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3 {
 
 span.MsoFootnoteReference {
   mso-style-priority: 99;
+  mso-style-name: "Footnote Reference";
   vertical-align: super; }
 
 p.MsoFootnoteText, li.MsoFootnoteText, div.MsoFootnoteText {

data/lib/isodoc/un/html/wordstyle.scss

@@ -135,6 +135,7 @@ p.MsoListParagraphCxSpLast, li.MsoListParagraphCxSpLast, div.MsoListParagraphCxS
 p.MsoCommentText, li.MsoCommentText, div.MsoCommentText
 	{mso-style-noshow:yes;
 	mso-style-unhide:no;
+        mso-style-name:"Comment Text";
 	margin:0cm;
 	margin-bottom:.0001pt;
 	mso-pagination:widow-orphan;
@@ -338,6 +339,7 @@ h1
 	{mso-style-priority:1;
 	mso-style-unhide:no;
 	mso-style-qformat:yes;
+	mso-style-name:"Heading 1";
 	mso-style-link:"Heading 1 Char";
 	mso-style-next:Normal;
 	margin-top:13.5pt;
@@ -418,6 +420,7 @@ h2
 	{mso-style-priority:2;
 	mso-style-unhide:no;
 	mso-style-qformat:yes;
+	mso-style-name:"Heading 2";
 	mso-style-parent:"Heading 1";
 	mso-style-link:"Heading 2 Char";
 	mso-style-next:Normal;
@@ -443,7 +446,8 @@ h3
 	{mso-style-priority:3;
 	mso-style-unhide:no;
 	mso-style-qformat:yes;
-	mso-style-parent:"Heading 1";
+	mso-style-name:"Heading 3";
+	mso-style-parent:"Heading 2";
 	mso-style-link:"Heading 3 Char";
 	mso-style-next:Normal;
 	margin-top:3.0pt;
@@ -468,6 +472,7 @@ h4
 	{mso-style-priority:4;
 	mso-style-unhide:no;
 	mso-style-qformat:yes;
+	mso-style-name:"Heading 4";
 	mso-style-parent:"Heading 3";
 	mso-style-link:"Heading 4 Char";
 	mso-style-next:Normal;
@@ -493,6 +498,7 @@ h5
 	{mso-style-priority:5;
 	mso-style-unhide:no;
 	mso-style-qformat:yes;
+	mso-style-name:"Heading 5";
 	mso-style-parent:"Heading 4";
 	mso-style-link:"Heading 5 Char";
 	mso-style-next:Normal;
@@ -518,6 +524,7 @@ h6
 	{mso-style-priority:6;
 	mso-style-unhide:no;
 	mso-style-qformat:yes;
+	mso-style-name:"Heading 6";
 	mso-style-parent:"Heading 5";
 	mso-style-link:"Heading 6 Char";
 	mso-style-next:Normal;
@@ -542,6 +549,7 @@ h6
 p.MsoToc1, li.MsoToc1, div.MsoToc1
 	{mso-style-priority:39;
 	mso-style-unhide:no;
+	mso-style-name:"TOC 1";
 	mso-style-next:Normal;
 	margin-top:6.0pt;
 	margin-right:25.0pt;
@@ -563,6 +571,7 @@ p.MsoToc2, li.MsoToc2, div.MsoToc2
 	{mso-style-noshow:yes;
 	mso-style-priority:39;
 	mso-style-unhide:no;
+	mso-style-name:"TOC 2";
 	mso-style-parent:"TOC 1";
 	mso-style-next:Normal;
 	margin-top:0cm;
@@ -585,6 +594,7 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3
 	{mso-style-noshow:yes;
 	mso-style-priority:39;
 	mso-style-unhide:no;
+	mso-style-name:"TOC 3";
 	mso-style-parent:"TOC 2";
 	mso-style-next:Normal;
 	margin-top:0cm;
@@ -605,6 +615,7 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3
 	mso-bidi-font-weight:normal;}
 span.MsoFootnoteReference
 	{mso-style-priority:99;
+        mso-style-name:"Footnote Reference";
 	vertical-align:super;}
 p.MsoFootnoteText, li.MsoFootnoteText, div.MsoFootnoteText
 	{mso-style-noshow:yes;