kramdown-rfc2629 1.7.1 → 1.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd5a2c0f3273c06c40f191cba73edff87064b7b07ff90eb28dbf50ff5128f476
-  data.tar.gz: 9a0a8949db295d24fc6cb7374b6438d3113e9ee84f465d3de4918d18ef1fac52
+  metadata.gz: cb7b62deaf23ec115b6b5b470e27bc099169d24ec1b09cd78e39a53f710d0319
+  data.tar.gz: 28ceab4f96a1c33dee2ab4c53ae4423069bb5f9d6f61e55a69ec8a1991b8109e
 SHA512:
-  metadata.gz: 735f79f81ac9cb0e19fd06362a79dffe6b5e73e06d658c11b0e62439c8c9b66b40f19252c756a3d5fc592b709d70342ed5ec4c290260d7fd0b9ce080e76c2e67
-  data.tar.gz: bf6e459bd077b13b87baee248e4a76f0287833fcbb49d00f009ce5871cc1133742a67c5bf8f1c3d9cdaf27387235e6e464c4043afb863436726f2a49d71a529b
+  metadata.gz: 5e95b5dcecb044404550dc3f481581d7cd044e4738b805cd8156c217910cf22a5e69f50b0c5bfc907d2f10c58c568d8eb8856924e4a0ca84429861a1ea0429ef
+  data.tar.gz: e0298c6433e0063aad63e04336f4f4f722ff878d053a565efc2502b3de35a286388952c68ca72805b32f1322b9f71c541fae8f0a80ce22a5532817ac1327f816

data/README.md

@@ -150,7 +150,7 @@ or
         email: pthubert@cisco.com
 
 (the hash keys are the XML GIs from RFC 7749, with a flattened
-structure.  As RFC 7749 requiresd giving both the full name and
+structure.  As RFC 7749 requires giving both the full name and
 surname/initials, we use `ins` as an abbreviation for
 "initials/surname".  Yes, the toolchain is Unicode-capable, even if
 the final RFC output is still in ASCII.)

data/bin/kramdown-rfc-extract-sourcecode

@@ -67,7 +67,15 @@ REXML::XPath.each(d.root, "//sourcecode|//artwork") do |x|
     else
       taken[ty][name] = ''
     end
-    taken[ty][name] << handle_artwork_sourcecode(x.all_text, unfold)
+    extracted = false
+    REXML::XPath.each(x, "svg") do |svg|
+      # According to v3.rnc, there should be only one...
+      taken[ty][name] << svg.to_s
+      extracted = true
+    end
+    unless extracted
+      taken[ty][name] << handle_artwork_sourcecode(x.all_text, unfold)
+    end
   end
 end
 

data/kramdown-rfc2629.gemspec

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

@@ -360,18 +360,19 @@ def xml_from_sections(input)
     next if k == "fluff"
     v.gsub!(/{{(#{
       spacify_re(XSR_PREFIX)
-    })?(?:([?!])(-)?|(-))([\w._\-]+)(?:=([\w.\/_\-]+))?(#{
+    })?([\w.\/_\-]+@)?(?:([?!])(-)?|(-))([\w._\-]+)(?:=([\w.\/_\-]+))?(#{
       XREF_TXT_SUFFIX
     })?(#{
       spacify_re(XSR_SUFFIX)
     })?}}/) do |match|
       xsr_prefix = $1
-      norminform = $2
-      replacing = $3 || $4
-      word = $5
-      bibref = $6
-      xrt_suffix = $7
-      xsr_suffix = $8
+      subref = $2
+      norminform = $3
+      replacing = $4 || $5
+      word = $6
+      bibref = $7
+      xrt_suffix = $8
+      xsr_suffix = $9
       if replacing
         if new = ref_replacements[word]
           word = new
@@ -395,7 +396,7 @@ def xml_from_sections(input)
       if norminform
         norm_ref[word] ||= norminform == '!' # one normative ref is enough
       end
-      "{{#{xsr_prefix}#{word}#{xrt_suffix}#{xsr_suffix}}}"
+      "{{#{xsr_prefix}#{subref}#{word}#{xrt_suffix}#{xsr_suffix}}}"
     end
   end
 

data/lib/kramdown-rfc2629.rb

@@ -78,6 +78,11 @@ module Kramdown
         href.gsub(/\A(?:[0-9]|section-|u-|figure-|table-|iref-)/) { "_#{$&}" }
       end
 
+      def rfc_mention(target1)  # only works for RFCnnnn
+        target1 =~ /\A([A-Z]*)(.*)\z/
+        "#$1 #$2 "
+      end
+
       def handle_bares(s, attr, format, href, last_join = nil)
         if s.match(/\A(#{XREF_ANY}) and (#{XREF_ANY})\z/)
           handle_bares($1, {}, nil, href, " and ")
@@ -86,13 +91,14 @@ module Kramdown
         end
 
         href = href.split(' ')[0] # Remove any trailing (...)
+        target1, target2 = href.split("@", 2)
         multi = last_join != nil
         (sn, s) = s.split(' ', 2)
         loop do
           m = s.match(/\A#{XREF_RE_M}(, (?:and )?| and )?/)
           break if not m
 
-          if not multi and not m[2] and not m[3]
+          if not multi and not m[2] and not m[3] and not target2
             # Modify |attr| if there is a single reference.  This can only be
             # used if there is only one section reference and the section part
             # has no title.
@@ -110,9 +116,13 @@ module Kramdown
           multi = true
           s[m[0]] = ''
 
-          attr1 = { 'target' => href, 'section' => m[1], 'sectionFormat' => 'bare', 'text' => m[2] }
+          attr1 = { 'target' => target1, 'section' => m[1], 'sectionFormat' => 'bare', 'text' => m[2] }
           @tree.children << Element.new(:xref, nil, attr1)
-          @tree.children << Element.new(:text, m[3] || last_join || " of ", {})
+          andof = m[3] || last_join || " of "
+          if andof == " of " && target2
+            andof += rfc_mention(target1)
+          end
+          @tree.children << Element.new(:text, andof, {})
         end
       end
 
@@ -135,18 +145,22 @@ module Kramdown
         else
           href = @src[3]
           attr = {}
+          handled_subref = false
           if $options.v3
             # match Section ... of ...; set section, sectionFormat
             case href.gsub(/[\u00A0\s]+/, ' ') # may need nbsp and/or newlines
             when /\A(#{SECTIONS_RE}) of (.*)\z/
               href = $2
               handle_bares($1, attr, "of", href)
+              handled_subref = true
             when /\A(.*), (#{SECTIONS_RE})\z/
               href = $1
               handle_bares($2, attr, "comma", href)
+              handled_subref = true
             when /\A(.*) \((#{SECTIONS_RE})\)\z/
               href = $1
               handle_bares($2, attr, "parens", href)
+              handled_subref = true
             when /#{XREF_RE_M}<(.+)\z/
               href = $3
               if $2
@@ -168,6 +182,13 @@ module Kramdown
             href = $1
             attr['text'] = $2
           end
+          target1, target2 = href.split("@", 2) # should do this only for sectionref...
+          if target2
+            href = target2
+            unless handled_subref
+              @tree.children << Element.new(:text, rfc_mention(target1), {})
+            end
+          end
           href = self.class.idref_cleanup(href)
           attr['target'] = href
           el = Element.new(:xref, nil, attr)

metadata

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