metanorma-itu 1.4.0.1 → 1.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e486ed509e01e8839797855e65a6431033298b7e307253f64b600fbc195f4caa
-  data.tar.gz: cbb5b77f6e2d99ded15a6e50375689d9f57f700d3f4f00d320e2ce110713d535
+  metadata.gz: 2fb429391263ff996d975c4530caafb770cdd27c641e5afd565021d503c82b00
+  data.tar.gz: 81c88468270f3a6b9e3febb646c459da0239c232780408f39104981af1bf619c
 SHA512:
-  metadata.gz: 550210205331fb08d6e5f9da8614f8f0f9b9883e4b353d79698a8530e4f71dce36cfd5b36d75b0fcce073569cc1f1cf33a83b9baf348179ad3f547a3c9221da6
-  data.tar.gz: 3900db56104d0d73841f932220178e3ef1e64cb085d60bcbdff5259e36fbdbca539b3dfc26d71a25934f4622a48ba7afb93813ac1bee7d86d66456064fee9692
+  metadata.gz: db67afa2f11981ca3c74a52eb2fcbc06de76b6aa8583c280bc2be6e1248ca132ed59e83a6f700d4eb1f6b55459666d9513c21494bb56fed53a6bad07f48a3de2
+  data.tar.gz: bd640b4db3d5f369b534b78d12f8c129637006e6e6e57ff201eff54814cc7e03bd3bcb5d483f70c06e8c5c1aff30cb31dbeb957c735bd8b561efedf40d6fadad

data/lib/asciidoctor/itu/converter.rb

@@ -8,9 +8,6 @@ require_relative "./cleanup"
 
 module Asciidoctor
   module ITU
-    # A {Converter} implementation that generates RSD output, and a document
-    # schema encapsulation of the document for validation
-    #
     class Converter < Standoc::Converter
       XML_ROOT_TAG = "itu-standard".freeze
       XML_NAMESPACE = "https://www.metanorma.org/ns/itu".freeze
@@ -72,11 +69,11 @@ module Asciidoctor
 
       def sectiontype_streamline(ret)
         case ret
-        when "definitions" then "terms and definitions"
+        when "definitions", "terms defined elsewhere",
+          "terms defined in this recommendation"
+          "terms and definitions"
         when "abbreviations and acronyms" then "symbols and abbreviated terms"
         when "references" then "normative references"
-        when "terms defined elsewhere" then "terms and definitions"
-        when "terms defined in this recommendation" then "terms and definitions"
         else
           super
         end
@@ -144,7 +141,7 @@ module Asciidoctor
       end
 
       def pdf_converter(node)
-        IsoDoc::ITU::PdfConvert.new(html_extract_attributes(node))
+        IsoDoc::ITU::PdfConvert.new(pdf_extract_attributes(node))
       end
 
       def doc_converter(node)

data/lib/asciidoctor/itu/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/asciidoctor/itu/validate.rb

@@ -130,7 +130,7 @@ module Asciidoctor
 
       def termdef_style(xmldoc)
         xmldoc.xpath("//term").each do |t|
-          para = t.at("./definition/verbaldefinition") || return
+          para = t.at("./definition/verbal-definition") || return
           term = t.at("./preferred//name").text
           termdef_warn(term, /^[A-Z][a-z]+/, t, term, "term is not lowercase")
           termdef_warn(para.text, /^[a-z]/, t, term,

data/lib/isodoc/itu/cleanup.rb

@@ -33,7 +33,7 @@ module IsoDoc
 
       def term_cleanup2(docxml)
         docxml.xpath("//p[@class = 'TermNum']").each do |d|
-          d1 = d.next_element and d1.name == "p" or next
+          (d1 = d.next_element and d1.name == "p") or next
           d1.children.each { |e| e.parent = d }
           d1.remove
         end

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

@@ -959,7 +959,7 @@ h4 {
   font-size: 1.2em; }
 
 /* Terms */
-.TermNum, .Terms, .AltTerms {
+.TermNum {
   font-weight: 400; }
 
 h2.TermNum {

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

@@ -294,7 +294,7 @@ h4 {
 
 /* Terms */
 
-.TermNum, .Terms, .AltTerms {
+.TermNum {
   font-weight: 400;
 }
 

data/lib/isodoc/itu/html/itu.css

@@ -445,7 +445,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/itu/html/itu.scss

@@ -427,7 +427,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/itu/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>