metanorma-itu 1.2.10 → 1.2.15

data/lib/isodoc/itu/metadata.rb

@@ -149,21 +149,55 @@ module IsoDoc
       def ddMMMYYYY(isodate)
         m = /(?<yr>\d\d\d\d)-(?<mo>\d\d)-(?<dd>\d\d)/.match isodate
         return isodate unless m && m[:yr] && m[:mo] && m[:dd]
-        mmm = DateTime.parse(isodate).localize(@lang.to_sym).#with_timezone("UCT").
-          to_additional_s("MMM")
+        mmm = DateTime.parse(isodate).localize(@lang.to_sym).to_additional_s("MMM")
         @i18n.l10n("#{m[:dd]} #{mmm} #{m[:yr]}")
       end
 
+      def ddMMMMYYYY(date1, date2)
+        m1 = /(?<yr>\d\d\d\d)-(?<mo>\d\d)-(?<dd>\d\d)/.match date1
+        m2 = /(?<yr>\d\d\d\d)-(?<mo>\d\d)-(?<dd>\d\d)/.match date2
+        if m1 && m1[:yr] && m1[:mo] && m1[:dd]
+          dd1 = m1[:dd].sub(/^0/, "")
+          if m2 && m2[:yr] && m2[:mo] && m2[:dd]
+            dd2 = m2[:dd].sub(/^0/, "")
+            if m1[:yr] == m2[:yr]
+              if m1[:mo] == m2[:mo]
+                @i18n.l10n("#{dd1}&#x2013;#{dd2} #{months[m1[:mo].to_sym]} #{m1[:yr]}")
+              else
+                @i18n.l10n("#{dd1} #{months[m1[:mo].to_sym]} &#x2013; "\
+                           "#{dd2} #{months[m2[:mo].to_sym]} #{m1[:yr]}")
+              end
+            else
+              @i18n.l10n("#{dd1} #{months[m1[:mo].to_sym]} #{m1[:yr]} &#x2013; "\
+                         "#{dd2} #{months[m2[:mo].to_sym]} #{m2[:yr]}")
+            end
+          else
+            date2.nil? ? @i18n.l10n("#{dd1} #{months[m1[:mo].to_sym]} #{m1[:yr]}") : "#{date1}/#{date2}"
+          end
+        else
+          date2.nil? ? date1 : "#{date1}/#{date2}"
+        end
+      end
+
       def techreport(isoxml, _out)
-        a = isoxml&.at(ns("//bibdata/ext/meeting"))&.text and set(:meeting, a)
-        a = isoxml&.at(ns("//bibdata/ext/intended-type"))&.text and
-          set(:intended_type, a)
+        if a = isoxml&.at(ns("//bibdata/ext/meeting"))&.text
+          set(:meeting, a)
+          set(:meeting_acronym, a)
+        end
+        a = isoxml&.at(ns("//bibdata/ext/meeting/@acronym"))&.text and set(:meeting_acronym, a)
+        a = isoxml&.at(ns("//bibdata/ext/meeting-place"))&.text and set(:meeting_place, a)
+        a = isoxml&.at(ns("//bibdata/ext/intended-type"))&.text and set(:intended_type, a)
         a = isoxml&.at(ns("//bibdata/ext/source"))&.text and set(:source, a)
+        meeting(isoxml)
+      end
+
+      def meeting(isoxml)
+        resolution = isoxml&.at(ns("//bibdata/ext/doctype"))&.text == "resolution"
         if o = isoxml&.at(ns("//bibdata/ext/meeting-date/on"))&.text
-          set(:meeting_date, ddMMMYYYY(o))
+          set(:meeting_date, resolution ? ddMMMMYYYY(o, nil) : ddMMMYYYY(o))
         elsif f = isoxml&.at(ns("//bibdata/ext/meeting-date/from"))&.text
           t = isoxml&.at(ns("//bibdata/ext/meeting-date/to"))&.text
-          set(:meeting_date, "#{ddMMMYYYY(f)}/#{ddMMMYYYY(t)}")
+          set(:meeting_date, resolution ? ddMMMMYYYY(f, t) :  "#{ddMMMYYYY(f)}/#{ddMMMYYYY(t)}")
         end
       end
     end

data/lib/isodoc/itu/pdf_convert.rb

@@ -13,14 +13,11 @@ module IsoDoc
       end
 
       def pdf_stylesheet(docxml)
-        case doctype = docxml&.at(ns("//bibdata/ext/doctype"))&.text
-        when "resolution" then "itu.resolution.xsl"
-        when "recommendation-annex" then "itu.recommendation-annex.xsl"
-        when "technical-report" then "itu.technical-report.xsl"
-        when "technical-paper" then "itu.technical-paper.xsl"
-        else
-          "itu.recommendation.xsl"
-        end
+        doctype = docxml&.at(ns("//bibdata/ext/doctype"))&.text
+
+        "itu.#{doctype}.xsl" if File.exist?(File.join(@libdir, "itu.#{doctype}.xsl"))
+
+        "itu.recommendation.xsl"
       end
     end
   end

