kramdown-rfc2629 1.6.32 → 1.6.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06d7a5e3575eaa6044b71492725d0aec45cae30106b435d7053dc6003a4a8ae2
-  data.tar.gz: 3f5aee93845187265047bb40decdfe9c24fa78acbf5f417c8609e04759ee882a
+  metadata.gz: dfdd6b2626b4919b9f19421d90541b9f7ec2cf8862e18c3ae5c8c8ba7bf425ba
+  data.tar.gz: 7d5a91368fa1aa42e189fb6b9dccd4fbe4439f07ff11833fb02104bf73bdbd94
 SHA512:
-  metadata.gz: c5b30e9a7de489ab05f1cea4ce856be9d5dd166a6989457da448b187963eccaefec4b92a76fa90e1c49e0e3016d11598e877f57f9f0a2c1ebd4003152818b58d
-  data.tar.gz: c2c2b61afbf59ba47aa0a0fd21969e3326beb02ddf7bad048fd252081daf4351a387133b0223510215a2afdbd9456bc41d1f1dae34c67589046dcb1ae9ad8a4e
+  metadata.gz: 4b070e6f03fce066242187858977e9a2a6e91ebc12859a6f1571abe3e487681b4fbb85e470c6a52207ec85dcebfce039a8d201bdbe86c70c0af5ddda83250a1f
+  data.tar.gz: 6fcc90e3ee7ab1daec870b0b0c704c04108bb6a398a733609ba331bdd0106464623ee6b17a3478c8fab972068b193a9c285b5e7488a866aba888e36e464fd27d

data/bin/kramdown-rfc-clean-svg-ids

@@ -2,6 +2,7 @@
 # -*- coding: utf-8 -*-
 
 require 'rexml/document'
+require 'kramdown-rfc/rexml-formatters-conservative'
 require 'kramdown-rfc/svg-id-cleanup'
 
 def svg_clean_ids(s)
@@ -10,7 +11,10 @@ def svg_clean_ids(s)
 
   svg_id_cleanup(d)
 
-  d.to_s
+  tr = REXML::Formatters::Conservative.new
+  o = ''
+  tr.write(d, o)
+  o
 rescue => detail
   warn "*** Can't clean SVG: #{detail}"
   d.to_s

data/bin/kramdown-rfc-extract-sourcecode

@@ -3,6 +3,7 @@ require 'rexml/document'        # for SVG and bibxml acrobatics
 require 'yaml'
 require 'shellwords'
 require 'fileutils'
