metanorma-itu 1.3.3 → 1.3.7

data/lib/isodoc/itu/ref.rb

@@ -5,12 +5,12 @@ require "fileutils"
 module IsoDoc
   module ITU
     module BaseConvert
-      def nonstd_bibitem(list, b, ordinal, biblio)
+      def nonstd_bibitem(list, b, _ordinal, biblio)
         list.tr **attr_code(iso_bibitem_entry_attrs(b, biblio)) do |ref|
           id = render_identifier(bibitem_ref_code(b))
-          ref.td **{style: "vertical-align:top"} do |td|
-            td << (id[0] || "[#{id[1]}]")&.
-              gsub(/-/, "&#x2011;")&.gsub(/ /, "&#xa0;")
+          ref.td **{ style: "vertical-align:top" } do |td|
+            td << (id[0] || "[#{id[1]}]")
+              &.gsub(/-/, "&#x2011;")&.gsub(/ /, "&#xa0;")
             date_note_process(b, td)
           end
           ref.td { |td| reference_format(b, td) }
@@ -28,6 +28,7 @@ module IsoDoc
             f.elements.each do |b|
               if b.name == "bibitem"
                 next if implicit_reference(b)
+
                 i += 1
                 nonstd_bibitem(tbody, b, i, biblio)
               else
@@ -45,6 +46,7 @@ module IsoDoc
 
       def bracket_if_num(x)
         return nil if x.nil?
+
         x = x.text.sub(/^\[/, "").sub(/\]$/, "")
         "[#{x}]"
       end
@@ -55,7 +57,7 @@ module IsoDoc
       end
 
       def titlecase(s)
-        s.gsub(/ |\_|\-/, " ").split(/ /).map(&:capitalize).join(" ")
+        s.gsub(/ |_|-/, " ").split(/ /).map(&:capitalize).join(" ")
       end
 
       def pref_ref_code(b)
@@ -71,23 +73,27 @@ module IsoDoc
         id.empty? and
           id = b.xpath(ns("./docidentifier[not(@type = 'metanorma')]"))
         return [] if id.empty?
+
         id.sort_by { |i| i["type"] == "ITU" ? 0 : 1 }
       end
 
       def render_multi_identifiers(ids)
         ids.map do |id|
-          id["type"] == "ITU" ? doctype_title(id) : 
+          if id["type"] == "ITU"
+            doctype_title(id)
+          else
             docid_prefix(id["type"], id.text.sub(/^\[/, "").sub(/\]$/, ""))
+          end
         end.join(" | ")
       end
 
       def doctype_title(id)
         type = id.parent&.at(ns("./ext/doctype"))&.text || "recommendation"
         if type == "recommendation" &&
-            /^(?<prefix>ITU-[A-Z] [A-Z])[ .-]Sup[a-z]*\.[ ]?(?<num>\d+)$/ =~ id.text
+            /^(?<prefix>ITU-[A-Z] [A-Z])[ .-]Sup[a-z]*\. ?(?<num>\d+)$/ =~ id.text
           "#{prefix}-series Recommendations – Supplement #{num}"
         else
-          d = docid_prefix(id["type"], id.text.sub(/^\[/, '').sub(/\]$/, ''))
+          d = docid_prefix(id["type"], id.text.sub(/^\[/, "").sub(/\]$/, ""))
           "#{titlecase(type)} #{d}"
         end
       end
@@ -98,7 +104,7 @@ module IsoDoc
         r << id1
         date = b.at(ns("./date[@type = 'published']")) and
           r << " (#{date.text.sub(/-.*$/, '')})"
-        r << ", " if (date || !id1.empty?)
+        r << ", " if date || !id1.empty?
       end
 
       def reference_format_title(b, r)

data/lib/isodoc/itu/xref.rb

@@ -1,5 +1,6 @@
 require "isodoc"
 require "fileutils"
+require_relative "./xref_section"
 
 module IsoDoc
   module ITU
@@ -16,38 +17,15 @@ module IsoDoc
         @hierarchical_assets = options[:hierarchical_assets]
       end
 
-      def annex_name_lbl(clause, num)
-        lbl = clause["obligation"] == "informative" ?  @labels["appendix"] : @labels["annex"]
-        @doctype == "resolution" ? l10n("#{lbl.upcase} #{num}") :
-          l10n("<strong>#{lbl} #{num}</strong>")
-      end
-
-      def annex_names(clause, num)
-        lbl = clause["obligation"] == "informative" ? 
-          @labels["appendix"] : @labels["annex"]
-        @anchors[clause["id"]] =
-          { label: annex_name_lbl(clause, num), type: "clause", xref: l10n("#{lbl} #{num}"), level: 1, value: num }
-        if a = single_annex_special_section(clause)
-          annex_names1(a, "#{num}", 1)
-        else
-          i = Counter.new
-          clause.xpath(ns("./clause | ./references | ./terms | ./definitions")).
-            each do |c|
-             i.increment(c)
-             annex_names1(c, "#{num}.#{i.print}", 2)
-          end
-        end
-        hierarchical_asset_names(clause, num)
-      end
-
       def back_anchor_names(docxml)
         super
-        if annexid = docxml&.at(ns("//bibdata/ext/structuredidentifier/annexid"))&.text
+        if annexid = docxml
+          &.at(ns("//bibdata/ext/structuredidentifier/annexid"))&.text
           docxml.xpath(ns("//annex")).each { |c| annex_names(c, annexid) }
         else
           i = Counter.new(0, numerals: :roman)
           docxml.xpath(ns("//annex[@obligation = 'informative']"))
-            .each_with_index do |c|
+            .each do |c|
             i.increment(c)
             annex_names(c, i.print.upcase)
           end
@@ -60,35 +38,25 @@ module IsoDoc
         end
       end
 
-      def annex_names1(clause, num, level)
-        @anchors[clause["id"]] =
-          { label: num, xref: @doctype == "resolution" ? num : l10n("#{@labels["annex_subclause"]} #{num}"), 
-            level: level, type: "clause" }
-        i = Counter.new
-        clause.xpath(ns("./clause | ./references | ./terms | ./definitions"))
-          .each do |c|
-          i.increment(c)
-          annex_names1(c, "#{num}.#{i.print}", level + 1)
+      def initial_anchor_names(doc)
+        @doctype = doc&.at(ns("//bibdata/ext/doctype"))&.text
+        doc.xpath(ns("//boilerplate//clause")).each { |c| preface_names(c) }
+        doc.xpath("//xmlns:preface/child::*").each { |c| preface_names(c) }
+        if @hierarchical_assets
+          hierarchical_asset_names(doc.xpath("//xmlns:preface/child::*"),
+                                   "Preface")
+        else
+          sequential_asset_names(doc.xpath("//xmlns:preface/child::*"))
         end
-      end
-
-      def initial_anchor_names(d)
-        @doctype = d&.at(ns("//bibdata/ext/doctype"))&.text
-        d.xpath(ns("//boilerplate//clause")).each { |c| preface_names(c) }
-        d.xpath("//xmlns:preface/child::*").each { |c| preface_names(c) }
-        @hierarchical_assets ?
-          hierarchical_asset_names(d.xpath("//xmlns:preface/child::*"), 
-                                   "Preface") :
-                                  sequential_asset_names(d.xpath("//xmlns:preface/child::*"))
         n = Counter.new
-        n = section_names(d.at(ns("//clause[@type = 'scope']")), n, 1)
-        n = section_names(d.at(ns(@klass.norm_ref_xpath)), n, 1)
-        n = section_names(d.at(ns("//sections/terms | //sections/clause[descendant::terms]")), n, 1)
-        n = section_names(d.at(ns("//sections/definitions")), n, 1)
-        clause_names(d, n)
-        middle_section_asset_names(d)
-        termnote_anchor_names(d)
-        termexample_anchor_names(d)
+        n = section_names(doc.at(ns("//clause[@type = 'scope']")), n, 1)
+        n = section_names(doc.at(ns(@klass.norm_ref_xpath)), n, 1)
+        n = section_names(doc.at(ns("//sections/terms | //sections/clause[descendant::terms]")), n, 1)
+        n = section_names(doc.at(ns("//sections/definitions")), n, 1)
+        clause_names(doc, n)
+        middle_section_asset_names(doc)
+        termnote_anchor_names(doc)
+        termexample_anchor_names(doc)
       end
 
       def middle_sections
