metanorma-un 0.7.0 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0cb696b15a66bb44c638334d8097ff07da2693d42e8d94d37cfec6491d7cb3a
-  data.tar.gz: c466c6a8ca6d3df99428a5c345bdb17a1f30f8b6ebace6607993eb6eefb2dd77
+  metadata.gz: ccaa87ab379c84d4d55870a2d11b39c373988215c8968bcddea4d6e3a419a2dd
+  data.tar.gz: 36d71cf8e66d7a05ee9972aecd2fc870fdb263e91eee5e7972344a1db786f000
 SHA512:
-  metadata.gz: c4b42efd4c3147edd4cae131822cedc94ea0c80ddcc27f02897107df0f5a38d771993c34d67ce56dd5de4c991fc5a642a2d975d4024778a1707f84b4c5fc95bd
-  data.tar.gz: fd6b0ea1834904bcf513eb99b943ecb279ad2ee1a8d19f1b45084b48dbb9eef373e84251bf197ee075c4432209ffffd094f88fbd351769a7473c01433b77dfa3
+  metadata.gz: e5ce088a501262889e1357d6fb6475f060ecd79400f7f7de3e6fa0636b5fd8f8de019a13c6f6038ea0903ba6986688712d423f1c221f1d00553a0c621520ee25
+  data.tar.gz: 1135d540fdfc8bb6df1ff040874ff024c5d29b033a677660f3bf97bd6219ae4b1749072fb8bd433b13bb3d85c3352a2bbbfef3d27f37cedf3d996ad023c48fdf

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>
@@ -1946,7 +1977,7 @@
         </zeroOrMore>
       </element>
       <optional>
-        <element name="abbreviationType">
+        <element name="abbreviation-type">
           <ref name="AbbreviationType"/>
         </element>
       </optional>
@@ -1956,7 +1987,7 @@
         </element>
       </optional>
       <optional>
-        <element name="grammarInfo">
+        <element name="grammar-info">
           <ref name="Grammar"/>
         </element>
       </optional>
@@ -1983,6 +2014,11 @@
         <ref name="GrammarGender"/>
       </element>
     </zeroOrMore>
+    <zeroOrMore>
+      <element name="number">
+        <ref name="GrammarNumber"/>
+      </element>
+    </zeroOrMore>
     <optional>
       <element name="isPreposition">
         <data type="boolean"/>
@@ -2014,7 +2050,7 @@
       </element>
     </optional>
     <zeroOrMore>
-      <element name="grammarvalue">
+      <element name="grammar-value">
         <text/>
       </element>
     </zeroOrMore>
@@ -2027,6 +2063,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 +2084,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,9 +2097,17 @@
     </element>
   </define>
   <define name="verbaldefinition">
-    <element name="verbaldefinition">
+    <element name="verbal-definition">
       <oneOrMore>
-        <ref name="paragraph"/>
+        <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>
         <ref name="termsource"/>
@@ -2071,7 +2115,7 @@
     </element>
   </define>
   <define name="nonverbalrep">
-    <element name="nonverbalrepresentation">
+    <element name="non-verbal-representation">
       <oneOrMore>
         <choice>
           <ref name="table"/>
@@ -2163,6 +2207,12 @@
           <value>modified</value>
         </choice>
       </attribute>
+      <attribute name="type">
+        <choice>
+          <value>authoritative</value>
+          <value>lineage</value>
+        </choice>
+      </attribute>
       <ref name="origin"/>
       <optional>
         <ref name="modification"/>

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

@@ -625,12 +625,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; }
 

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

@@ -346,13 +346,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;
 }

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\)";