kramdown-rfc2629 1.5.20 → 1.5.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ecea74ca8da77f320a8ac599c81e194aec5be20bc751feeb9d85e0e42929aa7
-  data.tar.gz: 5c1d8881b2edf9796ceb3b722f8ea4c1164af5629d57e89b84227dcb1b6c184c
+  metadata.gz: 4e19def630ee2ad018b297cd5c196e3ee70f052fea88004014a1e8dcc298c050
+  data.tar.gz: eb677f68752221d001095424394b4d276453614bb2286fe77e83d2d3a41d1cfa
 SHA512:
-  metadata.gz: 8e07eac38d45437e5e9aae7b8d5b3d9f6281e6e9a03363349f87bc948061d6e59842cd3a7f317490643b9ede8e7528da2753499b887b1f07f68c8f1e891fef90
-  data.tar.gz: f237627b57c7abd02de193a8853c8311f9679fec7fdd0f83f98408fda0f58e3ce63335a64b240d238cfdcdc0085ad5f52a26ec37e0742d4009267a281eae7fba
+  metadata.gz: f54b8a10cb72d16313a4a5c644e52e223539f38b4245d6ca3e54abb28b1704bdbd447d15b0065ad00334df6bbae3a0508f08cd59f0eaf37bfaa717eb52b394ff
+  data.tar.gz: b54e739cba1b21727189cfdf576fc0d8f0bcac1be224bf7affb017c1ddcfd0e2358344a1f162763183b297da2256ca9710e64946b62f79e2e1aa65ec45bdab04

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,12 +25,55 @@ def add_quote(s)
   l.map {|li| "> #{li}"}.join
 end
 
-def process_chunk(s, dedent, quote)
+def process_chunk(s, nested, dedent, fold, quote)
+  process_includes(s) if nested
   s = remove_indentation(s) if dedent
+  s = fold8792_1(s, *fold) if fold
   s = add_quote(s) if quote
   s
 end
 
+def process_includes(input)
+ input.gsub!(/^\{::include((?:-[a-z0-9]+)*)\s+(.*?)\}/) {
+  include_flags = $1
+  fn = [$2]
+  chunks = false
+  nested = false
+  dedent = false
+  fold = false
+  quote = false
+  include_flags.split("-") do |flag|
+    case flag
+    when ""
+    when "nested"
+      nested = true
+    when "quote"
+      quote = true
+    when "dedent"
+      dedent = true
+    when /\Afold(\d*)(left(\d*))?(dry)?\z/
+      fold = [$1.to_i,            # col 0 for ''
+              ($3.to_i if $2),    # left 0 for '', nil if no "left"
+              $4]                 # dry
+    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), nested, dedent, fold, quote)
+        nested = false; dedent = false; fold = false; quote = false
+        ret
+      }
+    else
+      warn "** unknown include flag #{flag}"
+    end
+  end
+  chunks = fn.map{|f| File.read(f)} unless chunks # no all/last
+  chunks = chunks.map {|ch| process_chunk(ch, nested, dedent, fold, quote)}
+  chunks.join.chomp
+ }
+end
+
+
 def boilerplate(key)
   case key.downcase
   when /\Abcp14(info)?(\+)?(-tagged)?\z/i
@@ -455,35 +499,7 @@ if input[-1] != "\n"
   # warn "*** added missing newline at end"
   input << "\n"                 # fix #26
 end
-input.gsub!(/^\{::include((?:-[a-z]+)*)\s+(.*?)\}/) {
-  include_flags = $1
-  fn = [$2]
-  chunks = false
-  dedent = false
-  quote = false
-  include_flags.split("-") do |flag|
-    case flag
-    when ""
-    when "quote"
-      quote = true
-    when "dedent"
-      dedent = 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)
-        dedent = false; quote = false
-        ret
-      }
-    else
-      warn "** unknown include flag #{flag}"
-    end
-  end
-  chunks = fn.map{|f| File.read(f)} unless chunks # no all/last
-  chunks = chunks.map {|ch| process_chunk(ch, dedent, quote)}
-  chunks.join.chomp
-} unless ENV["KRAMDOWN_SAFE"]
+process_includes(input) unless ENV["KRAMDOWN_SAFE"]
 input.gsub!(/^\{::boilerplate\s+(.*?)\}/) {
   boilerplate($1)
 }

data/data/kramdown-rfc2629.erb

@@ -1,9 +1,18 @@
 <?xml version="1.0" encoding="<%=ps[:coding]||"UTF-8"%>"?>
   <?xml-stylesheet type="text/xsl" href="rfc2629.xslt" ?>
   <!-- generated by https://github.com/cabo/kramdown-rfc2629 version <%=
-    Gem.loaded_specs["kramdown-rfc2629"].version rescue nil %> -->
-
+    Gem.loaded_specs["kramdown-rfc2629"].version rescue nil 
+    %> (Ruby <%= RUBY_VERSION %>) -->
+
+<% if $options.v3 %>
+<!DOCTYPE rfc <%= ps["doctype-reference"] %> [
+  <!ENTITY nbsp    "&#160;">
+  <!ENTITY zwsp   "&#8203;">
+  <!ENTITY nbhy   "&#8209;">
+  <!ENTITY wj     "&#8288;">
+<% else %>
 <!DOCTYPE rfc SYSTEM "rfc2629.dtd" [
+<% end %>
 <% ps.arr("bibxml") do |tag, sys| -%>
 <!ENTITY <%= tag %> SYSTEM "<%= sys %>">
 <% end -%>
@@ -22,7 +31,8 @@
   rfcattrs = ps.attrs("ipr", "docName=docname", "category=cat",
                       "consensus", "submissionType=submissiontype", "xml:lang=lang",
                       "number", "obsoletes", "updates", "seriesNo=seriesno")
-  TRUE_FALSE = {nil => "true", false => "false", true => "true"}
+  TRUE_FALSE = {nil => "true", false => "false", true => "true",
+                "yes" => "true", "no" => "false"}
   YES_NO = {"true" => "yes", "false" => "no"}
   pis = KramdownRFC::ParameterSet.new({})
   ps.arr("pi", false) do |pi, val|
@@ -36,7 +46,7 @@
     end
   end
   pis.rest.each do |pi, val|
-    v = YES_NO[val] || escape_html(val.to_s, :attribute)
+    v = YES_NO[val] || pis.escattr(val)
 -%>
 <?rfc <%=pi%>="<%=v%>"?>
 <% end -%>

data/kramdown-rfc2629.gemspec

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

@@ -0,0 +1,77 @@
+FOLD_MSG = "NOTE: '\\' line wrapping per RFC 8792".freeze
+MIN_FOLD_COLUMNS = FOLD_MSG.size
+FOLD_COLUMNS = 69
+RE_IDENT = /\A[A-Za-z0-9_]\z/
+
+def fold8792_1(s, columns = FOLD_COLUMNS, left = false, dry = false)
+  if s.index("\t")
+    warn "*** HT (\"TAB\") in text to be folded. Giving up."
+    return s
+  end
+  if columns < MIN_FOLD_COLUMNS
+    columns =
+      if columns == 0
+        FOLD_COLUMNS
+      else
+        warn "*** folding to #{MIN_FOLD_COLUMNS}, not #{columns}"
+        MIN_FOLD_COLUMNS
+      end
+  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
+      min_indent = left || 0
+      col -= 1                  # space for "\\"
+      while li[col] == " "      # can't start new line with " "
+        col -= 1
+      end
+      if col <= min_indent
+        warn "*** Cannot RFC8792-fold1 to #{columns} cols #{"with indent #{left}" if left}  |#{li.inspect}|"
+      else
+        if RE_IDENT === li[col] # Don't split IDs
+          col2 = col
+          while col2 > min_indent && RE_IDENT === li[col2-1]
+            col2 -= 1
+          end
+          if col2 > min_indent
+            col = col2
+          end
+        end
+        rest = li[col..-1]
+        indent = left || columns - rest.size
+        if !left && 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
+    msg = FOLD_MSG.dup
+    if !dry && columns >= msg.size + 4
+      delta = columns - msg.size - 2 # 2 spaces
+      half = delta/2
+      msg = "#{"=" * half} #{msg} #{"=" * (delta - half)}"
+    end
+    lines[0...0] = [msg, ""]
+    lines.map{|x| x << "\n"}.join
+  else
+    s
+  end
+end

data/lib/kramdown-rfc2629.rb

@@ -1323,7 +1323,7 @@ COLORS
           if target == "#"
             target = value
           else
-            target = target[1..]
+            target = target[1..-1]
           end
         else
           target = nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kramdown-rfc2629
 version: !ruby/object:Gem::Version
-  version: 1.5.20
+  version: 1.5.25
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-01 00:00:00.000000000 Z
+date: 2022-01-25 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.