metanorma-un 0.7.1 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0021dd59134b1e29f4fefa8f42876e766cab44fd2c39b026f235235ce92dec9b
-  data.tar.gz: 2f760abef94975595bd6b2f9a1b4d4eebdaf014da1b8fb16e030afb65b11d83c
+  metadata.gz: e571be88b769ac9333a8bcacd96bfa1e02b8b24e421b0d93ba912e3f9868b57d
+  data.tar.gz: b83c712fe918c7660831321f909555e4265c015a4536b344ce1c80bc035e1dfb
 SHA512:
-  metadata.gz: dba9f3ff9ceb09f78cddda3d6b7c0cccc20f52a12d32e076bfd914844d01ed0d2860cd1f8035744f2c9c047a3f38e8217d4c6d996b0bb7f35162ebde59a62454
-  data.tar.gz: 40bc6b1322e06fd459e7374eed5e9d4bd10b6d3c96829ed09c76a454cc73dd2181322cf134511a8a7227e38e451c01219a928e3a306ae2cef21dda63d9fa57d6
+  metadata.gz: cadb83bac6c3e9ed659b1447cc1c8fd11a2c3e88cee4b6765ce3e60be3122f06aa8f5ca9129f281e78410ac2b3fe648027c534b8972fe839fb37885f99e38f86
+  data.tar.gz: 1a4874986efb7c85a0bcce107a25472f9f2733ebe2678d7a02fbdb911866911b4a7918dd27ee209085817059638d6f4cb681197eca894d3a7872c92512819cb6

data/lib/asciidoctor/un/converter.rb

@@ -169,7 +169,7 @@ module Asciidoctor
       def pdf_converter(node)
         return nil if node.attr("no-pdf")
 
-        IsoDoc::UN::PdfConvert.new(doc_extract_attributes(node))
+        IsoDoc::UN::PdfConvert.new(pdf_extract_attributes(node))
       end
 
       def sections_cleanup(xmldoc)

data/lib/asciidoctor/un/isodoc.rng

@@ -58,7 +58,7 @@
           <attribute name="alt"/>
         </optional>
         <optional>
-          <attribute name="updatetype">
+          <attribute name="update-type">
             <data type="boolean"/>
           </attribute>
         </optional>
@@ -1796,6 +1796,20 @@
           <data type="ID"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="language"/>
+      </optional>
+      <optional>
+        <attribute name="script"/>
+      </optional>
+      <optional>
+        <attribute name="tag"/>
+      </optional>
+      <optional>
+        <attribute name="multilingual-rendering">
+          <ref name="MultilingualRenderingType"/>
+        </attribute>
+      </optional>
       <oneOrMore>
         <ref name="preferred"/>
       </oneOrMore>
@@ -1814,9 +1828,6 @@
       <optional>
         <ref name="termsubject"/>
       </optional>
-      <optional>
-        <ref name="termusage"/>
-      </optional>
       <oneOrMore>
         <ref name="termdefinition"/>
       </oneOrMore>
@@ -1880,17 +1891,37 @@
       </attribute>
     </optional>
     <optional>
-      <attribute name="geographicArea"/>
+      <attribute name="geographic-area"/>
     </optional>
     <choice>
       <ref name="expression_designation"/>
       <ref name="letter_symbol_designation"/>
       <ref name="graphical_symbol_designation"/>
     </choice>
+    <optional>
+      <ref name="fieldofapplication"/>
+    </optional>
+    <optional>
+      <ref name="usageinfo"/>
+    </optional>
     <zeroOrMore>
       <ref name="termsource"/>
     </zeroOrMore>
   </define>
+  <define name="fieldofapplication">
+    <element name="field-of-application">
+      <oneOrMore>
+        <ref name="PureTextElement"/>
+      </oneOrMore>
+    </element>
+  </define>
+  <define name="usageinfo">
+    <element name="usage-info">
+      <oneOrMore>
+        <ref name="PureTextElement"/>
+      </oneOrMore>
+    </element>
+  </define>
   <define name="letter_symbol_designation">
     <element name="letter-symbol">
       <optional>
@@ -1942,11 +1973,15 @@
       </optional>
       <element name="name">
         <zeroOrMore>
-          <ref name="PureTextElement"/>
+          <choice>
+            <ref name="PureTextElement"/>
+            <ref name="stem"/>
+            <ref name="index"/>
+          </choice>
         </zeroOrMore>
       </element>
       <optional>
-        <element name="abbreviationType">
+        <element name="abbreviation-type">
           <ref name="AbbreviationType"/>
         </element>
       </optional>
@@ -1956,7 +1991,7 @@
         </element>
       </optional>
       <optional>
-        <element name="grammarInfo">
+        <element name="grammar">
           <ref name="Grammar"/>
         </element>
       </optional>
@@ -1983,6 +2018,11 @@
         <ref name="GrammarGender"/>
       </element>
     </zeroOrMore>
+    <zeroOrMore>
+      <element name="number">
+        <ref name="GrammarNumber"/>
+      </element>
+    </zeroOrMore>
     <optional>
       <element name="isPreposition">
         <data type="boolean"/>
@@ -2014,7 +2054,7 @@
       </element>
     </optional>
     <zeroOrMore>
-      <element name="grammarvalue">
+      <element name="grammar-value">
         <text/>
       </element>
     </zeroOrMore>
@@ -2027,6 +2067,13 @@
       <value>common</value>
     </choice>
   </define>
+  <define name="GrammarNumber">
+    <choice>
+      <value>singular</value>
+      <value>dual</value>
+      <value>plural</value>
+    </choice>
+  </define>
   <define name="termdomain">
     <element name="domain">
       <oneOrMore>
@@ -2041,13 +2088,6 @@
       </oneOrMore>
     </element>
   </define>
-  <define name="termusage">
-    <element name="usageinfo">
-      <oneOrMore>
-        <ref name="BasicBlock"/>
-      </oneOrMore>
-    </element>
-  </define>
   <define name="termdefinition">
     <element name="definition">
       <choice>
@@ -2061,13 +2101,16 @@
     </element>
   </define>
   <define name="verbaldefinition">
-    <element name="verbaldefinition">
+    <element name="verbal-definition">
       <oneOrMore>
         <choice>
           <ref name="paragraph"/>
           <ref name="dl"/>
           <ref name="ol"/>
           <ref name="ul"/>
+          <ref name="table"/>
+          <ref name="figure"/>
+          <ref name="formula"/>
         </choice>
       </oneOrMore>
       <zeroOrMore>
@@ -2076,7 +2119,7 @@
     </element>
   </define>
   <define name="nonverbalrep">
-    <element name="nonverbalrepresentation">
+    <element name="non-verbal-representation">
       <oneOrMore>
         <choice>
           <ref name="table"/>

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

@@ -75,6 +75,12 @@ code *, pre *, tt *, kbd *, samp * {
   font-family: {{monospacefont}} !important;
   font-variant-ligatures: none; }
 
+p code, dt code, li code, label code, legend code, caption code, th code, td code,
+p tt, dt tt, li tt, label tt, legend tt, caption tt, th tt, td tt,
+p kbd, dt kbd, li kbd, label kbd, legend kbd, caption kbd, th kbd, td kbd,
+p samp, dt samp, li samp, label samp, legend samp, caption samp, th samp, td samp {
+  font-size: {{monospacefontsize}}; }
+
 article, aside, details, figcaption, figure,
 footer, header, hgroup, menu, nav, section {
   display: block; }
