kramdown-rfc2629 1.3.20 → 1.3.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f5ee9d2385757e8121af0b12406be16995f0a221fbc2d7feca3e0b778168c2f
-  data.tar.gz: 2a76e6613d01eef256c192728dfe71e327c73656a4fc74547da51e60290bcca6
+  metadata.gz: 34bc0c22021d827ebe3c42abda25c3255a6f9902fb8ab94cb7b758c29119016b
+  data.tar.gz: 5e457122aa29c8f2ffac9db511ebc50c036b56d170879e8f9cbd46477099f81d
 SHA512:
-  metadata.gz: a1e75e8d942f4d068dce0be7cc1ccf79a5add0b31a0bd3e211737c0ffa0a3dd9cb03b7ca2e66324ceb14ba36d335a71a671d3e4b529ca8308507f7c96dde0c7a
-  data.tar.gz: '0937c152d0f6032072a53c442e9f6404b05f1c5aad1df9e91a62f93b2390abba9666ad70f7d99c7c238a4832dac1699e842c591b9ab5dfe03da25176e7caaaa0'
+  metadata.gz: c9a397ece10c7c210ea7231e35ea0f949146db5fce32799a1b4bbb91fa59f3bfe7fda9d7b8e3a40127c426cecdd8b304a1370e5f60934ab8bc7af1c94e466518
+  data.tar.gz: 0b22b30f1ca35a27b27d671b2b081c2881d10388f50abffb079c8af506e0ac706f6bf47f3d19d7c20c52029d1654fe854fc3c1098fb0e80aba8edd9cdfac5ede

data/kramdown-rfc2629.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s|
   s.name = 'kramdown-rfc2629'
-  s.version = '1.3.20'
+  s.version = '1.3.21'
   s.summary = "Kramdown extension for generating RFC 7749 XML."
   s.description = %{An RFC7749 (XML2RFC) generating backend for Thomas Leitner's
 "kramdown" markdown parser.  Mostly useful for RFC writers.}

data/lib/kramdown-rfc2629.rb

@@ -39,7 +39,36 @@ module Kramdown
         @span_parsers.unshift(:iref)
       end
 
-      XREF_START = /\{\{(?:(?:\{(.*?)\}(?:\{(.*?)\})?)|(.*?))((?:\}\})|\})/u
+      SECTIONS_RE = /Section(?:s (?:[\w.]+, )*[\w.]+,? and)? [\w.]+/
+
+      def handle_bares(s, attr, format, href)
+        sa = s.sub(/\A\S+\s/, '').split(/,? and /)
+        sa[0..0] = *sa[0].split(', ')
+        sz = sa.size
+        if sz != 1         # we have to redo xml2rfc's work here
+          @tree.children << Element.new(:text, "Sections ", {}) # XXX needs to split into Section/Appendix
+          sa.each_with_index do |sec, i|
+            attr1 = {"target" => href, "section" => sec, "sectionFormat" => "bare"}
+            @tree.children << Element.new(:xref, nil, attr1)
+            text = if i == 0 && sz == 2
+                     " and "
+                   elsif i == sz-1
+                     " of "
+                   elsif i == sz-2
+                     ", and "
+                   else
+                     ", "
+                   end
+            @tree.children << Element.new(:text, text, {})
+          end
+          # attr stays unchanged, no section added
+        else
+          attr['section'] = sa[-1]
+          attr['sectionFormat'] = format
+        end
+      end
+
+      XREF_START = /\{\{(?:(?:\{(.*?)\}(?:\{(.*?)\})?)|(\X*?))((?:\}\})|\})/u
 
       # Introduce new {{target}} syntax for empty xrefs, which would
       # otherwise be an ugly ![!](target) or ![ ](target)
@@ -57,8 +86,28 @@ module Kramdown
           el = Element.new(:contact, nil, attr)
         else
           href = @src[3]
+          attr = {}
+          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)
+            when /\A(.*), (#{SECTIONS_RE})\z/
+              href = $1
+              handle_bares($2, attr, "comma", href)
+            when /\A(.*) \((#{SECTIONS_RE})\)\z/
+              href = $1
+              handle_bares($2, attr, "parens", href)
+            when /\A([\w.]+)<(.*)\z/
+              href = $2
+              attr['section'] = $1
+              attr['sectionFormat'] = 'bare'
+            end
+          end
           href = href.gsub(/\A[0-9]/) { "_#{$&}" } # can't start an IDREF with a number
-          el = Element.new(:xref, nil, {'target' => href})
+          attr['target'] = href
+          el = Element.new(:xref, nil, attr)
         end
         @tree.children << el
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kramdown-rfc2629
 version: !ruby/object:Gem::Version
-  version: 1.3.20
+  version: 1.3.21
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-16 00:00:00.000000000 Z
+date: 2020-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown