kramdown-rfc2629 1.5.22 → 1.5.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90fd02030501ff7ce234af8b2f2412b5c1372c8e865b368db995ab0a32347dc0
-  data.tar.gz: 31d7f8eed4b7adc64e8ff4458368e1380351089aa44478faf2987a78239d5cae
+  metadata.gz: d7c7ac571f000360c4b8aca5450e5439c2d50b71fb85872ad2890e575c986c9b
+  data.tar.gz: 1af9f4b9d49c2176143a61b7c24f3bc9f13302a2bbef6a5cc90a379596b5ff04
 SHA512:
-  metadata.gz: a39fa3bf7a2703f958dbc443d1d8d850a0a89ec9797f619218e921cdadd372e4466f628a1a3dbf13f178163a16f92141026ac34bfd52c82f1950fd3780d187aa
-  data.tar.gz: f02da291a9a611a4cb21097c2f31ee490a6327558cf1d66018279c89ef5f56f4ad87884046b19e44d347d5946346d0108a017e19aabb6b0db180f53a9847430a
+  metadata.gz: 58d5ed0d4e9ec45f285a2230055a5cdbc4393a0eec6fe5722c170a965a4d24a6f5a73bf16e14e83b38fa6029a6942edacf88f5621f2e2c5c0aabd2223f73bc9f
+  data.tar.gz: 748fbf3adced720c4cdb48c346174d4660a17b670ee5f12fc315fd252d3353c7e8c8569bba1d4526f2c8016c85d524160e9bfac5749f3e1f40b7932c048d3a01

data/bin/kramdown-rfc2629

@@ -25,13 +25,53 @@ def add_quote(s)
   l.map {|li| "> #{li}"}.join
 end
 
-def process_chunk(s, dedent, fold, quote)
+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 = add_quote(s) if quote
   s
 end
 
+def process_includes(input)
+ input.gsub!(/^\{::include((?:-[a-z]+)*)\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 "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), 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
@@ -457,38 +497,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
-  fold = false
-  quote = false
-  include_flags.split("-") do |flag|
-    case flag
-    when ""
-    when "quote"
-      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, fold, 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, fold, quote)}
-  chunks.join.chomp
-} unless ENV["KRAMDOWN_SAFE"]
+process_includes(input) unless ENV["KRAMDOWN_SAFE"]
 input.gsub!(/^\{::boilerplate\s+(.*?)\}/) {
   boilerplate($1)
 }

data/kramdown-rfc2629.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s|
   s.name = 'kramdown-rfc2629'
-  s.version = '1.5.22'
+  s.version = '1.5.24'
   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-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.22
+  version: 1.5.24
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-13 00:00:00.000000000 Z
+date: 2021-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown