isodoc 3.7.5 → 3.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3db7bc4dbab1aaeab3373f84609b81b92a4d276dc8e9339fe075e84d2eb06a37
-  data.tar.gz: 6f3969990c9d8d7c753aea2c1ae11dce4818c4c43cbbe48344a1f9a1cd2d4ffc
+  metadata.gz: f5e6a59ece60d88c1ec940f5a34612fd4290dcdfb9737528713152c2eb7dbe20
+  data.tar.gz: a59beb605f4e93e76be88d82567d96b3c34534479805db7c07b3b3b228a29766
 SHA512:
-  metadata.gz: c83673de018c7334755ab2fbc3b5742112a0e9ae4abf7b841409808188a1d53da4dbafda27d63e4cddb1c4db4fddb52e8e9e61d6f3bd8014ad382970176ef43f
-  data.tar.gz: dcd80a4fcc89a25dff29638d4367bd3666d9820baa691f0107feeec8d6ec93c680ca744666667825d8de4f76cdcdb67e2e1466ea1b7e1408923f7062a4c9cd55
+  metadata.gz: 858f4a2255c6a3a0fb7150dd6e4c13e81cfc49369e454e89c2bf7b2327d5b61bf1ac8b1075938c4a8b5d00310c4a525d4100287690e9816c3486a7ace5e307e9
+  data.tar.gz: 7f900ddbf4c9f128141550d1172e5805f974a91b649a11613b7cc4a52ddf5839a91df107d34d3eea459dadc6720c8f763f8c974c7d4b488dda8a18f1bea81a9e

data/Gemfile

@@ -5,9 +5,8 @@ source "https://rubygems.org"
 git_source(:github) { |repo| "https://github.com/#{repo}" }
 
 gem "benchmark"
-gem "canon"
+gem "canon", "~> 0.3"
 gem "debug"
-gem "equivalent-xml", "~> 0.6"
 gem "guard", "~> 2.14"
 gem "guard-rspec", "~> 4.7"
 gem "rake"

data/lib/isodoc/function/footnotes.rb

@@ -12,7 +12,7 @@ module IsoDoc
       def get_table_ancestor_id(node)
         table = node.ancestors("table")
         table.empty? and table = node.ancestors("figure")
-        table.empty? and return [nil, UUIDTools::UUID.random_create.to_s]
+        table.empty? and return [nil, Metanorma::Utils.random_uuid]
         [table.last, table.last["id"]]
       end
 
@@ -20,7 +20,7 @@ module IsoDoc
       # do not output footnote text if we have already seen it for this table
 
       def table_footnote_parse(node, out)
-        fn = node["reference"] || UUIDTools::UUID.random_create.to_s
+        fn = node["reference"] || Metanorma::Utils.random_uuid
         table, tid = get_table_ancestor_id(node)
         make_table_footnote_link(out, tid + fn, node.at(ns("./fmt-fn-label")))
         # do not output footnote text if we have already seen it for this table
@@ -49,7 +49,7 @@ module IsoDoc
 
       def footnote_parse(node, out)
         table_footnote?(node) and return table_footnote_parse(node, out)
-        fn = node["target"] # || UUIDTools::UUID.random_create.to_s
+        fn = node["target"] # || Metanorma::Utils.random_uuid
         attrs = { class: "FootnoteRef", href: "#fn:#{fn}" }
         f = node.at(ns("./fmt-fn-label"))
         out.a(**attrs) do |a|

data/lib/isodoc/html_function/postprocess.rb

@@ -118,7 +118,7 @@ module IsoDoc
 
       def move_image1(img)
         suffix = image_suffix(img)
-        uuid = UUIDTools::UUID.random_create.to_s
+        uuid = Metanorma::Utils.random_uuid
         fname = "#{uuid}.#{suffix}"
         new_full_filename = File.join(tmpimagedir, fname)
         local_filename = image_localfile(img)
@@ -131,7 +131,7 @@ module IsoDoc
           docxml.xpath("//p[@class = 'TermNum'][../#{h}]").each do |p|
             p.name = "h#{h[1].to_i + 1}"
             id = p["id"]
-            p["id"] = "_#{UUIDTools::UUID.random_create}"
+            p["id"] = "_#{Metanorma::Utils.random_uuid}"
             p.wrap("<div id='#{id}'></div>")
           end
         end

data/lib/isodoc/html_function/postprocess_cover.rb

@@ -154,7 +154,7 @@ module IsoDoc
       def html_toc_entries_prep(docxml, path)
         docxml.xpath(path.join(" | "))
           .each_with_index.with_object({}) do |(h, i), m|
-            h["id"] ||= "_#{UUIDTools::UUID.random_create}"
+            h["id"] ||= "_#{Metanorma::Utils.random_uuid}"
             m[h["id"]] = i
           end
       end

data/lib/isodoc/presentation_function/autonum.rb

@@ -31,7 +31,7 @@ module IsoDoc
     end
 
     def prefix_name_labels(node)
-      id = "_#{UUIDTools::UUID.random_create}"
+      id = "_#{Metanorma::Utils.random_uuid}"
       @new_ids[id] = nil
       { elem: node["id"], name: id }
     end

data/lib/isodoc/presentation_function/ids.rb

@@ -1,14 +1,14 @@
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
     def add_id_text
-      id = "_#{UUIDTools::UUID.random_create}"
+      id = "_#{Metanorma::Utils.random_uuid}"
       @new_ids[id] = nil
       %(id="#{id}")
     end
 
     def add_id(elem)
       elem["id"] and return
-      id = "_#{UUIDTools::UUID.random_create}"
+      id = "_#{Metanorma::Utils.random_uuid}"
       elem["id"] = id
       @new_ids[id] = nil
     end

data/lib/isodoc/presentation_function/refs.rb

@@ -195,7 +195,7 @@ module IsoDoc
       ret = ident_fn(bib)
       date_note = bibnote_extract(bib, "Unpublished-Status")
       date_note.empty? and return ret
-      id = "_#{UUIDTools::UUID.random_create}"
+      id = "_#{Metanorma::Utils.random_uuid}"
       @new_ids[id] = nil
       <<~XML
         #{ret}<fn id='#{id}' reference='#{id}'><p>#{date_note.first.content}</p></fn>

data/lib/isodoc/presentation_function/terms.rb

@@ -3,6 +3,23 @@ module IsoDoc
     DESIGNATION_ELEMS =
       %w(preferred admitted deprecates related definition source).freeze
 
+    # Union XPaths: one evaluation per term replaces the original six
+    # nested xpath/at pairs (O(terms × designation-elems) XPathContext
+    # setups). The removal set (fmt-name/fmt-xref-label under designation
+    # elements) and the removal targets (empty fmt-* containers) are
+    # disjoint node sets, so evaluating removal after collection preserves
+    # the original interleaved order's outcome.
+    TERMCLEANUP_REMOVE_XPATH =
+      DESIGNATION_ELEMS.flat_map do |w|
+        %w(fmt-name fmt-xref-label).map { |n| "./#{w}//#{n}" }
+      end.join(" | ").freeze
+
+    TERMCLEANUP_TARGET_XPATH =
+      DESIGNATION_ELEMS.map do |w|
+        n = w == "source" ? "fmt-termsource" : "fmt-#{w}"
+        ".//#{n}"
+      end.join(" | ").freeze
+
     def target_desgn_elem(name)
       target = "fmt-#{name}"
       name == "source" and target = "fmt-termsource"
@@ -20,11 +37,9 @@ module IsoDoc
 
     def termcleanup(docxml)
       docxml.xpath(ns("//term")).each do |t|
-        DESIGNATION_ELEMS.each do |w|
-          target = target_desgn_elem(w)
-          t.xpath(ns("./#{w}//fmt-name | ./#{w}//fmt-xref-label")).each(&:remove)
-          f = t.at(ns(".//#{target}"))
-          f&.children&.empty? and f.remove
+        t.xpath(ns(TERMCLEANUP_REMOVE_XPATH)).each(&:remove)
+        t.xpath(ns(TERMCLEANUP_TARGET_XPATH)).each do |f|
+          f.children.empty? and f.remove
         end
       end
     end

data/lib/isodoc/spec_helpers/canon_html_input_guard.rb

@@ -111,6 +111,10 @@ module IsoDoc
 
       def wrap_xml_fragment(value)
         return value unless value.is_a?(String)
+        # XML declarations are legal only at document start; a fragment
+        # carrying one (e.g. `<root/><?xml?>`) blows up the strict wrap
+        # parse. A declaration carries no comparison semantics.
+        value = value.gsub(/<\?xml[^>]*\?>\s*/, "")
         return value if already_wrapped?(value)
 
         wrapped = "<#{XML_FRAG_ROOT}>#{value}</#{XML_FRAG_ROOT}>"

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "3.7.5".freeze
+  VERSION = "3.7.7".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 3.7.5
+  version: 3.7.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-10-30 00:00:00.000000000 Z
+date: 2026-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64