@@ -99,9 +67,10 @@ module IsoDoc
           "//sections/definitions | //clause[parent::sections]"
       end
 
-      def middle_section_asset_names(d)
+      def middle_section_asset_names(doc)
         return super unless @hierarchical_assets
-        d.xpath(ns(middle_sections)).each do |c|
+
+        doc.xpath(ns(middle_sections)).each do |c|
           hierarchical_asset_names(c, @anchors[c["id"]][:label])
         end
       end
@@ -115,9 +84,11 @@ module IsoDoc
             j = 0
             c.increment(t)
           end
-          label = c.print + (j.zero? ? "" : "#{hierfigsep}#{(96 + j).chr.to_s}")
+          label = c.print + (j.zero? ? "" : "#{hierfigsep}#{(96 + j).chr}")
           next if t["id"].nil? || t["id"].empty?
-          @anchors[t["id"]] = anchor_struct(label, nil, @labels["figure"], "figure", t["unnumbered"])
+
+          @anchors[t["id"]] =
+            anchor_struct(label, nil, @labels["figure"], "figure", t["unnumbered"])
         end
       end
 
@@ -130,9 +101,11 @@ module IsoDoc
             j = 0
             c.increment(t)
           end
-          label = "#{num}#{hiersep}#{c.print}" + (j.zero? ? "" : "#{hierfigsep}#{(96 + j).chr.to_s}")
+          label = "#{num}#{hiersep}#{c.print}" + (j.zero? ? "" : "#{hierfigsep}#{(96 + j).chr}")
           next if t["id"].nil? || t["id"].empty?
-          @anchors[t["id"]] = anchor_struct(label, nil, @labels["figure"], "figure", t["unnumbered"])
+
+          @anchors[t["id"]] =
+            anchor_struct(label, nil, @labels["figure"], "figure", t["unnumbered"])
         end
       end
 
@@ -150,15 +123,19 @@ module IsoDoc
         c = Counter.new
         clause.xpath(ns(".//formula")).each do |t|
           next if t["id"].nil? || t["id"].empty?
+
           @anchors[t["id"]] = anchor_struct(
             "#{num}-#{c.increment(t).print}", nil,
-            t["inequality"] ? @labels["inequality"] : @labels["formula"], "formula", t["unnumbered"])
+            t["inequality"] ? @labels["inequality"] : @labels["formula"],
+            "formula", t["unnumbered"]
+          )
         end
       end
 
       def reference_names(ref)
         super
-        @anchors[ref["id"]] = { xref: @anchors[ref["id"]][:xref].sub(/^\[/, '').sub(/\]$/, '') }
+        @anchors[ref["id"]] =
+          { xref: @anchors[ref["id"]][:xref].sub(/^\[/, "").sub(/\]$/, "") }
       end
 
       def termnote_anchor_names(docxml)
@@ -167,67 +144,15 @@ module IsoDoc
           notes = t.xpath(ns(".//termnote"))
           notes.each do |n|
             return if n["id"].nil? || n["id"].empty?
+
             idx = notes.size == 1 ? "" : " #{c.increment(n).print}"
