metanorma-itu 2.4.2 → 2.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d173fd252ee677a77d8fe211f7f2215ca310bb1dada1dc8710f00b55b6d5b55
-  data.tar.gz: 0c517b8f430d94458f4c423a411034eb9eea1e02319aa6b03a59db930d88736a
+  metadata.gz: b5ec3cdcd778596dec27ae55cc44308d184a8e93180c51085c1ea9e4f4ee8b83
+  data.tar.gz: 0de91af4f5b675f4920e6a5c28699edd8de0c2e062c548f0be106ee732dfccc0
 SHA512:
-  metadata.gz: de66fbb0149faf3e41ef3008ad5472cbf83122abe37de4ed52250a95e57264ac682ce39c051ffb4a3175c9811c15de83e9a045fbed06533a7b0ff9de4c037249
-  data.tar.gz: 800e775da616ffce73ae7fd6add9e6168c8d6bb4f919946318adae8fb7904f1ac6d96728949794977691b82900c1db8264347c5a92ece8476a2785c0901b0a0f
+  metadata.gz: a18bf663e1a3f340e945021db942703e5b6d2c089a0f635cee55422931f420d94e838009717726a9a11fb58d9474e439b5b9cbb42fc9a018cb107d55a222597f
+  data.tar.gz: 1679c63b7d644d6ca96b5a1ed26f66ae275b2159dca9f84b00b06480df8c1f3d48353a58ef08113242df7d574b64c3739479d32df072624459093420fa9f1a7e

data/lib/isodoc/itu/base_convert.rb

@@ -48,9 +48,8 @@ module IsoDoc
       end
 
       def ol_depth(node)
-        return super unless node["class"] == "steps" ||
-          node.at(".//ancestor::xmlns:ol[@class = 'steps']")
-
+        node["class"] == "steps" ||
+          node.at(".//ancestor::xmlns:ol[@class = 'steps']") or return super
         depth = node.ancestors("ul, ol").size + 1
         type = :arabic
         type = :alphabet if [2, 7].include? depth
@@ -78,17 +77,17 @@ module IsoDoc
       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"))
-            node.elements.each do |c1|
-              if c1.name == "title" then annex_name(node, c1, s)
-              else
-                parse(c1, s)
-              end
+        @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"))
+          node.elements.each do |c1|
+            if c1.name == "title" then annex_name(node, c1, s)
+            else
+              parse(c1, s)
             end
           end
+        end
       end
 
       def info(isoxml, out)
@@ -124,8 +123,7 @@ module IsoDoc
       end
 
       def note_parse(node, out)
-        return if node["type"] == "title-footnote"
-
+        node["type"] == "title-footnote" and return
         super
       end
 
@@ -148,15 +146,40 @@ module IsoDoc
         end
       end
 
-=begin
-      def scope(isoxml, out, num)
-        return super unless @meta.get[:doctype_original] == "resolution"
+      def dl_parse(node, out)
+        node.ancestors("table, formula, figure").empty? or return super
+        dl1(node)
+        table_parse(node, out)
+      end
 
-        f = isoxml.at(ns("//clause[@type = 'scope']")) or return num
-        clause_core(f, out)
-        num + 1
+      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}"
+        dlist.name = "table"
+        dlist["class"] = "dl"
+        dlist.children.first.previous = ret
       end
-=end
+
+      def dl2tbody(dlist)
+        ret = ""
+        dlist.elements.select { |n| %w{dt dd}.include? n.name }
+          .each_slice(2) do |dt, dd|
+            ret += "<tr><th width='20%'>#{dt.children.to_xml}</th>" \
+             "<td width='80%'>#{dd.children.to_xml}</td></tr>"
+            dt.replace(" ")
+            dd.remove
+          end
+        "<tbody>#{ret}</tbody>"
+      end
+
+      #       def scope(isoxml, out, num)
+      #         return super unless @meta.get[:doctype_original] == "resolution"
+      #
+      #         f = isoxml.at(ns("//clause[@type = 'scope']")) or return num
+      #         clause_core(f, out)
+      #         num + 1
+      #       end
     end
   end
 end

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

@@ -43,7 +43,8 @@
 
         <div class="doc-info-left">
           <div class="doc-identifier">
-            {% if doctype != "Recommendation" %}{{doctype }} {% endif %}{{ docnumeric }}
+            {% if collectiontitle  %}<div>{{ collectiontitle}}</div>{%endif%}
+            <div>{% if doctype != "Recommendation" %}{{doctype }} {% endif %}{{ docnumeric }}</div>
             {% 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 %}
@@ -59,9 +60,11 @@
         </div>
 
         <div class="doc-category">
-          {% if bureau == "T" %}Telecommunication <br/>Standardization Sector <br/>of ITU{% endif %}
-          {% if bureau == "D" %}Telecommunication <br/>Development Sector <br/>of ITU{% endif %}
-          {% if bureau == "R" %}Radiocommunication <br/>Sector of ITU{% endif %}
+          {% if sector %}{{sector}}{%else%}
+          {% if bureau == "T" %}{{ labels["tsb_full"] }}{% endif %}
+          {% if bureau == "D" %}{{ labels["bdt_full"] }}{% endif %}
+          {% if bureau == "R" %}{{ labels["br_full"] }}{% endif %}
+          {%endif%}
         </div>
 
         <div class="coverpage-title">

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

@@ -223,44 +223,27 @@
   width="95" colspan="2"><p class='MsoNormal'>&#xA0;</p></td>
   <td width="303" colspan="2" valign="top" style='width:227.45pt;padding:0cm 4.25pt 0cm 4.25pt;
   height:48.7pt'>
-    {% if bureau == "T" %}
-  <p class="MsoNormal" align="left" style='text-align:left'><span style='mso-bookmark:
-  _Hlk526346232'><span lang="EN-US" style='font-size:10.0pt;font-family:"Arial",sans-serif;
-  mso-bidi-font-family:"Times New Roman";mso-ansi-language:EN-US'>TELECOMMUNICATION</span></span><span
-  style='mso-bookmark:_Hlk526346232'><span lang="EN-US" style='font-size:10.0pt;
-  font-family:"Arial",sans-serif;mso-ansi-language:EN-US'><br/>
-  </span></span><span style='mso-bookmark:_Hlk526346232'><span lang="EN-US"
-  style='font-size:10.0pt;font-family:"Arial",sans-serif;mso-bidi-font-family:
-  "Times New Roman";mso-ansi-language:EN-US'>STANDARDIZATION SECTOR<br/>
-  OF ITU</span></span><span style='mso-bookmark:_Hlk526346232'><b
-  style='mso-bidi-font-weight:normal'><span lang="EN-US" style='font-size:10.0pt;
-  mso-ansi-language:EN-US'><o:p></o:p></span></b></span></p>
+
+  {% if sector %}
+  <p class="MsoNormal" align="left" style='text-align:left'>
+  <span lang="EN-US" style='font-size:10.0pt;font-family:"Arial",sans-serif;
+              mso-bidi-font-family:"Times New Roman";mso-ansi-language:EN-US'>{{ sector }}</span></p>
+  {% else %}
+  {% if bureau == "T" %}
+  <p class="MsoNormal" align="left" style='text-align:left'>
+  <span lang="EN-US" style='font-size:10.0pt;font-family:"Arial",sans-serif;
+              mso-bidi-font-family:"Times New Roman";mso-ansi-language:EN-US'>{{ labels["tsb_full"] }}</span></p>
   {% endif %}
       {% if bureau == "D" %}
-  <p class="MsoNormal" align="left" style='text-align:left'><span style='mso-bookmark:
-  _Hlk526346232'><span lang="EN-US" style='font-size:10.0pt;font-family:"Arial",sans-serif;
-  mso-bidi-font-family:"Times New Roman";mso-ansi-language:EN-US'>TELECOMMUNICATION</span></span><span
-  style='mso-bookmark:_Hlk526346232'><span lang="EN-US" style='font-size:10.0pt;
-  font-family:"Arial",sans-serif;mso-ansi-language:EN-US'><br/>
-  </span></span><span style='mso-bookmark:_Hlk526346232'><span lang="EN-US"
-  style='font-size:10.0pt;font-family:"Arial",sans-serif;mso-bidi-font-family:
-  "Times New Roman";mso-ansi-language:EN-US'>DEVELOPMENT SECTOR<br/>
-  OF ITU</span></span><span style='mso-bookmark:_Hlk526346232'><b
-  style='mso-bidi-font-weight:normal'><span lang="EN-US" style='font-size:10.0pt;
-  mso-ansi-language:EN-US'><o:p></o:p></span></b></span></p>
+  <p class="MsoNormal" align="left" style='text-align:left'>
+  <span lang="EN-US" style='font-size:10.0pt;font-family:"Arial",sans-serif;
+              mso-bidi-font-family:"Times New Roman";mso-ansi-language:EN-US'>{{ labels["bdt_full"] }}</span></p>
   {% endif %}
     {% if bureau == "R" %}
-  <p class="MsoNormal" align="left" style='text-align:left'><span style='mso-bookmark:
-  _Hlk526346232'><span lang="EN-US" style='font-size:10.0pt;font-family:"Arial",sans-serif;
-  mso-bidi-font-family:"Times New Roman";mso-ansi-language:EN-US'>RADIOCOMMUNICATION</span></span><span
-  style='mso-bookmark:_Hlk526346232'><span lang="EN-US" style='font-size:10.0pt;
-  font-family:"Arial",sans-serif;mso-ansi-language:EN-US'><br/>
-  </span></span><span style='mso-bookmark:_Hlk526346232'><span lang="EN-US"
-  style='font-size:10.0pt;font-family:"Arial",sans-serif;mso-bidi-font-family:
-  "Times New Roman";mso-ansi-language:EN-US'>SECTOR<br/>
-  OF ITU</span></span><span style='mso-bookmark:_Hlk526346232'><b
-  style='mso-bidi-font-weight:normal'><span lang="EN-US" style='font-size:10.0pt;
-  mso-ansi-language:EN-US'><o:p></o:p></span></b></span></p>
+  <p class="MsoNormal" align="left" style='text-align:left'>
+  <span lang="EN-US" style='font-size:10.0pt;font-family:"Arial",sans-serif;
+              mso-bidi-font-family:"Times New Roman";mso-ansi-language:EN-US'>{{ labels["br_full"] }}</span></p>
+  {% endif %}
   {% endif %}
 
   </td>

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

@@ -58,6 +58,9 @@ revision_abbreviation: المراجعة
 tsb: TSB
 br: BR
 bdt: BDT
+tsb_short: مكتب تقييس الاتصالات
+br_short: مكتب الاتصالات الراديوية
+bdt_short: مكتب تنمية الاتصالات
 tsb_full: مكتب تقييس الاتصالات
 br_full: مكتب الاتصالات الراديوية
 bdt_full: مكتب تنمية الاتصالات

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

@@ -59,6 +59,9 @@ revision_abbreviation: Rev.
 tsb: TSB
 br: BR
 bdt: BDT
+tsb_short: Büro für Telekommunikations-Standardisierung
+br_short: Büro für Funkkommunikation
+bdt_short: Büro für Entwicklungen in der Telekommunikation
 tsb_full: Büro für Telekommunikations-<br/>Standardisierung<br/>der ITU
 br_full: Büro für Funkkommunikation<br/>der ITU
 bdt_full: Büro für Entwicklungen<br/>in der Telekommunikation<br/>der ITU

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

@@ -60,6 +60,9 @@ revision_abbreviation: Rev.
 tsb: TSB
 br: BR
 bdt: BDT
+tsb_short: Telecommunication Standardization Bureau
+br_short: Radiocommunication Bureau
+bdt_short: Telecommunication Development Bureau
 tsb_full: Telecommunication<br/>Standardization Bureau<br/>of ITU
 br_full: Radiocommunication Bureau<br/>of ITU
 bdt_full: Telecommunication<br/>Development Bureau<br/>of ITU

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

@@ -60,6 +60,9 @@ revision_abbreviation: Rev.
 tsb: TSB
 br: BR
 bdt: BDT
+tsb_short: Oficina de Normalización de las Telecomunicaciones
+br_short: Oficina de Radiocomunicaciones
+bdt_short: Oficina de Desarrollo de las Telecomunicaciones
 tsb_full: <br/>Oficina de Normalización<br/>de las Telecomunicaciones de la UIT
 br_full: Oficina de Radiocomunicaciones<br/>de la UIT
 bdt_full: <br/>Oficina de Desarrollo<br/>de las Telecomunicaciones de la UIT

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

@@ -60,6 +60,9 @@ revision_abbreviation: Rev.
 tsb: TSB
 br: BR
 bdt: BDT
+tsb_short: Bureau de la normalisation des télécommunications
+br_short: Bureau des radiocommunications
+bdt_short: Bureau de développement des télécommunications
 tsb_full: Bureau de la normalisation<br/>des télécommunications<br/>de l’UIT
 br_full: Bureau des radiocommunications<br/>de l’UIT
 bdt_full: Bureau de développement<br/>des télécommunications<br/>de l’UIT

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

@@ -60,6 +60,9 @@ revision_abbreviation: Ред.
 tsb: БСЭ
 br: БР
 bdt: БРЭ
+tsb_short: Бюро стандартизации электросвязи
+br_short: Бюро радиосвязи
+bdt_short: Бюро развития электросвязи
 tsb_full: Бюро стандартизации электросвязи<br/>МСЭ
 br_full: Бюро радиосвязи<br/>МСЭ
 bdt_full: Бюро развития электросвязи<br/>МСЭ

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

@@ -52,6 +52,9 @@ revision_abbreviation: Rev.
 tsb: TSB
 br: BR
 bdt: BDT
+tsb_short: 电信标准化局
+br_short: 电信发展部门
+bdt_short: 电信发展局
 tsb_full: 国际电信联盟<br/>电信标准化局
 br_full: 国际电信联盟<br/>电信发展部门
 bdt_full: 国际电信联盟<br/>电信发展局

data/lib/isodoc/itu/init.rb

@@ -21,6 +21,11 @@ module IsoDoc
                                        i18nyaml: i18nyaml || @i18nyaml)
       end
 
+      def bibrenderer(options = {})
+        ::Relaton::Render::ITU::General.new(options.merge(language: @lang,
+                                                          i18nhash: @i18n.get))
+      end
+
       def fileloc(loc)
         File.join(File.dirname(__FILE__), loc)
       end