isodoc 1.2.6 → 1.4.0

data/lib/isodoc/i18n.rb

@@ -4,8 +4,21 @@ module IsoDoc
   class I18n
     def load_yaml(lang, script, i18nyaml = nil)
       ret = load_yaml1(lang, script)
-      return ret.merge(YAML.load_file(i18nyaml)) if i18nyaml
-      ret
+      return normalise_hash(ret.merge(YAML.load_file(i18nyaml))) if i18nyaml
+      normalise_hash(ret)
+    end
+
+    def normalise_hash(ret)
+      if ret.is_a? Hash 
+        ret.each do |k, v|
+          ret[k] = normalise_hash(v)
+        end
+        ret
+      elsif ret.is_a? Array then ret.map { |n| normalise_hash(n) }
+      elsif ret.is_a? String then ret.unicode_normalize(:nfc) 
+      else
+        ret
+      end
     end
 
     def load_yaml1(lang, script)

data/lib/isodoc/metadata.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative './metadata_date'
+require_relative './metadata_contributor'
 
 module IsoDoc
   class Metadata
@@ -15,7 +16,7 @@ module IsoDoc
     end
 
     def initialize(lang, script, i18n, fonts_options = {})
-      @metadata = {}
+      @metadata = { lang: lang, script: script }
       DATETYPES.each { |w| @metadata["#{w.gsub(/-/, '_')}date".to_sym] = 'XXX' }
       @lang = lang
       @script = script
@@ -37,122 +38,33 @@ module IsoDoc
       @metadata[key] = value
     end
 
-    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
+    NOLANG = "[not(@language) or @language = '']".freeze
 
-    def author(xml, _out)
-      personal_authors(xml)
-      agency(xml)
-    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
+    def currlang
+      "[@language = '#{@lang}']"
     end
 
     def doctype(isoxml, _out)
-      b = isoxml&.at(ns('//bibdata/ext/doctype'))&.text || return
+      b = isoxml&.at(ns("//bibdata/ext/doctype#{NOLANG}"))&.text || return
       set(:doctype, status_print(b))
-      b = isoxml&.at(ns('//local_bibdata/ext/doctype'))&.text || return
-      set(:doctype_display, status_print(b))
-    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)
+      b1 = isoxml&.at(ns("//bibdata/ext/doctype#{currlang}"))&.text || b
+      set(:doctype_display, status_print(b1))
     end
 
-    def docstatus(isoxml, _out)
+    def docstatus(xml, _out)
       set(:unpublished, true)
-      return unless docstatus = isoxml.at(ns('//bibdata/status/stage'))
-      docstatus_local = isoxml.at(ns('//local_bibdata/status/stage'))
-      set(:stage, status_print(docstatus.text))
-      docstatus_local and
-        set(:stage_display, status_print(docstatus_local.text))
-      (i = isoxml&.at(ns('//bibdata/status/substage'))&.text) &&
+      return unless s = xml.at(ns("//bibdata/status/stage#{NOLANG}"))
+      s1 = xml.at(ns("//bibdata/status/stage#{currlang}")) || s
+      set(:stage, status_print(s.text))
+      s1 and set(:stage_display, status_print(s1.text))
+      (i = xml&.at(ns("//bibdata/status/substage#{NOLANG}"))&.text) and
         set(:substage, i)
-      (i = isoxml&.at(ns('//local_bibdata/status/substage'))&.text) &&
-        set(:substage_display, i)
-      (i = isoxml&.at(ns('//bibdata/status/iteration'))&.text) &&
-        set(:iteration, i)
-      set(:unpublished, unpublished(docstatus.text))
-      unpublished(docstatus.text) &&
-        set(:stageabbr, stage_abbr(docstatus.text))
+      (i1 = xml&.at(ns("//bibdata/status/substage#{currlang}"))&.text || i) and
+        set(:substage_display, i1)
+      (i2 = xml&.at(ns('//bibdata/status/iteration'))&.text) and
+        set(:iteration, i2)
+      set(:unpublished, unpublished(s.text))
+      unpublished(s.text) && set(:stageabbr, stage_abbr(s.text))
     end
 
     def stage_abbr(docstatus)
@@ -172,6 +84,13 @@ module IsoDoc
       set(:docnumber, dn&.text)
     end
 
+    def otherid(isoxml, _out)
+      dn = isoxml.at(ns('//bibdata/docidentifier[@type = "ISBN"]'))
+      set(:isbn, dn&.text)
+      dn = isoxml.at(ns('//bibdata/docidentifier[@type = "ISBN10"]'))
+      set(:isbn10, dn&.text)
+    end
+
     def docnumeric(isoxml, _out)
       dn = isoxml.at(ns('//bibdata/docnumber'))
       set(:docnumeric, dn&.text)
@@ -197,7 +116,7 @@ module IsoDoc
     end
 
     def title(isoxml, _out)
-      main = isoxml&.at(ns("//bibdata/title[@language='en']"))&.text
+      main = isoxml&.at(ns("//bibdata/title[@language='#{@lang}']"))&.text
       set(:doctitle, main)
     end
 

data/lib/isodoc/metadata_contributor.rb

@@ -0,0 +1,91 @@
+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
+        subdivs = a&.xpath(ns('./affiliation/organization/subdivision'))&.map(&:text)&.join(", ")
+        name and subdivs and !subdivs.empty? and name = l10n("#{name}, #{subdivs}", @lang, @script)
+        location = a&.at(ns('./affiliation/organization/address/formattedAddress'))&.text
+        m << (!name.nil? && !location.nil? ? l10n("#{name}, #{location}", @lang, @script) :
+          (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

@@ -40,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

@@ -1,11 +1,22 @@
 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
-      b = a.dup
-      b.name = "local_bibdata"
-      bibdata_i18n(b)
-      a.next = b
+      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)
@@ -14,11 +25,72 @@ module IsoDoc
       hash_translate(b, @i18n.get["substage_dict"], "./status/substage")
     end
 
-    def hash_translate(bibdata, hash, xpath)
-      hash.is_a? Hash or return
+    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.children = hash[x.text]
+      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