kramdown-rfc2629 1.7.35 → 1.7.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db828f3c40e956c5cf30f1c29cf658784bac36c2af464cf0216ef8fa14434d71
-  data.tar.gz: '09516f03f56523d7636f14689b15975417f9ce10cf8fd6f980cf844af003c945'
+  metadata.gz: a137034ca47a378411e22f6f1174a7e3bd38ec49602071dd1d1bdc9baae5dce7
+  data.tar.gz: 314a3eb7904262f07005244ad182557b60163e2dc60342ad50f82bc0d7e9c631
 SHA512:
-  metadata.gz: 0da3a29b338f0a3ce60e54b9dae53cfd6568e75e0320c256a716728ec099e0f8b60a819f0f6c210f3c14b1c81a74d981cbe6f30c42d1b1f5ca315f0f690f6301
-  data.tar.gz: a2af7e2f8f79cc46dd0ff426c90457d8543b99be587e8defde3bc7b824ee3afa25feaef98b33cb4777e20ae3fb1de9cb9b9a872d53736852e0d5cc137d1217ca
+  metadata.gz: d2a53bae6614608fb60c8007d04a582d225ee45f846ae318b68111fa157ba81f9f96256b5729335083f55c4e823d3091af4ceb10e45f5af90d0b028894dcad1b
+  data.tar.gz: 52bbd44c2902ea00153d33668d4334d7206c413c6f45223ff1ce4006188868f22d78975918f5f1a8c56a78b079a7a8290c493826cead32c5439420a43fa5d6ac

data/kramdown-rfc2629.gemspec

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

@@ -25,10 +25,11 @@ def process_xml(s)
   d.to_s
 end
 
-def process_chunk(s, nested, dedent, fold, quote, xml, data)
+def process_chunk(s, nested, dedent, range, fold, quote, xml, data)
   process_includes(s) if nested
   s = remove_indentation(s) if dedent
   s = process_xml(s) if xml
+  s = s.lines[range].join if range
   s = %{src="data:application/octet-stream;base64,#{[s].pack('m0')}"} if data
   s = fold8792_1(s, *fold) if fold
   s = add_quote(s) if quote
@@ -36,7 +37,7 @@ def process_chunk(s, nested, dedent, fold, quote, xml, data)
 end
 
 def process_includes(input)
- input.gsub!(/^\{::include((?:-[a-z0-9]+)*)\s+(.*?)\}/) {
+ input.gsub!(/^\{::include((?:-[a-z0-9.]+)*)\s+(.*?)\}/) {
   include_flags = $1
   fn = [$2]
   chunks = false
@@ -45,6 +46,7 @@ def process_includes(input)
   fold = false
   quote = false
   xml = false
+  range = false
   data = false
   include_flags.split("-") do |flag|
     case flag
@@ -57,6 +59,10 @@ def process_includes(input)
       dedent = true
     when "xml"
       xml = true
+    when /\Alines(\d*)\.\.(\.)?(\d*)\z/
+      range = Range.new($1.empty? ? nil : $1.to_i - 1, # compensate for
+                        $3.empty? ? nil : $3.to_i - 1, #   extra newline
+                        $2)
     when "data"
       data = true
     when /\Afold(\d*)(left(\d*))?(dry)?\z/
@@ -67,7 +73,7 @@ def process_includes(input)
       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, xml, data)
+        ret = process_chunk(File.read(f), nested, dedent, range, fold, quote, xml, data)
         nested = false; dedent = false; fold = false; quote = false
         ret
       }
@@ -76,7 +82,7 @@ def process_includes(input)
     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, xml, data)}
+  chunks = chunks.map {|ch| process_chunk(ch, nested, dedent, range, fold, quote, xml, data)}
   chunks.join.chomp
  }
 end
@@ -192,21 +198,40 @@ NMDTAGS = ["{:/nomarkdown}\n\n", "\n\n{::nomarkdown}\n"]
 
 NORMINFORM = { "!" => :normative, "?" => :informative }
 
-def yaml_load(input, *args)
- begin
+
+# Handle several transitions of YAML API:
+# * very early Ruby (no safe_load, before Ruby 2.1)
+# * Ruby before 3.1 (safe_load, positional parameters)
+# * Ruby 2.6 up (safe_load, keyword parameters)
+def yaml_load_compat(input, *args)
   if YAML.respond_to?(:safe_load)
     begin
       YAML.safe_load(input, *args)
     rescue ArgumentError
-      YAML.safe_load(input, permitted_classes: args[0], permitted_symbols: args[1], aliases: args[2])
+      YAML.safe_load(input, permitted_classes: args[0], permitted_symbols: args[1], aliases: args[2], filename: args[3])
     end
   else
     YAML.load(input)
   end
