kramdown-rfc2629 1.6.28 → 1.6.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 172e0d4fcfbb65449f29ffa7ca743ecf090a031638feaa355d8d5f7df10eca28
-  data.tar.gz: 335e0852a920a3e9f3a8b5319a0328bcb49216a2bc6ba9dd1ce8c5e515759587
+  metadata.gz: 062a31f4914296fa8729f4256c83c79420950605b944076b923b836f6a982ced
+  data.tar.gz: d9a463cf4cbcc663bbd639b29c1641df308716d92b50b1add469bdc056937fad
 SHA512:
-  metadata.gz: 446b0fb243297a7eff9231b43615ee06b389f9a7ab571f5699cf2527e4d062ed116caf5e9924c3a4fa842e2bfae82d47c2e9be68886c9be7005fbc23944cf326
-  data.tar.gz: 14679cac5457fa6238a408e0547e27ce84d611af5d503db23aed52c76df1ef574f873cd13b467393e5e57111460c283f216c8b00c248c458b4b606e9d7455631
+  metadata.gz: 3cecb965efec5d1d40e0da6dee5a8389d45cc65f78a835cf756d979e9e836200b2ab80cd6fbd7686cd30bcd2cbf1beb08993a2615df049376705c8170e44dfc9
+  data.tar.gz: '056960710e1102ea0724d57774073c882411db9392f7c256c4ee5fe1c1e7118fa67a6518eeec87e4e456f92184e289c42479270144dcfdffda6b17d956902925'

data/bin/kramdown-rfc-clean-svg-ids

@@ -2,47 +2,18 @@
 # -*- coding: utf-8 -*-
 
 require 'rexml/document'
-
-SVG_NAMESPACES = {"svg"=>"http://www.w3.org/2000/svg",
-                  "xlink"=>"http://www.w3.org/1999/xlink"}
+require 'kramdown-rfc/svg-id-cleanup'
 
 def svg_clean_ids(s)
   d = REXML::Document.new(s)
-  d.context[:attribute_quote] = :quote  # <-- Set double-quote as the attribute value delimiter
-  gensym = "gensym000"
-  REXML::XPath.each(d.root, "//svg:svg", SVG_NAMESPACES) do |x|
-    gensym = gensym.succ
-    # warn "*** SVG"
-    # warn "*** SVG: #{x.to_s.size}"
-    found_as_id = Set[]
-    found_as_href = Set[]
-    REXML::XPath.each(x, ".//*[@id]", SVG_NAMESPACES) do |y|
-      # warn "*** ID: #{y}"
-      name = y.attributes["id"]
-      if found_as_id === name
-        warn "*** duplicate ID #{name}"
-      end
-      found_as_id.add(name)
-      y.attributes["id"] = "#{name}-#{gensym}"
-    end
-    REXML::XPath.each(x, ".//*[@xlink:href]", SVG_NAMESPACES) do |y|
-      # warn "*** HREF: #{y}"
-      name = y.attributes["href"]
-      name1 = name[1..-1]
-      if !found_as_id === name1
-        warn "*** unknown HREF #{name}"
-      end
-      found_as_href.add(name1)
-      y.attributes["xlink:href"] = "#{name}-#{gensym}"
-    end
-    found_as_id -= found_as_href
-    warn "*** warning: unused ID: #{found_as_id}" unless found_as_id.empty?
-  end
+  d.context[:attribute_quote] = :quote  # Set double-quote as the attribute value delimiter
+
+  svg_id_cleanup(d)
+
   d.to_s
 rescue => detail
   warn "*** Can't clean SVG: #{detail}"
-  d
+  d.to_s
 end
 
-c = svg_clean_ids(ARGF.read)
-puts c.to_s
+puts svg_clean_ids(ARGF.read)

data/kramdown-rfc2629.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s|
   s.name = 'kramdown-rfc2629'
-  s.version = '1.6.28'
+  s.version = '1.6.29'
   s.summary = "Kramdown extension for generating RFCXML (RFC 799x)."
   s.description = %{An RFCXML (RFC 799x) generating backend for Thomas Leitner's
 "kramdown" markdown parser.  Mostly useful for RFC writers.}

data/lib/kramdown-rfc/command.rb

@@ -262,6 +262,9 @@ def xml_from_sections(input)
   if o = ps[:'autolink-iref-cleanup']
     $options.autolink_iref_cleanup = o
   end
+  if o = ps[:'svg-id-cleanup']
+    $options.svg_id_cleanup = o
+  end
 
   coding_override = ps.has(:coding)
   smart_quotes = ps[:smart_quotes]
@@ -579,12 +582,23 @@ if $options.v3_used && !$options.v3
   $options.v3 = true
 end
 
-if $options.autolink_iref_cleanup
+# only reparse output document if cleanup actions required
+if $options.autolink_iref_cleanup || $options.svg_id_cleanup
   require 'rexml/document'
-  require 'kramdown-rfc/autolink-iref-cleanup'
 
   d = REXML::Document.new(output)
-  autolink_iref_cleanup(d)
+  d.context[:attribute_quote] = :quote  # Set double-quote as the attribute value delimiter
+
+  if $options.autolink_iref_cleanup
+    require 'kramdown-rfc/autolink-iref-cleanup'
+    autolink_iref_cleanup(d)
+  end
+
+  if $options.svg_id_cleanup
+    require 'kramdown-rfc/svg-id-cleanup'
+    svg_id_cleanup(d)
+  end
+
   output = d.to_s
 end
 

data/lib/kramdown-rfc/svg-id-cleanup.rb

@@ -0,0 +1,39 @@
+require 'rexml/document'
+
+SVG_NAMESPACES = {"svg"=>"http://www.w3.org/2000/svg",
+                  "xlink"=>"http://www.w3.org/1999/xlink"}
+
+def svg_id_cleanup(d)
+  gensym = "gensym000"
+
+  REXML::XPath.each(d.root, "//svg:svg", SVG_NAMESPACES) do |x|
+    gensym = gensym.succ
+    # warn "*** SVG"
+    # warn "*** SVG: #{x.to_s.size}"
+    found_as_id = Set[]
+    found_as_href = Set[]
+    REXML::XPath.each(x, ".//*[@id]", SVG_NAMESPACES) do |y|
+      # warn "*** ID: #{y}"
+      name = y.attributes["id"]
+      if found_as_id === name
+        warn "*** duplicate ID #{name}"
+      end
+      found_as_id.add(name)
+      y.attributes["id"] = "#{name}-#{gensym}"
+    end
+    REXML::XPath.each(x, ".//*[@xlink:href]", SVG_NAMESPACES) do |y|
+      # warn "*** HREF: #{y}"
+      name = y.attributes["href"]
+      name1 = name[1..-1]
+      if !found_as_id === name1
+        warn "*** unknown HREF #{name}"
+      end
+      found_as_href.add(name1)
+      y.attributes["xlink:href"] = "#{name}-#{gensym}"
+    end
+    found_as_id -= found_as_href
+    warn "*** warning: unused ID: #{found_as_id.to_a.join(", ")}" unless found_as_id.empty?
+  end
+rescue => detail
+  warn "*** Can't clean SVG: #{detail}"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kramdown-rfc2629
 version: !ruby/object:Gem::Version
-  version: 1.6.28
+  version: 1.6.29
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-07 00:00:00.000000000 Z
+date: 2023-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown
@@ -181,6 +181,7 @@ files:
 - lib/kramdown-rfc/parameterset.rb
 - lib/kramdown-rfc/refxml.rb
 - lib/kramdown-rfc/rfc8792.rb
+- lib/kramdown-rfc/svg-id-cleanup.rb
 - lib/kramdown-rfc2629.rb
 homepage: http://github.com/cabo/kramdown-rfc
 licenses: