kramdown-rfc2629 1.6.42 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd4b84a97e79385787341f72d184839730c05ab3e33021823c9d83c87faef47e
-  data.tar.gz: 8df16059c4ffaeb27578151471aaac730f8cfa4c549dbaf922a3c590265743f7
+  metadata.gz: bd5a2c0f3273c06c40f191cba73edff87064b7b07ff90eb28dbf50ff5128f476
+  data.tar.gz: 9a0a8949db295d24fc6cb7374b6438d3113e9ee84f465d3de4918d18ef1fac52
 SHA512:
-  metadata.gz: 6222277e78f07ee3fc05c40cd7d1b0e5ec197f600e49e395e33fc5b3975865a6c3fbcaf310934d3b3e6ddcbc260e69ce878b8f3fbcb99b9824204b1c4759ed1f
-  data.tar.gz: ee98f5323fbf5c590b983d1faa181fd6ce459d5e40ecdfa7868773aa739f6332be0c32e2c336576364703c06d2ed0df884d9429385d0fc7d626275f8c8a558a7
+  metadata.gz: 735f79f81ac9cb0e19fd06362a79dffe6b5e73e06d658c11b0e62439c8c9b66b40f19252c756a3d5fc592b709d70342ed5ec4c290260d7fd0b9ce080e76c2e67
+  data.tar.gz: bf6e459bd077b13b87baee248e4a76f0287833fcbb49d00f009ce5871cc1133742a67c5bf8f1c3d9cdaf27387235e6e464c4043afb863436726f2a49d71a529b

data/bin/kramdown-rfc-extract-sourcecode

@@ -8,7 +8,8 @@ require_relative '../lib/kramdown-rfc/rexml-all-text.rb'
 
 def clean(s)
   s.gsub!(/\//, ":")
-  s.gsub!(/[^:\w]/, "_")        # handles leading dot, too --   s.gsub!(/\A([.]+)/) {"_" * $1.size } otherwise
+  s.gsub!(/\A([-.]+)/) {"_" * $1.size }
+  s.gsub!(/[^-.:\w]/, "_")
   s
 end
 
@@ -53,7 +54,10 @@ REXML::XPath.each(d.root, "//sourcecode|//artwork") do |x|
   if ty = x[:type]
     ty = clean(ty)
     name = x[:name]
-    name = gensym.succ! if !name || name.empty?
+    if !name || name.empty?
+      name = gensym.succ!.dup
+      name = "#{name}.#{ty}" unless ty.empty?
+    end
     name = clean(name)
     if taken[ty][name]
       unless warned[ty][name]

data/kramdown-rfc2629.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s|
   s.name = 'kramdown-rfc2629'
-  s.version = '1.6.42'
+  s.version = '1.7.1'
   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-rfc2629.rb

@@ -42,8 +42,8 @@ module Kramdown
           sorted_abbrevs = @root.options[:abbrev_defs].keys.sort {|a, b| b.length <=> a.length }
           regexps = [Regexp.union(*sorted_abbrevs.map {|k|
                                     /#{Regexp.escape(k).gsub(/\\\s/, "[\\s\\p{Z}]+").force_encoding(Encoding::UTF_8)}/})]
-          # warn regexps.inspect
           regexps << /(?=(?:\W|^)#{regexps.first}(?!\w))/ # regexp should only match on word boundaries
+          # warn regexps.inspect
         end
         super(el, regexps)
       end
@@ -1498,7 +1498,9 @@ COLORS
 
         hacked_value = value
 
+        nobr = false
         if title && title =~ /\A<nobr>(\z|\s)/
+          nobr = true
           _nobr, title = title.split(' ', 2)
           hacked_value = nobr_hack(value)
           if title.nil? || title.empty?
@@ -1518,11 +1520,19 @@ COLORS
         end
 
         if item = title
-          m = title.scan(Parser::RFC2629Kramdown::IREF_START)
-          if m.empty?
+          pairs = title.split(Parser::RFC2629Kramdown::IREF_START).each_slice(2).to_a
+          replacement = pairs.map {|x,| s = x.strip; s unless s.empty?}.compact.join(" ")
+          irefs = pairs.map {|_,x| x && [x]}.compact
+          warn "@@@ ABBREV MISMATCH #{irefs}" if title.scan(Parser::RFC2629Kramdown::IREF_START) != irefs
+          if irefs.empty?
             subitem = value
           else
-            iref = m.map{|a,| iref_attr(a)}.join('')
+            iref = irefs.map{|a,| iref_attr(a)}.join('')
+          end
+          unless replacement.empty?
+            replacement = nobr_hack(replacement) if nobr # XXX this can break XML
+            replacement = ::Kramdown::Converter::Rfc2629::process_markdown(replacement)
+            hacked_value = replacement
           end
         else
           item = value

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kramdown-rfc2629
 version: !ruby/object:Gem::Version
-  version: 1.6.42
+  version: 1.7.1
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-22 00:00:00.000000000 Z
+date: 2023-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown