metanorma-standoc 3.5.1.pre.alpha.1 → 3.5.1.pre.alpha.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8001a19a529d536d37e1f035e1fcc45585ecfdecaece0e2466b00a684807f71c
-  data.tar.gz: aa1838be7a5e6dfb6675251a4c0871aafb58e427a4bea598a60849e5263b4e22
+  metadata.gz: 79b37a413932b28bdbdaa5564347f846c2a1fdb3722c6201d5f688e80af65d03
+  data.tar.gz: 94adfc8f36c38c305be115769c7e5cfca64a6babda01e83261b6202f07d3cec2
 SHA512:
-  metadata.gz: 48756dd12f0f9ba7f553e0c762b398688d812bf86780a6a860f88c09c32395e7460a3bbc9556e0a0c02b5d9d61a998ff1897c04708b6f545693e6600ceb93be8
-  data.tar.gz: c9bfc8a020ab69a476d91d737acdf13d319b41b8e234b64d23ceb2770ab976cf79dbddd984c3393a395bae69adc54cd2d06797e4b725c023ac1c5bfb4ce5ef78
+  metadata.gz: 1dc0236ec7ce90db11c8b8606299ef21c1c444ea84b9391517bd98f8cb8b5df5482e0b1f35d8ac75623ab2ce44e7ab1b042e1d1f89563a2a4374a31c7b12ce8e
+  data.tar.gz: 1ab82ac3c1f076d09d2ee443a6b5ac26500cb5eb7be9680f2d6a4e7e3dbf6ea77f11c441d543fb690b6740a9ea167cffec8ed3d1c818553bae941c0e2764ec0f

data/lib/metanorma/cleanup/image.rb

@@ -185,18 +185,6 @@ module Metanorma
         node[:selector] = Crass.parse("#{v} {}").first[:selector]
       end
 
-      IRI_TAG_PROPERTIES_MAP = {
-        clipPath: ["clip-path"],
-        "color-profile": nil,
-        cursor: nil,
-        filter: nil,
-        linearGradient: ["fill", "stroke"],
-        marker: ["marker", "marker-end", "marker-mid", "marker-start"],
-        mask: nil,
-        pattern: ["fill", "stroke"],
-        radialGradient: ["fill", "stroke"],
-      }.freeze
-
       SVG_NS = "http://www.w3.org/2000/svg".freeze
 
       def svg_uniqueids(xmldoc)
@@ -204,77 +192,32 @@ module Metanorma
         ids = xmldoc.xpath("//m:svg//*/@id | //svg/@id", "m" => SVG_NS)
           .map(&:text).group_by(&:itself).transform_values(&:count)
           .delete_if { |_, v| v < 2 }
-        xmldoc.xpath("//m:svg", "m" => SVG_NS).each_with_index do |s, i|
-          ids = svg_uniqueids1(s, i, ids)
+        # re-resolve by position each time: replacing an outer SVG detaches
+        # the nodes of any SVG nested inside it
+        xmldoc.xpath("//m:svg", "m" => SVG_NS).size.times do |i|
+          svg = xmldoc.xpath("//m:svg", "m" => SVG_NS)[i]
+          ids = svg_uniqueids1(svg, i, ids)
         end
       end
 
-      def svg_iri_properties(id_elems)
-        iri_tag_names = id_elems.each_with_object([]) do |e, m|
-          IRI_TAG_PROPERTIES_MAP.key?(e.name.to_sym) and m << e.name
-        end.uniq
-        iri_properties = iri_tag_names.each_with_object([]) do |t, m|
-          (IRI_TAG_PROPERTIES_MAP[t.to_sym] || [t]).each { |t1| m = m << t1 }
-        end.uniq
-        iri_properties.empty? and return []
-        iri_properties << "style"
-      end
-
+      # Vectory returns a rewritten copy: reparse it with the caller's XML
+      # library and swap it into the caller's tree.
       def svg_uniqueids1(svg, idx, ids)
-        id_elems = svg.xpath(".//*[@id] | ./@id/..")
-        iri_properties = svg_iri_properties(id_elems)
-        svg_uniqueids2(svg, iri_properties, idx, ids)
-        new_ids = id_elems.map { |x| x["id"] }
-          .map { |x| x + (ids[x] ? "_inject_#{idx}" : "") }
+        rewritten = Vectory::SvgIdDisambiguator
+          .rewrite(svg.to_xml, "_inject_#{idx}", ids)
+          .sub(/\A<\?xml[^>]*\?>\s*/, "")
+        new_svg = svg_replace(svg, rewritten)
+        new_ids = new_svg.xpath(".//*[@id] | ./@id/..").map { |x| x["id"] }
         ids.merge(new_ids.each.to_h { |value| [value, true] })
       end
 
-      def svg_uniqueids2(svg, iri_properties, idx, ids)
-        svg.traverse do |e|
-          e.element? or next
-          if e.name == "style"
-            svg_styleupdate(e, idx, ids)
-          elsif !e.attributes.empty?
-            svg_attrupdate(e, iri_properties, idx, ids)
-          end
-          svg_linkupdate(e, idx, ids)
-          svg_idupdate(e, idx, ids)
-        end
-      end
-
-      def svg_update_url(text, idx, ids)
-        text.gsub(/url\("?#([a-zA-Z][\w:.-]*)"?\)/) do |x|
-          if ids[$1] then "url(##{$1}_inject_#{idx})"
-          else x
-          end
-        end
-      end
-
-      def svg_styleupdate(elem, idx, ids)
-        elem.children = svg_update_url(elem.text, idx, ids)
-      end
-
-      def svg_attrupdate(elem, iri_properties, idx, ids)
-        iri_properties.each do |p|
-          elem[p] or next
-          elem[p] = svg_update_url(elem[p], idx, ids)
+      def svg_replace(svg, xml)
+        if defined?(Moxml) && svg.is_a?(Moxml::Node)
+          Moxml.new(:leptris).parse(xml).root.tap { |n| svg.replace(n) }
+        else
+          svg.replace(xml).first
         end
       end
-
-      def svg_linkupdate(elem, idx, ids)
-        %w(xlink:href href).each do |ref|
-          iri = elem[ref]&.strip
-          /^#/.match?(iri) or next
-          ids[iri.sub(/^#/, "")] or next
-          elem[ref] += "_inject_#{idx}"
-        end
-      end
-
-      def svg_idupdate(elem, idx, ids)
-        elem["id"] or return
-        ids[elem["id"]] or return
-        elem["id"] += "_inject_#{idx}"
-      end
     end
   end
 end

data/lib/metanorma/standoc/version.rb

@@ -19,6 +19,6 @@ module Metanorma
   end
 
   module Standoc
-    VERSION = "3.5.1.pre.alpha.1".freeze
+    VERSION = "3.5.1.pre.alpha.3".freeze
   end
 end

data/metanorma-standoc.gemspec

@@ -34,7 +34,7 @@ Gem::Specification.new do |spec|
   # spec.add_dependency "iev", "~> 0.4"
   spec.add_dependency "isodoc", "~> 3.7.2"
   spec.add_dependency "metanorma-core", "~> 0.2.3"
-  spec.add_dependency "metanorma-document"
+  spec.add_dependency "metanorma-document", ">= 0.5.2.pre.alpha.1"
   spec.add_dependency "metanorma-mirror"
   spec.add_dependency "metanorma-plugin-asciichem", "~> 0.1.0"
   spec.add_dependency "metanorma-plugin-glossarist", "~> 0.5"
@@ -48,11 +48,10 @@ Gem::Specification.new do |spec|
   # svgmap_cleanup reparses vectory's returned document and grafts the
   # content back (the 0.13 SvgMapping contract: vectory processes its own
   # tree and returns the result instead of mutating the caller's document).
-  spec.add_dependency "vectory", "~> 0.13"
-  # Floor names the 3.0.0 prerelease: bundler only considers prereleases
-  # when a requirement names one, and the ecosystem target is relaton 3.0+
+  spec.add_dependency "vectory", "~> 0.13", ">= 0.13.2"
+  # Stable relaton-cli 3.0.0 is out; the ecosystem target is relaton 3.0+
   # (glossarist 2.14+ requires relaton ~> 3.0.0.pre.alpha).
-  spec.add_dependency "relaton-cli", ">= 3.0.0.pre.alpha", "< 3.1.0"
+  spec.add_dependency "relaton-cli", ">= 3.0.0", "< 3.1.0"
   spec.add_dependency "relaton-iev", "~> 2.0"
   spec.add_dependency "svg_conform", "~> 0.2"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 3.5.1.pre.alpha.1
+  version: 3.5.1.pre.alpha.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-10-22 00:00:00.000000000 Z
+date: 2026-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.2.pre.alpha.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.2.pre.alpha.1
 - !ruby/object:Gem::Dependency
   name: metanorma-mirror
   requirement: !ruby/object:Gem::Requirement
@@ -241,6 +241,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.13'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.13.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -248,13 +251,16 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.13'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.13.2
 - !ruby/object:Gem::Dependency
   name: relaton-cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0.pre.alpha
+        version: 3.0.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 3.1.0
@@ -264,7 +270,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0.pre.alpha
+        version: 3.0.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 3.1.0