isodoc 1.2.4 → 1.3.0

data/lib/isodoc/metadata_contributor.rb

@@ -0,0 +1,90 @@
+module IsoDoc
+  class Metadata
+    def extract_person_names(authors)
+      authors.reduce([]) do |ret, a|
+        if a.at(ns('./name/completename'))
+          ret << a.at(ns('./name/completename')).text
+        else
+          fn = []
+          forenames = a.xpath(ns('./name/forename'))
+          forenames.each { |f| fn << f.text }
+          surname = a&.at(ns('./name/surname'))&.text
+          ret << fn.join(' ') + ' ' + surname
+        end
+      end
+    end
+
+    def extract_person_affiliations(authors)
+      authors.reduce([]) do |m, a|
+        name = a&.at(ns('./affiliation/organization/name'))&.text
+        location = a&.at(ns('./affiliation/organization/address/'\
+                            'formattedAddress'))&.text
+        m << (!name.nil? && !location.nil? ? "#{name}, #{location}" :
+          (name || location || ''))
+        m
+      end
+    end
+
+    def extract_person_names_affiliations(authors)
+      names = extract_person_names(authors)
+      affils = extract_person_affiliations(authors)
+      ret = {}
+      affils.each_with_index do |a, i|
+        ret[a] ||= []
+        ret[a] << names[i]
+      end
+      ret
+    end
+
+    def personal_authors(isoxml)
+      authors = isoxml.xpath(ns("//bibdata/contributor[role/@type = 'author' "\
+                                "or xmlns:role/@type = 'editor']/person"))
+      set(:authors, extract_person_names(authors))
+      set(:authors_affiliations, extract_person_names_affiliations(authors))
+    end
+
+    def author(xml, _out)
+      personal_authors(xml)
+      agency(xml)
+    end
+
+    def iso?(org)
+      name = org&.at(ns('./name'))&.text
+      abbrev = org&.at(ns('./abbreviation'))&.text
+      (abbrev == 'ISO' ||
+       name == 'International Organization for Standardization')
+    end
+
+    def agency1(xml)
+      agency = ''
+      publisher = []
+      xml.xpath(ns("//bibdata/contributor[xmlns:role/@type = 'publisher']/"\
+                   'organization')).each do |org|
+        name = org&.at(ns('./name'))&.text
+        agency1 = org&.at(ns('./abbreviation'))&.text || name
+        publisher << name if name
+        agency = iso?(org) ? "ISO/#{agency}" : "#{agency}#{agency1}/"
+      end
+      [agency, publisher]
+    end
+
+    def agency(xml)
+      agency, publisher = agency1(xml)
+      set(:agency, agency.sub(%r{/$}, ''))
+      set(:publisher, @i18n.multiple_and(publisher, @labels['and']))
+      agency_addr(xml)
+    end
+
+    def agency_addr(xml)
+      a = xml.at(ns("//bibdata/contributor[xmlns:role/@type = 'publisher'][1]/"\
+                    "organization")) or return
+      n = a.at(ns("./subdivision")) and set(:subdivision, n.text)
+      n = a.at(ns("./address/formattedAddress")) and
+        set(:pub_address, n.children.to_xml)
+      n = a.at(ns("./phone[not(@type = 'fax')]")) and set(:pub_phone, n.text)
+      n = a.at(ns("./phone[@type = 'fax']")) and set(:pub_fax, n.text)
+      n = a.at(ns("./email")) and set(:pub_email, n.text)
+      n = a.at(ns("./uri")) and set(:pub_uri, n.text)
+    end
+  end
+end

data/lib/isodoc/metadata_date.rb

@@ -1,5 +1,10 @@
 module IsoDoc
   class Metadata