-            @anchors[n["id"]] = 
+            @anchors[n["id"]] =
               { label: termnote_label(idx).strip, type: "termnote", value: idx,
-                xref: l10n("#{anchor(t['id'], :xref)},  #{@labels["note_xref"]} #{c.print}") }
+                xref: l10n("#{anchor(t['id'], :xref)},
+                           #{@labels['note_xref']} #{c.print}") }
           end
         end
       end
-
-      def clause_names(docxml, sect_num)
-        docxml.xpath(ns("//sections/clause[not(@unnumbered = 'true')][not(@type = 'scope')][not(descendant::terms)]")).
-          each do |c|
-          section_names(c, sect_num, 1)
-        end
-        docxml.xpath(ns("//sections/clause[@unnumbered = 'true']")).each do |c|
-          unnumbered_section_names(c, 1)
-        end
-      end
-
-      def section_names(clause, num, lvl)
-        return num if clause.nil?
-        num.increment(clause)
-        lbl = @doctype == "resolution" ? @labels["section"] : @labels["clause"]
-        @anchors[clause["id"]] =
-          { label: num.print, xref: l10n("#{lbl} #{num.print}"), level: lvl, type: "clause" }
-        i = Counter.new()
-        clause.xpath(ns(SUBCLAUSES)).each do |c|
-          i.increment(c)
-          section_names1(c, "#{num.print}.#{i.print}", lvl + 1)
-        end
-        num
-      end
-
-      def section_names1(clause, num, level)
-        @anchors[clause["id"]] =
-          { label: num, level: level, 
-            xref: @doctype == "resolution" ? num : l10n("#{@labels["clause"]} #{num}") }
-        i = Counter.new()
-        clause.xpath(ns(SUBCLAUSES)).each do |c|
-          i.increment(c)
-          section_names1(c, "#{num}.#{i.print}", level + 1)
-        end
-      end
-
-      def unnumbered_section_names(clause, lvl)
-        return if clause.nil?
-        lbl = clause&.at(ns("./title"))&.text || "[#{clause["id"]}]"
-        @anchors[clause["id"]] =
-          { label: lbl, xref: l10n(%{"#{lbl}"}), level: lvl, type: "clause" }
-        clause.xpath(ns(SUBCLAUSES)).each do |c|
-          unnumbered_section_names1(c, lvl + 1)
-        end
-      end
-
-      def unnumbered_section_names1(clause, level)
-        lbl = clause&.at(ns("./title"))&.text || "[#{clause["id"]}]"
-        @anchors[clause["id"]] =
-          { label: lbl, xref: l10n(%{"#{lbl}"}), level: level, type: "clause" }
-        clause.xpath(ns(SUBCLAUSES)).each do |c|
-          unnumbered_section_names1(c, level + 1)
-        end
-      end
     end
   end
 end

data/lib/isodoc/itu/xref_section.rb

@@ -0,0 +1,109 @@
+module IsoDoc
+  module ITU
+    class Xref < IsoDoc::Xref
+      def annextype(clause)
+        if clause["obligation"] == "informative" then @labels["appendix"]
+        else @labels["annex"]
+        end
+      end
+
+      def annex_name_lbl(clause, num)
+        lbl = annextype(clause)
+        if @doctype == "resolution"
+          l10n("#{lbl.upcase} #{num}")
+        else
+          l10n("<strong>#{lbl} #{num}</strong>")
+        end
+      end
+
+      def annex_names(clause, num)
+        lbl = annextype(clause)
+        @anchors[clause["id"]] =
+          { label: annex_name_lbl(clause, num), type: "clause",
+            xref: l10n("#{lbl} #{num}"), level: 1, value: num }
+        if a = single_annex_special_section(clause)
+          annex_names1(a, num.to_s, 1)
+        else
+          i = Counter.new
+          clause.xpath(ns("./clause | ./references | ./terms | ./definitions"))
+            .each do |c|
+            i.increment(c)
+            annex_names1(c, "#{num}.#{i.print}", 2)
+          end
+        end
+        hierarchical_asset_names(clause, num)
+      end
+
+      def annex_names1(clause, num, level)
+        @anchors[clause["id"]] =
+          { label: num,
+            xref: @doctype == "resolution" ? num : l10n("#{@labels['annex_subclause']} #{num}"),
+            level: level, type: "clause" }
+        i = Counter.new
+        clause.xpath(ns("./clause | ./references | ./terms | ./definitions"))
+          .each do |c|
+          i.increment(c)
+          annex_names1(c, "#{num}.#{i.print}", level + 1)
+        end
+      end
+
+      def clause_names(docxml, sect_num)
+        docxml.xpath(ns("//sections/clause[not(@unnumbered = 'true')]"\
+                        "[not(@type = 'scope')][not(descendant::terms)]"))
+          .each do |c|
+          section_names(c, sect_num, 1)
+        end
+        docxml.xpath(ns("//sections/clause[@unnumbered = 'true']")).each do |c|
+          unnumbered_section_names(c, 1)
+        end
+      end
+
+      def section_names(clause, num, lvl)
+        return num if clause.nil?
+
+        num.increment(clause)
+        lbl = @doctype == "resolution" ? @labels["section"] : @labels["clause"]
+        @anchors[clause["id"]] =
+          { label: num.print, xref: l10n("#{lbl} #{num.print}"),
+            level: lvl, type: "clause" }
+        i = Counter.new
+        clause.xpath(ns(SUBCLAUSES)).each do |c|
+          i.increment(c)
+          section_names1(c, "#{num.print}.#{i.print}", lvl + 1)
+        end
+        num
+      end
+
+      def section_names1(clause, num, level)
+        @anchors[clause["id"]] =
+          { label: num, level: level,
+            xref: @doctype == "resolution" ? num : l10n("#{@labels['clause']} #{num}") }
+        i = Counter.new
+        clause.xpath(ns(SUBCLAUSES)).each do |c|
+          i.increment(c)
+          section_names1(c, "#{num}.#{i.print}", level + 1)
+        end
+      end
+
+      def unnumbered_section_names(clause, lvl)
+        return if clause.nil?
+
+        lbl = clause&.at(ns("./title"))&.text || "[#{clause['id']}]"
+        @anchors[clause["id"]] =
+          { label: lbl, xref: l10n(%{"#{lbl}"}), level: lvl, type: "clause" }
+        clause.xpath(ns(SUBCLAUSES)).each do |c|
+          unnumbered_section_names1(c, lvl + 1)
+        end
+      end
+
+      def unnumbered_section_names1(clause, level)
+        lbl = clause&.at(ns("./title"))&.text || "[#{clause['id']}]"
+        @anchors[clause["id"]] =
+          { label: lbl, xref: l10n(%{"#{lbl}"}), level: level, type: "clause" }
+        clause.xpath(ns(SUBCLAUSES)).each do |c|
+          unnumbered_section_names1(c, level + 1)
+        end
+      end
+    end
+  end
+end

data/lib/metanorma/itu/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ITU
-    VERSION = "1.3.3".freeze
+    VERSION = "1.3.7".freeze
   end
 end

data/metanorma-itu.gemspec

@@ -22,11 +22,11 @@ Gem::Specification.new do |spec|
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
   spec.add_dependency "htmlentities", "~> 4.3.4"
-  spec.add_dependency "isodoc", "~> 1.6.0"
-  spec.add_dependency "metanorma-standoc", "~> 1.9.0"
+  spec.add_dependency "isodoc", "~> 1.7.0"
+  spec.add_dependency "metanorma-standoc", "~> 1.10.0"
   spec.add_dependency "ruby-jing"
   spec.add_dependency "twitter_cldr"
   spec.add_dependency "tzinfo-data" # we need this for windows only

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-itu
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.3.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-05-24 00:00:00.000000000 Z
+date: 2021-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: 1.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: 1.10.0
 - !ruby/object:Gem::Dependency
   name: ruby-jing
   requirement: !ruby/object:Gem::Requirement
@@ -343,6 +343,7 @@ files:
 - lib/isodoc/itu/word_cleanup.rb
 - lib/isodoc/itu/word_convert.rb
 - lib/isodoc/itu/xref.rb
+- lib/isodoc/itu/xref_section.rb
 - lib/metanorma-itu.rb
 - lib/metanorma/itu.rb
 - lib/metanorma/itu/processor.rb
@@ -360,7 +361,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="