kramdown-rfc2629 1.3.20 → 1.3.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f5ee9d2385757e8121af0b12406be16995f0a221fbc2d7feca3e0b778168c2f
-  data.tar.gz: 2a76e6613d01eef256c192728dfe71e327c73656a4fc74547da51e60290bcca6
+  metadata.gz: 4a18c9460f832be1f0bb626cc1b6ea385a6535b7af585212ec0c961ae1945d36
+  data.tar.gz: f34512123c073979fff13351c1fdd3ec640376a604e9aba7e849652d59172023
 SHA512:
-  metadata.gz: a1e75e8d942f4d068dce0be7cc1ccf79a5add0b31a0bd3e211737c0ffa0a3dd9cb03b7ca2e66324ceb14ba36d335a71a671d3e4b529ca8308507f7c96dde0c7a
-  data.tar.gz: '0937c152d0f6032072a53c442e9f6404b05f1c5aad1df9e91a62f93b2390abba9666ad70f7d99c7c238a4832dac1699e842c591b9ab5dfe03da25176e7caaaa0'
+  metadata.gz: 69f0328719872f0bef0d81bffb5fa495e384f599a0fb3843cc4c9d6065811be71f21e7ab9700cb1d1f3419d5a91dc88af62c855b5f97f499519b15b11f888bef
+  data.tar.gz: 56778f5ec4e581ac21d17637c1098924ccd6a0b97facd12a2e636fdae755798c6ce7a545e5b8395ec17168e9e118230c1cca00e23ab8332eedbca6a0cf57dccc

data/bin/kramdown-rfc2629

@@ -4,7 +4,7 @@ require 'kramdown-rfc2629'
 require 'kramdown-rfc/parameterset'
 require 'kramdown-rfc/refxml'
 require 'yaml'
-require 'erb'
+require 'kramdown-rfc/erb'
 require 'date'
 
 # try to get this from gemspec.
@@ -154,7 +154,7 @@ def xml_from_sections(input)
       if bibref
         if old = anchor_to_bibref[word]
           if bibref != old
-            warn "*** conflicting definitions for xref #{anchor}: #{old} != #{bibref}"
+            warn "*** conflicting definitions for xref #{word}: #{old} != #{bibref}"
           end
         else
           anchor_to_bibref[word] = bibref
@@ -229,7 +229,7 @@ def xml_from_sections(input)
 
   erbfilename = File.expand_path '../../data/kramdown-rfc2629.erb', __FILE__
   erbfile = File.read(erbfilename, coding: "UTF-8")
-  erb = ERB.new(erbfile, nil, '-')
+  erb = ERB.trim_new(erbfile, '-')
   # remove redundant nomarkdown pop outs/pop ins as they confuse kramdown
   input = erb.result(binding).gsub(%r"{::nomarkdown}\s*{:/nomarkdown}"m, "")
   ps.warn_if_leftovers

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.25'
   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-rfc/erb.rb

@@ -0,0 +1,16 @@
+require 'erb'
+
+class ERB
+
+  case version.sub("erb.rb [", "")
+  when /\A2.1/                    # works back to 1.9.1
+    def self.trim_new(s, trim)
+      ERB.new(s, nil, trim)
+    end
+  else
+    def self.trim_new(s, trim)
+      ERB.new(s, trim_mode: trim)
+    end
+  end
+
+end

data/lib/kramdown-rfc/refxml.rb

@@ -1,3 +1,5 @@
+require 'kramdown-rfc/erb'
+
 module KramdownRFC
 
   extend Kramdown::Utils::Html
@@ -8,7 +10,7 @@ module KramdownRFC
 
   def self.ref_to_xml(k, v)
     vps = KramdownRFC::ParameterSet.new(v)
-    erb = ERB.new <<-REFERB, nil, '-'
+    erb = ERB.trim_new <<-REFERB, '-'
 <reference anchor="<%= escattr(k) %>" <%= vps.attr("target") %>>
   <front>
     <%= vps.ele("title") -%>
@@ -75,7 +77,7 @@ module KramdownRFC
   ERB
 
   def self.person_element_from_aups(element_name, aups)
-    erb = ERB.new(PERSON_ERB, nil, '-')
+    erb = ERB.trim_new(PERSON_ERB, '-')
     erb.result(binding)
   end
 

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
@@ -404,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'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kramdown-rfc2629
 version: !ruby/object:Gem::Version
-  version: 1.3.20
+  version: 1.3.25
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-16 00:00:00.000000000 Z
+date: 2021-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown
@@ -74,6 +74,7 @@ files:
 - data/kramdown-rfc2629.erb
 - data/math.json
 - kramdown-rfc2629.gemspec
+- lib/kramdown-rfc/erb.rb
 - lib/kramdown-rfc/gzip-clone.rb
 - lib/kramdown-rfc/parameterset.rb
 - lib/kramdown-rfc/refxml.rb
@@ -97,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: Kramdown extension for generating RFC 7749 XML.