isodoc 3.7.6 → 3.7.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53a0846d73af6d9b85e2ab844e73b7f136e7fdff0bed55e952f0538359dee5e8
-  data.tar.gz: d2b73567291b752c28d06228fe58cd1b1bb8dfea3df5acd727d8aa2db63cd541
+  metadata.gz: cdda29c5e2ec54e77bb977a7f736b5cd215e3d54dfccf06213a0cb620bd111a7
+  data.tar.gz: 94ca91d475ff5554300c74d15fcb0a68a08166728103d52e688e931f030f67bc
 SHA512:
-  metadata.gz: 4a0a325e3e20a885a95cdabd6bc53a90b4537be2ec20315173ec8d6f48beb7c9af89f9cea4966db4b20edfd08a22878d704ece90495cd3a8c600b37572d81c38
-  data.tar.gz: ffb5f000b1363a094e4142091eb189bdcbba7d4dc4a3f55374b2b4eb6fecff9686af7898925842246e8c33c485c1716a7bd71b269e92fc31f9979163ef32ccc2
+  metadata.gz: 2a1d38eab37a9aa533e94adc24e75414927376b65d9c0acca578c4009f688c4508abf5c4589f5352605087f45edb5c35af459f2b47868d5729caf4d029a1c754
+  data.tar.gz: 2c19a2c45d35869b011beaa785ea5938c338a6a06acceb66a1b6378bfad2edc9dcf47ca1cf259b601790f584d351cb5058c16fa3b506c991ba6c78efb3d7adcd

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/presentation_function/autonum.rb

@@ -136,6 +136,8 @@ module IsoDoc
     # detect whether string which may contain XML markup is empty
     def empty_xml?(str)
       str.blank? and return true
+      # plain text (no markup, no entity refs): emptiness is just whitespace
+      !str.include?("<") && !str.include?("&") and return str.strip.empty?
       x = Nokogiri::XML::DocumentFragment.parse(str)
       x.to_str.strip.empty?
     end

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.6".freeze
+  VERSION = "3.7.8".freeze
 end

metadata

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