isodoc 2.7.4 → 2.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed67e4d2dcf7434348ba3cffd17acb74fe0299e0572e5de475b6239354a1a76d
-  data.tar.gz: fed255fae89b9d5142a1ba7f7b775de2681d1321163ae11a28e735649cdbaa45
+  metadata.gz: 3a4ea94214377595240bcb873426fb3170509fd7e535b2c277fff4dbb6077f95
+  data.tar.gz: 46c9e47211dbbd225871f4ea91a86697c119b0d60a5359b974795c303becca18
 SHA512:
-  metadata.gz: 0f8c5fb1bee726d778940c54b608603f11ba01f48b564198b2a4c56b03d741ea60b8bf2bd7b178f97dcb169760484731dcb7c3984c46ba0662df7dfa772a0315
-  data.tar.gz: 5b981bee3d73b52ff4d1d22ae8ba71b93fcd9512c78fc486de1f2902700dc201a75e8cf459c6229b6e27c78a333a4ec2db6a8155c77728f7ed65c993d040d552
+  metadata.gz: 9862cb11f6f06fb48052a21c5a1289e53677a2d357da003434d66251a28fd4c62cda42696e2d906448f791edd485545bc7a7257764eabeb6125f35ef287dfd15
+  data.tar.gz: db953889f3de823b3bb107d9c694088c81fc68ebf16d8f75cd38d78aef13b5794b0349cff181e8c1f9c3566b16c9b8ffa7da57a8baa02cfb937317658d807c79

data/.gitignore

@@ -0,0 +1 @@
+spec/assets/img.svg

data/Gemfile

@@ -6,7 +6,4 @@ git_source(:github) { |repo| "https://github.com/#{repo}" }
 
 gemspec
 
-if File.exist? "Gemfile.devel"
-  eval File.read("Gemfile.devel"), nil, "Gemfile.devel" # rubocop:disable Security/Eval
-end
-
+eval_gemfile("Gemfile.devel") rescue nil

data/isodoc.gemspec

@@ -31,7 +31,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "html2doc", "~> 1.7.1"
   spec.add_dependency "htmlentities", "~> 4.3.4"
   # spec.add_dependency "isodoc-i18n", "~> 1.1.0" # already in relaton-render and mn-requirements
-  spec.add_dependency "emf2svg"
   spec.add_dependency "liquid", "~> 5"
   #spec.add_dependency "relaton-cli"
   # spec.add_dependency "metanorma-utils", "~> 1.5.0" # already in isodoc-i18n
@@ -44,6 +43,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "thread_safe"
   spec.add_dependency "twitter_cldr", ">= 6.6.0"
   spec.add_dependency "uuidtools"
+  spec.add_dependency "vectory", "~> 0.6"
 
   spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"

data/lib/isodoc/html_function/postprocess.rb

@@ -85,7 +85,7 @@ module IsoDoc
       end
 
       def datauri(img)
-        img["src"] = Metanorma::Utils::datauri(img["src"], @localdir)
+        img["src"] = Vectory::Utils::datauri(img["src"], @localdir)
       end
 
       def image_suffix(img)

data/lib/isodoc/metadata_contributor.rb

@@ -58,8 +58,8 @@ module IsoDoc
     def iso?(org)
       name = org&.at(ns("./name"))&.text
       abbrev = org&.at(ns("./abbreviation"))&.text
-      (abbrev == "ISO" ||
-       name == "International Organization for Standardization")
+      abbrev == "ISO" ||
+        name == "International Organization for Standardization"
     end
 
     def agency1(xml)

data/lib/isodoc/presentation_function/image.rb

@@ -1,5 +1,4 @@
 require "base64"
-require "emf2svg"
 
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
@@ -92,33 +91,56 @@ module IsoDoc
 
     def svg_prep(img)
       img["mimetype"] = "image/svg+xml"
-      %r{^data:image}.match?(img["src"]) or
-        img["src"] = Metanorma::Utils::datauri(img["src"])
+      %r{^data:}.match?(img["src"]) or
+        img["src"] = Vectory::Emf.from_path(img["src"]).to_uri.content
     end
 
     def emf_to_svg(img)
-      emf = Metanorma::Utils::save_dataimage(img.at(ns("./emf/@src")).text)
-      Emf2svg.from_file(emf).sub(/<\?[^>]+>/, "")
+      datauri_src = img.at(ns("./emf/@src")).text
+      Vectory::Emf.from_datauri(datauri_src)
+        .to_svg
+        .content
+        .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")
+      if !node.text.strip.empty? || %r{^data:}.match?(node["src"])
+        return eps_to_svg_from_node(node)
+      end
+
+      target_path = imgfile_suffix(node["src"], "svg")
+      return target_path if File.exist?(target_path)
+
+      eps_to_svg_from_node(node, target_path)
+    end
+
+    def eps_to_svg_from_node(node, target_path = nil)
+      svg = Vectory::Eps.from_node(node).to_svg
+      return svg.write(target_path).path if target_path
+
+      svg.write.path
     end
 
     def svg_to_emf(node)
       @output_formats[:doc] or return
-      uri = svg_to_emf_uri(node)
+
       svg_impose_height_attr(node)
-      ret = imgfile_suffix(uri, "emf")
-      if File.exist?(ret) && File.exist?(node["src"])
-        warn "Exists: #{ret}, Exists: #{node['src']}"
-        return ret
+
+      if node.elements&.first&.name == "svg" || %r{^data:}.match?(node["src"])
+        return svg_to_emf_from_node(node)
       end
-      warn "Converting..."
-      inkscape_convert(uri, ret, '--export-type="emf"')
+
+      target_path = imgfile_suffix(node["src"], "emf")
+      return target_path if File.exist?(target_path)
+
+      svg_to_emf_from_node(node, target_path)
+    end
+
+    def svg_to_emf_from_node(node, target_path = nil)
+      emf = Vectory::Svg.from_node(node).to_emf
+      return emf.write(target_path).to_uri.content if target_path
+
+      emf.to_uri.content
     end
 
     def svg_impose_height_attr(node)
@@ -129,68 +151,8 @@ module IsoDoc
       node["width"] = e["width"]
     end
 
-    def inkscape_convert(uri, file, option)
-      exe = inkscape_installed? or raise "Inkscape missing in PATH, unable" \
-                                         "to convert image #{uri}. Aborting."
-      uri = Metanorma::Utils::external_path uri
-      exe = Metanorma::Utils::external_path exe
-      warn %(#{exe} #{option} #{uri})
-      err = system %(#{exe} #{option} #{uri})
-      File.exist?(file) and return Metanorma::Utils::datauri(file)
-      file2 = uri + File.extname(file)
-      warn "Checking #{file2}"
-      File.exist?(file2) and return Metanorma::Utils::datauri(file2)
-      raise %(Fail on #{exe} #{option} #{uri} outputting #{file}: status #{err})
-    end
-
-    def svg_to_emf_uri(node)
-      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)
-      end
-      uri
-    end
-
-    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 imgfile_suffix(uri, suffix)
       "#{File.join(File.dirname(uri), File.basename(uri, '.*'))}.#{suffix}"
     end
-
-    def inkscape_installed?
-      cmd = "inkscape"
-      exts = ENV["PATHEXT"] ? ENV["PATHEXT"].split(";") : [""]
-      ENV["PATH"].split(File::PATH_SEPARATOR).each do |path|
-        exts.each do |ext|
-          exe = File.join(path, "#{cmd}#{ext}")
-          return exe if File.executable?(exe) && !File.directory?(exe)
-        end
-      end
-      nil
-    end
   end
 end

data/lib/isodoc/presentation_function/refs.rb

@@ -16,7 +16,7 @@ module IsoDoc
       s = docxml.at(ns("//sections")) ||
         docxml.at(ns("//preface"))&.after("<sections/>")&.next_element ||
         docxml.at(ns("//annex | //bibliography"))&.before("<sections/>")
-        &.previous_element or return
+          &.previous_element or return
       docxml.xpath(ns(@xrefs.klass.norm_ref_xpath)).each do |r|
         s << r.remove
       end
@@ -163,7 +163,7 @@ module IsoDoc
     # else, use both ordinal, as prefix, and ids
     def biblio_ref_entry_code(ordinal, ids, _id, _standard, datefn, _bib)
       # standard and id = nil
-      ret = (ids[:ordinal] || ids[:metanorma] || "[#{ordinal}]")
+      ret = ids[:ordinal] || ids[:metanorma] || "[#{ordinal}]"
       if ids[:sdo]
         ret = prefix_bracketed_ref(ret)
         ret += "#{ids[:sdo]}#{datefn}, "

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "2.7.4".freeze
+  VERSION = "2.8.1".freeze
 end

data/lib/isodoc/word_function/postprocess.rb

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

data/lib/isodoc.rb

@@ -10,6 +10,7 @@ require "html2doc"
 require "liquid"
 require "htmlentities"
 require "relaton-render"
+require "vectory"
 
 require "isodoc/common"
 require "isodoc/convert"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 2.7.4
+  version: 2.8.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-12-21 00:00:00.000000000 Z
+date: 2024-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: html2doc
@@ -38,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 4.3.4
-- !ruby/object:Gem::Dependency
-  name: emf2svg
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: liquid
   requirement: !ruby/object:Gem::Requirement
@@ -178,6 +164,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: vectory
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -329,6 +329,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
 - ".hound.yml"
 - ".oss-guides.rubocop.yml"
 - ".rubocop.yml"