metanorma-itu 2.2.4 → 2.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '094600fa0601e8d0d0d1cc785753b36f303708857c814d1137c949b0a170a11a'
-  data.tar.gz: '0489e85d27e58fa185ec6e0d70b8a35bb602cf343ae7f662b5f14626dd470507'
+  metadata.gz: d0aff593cb44fbd43690c0dec7b796aae694c20641669d1a52e57e0108b2ec04
+  data.tar.gz: 67ec47347f5d85262cb552330a25578f5b2cc6ea98466ad5ba6317f93b3da23a
 SHA512:
-  metadata.gz: 3467eeb6c89581fca56cea3ef51a69fa0426d865d2d313d15ad0861240c2dd400a0d5240551225a1a4f9c9f468ff1d931692d248ab0adb802f607be4bf661cf4
-  data.tar.gz: c5eb014d0f82ee0b76f10d03511aae57747433a4d5a893a0de53c2e67d6155104efd335d4e50e1e4cd7a5937ff0d29762384767b1a31d33a5b46ef9b5e528b2e
+  metadata.gz: 5cd80af4151d3c3a9e47a1ad5aae96df063a4e2b76bc67acc92754cadb856309dab054b0082ab0dfa086852e3308465a99b38e354b78a50e0aa51303dfc2872a
+  data.tar.gz: efc85fde805aa5f92f6670ef714c7c8361a4ba2e9dec95f907556897ac5ad255bb30185f769e094989e1c93b5fe12d247f6fdf41ec2cb8676e3949a738f1b02c

data/lib/isodoc/itu/base_convert.rb

@@ -8,7 +8,7 @@ require_relative "./cleanup"
 module IsoDoc
   module ITU
     module BaseConvert
-      FRONT_CLAUSE = "//*[parent::preface]"\
+      FRONT_CLAUSE = "//*[parent::preface]" \
                      "[not(local-name() = 'abstract')]".freeze
 
       def preface(isoxml, out)
@@ -55,7 +55,7 @@ module IsoDoc
       def annex_name(annex, name, div)
         preceding_floating_titles(name, div)
         r_a = @meta.get[:doctype_original] == "recommendation-annex"
-        div.h1 **{ class: r_a ? "RecommendationAnnex" : "Annex" } do |t|
+        div.h1 class: r_a ? "RecommendationAnnex" : "Annex" do |t|
           name&.children&.each { |c2| parse(c2, t) }
         end
         @meta.get[:doctype_original] == "resolution" or
@@ -64,7 +64,7 @@ module IsoDoc
 
       def annex_obligation_subtitle(annex, div)
         info = annex["obligation"] == "informative"
-        div.p **{ class: "annex_obligation" } do |p|
+        div.p class: "annex_obligation" do |p|
           p << (info ? @i18n.inform_annex : @i18n.norm_annex)
             .sub(/%/, @meta.get[:doctype] || "")
         end
@@ -102,15 +102,15 @@ module IsoDoc
 
       def middle_title_resolution(isoxml, out)
         res = isoxml.at(ns("//bibdata/title[@type = 'resolution']"))
-        out.p(**{ align: "center", style: "text-align:center;" }) do |p|
+        out.p(align: "center", style: "text-align:center;") do |p|
           res.children.each { |n| parse(n, p) }
         end
-        out.p(**{ class: "zzSTDTitle2" }) { |p| p << @meta.get[:doctitle] }
+        out.p(class: "zzSTDTitle2") { |p| p << @meta.get[:doctitle] }
         middle_title_resolution_subtitle(isoxml, out)
       end
 
       def middle_title_resolution_subtitle(isoxml, out)
-        out.p(**{ align: "center", style: "text-align:center;" }) do |p|
+        out.p(align: "center", style: "text-align:center;") do |p|
           p.i do |i|
             i << "("
             isoxml.at(ns("//bibdata/title[@type = 'resolution-placedate']"))
@@ -124,26 +124,26 @@ module IsoDoc
       end
 
       def middle_title_recommendation(isoxml, out)
-        out.p(**{ class: "zzSTDTitle1" }) do |p|
+        out.p(class: "zzSTDTitle1") do |p|
           type = @meta.get[:doctype]
           @meta.get[:unpublished] && @meta.get[:draft_new_doctype] and
             type = @meta.get[:draft_new_doctype]
           id = @meta.get[:docnumber] and p << "#{type} #{id}"
         end
-        out.p(**{ class: "zzSTDTitle2" }) do |p|
+        out.p(class: "zzSTDTitle2") do |p|
           p << @meta.get[:doctitle]
           isoxml.xpath(ns("//note[@type = 'title-footnote']")).each do |f|
             footnote_parse(f, p)
           end
         end
         s = @meta.get[:docsubtitle] and
-          out.p(**{ class: "zzSTDTitle3" }) { |p| p << s }
+          out.p(class: "zzSTDTitle3") { |p| p << s }
       end
 
       def note_p_parse(node, div)
         name = node&.at(ns("./name"))&.remove
         div.p do |p|
-          name and p.span **{ class: "note_label" } do |s|
+          name and p.span class: "note_label" do |s|
             name.children.each { |n| parse(n, s) }
             s << note_delim
           end
@@ -155,7 +155,7 @@ module IsoDoc
       def note_parse1(node, div)
         name = node&.at(ns("./name"))&.remove
         div.p do |p|
-          name and p.span **{ class: "note_label" } do |s|
+          name and p.span class: "note_label" do |s|
             name.children.each { |n| parse(n, s) }
           end
         end

data/lib/isodoc/itu/html/header.html

@@ -88,22 +88,22 @@ exactly'></p>
 
 <div style='mso-element:header' id=eh2>
 <p class=MsoHeader align=left style='text-align:left;line-height:12.0pt;
-mso-line-height-rule:exactly'><span lang=EN-GB></span></p>
+mso-line-height-rule:exactly'><span lang=EN-GB>{% if document_td or document_provisional %}{% if document_td %}{{ document_td }}{% endif %}{% if document_td and document_provisional %}; {% endif %}{% if document_provisional %}{{ document_provisional }}{% endif %}{% endif %}</span></p>
 </div>
 
 <div style='mso-element:header' id=eh2l>
 <p class=MsoHeaderLandscape align=left style='text-align:left;line-height:12.0pt;
-mso-line-height-rule:exactly'><span lang=EN-GB></span></p>
+mso-line-height-rule:exactly'><span lang=EN-GB>{% if document_td or document_provisional %}{% if document_td %}{{ document_td }}{% endif %}{% if document_td and document_provisional %}; {% endif %}{% if document_provisional %}{{ document_provisional }}{% endif %}{% endif %}</span></p>
 </div>
 
 <div style='mso-element:header' id=h2>
 <p class=MsoHeader align=right style='text-align:right;line-height:12.0pt;
-mso-line-height-rule:exactly'><span lang=EN-GB></span></p>
+mso-line-height-rule:exactly'><span lang=EN-GB>{% if document_td or document_provisional %}{% if document_td %}{{ document_td }}{% endif %}{% if document_td and document_provisional %}; {% endif %}{% if document_provisional %}{{ document_provisional }}{% endif %}{% endif %}</span></p>
 </div>
 
 <div style='mso-element:header' id=h2l>
 <p class=MsoHeaderLandscape align=right style='text-align:right;line-height:12.0pt;
-mso-line-height-rule:exactly'><span lang=EN-GB></span></p>
+mso-line-height-rule:exactly'><span lang=EN-GB>{% if document_td or document_provisional %}{% if document_td %}{{ document_td }}{% endif %}{% if document_td and document_provisional %}; {% endif %}{% if document_provisional %}{{ document_provisional }}{% endif %}{% endif %}</span></p>
 </div>
 
 <div style='mso-element:footer' id=ef2>

data/lib/isodoc/itu/html/html_itu_titlepage.html

@@ -47,6 +47,8 @@
             {% if amendmentid %}<div class="doc-subidentifier">{{ amendmentid }}</div>{% endif %} 
             {% if corrigendumid %}<div class="doc-subidentifier">{{ corrigendumid }}</div>{% endif %}       
             {% if edition %} <div> Revision {{ edition }}</div> {% endif %}
+            {% if docnumber_td %}<br/><span class="doc-subidentifier">TD number: {{docnumber_td}}</span>{%endif%}
+          {% if docnumber_provisional %}<br/><span class="doc-subidentifier">Provisional identifier: {{docnumber_provisional}}</span>{%endif%}
             <div> {{ draftinfo }}</div>
           </div>
           {% if pubdate_monthyear %}

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

@@ -882,6 +882,10 @@ nav #toc {
     max-width: 100%;
     height: auto; }
 
+table div.figure {
+  padding: 0;
+  margin: 0; }
+
 .SourceTitle {
   font-weight: 700;
   font-size: 1em;

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

@@ -158,6 +158,12 @@ nav {
   font-size: $monospacefontsize;
 }
 
+table div.figure {
+  padding: 0;
+  margin: 0;
+}
+
+
 .SourceTitle {
   @include blockTitle();
 }

data/lib/isodoc/itu/html/word_itu_titlepage.html

@@ -212,6 +212,8 @@
   normal'><span lang="EN-US" style='font-size:30.0pt;mso-bidi-font-size:10.0pt;
   font-family:"Arial",sans-serif;mso-ansi-language:EN-US'>{% if doctype == "Recommendation" %}{{ docnumeric }}{% else %}{% if recommendationnumber %}{{ recommendationnumber }} {% endif %}{{ doctype_display }}{% endif %}<o:p></o:p></span></b></a>
     {% endif %}
+              {% if docnumber_td %}<br/><span class="doc-identifier" style='font-family:"Arial",sans-serif'>TD number: {{docnumber_td}}</span>{%endif%}
+          {% if docnumber_provisional %}<br/><span class="doc-identifier" style='font-family:"Arial",sans-serif'>Provisional identifier: {{docnumber_provisional}}</span>{%endif%}
   </span></p>
   </td>
   <span style='mso-bookmark:_Hlk526346232'><span style='mso-bookmark:dnume'></span></span>

data/lib/isodoc/itu/html/word_itu_titlepage_sp.html

@@ -16,6 +16,8 @@ lang="EN-GB" style='font-size:10.0pt'>{{ annex_to_itu_ob }}</span></i></p>
 <p class="MsoNormal" align="center" style='margin-top:0cm;text-align:center'><i><span
 lang="EN-GB" style='font-size:10.0pt'>{{ number_abbrev }} {{ docnumeric }} – {{ pubdate_ddMMMyyyy }}</span></i></p>
 {% endif %}
+{% if docnumber_td %}<p><span class="doc-identifier">TD number: {{docnumber_td}}</span></p>{%endif%}
+{% if docnumber_provisional %}<p><span class="doc-identifier">Provisional identifier: {{docnumber_provisional}}</span></p>{%endif%}
 
 <p class="MEP"><span lang="EN-GB" style='font-size:10.0pt'><o:p>&#xA0;</o:p></span></p>
 

data/lib/isodoc/itu/i18n-ar.yaml

@@ -18,6 +18,7 @@ formula: معادلة
 inequality: عدم مساواة
 clause: فقرة
 section: قسم
+abstract: ملخص
 annex_subclause: فقرة
 in: في
 to: إلى

data/lib/isodoc/itu/i18n-de.yaml

@@ -17,6 +17,7 @@ formula: Gleichung
 inequality: Ungleichheit
 clause: Klausel
 section: Abschnitt
+abstract: Zusammenfassung
 annex_subclause: Klausel
 in: in
 to: bis

data/lib/isodoc/itu/i18n-en.yaml

@@ -8,6 +8,7 @@ symbolsabbrev: Abbreviations and acronyms
 abbrev: Abbreviations and acronyms
 symbols: Abbreviations and acronyms
 conventions: Conventions
+abstract: Summary
 elsewhere_terms: >-
   This Recommendation uses the following terms defined elsewhere:
 here_terms: >-

data/lib/isodoc/itu/i18n-es.yaml

@@ -8,6 +8,7 @@ symbolsabbrev: Abreviaciones y acrónimos
 abbrev: Abreviaciones y acrónimos
 symbols: Abreviaciones y acrónimos
 conventions: Convenciones
+abstract: Resumen
 elsewhere_terms: >-
   Esta Recomendación utiliza los siguientes términos definidos en otro lugar:
 here_terms: >-

data/lib/isodoc/itu/i18n-fr.yaml

@@ -8,6 +8,7 @@ symbolsabbrev: Abréviations et acronymes
 abbrev: Abréviations et acronymes
 symbols: Abréviations et acronymes
 conventions: Conventions
+abstract: Résumé
 elsewhere_terms: >-
   La présente Recommandation utilise les termes suivants définis ailleurs:
 here_terms: >-

data/lib/isodoc/itu/i18n-ru.yaml

@@ -8,6 +8,7 @@ symbolsabbrev: Сокращения и акронимы
 abbrev: Сокращения и акронимы
 symbols: Сокращения и акронимы
 conventions: Соглашения
+abstract: Резюме
 elsewhere_terms: >-
   Эта Рекомендация использует следующие термины, определенные в другом месте:
 here_terms: >-

data/lib/isodoc/itu/i18n-zh-Hans.yaml

@@ -8,6 +8,7 @@ symbolsabbrev: 缩略语与缩写
 abbrev: 缩略语与缩写
 symbols: 缩略语与缩写
 conventions: 惯例
+abstract: 概括
 elsewhere_terms: >-
   本建议书采用下列他处定义的术语：
 here_terms: >-