kramdown-rfc2629 1.3.34 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aea9fb4169327aa3629088261ef7ca4f99b6cdc205326d782a8c43d97818f76b
-  data.tar.gz: 1319c3c4e0435633b9dac413c5ed13384a10b245708b8abf55c8c943178ba9e1
+  metadata.gz: fec107f9381d395a6a6000d553ed820c673ed113d4d7f652f16dfef98aebda64
+  data.tar.gz: 01ccac9bef6597540b689ae5a31600509d18adb489d56dc833940626397df7b0
 SHA512:
-  metadata.gz: 79cedc2bf3905da08feafd6a856d67d4f4928cc53d21ed2035b05607e2ce55bf8ec455cb7a94f67afc4296c813b05668d425d5c280a1f0e61b435c611dd66ad8
-  data.tar.gz: e9026c235426738610a9d3d5a4a2a3d803a5afde25714cab72e4012e882cc285e82755d41d3dfe2d89a8456a044c4c7b1fb14e6f53992db93b3b8d1ac1f2ba1d
+  metadata.gz: d926cdd5b45667c0e70bf6c00485795e97993b64f022199443a03c48ad3edca2078657274302dd93ed657bff0fd1d703dfe951981bfdb3d81ac4c86c033ef759
+  data.tar.gz: 21c2a803dd8203d23f0633e0ac9d254b857c4e84af378f63ae1160d48612d58b556b425c26f83e6fe211315d1e2ee3e9b520bab33fa5ecb3bfcdd33e10dddd1f

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/bin/kramdown-rfc-cache-i-d-bibxml

@@ -0,0 +1,102 @@
+#!/usr/bin/env ruby
+# prerequisite:
+# gem install net-http-persistent
+#
+# dumps all bibxml for current, "Active" I-Ds in cache
+# reasonably efficient after initial call if the output is retained
+#
+# requires Ruby 2.4 or above because of "liberal_parsing" option
+#
+# uses ENV["KRAMDOWN_REFCACHEDIR"] for where you want to have your bibxml3 data
+#
+
+require 'csv'
+require 'fileutils'
+
+begin
+  require 'net/http/persistent'
+rescue
+  warn "*** please install net-http-persistent:"
+  warn "   gem install net-http-persistent"
+  warn "(prefix by sudo only if required)."
+  exit 72                       # EX_OSFILE
+end
+
+
+TARGET_DIR = ENV["KRAMDOWN_REFCACHEDIR"] || (
+  path = File.expand_path("~/.cache/xml2rfc")
+  warn "*** set environment variable KRAMDOWN_REFCACHEDIR to #{path} to actually use the cache"
+  path
+)
+
+FileUtils.mkdir_p(TARGET_DIR)
+FileUtils.chdir(TARGET_DIR)
+
+$http = Net::HTTP::Persistent.new name: 'allid'
+
+KRAMDOWN_PERSISTENT_VERBOSE = true
+
+      def get_and_write_resource_persistently(url, fn, age_verbose=false)
+        t1 = Time.now
+        response = $http.request(URI(url))
+        if response.code != "200"
+          raise "*** Status code #{response.code} while fetching #{url}"
+        else
+          File.write(fn, response.body)
+        end
+        t2 = Time.now
+        warn "#{url} -> #{fn} (#{"%.3f" % (t2 - t1)} s)" if KRAMDOWN_PERSISTENT_VERBOSE
+        if age_verbose
+          if age = response.get_fields("age")
+            warn "(working from a web cache, index is #{age.first} seconds stale)"
+          end
+        end
+      end
+
+CLEAR_RET = "\e[K\r" # XXX all the world is ECMA-48 (ISO 6429), no?
+
+      def noisy(name)
+        print "#{name}...#{CLEAR_RET}"
+      end
+      def clear_noise
+        print CLEAR_RET
+      end
+
+ALL_ID2_SOURCE = "https://www.ietf.org/id/all_id2.txt"
+ALL_ID2_COPY = ".all_id2.txt"
+
+get_and_write_resource_persistently(ALL_ID2_SOURCE, ALL_ID2_COPY, true) unless ENV["KRAMDOWN_DONT_REFRESH_ALL_ID2"]
+ix = File.read(ALL_ID2_COPY).lines.grep_v(/^#/).join
+
+csv = CSV.new(ix, col_sep: "\t", liberal_parsing: true)
+
+drafts = csv.read
+active = drafts.select { |d| d[2] == "Active" }
+active_names = active.map { |a| a[0] }
+puts "#{active_names.size} active drafts"
+
+active_names.each do |name|
+  if name =~ /\Adraft-(.*)-(\d\d)\z/
+    namepart = $1
+    version = $2
+    name0 = "reference.I-D.#{namepart}.xml"
+    noisy(name0) if File.exists?(name0)
+    name1 = "reference.I-D.draft-#{namepart}-#{version}.xml"
+    if File.exists?(name1)
+      noisy(name1)
+      FileUtils.touch(name0)    # because name1 already exists, we believe name0 is fresh
+    else
+      begin
+        url0 = "https://datatracker.ietf.org/doc/bibxml3/draft-#{namepart}/xml"
+        get_and_write_resource_persistently(url0, name0) # get name0 first
+        url1 = "https://datatracker.ietf.org/doc/bibxml3/draft-#{namepart}-#{version}/xml"
+        get_and_write_resource_persistently(url1, name1) # then name1 to mark this as updated
+      rescue => e
+        warn "*** #{name0}: #{e}"
+      end
+    end
+  else
+    warn "*** Malformed draft name: #{name}"
+  end
+end
+clear_noise

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,15 +1,16 @@
 spec = Gem::Specification.new do |s|
   s.name = 'kramdown-rfc2629'
-  s.version = '1.3.34'
+  s.version = '1.4.2'
   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)
   s.require_path = 'lib'
-  s.executables = ['kramdown-rfc2629', 'doilit', 'kramdown-rfc-extract-markdown', 'kdrfc']
+  s.executables = ['kramdown-rfc2629', 'doilit', 'kramdown-rfc-extract-markdown',
+                   'kdrfc', 'kramdown-rfc-cache-i-d-bibxml']
   s.required_ruby_version = '>= 2.3.0'
   # s.requirements = 'wget'
   #  s.has_rdoc = true

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 -NXqa", stdin_data: result1);
         capture_croak("svgcheck", err)
         # warn ["svgcheck:", result1.inspect]
         if result1 == ''
@@ -428,7 +464,7 @@ COLORS
             "#{' '*indent}<figure#{el_html_attributes(el)}><artset><artwork #{html_attributes(artwork_attr.merge("type"=> "svg"))}>#{result1.sub(/.*?<svg/m, "<svg")}</artwork><artwork #{html_attributes(artwork_attr.merge("type"=> "ascii-art"))}><![CDATA[#{result}#{result =~ /\n\Z/ ? '' : "\n"}]]></artwork></artset></figure>\n"
           else
             gi ||= (
-              if !$options.v3 || !t || ARTWORK_TYPES.include?(t)
+              if !$options.v3 || !t || ARTWORK_TYPES.include?(t) || artwork_attr["align"]
                 "artwork"
               else
                 "sourcecode"
@@ -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.34
+  version: 1.4.2
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-18 00:00:00.000000000 Z
+date: 2021-04-06 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
@@ -61,6 +61,7 @@ executables:
 - doilit
 - kramdown-rfc-extract-markdown
 - kdrfc
+- kramdown-rfc-cache-i-d-bibxml
 extensions: []
 extra_rdoc_files: []
 files:
@@ -68,6 +69,7 @@ files:
 - README.md
 - bin/doilit
 - bin/kdrfc
+- bin/kramdown-rfc-cache-i-d-bibxml
 - bin/kramdown-rfc-extract-markdown
 - bin/kramdown-rfc2629
 - data/encoding-fallbacks.txt