metanorma-itu 2.5.6 → 2.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9bcca39daa471be9099854e87a81ecce4c146a479cb380becb63719869d43bc8
-  data.tar.gz: 612f4eb3446450c32b54ea1393446183dfacf5fdb9313ca39742e89bbb729840
+  metadata.gz: 07febc1da79ed58da9a7ec29a626c5612d5a54da9e77003b7adf70531f9738ca
+  data.tar.gz: 760aa9b1e6bbf86f9ec4f127519ba5d9a6493020ef5ee281c8010a5d57607136
 SHA512:
-  metadata.gz: 841a1368e8ca1a9a71b3cb8c6993491251896581b8e11282d0456b9a433153a4467030d4bcb9ea3f370c04ea41967949897bb554c9e2203f5a587b13446951b8
-  data.tar.gz: d451dd6a95d4e53f862f9005ee61c05280e4b9f433809beedfb9091cd0ca9291bda146187d33e33c84fdae1d43eb6c201d60117392a88a6df59fd7de135e95a6
+  metadata.gz: 0d3e2e0eef213be48fb71f1bb4f0582b4cabcc95a770ef2fd7cdf4d5f8f7b5fb1e3155acea1d2c256b5ecc500919fd4927bf5c1b3829cb340ea6972a964f31b0
+  data.tar.gz: fd6cc9a7c452b97962bd84797e3394c3211c27d49cc5220e755bda5ebf2fc229e1c25b9a497fbdc86fb1a356a6cd3d5ff2349df968075df94889f27f06938aa5

data/lib/isodoc/itu/base_convert.rb

@@ -12,10 +12,10 @@ module IsoDoc
                      "[not(local-name() = 'abstract')]".freeze
 
       def introduction(clause, out)
-        title = clause.at(ns("./title"))
+        title = clause.at(ns("./fmt-title"))
         out.div **attr_code(clause_attrs(clause)) do |s|
           clause_name(clause, title, s, class: "IntroTitle")
-          clause.elements.reject { |c1| c1.name == "title" }.each do |c1|
+          clause.elements.reject { |c1| c1.name == "fmt-title" }.each do |c1|
             parse(c1, s)
           end
         end
@@ -37,13 +37,8 @@ module IsoDoc
         ""
       end
 
-      def note_delim
-        " – "
-      end
-
       def para_class(node)
-        return "supertitle" if node["class"] == "supertitle"
-
+        node["class"] == "supertitle" and return "supertitle"
         super
       end
 
@@ -59,30 +54,20 @@ module IsoDoc
         ol_style(type)
       end
 
-      def annex_name(annex, name, div)
+      def annex_name(_annex, 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) }
         end
-        @meta.get[:doctype_original] == "resolution" or
-          annex_obligation_subtitle(annex, div)
-      end
-
-      def annex_obligation_subtitle(annex, div)
-        info = annex["obligation"] == "informative"
-        div.p class: "annex_obligation" do |p|
-          p << (info ? @i18n.inform_annex : @i18n.norm_annex)
-            .sub("%", @meta.get[:doctype] || "")
-        end
       end
 
       def annex(node, out)
         @meta.get[:doctype_original] == "recommendation-annex" or
           page_break(out)
         out.div **attr_code(id: node["id"], class: "Section3") do |s|
-          annex_name(node, nil, s) unless node.at(ns("./title"))
+          annex_name(node, nil, s) unless node.at(ns("./fmt-title"))
           node.elements.each do |c1|
-            if c1.name == "title" then annex_name(node, c1, s)
+            if c1.name == "fmt-title" then annex_name(node, c1, s)
             else
               parse(c1, s)
             end
@@ -97,19 +82,20 @@ module IsoDoc
         super
       end
 
-      def note_p_parse(node, div)
+      # TODO kill
+      def note_p_parsex(node, div)
         name = node.at(ns("./name"))&.remove
         div.p do |p|
           name and p.span class: "note_label" do |s|
             name.children.each { |n| parse(n, s) }
-            s << note_delim
           end
           node.first_element_child.children.each { |n| parse(n, p) }
         end
         node.element_children[1..-1].each { |n| parse(n, div) }
       end
 
-      def note_parse1(node, div)
+      # TODO kill
+      def note_parse1x(node, div)
         name = node.at(ns("./name"))&.remove
         div.p do |p|
           name and p.span class: "note_label" do |s|
@@ -119,10 +105,6 @@ module IsoDoc
         node.children.each { |n| parse(n, div) }
       end
 
-      def table_footnote_reference_format(node)
-        node.content += ")"
-      end
-
       def note_parse(node, out)
         node["type"] == "title-footnote" and return
         super
@@ -139,7 +121,7 @@ module IsoDoc
       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)
+            if c1.name == "fmt-title" then clause_name(clause, c1, s, nil)
             else
               parse(c1, s)
             end
@@ -156,7 +138,7 @@ module IsoDoc
       def dl1(dlist)
         ret = dl2tbody(dlist)
         n = dlist.at(ns("./colgroup")) and ret = "#{n.remove.to_xml}#{ret}"
-        n = dlist.at(ns("./name")) and ret = "#{n.remove.to_xml}#{ret}"
+        n = dlist.at(ns("./fmt-name")) and ret = "#{n.remove.to_xml}#{ret}"
         dlist.name = "table"
         dlist["class"] = "dl"
         dlist.children.first.previous = ret

data/lib/isodoc/itu/cleanup.rb

@@ -25,7 +25,7 @@ module IsoDoc
       def term_cleanup1(docxml)
         docxml.xpath("//p[@class = 'Terms']").each do |d|
           h2 = d.at("./preceding-sibling::*[@class = 'TermNum'][1]")
-          d.children.first.previous = "<b>#{h2.children.to_xml}</b>&#xa0;"
+          d.add_first_child "<b>#{h2.children.to_xml}</b>&#xa0;"
           d["id"] = h2["id"]
           h2.remove
         end

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

@@ -10,7 +10,7 @@ termsdef: مصطلحات معرفة
 termsdefsymbolsabbrev: تعريف
 termsdefsymbols: تعريف
 termsdefabbrev: تعريف
-termnote: ملاحظة
+termnote: <span class='fmt-element-name'>ﻡﻼﺤﻇﺓ</span> ؜%؜
 normref: المراجع المعيارية
 symbolsabbrev: اختصار
 abbrev: اختصار
@@ -31,7 +31,7 @@ annex_subclause: فقرة
 keywords: الكلمات الدالة
 in: في
 to: إلى
-nested_xref: "%2 في %1"
+nested_xref: "%2 <conn>ﻒﻳ</conn> %1"
 where: ":حيث,"
 where_one: "حيث,"
 blankclause: تم ترك هذا الشرط فارغًا عمدًا

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

@@ -10,7 +10,7 @@ termsdef: Definitionen
 termsdefsymbolsabbrev: Definitionen
 termsdefsymbols: Definitionen
 termsdefabbrev: Definitionen
-termnote: HINWEIS %
+termnote: <span class='fmt-element-name'>HINWEIS</span> %
 normref: Referenzen
 symbolsabbrev: Abkürzungen und Akronyme
 abbrev: Abkürzungen und Akronyme
@@ -30,7 +30,7 @@ annex_subclause: Klausel
 keywords: Schlüsselwörter
 in: in
 to: bis
-nested_xref: "%2 in %1"
+nested_xref: "%2 <conn>in</conn> %1"
 where: "wobei:"
 where_one: "wobei"
 blankclause: Diese Klausel ist absichtlich leer gelassen

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

@@ -10,7 +10,7 @@ termsdef: Definitions
 termsdefsymbolsabbrev: Definitions
 termsdefsymbols: Definitions
 termsdefabbrev: Definitions
-termnote: NOTE %
+termnote: <span class='fmt-element-name'>NOTE</span> %
 normref: References
 symbolsabbrev: Abbreviations and acronyms
 abbrev: Abbreviations and acronyms
@@ -33,7 +33,7 @@ in: in
 to: to
 where: "where:"
 where_one: "where"
-nested_xref: "%2 in %1"
+nested_xref: "%2 <conn>in</conn> %1"
 blankclause: This clause is intentionally left blank.
 norm_with_refs_pref:
   The following ITU-T Recommendations and other references contain provisions which, through reference in this text, constitute provisions of this Recommendation. At the time of publication, the editions indicated were valid. All Recommendations and other references are subject to revision; users of this Recommendation are therefore encouraged to investigate the possibility of applying the most recent edition of the Recommendations and other references listed below. A list of the currently valid ITU-T Recommendations is regularly published. The reference to a document within this Recommendation does not give it, as a stand-alone document, the status of a Recommendation.

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

@@ -10,7 +10,7 @@ termsdef: Definiciones
 termsdefsymbolsabbrev: Definiciones
 termsdefsymbols: Definiciones
 termsdefabbrev: Definiciones
-termnote: NOTA %
+termnote: <span class='fmt-element-name'>NOTA</span> %
 normref: Referencias
 symbolsabbrev: Abreviaciones y acrónimos
 abbrev: Abreviaciones y acrónimos
@@ -31,7 +31,7 @@ annex_subclause: cláusula
 keywords: Palabras clave
 in: en
 to: a
-nested_xref: "%2 en %1"
+nested_xref: "%2 <conn>en</conn> %1"
 where: "donde:"
 where_one: "donde"
 blankclause: Esta cláusula se deja en blanco intencionalmente.

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

@@ -10,7 +10,7 @@ termsdef: Définitions
 termsdefsymbolsabbrev: Définitions
 termsdefsymbols: Définitions
 termsdefabbrev: Définitions
-termnote: NOTE %
+termnote: <span class='fmt-element-name'>NOTE</span> %
 normref: Références
 symbolsabbrev: Abréviations et acronymes
 abbrev: Abréviations et acronymes
@@ -31,7 +31,7 @@ annex_subclause: article
 keywords: Mots clés
 in: dans
 to: à
-nested_xref: "%2 dans %1"
+nested_xref: "%2 <conn>dans</conn> %1"
 where: "où:"
 where_one: "où"
 blankclause: Cette clause est laissée en blanc intentionnellement.

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

@@ -10,7 +10,7 @@ termsdef: Определения
 termsdefsymbolsabbrev: Определения
 termsdefsymbols: Определения
 termsdefabbrev: Определения
-termnote: ПРИМЕЧАНИЕ %
+termnote: <span class='fmt-element-name'>ПРИМЕЧАНИЕ</span> %
 normref: Ссылки
 symbolsabbrev: Сокращения и акронимы
 abbrev: Сокращения и акронимы
@@ -31,7 +31,7 @@ annex_subclause: пункт
 keywords: Ключевые слова
 in: в
 to: до
-nested_xref: "%2 в %1"
+nested_xref: "%2 <conn>в</conn> %1"
 where: "где:"
 where_one: "где"
 blankclause: Этот пункт намеренно оставлен пустым.

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

@@ -10,7 +10,7 @@ termsdef: 定义
 termsdefsymbolsabbrev: 定义
 termsdefsymbols: 定义
 termsdefabbrev: 定义
-termnote:  注 %
+termnote:  <span class='fmt-element-name'>注</span>%
 normref: 规范性参考文献
 symbolsabbrev: 缩略语与缩写
 abbrev: 缩略语与缩写
@@ -31,7 +31,7 @@ annex_subclause: 条款
 keywords: 关键词
 in: 中的
 to: 至
-nested_xref: "%1中的%2"
+nested_xref: "%1<conn>中的</conn>%2"
 where:  式中：
 where_one:  式中
 blankclause: This clause is intentionally left blank.

data/lib/isodoc/itu/init.rb

@@ -22,8 +22,8 @@ module IsoDoc
       end
 
       def bibrenderer(options = {})
-        ::Relaton::Render::Itu::General.new(options.merge(language: @lang,
-                                                          i18nhash: @i18n.get))
+        ::Relaton::Render::Itu::General.new(options
+          .merge(language: @lang, i18nhash: @i18n.get))
       end
 
       def fileloc(loc)