kramdown-rfc2629 1.6.33 → 1.6.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4c663bed0e8e2dc848a9e532ba201b9e9a26b4090368c0d83f8c518275df710
-  data.tar.gz: a2ac5d0be0615b41ecd65964ca7dfd61e3163fbb3aa612994fa5ac05ae1504ca
+  metadata.gz: e499db8e2b4bd1536065dc5813e013ec9169439a8348925a2def7e315af7f3a6
+  data.tar.gz: 9e96e353bb8beb68cb30f0bda6743c1b03e35feaa50de6832a36347e89d767a4
 SHA512:
-  metadata.gz: 90ef1269825ef2b9484fc358cf92fa7ffa1ce255ea6e0b520cf99e98ed9f463551bf060d9af84de1ef87f0bd2e8a12442c4b9dc866858e1ed18bf23d4084829a
-  data.tar.gz: 840c014bc4efcabb1491e81126f577541bb237b0fa92a06fdaa293556eed480997829a357728da96caadc480347d32ddfb3be76a8e7027c986c775adff9babc7
+  metadata.gz: f6a1eb287475812891c52bdf6706bfcbbc4e5f14d1a73db20a0c1a8e47fda2b490d8d9b64a2f39e77afddaf663df714e2d27883fcfe7cb2cc4fafa79b206c568
+  data.tar.gz: 1c7cd9dffed2f30da77216b019aa4145c708666b1733f2b7c93635b81bb1b59ae9a036c406c0091bb6ba2eabeaa920869596c6f7966556204b142f5688f3f8a5

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

@@ -2,6 +2,7 @@
 # -*- coding: utf-8 -*-
 
 require 'rexml/document'
+require 'kramdown-rfc/rexml-formatters-conservative'
 require 'kramdown-rfc/svg-id-cleanup'
 
 def svg_clean_ids(s)
@@ -10,7 +11,10 @@ def svg_clean_ids(s)
 
   svg_id_cleanup(d)
 
-  d.to_s
+  tr = REXML::Formatters::Conservative.new
+  o = ''
+  tr.write(d, o)
+  o
 rescue => detail
   warn "*** Can't clean SVG: #{detail}"
   d.to_s

data/kramdown-rfc2629.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s|
   s.name = 'kramdown-rfc2629'
-  s.version = '1.6.33'
+  s.version = '1.6.35'
   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/rexml-formatters-conservative.rb

@@ -0,0 +1,38 @@
+require 'rexml/document'
+
+module REXML
+  module Formatters
+    # The Conservative formatter writes an XML document that parses to an
+    # identical document as the source document.  This means that no extra
+    # whitespace nodes are inserted, and whitespace within text nodes is
+    # preserved.  Attributes are not sorted.
+    class Conservative < Default
+      def initialize
+        @indentation = 0
+        @level = 0
+        @ie_hack = false
+      end
+
+      protected
+      def write_element( node, output )
+        output << "<#{node.expanded_name}"
+
+        node.attributes.each_attribute do |attr|
+          output << " "
+          attr.write( output )
+        end unless node.attributes.empty?
+
+        if node.children.empty?
+          output << "/"
+        else
+          output << ">"
+          node.children.each { |child|
+            write( child, output )
+          }
+          output << "</#{node.expanded_name}"
+        end
+        output << ">"
+      end
+    end
+  end
+end

data/lib/kramdown-rfc2629.rb

@@ -1183,7 +1183,8 @@ COLORS
       XML_RESOURCE_ORG_MAP = {
         "RFC" => ["bibxml", 86400*7, false,
                   ->(fn, n){ [name = "reference.RFC.#{"%04d" % n.to_i}.xml",
-                              "https://www.rfc-editor.org/refs/bibxml/#{name}"] }
+                              "https://bib.ietf.org/public/rfc/bibxml/#{name}"] }
+# was                         "https://www.rfc-editor.org/refs/bibxml/#{name}"] }
                  ],
         "I-D" => ["bibxml3", false, false,
                   ->(fn, n){ [fn,
@@ -1265,6 +1266,7 @@ COLORS
               d = REXML::Document.new(to_insert)
               d.xml_decl.nowrite
               d.delete d.doctype
+              d.context[:attribute_quote] = :quote  # Set double-quote as the attribute value delimiter
               d.root.attributes["anchor"] = anchor
               if t == "RFC" or t == "I-D"
                 if KRAMDOWN_NO_TARGETS || !KRAMDOWN_KEEP_TARGETS

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kramdown-rfc2629
 version: !ruby/object:Gem::Version
-  version: 1.6.33
+  version: 1.6.35
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-30 00:00:00.000000000 Z
+date: 2023-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown
@@ -182,6 +182,7 @@ files:
 - lib/kramdown-rfc/kdrfc-processor.rb
 - lib/kramdown-rfc/parameterset.rb
 - lib/kramdown-rfc/refxml.rb
+- lib/kramdown-rfc/rexml-formatters-conservative.rb
 - lib/kramdown-rfc/rfc8792.rb
 - lib/kramdown-rfc/svg-id-cleanup.rb
 - lib/kramdown-rfc2629.rb