kramdown-rfc2629 1.3.22 → 1.3.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c27c4d709e85cd390f830f4eefcc99f9f133a6b7ba6bf9a35bd9545588c373a9
-  data.tar.gz: edb598ba6639f55f473ef8dde927a435522d8b22b7fda4d46f14134ce4aaca8f
+  metadata.gz: e75bef07cedf1af17c6bfc0f6c688171af4a5deeb5f473215597617f7c98888f
+  data.tar.gz: a8d16417fe3a37a092375fba5234857e61b15350eee5f99e9efe25aeeaed8165
 SHA512:
-  metadata.gz: 966de445a5c3b61db77e61fc500ba9eed670cfb67fe710f80bf23ec33f1bf96f67891a4b50112c957198f83c2a8aa7f798342d9002bde3fc77722d82e10436da
-  data.tar.gz: 92983b9282b11a77a5633ee8d172d4cdfd2f03a852f788b447be84f750256c4bbba81e38518dfbf5c5dfdf4f2480f17fdbf3fce7f33fb7e1614b582d4426f722
+  metadata.gz: fc5c770234e58c35c658de4ca7596d0d8ab0d3ea37bb9569e0689086909ba1c45ac0e4a68f39a0839a85abd1b4e55ef18c0b651f36954276be1686aabc501469
+  data.tar.gz: c3e226f620e093229c30549463dfa42eb99aeeb56bcd55022c0b7265a2531b5c469299f94010fbbe5de585787f08328a8c9991c1dcfebaba5c8552c97a192daa

data/bin/kdrfc

@@ -24,6 +24,12 @@ def process_mkd(input, output)
   end
 end
 
+def run_idnits(txt_fn)
+  unless system("idnits", txt_fn)
+    warn "*** problem #$? running idnits"
+  end
+end
+
 def process_xml(*args)
   if $options.remote
     process_xml_remotely(*args)
@@ -124,6 +130,9 @@ BANNER
   opts.on("-c", "--[no-]convert", "Convert xml to v3 xml") do |v|
     $options.v2v3 = v
   end
+  opts.on("-i", "--[no-]idnits", "Run idnits on the resulting text") do |v|
+    $options.idnits = v
+  end
   opts.on("-h", "--[no-]html", "Convert to html as well") do |v|
     $options.html = v
   end
@@ -139,8 +148,9 @@ op.parse!
 def process_the_xml(fn, base)
   process_xml(fn, "#{base}.prepped.xml", "--preptool") if $options.prep
   process_xml(fn, "#{base}.v2v3.xml", "--v2v3") if $options.v2v3
-  process_xml(fn, "#{base}.txt") if $options.txt
+  process_xml(fn, "#{base}.txt") if $options.txt || $options.idnits
   process_xml(fn, "#{base}.html", "--html") if $options.html
+  run_idnits("#{base}.txt") if $options.idnits
 end
 
 case ARGV.size

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,12 +1,12 @@
 spec = Gem::Specification.new do |s|
   s.name = 'kramdown-rfc2629'
-  s.version = '1.3.22'
+  s.version = '1.3.27'
   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.}
   s.add_dependency('kramdown', '~> 1.17.0')
   s.add_dependency('certified', '~> 1.0')
-  s.add_dependency('json', '~> 2.0')
+  s.add_dependency('json_pure', '~> 2.0')
   s.files = Dir['lib/**/*.rb'] + %w(README.md LICENSE kramdown-rfc2629.gemspec bin/kdrfc bin/kramdown-rfc2629 bin/doilit bin/kramdown-rfc-extract-markdown data/kramdown-rfc2629.erb data/encoding-fallbacks.txt data/math.json)
   s.require_path = 'lib'
   s.executables = ['kramdown-rfc2629', 'doilit', 'kramdown-rfc-extract-markdown', 'kdrfc']

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

@@ -128,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')
@@ -136,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
@@ -453,10 +474,8 @@ COLORS
 
       def convert_dl(el, indent, opts)
         if $options.v3
-          hangindent = el.attr.delete('hangIndent')
-          if hangindent && !$hangindent_seen
-            warn "** Ignoring @hangIndent on <dl> for v3, see https://u.nu/hangindent-dl"
-            $hangindent_seen = true
+          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']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kramdown-rfc2629
 version: !ruby/object:Gem::Version
-  version: 1.3.22
+  version: 1.3.27
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-21 00:00:00.000000000 Z
+date: 2021-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: json_pure
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -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.