+    DATETYPES = %w{published accessed created implemented obsoleted confirmed
+                   updated issued received transmitted copied unchanged
+                   circulated vote-started
+                   vote-ended}.freeze
+
     def months
     {
         "01": @labels["month_january"],
@@ -35,5 +40,11 @@ module IsoDoc
                Date.parse(isodate).strftime("%B %d, %Y")
              end
     end
+
+    def bibdate(isoxml, _out)
+      isoxml.xpath(ns('//bibdata/date')).each do |d|
+        set("#{d['type'].gsub(/-/, '_')}date".to_sym, Common::date_range(d))
+      end
+    end
   end
 end

data/lib/isodoc/presentation_function/bibdata.rb

@@ -0,0 +1,96 @@
+module IsoDoc
+  class PresentationXMLConvert < ::IsoDoc::Convert
+    def bibdata(docxml)
+      a = bibdata_current(docxml) or return
+      bibdata_i18n(a)
+      a.next =
+        "<localized-strings>#{i8n_name(trim_hash(@i18n.get), "").join("")}"\
+        "</localized-strings>"
+    end
+
+    def bibdata_current(docxml)
+      a = docxml.at(ns("//bibdata")) or return
+      a.xpath(ns("./language")).each do |l|
+        l.text == @lang and l["current"] = "true"
+      end
+      a.xpath(ns("./script")).each do |l|
+        l.text == @script and l["current"] = "true"
+      end
+      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")
+    end
+
+    def hash_translate(bibdata, hash, xpath, lang = @lang)
+      x = bibdata.at(ns(xpath)) or return
+      x["language"] = ""
+      hash.is_a? Hash or return
+      hash[x.text] or return
+      x.next = x.dup
+      x.next["language"] = lang
+      x.next.children = hash[x.text]
+    end
+
+    def i18n_tag(k, v)
+      "<localized-string key='#{k}' language='#{@lang}'>#{v}</localized-string>"
+    end
+
+    def i18n_safe(k)
+      k.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|
+          i8n_name(v1, "#{i18n_safe(k)}.#{i}").each { |x| g << x }
+        end
+      else [i18n_tag(pref, h)]
+      end
+    end
+
+    def i8n_name1(h, pref)
+      h.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)
+        end
+      end
+    end
+
+    #https://stackoverflow.com/a/31822406
+    def blank?(v)
+      v.nil? || v.respond_to?(:empty?) && v.empty?
+    end
+
+    def trim_hash(h)
+      loop do
+        h_new = trim_hash1(h)
+        break h if h==h_new
+        h = h_new
+      end
+    end
+
+    def trim_hash1(h)
+      return h unless h.is_a? Hash
+      h.each_with_object({}) do |(k,v), g|
+        next if blank?(v)
+        g[k] = if v.is_a? Hash then trim_hash1(h[k])
+               elsif v.is_a? Array
+                 h[k].map { |a| trim_hash1(a) }.reject { |a| blank?(a) }
+               else
+                 v
+               end
+      end
+    end
+  end
+end

data/lib/isodoc/presentation_function/block.rb

@@ -1,5 +1,10 @@
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
+    def lower2cap(s)
+      return s if /^[[:upper:]][[:upper:]]/.match(s)
+      s.capitalize
+    end
+
     def figure(docxml)
       docxml.xpath(ns("//figure")).each do |f|
         figure1(f)
@@ -12,7 +17,7 @@ module IsoDoc
       return if labelled_ancestor(f) && f.ancestors("figure").empty?
       return if f.at(ns("./figure")) and !f.at(ns("./name"))
       lbl = @xrefs.anchor(f['id'], :label, false) or return
-      prefix_name(f, "&nbsp;&mdash; ", l10n("#{@i18n.figure} #{lbl}"), "name")
+      prefix_name(f, "&nbsp;&mdash; ", l10n("#{lower2cap @i18n.figure} #{lbl}"), "name")
     end
 
     def prefix_name(f, delim, number, elem)
@@ -36,7 +41,7 @@ module IsoDoc
       return if labelled_ancestor(f)
       return unless f.ancestors("example").empty?
       lbl = @xrefs.anchor(f['id'], :label, false) or return
-      prefix_name(f, "&nbsp;&mdash; ", l10n("#{@i18n.figure} #{lbl}"), "name")
+      prefix_name(f, "&nbsp;&mdash; ", l10n("#{lower2cap @i18n.figure} #{lbl}"), "name")
     end
 
     def formula(docxml)
@@ -65,7 +70,7 @@ module IsoDoc
 
     def example1(f)
       n = @xrefs.get[f["id"]]
-      lbl = (n.nil? || n[:label].nil? || n[:label].empty?) ? @i18n.example :
+      lbl = (n.nil? || n[:label].nil? || n[:label].empty?) ? @i18n.example:
         l10n("#{@i18n.example} #{n[:label]}")
       prefix_name(f, "&nbsp;&mdash; ", lbl, "name")
     end
@@ -81,7 +86,7 @@ module IsoDoc
       return if f.parent.name == "bibitem"
       n = @xrefs.get[f["id"]]
       lbl = (@i18n.note if n.nil? || n[:label].nil? || n[:label].empty?) ?
-        @i18n.note : l10n("#{@i18n.note} #{n[:label]}")
+        @i18n.note: l10n("#{@i18n.note} #{n[:label]}")
       prefix_name(f, "", lbl, "name")
     end
 
@@ -94,24 +99,24 @@ module IsoDoc
     # introduce name element
     def termnote1(f)
       lbl = l10n(@xrefs.anchor(f['id'], :label) || '???')
-      prefix_name(f, "", lbl, "name")
+      prefix_name(f, "", lower2cap(lbl), "name")
     end
 
     def recommendation(docxml)
       docxml.xpath(ns("//recommendation")).each do |f|
-        recommendation1(f, @i18n.recommendation)
+        recommendation1(f, lower2cap(@i18n.recommendation))
       end
     end
 
     def requirement(docxml)
       docxml.xpath(ns("//requirement")).each do |f|
-        recommendation1(f, @i18n.requirement)
+        recommendation1(f, lower2cap(@i18n.requirement))
       end
     end
 
     def permission(docxml)
       docxml.xpath(ns("//permission")).each do |f|
-        recommendation1(f, @i18n.permission)
+        recommendation1(f, lower2cap(@i18n.permission))
       end
     end
 
@@ -132,7 +137,7 @@ module IsoDoc
       return if labelled_ancestor(f)
       return if f["unnumbered"] && !f.at(ns("./name"))
       n = @xrefs.anchor(f['id'], :label, false)
-      prefix_name(f, "&nbsp;&mdash; ", l10n("#{@i18n.table} #{n}"), "name")
+      prefix_name(f, "&nbsp;&mdash; ", l10n("#{lower2cap @i18n.table} #{n}"), "name")
     end
 
     # we use this to eliminate the semantic amend blocks from rendering

data/lib/isodoc/presentation_function/inline.rb

@@ -1,3 +1,5 @@
+require "twitter_cldr"
+
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
     def prefix_container(container, linkend, _target)
@@ -7,17 +9,25 @@ module IsoDoc
     def anchor_linkend(node, linkend)
       if node["citeas"].nil? && node["bibitemid"]
         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) || "???"
       elsif node["target"] && !/.#./.match(node["target"])
-        linkend = @xrefs.anchor(node["target"], :xref)
-        container = @xrefs.anchor(node["target"], :container, false)
-        (container && get_note_container_id(node) != container &&
-         @xrefs.get[node["target"]]) &&
-        linkend = prefix_container(container, linkend, node["target"])
-        linkend = capitalise_xref(node, linkend)
+        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"]]) &&
+      linkend = prefix_container(container, linkend, node["target"])
+      capitalise_xref(node, linkend)
+    end
+
     def capitalise_xref(node, linkend)
       return linkend unless %w(Latn Cyrl Grek).include? @script
       return linkend&.capitalize if node["case"] == "capital"
@@ -30,7 +40,7 @@ module IsoDoc
     end
 
     def nearest_block_parent(node)
