kramdown-rfc2629 1.7.38 → 1.7.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a4229601b804e1214f5b5680529e4eadc85b411dff42300930a7ee67f089677
-  data.tar.gz: e014af8a2a3fbd97e476fc9f75324aa60b018c86852c863a48ef154bd00edb32
+  metadata.gz: 8169f0e77f49dec5dd3ebe8880bb1329ed159ea5553d76f68eb4ff3d9425f8e4
+  data.tar.gz: dbd77ffa24df6367900d97eb5835abfd0bc1fb3164865718e3e5b48b91251c09
 SHA512:
-  metadata.gz: d75555c1707c87224b3d3e1b79f4df733085b3c325cc8f02e3c6c94716bc663b98dfb623940a34e5ffd2f813aaaeccff2bbf505691d41caceaba09fc04216a3f
-  data.tar.gz: 0201b85f296e9acc385e6146e5153f812d87e50ae4054a1d0171809b9d8c251d8bb145ef842d730d9b479553292ec82e61c36a8a37fc2506cd5c5ccadfd79053
+  metadata.gz: 8fe768ffe85a62f7a2d15e976f5e00403d7aeaca282276d1ce4ddbe788c29b2fc6beb4edab9c93c817589b589ec1af68ebb2b50d1b9c6b05fa5bbc8d71090553
+  data.tar.gz: 862c708667b6cc2d62de66eec9254b16ba2395afd5d0e109e72e6baa1ac78c737c1ffe1c7d2e977f005ddd7d10de97706daf2e4448b46886061198bf918b3542

data/README.md

@@ -12,10 +12,11 @@ Who would care?  Anybody who is writing Internet-Drafts and RFCs in
 the [IETF][] and prefers (or has co-authors who prefer) to do part of
 their work in markdown.
 
-kramdown-rfc is documented on this page, and also on
-[the wiki][].
+kramdown-rfc is documented on this page, as well as on
+[the wiki][] and via a "[Rosetta Stone]" maintained by the RFC Production Center.
 
 [the wiki]: https://github.com/cabo/kramdown-rfc/wiki
+[Rosetta Stone]: https://authors.ietf.org/en/rfcxml-markdown-syntax-tables
 
 # Usage
 
@@ -549,6 +550,16 @@ machine-generated:
 {: #example2 title="A longer RPL example"}
 ```
 
+Include flags can be combined and appended to the command name:
+
+```markdown
+{::include-dedent-lines3..8 generated.txt}
+{::include-fold69hardleft4dry generated.json}
+```
+
+Details about include flags can be found in the kramdown-rfc wiki: https://github.com/cabo/kramdown-rfc/wiki/Syntax#file-inclusion
+
+
 (0.x:) A page break can be forced by adding a horizontal rule (`----`,
 note that this creates ugly blank space in some HTML converters).
 

data/kramdown-rfc2629.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s|
   s.name = 'kramdown-rfc2629'
-  s.version = '1.7.38'
+  s.version = '1.7.40'
   s.summary = "Kramdown extension for generating RFCXML (RFC 799x)."
   s.description = %{An RFCXML (RFC 799x) generating backend for Thomas Leitner's
 "kramdown" markdown parser.  Mostly useful for RFC writers.}

data/lib/kramdown-rfc/command.rb

@@ -65,13 +65,18 @@ def process_includes(input)
                         $2)
     when "data"
       data = 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 ::FOLD8792_PROC_RE
+      fold = fold8792_options(Regexp.last_match)
     when "all", "last"
+      fn_in = fn
       fn = fn.flat_map{|n| Dir[n]}
-      fn = [fn.last] if flag == "last"
+      if flag == "last"
+        if last = fn.last
+          fn = [last]
+        else
+          warn "** include-last: no file matches #{fn_in.inspect}"
+        end
+      end
       chunks = fn.map{ |f|
         ret = process_chunk(File.read(f), nested, dedent, range, fold, quote, xml, data)
         nested = false; dedent = false; fold = false; quote = false

data/lib/kramdown-rfc/rfc8792.rb

@@ -22,6 +22,13 @@ end
 
 FOLD_MSG = "NOTE: '\\' line wrapping per RFC 8792".freeze
 UNFOLD_RE = /\A.*#{FOLD_MSG.sub("\\", "(\\\\\\\\\\\\\\\\?)")}.*\n\r?\n/
+# use indent as preferred synonym over smart
+FOLD8792_PROC_RE = /\Afold(?<columns>\d*)(?<hard>hard)?(?:(?<indent_type>left|smart|indent)(?<spaces>\d*))?(?<dry>dry)?\z/
+
+def fold8792_options(md)
+  indent_type = md[:indent_type].to_sym if md[:indent_type]
+  [md[:columns].to_i, indent_type, (md[:spaces] || 0).to_i, md[:dry], md[:hard]]
+end
 
 def unfold8792(s)
   if s =~ UNFOLD_RE
@@ -44,7 +51,7 @@ 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)
+def fold8792_1(s, columns = FOLD_COLUMNS, indent_type = nil, indent_spaces = 0, dry = false, hard = false)
   if s.index("\t")
     warn "*** HT (\"TAB\") in text to be folded. Giving up."
     return s
@@ -61,6 +68,7 @@ def fold8792_1(s, columns = FOLD_COLUMNS, left = false, dry = false)
 
   lines = s.lines.map(&:chomp)
   did_fold = false
+  smart_indent = nil
   ix = 0
   while li = lines[ix]
     col = columns
@@ -69,18 +77,28 @@ def fold8792_1(s, columns = FOLD_COLUMNS, left = false, dry = false)
         lines[ix..ix] = [li << "\\", ""]
         ix += 1
       end
+      smart_indent = nil
       ix += 1
     else
       did_fold = true
-      min_indent = left || 0
+      left_indent =
+        case indent_type
+        when :left
+          indent_spaces
+        when :smart, :indent
+          smart_indent ||= li[/\A */].size + indent_spaces
+        end
+      min_indent = left_indent || 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}|"
+        indent_msg = "with indent #{min_indent}" if indent_type
+        warn "*** Cannot RFC8792-fold1 to #{columns} cols #{indent_msg}  |#{li.inspect}|"
+        smart_indent = nil
       else
-        if RE_IDENT === li[col] # Don't split IDs
+        if !hard && RE_IDENT === li[col] # Don't split IDs
           col2 = col
           while col2 > min_indent && RE_IDENT === li[col2-1]
             col2 -= 1
@@ -90,8 +108,8 @@ def fold8792_1(s, columns = FOLD_COLUMNS, left = false, dry = false)
           end
         end
         rest = li[col..-1]
-        indent = left || columns - rest.size
-        if !left && li[-1] == "\\"
+        indent = left_indent || columns - rest.size
+        if !left_indent && li[-1] == "\\"
           indent -= 1           # leave space for next round
         end
         if indent > 0

data/lib/kramdown-rfc2629.rb

@@ -795,10 +795,8 @@ COLORS
         case proc
         when "dedent"
           result = remove_indentation(result)
-        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 ::FOLD8792_PROC_RE
+          fold = fold8792_options(Regexp.last_match)
           result = fix_unterminated_line(fold8792_1(trim_empty_lines_around(result), *fold)) # XXX
         when /\Alines(\d*)\.\.(\.)?(\d*)\z/
           range = Range.new($1.empty? ? nil : $1.to_i, # compensate for

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kramdown-rfc2629
 version: !ruby/object:Gem::Version
-  version: 1.7.38
+  version: 1.7.40
 platform: ruby
 authors:
 - Carsten Bormann