kramdown-rfc2629 1.5.3 → 1.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aca914cd77e805824fc1d15d642e3f0e453f12e5ffe0ee17f56b0a497b047382
-  data.tar.gz: df4c1b4c6d73a796183ba2bf8503ff8b7b943025fd61842767250de4107b27be
+  metadata.gz: f5fb1bbe625f32a0996caf7953ccdfb120dc675f98e3629ec4f0b1eb778952e2
+  data.tar.gz: 89b8e32c14263fb7ac0dc4ccd34f7cdbe9c0c264bce65e10f36c12fd9fda68a9
 SHA512:
-  metadata.gz: 5219932525720483e742f5c0e0bb90957c1766c9a019c76491b45b05351e3a864be4ff69bebff5ec942dfb39a090c4b0fbf7f6b4b502f4f526105b46b03c00ca
-  data.tar.gz: eb2d6d95a67cb80ca52ba46eb299d6edb4a11d9e760c09c36377372876b8c99cfcfd36b6e6461a47797d7e15bd85c3ce1f9e00aa8317a1140361cfea7658cfee
+  metadata.gz: ff5b6843cfd27a6195c4a8a3a9735c8c180be6d376799d68c09ddbfcdd55919f33ed75ab6ae4e826252e2fdfc2b1c3c1ce91a548954ec9e8a4669e580c05ab6e
+  data.tar.gz: a7c3f4fe40f33059be269ffd6342b46e924b93751d43da1cb71ba356a1bec3e550a026bf2f6f6da0505813a0ab97ed845d40cad9cda411b2ff11cc95d138218d

data/bin/de-gfm

@@ -0,0 +1,40 @@
+#!/usr/bin/env ruby -Ku
+
+Encoding.default_external = "UTF-8" # wake up, smell the coffee
+
+require 'kramdown'
+require 'kramdown-parser-gfm'
+
+if ARGV[0] == '-k'              # kramdown
+  MARKDOWN_BR = "\\\\\n"
+  ARGV.shift
+end
+
+if ARGV[0] == '-c'              # commonmark
+  MARKDOWN_BR = "\\\n"
+  ARGV.shift
+end
+
+if ARGV[0] == '-b'              # universal HTML
+  MARKDOWN_BR = "<br/>\n"
+  ARGV.shift
+end
+
+MARKDOWN_BR ||= "  \n"          # original Gruber
+
+module Kramdown
+
+  module Converter
+
+    # Converts an element tree to the kramdown format.
+    class Kramdown < Base
+
+      # Argh
+      def convert_br(_el, _opts)
+        MARKDOWN_BR
+      end
+    end
+  end
+end
+
+puts Kramdown::Document.new(ARGF.read, input: 'GFM', gfm_quirks: 'paragraph_end').to_kramdown

data/bin/kramdown-rfc2629

@@ -12,6 +12,24 @@ KDRFC_VERSION=Gem.loaded_specs["kramdown-rfc2629"].version rescue "unknown-versi
 
 Encoding.default_external = "UTF-8" # wake up, smell the coffee
 
