kramdown-rfc2629 1.5.24 → 1.5.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7c7ac571f000360c4b8aca5450e5439c2d50b71fb85872ad2890e575c986c9b
-  data.tar.gz: 1af9f4b9d49c2176143a61b7c24f3bc9f13302a2bbef6a5cc90a379596b5ff04
+  metadata.gz: 4e19def630ee2ad018b297cd5c196e3ee70f052fea88004014a1e8dcc298c050
+  data.tar.gz: eb677f68752221d001095424394b4d276453614bb2286fe77e83d2d3a41d1cfa
 SHA512:
-  metadata.gz: 58d5ed0d4e9ec45f285a2230055a5cdbc4393a0eec6fe5722c170a965a4d24a6f5a73bf16e14e83b38fa6029a6942edacf88f5621f2e2c5c0aabd2223f73bc9f
-  data.tar.gz: 748fbf3adced720c4cdb48c346174d4660a17b670ee5f12fc315fd252d3353c7e8c8569bba1d4526f2c8016c85d524160e9bfac5749f3e1f40b7932c048d3a01
+  metadata.gz: f54b8a10cb72d16313a4a5c644e52e223539f38b4245d6ca3e54abb28b1704bdbd447d15b0065ad00334df6bbae3a0508f08cd59f0eaf37bfaa717eb52b394ff
+  data.tar.gz: b54e739cba1b21727189cfdf576fc0d8f0bcac1be224bf7affb017c1ddcfd0e2358344a1f162763183b297da2256ca9710e64946b62f79e2e1aa65ec45bdab04

data/bin/kramdown-rfc2629

@@ -28,13 +28,13 @@ end
 def process_chunk(s, nested, dedent, fold, quote)
   process_includes(s) if nested
   s = remove_indentation(s) if dedent
-  s = fold8792_1(s) if fold
+  s = fold8792_1(s, *fold) if fold
   s = add_quote(s) if quote
   s
 end
 
 def process_includes(input)
- input.gsub!(/^\{::include((?:-[a-z]+)*)\s+(.*?)\}/) {
+ input.gsub!(/^\{::include((?:-[a-z0-9]+)*)\s+(.*?)\}/) {
   include_flags = $1
   fn = [$2]
   chunks = false
@@ -51,8 +51,10 @@ def process_includes(input)
       quote = true
     when "dedent"
       dedent = true
-    when "fold"
-      fold = 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"

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 -%>

data/kramdown-rfc2629.gemspec

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

@@ -1,11 +1,22 @@
+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)
+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
@@ -20,25 +31,26 @@ def fold8792_1(s, columns = FOLD_COLUMNS)
       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 <= 0
-        warn "*** Cannot RFC8792-fold1 #{li.inspect}"
+      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 > 0 && RE_IDENT === li[col2-1]
+          while col2 > min_indent && RE_IDENT === li[col2-1]
             col2 -= 1
           end
-          if col2 > 0
+          if col2 > min_indent
             col = col2
           end
         end
         rest = li[col..-1]
-        indent = columns - rest.size
-        if li[-1] == "\\"
+        indent = left || columns - rest.size
+        if !left && li[-1] == "\\"
           indent -= 1           # leave space for next round
         end
         if indent > 0
@@ -51,7 +63,13 @@ def fold8792_1(s, columns = FOLD_COLUMNS)
   end
 
   if did_fold
-    lines[0...0] = ["=== NOTE: '\\' line wrapping per RFC 8792 ===", ""]
+    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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kramdown-rfc2629
 version: !ruby/object:Gem::Version
-  version: 1.5.24
+  version: 1.5.25
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-16 00:00:00.000000000 Z
+date: 2022-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown