isodoc 1.6.1 → 1.6.6

data/lib/isodoc/pdf_convert.rb

@@ -1,11 +1,10 @@
-require_relative "html_function/comments.rb"
-require_relative "html_function/footnotes.rb"
-require_relative "html_function/html.rb"
+require_relative "html_function/comments"
+require_relative "html_function/footnotes"
+require_relative "html_function/html"
 require "metanorma"
 
 module IsoDoc
   class PdfConvert < ::IsoDoc::Convert
-
     include HtmlFunction::Comments
     include HtmlFunction::Footnotes
     include HtmlFunction::Html
@@ -13,6 +12,8 @@ module IsoDoc
     def initialize(options)
       @standardstylesheet = nil
       super
+      @format = :pdf
+      @suffix = "pdf"
       @scripts = @scripts_pdf if @scripts_pdf
       @maxwidth = 500
       @maxheight = 800
@@ -22,22 +23,19 @@ module IsoDoc
       "_pdfimages"
     end
 
-    def initialize(options)
-      @format = :pdf
-      @suffix = "pdf"
-      super
-    end
-
     def convert(input_filename, file = nil, debug = false, output_filename = nil)
       file = File.read(input_filename, encoding: "utf-8") if file.nil?
       @openmathdelim, @closemathdelim = extract_delims(file)
       docxml, filename, dir = convert_init(file, input_filename, debug)
       result = convert1(docxml, filename, dir)
       return result if debug
-      postprocess(result, filename + ".tmp.html", dir)
+
+      postprocess(result, "#{filename}.tmp.html", dir)
       FileUtils.rm_rf dir
-      ::Metanorma::Output::Pdf.new.convert("#{filename}.tmp.html",
-                                           output_filename || "#{filename}.#{@suffix}")
+      ::Metanorma::Output::Pdf.new.convert(
+        "#{filename}.tmp.html",
+        output_filename || "#{filename}.#{@suffix}",
+      )
       FileUtils.rm_rf ["#{filename}.tmp.html", tmpimagedir]
     end
 

data/lib/isodoc/presentation_function/bibdata.rb

@@ -2,12 +2,32 @@ module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
     def bibdata(docxml)
       a = bibdata_current(docxml) or return
+      address_precompose(a)
       bibdata_i18n(a)
       a.next =
-        "<localized-strings>#{i8n_name(trim_hash(@i18n.get), "").join("")}"\
+        "<localized-strings>#{i8n_name(trim_hash(@i18n.get), '').join('')}"\
         "</localized-strings>"
     end
 
+    def address_precompose(bib)
+      bib.xpath(ns("//bibdata//address")).each do |b|
+        next if b.at(ns("./formattedAddress"))
+
+        x = address_precompose1(b)
+        b.children = "<formattedAddress>#{x}</formattedAddress>"
+      end
+    end
+
+    def address_precompose1(addr)
+      ret = []
+      addr.xpath(ns("./street")).each { |s| ret << s.children.to_xml }
+      a = addr.at(ns("./city")) and ret << a.children.to_xml
+      addr.xpath(ns("./state")).each { |s| ret << s.children.to_xml }
+      a = addr.at(ns("./country")) and ret << a.children.to_xml
+      a = addr.at(ns("./postcode")) and ret[-1] += " #{a.children.to_xml}"
+      ret.join("<br/>")
+    end
+
     def bibdata_current(docxml)
       a = docxml.at(ns("//bibdata")) or return
       a.xpath(ns("./language")).each do |l|
@@ -19,10 +39,10 @@ module IsoDoc
       a
     end
 
-    def bibdata_i18n(b)
-      hash_translate(b, @i18n.get["doctype_dict"], "./ext/doctype")
-      hash_translate(b, @i18n.get["stage_dict"], "./status/stage")
-      hash_translate(b, @i18n.get["substage_dict"], "./status/substage")
+    def bibdata_i18n(bib)
+      hash_translate(bib, @i18n.get["doctype_dict"], "./ext/doctype")
+      hash_translate(bib, @i18n.get["stage_dict"], "./status/stage")
+      hash_translate(bib, @i18n.get["substage_dict"], "./status/substage")
     end
 
     def hash_translate(bibdata, hash, xpath, lang = @lang)
@@ -35,58 +55,62 @@ module IsoDoc
       x.next.children = hash[x.text]
     end
 
-    def i18n_tag(k, v)
-      "<localized-string key='#{k}' language='#{@lang}'>#{v}</localized-string>"
+    def i18n_tag(key, value)
+      "<localized-string key='#{key}' language='#{@lang}'>#{value}"\
+        "</localized-string>"
     end
 
-    def i18n_safe(k)
-      k.to_s.gsub(/\s|\./, "_")
+    def i18n_safe(key)
+      key.to_s.gsub(/\s|\./, "_")
     end
 
-    def i8n_name(h, pref)
-      if h.is_a? Hash then i8n_name1(h, pref)
-      elsif h.is_a? Array
-        h.reject { |a| blank?(a) }.each_with_object([]).
-          with_index do |(v1, g), i|
+    def i8n_name(hash, pref)
+      if hash.is_a? Hash then i8n_name1(hash, pref)
+      elsif hash.is_a? Array
+        hash.reject { |a| blank?(a) }.each_with_object([])
+          .with_index do |(v1, g), i|
           i8n_name(v1, "#{i18n_safe(k)}.#{i}").each { |x| g << x }
         end
-      else [i18n_tag(pref, h)]
+      else [i18n_tag(pref, hash)]
       end
     end
 
-    def i8n_name1(h, pref)
-      h.reject { |k, v| blank?(v) }.each_with_object([]) do |(k, v), g|
+    def i8n_name1(hash, pref)
+      hash.reject { |_k, v| blank?(v) }.each_with_object([]) do |(k, v), g|
         if v.is_a? Hash then i8n_name(v, i18n_safe(k)).each { |x| g << x }
         elsif v.is_a? Array
           v.reject { |a| blank?(a) }.each_with_index do |v1, i|
             i8n_name(v1, "#{i18n_safe(k)}.#{i}").each { |x| g << x }
           end
         else
-          g << i18n_tag("#{pref}#{pref.empty? ? "" : "."}#{i18n_safe(k)}", v)
+          g << i18n_tag("#{pref}#{pref.empty? ? '' : '.'}#{i18n_safe(k)}", v)
         end
       end
     end
 
-    #https://stackoverflow.com/a/31822406
-    def blank?(v)
-      v.nil? || v.respond_to?(:empty?) && v.empty?
+    # https://stackoverflow.com/a/31822406
+    def blank?(elem)
+      elem.nil? || elem.respond_to?(:empty?) && elem.empty?
     end
 
-    def trim_hash(h)
+    def trim_hash(hash)
       loop do
-        h_new = trim_hash1(h)
-        break h if h==h_new
-        h = h_new
+        h_new = trim_hash1(hash)
+        break hash if hash == h_new
+
+        hash = h_new
       end
     end
 
-    def trim_hash1(h)
-      return h unless h.is_a? Hash
-      h.each_with_object({}) do |(k,v), g|
+    def trim_hash1(hash)
+      return hash unless hash.is_a? Hash
+
+      hash.each_with_object({}) do |(k, v), g|
         next if blank?(v)
-        g[k] = if v.is_a? Hash then trim_hash1(h[k])
+
+        g[k] = if v.is_a? Hash then trim_hash1(hash[k])
                elsif v.is_a? Array
-                 h[k].map { |a| trim_hash1(a) }.reject { |a| blank?(a) }
+                 hash[k].map { |a| trim_hash1(a) }.reject { |a| blank?(a) }
                else
                  v
                end

data/lib/isodoc/presentation_function/inline.rb

@@ -1,28 +1,28 @@
-require "twitter_cldr"
-require "bigdecimal"
-
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
     def prefix_container(container, linkend, _target)
-      l10n(@xrefs.anchor(container, :xref) + ", " + linkend)
+      l10n("#{@xrefs.anchor(container, :xref)}, #{linkend}")
     end
 
     def anchor_linkend(node, linkend)
       if node["citeas"].nil? && node["bibitemid"]
-        return @xrefs.anchor(node["bibitemid"] ,:xref) || "???"
+        return @xrefs.anchor(node["bibitemid"], :xref) || "???"
       elsif node["target"] && node["droploc"]
-        return @xrefs.anchor(node["target"], :value) || @xrefs.anchor(node["target"], :label) ||
-          @xrefs.anchor(node["target"], :xref) || "???"
+        return @xrefs.anchor(node["target"], :value) ||
+            @xrefs.anchor(node["target"], :label) ||
+            @xrefs.anchor(node["target"], :xref) || "???"
       elsif node["target"] && !/.#./.match(node["target"])
         linkend = anchor_linkend1(node)
       end
+
       linkend || "???"
     end
 
     def anchor_linkend1(node)
       linkend = @xrefs.anchor(node["target"], :xref)
       container = @xrefs.anchor(node["target"], :container, false)
-      (container && get_note_container_id(node) != container && @xrefs.get[node["target"]]) &&
+      (container && get_note_container_id(node) != container &&
+       @xrefs.get[node["target"]]) and
         linkend = prefix_container(container, linkend, node["target"])
       capitalise_xref(node, linkend)
     end
@@ -31,90 +31,104 @@ module IsoDoc
       return linkend unless %w(Latn Cyrl Grek).include? @script
       return linkend&.capitalize if node["case"] == "capital"
       return linkend&.downcase if node["case"] == "lowercase"
-      return linkend if linkend[0,1].match(/\p{Upper}/)
+      return linkend if linkend[0, 1].match?(/\p{Upper}/)
+
+      capitalise_xref1(node, linkend)
+    end
+
+    def capitalise_xref1(node, linkend)
       prec = nearest_block_parent(node).xpath("./descendant-or-self::text()") &
         node.xpath("./preceding::text()")
-      (prec.empty? || /(?!<[^.].)\.\s+$/.match(prec.map { |p| p.text }.join)) ?  linkend&.capitalize : linkend
+      if prec.empty? || /(?!<[^.].)\.\s+$/.match(prec.map(&:text).join)
+        linkend&.capitalize
+      else linkend
+      end
     end
 
     def nearest_block_parent(node)
-      until %w(p title td th name formula li dt dd sourcecode pre).include?(node.name)
+      until %w(p title td th name formula li dt dd sourcecode pre)
+          .include?(node.name)
         node = node.parent
       end
       node
     end
 
     def non_locality_elems(node)
-      node.children.select do |c|
-        !%w{locality localityStack}.include? c.name
+      node.children.reject do |c|
+        %w{locality localityStack}.include? c.name
       end
     end
 
     def get_linkend(node)
-      contents = non_locality_elems(node).select { |c| !c.text? || /\S/.match(c) }
-      return unless contents.empty?
+      c1 = non_locality_elems(node).select { |c| !c.text? || /\S/.match(c) }
+      return unless c1.empty?
+
       link = anchor_linkend(node, docid_l10n(node["target"] || node["citeas"]))
-      link += eref_localities(node.xpath(ns("./locality | ./localityStack")), link, node)
-      non_locality_elems(node).each { |n| n.remove }
+      link += eref_localities(node.xpath(ns("./locality | ./localityStack")),
+                              link, node)
+      non_locality_elems(node).each(&:remove)
       node.add_child(link)
     end
     # so not <origin bibitemid="ISO7301" citeas="ISO 7301">
     # <locality type="section"><reference>3.1</reference></locality></origin>
 
-    def eref_localities(refs, target, n)
+    def eref_localities(refs, target, node)
       ret = ""
       refs.each_with_index do |r, i|
         delim = ","
-        delim = ";" if r.name == "localityStack" && i>0
-        ret = eref_locality_stack(r, i, target, delim, ret, n)
+        delim = ";" if r.name == "localityStack" && i.positive?
+        ret = eref_locality_stack(r, i, target, delim, ret, node)
       end
       ret
     end
 