-      until %w(p title td th name formula 
+      until %w(p title td th name formula
         li dt dd sourcecode pre).include?(node.name)
         node = node.parent
       end
@@ -43,13 +53,13 @@ module IsoDoc
       end
     end
 
-    def get_linkend(node)
-      contents = non_locality_elems(node).select { |c| !c.text? || /\S/.match(c) }
+    def get_linkend(n)
+      contents = non_locality_elems(n).select { |c| !c.text? || /\S/.match(c) }
       return unless contents.empty?
-      link = anchor_linkend(node, docid_l10n(node["target"] || node["citeas"]))
-      link += eref_localities(node.xpath(ns("./locality | ./localityStack")), link)
-      non_locality_elems(node).each { |n| n.remove }
-      node.add_child(link)
+      link = anchor_linkend(n, docid_l10n(n["target"] || n["citeas"]))
+      link += eref_localities(n.xpath(ns("./locality | ./localityStack")), link)
+      non_locality_elems(n).each { |n| n.remove }
+      n.add_child(link)
     end
     # so not <origin bibitemid="ISO7301" citeas="ISO 7301">
     # <locality type="section"><reference>3.1</reference></locality></origin>
@@ -59,14 +69,19 @@ module IsoDoc
       refs.each_with_index do |r, i|
         delim = ","
         delim = ";" if r.name == "localityStack" && i>0
-        if r.name == "localityStack"
-          r.elements.each_with_index do |rr, j|
-            ret += eref_localities0(rr, j, target, delim)
-            delim = ","
-          end
-        else
-          ret += eref_localities0(r, i, target, delim)
+        ret = eref_locality_stack(r, i, target, delim, ret)
+      end
+      ret
+    end
+
+    def eref_locality_stack(r, i, target, delim, ret)
+      if r.name == "localityStack"
+        r.elements.each_with_index do |rr, j|
+          ret += eref_localities0(rr, j, target, delim)
+          delim = ","
         end
+      else
+        ret += eref_localities0(r, i, target, delim)
       end
       ret
     end
@@ -79,7 +94,7 @@ module IsoDoc
       end
     end
 
-     # TODO: move to localization file
+    # TODO: move to localization file
     def eref_localities1_zh(target, type, from, to, delim)
       ret = "#{delim} 第#{from.text}" if from
       ret += "&ndash;#{to.text}" if to
@@ -91,7 +106,8 @@ module IsoDoc
     # TODO: move to localization file
     def eref_localities1(target, type, from, to, delim, lang = "en")
       return "" if type == "anchor"
-      return l10n(eref_localities1_zh(target, type, from, to, delim)) if lang == "zh"
+      lang == "zh" and
+        return l10n(eref_localities1_zh(target, type, from, to, delim))
       ret = delim
       loc = @i18n.locality[type] || type.sub(/^locality:/, "").capitalize
       ret += " #{loc}"
@@ -101,31 +117,132 @@ module IsoDoc
     end
 
     def xref(docxml)
-      docxml.xpath(ns("//xref")).each do |f|
-        xref1(f)
-      end
+      docxml.xpath(ns("//xref")).each { |f| xref1(f) }
     end
 
     def eref(docxml)
-      docxml.xpath(ns("//eref")).each do |f|
-        xref1(f)
-      end
+      docxml.xpath(ns("//eref")).each { |f| xref1(f) }
     end
 
     def origin(docxml)
-      docxml.xpath(ns("//origin[not(termref)]")).each do |f|
-        xref1(f)
-      end
+      docxml.xpath(ns("//origin[not(termref)]")).each { |f| xref1(f) }
     end
 
     def quotesource(docxml)
-      docxml.xpath(ns("//quote/source")).each do |f|
-        xref1(f)
-      end
+      docxml.xpath(ns("//quote/source")).each { |f| xref1(f) }
     end
 
     def xref1(f)
       get_linkend(f)
     end
+
+    def concept(docxml)
+      docxml.xpath(ns("//concept")).each { |f| concept1(f) }
+    end
+
+    def concept1(node)
+      content = node.first_element_child.children.select 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 = /\./.match(x.text) ? x.text.to_f : x.text.to_i
+        precision = /\./.match(x.text) ? x.text.sub(/^.*\./, "").size : 0
+        x.children = localized_number(num, locale, precision)
+      end
+    end
+
+    # By itself twiiter 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"
+      f.replace(f.at("./m:mn", MATHML).children)
+    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")).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)
+      elsif found_matching_variant_sibling(node)
+        node["remove"] = "true"
+      else
+        #return unless !node.at("./preceding-sibling::xmlns:variant")
+      end
+    end
+
+    def found_matching_variant_sibling(node)
+      prev = node.xpath("./preceding-sibling::xmlns:variant")
+      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)
+      end
+      found
+    end
   end
 end