+# Note that this doesn't attempt to handle HT characters
+def remove_indentation(s)
+  l = s.lines
+  indent = l.grep(/\S/).map {|l| l[/^\s*/].size}.min
+  l.map {|li| li.sub(/^ {0,#{indent}}/, "")}.join
+end
+
+def add_quote(s)
+  l = s.lines
+  l.map {|li| "> #{li}"}.join
+end
+
+def process_chunk(s, dedent, quote)
+  s = remove_indentation(s) if dedent
+  s = add_quote(s) if quote
+  s
+end
+
 def boilerplate(key)
   case key.downcase
   when /\Abcp14(info)?(\+)?(-tagged)?\z/i
@@ -437,8 +455,34 @@ if input[-1] != "\n"
   # warn "*** added missing newline at end"
   input << "\n"                 # fix #26
 end
-input.gsub!(/^\{::include\s+(.*?)\}/) {
-  File.read($1).chomp
+input.gsub!(/^\{::include((?:-[a-z]+)*)\s+(.*?)\}/) {
+  include_flags = $1
+  fn = [$2]
+  chunks = false
+  dedent = false
+  quote = false
+  include_flags.split("-") do |flag|
+    case flag
+    when ""
+    when "quote"
+      quote = true
+    when "dedent"
+      dedent = true
+    when "all", "last"
+      fn = fn.flat_map{|n| Dir[n]}
+      fn = [fn.last] if flag == "last"
+      chunks = fn.map{ |f|
+        ret = process_chunk(File.read(f), dedent, quote)
+        dedent = false; quote = false
+        ret
+      }
+    else
+      warn "** unknown include flag #{flag}"
+    end
+  end
+  chunks = fn.map{|f| File.read(f)} unless chunks # no all/last
+  chunks = chunks.map {|ch| process_chunk(ch, dedent, quote)}
+  chunks.join.chomp
 } unless ENV["KRAMDOWN_SAFE"]
 input.gsub!(/^\{::boilerplate\s+(.*?)\}/) {
   boilerplate($1)

data/kramdown-rfc2629.gemspec

@@ -1,17 +1,18 @@
 spec = Gem::Specification.new do |s|
   s.name = 'kramdown-rfc2629'
-  s.version = '1.5.3'
+  s.version = '1.5.7'
   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', '~> 2.3.0')
+  s.add_dependency('kramdown-parser-gfm', '~> 1.1')
   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.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 bin/kramdown-rfc-cache-subseries-bibxml bin/de-gfm)
   s.require_path = 'lib'
   s.executables = ['kramdown-rfc2629', 'doilit', 'kramdown-rfc-extract-markdown',
                    'kdrfc', 'kramdown-rfc-cache-i-d-bibxml',
-                   'kramdown-rfc-cache-subseries-bibxml']
+                   'kramdown-rfc-cache-subseries-bibxml', 'de-gfm']
   s.required_ruby_version = '>= 2.3.0'
   # s.requirements = 'wget'
   #  s.has_rdoc = true

data/lib/kramdown-rfc/refxml.rb

@@ -51,6 +51,10 @@ module KramdownRFC
     # -- only works for people with exactly one last name and uncomplicated first names
     if n = aups.rest["name"]
       n = n.split
+      if s = aups.rest["surname"]
+        s = s.split
+        # XXX remove s from n; use n[0..-2] otherwise.
+      end
       aups.rest["initials"] ||= n[0..-2].map(&:chr).join('.') << '.'
       aups.rest["surname"] ||= n[-1]
     end

data/lib/kramdown-rfc2629.rb

@@ -54,7 +54,11 @@ module Kramdown
       def self.idref_cleanup(href)
         # can't start an IDREF with a number or reserved start
         if href =~ / /
-          warn "** space(s) in cross-reference '#{href}' -- are you trying to use section references?"
+          if $options.v3
+            warn "** space(s) in cross-reference '#{href}' -- are you trying to use section references?"
+          else
+            warn "** space(s) in cross-reference '#{href}' -- note that section references are supported in v3 mode only."
+          end
         end
         href.gsub(/\A(?:[0-9]|section-|u-|figure-|table-|iref-)/) { "_#{$&}" }
       end
@@ -128,9 +132,14 @@ module Kramdown
             when /\A(.*) \((#{SECTIONS_RE})\)\z/
               href = $1
               handle_bares($2, attr, "parens", href)
-            when /\A(#{XREF_BASE})<(.+)\z/
-              href = $2
-              attr['section'] = $1
+            when /#{XREF_RE_M}<(.+)\z/
+              href = $3
+              if $2
+                attr['section'] = $2
+                attr['relative'] = "#" << $1
+              else
+                attr['section'] = $1
+              end
               attr['sectionFormat'] = 'bare'
             when /\A<<(.+)\z/
               href = $1
@@ -374,8 +383,20 @@ COLORS
         end
       end
 
+      SVG_NAMESPACES = {"xmlns"=>"http://www.w3.org/2000/svg",
+                        "xlink"=>"http://www.w3.org/1999/xlink"}
+
       def svg_clean_kgt(s)
         d = REXML::Document.new(s)
+        REXML::XPath.each(d.root, "/xmlns:svg", SVG_NAMESPACES) do |x|
+          if (w = x.attributes["width"]) && (h = x.attributes["height"])
+            x.attributes["viewBox"] = "0 0 %d %d" % [w, h]
+          end
+          if x.attributes["viewBox"]
+            x.attributes["width"] = nil
+            x.attributes["height"] = nil
+          end
+        end
         REXML::XPath.each(d.root, "//rect|//line|//path") do |x|
           x.attributes["fill"] = "none"
           x.attributes["stroke"] = "black"
@@ -927,7 +948,7 @@ COLORS
                  ],
         "I-D" => ["bibxml3", false, false,
                   ->(fn, n){ [fn,
-                              "https://datatracker.ietf.org/doc/bibxml3/draft-#{n.sub(/\Adraft-/, '')}/xml"] }
+                              "https://datatracker.ietf.org/doc/bibxml3/draft-#{n.sub(/\Adraft-/, '')}.xml"] }
                  ],
         "BCP" => ["bibxml-rfcsubseries", 86400*7, false,
                   ->(fn, n){ Rfc2629::bcp_std_ref("BCP", n) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kramdown-rfc2629
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.5.7
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-23 00:00:00.000000000 Z
+date: 2021-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.3.0
+- !ruby/object:Gem::Dependency
+  name: kramdown-parser-gfm
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: certified
   requirement: !ruby/object:Gem::Requirement
@@ -63,11 +77,13 @@ executables:
 - kdrfc
 - kramdown-rfc-cache-i-d-bibxml
 - kramdown-rfc-cache-subseries-bibxml
+- de-gfm
 extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
+- bin/de-gfm
 - bin/doilit
 - bin/kdrfc
 - bin/kramdown-rfc-cache-i-d-bibxml