metanorma-itu 2.2.14 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a28a71a0e59c9d816daa8687d0cb502725afe60f5c768dcebbe4fb0c039439b
-  data.tar.gz: cef6128f170257b229679f1a972239f7cc2803a3ecae8e9f977616facb92aece
+  metadata.gz: dd7cb2a16590fe04f51e162637b7fc1be2b6e7b403d04118e8c82b2ad0e4eb66
+  data.tar.gz: 35a5dd96771972460f80fc0f0a83f4c6610b59bd659b08c771b89405ca719e62
 SHA512:
-  metadata.gz: a2bf5a89490dea4a35da30754286f7c48af1d833c9275407c1b52dc30369247547333b8990b666e6d2730677b7b09954a733ccc8c54b7fda6e10f3b45ec04519
-  data.tar.gz: c8aff7031ab0a058682be1afdbd2963ac55e9acb91e80132ccc1daea4b27b6bc46ba78c7957674997e12272d33b144163b60bba0c27e0afe8c77435a90ee7627
+  metadata.gz: 78896c795984c2999c194e6cb21546880ed1df41cbabe7082f773d5086c1f354f5d342eec07f7ae697dd21ab9848aee3b035d4047db3af3c1c4efc9296ccf10f
+  data.tar.gz: 53894e2251b8a69d8c4ff9c37789b600b18907c8a718ac9a5dde34e351e4e36b7b27c1ae40b3808bc885dfa7d1b7cf458d2e3a0ca43474a9ec341bd07760cae8

data/lib/isodoc/itu/base_convert.rb

@@ -1,9 +1,9 @@
 require "isodoc"
 require "fileutils"
-require_relative "./ref"
-require_relative "./xref"
-require_relative "./terms"
-require_relative "./cleanup"
+require_relative "ref"
+require_relative "xref"
+require_relative "terms"
+require_relative "cleanup"
 
 module IsoDoc
   module ITU
@@ -61,7 +61,6 @@ module IsoDoc
       end
 
       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|
           name&.children&.each { |c2| parse(c2, t) }
@@ -74,24 +73,22 @@ module IsoDoc
         info = annex["obligation"] == "informative"
         div.p class: "annex_obligation" do |p|
           p << (info ? @i18n.inform_annex : @i18n.norm_annex)
-            .sub(/%/, @meta.get[:doctype] || "")
+            .sub("%", @meta.get[:doctype] || "")
         end
       end
 
-      def annex(isoxml, out)
-        isoxml.xpath(ns("//annex")).each do |c|
+      def annex(node, out)
           @meta.get[:doctype_original] == "recommendation-annex" or
             page_break(out)
-          out.div **attr_code(id: c["id"], class: "Section3") do |s|
-            annex_name(c, nil, s) unless c.at(ns("./title"))
-            c.elements.each do |c1|
-              if c1.name == "title" then annex_name(c, c1, s)
+          out.div **attr_code(id: node["id"], class: "Section3") do |s|
+            annex_name(node, nil, s) unless node.at(ns("./title"))
+            node.elements.each do |c1|
+              if c1.name == "title" then annex_name(node, c1, s)
               else
                 parse(c1, s)
               end
             end
           end
-        end
       end
 
       def info(isoxml, out)
@@ -100,54 +97,6 @@ module IsoDoc
         super
       end
 
-      def middle_title(isoxml, out)
-        if @meta.get[:doctype] == "Resolution"
-          middle_title_resolution(isoxml, out)
-        else
-          middle_title_recommendation(isoxml, out)
-        end
-      end
-
-      def middle_title_resolution(isoxml, out)
-        res = isoxml.at(ns("//bibdata/title[@type = 'resolution']"))
-        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] }
-        middle_title_resolution_subtitle(isoxml, out)
-      end
-
-      def middle_title_resolution_subtitle(isoxml, out)
-        out.p(align: "center", style: "text-align:center;") do |p|
-          p.i do |i|
-            i << "("
-            isoxml.at(ns("//bibdata/title[@type = 'resolution-placedate']"))
-              .children.each { |n| parse(n, i) }
-            i << ")"
-          end
-          isoxml.xpath(ns("//note[@type = 'title-footnote']")).each do |f|
-            footnote_parse(f, p)
-          end
-        end
-      end
-
-      def middle_title_recommendation(isoxml, out)
-        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|
-          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 }
-      end
-
       def note_p_parse(node, div)
         name = node&.at(ns("./name"))&.remove
         div.p do |p|
@@ -180,14 +129,15 @@ module IsoDoc
         super
       end
 
-      # can have supertitle in resolution
-      def clause(isoxml, out)
-        isoxml.xpath(ns(middle_clause(isoxml))).each do |c|
-          clause_core(c, out)
+      def clause_attrs(node)
+        if node["type"] == "keyword"
+          super.merge(class: "Keyword")
+        else super
         end
       end
 
-      def clause_core(clause, out)
+      # can have supertitle in resolution
+      def clause(clause, out)
         out.div **attr_code(clause_attrs(clause)) do |s|
           clause.elements.each do |c1|
             if c1.name == "title" then clause_name(clause, c1, s, nil)
@@ -198,6 +148,7 @@ module IsoDoc
         end
       end
 
+=begin
       def scope(isoxml, out, num)
         return super unless @meta.get[:doctype_original] == "resolution"
 
@@ -205,6 +156,7 @@ module IsoDoc
         clause_core(f, out)
         num + 1
       end
+=end
     end
   end
 end

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

@@ -90,7 +90,7 @@ h1, h2, h3, h4, h5, h6 {
 
 blockquote, q {
   quotes: none; }
-  blockquote:before, blockquote:after, q:before, q:after {
+  blockquote::before, blockquote::after, q::before, q::after {
     content: '';
     content: none; }
 
@@ -113,14 +113,18 @@ b, strong {
 div.document-stage-band, div.document-type-band {
   background-color: #333333; }
 
-a.FootnoteRef + a.FootnoteRef:before {
+a.FootnoteRef + a.FootnoteRef::before {
   content: ", ";
   vertical-align: super; }
 
-a.TableFootnoteRef + a.TableFootnoteRef:before {
+a.TableFootnoteRef + a.TableFootnoteRef::before {
   content: ", ";
   vertical-align: super; }
 
+a.TableFootnoteRef, span.TableFootnoteRef,
+a.FootnoteRef, span.FootnoteRef {
+  vertical-align: super; }
+
 .addition {
   color: blue; }
 

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

@@ -90,7 +90,7 @@ h1, h2, h3, h4, h5, h6 {
 
 blockquote, q {
   quotes: none; }
-  blockquote:before, blockquote:after, q:before, q:after {
+  blockquote::before, blockquote::after, q::before, q::after {
     content: '';
     content: none; }
 
@@ -113,14 +113,18 @@ b, strong {
 div.document-stage-band, div.document-type-band {
   background-color: #333333; }
 
-a.FootnoteRef + a.FootnoteRef:before {
+a.FootnoteRef + a.FootnoteRef::before {
   content: ", ";
   vertical-align: super; }
 
-a.TableFootnoteRef + a.TableFootnoteRef:before {
+a.TableFootnoteRef + a.TableFootnoteRef::before {
   content: ", ";
   vertical-align: super; }
 
+a.TableFootnoteRef, span.TableFootnoteRef,
+a.FootnoteRef, span.FootnoteRef {
+  vertical-align: super; }
+
 .addition {
   color: blue; }
 
@@ -369,7 +373,7 @@ h1, h2, h3, h4, h5, h6 {
 
 blockquote, q {
   quotes: none; }
-  blockquote:before, blockquote:after, q:before, q:after {
+  blockquote::before, blockquote::after, q::before, q::after {
     content: '';
     content: none; }
 
@@ -392,14 +396,18 @@ b, strong {
 div.document-stage-band, div.document-type-band {
   background-color: #333333; }
 
-a.FootnoteRef + a.FootnoteRef:before {
+a.FootnoteRef + a.FootnoteRef::before {
   content: ", ";
   vertical-align: super; }
 
-a.TableFootnoteRef + a.TableFootnoteRef:before {
+a.TableFootnoteRef + a.TableFootnoteRef::before {
   content: ", ";
   vertical-align: super; }
 
+a.TableFootnoteRef, span.TableFootnoteRef,
+a.FootnoteRef, span.FootnoteRef {
+  vertical-align: super; }
+
 .addition {
   color: blue; }
 
@@ -790,7 +798,7 @@ nav #toc {
   #toc li:hover a, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) li:hover a {
     background: none;
     box-shadow: none; }
-  #toc li:before, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) li:before {
+  #toc li::before, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) li::before {
     content: " ";
     display: none; }
   @media print {
@@ -1100,7 +1108,7 @@ ul, ol {
 
 ul > li {
   list-style: none; }
-  ul > li:before {
+  ul > li::before {
     content: "\2014";
     display: inline-block;
     width: 1em;

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

@@ -70,7 +70,7 @@ nav {
       background: none;
       box-shadow: none;
     }
-    &:before {
+    &::before {
       content: " ";
       display: none;
     }
@@ -356,7 +356,7 @@ ul {
   > li {
     list-style: none;
 
-    &:before {
+    &::before {
       content: "\2014";
       display: inline-block;
       width: 1em;

data/lib/isodoc/itu/html_convert.rb

@@ -57,16 +57,6 @@ module IsoDoc
         end
       end
 
-      def make_body3(body, docxml)
-        body.div **{ class: "main-section" } do |div3|
-          boilerplate docxml, div3
-          front docxml, div3
-          middle docxml, div3
-          footnotes div3
-          comments div3
-        end
-      end
-
       def authority_cleanup(docxml)
         dest = docxml.at("//div[@id = 'draft-warning-destination']")
         auth = docxml.at("//div[@id = 'draft-warning']")
@@ -74,6 +64,11 @@ module IsoDoc
         super
       end
 
+      def clause(node, out)
+        node["type"] == "keyword" and return
+        super
+      end
+
       include BaseConvert
       include Init
     end

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

@@ -18,8 +18,9 @@ formula: معادلة
 inequality: عدم مساواة
 clause: فقرة
 section: قسم
-abstract: ملخص
+summary: ملخص
 annex_subclause: فقرة
+keywords: الكلمات الدالة
 in: في
 to: إلى
 where: ":حيث,"

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

@@ -17,8 +17,9 @@ formula: Gleichung
 inequality: Ungleichheit
 clause: Klausel
 section: Abschnitt
-abstract: Zusammenfassung
+summary: Zusammenfassung
 annex_subclause: Klausel
+keywords: Schlüsselwörter
 in: in
 to: bis
 where: "wobei:"

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

@@ -8,7 +8,7 @@ symbolsabbrev: Abbreviations and acronyms
 abbrev: Abbreviations and acronyms
 symbols: Abbreviations and acronyms
 conventions: Conventions
-abstract: Summary
+summary: Summary
 elsewhere_terms: >-
   This Recommendation uses the following terms defined elsewhere:
 here_terms: >-
@@ -20,6 +20,7 @@ inequality: Inequality
 clause: clause
 section: Section
 annex_subclause: clause
+keywords: Keywords
 in: in
 to: to
 where: "where:"
@@ -64,6 +65,8 @@ prepub: Prepublished version
 draft_new: Draft new %
 email: E-mail
 editor_full: editor
+toc_figures: List of Figures
+toc_tables: List of Tables
 doctype_dict:
   resolution: Resolution
   recommendation: Recommendation

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

@@ -8,7 +8,7 @@ symbolsabbrev: Abreviaciones y acrónimos
 abbrev: Abreviaciones y acrónimos
 symbols: Abreviaciones y acrónimos
 conventions: Convenciones
-abstract: Resumen
+summary: Resumen
 elsewhere_terms: >-
   Esta Recomendación utiliza los siguientes términos definidos en otro lugar:
 here_terms: >-
@@ -20,6 +20,7 @@ inequality: Inecuación
 clause: cláusula
 section: Sección
 annex_subclause: cláusula
+keywords: Palabras clave
 in: en
 to: a
 where: "donde:"
@@ -64,6 +65,8 @@ prepub: Versión prepublicada
 draft_new: Borrador de nueva %
 email: E-mail
 editor_full: editor
+toc_figures: Table de Figuras
+toc_tables: Tabla de Tablas
 doctype_dict:
   resolution: Resolución
   recommendation: Recomendación

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

@@ -8,7 +8,7 @@ symbolsabbrev: Abréviations et acronymes
 abbrev: Abréviations et acronymes
 symbols: Abréviations et acronymes
 conventions: Conventions
-abstract: Résumé
+summary: Résumé
 elsewhere_terms: >-
   La présente Recommandation utilise les termes suivants définis ailleurs:
 here_terms: >-
@@ -20,6 +20,7 @@ inequality: Inégalité
 clause: article
 section: Section
 annex_subclause: article
+keywords: Mots clés
 in: dans
 to: à
 where: "où:"
@@ -64,6 +65,8 @@ prepub: Version pré-publiée
 draft_new: Projet de nouvelle %
 editor_full: éditeur
 email: E-mail
+toc_figures: Table de Figures
+toc_tables: Table des Tableaux
 doctype_dict:
   resolution: Résolution
   recommendation: Recommandation

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

@@ -8,7 +8,7 @@ symbolsabbrev: Сокращения и акронимы
 abbrev: Сокращения и акронимы
 symbols: Сокращения и акронимы
 conventions: Соглашения
-abstract: Резюме
+summary: Резюме
 elsewhere_terms: >-
   Эта Рекомендация использует следующие термины, определенные в другом месте:
 here_terms: >-
@@ -20,6 +20,7 @@ inequality: Неравенство
 clause: пункт
 section: Раздел
 annex_subclause: пункт
+keywords: Ключевые слова
 in: в
 to: до
 where: "где:"
@@ -63,6 +64,8 @@ bdt_full: Бюро развития электросвязи<br/>МСЭ
 prepub: Предварительно опубликованная версия
 draft_new: Проект новой %
 email: Эл. почта
+toc_figures: Таблица Фигур
+toc_tables: Таблица Таблиц
 editor_full: редактор
 doctype_dict:
   resolution: Резолюция

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

@@ -8,7 +8,7 @@ symbolsabbrev: 缩略语与缩写
 abbrev: 缩略语与缩写
 symbols: 缩略语与缩写
 conventions: 惯例
-abstract: 概括
+summary: 概括
 elsewhere_terms: >-
   本建议书采用下列他处定义的术语：
 here_terms: >-
@@ -20,6 +20,7 @@ inequality: 不等式
 clause: 条款
 section: 节
 annex_subclause: 条款
+keywords: 关键词
 in: in
 to: to
 where:  式中：