kramdown-rfc2629 1.3.18 → 1.3.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28fbdd54743e2c20350291a2d61dae4fe326e23e55931316547fbdbd9648f8b7
-  data.tar.gz: c6d612a256598e8bfcf65e17cdf1da082c673e3d090d9a735bcfc7059580d4e0
+  metadata.gz: 4917395db5dce706708b9a3ce81da25a4089d0982b6f6c577fe2249248718f3c
+  data.tar.gz: c2c3a7ce6d9269674a20dcbd793e2bd0f451cee98fa36dbe5b2be47b29d76f30
 SHA512:
-  metadata.gz: 6383c69fff2b3f1b8aa67c14ce114053a53cbce20ff0af9bbfcc114ed196073609f2c90cfd94f79807f9f45ebb17d0c68e4785b912b6cd6de23bfccac8fb7dac
-  data.tar.gz: a2d196a6e43d53e363689161bb5a57b694754fc23792352db4d9c5c085d7d6cda15aa96491b8775a459d20e31d61c6b52ffb5f276d238e6e51e4a2d2976e7bdd
+  metadata.gz: 3818e58468fef81b14fb7bf7e399a0ba740ed08a3b2e2b98a0e4e2019c536a456aec5678e1e3a6a525800d236a245bd86f05bf07610048c287f72c633cb1355d
+  data.tar.gz: 884d1d3650106e695294dfdf96a534db6e1f40fd7204e10bfab118fc50ebca1db65b28762d52c57884732f65da37183c83a34834cbad21a6c9a1f77db6f7e023

data/kramdown-rfc2629.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s|
   s.name = 'kramdown-rfc2629'
-  s.version = '1.3.18'
+  s.version = '1.3.24'
   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
@@ -79,6 +128,22 @@ module Kramdown
   end
 
   class Element
+
+    # Not fixing studly element names postalLine and seriesInfo yet
+
+    # occasionally regenerate the studly attribute name list via
+    # script in data/studly.rb
+    STUDLY_ATTR = %w(
+    asciiAbbrev asciiFullname asciiInitials asciiName asciiSurname
+    asciiValue blankLines derivedAnchor derivedContent derivedCounter
+    derivedLink displayFormat docName expiresDate hangIndent hangText
+    indexInclude iprExtract keepWithNext keepWithPrevious originalSrc
+    prepTime quoteTitle quotedFrom removeInRFC sectionFormat seriesNo
+    showOnFrontPage slugifiedName sortRefs submissionType symRefs tocDepth
+    tocInclude
+    )
+    STUDLY_ATTR_MAP = Hash[STUDLY_ATTR.map {|s| [s.downcase, s]}]
+
     def rfc2629_fix
       if a = attr
         if anchor = a.delete('id')
@@ -87,6 +152,11 @@ module Kramdown
         if anchor = a.delete('href')
           a['target'] = anchor
         end
+        attr.keys.each do |k|
+          if (d = k.gsub(/_(.|$)/) { $1.upcase }) != k or d = STUDLY_ATTR_MAP[k]
+            a[d] = a.delete(k)
+          end
+        end
       end
     end
   end
@@ -373,8 +443,15 @@ COLORS
         if options[:auto_ids] && !el.attr['anchor']
           el.attr['anchor'] = saner_generate_id(el.options[:raw_text])
         end
+        if $options.v3
+          if sl = el.attr.delete('slugifiedName') # could do general name- play
+            attrstring = html_attributes({'slugifiedName' => sl})
+          end
+          irefs = "<name#{attrstring}>#{inner(el, indent, opts)}</name>" #
+        else
         clean, irefs = clean_pcdata(inner_a(el, indent, opts))
         el.attr['title'] = clean
+        end
         "#{end_sections(el.options[:level], indent)}#{' '*indent}<section#{@sec_level += 1; el_html_attributes(el)}>#{irefs}\n"
       end
 
@@ -397,6 +474,9 @@ COLORS
 
       def convert_dl(el, indent, opts)
         if $options.v3
+          if hangindent = el.attr.delete('hangIndent')
+            el.attr['indent'] ||= hangindent # new attribute name wins
+          end
           vspace = el.attr.delete('vspace')
           if vspace && !el.attr['newline']
             el.attr['newline'] = 'true'
@@ -752,9 +832,14 @@ COLORS
       EMPH = { em: "emph", strong: "strong"}
 
       def convert_em(el, indent, opts)
+        if $options.v3
+          gi = el.type
+          "<#{gi}#{el_html_attributes(el)}>#{inner(el, indent, opts)}</#{gi}>"
+        else
         attrstring = el_html_attributes_with(el, {"style" => EMPH[el.type]})
         span, irefs = clean_pcdata(inner_a(el, indent, opts))
         "<spanx#{attrstring}>#{span}</spanx>#{irefs}"
+        end
       end
       alias :convert_strong :convert_em
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kramdown-rfc2629
 version: !ruby/object:Gem::Version
-  version: 1.3.18
+  version: 1.3.24
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-09 00:00:00.000000000 Z
+date: 2021-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown
@@ -97,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: Kramdown extension for generating RFC 7749 XML.