+require_relative '../lib/kramdown-rfc/rfc8792'
 
 def clean(s)
   s.gsub!(/\//, ":")
@@ -12,6 +13,7 @@ end
 
 target = nil
 dir = nil
+unfold = true
 targets = [:list, :files, :zip, :yaml]
 require 'optparse'
 begin
@@ -23,6 +25,9 @@ begin
     opts.on("-dDIR", "--dir=DIR", "Target directory (default: sourcecode)") do |v|
       dir = v
     end
+    opts.on("-f", "--[no-]unfold", "RFC8972-unfold (default: yes)") do |v|
+      unfold = v
+    end
   end
   op.parse!
 rescue Exception => e
@@ -56,7 +61,7 @@ REXML::XPath.each(d.root, "//sourcecode|//artwork") do |x|
     else
       taken[ty][name] = ''
     end
-    taken[ty][name] << x.text
+    taken[ty][name] << handle_artwork_sourcecode(x.text, unfold)
   end
 end
 

data/kramdown-rfc2629.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s|
   s.name = 'kramdown-rfc2629'
-  s.version = '1.6.32'
+  s.version = '1.6.34'
   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/rexml-formatters-conservative.rb

@@ -0,0 +1,38 @@
+require 'rexml/document'
+
+module REXML
+  module Formatters
+    # The Conservative formatter writes an XML document that parses to an
+    # identical document as the source document.  This means that no extra
+    # whitespace nodes are inserted, and whitespace within text nodes is
+    # preserved.  Attributes are not sorted.
+    class Conservative < Default
+      def initialize
+        @indentation = 0
+        @level = 0
+        @ie_hack = false
+      end
+
+      protected
+      def write_element( node, output )
+        output << "<#{node.expanded_name}"
+
+        node.attributes.each_attribute do |attr|
+          output << " "
+          attr.write( output )
+        end unless node.attributes.empty?
+
+        if node.children.empty?
+          output << "/"
+        else
+          output << ">"
+          node.children.each { |child|
+            write( child, output )
+          }
+          output << "</#{node.expanded_name}"
+        end
+        output << ">"
+      end
+    end
+  end
+end

data/lib/kramdown-rfc/rfc8792.rb

@@ -6,8 +6,40 @@ def remove_indentation(s)
   l.map {|li| li.sub(/^ {0,#{indent}}/, "")}.join
 end
 
+def trim_empty_lines_around(s)  # this deletes the trailing newline, which may need to be reconstructed
+  s.sub(/\A(\r?\n)*/, '').sub(/(\r?\n)*\z/, '')
+end
+
+def fix_unterminated_line(s)
+  s.sub(/[^\n]\z/) { "#$&\n" } # XXX
+end
+
+def handle_artwork_sourcecode(s, unfold = true)
+  s = trim_empty_lines_around(s)
+  s = unfold8792(s) if unfold
+  fix_unterminated_line(s)
+end
 
 FOLD_MSG = "NOTE: '\\' line wrapping per RFC 8792".freeze
+UNFOLD_RE = /\A.*#{FOLD_MSG.sub("\\", "(\\\\\\\\\\\\\\\\?)")}.*\n\r?\n/
+
+def unfold8792(s)
+  if s =~ UNFOLD_RE
+    indicator = $1
+    s = $'
+    sub = case indicator
+          when "\\"
+            s.gsub!(/\\\n[ \t]*/, '')
+          when "\\\\"
+            s.gsub!(/\\\n[ \t]*\\/, '')
+          else
+            fail "indicator"    # Cannot happen
+          end
+    warn "** encountered RFC 8792 header without folded lines" unless sub
+  end
+  s
+end
+
 MIN_FOLD_COLUMNS = FOLD_MSG.size
 FOLD_COLUMNS = 69
 RE_IDENT = /\A[A-Za-z0-9_]\z/

data/lib/kramdown-rfc2629.rb

@@ -696,7 +696,7 @@ COLORS
           fold = [$1.to_i,            # col 0 for ''
                   ($3.to_i if $2),    # left 0 for '', nil if no "left"
                   $4]                 # dry
-          result = fold8792_1(result, *fold)
+          result = fix_unterminated_line(fold8792_1(trim_empty_lines_around(result), *fold)) # XXX
         when "yaml2json"
           begin
             y = YAML.safe_load(result, aliases: true, filename: loc_str)
@@ -714,16 +714,19 @@ COLORS
         preprocs.each do |proc|
           result = sourcecode_proc(proc, loc_str, result)
         end if preprocs
+        check_input = result
         checks.each do |check|
           case check
+          when "skipheader"
+            check_input = handle_artwork_sourcecode(check_input).sub(/.*?\n\n/m, '')
           when "json"
-            # XXX check for 8792; undo if needed!
+            # check for 8792; undo if needed:
             begin
-              JSON.load(result)
+              JSON.load(handle_artwork_sourcecode(check_input))
             rescue => e
               err1 = "*** #{loc_str}: JSON isn't: #{JSON.dump(e.message[0..40])}\n"
               begin
-                JSON.load("{" << result << "}")
+                JSON.load("{" << check_input << "}")
               rescue => e
                 warn err1 << "***  not even with braces added around: #{JSON.dump(e.message[0..40])}"
               end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kramdown-rfc2629
 version: !ruby/object:Gem::Version
-  version: 1.6.32
+  version: 1.6.34
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-28 00:00:00.000000000 Z
+date: 2023-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown
@@ -182,6 +182,7 @@ files:
 - lib/kramdown-rfc/kdrfc-processor.rb
 - lib/kramdown-rfc/parameterset.rb
 - lib/kramdown-rfc/refxml.rb
+- lib/kramdown-rfc/rexml-formatters-conservative.rb
 - lib/kramdown-rfc/rfc8792.rb
 - lib/kramdown-rfc/svg-id-cleanup.rb
 - lib/kramdown-rfc2629.rb