metanorma-itu 1.2.1 → 1.2.6

data/lib/isodoc/itu/metadata.rb

@@ -1,4 +1,5 @@
 require "isodoc"
+require "twitter_cldr"
 
 module IsoDoc
   module ITU
@@ -23,6 +24,12 @@ module IsoDoc
         main = isoxml&.at(ns("//bibdata/title[@language='#{@lang}']"\
                              "[@type = 'subtitle']"))&.text
         set(:docsubtitle, main)
+        main = isoxml&.at(ns("//bibdata/title[@language='#{@lang}']"\
+                             "[@type = 'amendment']"))&.text
+        set(:amendmenttitle, main)
+        main = isoxml&.at(ns("//bibdata/title[@language='#{@lang}']"\
+                             "[@type = 'corrigendum']"))&.text
+        set(:corrigendumtitle, main)
         series = isoxml&.at(ns("//bibdata/series[@type='main']/title"))&.text
         set(:series, series)
         series1 =
@@ -39,12 +46,38 @@ module IsoDoc
         nil
       end
 
-      def author(isoxml, _out)
-        bureau = isoxml.at(ns("//bibdata/ext/editorialgroup/bureau"))
+      def author(xml, _out)
+        bureau = xml.at(ns("//bibdata/ext/editorialgroup/bureau"))
         set(:bureau, bureau.text) if bureau
-        tc = isoxml.at(ns("//bibdata/ext/editorialgroup/committee"))
+        tc = xml.at(ns("//bibdata/ext/editorialgroup/committee"))
         set(:tc, tc.text) if tc
+        tc = xml.at(ns("//bibdata/ext/editorialgroup/group/name"))
+        set(:group, tc.text) if tc
+        tc = xml.at(ns("//bibdata/ext/editorialgroup/subgroup/name"))
+        set(:subgroup, tc.text) if tc
+        tc = xml.at(ns("//bibdata/ext/editorialgroup/workgroup/name"))
+        set(:workgroup, tc.text) if tc
         super
+        authors = xml.xpath(ns("//bibdata/contributor[role/@type = 'author' "\
+                                "or xmlns:role/@type = 'editor']/person"))
+        person_attributes(authors) unless authors.empty?
+      end
+
+      def append(key, value)
+        @metadata[key] << value
+      end
+
+      def person_attributes(authors)
+        %i(affiliations addresses emails faxes phones).each { |i| set(i, []) }
+        authors.each do |a|
+          append(:affiliations, 
+                 a&.at(ns("./affiliation/organization/name"))&.text)
+          append(:addresses, a&.at(ns("./affiliation/organization/address/"\
+                                      "formattedAddress"))&.text)
+          append(:emails, a&.at(ns("./email"))&.text)
+          append(:faxes, a&.at(ns("./phone[@type = 'fax']"))&.text)
+          append(:phones, a&.at(ns("./phone[not(@type = 'fax')]"))&.text)
+        end
       end
 
       def docid(isoxml, _out)
@@ -54,6 +87,11 @@ module IsoDoc
         oblig = isoxml&.at(ns("//annex/@obligation"))&.text
         lbl = oblig == "informative" ? @labels["appendix"] : @labels["annex"]
         dn and set(:annexid, @i18n.l10n("#{lbl} #{dn&.text}"))
+        dn = isoxml.at(ns("//bibdata/ext/structuredidentifier/amendment")) and
+          set(:amendmentid, @i18n.l10n("#{@labels["amendment"]} #{dn&.text}"))
+        dn = isoxml.at(ns("//bibdata/ext/structuredidentifier/corrigendum")) and
+          set(:corrigendumid,
+              @i18n.l10n("#{@labels["corrigendum"]} #{dn&.text}"))
       end
 
       def unpublished(status)
@@ -91,6 +129,27 @@ module IsoDoc
           "false"
         set(:ip_notice_received, received)
       end
+
+      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")
+        @i18n.l10n("#{m[:dd]} #{mmm} #{m[:yr]}")
+      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)
+        a = isoxml&.at(ns("//bibdata/ext/source"))&.text and set(:source, a)
+        if o = isoxml&.at(ns("//bibdata/ext/meeting-date/on"))&.text
+          set(:meeting_date, 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)}")
+        end
+      end
     end
   end
 end

data/lib/isodoc/itu/presentation_xml_convert.rb

@@ -48,6 +48,18 @@ module IsoDoc
         node.add_child(link)
       end
 
+      def bibdata_i18n(b)
+        super
+        %w(amendment corrigendum).each do |w|
+          if dn = b.at(ns("./ext/structuredidentifier/#{w}"))
+            dn["language"] = ""
+            dn.next = dn.dup
+            dn.next["language"] = @lang
+            dn.next.children = @i18n.l10n("#{@i18n.get[w]} #{dn&.text}")
+          end
+        end
+      end
+
       include Init
     end
   end

data/lib/isodoc/itu/word_cleanup.rb

@@ -0,0 +1,152 @@
+module IsoDoc
+  module ITU
+    class WordConvert < IsoDoc::WordConvert
+      def word_preface_cleanup(docxml)
+        docxml.xpath("//h1[@class = 'AbstractTitle'] | "\
+                     "//h1[@class = 'IntroTitle']").each do |h2|
+          h2.name = "p"
+          h2["class"] = "h1Preface"
+        end
+      end
+
+      def word_term_cleanup(docxml)
+      end
+
+      def word_cleanup(docxml)
+        word_footnote_cleanup(docxml)
+        word_title_cleanup(docxml)
+        word_preface_cleanup(docxml)
+        word_term_cleanup(docxml)
+        word_history_cleanup(docxml)
+        authority_hdr_cleanup(docxml)
+        table_list_style(docxml)
+        super
+        docxml
+      end
+
+      def word_footnote_cleanup(docxml)
+        docxml.xpath("//aside").each do |a|
+          a.first_element_child.children.first.previous =
+            '<span style="mso-tab-count:1"/>'
+        end
+      end
+
+      def word_title_cleanup(docxml)
+        docxml.xpath("//p[@class = 'annex_obligation']").each do |h|
+          h&.next_element&.name == "p" or next
+          h.next_element["class"] ||= "Normalaftertitle"
+        end
+        docxml.xpath("//p[@class = 'FigureTitle']").each do |h|
+          h&.parent&.next_element&.name == "p" or next
+          h.parent.next_element["class"] ||= "Normalaftertitle"
+        end
+      end
+
+      def word_history_cleanup(docxml)
+        docxml.xpath("//div[@id='_history']//table").each do |t|
+          t["class"] = "MsoNormalTable"
+          t.xpath(".//td").each { |td| td["style"] = nil }
+        end
+      end
+
+      def word_preface(docxml)
+        super
+        abstractbox = docxml.at("//div[@id='abstractbox']")
+        historybox = docxml.at("//div[@id='historybox']")
+        sourcebox = docxml.at("//div[@id='sourcebox']")
+        keywordsbox = docxml.at("//div[@id='keywordsbox']")
+        abstract = docxml.at("//div[@class = 'Abstract']")
+        history = docxml.at("//div[@class = 'history']")
+        source = docxml.at("//div[@class = 'source']")
+        keywords = docxml.at("//div[@class = 'Keywords']")
+        abstract.parent = abstractbox if abstract && abstractbox
+        history.parent = historybox if history && historybox
+        source.parent = sourcebox if source && sourcebox
+        keywords.parent = keywordsbox if keywords && keywordsbox
+      end
+
+      def toWord(result, filename, dir, header)
+        result = populate_template(result, :word)
+        result = from_xhtml(word_cleanup(to_xhtml(result)))
+        unless @landscapestyle.nil? || @landscapestyle.empty?
+          @wordstylesheet&.open
+          @wordstylesheet&.write(@landscapestyle)
+          @wordstylesheet&.close
+        end
+        Html2Doc.process(
+          result, filename: filename, 
+          stylesheet: @wordstylesheet&.path,
+          header_file: header&.path, dir: dir,
+          asciimathdelims: [@openmathdelim, @closemathdelim],
+          liststyles: { ul: @ulstyle, ol: @olstyle, steps: "l4" })
+        header&.unlink
+        @wordstylesheet&.unlink
+      end
+
+      def authority_hdr_cleanup(docxml)
+        docxml&.xpath("//div[@id = 'draft-warning']").each do |d|
+          d.xpath(".//h1 | .//h2").each do |p|
+            p.name = "p"
+            p["class"] = "draftwarningHdr"
+          end
+        end
+        %w(copyright license legal).each do |t|
+          docxml&.xpath("//div[@class = 'boilerplate-#{t}']").each do |d|
+            p = d&.at("./descendant::h1[2]") and
+              p.previous = "<p>&nbsp;</p><p>&nbsp;</p><p>&nbsp;</p>"
+            d.xpath(".//h1 | .//h2").each do |p|
+              p.name = "p"
+              p["class"] = "boilerplateHdr"
+            end
+          end
+        end
+      end
+
+      def authority_cleanup(docxml)
+        dest = docxml.at("//div[@class = 'draft-warning']")
+        auth = docxml.at("//div[@id = 'draft-warning']")
+        dest and auth and dest.replace(auth.remove)
+        %w(copyright license legal).each do |t|
+          dest = docxml.at("//div[@id = 'boilerplate-#{t}-destination']")
+          auth = docxml.at("//div[@class = 'boilerplate-#{t}']")
+          next unless auth && dest
+          t == "copyright" and p = auth&.at(".//p") and
+            p["class"] = "boilerplateHdr"
+          auth&.xpath(".//p[not(@class)]")&.each_with_index do |p, i|
+            p["class"] = "boilerplate"
+            #i == 0 && t == "copyright" and p["style"] = "text-align:center;"
+          end
+          t == "copyright" or
+            auth << "<p>&nbsp;</p><p>&nbsp;</p><p>&nbsp;</p>" 
+          dest.replace(auth.remove)
+        end
+      end
+
+      TOPLIST = "[not(ancestor::ul) and not(ancestor::ol)]".freeze
+
+      def table_list_style(xml)
+        xml.xpath("//table//ul#{TOPLIST} | //table//ol#{TOPLIST}").each do |t|
+          table_list_style1(t, 1)
+        end
+      end
+
+      def table_list_style1(t, num)
+        (t.xpath(".//li") - t.xpath(".//ol//li | .//ul//li")).each do |t1|
+          indent_list(t1, num)
+          t1.xpath("./div | ./p").each { |p| indent_list(p, num) }
+          (t1.xpath(".//ul") - t1.xpath(".//ul//ul | .//ol//ul")).each do |t2|
+            table_list_style1(t2, num + 1)
+          end
+          (t1.xpath(".//ol") - t1.xpath(".//ul//ol | .//ol//ol")).each do |t2|
+            table_list_style1(t2, num + 1)
+          end
+        end
+      end
+
+      def indent_list(li, num)
+        li["style"] = (li["style"] ? li["style"] + ";" : "")
+        li["style"] += "margin-left: #{num * 0.5}cm;text-indent: -0.5cm;"
+      end
+    end
+  end
+end

data/lib/isodoc/itu/word_convert.rb

@@ -1,12 +1,10 @@
 require "isodoc"
 require_relative "init"
+require_relative "word_cleanup"
 require "fileutils"
 
 module IsoDoc
   module ITU
-    # A {Converter} implementation that generates Word output, and a document
-    # schema encapsulation of the document for validation
-
     class WordConvert < IsoDoc::WordConvert
       def initialize(options)
         @libdir = File.dirname(__FILE__)
@@ -27,6 +25,7 @@ module IsoDoc
         body.div **{ class: "WordSection2" } do |div2|
           info docxml, div2 
           boilerplate docxml, div2
+          preface_block docxml, div2
           abstract docxml, div2
           keywords docxml, div2
           preface docxml, div2
@@ -52,71 +51,6 @@ module IsoDoc
         end
       end
 
-      def word_preface_cleanup(docxml)
-        docxml.xpath("//h1[@class = 'AbstractTitle'] | "\
-                     "//h1[@class = 'IntroTitle']").each do |h2|
-          h2.name = "p"
-          h2["class"] = "h1Preface"
-        end
-      end
-
-      def word_term_cleanup(docxml)
-        docxml.xpath("//p[@class = 'TermNum']").each do |t|
-        end
-      end
-
-      def word_cleanup(docxml)
-        word_footnote_cleanup(docxml)
-        word_title_cleanup(docxml)
-        word_preface_cleanup(docxml)
-        word_term_cleanup(docxml)
-        word_history_cleanup(docxml)
-        authority_hdr_cleanup(docxml)
-        super
-        docxml
-      end
-
-      def word_footnote_cleanup(docxml)
-        docxml.xpath("//aside").each do |a|
-          a.first_element_child.children.first.previous =
-            '<span style="mso-tab-count:1"/>'
-        end
-      end
-
-      def word_title_cleanup(docxml)
-        docxml.xpath("//p[@class = 'annex_obligation']").each do |h|
-          h&.next_element&.name == "p" or next
-          h.next_element["class"] ||= "Normalaftertitle"
-        end
-        docxml.xpath("//p[@class = 'FigureTitle']").each do |h|
-          h&.parent&.next_element&.name == "p" or next
-          h.parent.next_element["class"] ||= "Normalaftertitle"
-        end
-      end
-
-      def word_history_cleanup(docxml)
-        docxml.xpath("//div[@id='_history']//table").each do |t|
-          t["class"] = "MsoNormalTable"
-          t.xpath(".//td").each { |td| td["style"] = nil }
-        end
-      end
-
-      def word_preface(docxml)
-        super
-        abstractbox = docxml.at("//div[@id='abstractbox']")
-        historybox = docxml.at("//div[@id='historybox']")
-        sourcebox = docxml.at("//div[@id='sourcebox']")
-        keywordsbox = docxml.at("//div[@id='keywordsbox']")
-        abstract = docxml.at("//div[@class = 'Abstract']")
-        history = docxml.at("//div[@class = 'history']")
-        source = docxml.at("//div[@class = 'source']")
-        keywords = docxml.at("//div[@class = 'Keywords']")
-        abstract.parent = abstractbox if abstract && abstractbox
-        history.parent = historybox if history && historybox
-        source.parent = sourcebox if source && sourcebox
-        keywords.parent = keywordsbox if keywords && keywordsbox
-      end
-
       def formula_parse1(node, out)
         out.div **attr_code(class: "formula") do |div|
           div.p **attr_code(class: "formula") do |p|