@@ -86,6 +92,9 @@ table {
 h1, h2, h3, h4, h5, h6 {
   font-family: {{headerfont}}; }
 
+.h1, .h2, .h3, .h4, .h5, .h6 {
+  font-family: {{headerfont}}; }
+
 blockquote, q {
   quotes: none; }
   blockquote:before, blockquote:after, q:before, q:after {
@@ -558,7 +567,8 @@ h3,
 h4,
 h5,
 h6,
-.h2Annex {
+.h2Annex,
+.h1, .h2, .h3, .h4, .h5, .h6 {
   font-family: {{headerfont}};
   color: #00ADEF;
   font-weight: 700;
@@ -568,38 +578,38 @@ h6,
 
 h1,
 h2,
-h3 {
+h3, .h1, .h2, .h3 {
   margin-top: 18px;
   margin-bottom: 9px; }
 
-h1 {
+h1, .h1 {
   font-size: 33px;
   font-weight: 500;
   margin: 0.67em 0;
   letter-spacing: -0.02em;
   color: #4D4D4D; }
 
-h2 {
+h2, .h2 {
   font-size: 27px;
   color: #4D4D4D; }
 
-h3 {
+h3, .h3 {
   font-size: 24px;
   margin-top: 26px;
   color: #000; }
 
-h4 {
+h4, .h4 {
   font-size: 18.2px;
   margin-bottom: 2px;
   color: #4D4D4D;
   letter-spacing: 0.03em; }
 
-h5 {
+h5, .h5 {
   font-size: 16.25px;
   color: #000;
   margin-bottom: 2px; }
 
-h6 {
+h6, .h6 {
   font-size: 13px;
   color: #4D4D4D;
   letter-spacing: 0.05em; }
@@ -625,12 +635,12 @@ h6 {
     font-size: 1.1em;
     font-weight: 100;
   }*/
-.TermNum,
-.Terms,
-.AltTerms {
-  color: #00ADEF;
+.TermNum {
   font-weight: 100; }
 
+.TermNum, .Terms, .AltTerms {
+  color: #00ADEF; }
+
 h2.TermNum {
   margin-bottom: 0; }
 
@@ -893,7 +903,7 @@ p {
   margin-bottom: 1em;
   margin-top: 1em; }
 
-h2 p {
+h2 p, .h2 p {
   display: inline; }
 
 /*
@@ -1057,7 +1067,8 @@ To top button
   h1,
   h2,
   h3,
-  h4 {
+  h4,
+  .h1, .h2, .h3, .h4 {
     page-break-after: avoid;
     margin-top: 1.2em; }
   .note,
@@ -1089,12 +1100,12 @@ To top button
   h1.content {
     line-height: 2.5em;
     margin-top: 2em; }
-  h1 {
+  h1, .h1 {
     font-size: 1.5em;
     line-height: 1.5; }
-  h2 {
+  h2, .h2 {
     font-size: 1.2em; }
-  h3 {
+  h3, .h3 {
     font-size: 1em; }
   .Note {
     background-color: #fff495;

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

@@ -268,7 +268,8 @@ h3,
 h4,
 h5,
 h6,
-.h2Annex {
+.h2Annex,
+.h1, .h2, .h3, .h4, .h5, .h6 {
   font-family: $headerfont;
   color: $un-blue;
   font-weight: 700;
@@ -279,12 +280,12 @@ h6,
 
 h1,
 h2,
-h3 {
+h3, .h1, .h2, .h3 {
   margin-top: 18px;
   margin-bottom: 9px;
 }
 
-h1 {
+h1, .h1 {
   font-size: 33px;
   font-weight: 500;
   margin: 0.67em 0;
@@ -293,31 +294,31 @@ h1 {
 }
 
 
-h2 {
+h2, .h2 {
   font-size: 27px;
   color: $un-label;
 }
 
-h3 {
+h3, .h3 {
   font-size: 24px;
   margin-top: 26px;
   color: $un-black;
 }
 
-h4 {
+h4, .h4 {
   font-size: 18.2px;
   margin-bottom: 2px;
   color: $un-label;
   letter-spacing: 0.03em;
 }
 
-h5 {
+h5, .h5 {
   font-size: 16.25px;
   color: $un-black;
   margin-bottom: 2px;
 }
 
-h6 {
+h6, .h6 {
   font-size: 13px;
   color: $un-label;
   letter-spacing: 0.05em;
@@ -346,13 +347,14 @@ h6 {
     font-weight: 100;
   }*/
 
-.TermNum,
-.Terms,
-.AltTerms {
-  color: $un-blue;
+.TermNum {
   font-weight: 100;
 }
 
+.TermNum, .Terms, .AltTerms {
+  color: $un-blue;
+}
+
 h2.TermNum {
   margin-bottom: 0;
 }
@@ -606,7 +608,7 @@ p {
   margin-top: 1em;
 }
 
-h2 p {
+h2 p, .h2 p {
   display: inline;
 }
 
@@ -790,7 +792,8 @@ To top button
   h1,
   h2,
   h3,
-  h4 {
+  h4, 
+  .h1, .h2, .h3, .h4 {
     page-break-after: avoid;
     margin-top: 1.2em;
   }
@@ -846,16 +849,16 @@ To top button
     margin-top: 2em;
   }
 
-  h1 {
+  h1, .h1 {
     font-size: 1.5em;
     line-height: 1.5;
   }
 
-  h2 {
+  h2, .h2 {
     font-size: 1.2em;
   }
 
-  h3 {
+  h3, .h3 {
     font-size: 1em;
   }
 

data/lib/isodoc/un/html/scripts.html

@@ -17,7 +17,6 @@ $('#toggle').on('click', function(){
     else {
         $('nav').show();
         $('nav').animate({ 'left': '0px' }, 'slow');
-        $('.container').animate({ 'padding-left': '360px' }, 'slow');
     }
 });
 </script>

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

@@ -314,7 +314,6 @@ p.Terms, li.Terms, div.Terms {
   mso-fareast-font-family: {{headerfont}};
   mso-bidi-font-family: {{headerfont}};
   mso-ansi-language: EN-GB;
-  font-weight: bold;
   mso-bidi-font-weight: normal; }
 
 p.AltTerms, li.AltTerms, div.AltTerms {

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

@@ -314,7 +314,6 @@ p.Terms, li.Terms, div.Terms
         mso-fareast-font-family:$headerfont;
         mso-bidi-font-family:$headerfont;
         mso-ansi-language:EN-GB;
-        font-weight:bold;
         mso-bidi-font-weight:normal;}
 p.AltTerms, li.AltTerms, div.AltTerms
         {mso-style-name:"AltTerm\(s\)";

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

@@ -366,7 +366,7 @@ span.blackgraphtx {
 div.figure, p.figure {
   text-align: center; }
 
-h1 {
+h1, .h1 {
   mso-style-priority: 1;
   mso-style-unhide: no;
   mso-style-qformat: yes;
@@ -381,8 +381,6 @@ h1 {
   line-height: 13.5pt;
   mso-pagination: widow-orphan;
   page-break-after: avoid;
-  mso-outline-level: 1;
-  mso-list: l1 level1 lfo6;
   mso-hyphenate: none;
   tab-stops: 20.0pt list 21.6pt left 28.0pt;
   font-size: 13.0pt;
@@ -394,6 +392,10 @@ h1 {
   mso-fareast-language: JA;
   mso-bidi-font-weight: normal; }
 
+h1 {
+  mso-outline-level: 1;
+  mso-list: l1 level1 lfo6; }
+
 h1.Annex {
   mso-style-priority: 1;
   mso-style-unhide: no;
@@ -450,7 +452,7 @@ h1.Annex {
   mso-fareast-language: JA;
   mso-bidi-font-weight: normal; }
 
-h2 {
+h2, .h2 {
   mso-style-priority: 2;
   mso-style-unhide: no;
   mso-style-qformat: yes;
@@ -465,8 +467,6 @@ h2 {
   line-height: 12.5pt;
   mso-pagination: widow-orphan;
   page-break-after: avoid;
-  mso-outline-level: 2;
-  mso-list: l1 level2 lfo6;
   mso-hyphenate: none;
   tab-stops: 27.0pt 35.0pt;
   font-size: 12.0pt;
@@ -477,7 +477,11 @@ h2 {
   mso-fareast-language: JA;
   mso-bidi-font-weight: normal; }
 
-h3 {
+h2 {
+  mso-outline-level: 2;
+  mso-list: l1 level2 lfo6; }
+
+h3, .h3 {
   mso-style-priority: 3;
   mso-style-unhide: no;
   mso-style-qformat: yes;
@@ -493,8 +497,6 @@ h3 {
   line-height: 12.0pt;
   mso-pagination: widow-orphan;
   page-break-after: avoid;
-  mso-outline-level: 3;
-  mso-list: l1 level3 lfo6;
   mso-hyphenate: none;
   tab-stops: list 27.0pt left 44.0pt;
   font-size: 11.0pt;
@@ -504,7 +506,11 @@ h3 {
   mso-fareast-language: JA;
   mso-bidi-font-weight: normal; }
 
-h4 {
+h3 {
+  mso-outline-level: 3;
+  mso-list: l1 level3 lfo6; }
+
+h4, .h4 {
   mso-style-priority: 4;
   mso-style-unhide: no;
   mso-style-qformat: yes;
@@ -520,8 +526,6 @@ h4 {
   line-height: 12.0pt;
   mso-pagination: widow-orphan;
   page-break-after: avoid;
-  mso-outline-level: 4;
-  mso-list: l1 level4 lfo6;
   mso-hyphenate: none;
   tab-stops: 51.05pt 57.0pt 68.0pt;
   font-size: 11.0pt;
@@ -531,7 +535,11 @@ h4 {
   mso-fareast-language: JA;
   mso-bidi-font-weight: normal; }
 
-h5 {
+h4 {
+  mso-outline-level: 4;
+  mso-list: l1 level4 lfo6; }
+
+h5, .h5 {
   mso-style-priority: 5;
   mso-style-unhide: no;
   mso-style-qformat: yes;
@@ -547,8 +555,6 @@ h5 {
   line-height: 12.0pt;
   mso-pagination: widow-orphan;
   page-break-after: avoid;
-  mso-outline-level: 5;
-  mso-list: l1 level5 lfo6;
   mso-hyphenate: none;
   tab-stops: 51.05pt list 54.0pt;
   font-size: 11.0pt;
@@ -558,7 +564,11 @@ h5 {
   mso-fareast-language: JA;
   mso-bidi-font-weight: normal; }
 
-h6 {
+h5 {
+  mso-outline-level: 5;
+  mso-list: l1 level5 lfo6; }
+
+h6, .h6 {
   mso-style-priority: 6;
   mso-style-unhide: no;
   mso-style-qformat: yes;
@@ -574,8 +584,6 @@ h6 {
   line-height: 12.0pt;
   mso-pagination: widow-orphan;
   page-break-after: avoid;
-  mso-outline-level: 6;
-  mso-list: l1 level6 lfo6;
   mso-hyphenate: none;
   tab-stops: 51.05pt list 72.0pt;
   font-size: 11.0pt;
@@ -585,6 +593,10 @@ h6 {
   mso-fareast-language: JA;
   mso-bidi-font-weight: normal; }
 
+h6 {
+  mso-outline-level: 6;
+  mso-list: l1 level6 lfo6; }
+
 p.MsoToc1, li.MsoToc1, div.MsoToc1 {
   mso-style-priority: 39;
   mso-style-unhide: no;