-    def eref_locality_stack(r, i, target, delim, ret, n)
-      if r.name == "localityStack"
-        r.elements.each_with_index do |rr, j|
-          ret += eref_localities0(rr, j, target, delim, n)
+    def eref_locality_stack(ref, idx, target, delim, ret, node)
+      if ref.name == "localityStack"
+        ref.elements.each_with_index do |rr, j|
+          ret += eref_localities0(rr, j, target, delim, node)
           delim = ","
         end
       else
-        ret += eref_localities0(r, i, target, delim, n)
+        ret += eref_localities0(ref, idx, target, delim, node)
       end
       ret
     end
 
-    def eref_localities0(r, i, target, delim, n)
-      if r["type"] == "whole" then l10n("#{delim} #{@i18n.wholeoftext}")
+    def eref_localities0(ref, _idx, target, delim, node)
+      if ref["type"] == "whole" then l10n("#{delim} #{@i18n.wholeoftext}")
       else
-        eref_localities1(target, r["type"], r.at(ns("./referenceFrom")),
-                         r.at(ns("./referenceTo")), delim, n, @lang)
+        eref_localities1(target, ref["type"], ref.at(ns("./referenceFrom")),
+                         ref.at(ns("./referenceTo")), delim, node, @lang)
       end
     end
 
     # TODO: move to localization file
-    def eref_localities1_zh(target, type, from, to, n, delim)
+    def eref_localities1_zh(_target, type, from, upto, node, delim)
       ret = "#{delim} 第#{from.text}" if from
-      ret += "&ndash;#{to.text}" if to
-      loc = (@i18n.locality[type] || type.sub(/^locality:/, "").capitalize )
-      ret += " #{loc}" unless n["droploc"] == "true"
+      ret += "&ndash;#{upto.text}" if upto
+      loc = (@i18n.locality[type] || type.sub(/^locality:/, "").capitalize)
+      ret += " #{loc}" unless node["droploc"] == "true"
       ret
     end
 
     # TODO: move to localization file
-    def eref_localities1(target, type, from, to, delim, n, lang = "en")
+    def eref_localities1(target, type, from, upto, delim, node, lang = "en")
       return "" if type == "anchor"
-      lang == "zh" and return l10n(eref_localities1_zh(target, type, from, to, n, delim))
+
+      lang == "zh" and
+        return l10n(eref_localities1_zh(target, type, from, upto, node, delim))
       ret = delim
-      ret += eref_locality_populate(type, n)
+      ret += eref_locality_populate(type, node)
       ret += " #{from.text}" if from
-      ret += "&ndash;#{to.text}" if to
+      ret += "&ndash;#{upto.text}" if upto
       l10n(ret)
     end
 
-    def eref_locality_populate(type, n)
-      return "" if n["droploc"] == "true"
+    def eref_locality_populate(type, node)
+      return "" if node["droploc"] == "true"
+
       loc = @i18n.locality[type] || type.sub(/^locality:/, "")
-      loc = case n["case"]
+      loc = case node["case"]
             when "capital" then loc.capitalize
             when "lowercase" then loc.downcase
             else
@@ -139,8 +153,8 @@ module IsoDoc
       docxml.xpath(ns("//quote/source")).each { |f| xref1(f) }
     end
 
-    def xref1(f)
-      get_linkend(f)
+    def xref1(node)
+      get_linkend(node)
     end
 
     def concept(docxml)
@@ -148,98 +162,33 @@ module IsoDoc
     end
 
     def concept1(node)
-      content = node.first_element_child.children.select do |c|
-        !%w{locality localityStack}.include? c.name
+      content = node.first_element_child.children.reject do |c|
+        %w{locality localityStack}.include? c.name
       end.select { |c| !c.text? || /\S/.match(c) }
-      node.replace content.empty? ? 
-        @i18n.term_defined_in.sub(/%/, node.first_element_child.to_xml) :
-        "<em>#{node.children.to_xml}</em>"
-    end
-
-
-    MATHML = { "m" => "http://www.w3.org/1998/Math/MathML" }.freeze
-
-    def mathml(docxml)
-      locale = twitter_cldr_localiser()
-      docxml.xpath("//m:math", MATHML).each do |f|
-        mathml1(f, locale)
-      end
-    end
-
-    # symbols is merged into
-    # TwitterCldr::DataReaders::NumberDataReader.new(locale).symbols
-    def localize_maths(f, locale)
-      f.xpath(".//m:mn", MATHML).each do |x|
-        num = BigDecimal(x.text)
-        precision = /\./.match(x.text) ? x.text.sub(/^.*\./, "").size : 0
-        x.children = localized_number(num, locale, precision)
-      end
-    end
-
-    # By itself twitter-cldr does not support fraction part digits grouping
-    # and custom delimeter, will decorate fraction part manually
-    def localized_number(num, locale, precision)
-      localized = (precision == 0) ? num.localize(locale).to_s :
-        num.localize(locale).to_decimal.to_s(:precision => precision)
-      twitter_cldr_reader_symbols = twitter_cldr_reader(locale)
-      return localized unless twitter_cldr_reader_symbols[:decimal]
-      integer, fraction = localized.split(twitter_cldr_reader_symbols[:decimal])
-      return localized if fraction.nil? || fraction.length.zero?
-      [integer, decorate_fraction_part(fraction, locale)].join(twitter_cldr_reader_symbols[:decimal])
-    end
-
-    def decorate_fraction_part(fract, locale)
-      result = []
-      twitter_cldr_reader_symbols = twitter_cldr_reader(locale)
-      fract = fract.slice(0..(twitter_cldr_reader_symbols[:precision] || -1))
-      fr_group_digits = twitter_cldr_reader_symbols[:fraction_group_digits] || 1
-      until fract.empty?
-        result.push(fract.slice!(0, fr_group_digits))
-      end
-      result.join(twitter_cldr_reader_symbols[:fraction_group].to_s)
-    end
-
-    def twitter_cldr_localiser_symbols
-      {}
-    end
-
-    def twitter_cldr_reader(locale)
-      num = TwitterCldr::DataReaders::NumberDataReader.new(locale)
-      num.symbols.merge!(twitter_cldr_localiser_symbols)
-    end
-
-    def twitter_cldr_localiser()
-      locale = TwitterCldr.supported_locale?(@lang.to_sym) ? @lang.to_sym : :en
-      twitter_cldr_reader(locale)
-      locale
-    end
-
-    def mathml1(f, locale)
-      localize_maths(f, locale)
-      return unless f.elements.size == 1 && f.elements.first.name == "mn"
-      if f.parent.name == "stem"
-        f.parent.replace(f.at("./m:mn", MATHML).children)
-      else
-        f.replace(f.at("./m:mn", MATHML).children)
-      end
+      n = if content.empty?
+            @i18n.term_defined_in.sub(/%/, node.first_element_child.to_xml)
+          else
+            "<em>#{node.children.to_xml}</em>"
+          end
+      node.replace(n)
     end
 
     def variant(docxml)
       docxml.xpath(ns("//variant")).each { |f| variant1(f) }
-      docxml.xpath(ns("//variant[@remove = 'true']")).each { |f| f.remove }
+      docxml.xpath(ns("//variant[@remove = 'true']")).each(&:remove)
       docxml.xpath(ns("//variant")).each do |v|
         next unless v&.next&.name == "variant"
+
         v.next = "/"
       end
       docxml.xpath(ns("//variant")).each { |f| f.replace(f.children) }
     end
 
     def variant1(node)
-      if (!node["lang"] || node["lang"] == @lang) && (!node["script"] || node["script"] == @script)
+      if (!node["lang"] || node["lang"] == @lang) &&
+          (!node["script"] || node["script"] == @script)
       elsif found_matching_variant_sibling(node)
         node["remove"] = "true"
-      else
-        #return unless !node.at("./preceding-sibling::xmlns:variant")
       end
     end
 
@@ -250,7 +199,8 @@ module IsoDoc
       foll = node.xpath("./following-sibling::xmlns:variant")
       found = false
       (prev + foll).each do |n|
-        found = true if n["lang"] == @lang && (!n["script"] || n["script"] == @script)
+        found = true if n["lang"] == @lang &&
+          (!n["script"] || n["script"] == @script)
       end
       found
     end