metanorma-itu 1.1.2 → 1.2.3

data/lib/isodoc/itu/metadata.rb

@@ -7,18 +7,21 @@ module IsoDoc
       def initialize(lang, script, labels)
         super
         here = File.dirname(__FILE__)
+        n = "International_Telecommunication_Union_Logo.svg"
         set(:logo_html,
-            File.expand_path(File.join(here, "html", "International_Telecommunication_Union_Logo.svg")))
+            File.expand_path(File.join(here, "html", n)))
         set(:logo_comb,
             File.expand_path(File.join(here, "html", "itu-document-comb.png")))
         set(:logo_word,
-            File.expand_path(File.join(here, "html", "International_Telecommunication_Union_Logo.svg")))
+            File.expand_path(File.join(here, "html", n)))
       end
 
       def title(isoxml, _out)
-        main = isoxml&.at(ns("//bibdata/title[@language='#{@lang}'][@type = 'main']"))&.text
+        main = isoxml&.at(ns("//bibdata/title[@language='#{@lang}']"\
+                             "[@type = 'main']"))&.text
         set(:doctitle, main)
-        main = isoxml&.at(ns("//bibdata/title[@language='#{@lang}'][@type = 'subtitle']"))&.text
+        main = isoxml&.at(ns("//bibdata/title[@language='#{@lang}']"\
+                             "[@type = 'subtitle']"))&.text
         set(:docsubtitle, main)
         series = isoxml&.at(ns("//bibdata/series[@type='main']/title"))&.text
         set(:series, series)
@@ -50,7 +53,7 @@ module IsoDoc
         dn = isoxml.at(ns("//bibdata/ext/structuredidentifier/annexid"))
         oblig = isoxml&.at(ns("//annex/@obligation"))&.text
         lbl = oblig == "informative" ? @labels["appendix"] : @labels["annex"]
-        dn and set(:annexid, IsoDoc::Function::I18n::l10n("#{lbl} #{dn&.text}"))
+        dn and set(:annexid, @i18n.l10n("#{lbl} #{dn&.text}"))
       end
 
       def unpublished(status)

data/lib/isodoc/itu/pdf_convert.rb

@@ -1,5 +1,4 @@
 require "isodoc"
-require_relative "metadata"
 require "fileutils"
 
 module IsoDoc

data/lib/isodoc/itu/presentation_xml_convert.rb

@@ -1,9 +1,54 @@
-require_relative "base_convert"
+require_relative "init"
 require "isodoc"
 
 module IsoDoc
   module ITU
     class PresentationXMLConvert < IsoDoc::PresentationXMLConvert
+      def initialize(options)
+        @hierarchical_assets = options[:hierarchical_assets]
+        super
+      end
+
+      def prefix_container(container, linkend, _target)
+        l10n("#{linkend} #{@i18n.get["in"]} #{@xrefs.anchor(container, :xref)}")
+      end
+
+      def eref(docxml)
+        docxml.xpath(ns("//eref")).each do |f|
+          eref1(f)
+        end
+      end
+
+      def origin(docxml)
+        docxml.xpath(ns("//origin[not(termref)]")).each do |f|
+          eref1(f)
+        end
+      end
+
+      def quotesource(docxml)
+        docxml.xpath(ns("//quote/source")).each do |f|
+          eref1(f)
+        end
+      end
+
+      def eref1(f)
+        get_eref_linkend(f)
+      end
+
+      def get_eref_linkend(node)
+        contents = non_locality_elems(node).select do |c|
+          !c.text? || /\S/.match(c)
+        end
+        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)
+        non_locality_elems(node).each { |n| n.remove }
+        node.add_child(link)
+      end
+
+      include Init
     end
   end
 end

data/lib/isodoc/itu/ref.rb

@@ -11,7 +11,7 @@ module IsoDoc
         f = isoxml.at(ns(q)) or return num
         out.div do |div|
           num = num + 1
-          clause_name(num, @normref_lbl, div, nil)
+          clause_name(num, f.at(ns("./title")), div, nil)
           biblio_list(f, div, false)
         end
         num
@@ -45,9 +45,7 @@ module IsoDoc
                 nonstd_bibitem(tbody, b, i, biblio)
               else
                 unless %w(title clause references).include? b.name
-                  tbody.tx do |tx|
-                    parse(b, tx)
-                  end
+                  tbody.tx { |tx| parse(b, tx) }
                 end
               end
             end
@@ -77,12 +75,14 @@ module IsoDoc
         b.at(ns("./docidentifier[@type = 'ITU']")) || super
       end
 
-      IGNORE_IDS =
-        "@type = 'DOI' or @type = 'ISSN' or @type = 'ISBN' or @type = 'rfc-anchor'".freeze
+      IGNORE_IDS = "@type = 'DOI' or @type = 'ISSN' or @type = 'ISBN' or "\
+        "@type = 'rfc-anchor'".freeze
 
       def multi_bibitem_ref_code(b)
-        id = b.xpath(ns("./docidentifier[not(@type = 'metanorma' or #{IGNORE_IDS})]"))
-        id.empty? and id = b.xpath(ns("./docidentifier[not(@type = 'metanorma')]"))
+        id = b.xpath(ns("./docidentifier[not(@type = 'metanorma' or "\
+                        "#{IGNORE_IDS})]"))
+        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
@@ -100,7 +100,8 @@ module IsoDoc
             /^(?<prefix>ITU-[A-Z] [A-Z])[ .-]Sup[a-z]*\.[ ]?(?<num>\d+)$/ =~ id.text
           "#{prefix}-series Recommendations – Supplement #{num}"
         else
-          "#{titlecase(type)} #{docid_prefix(id["type"], id.text.sub(/^\[/, '').sub(/\]$/, ''))}"
+          d = docid_prefix(id["type"], id.text.sub(/^\[/, '').sub(/\]$/, ''))
+          "#{titlecase(type)} #{d}"
         end
       end
 

data/lib/isodoc/itu/terms.rb

@@ -1,15 +1,12 @@
 module IsoDoc
   module ITU
     module BaseConvert
-      def term_def_title(node)
-        node
-      end
-
+=begin
       def terms_defs(node, out, num)
         f = node.at(ns(IsoDoc::Convert::TERM_CLAUSE)) or return num
         out.div **attr_code(id: f["id"]) do |div|
           num = num + 1
-          clause_name(num, term_def_title(f.at(ns("./title"))), div, nil)
+          clause_name(num, f.at(ns("./title")), div, nil)
           if f.at(ns("./clause | ./terms | ./term")).nil? then out.p "None."
           else
             f.children.reject { |c1| c1.name == "title" }.each do |c1|
@@ -31,13 +28,14 @@ module IsoDoc
           end
         end
       end
+=end
 
-      def termdef_parse1(node, div, term, defn, source)
+      def termdef_parse1(node, div, defn, source)
         div.p **{ class: "TermNum", id: node["id"] } do |p|
           p.b do |b|
-            b << @xrefs.anchor(node["id"], :label)
+            node&.at(ns("./name"))&.children&.each { |n| parse(n, b) }
             insert_tab(b, 1)
-            term.children.each { |n| parse(n, b) }
+            node&.at(ns("./preferred"))&.children&.each { |n| parse(n, b) }
           end
           source and p << " #{bracket_opt(source.value)}"
           p << ": "
@@ -46,27 +44,20 @@ module IsoDoc
       end
 
       def termdef_parse(node, out)
-        term = node.at(ns("./preferred"))
         defn = node.at(ns("./definition"))
         source = node.at(ns("./termsource/origin/@citeas"))
         out.div **attr_code(id: node["id"]) do |div|
-          termdef_parse1(node, div, term, defn, source)
+          termdef_parse1(node, div, defn, source)
           set_termdomain("")
           node.children.each do |n|
-            next if %w(preferred definition termsource title).include? n.name
+            next if %w(preferred definition termsource title name).include? n.name
             parse(n, out)
           end
         end
       end
 
-      def termnote_parse(node, out)
-        out.div **note_attrs(node) do |div|
-          first = node.first_element_child
-          div.p do |p|
-            p << note_label(node) # "#{@xrefs.anchor(node['id'], :label) || '???'}: "
-            para_then_remainder(first, node, p, div)
-          end
-        end
+      def termnote_delim
+        " &ndash; "
       end
     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 "metadata"
+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
@@ -37,7 +36,7 @@ module IsoDoc
 
       def abstract(isoxml, out)
         f = isoxml.at(ns("//preface/abstract")) || return
-        out.div **attr_code(id: f["id"]) do |s|
+        out.div **attr_code(id: f["id"], class: "Abstract") do |s|
           clause_name(nil, "Summary", s, class: "AbstractTitle")
           f.elements.each { |e| parse(e, s) unless e.name == "title" }
         end
@@ -46,84 +45,18 @@ module IsoDoc
       def keywords(_docxml, out)
         kw = @meta.get[:keywords]
         kw.nil? || kw.empty? and return
-        out.div do |div|
+        out.div **attr_code(class: "Keyword") do |div|
           clause_name(nil, "Keywords", div,  class: "IntroTitle")
           div.p kw.join(", ") + "."
         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("//p[@class = 'h1Preface' and text() = 'Summary']/..")
-        history = docxml.at("//p[@class = 'h1Preface' and text() = 'History']/..")
-        source = docxml.at("//p[@class = 'h1Preface' and text() = 'Source']/..")
-        keywords = docxml.at("//p[@class = 'h1Preface' and text() = '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|
             insert_tab(div, 1)
             parse(node.at(ns("./stem")), div)
-            lbl = @xrefs.anchor(node['id'], :label, false)
-            unless lbl.nil?
+            if lbl = node&.at(ns("./name"))&.text
               insert_tab(div, 1)
               div << "(#{lbl})"
             end
@@ -157,24 +90,9 @@ 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|
+        out.a **attr_code(href: node["target"], title: node["alt"], 
+                          class: "url") do |l|
           if node.text.empty?
             l << node["target"].sub(/^mailto:/, "")
           else
@@ -183,45 +101,15 @@ 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
-          auth << "<p>&nbsp;</p><p>&nbsp;</p><p>&nbsp;</p>" unless t == "copyright"
-          dest.replace(auth.remove)
-        end
+      def clause_attrs(node)
+        ret = {}
+        %w(source history).include?(node["type"]) and
+          ret = { class: node["type"] }
+        super.merge(ret)
       end
 
       include BaseConvert
+      include Init
     end
   end
 end