kramdown-rfc2629 1.6.5 → 1.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0115e72b1d82f546c2681cc3f25a9e473b976bd32f70cf5c922cf31345a24b3
-  data.tar.gz: 914787571e83ab08a6a355ca280fe4e85c79d00fd4c25446702edf824b39f968
+  metadata.gz: 6d59387d706ba44ac2ac591f8d2dbddeae8d1a4b451fa8252b6231f655fbce56
+  data.tar.gz: f059d6c8a0006257317423d23c5a8478b722e00bf33d441e7f892d67248fa2bb
 SHA512:
-  metadata.gz: d07f0c3c4d96dd0dfb9833ec57dcf6b1221aee08d1df3d0819a8263e1f499a152661e8e2d0d6cf0cb40a16083f2ea8abd416849c500a6fad60c37722166ba18a
-  data.tar.gz: f7a157dc317405b405a02a39b459e510e5a6cff2488f79abe261501c40cb6d1ed152034a49ddfd90cfb274cc8c8eb5962d043624a6d856354a63b34f8fefb3c6
+  metadata.gz: 93865dc7e09b2a905a58873beb724d9d7a8c7b66b2d012c88bd562fa0ecc667558b44765c304a174d339c8ea89b4cb6e72b47aa35463e0ba6dba6e0d3909dc16
+  data.tar.gz: c85e67c72649fd7fd702713572118300e10d24146c04008ba681b892ed985fc1c4918f9bf3a7f61b040096fe4bc29ded9b3c1632fd89cabb47a54cb6571589a3

data/bin/de-gfm

@@ -5,19 +5,22 @@ Encoding.default_external = "UTF-8" # wake up, smell the coffee
 require 'kramdown'
 require 'kramdown-parser-gfm'
 
-if ARGV[0] == '-k'              # kramdown
-  MARKDOWN_BR = "\\\\\n"
+options = ''
+while /\A-([4bck]+)\z/ === ARGV[0]
   ARGV.shift
+  options << $1
+end
+
+if /k/ === options              # kramdown
+  MARKDOWN_BR = "\\\\\n"
 end
 
-if ARGV[0] == '-c'              # commonmark
+if /c/ === options              # commonmark
   MARKDOWN_BR = "\\\n"
-  ARGV.shift
 end
 
-if ARGV[0] == '-b'              # universal HTML
+if /b/ === options              # universal HTML
   MARKDOWN_BR = "<br/>\n"
-  ARGV.shift
 end
 
 MARKDOWN_BR ||= "  \n"          # original Gruber
@@ -37,4 +40,9 @@ module Kramdown
   end
 end
 
-puts Kramdown::Document.new(ARGF.read, input: 'GFM', gfm_quirks: 'paragraph_end').to_kramdown
+list_indent = 2
+list_indent = 4 if /4/ === options
+
+doc = Kramdown::Document.new(ARGF.read, input: 'GFM', gfm_quirks: 'paragraph_end',
+                             list_indent: list_indent)
+puts doc.to_kramdown

data/bin/kramdown-rfc-autolink-iref-cleanup.rb

@@ -0,0 +1,31 @@
+#!/usr/bin/env ruby
+# -*- coding: utf-8 -*-
+require 'rexml/document'
+
+d = REXML::Document.new(ARGF.read)
+
+d.root.get_elements("//section[@anchor]").each do |sec|
+  anchor = sec['anchor']
+  irefs = {}
+  sec.get_elements(".//xref[@target='#{anchor}'][@format='none']").each do |xr|
+    ne = xr.next_element
+    if ne && ne.name == "iref" && (item = ne['item'])
+      irefs[item] = ne['subitem'] # XXX one subitem only
+      ne.remove
+      chi = xr.children
+      chi[1..-1].reverse.each do |ch|
+        xr.parent.insert_after(xr, ch)
+      end
+      xr.replace_with(chi[0])
+    end
+  end
+  irefs.each do |k, v|
+    sec.insert_after(sec.get_elements("name").first, 
+                     e = REXML::Element.new("iref", sec))
+    e.attributes["item"] = k
+    e.attributes["subitem"] = v
+    e.attributes["primary"] = 'true'
+  end
+end
+
+puts d.to_s

data/data/kramdown-rfc2629.erb

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="<%=ps[:coding]||"UTF-8"%>"?>
   <?xml-stylesheet type="text/xsl" href="rfc2629.xslt" ?>
-  <!-- generated by https://github.com/cabo/kramdown-rfc2629 version <%=
+  <!-- generated by https://github.com/cabo/kramdown-rfc version <%=
     Gem.loaded_specs["kramdown-rfc2629"].version rescue nil 
     %> (Ruby <%= RUBY_VERSION %>) -->
 

data/kramdown-rfc2629.gemspec

@@ -1,14 +1,14 @@
 spec = Gem::Specification.new do |s|
   s.name = 'kramdown-rfc2629'
-  s.version = '1.6.5'
+  s.version = '1.6.8'
   s.summary = "Kramdown extension for generating RFCXML (RFC 799x)."
   s.description = %{An RFCXML (RFC 799x) 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', '~> 2.4.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-rfc 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.files = Dir['lib/**/*.rb'] + %w(README.md LICENSE kramdown-rfc2629.gemspec bin/kdrfc bin/kramdown-rfc 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/kramdown-rfc-autolink-iref-cleanup.rb bin/de-gfm)
   s.require_path = 'lib'
   s.executables = ['kramdown-rfc', 'kramdown-rfc2629', 'doilit', 'kramdown-rfc-extract-markdown',
                    'kdrfc', 'kramdown-rfc-cache-i-d-bibxml',
@@ -18,6 +18,6 @@ spec = Gem::Specification.new do |s|
   #  s.has_rdoc = true
   s.author = "Carsten Bormann"
   s.email = "cabo@tzi.org"
-  s.homepage = "http://github.com/cabo/kramdown-rfc2629"
+  s.homepage = "http://github.com/cabo/kramdown-rfc"
   s.license = 'MIT'
 end

data/lib/kramdown-rfc/command.rb

@@ -229,7 +229,7 @@ def xml_from_sections(input)
   unless ENV["KRAMDOWN_NO_SOURCE"]
     require 'kramdown-rfc/gzip-clone'
     require 'base64'
-    compressed_input = Gzip.compress(input)
+    compressed_input = Gzip.compress_m0(input)
     $source = Base64.encode64(compressed_input)
   end
 
@@ -485,7 +485,7 @@ Usage: kramdown-rfc2629 [options] file.md|file.mkd > file.xml
 Version: #{KDRFC_VERSION}
 BANNER
   opts.on("-V", "--version", "Show version and exit") do |v|
-    puts "kramdown-rfc2629 #{KDRFC_VERSION}"
+    puts "kramdown-rfc #{KDRFC_VERSION}"
     exit
   end
   opts.on("-H", "--help", "Show option summary and exit") do |v|

data/lib/kramdown-rfc/gzip-clone.rb

@@ -24,10 +24,11 @@ require 'stringio'
       Zlib::GzipReader.new(StringIO.new(source)).read
     end
 
-    # Compresses a string using gzip.
-    def self.compress(source, level=Zlib::DEFAULT_COMPRESSION, strategy=Zlib::DEFAULT_STRATEGY)
+    # Compresses a string using gzip, setting mtime to 0
+    def self.compress_m0(source, level=Zlib::DEFAULT_COMPRESSION, strategy=Zlib::DEFAULT_STRATEGY)
       output = Stream.new
       gz = Zlib::GzipWriter.new(output, level, strategy)
+      gz.mtime = 0
       gz.write(source)
       gz.close
       output.string

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', '~> 2.3.0'
+gem 'kramdown', '~> 2.4.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
@@ -113,7 +113,7 @@ module Kramdown
         end
       end
 
-      XREF_START = /\{\{(?:(?:\{(.*?)\}(?:\{(.*?)\})?)|(\X*?))((?:\}\})|\})/u
+      XREF_START = /\{\{(?:(?:\{(.*?\n??.*?)\}(?:\{(.*?\n??.*?)\})?)|(\X*?))((?:\}\})|\})/u
 
       # Introduce new {{target}} syntax for empty xrefs, which would
       # otherwise be an ugly ![!](target) or ![ ](target)
@@ -124,9 +124,9 @@ module Kramdown
           warn "*** #{@src[0]}: unmatched braces #{@src[4].inspect}"
         end
         if contact_name = @src[1]
-          attr = {'fullname' => contact_name}
+          attr = {'fullname' => contact_name.gsub("\n", " ")}
           if ascii_name = @src[2]
-            attr["asciiFullname"] = ascii_name
+            attr["asciiFullname"] = ascii_name.gsub("\n", " ")
           end
           el = Element.new(:contact, nil, attr)
         else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kramdown-rfc2629
 version: !ruby/object:Gem::Version
-  version: 1.6.5
+  version: 1.6.8
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-08 00:00:00.000000000 Z
+date: 2022-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: kramdown-parser-gfm
   requirement: !ruby/object:Gem::Requirement
@@ -88,6 +88,7 @@ files:
 - bin/doilit
 - bin/kdrfc
 - bin/kramdown-rfc
+- bin/kramdown-rfc-autolink-iref-cleanup.rb
 - bin/kramdown-rfc-cache-i-d-bibxml
 - bin/kramdown-rfc-cache-subseries-bibxml
 - bin/kramdown-rfc-extract-markdown
@@ -104,7 +105,7 @@ files:
 - lib/kramdown-rfc/refxml.rb
 - lib/kramdown-rfc/rfc8792.rb
 - lib/kramdown-rfc2629.rb
-homepage: http://github.com/cabo/kramdown-rfc2629
+homepage: http://github.com/cabo/kramdown-rfc
 licenses:
 - MIT
 metadata: {}
@@ -123,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.11
 signing_key:
 specification_version: 4
 summary: Kramdown extension for generating RFCXML (RFC 799x).