metanorma-itu 1.1.3 → 1.2.0

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_convert.rb

@@ -1,5 +1,5 @@
 require "isodoc"
-require_relative "metadata"
+require_relative "init"
 require "fileutils"
 
 module IsoDoc
@@ -37,7 +37,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,7 +46,7 @@ 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
@@ -107,10 +107,10 @@ module IsoDoc
         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 = 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
@@ -122,8 +122,7 @@ module IsoDoc
           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
@@ -165,16 +164,19 @@ module IsoDoc
           @wordstylesheet&.write(@landscapestyle)
           @wordstylesheet&.close
         end
-        Html2Doc.process(result, filename: filename, stylesheet: @wordstylesheet&.path,
+        Html2Doc.process(result, filename: filename, 
+                         stylesheet: @wordstylesheet&.path,
                          header_file: header&.path, dir: dir,
                          asciimathdelims: [@openmathdelim, @closemathdelim],
-                         liststyles: { ul: @ulstyle, ol: @olstyle, steps: "l4" })
+                         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
@@ -214,14 +216,23 @@ module IsoDoc
             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;"
+            #i == 0 && t == "copyright" and p["style"] = "text-align:center;"
           end
-          auth << "<p>&nbsp;</p><p>&nbsp;</p><p>&nbsp;</p>" unless t == "copyright"
+          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
+          ret = { class: node["type"] }
+        super.merge(ret)
+      end
+
       include BaseConvert
+      include Init
     end
   end
 end

data/lib/isodoc/itu/xref.rb

@@ -1,5 +1,4 @@
 require "isodoc"
-require_relative "metadata"
 require "fileutils"
 
 module IsoDoc
@@ -11,12 +10,14 @@ module IsoDoc
       end
 
       def annex_name_lbl(clause, num)
-        lbl = clause["obligation"] == "informative" ? @labels["appendix"] : @labels["annex"]
-        l10n("<b>#{lbl} #{num}</b>")
+        lbl = clause["obligation"] == "informative" ? 
+          @labels["appendix"] : @labels["annex"]
+        l10n("<strong>#{lbl} #{num}</strong>")
       end
 
       def annex_names(clause, num)
-        lbl = clause["obligation"] == "informative" ? @labels["appendix"] : @labels["annex"]
+        lbl = clause["obligation"] == "informative" ? 
+          @labels["appendix"] : @labels["annex"]
         @anchors[clause["id"]] =
           { label: annex_name_lbl(clause, num), type: "clause",
             xref: "#{lbl} #{num}", level: 1 }
@@ -33,13 +34,16 @@ 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
-          docxml.xpath(ns("//annex[@obligation = 'informative']")).each_with_index do |c, i|
+          docxml.xpath(ns("//annex[@obligation = 'informative']"))
+            .each_with_index do |c, i|
             annex_names(c, RomanNumerals.to_roman(i + 1))
           end
-          docxml.xpath(ns("//annex[not(@obligation = 'informative')]")).each_with_index do |c, i|
+          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)
           end
         end
@@ -49,7 +53,8 @@ module IsoDoc
         @anchors[clause["id"]] =
           { label: num, xref: "#{@labels["annex_subclause"]} #{num}",
             level: level, type: "clause" }
-        clause.xpath(ns("./clause | ./references | ./terms | ./definitions")).each_with_index do |c, i|
+        clause.xpath(ns("./clause | ./references | ./terms | ./definitions"))
+          .each_with_index do |c, i|
           annex_names1(c, "#{num}.#{i + 1}", level + 1)
         end
       end
@@ -58,11 +63,11 @@ module IsoDoc
         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[title = 'Scope']")), 0, 1)
-        n = section_names(d.at(ns("//bibliography/clause[.//references[@normative = 'true']] | "\
-                                  "//bibliography/references[@normative = 'true']")), n, 1)
+          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 = 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)
@@ -72,15 +77,17 @@ module IsoDoc
         termexample_anchor_names(d)
       end
 
-      MIDDLE_SECTIONS = "//clause[title = 'Scope'] | "\
-        "//foreword | //introduction | //acknowledgements | "\
-        "//references[@normative = 'true'] | "\
-        "//sections/terms | //preface/clause | "\
-        "//sections/definitions | //clause[parent::sections]".freeze
+      def middle_sections
+        "//clause[@type = 'scope'] | "\
+          "//foreword | //introduction | //acknowledgements | "\
+          " #{@klass.norm_ref_xpath} | "\
+          "//sections/terms | //preface/clause | "\
+          "//sections/definitions | //clause[parent::sections]"
+      end
 
       def middle_section_asset_names(d)
         return super unless @hierarchical_assets
-        d.xpath(ns(MIDDLE_SECTIONS)).each do |c|
+        d.xpath(ns(middle_sections)).each do |c|
           hierarchical_asset_names(c, @anchors[c["id"]][:label])
         end
       end
@@ -104,7 +111,8 @@ module IsoDoc
       def hierarchical_figure_names(clause, num)
         c = IsoDoc::XrefGen::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
@@ -113,13 +121,14 @@ module IsoDoc
           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|
+        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] || "???")
@@ -133,16 +142,17 @@ module IsoDoc
         c = IsoDoc::XrefGen::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"])
+          @anchors[t["id"]] = anchor_struct(
+            "#{num}-#{c.increment(t).print}", nil,
+            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)
@@ -152,8 +162,11 @@ module IsoDoc
           notes.each do |n|
             return if n["id"].nil? || n["id"].empty?
             idx = notes.size == 1 ? "" : " #{c.increment(n).print}"
-            @anchors[n["id"]] = anchor_struct(idx, n, @labels["note_xref"],
-                                              "termnote", false)
+            @anchors[n["id"]] = 
+              { label: termnote_label(idx).strip, type: "termnote",
+              xref: l10n("#{anchor(t['id'], :xref)}, "\
+                         "#{@labels["note_xref"]} #{c.print}") }
+
           end
         end
       end