@@ -156,24 +90,6 @@ module IsoDoc
         { class: node["class"], id: node["id"], style: keep_style(node) }
       end
 
-      def toWord(result, filename, dir, header)
-        result = populate_template(result, :word)
-        result = from_xhtml(word_cleanup(to_xhtml(result)))
-        unless @landscapestyle.nil? || @landscapestyle.empty?
-          @wordstylesheet&.open
-          @wordstylesheet&.write(@landscapestyle)
-          @wordstylesheet&.close
-        end
-        Html2Doc.process(result, filename: filename, 
-                         stylesheet: @wordstylesheet&.path,
-                         header_file: header&.path, dir: dir,
-                         asciimathdelims: [@openmathdelim, @closemathdelim],
-                         liststyles: { ul: @ulstyle, ol: @olstyle, 
-                                       steps: "l4" })
-        header&.unlink
-        @wordstylesheet&.unlink
-      end
-
       def link_parse(node, out)
         out.a **attr_code(href: node["target"], title: node["alt"], 
                           class: "url") do |l|
@@ -185,45 +101,6 @@ module IsoDoc
         end
       end
 
-      def authority_hdr_cleanup(docxml)
-        docxml&.xpath("//div[@id = 'draft-warning']").each do |d|
-          d.xpath(".//h1 | .//h2").each do |p|
-            p.name = "p"
-            p["class"] = "draftwarningHdr"
-          end
-        end
-        %w(copyright license legal).each do |t|
-          docxml&.xpath("//div[@class = 'boilerplate-#{t}']").each do |d|
-            p = d&.at("./descendant::h1[2]") and
-              p.previous = "<p>&nbsp;</p><p>&nbsp;</p><p>&nbsp;</p>"
-            d.xpath(".//h1 | .//h2").each do |p|
-              p.name = "p"
-              p["class"] = "boilerplateHdr"
-            end
-          end
-        end
-      end
-
-      def authority_cleanup(docxml)
-        dest = docxml.at("//div[@class = 'draft-warning']")
-        auth = docxml.at("//div[@id = 'draft-warning']")
-        dest and auth and dest.replace(auth.remove)
-        %w(copyright license legal).each do |t|
-          dest = docxml.at("//div[@id = 'boilerplate-#{t}-destination']")
-          auth = docxml.at("//div[@class = 'boilerplate-#{t}']")
-          next unless auth && dest
-          t == "copyright" and p = auth&.at(".//p") and
-            p["class"] = "boilerplateHdr"
-          auth&.xpath(".//p[not(@class)]")&.each_with_index do |p, i|
-            p["class"] = "boilerplate"
-            #i == 0 && t == "copyright" and p["style"] = "text-align:center;"
-          end
-          t == "copyright" or
-            auth << "<p>&nbsp;</p><p>&nbsp;</p><p>&nbsp;</p>" 
-          dest.replace(auth.remove)
-        end
-      end
-
       def clause_attrs(node)
         ret = {}
         %w(source history).include?(node["type"]) and

data/lib/isodoc/itu/xref.rb

@@ -20,7 +20,7 @@ module IsoDoc
           @labels["appendix"] : @labels["annex"]
         @anchors[clause["id"]] =
           { label: annex_name_lbl(clause, num), type: "clause",
-            xref: "#{lbl} #{num}", level: 1 }
+            xref: "#{lbl} #{num}", level: 1, value: num }
         if a = single_annex_special_section(clause)
           annex_names1(a, "#{num}", 1)
         else
@@ -101,7 +101,7 @@ module IsoDoc
             j = 0
             c.increment(t)
           end
-          label = c.print + (j.zero? ? "" : "-#{(96 + j).chr.to_s}")
+          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"])
@@ -164,6 +164,7 @@ module IsoDoc
             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}") }