kramdown-rfc2629 1.6.4 → 1.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3216df18368295dd7cd569731da214ec39f57132880c8d12d51f9dc02dce30fb
-  data.tar.gz: e2f0bfaf8d5b96bc2451d93c6c08a636b0b013420201821bff611918a87e7922
+  metadata.gz: 452cf1c47c8482b1c9067aae060966a7cd45026dc917e0959895398d97006d66
+  data.tar.gz: be26600191bf4b7421c333801117f8be4ac5b5430bd60dc28a83781f551488bc
 SHA512:
-  metadata.gz: acfa4b9493d9cd4eb39ea67665a86a249915aa5f537ddbff53e6add625a0576223dc93bc9cb6ffb192f61c1805f892940c667153a9a316b5a7195820135e5365
-  data.tar.gz: 56de1bff6b8db68224ea994c8604dc75dd1ef99f01705ea04a704be0b1d635bdfa229296f9ad5a9c6a5263812da6dfa4b9d955035dd5f20a64d11b657afd7fca
+  metadata.gz: fdd3f6e6fd3fbb4cd659c6470e879423e99a81c1a636a1665d7c92fa997bdcf610bd9fc9dceec43382d8357d993e8668851a290b23b7d658296550d6439caddf
+  data.tar.gz: 45079be5f0fc24eccc320fc638d177ebbe68ca5e3ee36ae2639c82256116c194b44e30944bbffe371c44a04b2e7c71ea63d6eee1ab7f84fb29fae74fe9c88cc8

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.4'
+  s.version = '1.6.7'
   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
@@ -722,7 +722,12 @@ COLORS
             attrstring = html_attributes({'slugifiedName' => sl})
           end
           # noabbrev: true -- Workaround for https://trac.ietf.org/trac/xml2rfc/ticket/683
-          irefs = "<name#{attrstring}>#{inner(el, indent, opts.merge(noabbrev: true))}</name>" #
+          nm = inner(el, indent, opts.merge(noabbrev: true))
+          if ttl = el.attr['title']
+            warn "*** Section has two titles: >>#{ttl}<< and >>#{nm}<<"
+            warn "*** Do you maybe have a loose IAL?"
+          end
+          irefs = "<name#{attrstring}>#{nm}</name>" #
         else
         clean, irefs = clean_pcdata(inner_a(el, indent, opts))
         el.attr['title'] = clean

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kramdown-rfc2629
 version: !ruby/object:Gem::Version
-  version: 1.6.4
+  version: 1.6.7
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-05 00:00:00.000000000 Z
+date: 2022-04-27 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).