kramdown-rfc2629 1.3.36 → 1.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a7a8c78c412d9bf4830f3335bba088f220a983e391057bdf90cad5d716d2d2f
-  data.tar.gz: 8fbac5333fb0e14e732aac23ba11b9a110fe8ca9948e6aa89ce953e88c95a193
+  metadata.gz: 7e7f64c0113454bd1d11678a4864ba747b38599658bb2b4b615d74227dd4d4a3
+  data.tar.gz: dfe8ea03a5bb3337a0f42919ce5d0ba79cfd76becca7b9a5d885831483c699ad
 SHA512:
-  metadata.gz: 889c151d93059ebd22e6adb9b7bc295206056c70ae69adab2c300b736c9b3037d7a7ec1af865ff7aeba29af5a4d3ab82525aebbd1bcddb8fb9f8ad2b9ba5c0af
-  data.tar.gz: 9e067408ad82182fb0ae4f0461b0e47db3888d3839b6a1e2915333fd1acffa34c783b8a7185ebe8afdb56a64a89854638de1c1d6a2c781aa95c4c093e58793fb
+  metadata.gz: 58c3c7d9e995537cfaf0445f995b4780f27ce75da3154a83bb9403775c312b3ab730fabc82e7b14e5d327bb176f8c034a0e8a3b5fd78c7d15b31456581b84cc3
+  data.tar.gz: edb193bc7b1330b7a33381c4cc051c7b1f8a103c6eccd8118650124af2cd6df2e0ef725ee523c65997830b9c36b5677852e8cc9b9c863797d5cccfeb55eff6f1

data/README.md

@@ -616,7 +616,7 @@ Other human-oriented markup input languages that are being used for authoring RF
 Since kramdown version 1.0, kramdown itself is MIT licensed, which
 made it possible to license kramdown-rfc2629 under the same license.
 
-[kramdown]: http://kramdown.rubyforge.org/
+[kramdown]: https://kramdown.gettalong.org
 [kdsyntax]: http://kramdown.gettalong.org/syntax.html
 [kdsyntax-ial]: http://kramdown.gettalong.org/syntax.html#inline-attribute-lists
 [stupid]: http://tools.ietf.org/id/draft-hartke-xmpp-stupid-00

data/bin/kdrfc

@@ -127,6 +127,9 @@ BANNER
   opts.on("-p", "--[no-]prep", "Convert xml to prepped xml") do |v|
     $options.prep = v
   end
+  opts.on("-P", "--[no-]pdf", "Convert xml to PDF") do |v|
+    $options.pdf = v
+  end
   opts.on("-c", "--[no-]convert", "Convert xml to v3 xml") do |v|
     $options.v2v3 = v
   end
@@ -150,6 +153,7 @@ def process_the_xml(fn, base)
   process_xml(fn, "#{base}.v2v3.xml", "--v2v3") if $options.v2v3
   process_xml(fn, "#{base}.txt") if $options.txt || $options.idnits
   process_xml(fn, "#{base}.html", "--html") if $options.html
+  process_xml(fn, "#{base}.pdf", "--pdf") if $options.pdf
   run_idnits("#{base}.txt") if $options.idnits
 end
 

data/data/kramdown-rfc2629.erb

@@ -108,6 +108,13 @@
        aups = KramdownRFC::authorps_from_hash(au)
    -%>
 <%= KramdownRFC::person_element_from_aups("contact", aups) -%>
+<%= if contrib = aups["contribution"]
+    <<CONTRIBUTION
+{:/nomarkdown}
+#{contrib}
+{::nomarkdown}
+CONTRIBUTION
+    end -%>
 <%   aups.warn_if_leftovers  -%>
 <%   end -%>
 <% end -%>

data/kramdown-rfc2629.gemspec

@@ -1,10 +1,10 @@
 spec = Gem::Specification.new do |s|
   s.name = 'kramdown-rfc2629'
-  s.version = '1.3.36'
+  s.version = '1.4.4'
   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-rfc/refxml.rb

@@ -32,6 +32,7 @@ module KramdownRFC
   <format type="<%=escattr(k)%>" target="<%=escattr(v)%>"/>
 <% end -%>
 <%= vps.ele("annotation=ann", nil, nil, true) -%>
+<%= vps.ele("refcontent=rc", nil, nil, true) -%>
 </reference>
     REFERB
     ret = erb.result(binding)

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
 
@@ -363,7 +399,7 @@ COLORS
         # warn ["goat:", result1.inspect]
         file.unlink
         result1 = svg_clean(result1) unless t == "goat"
-        result1, err, _s = Open3.capture3("svgcheck -qa", stdin_data: result1);
+        result1, err, _s = Open3.capture3("svgcheck -Xqa", stdin_data: result1);
         capture_croak("svgcheck", err)
         # warn ["svgcheck:", result1.inspect]
         if result1 == ''
@@ -662,7 +698,11 @@ COLORS
       end
 
       def convert_br(el, indent, opts)
-        "<vspace />"
+        if $options.v3
+          "<br />"
+        else
+          "<vspace />"
+        end
       end
 
       def convert_a(el, indent, opts)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kramdown-rfc2629
 version: !ruby/object:Gem::Version
-  version: 1.3.36
+  version: 1.4.4
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-23 00:00:00.000000000 Z
+date: 2021-04-29 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
@@ -100,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: Kramdown extension for generating RFC 7749 XML.