kramdown-rfc2629 1.5.21 → 1.5.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2f9b627799934e130561b80d0625ee127bb67e340742ab9df6f309f069d2487
-  data.tar.gz: fd3bb7cbbe1a54316d809844f12070836e18c5eb38286a00fc322c915bebd363
+  metadata.gz: 90fd02030501ff7ce234af8b2f2412b5c1372c8e865b368db995ab0a32347dc0
+  data.tar.gz: 31d7f8eed4b7adc64e8ff4458368e1380351089aa44478faf2987a78239d5cae
 SHA512:
-  metadata.gz: 1d588638f3ae60b71555a23236546f0639f612774e38d8325515d9304154038cbedba463fa2c3fe3dedf028ab1b44ee9386325215114ef9a8a5c11029d57d9a6
-  data.tar.gz: 6307e13b08a45165813ceec0ea1cc5e5cc9e788fcdc0024fee168979e87803eac96dca878288b7eee628f5a167a35c1079dcc1c411b2ad88fda0fcf11757eaf7
+  metadata.gz: a39fa3bf7a2703f958dbc443d1d8d850a0a89ec9797f619218e921cdadd372e4466f628a1a3dbf13f178163a16f92141026ac34bfd52c82f1950fd3780d187aa
+  data.tar.gz: f02da291a9a611a4cb21097c2f31ee490a6327558cf1d66018279c89ef5f56f4ad87884046b19e44d347d5946346d0108a017e19aabb6b0db180f53a9847430a

data/bin/kramdown-rfc2629

@@ -3,6 +3,7 @@
 require 'kramdown-rfc2629'
 require 'kramdown-rfc/parameterset'
 require 'kramdown-rfc/refxml'
+require 'kramdown-rfc/rfc8792'
 require 'yaml'
 require 'kramdown-rfc/erb'
 require 'date'
@@ -24,8 +25,9 @@ def add_quote(s)
   l.map {|li| "> #{li}"}.join
 end
 
-def process_chunk(s, dedent, quote)
+def process_chunk(s, dedent, fold, quote)
   s = remove_indentation(s) if dedent
+  s = fold8792_1(s) if fold
   s = add_quote(s) if quote
   s
 end
@@ -460,6 +462,7 @@ input.gsub!(/^\{::include((?:-[a-z]+)*)\s+(.*?)\}/) {
   fn = [$2]
   chunks = false
   dedent = false
+  fold = false
   quote = false
   include_flags.split("-") do |flag|
     case flag
@@ -468,11 +471,13 @@ input.gsub!(/^\{::include((?:-[a-z]+)*)\s+(.*?)\}/) {
       quote = true
     when "dedent"
       dedent = true
+    when "fold"
+      fold = true
     when "all", "last"
       fn = fn.flat_map{|n| Dir[n]}
       fn = [fn.last] if flag == "last"
       chunks = fn.map{ |f|
-        ret = process_chunk(File.read(f), dedent, quote)
+        ret = process_chunk(File.read(f), dedent, fold, quote)
         dedent = false; quote = false
         ret
       }
@@ -481,7 +486,7 @@ input.gsub!(/^\{::include((?:-[a-z]+)*)\s+(.*?)\}/) {
     end
   end
   chunks = fn.map{|f| File.read(f)} unless chunks # no all/last
-  chunks = chunks.map {|ch| process_chunk(ch, dedent, quote)}
+  chunks = chunks.map {|ch| process_chunk(ch, dedent, fold, quote)}
   chunks.join.chomp
 } unless ENV["KRAMDOWN_SAFE"]
 input.gsub!(/^\{::boilerplate\s+(.*?)\}/) {

data/kramdown-rfc2629.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s|
   s.name = 'kramdown-rfc2629'
-  s.version = '1.5.21'
+  s.version = '1.5.22'
   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/rfc8792.rb

@@ -0,0 +1,59 @@
+FOLD_COLUMNS = 69
+RE_IDENT = /\A[A-Za-z0-9_]\z/
+
+def fold8792_1(s, columns = FOLD_COLUMNS)
+  if s.index("\t")
+    warn "*** HT (\"TAB\") in text to be folded. Giving up."
+    return s
+  end
+
+  lines = s.lines.map(&:chomp)
+  did_fold = false
+  ix = 0
+  while li = lines[ix]
+    col = columns
+    if li[col].nil?
+      if li[-1] == "\\"
+        lines[ix..ix] = [li << "\\", ""]
+        ix += 1
+      end
+      ix += 1
+    else
+      did_fold = true
+      col -= 1                  # space for "\\"
+      while li[col] == " "      # can't start new line with " "
+        col -= 1
+      end
+      if col <= 0
+        warn "*** Cannot RFC8792-fold1 #{li.inspect}"
+      else
+        if RE_IDENT === li[col] # Don't split IDs
+          col2 = col
+          while col2 > 0 && RE_IDENT === li[col2-1]
+            col2 -= 1
+          end
+          if col2 > 0
+            col = col2
+          end
+        end
+        rest = li[col..-1]
+        indent = columns - rest.size
+        if li[-1] == "\\"
+          indent -= 1           # leave space for next round
+        end
+        if indent > 0
+         rest = " " * indent + rest
+        end
+        lines[ix..ix] = [li[0...col] << "\\", rest]
+      end
+      ix += 1
+    end
+  end
+
+  if did_fold
+    lines[0...0] = ["=== NOTE: '\\' line wrapping per RFC 8792 ===", ""]
+    lines.map{|x| x << "\n"}.join
+  else
+    s
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kramdown-rfc2629
 version: !ruby/object:Gem::Version
-  version: 1.5.21
+  version: 1.5.22
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-01 00:00:00.000000000 Z
+date: 2021-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown
@@ -99,6 +99,7 @@ files:
 - lib/kramdown-rfc/kdrfc-processor.rb
 - lib/kramdown-rfc/parameterset.rb
 - lib/kramdown-rfc/refxml.rb
+- lib/kramdown-rfc/rfc8792.rb
 - lib/kramdown-rfc2629.rb
 homepage: http://github.com/cabo/kramdown-rfc2629
 licenses:
@@ -119,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: Kramdown extension for generating RFC 7749 XML.