isodoc 2.1.5 → 2.2.2.2

data/lib/isodoc/presentation_function/image.rb

@@ -11,7 +11,14 @@ module IsoDoc
         else s.remove
         end
       end
-      docxml.xpath(ns("//image")).each { |f| svg_emf_double(f) }
+      imageconvert(docxml)
+    end
+
+    def imageconvert(docxml)
+      docxml.xpath(ns("//image")).each do |f|
+        eps2svg(f)
+        svg_emf_double(f)
+      end
     end
 
     def svg_extract(elem)
@@ -36,6 +43,16 @@ module IsoDoc
                   l10n("#{lower2cap @i18n.figure} #{lbl}"), "name")
     end
 
+    def eps2svg(img)
+      return unless eps?(img["mimetype"])
+
+      img["mimetype"] = "image/svg+xml"
+      if src = eps_to_svg(img)
+        img["src"] = src
+        img.children = ""
+      end
+    end
+
     def svg_emf_double(img)
       if emf?(img["mimetype"])
         img = emf_encode(img)
@@ -46,40 +63,59 @@ module IsoDoc
     end
 
     def emf_encode(img)
-      img["mimetype"] = "image/svg+xml"
-      unless %r{^data:image}.match?(img["src"])
-        img["src"] = Metanorma::Utils::datauri(img["src"])
-      end
+      svg_prep(img)
       img.children = "<emf src='#{img['src']}'/>"
       img["src"] = ""
       img
     end
 
+    def svg_prep(img)
+      img["mimetype"] = "image/svg+xml"
+      %r{^data:image}.match?(img["src"]) or
+        img["src"] = Metanorma::Utils::datauri(img["src"])
+    end
+
     def emf_to_svg(img)
       emf = Metanorma::Utils::save_dataimage(img.at(ns("./emf/@src")).text)
       Emf2svg.from_file(emf).sub(/<\?[^>]+>/, "")
     end
 
+    def eps_to_svg(node)
+      uri = eps_to_svg_uri(node)
+      ret = imgfile_suffix(uri, "svg")
+      File.exist?(ret) and return ret
+      inkscape_convert(uri, ret, "--export-plain-svg")
+    end
+
     def svg_to_emf(node)
       uri = svg_to_emf_uri(node)
-      ret = svg_to_emf_filename(uri)
+      ret = imgfile_suffix(uri, "emf")
       File.exist?(ret) and return ret
+      inkscape_convert(uri, ret, '--export-type="emf"')
+    end
+
+    def inkscape_convert(uri, file, option)
       exe = inkscape_installed? or raise "Inkscape missing in PATH, unable" \
-                                         "to convert EMF to SVG. Aborting."
+                                         "to convert image #{uri}. Aborting."
       uri = Metanorma::Utils::external_path uri
       exe = Metanorma::Utils::external_path exe
-      system(%(#{exe} --export-type="emf" #{uri})) and
-        return Metanorma::Utils::datauri(ret)
+      system(%(#{exe} #{option} #{uri})) and
+        return Metanorma::Utils::datauri(file)
 
-      raise %(Fail on #{exe} --export-type="emf" #{uri})
+      raise %(Fail on #{exe} #{option} #{uri})
     end
 
     def svg_to_emf_uri(node)
-      uri = if node&.elements&.first&.name == "svg"
-              a = Base64.strict_encode64(node.children.to_xml)
-              "data:image/svg+xml;base64,#{a}"
-            else node["src"]
-            end
+      uri = svg_to_emf_uri_convert(node)
+      cache_dataimage(uri)
+    end
+
+    def eps_to_svg_uri(node)
+      uri = eps_to_svg_uri_convert(node)
+      cache_dataimage(uri)
+    end
+
+    def cache_dataimage(uri)
       if %r{^data:}.match?(uri)
         uri = save_dataimage(uri)
         @tempfile_cache << uri
@@ -87,12 +123,25 @@ module IsoDoc
       uri
     end
 
-    def svg_to_emf_filename(uri)
-      "#{File.join(File.dirname(uri), File.basename(uri, '.*'))}.emf"
+    def svg_to_emf_uri_convert(node)
+      if node&.elements&.first&.name == "svg"
+        a = Base64.strict_encode64(node.children.to_xml)
+        "data:image/svg+xml;base64,#{a}"
+      else node["src"]
+      end
+    end
+
+    def eps_to_svg_uri_convert(node)
+      if node.text.strip.empty?
+        node["src"]
+      else
+        a = Base64.strict_encode64(node.children.to_xml)
+        "data:application/postscript;base64,#{a}"
+      end
     end
 
-    def emf_to_svgfilename(uri)
-      "#{File.join(File.dirname(uri), File.basename(uri, '.*'))}.svg"
+    def imgfile_suffix(uri, suffix)
+      "#{File.join(File.dirname(uri), File.basename(uri, '.*'))}.#{suffix}"
     end
 
     def inkscape_installed?

data/lib/isodoc/presentation_function/refs.rb

@@ -0,0 +1,102 @@
+require_relative "../../relaton/render/general"
+
+module IsoDoc
+  class PresentationXMLConvert < ::IsoDoc::Convert
+    def references(docxml)
+      bibliography_bibitem_number(docxml)
+      renderings = references_render(docxml)
+      docxml.xpath(ns("//references/bibitem")).each do |x|
+        bibitem(x, renderings)
+      end
+      docxml.xpath(ns("//references[bibitem/@hidden = 'true']")).each do |x|
+        x.at(ns("./bibitem[not(@hidden = 'true')]")) and next
+        x["hidden"] = "true"
+      end
+      @xrefs.parse_inclusions(refs: true).parse(docxml)
+    end
+
+    def references_render(docxml)
+      d = docxml.clone
+      d.remove_namespaces!
+      refs = d.xpath("//references/bibitem").each_with_object([]) do |b, m|
+        prep_for_rendering(b)
+        m << b.to_xml
+      end.join
+      bibrenderer.render_all("<references>#{refs}</references>",
+                             type: citestyle)
+    end
+
+    def prep_for_rendering(bib)
+      bib["suppress_identifier"] == true and
+        bib.xpath(ns("./docidentifier")).each(&:remove)
+      bib["type"] ||= "standard"
+    end
+
+    def bibitem(xml, renderings)
+      @xrefs.klass.implicit_reference(xml) and xml["hidden"] = "true"
+      bibrender(xml, renderings)
+    end
+
+    def bibrender(xml, renderings)
+      if f = xml.at(ns("./formattedref"))
+        bibrender_formattedref(f, xml)
+      else bibrender_relaton(xml, renderings)
+      end
+    end
+
+    def bibrender_formattedref(formattedref, xml)
+      code = render_identifier(bibitem_ref_code(xml))
+      (code[:sdo] && xml["suppress_identifier"] != "true") and
+        formattedref << " [#{code[:sdo]}] "
+    end
+
+    def bibrender_relaton(xml, renderings)
+      f = renderings[xml["id"]][:formattedref]
+      f &&= "<formattedref>#{f}</formattedref>"
+      xml.children =
+        "#{f}#{xml.xpath(ns('./docidentifier | ./uri | ./note')).to_xml}"
+    end
+
+    def bibrenderer
+      ::Relaton::Render::IsoDoc::General.new(language: @lang)
+    end
+
+    def citestyle
+      nil
+    end
+
+    def bibliography_bibitem_number_skip(bibitem)
+      @xrefs.klass.implicit_reference(bibitem) ||
+        bibitem.at(ns(".//docidentifier[@type = 'metanorma']")) ||
+        bibitem.at(ns(".//docidentifier[@type = 'metanorma-ordinal']")) ||
+        bibitem["hidden"] == "true" || bibitem.parent["hidden"] == "true"
+    end
+
+    def bibliography_bibitem_number(docxml)
+      i = 0
+      docxml.xpath(ns("//references[@normative = 'false']/bibitem")).each do |b|
+        i = bibliography_bibitem_number1(b, i)
+      end
+      @xrefs.references docxml
+    end
+
+    def bibliography_bibitem_number1(bibitem, idx)
+      ins = bibitem.at(ns(".//docidentifier")).previous_element
+      mn = bibitem.at(ns(".//docidentifier[@type = 'metanorma']")) and
+        /^\[?\d+\]?$/.match?(mn.text) and
+        mn.remove # ignore numbers already inserted
+      unless bibliography_bibitem_number_skip(bibitem)
+        idx += 1
+        ins.next =
+          "<docidentifier type='metanorma-ordinal'>[#{idx}]</docidentifier>"
+      end
+      idx
+    end
+
+    def docid_prefixes(docxml)
+      docxml.xpath(ns("//references/bibitem/docidentifier")).each do |i|
+        i.children = @xrefs.klass.docid_prefix(i["type"], i.text)
+      end
+    end
+  end
+end

data/lib/isodoc/presentation_function/section.rb

@@ -1,4 +1,4 @@
-require_relative "../../relaton/render/general"
+require_relative "refs"
 
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
@@ -76,85 +76,6 @@ module IsoDoc
       prefix_name(elem, "", "#{lbl}#{clausedelim}", "name")
     end
 
-    def references(docxml)
-      bibliography_bibitem_number(docxml)
-      docxml.xpath(ns("//references/bibitem")).each do |x|
-        bibitem(x)
-      end
-      docxml.xpath(ns("//references[bibitem/@hidden = 'true']")).each do |x|
-        x.at(ns("./bibitem[not(@hidden = 'true')]")) and next
-        x["hidden"] = "true"
-      end
-      @xrefs.parse_inclusions(refs: true).parse(docxml)
-    end
-
-    def bibitem(xml)
-      @xrefs.klass.implicit_reference(xml) and
-        xml["hidden"] = "true"
-      bibrender(xml)
-    end
-
-    def bibrender(xml)
-      if f = xml.at(ns("./formattedref"))
-        bibrender_formattedref(f, xml)
-      else bibrender_relaton(xml)
-      end
-    end
-
-    def bibrender_formattedref(formattedref, xml)
-      code = render_identifier(bibitem_ref_code(xml))
-      (code[:sdo] && xml["suppress_identifier"] != "true") and
-        formattedref << " [#{code[:sdo]}] "
-    end
-
-    def bibrender_relaton(xml)
-      bib = xml.dup
-      bib["suppress_identifier"] == true and
-        bib.xpath(ns("./docidentifier")).each(&:remove)
-      xml.children =
-        "#{bibrenderer.render(bib.to_xml)}"\
-        "#{xml.xpath(ns('./docidentifier | ./uri | ./note')).to_xml}"
-    end
-
-    def bibrenderer
-      ::Relaton::Render::IsoDoc::General.new(language: @lang)
-    end
-
-    def bibliography_bibitem_number_skip(bibitem)
-      @xrefs.klass.implicit_reference(bibitem) ||
-        bibitem.at(ns(".//docidentifier[@type = 'metanorma']")) ||
-        bibitem.at(ns(".//docidentifier[@type = 'metanorma-ordinal']")) ||
-        bibitem["hidden"] == "true" || bibitem.parent["hidden"] == "true"
-    end
-
-    def bibliography_bibitem_number(docxml)
-      i = 0
-      docxml.xpath(ns("//references[@normative = 'false']/bibitem")).each do |b|
-        i = bibliography_bibitem_number1(b, i)
-      end
-      @xrefs.references docxml
-    end
-
-    def bibliography_bibitem_number1(bibitem, idx)
-      if mn = bibitem.at(ns(".//docidentifier[@type = 'metanorma']"))
-        /^\[?\d\]?$/.match?(mn&.text) and
-          idx = mn.text.sub(/^\[/, "").sub(/\]$/, "").to_i
-      end
-      unless bibliography_bibitem_number_skip(bibitem)
-
-        idx += 1
-        bibitem.at(ns(".//docidentifier")).previous =
-          "<docidentifier type='metanorma-ordinal'>[#{idx}]</docidentifier>"
-      end
-      idx
-    end
-
-    def docid_prefixes(docxml)
-      docxml.xpath(ns("//references/bibitem/docidentifier")).each do |i|
-        i.children = @xrefs.klass.docid_prefix(i["type"], i.text)
-      end
-    end
-
     def index(docxml)
       docxml.xpath(ns("//index | //index-xref | //indexsect")).each(&:remove)
     end

data/lib/isodoc/presentation_function/terms.rb

@@ -28,10 +28,9 @@ module IsoDoc
     end
 
     def concept1_nonital(node, opts)
-      if opts[:ital] == "false"
-        r = node.at(ns(".//renderterm"))
-        r&.replace(r&.children)
-      end
+      opts[:ital] == "false" or return
+      r = node.at(ns(".//renderterm"))
+      r&.replace(r&.children)
     end
 
     def concept_render_init(node, defaults)
@@ -43,11 +42,11 @@ module IsoDoc
     end
 
     def concept1_linkmention(ref, renderterm, opts)
-      if opts[:linkmention] == "true" && !renderterm.nil? && !ref.nil?
-        ref2 = ref.clone
-        r2 = renderterm.clone
-        renderterm.replace(ref2).children = r2
-      end
+      return unless opts[:linkmention] == "true" && !renderterm.nil? && !ref.nil?
+
+      ref2 = ref.clone
+      r2 = renderterm.clone
+      renderterm.replace(ref2).children = r2
     end
 
     def concept1_ref(_node, ref, opts)
@@ -92,9 +91,7 @@ module IsoDoc
     end
 
     def designation(docxml)
-      docxml.xpath(ns("//term")).each do |t|
-        merge_second_preferred(t)
-      end
+      docxml.xpath(ns("//term")).each { |t| merge_second_preferred(t) }
       docxml.xpath(ns("//preferred | //admitted | //deprecates")).each do |p|
         designation1(p)
       end
@@ -194,7 +191,6 @@ module IsoDoc
       end
     end
 
-    # introduce name element
     def termnote1(elem)
       lbl = l10n(@xrefs.anchor(elem["id"], :label) || "???")
       prefix_name(elem, "", lower2cap(lbl), "name")

data/lib/isodoc/presentation_xml_convert.rb

@@ -59,6 +59,7 @@ module IsoDoc
       permission docxml
       requirement docxml
       recommendation docxml
+      requirement_render docxml
     end
 
     def inline(docxml)

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "2.1.5".freeze
+  VERSION = "2.2.2.2".freeze
 end

data/lib/isodoc/word_function/postprocess.rb

@@ -98,7 +98,7 @@ module IsoDoc
         docxml.xpath("//p[@class='Biblio']//span[@style='mso-tab-count:1']")
           .each do |s|
           s.next.text? or next
-          s.next.replace(s.next.text.sub(/^\s+/, ""))
+          s.next.replace(@c.encode(s.next.text.sub(/^\s+/, ""), :hexadecimal))
         end
       end
 

data/lib/isodoc/xref/xref_counter.rb

@@ -2,6 +2,18 @@ require "roman-numerals"
 
 module IsoDoc
   module XrefGen
+    class ReqCounter
+      # one counter for each requirements label
+      def initialize
+        @counters = {}
+      end
+
+      def increment(label, node)
+        @counters[label] ||= Counter.new
+        @counters[label].increment(node)
+      end
+    end
+
     class Counter
       def initialize(num = 0, opts = { numerals: :arabic })
         @unnumbered = false

data/lib/isodoc/xref/xref_gen.rb

@@ -1,5 +1,13 @@
 require_relative "xref_gen_seq"
 
+module Enumerable
+  def noblank
+    reject do |n|
+      n["id"].nil? || n["id"].empty?
+    end
+  end
+end
+
 module IsoDoc
   module XrefGen
     module Blocks
@@ -11,6 +19,10 @@ module IsoDoc
         text.nil? || text.empty?
       end
 
+      def noblank(xpath)
+        xpath.reject { |n| blank?(n["id"]) }
+      end
+
       def amend_preprocess(xmldoc)
         xmldoc.xpath(ns("//amend[newcontent]")).each do |a|
           autonum = amend_autonums(a)
@@ -45,7 +57,7 @@ module IsoDoc
       def termnote_anchor_names(docxml)
         docxml.xpath(ns("//*[termnote]")).each do |t|
           c = Counter.new
-          t.xpath(ns("./termnote")).reject { |n| blank?(n["id"]) }.each do |n|
+          t.xpath(ns("./termnote")).noblank.each do |n|
             c.increment(n)
             @anchors[n["id"]] =
               { label: termnote_label(c.print), type: "termnote",
@@ -60,7 +72,7 @@ module IsoDoc
         docxml.xpath(ns("//*[termexample]")).each do |t|
           examples = t.xpath(ns("./termexample"))
           c = Counter.new
-          examples.reject { |n| blank?(n["id"]) }.each do |n|
+          examples.noblank.each do |n|
             c.increment(n)
             idx = increment_label(examples, n, c, increment: false)
             @anchors[n["id"]] = anchor_struct(idx, n, @labels["example_xref"],
@@ -135,7 +147,7 @@ module IsoDoc
           notes = s.xpath(ns(".//ol")) - s.xpath(ns(".//clause//ol")) -
             s.xpath(ns(".//appendix//ol")) - s.xpath(ns(".//ol//ol"))
           c = Counter.new
-          notes.reject { |n| blank?(n["id"]) }.each do |n|
+          notes.noblank.each do |n|
             @anchors[n["id"]] = anchor_struct(increment_label(notes, n, c), n,
                                               @labels["list"], "list", false)
             list_item_anchor_names(n, @anchors[n["id"]], 1, "", notes.size != 1)
@@ -169,7 +181,7 @@ module IsoDoc
       end
 
       def deflist_anchor_names1(notes, counter)
-        notes.reject { |n| blank?(n["id"]) }.each do |n|
+        notes.noblank.each do |n|
           @anchors[n["id"]] =
             anchor_struct(increment_label(notes, n, counter), n,
                           @labels["deflist"], "deflist", false)
@@ -197,7 +209,7 @@ module IsoDoc
       end
 
       def bookmark_anchor_names(xml)
-        xml.xpath(ns(".//bookmark")).reject { |n| blank?(n["id"]) }.each do |n|
+        xml.xpath(ns(".//bookmark")).noblank.each do |n|
           parent = nil
           n.ancestors.each do |a|
             next unless a["id"] && parent = @anchors.dig(a["id"], :xref)