- rescue Psych::SyntaxError => e
-   warn "*** YAML syntax error: #{e}"
-   exit 65 # EX_DATAERR
- end
+end
+
+def yaml_diagnose(input, *args)
+  l = input.lines.to_a
+  (l.size-1).downto(0) do |nl|
+    yaml_load_compat(l[0...nl].join, *args) rescue next
+    warn "** YAML appears to be parsable up to line #{nl}"
+    return
+  end
+end
+
+def yaml_load(input, *args)
+  begin
+    yaml_load_compat(input, *args)
+  rescue Psych::SyntaxError => e
+    warn "*** YAML syntax error: #{e}"
+    yaml_diagnose(input, *args) rescue nil
+    exit 65 # EX_DATAERR
+  end
 end
 
 def process_kramdown_options(coding_override = nil,
@@ -282,7 +307,7 @@ def read_erbfile
   File.read(erbfilename, coding: "UTF-8")
 end
 
-def xml_from_sections(input)
+def xml_from_sections(input, filename = "YAML header")
 
   unless ENV["KRAMDOWN_NO_SOURCE"]
     require 'kramdown-rfc/gzip-clone'
@@ -303,13 +328,13 @@ def xml_from_sections(input)
   # the first section is a YAML with front matter parameters (don't put a label here)
   # We put back the "---" plus gratuitous blank lines to hack the line number in errors
   yaml_in = input[/---\s*/] << sections.shift[2]
+  ps = KramdownRFC::ParameterSet.new(yaml_load(yaml_in, [Date], [], true, filename))
   begin
     require 'kramdown-rfc/yamlcheck'
     KramdownRFC::YAMLcheck.check_dup_keys(yaml_in)
   rescue => e
     warn "** Cannot check for duplicate keys in YAML header (#{e})"
   end
-  ps = KramdownRFC::ParameterSet.new(yaml_load(yaml_in, [Date], [], true))
 
   if v = ps[:v]
     warn "*** unsupported RFCXML version #{v}" if v != 3
@@ -628,6 +653,11 @@ end
 
 warn "*** v2 #{$options.v2.inspect} v3 #{$options.v3.inspect}" if $options.verbose
 
+input_filename = ARGV.join(", ")
+case input_filename
+when "", "-"
+  input_filename = "<stdin>"
+end
 input = ARGF.read
 input.scrub! do |c|
   warn "*** replaced invalid UTF-8 byte sequence #{c.inspect} by U+FFFD REPLACEMENT CHARACTER"
@@ -654,7 +684,7 @@ end
 
 if input =~ /\A---/        # this is a sectionized file
   do_the_tls_dance unless ENV["KRAMDOWN_DONT_VERIFY_HTTPS"]
-  input, options, coding_override = xml_from_sections(input)
+  input, options, coding_override = xml_from_sections(input, input_filename)
 else
   options = process_kramdown_options # all default
 end

data/lib/kramdown-rfc2629.rb

@@ -745,7 +745,7 @@ COLORS
                                 "<![CDATA[#{result}#{result =~ /\n\Z/ ? '' : "\n"}]]>")
             if result1          # nest TXT in artset with SVG
               retsvg = mk_artwork(artwork_attr, "svg",
-                                  result1.sub(/.*?<svg/m, "<svg"))
+                                  result1.sub(/.*?<svg/m, "<svg")) # , t == "mermaid")
               retart = "<artset>#{retsvg}#{retart}</artset>"
             end
             "#{' '*indent}<figure#{el_html_attributes(el)}>#{retart}</figure>\n"
@@ -800,6 +800,11 @@ COLORS
                   ($3.to_i if $2),    # left 0 for '', nil if no "left"
                   $4]                 # dry
           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
+                            $3.empty? ? nil : $3.to_i, #   counting from 1
+                            $2)
+          result = result.lines[range].join
         when "yaml2json"
           begin
             y = YAML.safe_load(result, aliases: true, filename: loc_str)
@@ -844,8 +849,14 @@ COLORS
         result
       end
 
-      def mk_artwork(artwork_attr, typ, content)
-        "<artwork #{html_attributes(artwork_attr.merge("type" => typ))}>#{content}</artwork>"
+      def mk_artwork(artwork_attr, typ, content, use_data = false)
+        if use_data
+          warn "** using data URI for artwork type #{typ}"
+          data = %{data:application/octet-stream;base64,#{[content].pack('m0')}}
+          "<artwork #{html_attributes(artwork_attr.merge("type" => typ, "src" => data))}></artwork>"
+        else
+          "<artwork #{html_attributes(artwork_attr.merge("type" => typ))}>#{content}</artwork>"
+        end
       end
 
       def convert_blockquote(el, indent, opts)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kramdown-rfc2629
 version: !ruby/object:Gem::Version
-  version: 1.7.35
+  version: 1.7.37
 platform: ruby
 authors:
 - Carsten Bormann
@@ -224,7 +224,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.2
+rubygems_version: 4.0.8
 specification_version: 4
 summary: Kramdown extension for generating RFCXML (RFC 799x).
 test_files: []