kramdown-rfc2629 1.5.2 → 1.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4b5c45b8847c6578542b8920d23c017bd22ef3bf35fe005d871c8a305738219
-  data.tar.gz: 2f2ff22d21077a464373dfe592af271457e1f2cfec8c4f353da92e0ffd559e01
+  metadata.gz: 5b97d607db8f40ef48b49955a4bfdb558d77a7d3be7772e5ae3a0249fc47009b
+  data.tar.gz: 3b7902b944cb0b6fc145ddc47de10395600f3f9c4666066d55277e5f78450625
 SHA512:
-  metadata.gz: b9f8b2a133cfc9e511804df4bd7be41ed0b59203a2997d277fb888f2b7b3ac494988f8bb7a9ba084c4ebe7253a141daef4aa8f9c4147329d9a19ba1bdc62a649
-  data.tar.gz: 562538aacef3d53eed6fc976d08e78d72838c8c28ea29a9a47fa65652ebaed34d05fff26bbba1570161740431aa9e9bef487083216ab7833db8ad1e93c0045a3
+  metadata.gz: 48a464f90773790e23dba198a34b4cd192f7595afa56060522480d0d9c667c0ba2dbd47801681f8ee87752045ced2f2266daab44c6fa14326642646098012170
+  data.tar.gz: 5abbd7f58367330c04aaa8849995e72eb06eda9bd5796bbc63fa214b91be5d171ef073c07a418433719ff03b02ea4c23abfe2d7c9af4f5281925498ff5286c65

data/bin/de-gfm

@@ -0,0 +1,38 @@
+#!/usr/bin/env ruby
+
+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/data/kramdown-rfc2629.erb

@@ -69,6 +69,17 @@
 
   <middle>
 
+{:/nomarkdown}
+{:quote: gi="blockquote"}
+{:aside: gi="aside"}
+{:markers: sourcecode-markers="true"}
+{:unnumbered: numbered="false"}
+{:vspace: vspace="0"}
+{:removeinrfc: removeinrfc="true"}
+{:notoc: toc="exclude"}
+{:compact: spacing="compact"}
+{::nomarkdown}
+
 <%= sechash.delete("middle") %>
 
   </middle>

data/kramdown-rfc2629.gemspec

@@ -1,17 +1,18 @@
 spec = Gem::Specification.new do |s|
   s.name = 'kramdown-rfc2629'
-  s.version = '1.5.2'
+  s.version = '1.5.6'
   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-rfc2629.rb

@@ -128,9 +128,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 +379,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"
@@ -548,8 +565,17 @@ COLORS
 
       def convert_blockquote(el, indent, opts)
         text = inner(el, indent, opts)
+        if $options.v3
+          gi = el.attr.delete('gi')
+          if gi && gi != 'ul'
+            "#{' '*indent}<#{gi}#{el_html_attributes(el)}>\n#{text}#{' '*indent}</#{gi}>\n"
+          else
+            "#{' '*indent}<ul#{el_html_attributes_with(el, {"empty" => 'true'})}><li>\n#{text}#{' '*indent}</li></ul>\n"
+          end
+        else
         text = "<t></t>" unless text =~ /</ # empty block quote
         "#{' '*indent}<t><list style='empty'#{el_html_attributes(el)}>\n#{text}#{' '*indent}</list></t>\n"
+        end
       end
 
       def end_sections(to_level, indent)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kramdown-rfc2629
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.6
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-18 00:00:00.000000000 Z
+date: 2021-07-29 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