isodoc 1.2.2 → 1.2.7

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)
+      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.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

@@ -134,5 +134,19 @@ module IsoDoc
       n = @xrefs.anchor(f['id'], :label, false)
       prefix_name(f, " — ", l10n("#{@i18n.table} #{n}"), "name")
     end
+
+    # we use this to eliminate the semantic amend blocks from rendering
+    def amend(docxml)
+      docxml.xpath(ns("//amend")).each do |f|
+        amend1(f)
+      end
+    end
+
+    def amend1(f)
+      f.xpath(ns("./autonumber")).each { |a| a.remove }
+      f.xpath(ns("./newcontent")).each { |a| a.name = "quote" }
+      f.xpath(ns("./description")).each { |a| a.replace(a.children) }
+      f.replace(f.children)
+    end
   end
 end

data/lib/isodoc/presentation_function/inline.rb

@@ -7,17 +7,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"
@@ -59,14 +67,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 +92,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 += "–#{to.text}" if to

data/lib/isodoc/presentation_xml_convert.rb

@@ -1,6 +1,7 @@
 require_relative "presentation_function/block"
 require_relative "presentation_function/inline"
 require_relative "presentation_function/section"
+require_relative "presentation_function/bibdata"
 
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
@@ -14,10 +15,12 @@ module IsoDoc
       @xrefs.parse docxml
       info docxml, nil
       conversions(docxml)
+      docxml.root["type"] = "presentation"
       docxml.to_xml
     end
 
     def conversions(docxml)
+      bibdata docxml
       section docxml
       block docxml
       inline docxml
@@ -30,6 +33,7 @@ module IsoDoc
     end
 
     def block(docxml)
+      amend docxml
       table docxml
       figure docxml
       sourcecode docxml

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "1.2.2".freeze
+  VERSION = "1.2.7".freeze
 end

data/lib/isodoc/word_function/body.rb

@@ -27,6 +27,7 @@ module IsoDoc::WordFunction
     def make_body2(body, docxml)
       body.div **{ class: "WordSection2" } do |div2|
         boilerplate docxml, div2
+        preface_block docxml, div2
         abstract docxml, div2
         foreword docxml, div2
         introduction docxml, div2

data/lib/isodoc/word_function/postprocess.rb

@@ -127,7 +127,7 @@ xmlns:m="http://schemas.microsoft.com/office/2004/12/omml">
     def list_add(xpath, lvl)
       xpath.each do |list|
         (list.xpath(".//li") - list.xpath(".//ol//li | .//ul//li")).each do |l|
-          l.xpath("./p | ./div").each_with_index do |p, i|
+          l.xpath("./p | ./div | ./table").each_with_index do |p, i|
             next if i == 0
             p.wrap(%{<div class="ListContLevel#{lvl}"/>})
           end
@@ -183,7 +183,7 @@ xmlns:m="http://schemas.microsoft.com/office/2004/12/omml">
     def generate_header(filename, _dir)
       return nil unless @header
       template = IsoDoc::Common.liquid(File.read(@header, encoding: "UTF-8"))
-      meta = @meta.get
+      meta = @meta.get.merge(@labels || {}).merge(@meta.labels || {})
       meta[:filename] = filename
       params = meta.map { |k, v| [k.to_s, v] }.to_h
       Tempfile.open(%w(header html), :encoding => "utf-8") do |f|

data/lib/isodoc/word_function/table.rb

@@ -29,7 +29,7 @@ module IsoDoc::WordFunction
         border-bottom:#{SW1} #{rowmax == totalrows ? '1.5' : '1.0'}pt;
         mso-border-bottom-alt:#{SW1} #{rowmax == totalrows ? '1.5' : '1.0'}pt;
       STYLE
-      { rowspan: td["rowspan"], colspan: td["colspan"],
+      { rowspan: td["rowspan"], colspan: td["colspan"], valign: td["valign"],
         align: td["align"], style: style.gsub(/\n/, "") }
     end
 
@@ -38,7 +38,8 @@ module IsoDoc::WordFunction
         summary: node["summary"],
         width: node["width"],
         style: "mso-table-anchor-horizontal:column;"\
-        "mso-table-overlap:never;border-spacing:0;border-width:1px;#{keep_style(node)}"
+        "mso-table-overlap:never;border-spacing:0;border-width:1px;#{keep_style(node)}",
+        class: (node.text.length > 4000 ? "MsoISOTableBig" : "MsoISOTable")
       }))
     end
 

data/lib/isodoc/xref.rb

@@ -41,6 +41,7 @@ module IsoDoc
 
     # extract names for all anchors, xref and label
     def parse(docxml)
+      amend_preprocess(docxml)
       initial_anchor_names(docxml)
       back_anchor_names(docxml)
       # preempt clause notes with all other types of note (ISO default)

data/lib/isodoc/xref/xref_anchor.rb

@@ -35,11 +35,15 @@ module IsoDoc::XrefGen
     end
 
     def anchor_struct_xref(lbl, elem)
+      l10n("#{elem} #{anchor_struct_value(lbl, elem)}")
+    end
+
+    def anchor_struct_value(lbl, elem)
       case elem
-      when @labels["formula"] then l10n("#{elem} (#{lbl})")
-      when @labels["inequality"] then l10n("#{elem} (#{lbl})")
+      when @labels["formula"] then "(#{lbl})"
+      when @labels["inequality"] then "(#{lbl})"
       else
-        l10n("#{elem} #{lbl}")
+        lbl
       end
     end
 
@@ -50,6 +54,7 @@ module IsoDoc::XrefGen
       ret[:xref].gsub!(/ $/, "")
       ret[:container] = @klass.get_clause_id(container) unless container.nil?
       ret[:type] = type
+      ret[:value] = anchor_struct_value(lbl, elem)
       ret
     end
   end

data/lib/isodoc/xref/xref_counter.rb

@@ -8,17 +8,20 @@ module IsoDoc::XrefGen
       @subseq = ""
       @letter_override = nil
       @number_override = nil
+      @base = ""
     end
 
     def new_subseq_increment(node)
       @subseq = node["subsequence"]
       @num += 1
       @letter = node["subsequence"] ? "a" : ""
+      @base = ""
       if node["number"]
-        /^(?<n>\d*)(?<a>[a-z]*)$/ =~ node["number"]
-        if n || a
-          @letter_override = @letter = a if a
-          @number_override = @num = n.to_i if n
+        /^(?<b>.*?)(?<n>\d*)(?<a>[a-z]*)$/ =~ node["number"]
+        if !n.empty? || !a.empty?
+          @letter_override = @letter = a unless a.empty?
+          @number_override = @num = n.to_i unless n.empty?
+          @base = b
         else
           @letter_override = node["number"]
           @letter = @letter_override if /^[a-z]$/.match(@letter_override)
@@ -28,8 +31,13 @@ module IsoDoc::XrefGen
 
     def sequence_increment(node)
       if node["number"]
+        @base = ""
         @number_override = node["number"]
-        @num = @number_override.to_i if /^\d+$/.match(@number_override)
+        /^(?<b>.*?)(?<n>\d+)$/ =~ node["number"]
+        unless n.nil? || n.empty?
+          @num = n.to_i
+          @base = b
+        end
       else
         @num += 1
       end
@@ -37,8 +45,14 @@ module IsoDoc::XrefGen
 
     def subsequence_increment(node)
       if node["number"]
+        @base = ""
         @letter_override = node["number"]
-        @letter = @letter_override if /^[a-z]$/.match(@letter_override)
+        /^(?<b>.*?)(?<n>\d*)(?<a>[a-z]+)$/ =~ node["number"]
+        unless a.empty?
+          @letter = a
+          @base = b
+          @number_override = @num = n.to_i unless n.empty?
+        end
       else
         @letter = (@letter.ord + 1).chr.to_s
       end
@@ -59,7 +73,7 @@ module IsoDoc::XrefGen
     end
 
     def print
-      "#{@number_override || @num}#{@letter_override || @letter}"
+      "#{@base}#{@number_override || @num}#{@letter_override || @letter}"
     end
 
     def listlabel(depth)