data/lib/isodoc/itu/presentation_xml_convert.rb

@@ -36,6 +36,11 @@ module IsoDoc
         get_eref_linkend(f)
       end
 
+      def note1(f)
+        return if f["type"] == "title-footnote"
+        super
+      end
+
       def get_eref_linkend(node)
         contents = non_locality_elems(node).select do |c|
           !c.text? || /\S/.match(c)
@@ -43,8 +48,7 @@ module IsoDoc
         return unless contents.empty?
         link = anchor_linkend(node, docid_l10n(node["target"] || node["citeas"]))
         link && !/^\[.*\]$/.match(link) and link = "[#{link}]"
-        link += eref_localities(node.xpath(ns("./locality | ./localityStack")),
-                                link)
+        link += eref_localities(node.xpath(ns("./locality | ./localityStack")), link)
         non_locality_elems(node).each { |n| n.remove }
         node.add_child(link)
       end
@@ -65,7 +69,28 @@ module IsoDoc
       end
 
       def bibdata_title(b)
-        b&.at(ns("./ext/doctype"))&.text == "service-publication" or return
+        case b&.at(ns("./ext/doctype"))&.text 
+        when "service-publication" then bibdata_title_service_population(b)
+        when "resolution" then bibdata_title_resolution(b)
+        end
+      end
+
+      def bibdata_title_resolution(b)
+        num = b&.at(ns("./docnumber"))&.text
+        place = b&.at(ns("./ext/meeting-place"))&.text
+        ed = b&.at(ns("./edition"))&.text
+        rev = (ed && ed != "1")  ? "#{@i18n.get["revision_abbreviation"]} " : ""
+        year = b&.at(ns("./ext/meeting-date/from | ./ext/meeting-date/on"))&.text&.gsub(/-.*$/, "")
+        num = b&.at(ns("./docnumber"))&.text
+        text = @i18n.l10n("#{@i18n.get['doctype_dict']['resolution'].upcase} #{num} (#{rev}#{place}, #{year})")
+        ins = b.at(ns("./title"))
+        ins.next = <<~END
+        <title language="#{@lang}" format="text/plain" type="resolution">#{text}</title>
+        <title language="#{@lang}" format="text/plain" type="resolution-placedate">#{place}, #{year}</title>
+        END
+      end
+
+      def bibdata_title_service_population(b)
         date = b&.at(ns("./date[@type = 'published']"))&.text or return
         text = l10n(@i18n.get["position_on"].sub(/%/, ddmmmmyyyy(date)))
         ins = b.at(ns("./title"))
@@ -116,6 +141,27 @@ module IsoDoc
         {group: "'"}
       end
 
+      def clause1(f)
+        return super unless f&.at(ns("//bibdata/ext/doctype"))&.text == "resolution"
+        return super unless %w(sections bibliography).include? f.parent.name
+        return if @suppressheadingnumbers || f["unnumbered"]
+        t = f.at(ns("./title")) and t["depth"] = "1"
+        lbl = @xrefs.anchor(f['id'], :label, false) or return
+        f.elements.first.previous =
+          "<p keep-with-next='true' class='supertitle'>#{@i18n.get['section'].upcase} #{lbl}</p>"
+      end
+
+      def annex1(f)
+        return super unless f&.at(ns("//bibdata/ext/doctype"))&.text == "resolution"
+        lbl = @xrefs.anchor(f['id'], :label)
+        subhead = (@i18n.l10n("(#{@i18n.get['to']} ") + 
+                   f.at(ns("//bibdata/title[@type = 'resolution']")).children.to_xml + @i18n.l10n(")"))
+        f.elements.first.previous = "<p class='supertitle'>#{lbl}<br/>#{subhead}</p>"
+        if t = f.at(ns("./title"))
+          t.children = "<strong>#{t.children.to_xml}</strong>"
+        end
+      end
+
       include Init
     end
   end

data/lib/isodoc/itu/word_convert.rb

@@ -74,9 +74,9 @@ module IsoDoc
       end
 
       def default_fonts(options)
-        { bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' :
+        { bodyfont: (options[:script] == "Hans" ? '"Source Han Sans",serif' :
                      '"Times New Roman",serif'),
-                     headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' :
+                     headerfont: (options[:script] == "Hans" ? '"Source Han Sans",sans-serif' :
                                   '"Times New Roman",serif'),
                                   monospacefont: '"Courier New",monospace',
                                   normalfontsize: "12.0pt",

data/lib/isodoc/itu/xref.rb

@@ -3,6 +3,13 @@ require "fileutils"
 
 module IsoDoc
   module ITU
+    class Counter < IsoDoc::XrefGen::Counter
+      def print
+        super.sub(/([0-9])(bis|ter|quater|quinquies|sexies|septies|octies|nonies)$/,
+                  "\\1<em>\\2</em>")
+      end
+    end
+
     class Xref < IsoDoc::Xref
       def initialize(lang, script, klass, labels, options)
         super
@@ -10,23 +17,24 @@ module IsoDoc
       end
 
       def annex_name_lbl(clause, num)
-        lbl = clause["obligation"] == "informative" ? 
-          @labels["appendix"] : @labels["annex"]
-        l10n("<strong>#{lbl} #{num}</strong>")
+        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 }
+          { 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_with_index do |c, i|
-            annex_names1(c, "#{num}.#{i + 1}", 2)
+            each do |c|
+             i.increment(c)
+             annex_names1(c, "#{num}.#{i.print}", 2)
           end
         end
         hierarchical_asset_names(clause, num)
@@ -34,42 +42,49 @@ module IsoDoc
 
       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, i|
-            annex_names(c, RomanNumerals.to_roman(i + 1))
+            .each_with_index do |c|
+            i.increment(c)
+            annex_names(c, i.print.upcase)
           end
+          i = Counter.new("@")
           docxml.xpath(ns("//annex[not(@obligation = 'informative')]"))
-            .each_with_index do |c, i|
-            annex_names(c, (65 + i + (i > 7 ? 1 : 0)).chr.to_s)
+            .each do |c|
+            i.increment(c)
+            i.increment(c) if i.print == "I"
+            annex_names(c, i.print)
           end
         end
       end
 
       def annex_names1(clause, num, level)
         @anchors[clause["id"]] =
-          { label: num, xref: l10n("#{@labels["annex_subclause"]} #{num}"),
+          { 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_with_index do |c, i|
-          annex_names1(c, "#{num}.#{i + 1}", level + 1)
+          .each do |c|
+          i.increment(c)
+          annex_names1(c, "#{num}.#{i.print}", level + 1)
         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 = section_names(d.at(ns("//clause[@type = 'scope']")), 0, 1)
+        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/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)
@@ -93,7 +108,7 @@ module IsoDoc
       end
 
       def sequential_figure_names(clause)
-        c = IsoDoc::XrefGen::Counter.new
+        c = Counter.new
         j = 0
         clause.xpath(ns(".//figure | .//sourcecode[not(ancestor::example)]")).each do |t|
           if t.parent.name == "figure" then j += 1
@@ -103,35 +118,29 @@ module IsoDoc
           end
           label = c.print + (j.zero? ? "" : "#{hierfigsep}#{(96 + j).chr.to_s}")
           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
 
       def hierarchical_figure_names(clause, num)
-        c = IsoDoc::XrefGen::Counter.new
+        c = Counter.new
         j = 0
-        clause.xpath(ns(".//figure | "\
-                        ".//sourcecode[not(ancestor::example)]")).each do |t|
+        clause.xpath(ns(".//figure | .//sourcecode[not(ancestor::example)]")).each do |t|
           if t.parent.name == "figure" then j += 1
           else
             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.to_s}")
           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
 
       def sequential_formula_names(clause)
         clause&.first&.xpath(ns(middle_sections))&.each do |c|
           if c["id"] && @anchors[c["id"]]
-            hierarchical_formula_names(c, @anchors[c["id"]][:label] ||
-                                       @anchors[c["id"]][:xref] || "???")
+            hierarchical_formula_names(c, @anchors[c["id"]][:label] || @anchors[c["id"]][:xref] || "???")
           else
             hierarchical_formula_names(c, "???")
           end
@@ -139,38 +148,87 @@ module IsoDoc
       end
 
       def hierarchical_formula_names(clause, num)
-        c = IsoDoc::XrefGen::Counter.new
+        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)
         docxml.xpath(ns("//term[descendant::termnote]")).each do |t|
-          c = IsoDoc::XrefGen::Counter.new
+          c = Counter.new
           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"]] = 
-              { label: termnote_label(idx).strip, type: "termnote",
-                value: idx,
-              xref: l10n("#{anchor(t['id'], :xref)}, "\
-                         "#{@labels["note_xref"]} #{c.print}") }
-
+              { label: termnote_label(idx).strip, type: "termnote", value: idx,
+                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/metanorma/itu/processor.rb

@@ -24,6 +24,7 @@ module Metanorma
           "Courier" => nil,
           "Courier New" => nil,
           "Times New Roman" => nil,
+          "Source Han Sans" => nil,
           "STIX Two Math" => nil,
         }
       end

data/lib/metanorma/itu/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ITU
-    VERSION = "1.2.10"
+    VERSION = "1.2.15"
   end
 end