isodoc 2.6.1 → 2.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b149d913a483c336d7463e587e980fe234f4d1e32d8d683a070d919b0ce7429
-  data.tar.gz: 46e568e2b91f13069f62131ab1b86e28fd74416c55ae0937935575927a578430
+  metadata.gz: 7d77a199eaa1452ad1dd61e4db65e4a4eec3d7856942033c2e6f31019db08708
+  data.tar.gz: 5f2bf413d05d58707097e3bb605c0b778088554c7238f5588102afbd6d07985a
 SHA512:
-  metadata.gz: ae43a3f990e70f7d1929357172ca48b4cbc5db2750e61d1f91768c8087e796f5e333de64b60fc928434862e1fb874151c6a00a0cd41e25d491fe79e8604dfa9d
-  data.tar.gz: 9abab47db0d610e3971c1f9a19af240449dc11d6cd1d8d0f9e1e860f4b00e4a6947cce60d8483ba8701a180472278badaee6d431a07bd32ba1727ea5ad4d9a16
+  metadata.gz: c7dc8fe34c7df07195377ff5c42e85b1597d5eb55e1c45951652f20521b16bf534f326c8e68a2058e4fa60b6b2f7bacbd5182da5488bca9ede76a4a9bfbb8c22
+  data.tar.gz: e2834d76979c5ceffe4a10b2a8471f2178b0d850e8d4b8fab3b321fed52d4902cb10624a3b4e72c164a70b1520cda41ba27f241fae1f367404b192059eaf70da

data/isodoc.gemspec

@@ -28,12 +28,11 @@ Gem::Specification.new do |spec|
   end
   spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
-  spec.add_dependency "html2doc", "~> 1.6.0"
+  spec.add_dependency "html2doc", "~> 1.7.0"
   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 "plurimath"
   spec.add_dependency "relaton-cli"
   # spec.add_dependency "metanorma-utils", "~> 1.5.0" # already in isodoc-i18n
   spec.add_dependency "mn2pdf"

data/lib/isodoc/convert.rb

@@ -10,7 +10,7 @@ require "mn-requirements"
 module IsoDoc
   class Convert < ::IsoDoc::Common
     attr_accessor :options, :i18n, :meta, :xrefs, :reqt_models,
-                  :requirements_processor
+                  :requirements_processor, :doctype
 
     # htmlstylesheet: Generic stylesheet for HTML
     # htmlstylesheet_override: Override stylesheet for HTML

data/lib/isodoc/css.rb

@@ -101,6 +101,7 @@ module IsoDoc
         stylesheet = convert_scss(filename, stylesheet, stripwordcss)
       end
       Tempfile.open([File.basename(filename, ".*"), "css"],
+                    mode: File::BINARY | File::SHARE_DELETE,
                     encoding: "utf-8") do |f|
         f.write(stylesheet)
         f

data/lib/isodoc/function/utils.rb

@@ -177,7 +177,8 @@ module IsoDoc
         imgtype = imgtype.sub(/\+[a-z0-9]+$/, "") # svg+xml
         imgtype = "png" unless /^[a-z0-9]+$/.match? imgtype
         imgtype == "postscript" and imgtype = "eps"
-        Tempfile.open(["image", ".#{imgtype}"]) do |f|
+        Tempfile.open(["image", ".#{imgtype}"],
+                      mode: File::BINARY | File::SHARE_DELETE) do |f|
           f.binmode
           f.write(Base64.strict_decode64(imgdata))
           @tempfile_cache << f # persist to the end
@@ -186,7 +187,8 @@ module IsoDoc
       end
 
       def save_svg(img)
-        Tempfile.open(["image", ".svg"]) do |f|
+        Tempfile.open(["image", ".svg"],
+                      mode: File::BINARY | File::SHARE_DELETE) do |f|
           f.write(img.to_xml)
           @tempfile_cache << f # persist to the end
           f.path

data/lib/isodoc/init.rb

@@ -19,6 +19,8 @@ module IsoDoc
     end
 
     def toc_init(docxml)
+      @doctype = docxml.at(ns("//bibdata/ext/doctype"))&.text
+      @xrefs.klass.doctype = @doctype
       x = "//metanorma-extension/presentation-metadata" \
           "[name[text() = 'TOC Heading Levels']]/value"
       n = docxml.at(ns(x.sub("TOC", "DOC TOC"))) and

data/lib/isodoc/presentation_function/image.rb

@@ -154,7 +154,6 @@ module IsoDoc
     def cache_dataimage(uri)
       if %r{^data:}.match?(uri)
         uri = save_dataimage(uri)
-        @tempfile_cache << uri
       end
       uri
     end

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "2.6.1".freeze
+  VERSION = "2.6.3".freeze
 end

data/lib/isodoc/word_function/postprocess_cover.rb

@@ -95,7 +95,9 @@ module IsoDoc
           .merge(@meta.labels ? { labels: @meta.labels } : {})
         meta[:filename] = filename
         params = meta.transform_keys(&:to_s)
-        Tempfile.open(%w(header html), encoding: "utf-8") do |f|
+        Tempfile.open(%w(header html),
+                      mode: File::BINARY | File::SHARE_DELETE,
+                      encoding: "utf-8") do |f|
           f.write(template.render(params))
           f
         end

data/lib/isodoc/word_function/postprocess_toc.rb

@@ -9,7 +9,7 @@ module IsoDoc
               s&.previous_element&.remove # page break
             s.remove
           end
-          intro.sub(/WORDTOC/, toc)
+          intro.sub("WORDTOC", toc)
         else
           source = docxml.at("//div[@class = 'TOC']") and
             source.children = toc

data/lib/isodoc/xref.rb

@@ -58,6 +58,7 @@ module IsoDoc
 
     # extract names for all anchors, xref and label
     def parse(docxml)
+      @doctype = docxml.at(ns("//bibdata/ext/doctype"))&.text
       @seen = SeenAnchor.new(docxml)
       amend_preprocess(docxml) if @parse_settings.empty?
       initial_anchor_names(docxml)

data/lib/isodoc/xslfo_convert.rb

@@ -57,6 +57,7 @@ module IsoDoc
       file = File.read(input_fname, encoding: "utf-8") if file.nil?
       input_file, docxml, filename =
         input_xml_path(input_fname, file, debug)
+      @doctype = Nokogiri::XML(file).at(ns("//bibdata/ext/doctype"))&.text
       ::Metanorma::Output::XslfoPdf.new.convert(
         filename,
         output_fname || output_filename(input_fname),
@@ -78,6 +79,7 @@ module IsoDoc
     def input_xml_path(input_filename, xml_file, debug)
       docxml, filename, dir = convert_init(xml_file, input_filename, debug)
       input_filename = Tempfile.open([File.basename(filename), ".xml"],
+                                     mode: File::BINARY | File::SHARE_DELETE,
                                      encoding: "utf-8") do |f|
         f.write docxml
         f

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 2.6.1
+  version: 2.6.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-28 00:00:00.000000000 Z
+date: 2023-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: html2doc
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement
@@ -66,20 +66,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5'
-- !ruby/object:Gem::Dependency
-  name: plurimath
-  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: relaton-cli
   requirement: !ruby/object:Gem::Requirement