kramdown-rfc2629 1.7.38 → 1.7.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a4229601b804e1214f5b5680529e4eadc85b411dff42300930a7ee67f089677
-  data.tar.gz: e014af8a2a3fbd97e476fc9f75324aa60b018c86852c863a48ef154bd00edb32
+  metadata.gz: 38aca91cefd454730d8c954f9d5d07035bca1a239fb1f580ab9d0d5fd41a60f3
+  data.tar.gz: 2eda7764ffdaef67e83376c0d748fa3b5a5d95db9655662454a63d5bda9ae4c0
 SHA512:
-  metadata.gz: d75555c1707c87224b3d3e1b79f4df733085b3c325cc8f02e3c6c94716bc663b98dfb623940a34e5ffd2f813aaaeccff2bbf505691d41caceaba09fc04216a3f
-  data.tar.gz: 0201b85f296e9acc385e6146e5153f812d87e50ae4054a1d0171809b9d8c251d8bb145ef842d730d9b479553292ec82e61c36a8a37fc2506cd5c5ccadfd79053
+  metadata.gz: daca417b970b16cfdb61685947a38ec857dbf332259815a609ea54bac9959969dfa9ad0e5b392ac2a60616f0ca7ff51f9cb78f1238f04080cbb307dd7f0de9ca
+  data.tar.gz: fc157fa46ff9ea8ef0fc69689c14f35cfd09782fc0440a9815a706c7ddccc21e5035510b4b80a696c987bd392739fe1ab46661f3707aad2a9870ba7bbd8f3b1e

data/README.md

@@ -549,6 +549,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.39'
   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,21 @@ 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 /\Afold(?<columns>\d*)(?<hard>hard)?(?<left>left(?<spaces>\d*))?(?<dry>dry)?\z/
+      md = Regexp.last_match
+      columns = md[:columns].to_i
+      left = md[:spaces].to_i if md[:left]
+      fold = [columns, left, md[:dry], md[:hard]]
     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

@@ -44,7 +44,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, left = false, dry = false, hard = false)
   if s.index("\t")
     warn "*** HT (\"TAB\") in text to be folded. Giving up."
     return s
@@ -80,7 +80,7 @@ def fold8792_1(s, columns = FOLD_COLUMNS, left = false, dry = false)
       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
+        if !hard && RE_IDENT === li[col] # Don't split IDs
           col2 = col
           while col2 > min_indent && RE_IDENT === li[col2-1]
             col2 -= 1

data/lib/kramdown-rfc2629.rb

@@ -795,10 +795,11 @@ 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 /\Afold(?<columns>\d*)(?<hard>hard)?(?<left>left(?<spaces>\d*))?(?<dry>dry)?\z/
+          md = Regexp.last_match
+          columns = md[:columns].to_i
+          left = md[:spaces].to_i if md[:left]
+          fold = [columns, left, md[:dry], md[:hard]]
           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.39
 platform: ruby
 authors:
 - Carsten Bormann