metanorma-itu 1.4.1 → 1.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1164c6fb0287be4c0c1f9f8d437cbcfedf5c7905d86c13f8992847a0bfb696d
-  data.tar.gz: 06a084cdde9d262683e457ea5b2f9c3d57a1e3f14dcd17fc255854f8ff9c79e2
+  metadata.gz: 5619cbb2db8525ff93cb36caa9db4131c780b144cb75dc5d415047a65ca20c75
+  data.tar.gz: 294066a345df88c036b18af7a2912cd4f1ddfa4f90b85ed77858032464685366
 SHA512:
-  metadata.gz: 0b965a8f12e85d64c07ce2b36ebe51151c38e0c43542b3dd7a497cc2b344fbd7a58b2c4087f2f1ee90f9b1d67e4b9c73d1b7b43ddc2d5847af672602427cd357
-  data.tar.gz: d3dc91a7831b1f94ec6abffa2f3a925218bb73c002e68c244c7c215ac051c2ac62fb6ba7951da04bf3a2b872d7ce3645bad326872fe50346b7fb8c0b366dade6
+  metadata.gz: 613682ce842a94efcee47298ca077c5fbbe5eadc6fb2f6bffba6f7649b4e2b4af9fa277063c9987f6d807059ced490b0d99f08476d8bfd85d3a63f2075b87a4f
+  data.tar.gz: e8135000aedbe9e46b7201b15a1fb9402abb628212ab95504e861bb5ed2f88cceb8b02732bbd203419eed6f93816b424bfb72e5b3a8872406e4b607a9701ea97

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>
@@ -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/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/_coverpage.css

@@ -68,6 +68,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; }
@@ -79,6 +85,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 {

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

@@ -68,6 +68,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; }
@@ -79,6 +85,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 {
@@ -305,6 +314,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; }
@@ -316,6 +331,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 {
@@ -907,27 +925,27 @@ svg {
   font-style: italic; }
 
 /* Headings */
-h1, h2, h3, h4, h5, h6, .h1Annex {
+h1, h2, h3, h4, h5, h6, .h1Annex, p.h1, .h2, .h3, .h4, .h5, .h6 {
   font-weight: 400;
   margin-top: 1.6em;
   margin-bottom: 0.3em; }
 
 @media print {
-  h1, h2, h3, h4, .h1Annex {
+  h1, h2, h3, h4, .h1Annex, p.h1, .h2, .h3, .h4 {
     page-break-after: avoid;
     margin-top: 1.2em; } }
 
-h1, .h1Annex {
+h1, .h1Annex, p.h1 {
   font-size: 1.4em;
   text-transform: uppercase;
   margin-top: 2em; }
-  h1#content, #content.h1Annex {
+  h1#content, #content.h1Annex, p#content.h1 {
     margin-top: 2em; }
   @media print {
-    h1, .h1Annex {
+    h1, .h1Annex, p.h1 {
       font-size: 1.5em;
       line-height: 1.5; }
-      h1.content, .h1Annex.content {
+      h1.content, .h1Annex.content, p.h1.content {
         margin-top: 2em;
         line-height: 2.5em; } }
 p.supertitle {
@@ -941,25 +959,25 @@ p.supertitle {
       p.supertitle.content {
         margin-top: 2em;
         line-height: 2.5em; } }
-h2 {
+h2, .h2 {
   margin-top: 1.7em;
   font-size: 1.5em; }
-  h2 p {
+  h2 p, .h2 p {
     display: inline; }
   @media print {
-    h2 {
+    h2, .h2 {
       font-size: 1.2em; } }
-h3 {
+h3, .h3 {
   margin-top: 1.5em;
   font-size: 1.4em; }
   @media print {
-    h3 {
+    h3, .h3 {
       font-size: 1em; } }
-h4 {
+h4, .h4 {
   font-size: 1.2em; }
 
 /* Terms */
-.TermNum, .Terms, .AltTerms {
+.TermNum {
   font-weight: 400; }
 
 h2.TermNum {

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

@@ -215,20 +215,20 @@ svg {
 
 /* Headings */
 
-h1, h2, h3, h4, h5, h6, .h1Annex {
+h1, h2, h3, h4, h5, h6, .h1Annex, p.h1, .h2, .h3, .h4, .h5, .h6 {
   font-weight: 400;
   margin-top: 1.6em;
   margin-bottom: 0.3em;
 }
 
-h1, h2, h3, h4, .h1Annex {
+h1, h2, h3, h4, .h1Annex, p.h1, .h2, .h3, .h4 {
   @media print {
     page-break-after: avoid;
     margin-top: 1.2em;
   }
 }
 
-h1, .h1Annex {
+h1, .h1Annex, p.h1 {
   font-size: 1.4em;
   text-transform: uppercase;
   margin-top: 2em;
@@ -265,7 +265,7 @@ p.supertitle {
 
 }
 
-h2 {
+h2, .h2 {
   margin-top: 1.7em;
   font-size: 1.5em;
 
@@ -278,7 +278,7 @@ h2 {
   }
 }
 
-h3 {
+h3, .h3 {
   margin-top: 1.5em;
   font-size: 1.4em;
 
@@ -287,14 +287,14 @@ h3 {
   }
 }
 
-h4 {
+h4, .h4 {
   font-size: 1.2em;
 }
 
 
 /* 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>

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

@@ -462,7 +462,7 @@ div.pseudocode, p.pseudocode, li.pseudocode {
   text-align: left;
   font-size: 10pt; }
 
-h1 {
+h1, .h1 {
   mso-style-priority: 1;
   mso-style-unhide: no;
   mso-style-qformat: yes;
@@ -477,14 +477,12 @@ h1 {
   text-indent: -39.7pt;
   mso-pagination: widow-orphan lines-together;
   page-break-after: avoid;
-  mso-outline-level: 1;
   tab-stops: 39.7pt 59.55pt 79.4pt 99.25pt;
   mso-layout-grid-align: none;
   punctuation-wrap: simple;
   text-autospace: none;
   font-size: {{normalfontsize}};
   mso-bidi-font-size: 10.0pt;
-  mso-list: l1 level1 lfo6;
   mso-hyphenate: none;
   font-family: {{headerfont}};
   mso-fareast-font-family: {{headerfont}};
@@ -498,6 +496,10 @@ h1 {
   mso-fareast-language: JA;
   mso-bidi-font-weight: normal; }
 
+h1 {
+  mso-outline-level: 1;
+  mso-list: l1 level1 lfo6; }
+
 p.supertitle {
   mso-style-priority: 1;
   mso-style-unhide: no;
@@ -648,7 +650,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;
@@ -664,8 +666,6 @@ h2 {
   text-indent: -39.7pt;
   mso-pagination: widow-orphan lines-together;
   page-break-after: avoid;
-  mso-outline-level: 2;
-  mso-list: l1 level2 lfo6;
   mso-hyphenate: none;
   tab-stops: 39.7pt 59.55pt 79.4pt 99.25pt;
   punctuation-wrap: simple;
@@ -680,7 +680,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;
@@ -696,8 +700,6 @@ h3 {
   text-indent: -39.7pt;
   mso-pagination: widow-orphan lines-together;
   page-break-after: avoid;
-  mso-outline-level: 3;
-  mso-list: l1 level3 lfo6;
   mso-hyphenate: none;
   tab-stops: 39.7pt 59.55pt 79.4pt 99.25pt;
   font-size: {{normalfontsize}};
@@ -710,7 +712,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;
@@ -726,8 +732,6 @@ h4 {
   text-indent: -51.05pt;
   mso-pagination: widow-orphan lines-together;
   page-break-after: avoid;
-  mso-outline-level: 4;
-  mso-list: l1 level4 lfo6;
   mso-hyphenate: none;
   tab-stops: 51.05pt 59.55pt 79.4pt 99.25pt;
   mso-layout-grid-align: none;
@@ -743,7 +747,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;
@@ -759,8 +767,6 @@ h5 {
   text-indent: -51.05pt;
   mso-pagination: widow-orphan lines-together;
   page-break-after: avoid;
-  mso-outline-level: 5;
-  mso-list: l1 level5 lfo6;
   mso-hyphenate: none;
   tab-stops: 51.05pt 59.55pt 79.4pt 99.25pt;
   mso-layout-grid-align: none;
@@ -776,7 +782,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;
@@ -792,14 +802,12 @@ h6 {
   text-indent: -79.4pt;
   mso-pagination: widow-orphan lines-together;
   page-break-after: avoid;
-  mso-outline-level: 6;
   tab-stops: 79.4pt 99.25pt;
   mso-layout-grid-align: none;
   punctuation-wrap: simple;
   text-autospace: none;
   font-size: {{normalfontsize}};
   mso-bidi-font-size: 10.0pt;
-  mso-list: l1 level6 lfo6;
   mso-hyphenate: none;
   font-family: {{headerfont}};
   color: black;
@@ -809,6 +817,10 @@ h6 {
   mso-fareast-language: JA;
   mso-bidi-font-weight: normal; }
 
+h6 {
+  mso-outline-level: 6;
+  mso-list: l1 level6 lfo6; }
+
 p.MsoHeading7, li.MsoHeading7, div.MsoHeading7 {
   mso-style-unhide: no;
   mso-style-qformat: yes;