kramdown-rfc2629 1.3.37 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0bb9b456b3633ec29485193b08210a063ff7f1c907df02f74426f60656e111a9
-  data.tar.gz: e3e38c690c6b105e35b83b2752cf81b13b68b628b46bf0b50c03d0f7ae50e380
+  metadata.gz: e810a295696230d06daa18981cff3c92ad0913175b717027788ee41351d4df6f
+  data.tar.gz: 5d5db17408cc47211883b0d95071139d47fb7fd8d8391cb9eff59217e81c330d
 SHA512:
-  metadata.gz: fb6bbbc4db1e6678e02dc21b2298b1e3a00bbd60dd0ed8442e989ec25416b90bf1c812b5466e13db8200ed4033f4d23ae92b5f17cfa205240e05613992b10584
-  data.tar.gz: 6facefb9d3126390497c2f02af865d4d92c18b0577b5def39c8855d937cac7b160a5cc2fb26704dde9a612b965b9eb10e5f8ad50ff4ba36682c3480c008cce9f
+  metadata.gz: 30d01f719beb7b67932396d4e28f6e1c4f9446029e04555706089e33615c305a673443922927136dad47f974c5c45cd871655a778c97347fa40a6f5454df7970
+  data.tar.gz: ef7be0d8a0b914f67a871e813533ad5eee7280bb31d67047d688ddf164ce124763653980b6c097f4be596be4211d32062efae15e5726d90618aca709cc63a462

data/kramdown-rfc2629.gemspec

@@ -1,10 +1,10 @@
 spec = Gem::Specification.new do |s|
   s.name = 'kramdown-rfc2629'
-  s.version = '1.3.37'
+  s.version = '1.4.1'
   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.}
-  s.add_dependency('kramdown', '~> 1.17.0')
+  s.add_dependency('kramdown', '~> 2.3.0')
   s.add_dependency('certified', '~> 1.0')
   s.add_dependency('json_pure', '~> 2.0')
   s.files = Dir['lib/**/*.rb'] + %w(README.md LICENSE kramdown-rfc2629.gemspec bin/kdrfc bin/kramdown-rfc2629 bin/doilit bin/kramdown-rfc-extract-markdown data/kramdown-rfc2629.erb data/encoding-fallbacks.txt data/math.json)

data/lib/kramdown-rfc2629.rb

@@ -12,7 +12,7 @@ require 'shellwords'
 
 raise "sorry, 1.8 was last decade" unless RUBY_VERSION >= '1.9'
 
-gem 'kramdown', '~> 1.17.0'
+gem 'kramdown', '~> 2.3.0'
 require 'kramdown'
 my_span_elements =  %w{list figure xref eref iref cref spanx vspace}
 Kramdown::Parser::Html::Constants::HTML_SPAN_ELEMENTS.concat my_span_elements
@@ -38,6 +38,8 @@ module Kramdown
         super
         @span_parsers.unshift(:xref)
         @span_parsers.unshift(:iref)
+        @span_parsers.unshift(:span_pi)
+        @block_parsers.unshift(:block_pi)
       end
 
       SECTIONS_RE = /Section(?:s (?:[\w.]+, )*[\w.]+,? and)? [\w.]+/
@@ -112,7 +114,7 @@ module Kramdown
         end
         @tree.children << el
       end
-      define_parser(:xref, XREF_START, '{{')
+      define_parser(:xref, XREF_START, '\{\{')
 
       IREF_START = /\(\(\((.*?)\)\)\)/u
 
@@ -125,6 +127,40 @@ module Kramdown
       end
       define_parser(:iref, IREF_START, '\(\(\(')
 
+      # HTML_INSTRUCTION_RE = /<\?(.*?)\?>/m    # still defined!
+
+      # warn [:OPT_SPACE, OPT_SPACE, HTML_INSTRUCTION_RE].inspect
+
+      PI_BLOCK_START = /^#{OPT_SPACE}<\?/u
+
+      def parse_block_pi
+        # warn [:BLOCK].inspect
+        line = @src.current_line_number
+        if (result = @src.scan(HTML_INSTRUCTION_RE))
+          @tree.children << Element.new(:xml_pi, result, nil, category: :block, location: line)
+          @src.scan(TRAILING_WHITESPACE)
+          true
+        else
+          false
+        end
+      end
+      define_parser(:block_pi, PI_BLOCK_START)
+
+      PI_SPAN_START = /<\?/u
+
+      def parse_span_pi
+        # warn [:SPAN].inspect
+        line = @src.current_line_number
+        if (result = @src.scan(HTML_INSTRUCTION_RE))
+          @tree.children << Element.new(:xml_pi, result, nil, category: :span, location: line)
+        else
+          add_text(@src.getch)
+        end
+      end
+      define_parser(:span_pi, PI_SPAN_START, '<\?')
+
+      # warn [:HERE, @@parsers.keys].inspect
+
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kramdown-rfc2629
 version: !ruby/object:Gem::Version
-  version: 1.3.37
+  version: 1.4.1
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-26 00:00:00.000000000 Z
+date: 2021-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.17.0
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.17.0
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: certified
   requirement: !ruby/object:Gem::Requirement