isodoc 2.6.2 → 2.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b66faaa134c306dcb9be32f7a587682d9910f0863d2d252824eb0df319735ee
-  data.tar.gz: 9f8b6559fa659841260b72430137ea8f93614f877a22089617e7976f7c2b61a3
+  metadata.gz: 7006fe8d8b97cf4224ddb1887323ed738c7710641451295fe87caf164e158059
+  data.tar.gz: 63926717876a67586dd1182af72a3c777690b7993f4b10b9b58fd09449a17739
 SHA512:
-  metadata.gz: 93267016a42a2f247bbbc9e6cd20d500fb3845fadcf32337e46cb94b84cea9939c11a3180c90355a5350928cc628cb0a88eaf36720775a7eae59adf74e3a70c9
-  data.tar.gz: deb0709eb785d832c3b3fe2602bd4d3549b2126731c6d44fcc9c752a8d38dab572c3926bed2d27d168bf9e47de65adff8b34699b941185f906742b16138b1d1d
+  metadata.gz: 30c171d99b4ca59293c0679ca8906c46bd21d5deba795a39f731c8705f53f2ec38bbd4f4c4b4578536e440088de8e67b985c75f057453d39bc89e4163b6351e1
+  data.tar.gz: 52a0c50bdd62a0a973905c71984bf19d12c4b9e9734cf804d89aabff958a922fb77ef0d62e98983fb44994afdfdc5c52d1a39628f88c606b970e52576ab8063c

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/function/inline.rb

@@ -7,7 +7,7 @@ module IsoDoc
         url = node["target"]
         node["update-type"] == "true" and url = suffix_url(url)
         out.a **attr_code(href: url, title: node["alt"]) do |l|
-          if node.text.empty?
+          if node.elements.empty? && node.text.strip.empty?
             l << node["target"].sub(/^mailto:/, "")
           else node.children.each { |n| parse(n, l) }
           end
@@ -37,7 +37,7 @@ module IsoDoc
       end
 
       def xref_parse(node, out)
-        target = if /#/.match?(node["target"])
+        target = if node["target"].include?("#")
                    node["target"].sub("#", ".html#")
                  else
                    "##{node['target']}"

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

@@ -77,7 +77,9 @@ module IsoDoc
         img = emf_encode(img)
         img.children.first.previous = emf_to_svg(img)
       elsif img["mimetype"] == "image/svg+xml"
-        src = svg_to_emf(img) and img << "<emf src='#{src}'/>"
+        src = svg_to_emf(img) or return
+        img.add_child("<emf/>")
+        img.elements.last["src"] = src
       end
     end
 
@@ -136,7 +138,6 @@ module IsoDoc
       File.exist?(file) and return Metanorma::Utils::datauri(file)
       file2 = uri + File.extname(file)
       warn "Checking #{file2}"
-      warn `ls #{File.dirname(file2)}`
       File.exist?(file2) and return Metanorma::Utils::datauri(file2)
       raise %(Fail on #{exe} #{option} #{uri} outputting #{file}: status #{err})
     end

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "2.6.2".freeze
+  VERSION = "2.6.4".freeze
 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),

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 2.6.2
+  version: 2.6.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-30 00:00:00.000000000 Z
+date: 2023-09-25 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