kramdown-rfc2629 1.6.8 → 1.6.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d59387d706ba44ac2ac591f8d2dbddeae8d1a4b451fa8252b6231f655fbce56
-  data.tar.gz: f059d6c8a0006257317423d23c5a8478b722e00bf33d441e7f892d67248fa2bb
+  metadata.gz: a7e2b28056c1ef692cd6de23d4436dd71ee6be8020d276f400965b61b59d779c
+  data.tar.gz: 143b99d9d781337fc783fc993504d4e691dc24ce4f228f7132e02dc6594c3bc0
 SHA512:
-  metadata.gz: 93865dc7e09b2a905a58873beb724d9d7a8c7b66b2d012c88bd562fa0ecc667558b44765c304a174d339c8ea89b4cb6e72b47aa35463e0ba6dba6e0d3909dc16
-  data.tar.gz: c85e67c72649fd7fd702713572118300e10d24146c04008ba681b892ed985fc1c4918f9bf3a7f61b040096fe4bc29ded9b3c1632fd89cabb47a54cb6571589a3
+  metadata.gz: b39291781b26db62fb2cf7c37f00d2a855b1f50d725c3a4e6dbba56eea1e3f432ceb93dc2adbda26ed8f59bca0a59519ccf24cbef23c62b97600599120da8811
+  data.tar.gz: 7631706a9ac2935ff3d882ff34910dd1db0a7fcebe2ccd7e4648a012ad50cff8a5afbbb52e5ca1d40e98680ddf1bbf2228592130345580d4a5ca8d8fd64762d6

data/bin/doilit

@@ -12,6 +12,7 @@ require 'kramdown-rfc/refxml'
 ACCEPT_CITE_JSON = {"Accept" => "application/citeproc+json"}
 
 $verbose = false
+$fuzzy = false
 $handle = "a"
 $xml = false
 
@@ -25,6 +26,9 @@ ARGV.each do |doi|
       warn '*** please "gem install open-uri-cached" to enable caching'
     end
     next
+  when "-f"
+    $fuzzy = true
+    next
   when "-v"
     $verbose = true
     next
@@ -36,7 +40,7 @@ ARGV.each do |doi|
     $xml = true
     next
   when /\A-/
-    warn "*** Usage: doilit [-c] [-v] [-h=handle|-x=xmlhandle] doi..."
+    warn "*** Usage: doilit [-c] [-f] [-v] [-h=handle|-x=xmlhandle] doi..."
     exit 1
   end
   cite = JSON.parse(URI("https://dx.doi.org/#{doi}").open(ACCEPT_CITE_JSON).read)
@@ -72,6 +76,13 @@ ARGV.each do |doi|
       end
     end
   end
+  if !lit.key?("date") && $fuzzy && (iss = cite["created"])
+    if dp = iss["date-parts"]
+      if Integer === (dp = dp[0])[0]
+        lit["date"] = ["%04d" % dp[0], *dp[1..-1].map {|p| "%02d" % p}].join("-")
+      end
+    end
+  end
   if (ct = cite["container-title"]) && ct != []
     info = []
     if v = cite["volume"]

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

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+# -*- coding: utf-8 -*-
+require 'rexml/document'
+require 'kramdown-rfc/autolink-iref-cleanup'
+
+d = REXML::Document.new(ARGF.read)
+autolink_iref_cleanup(d)
+puts d.to_s

data/data/kramdown-rfc2629.erb

@@ -29,7 +29,7 @@
     ps["consensus"] = true if MUST_CONSENSUS[cat]
   end
   rfcattrs = ps.attrs("ipr", "docName=docname", "category=cat",
-                      "consensus", "submissionType=submissiontype", "xml:lang=lang",
+                      "consensus", "submissionType=submissiontype=stream", "xml:lang=lang",
                       "number", "obsoletes", "updates", "seriesNo=seriesno")
   TRUE_FALSE = {nil => "true", false => "false", true => "true",
                 "yes" => "true", "no" => "false"}

data/kramdown-rfc2629.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s|
   s.name = 'kramdown-rfc2629'
-  s.version = '1.6.8'
+  s.version = '1.6.11'
   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.}
@@ -8,11 +8,13 @@ spec = Gem::Specification.new do |s|
   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/kramdown-rfc-autolink-iref-cleanup.rb 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 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',
-                   'kramdown-rfc-cache-subseries-bibxml', 'de-gfm']
+                   'kramdown-rfc-cache-subseries-bibxml',
+                   'kramdown-rfc-autolink-iref-cleanup',
+                   'de-gfm']
   s.required_ruby_version = '>= 2.3.0'
   # s.requirements = 'wget'
   #  s.has_rdoc = true

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

@@ -0,0 +1,29 @@
+require 'rexml/document'
+
+def autolink_iref_cleanup(d)
+
+  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
+
+end

data/lib/kramdown-rfc/command.rb

@@ -254,6 +254,10 @@ def xml_from_sections(input)
     end
   end
 
+  if o = ps[:'autolink-iref-cleanup']
+    $options.autolink_iref_cleanup = o
+  end
+
   coding_override = ps.has(:coding)
   smart_quotes = ps[:smart_quotes]
   typographic_symbols = ps[:typographic_symbols]
@@ -570,6 +574,15 @@ if $options.v3_used && !$options.v3
   $options.v3 = true
 end
 
+if $options.autolink_iref_cleanup
+  require 'rexml/document'
+  require 'kramdown-rfc/autolink-iref-cleanup'
+
+  d = REXML::Document.new(output)
+  autolink_iref_cleanup(d)
+  output = d.to_s
+end
+
 if coding_override
   output = output.encode(Encoding.find(coding_override), fallback: FALLBACK)
 end

data/lib/kramdown-rfc/parameterset.rb

@@ -27,13 +27,15 @@ module KramdownRFC
     def has(pn)
       @f[pn.to_s]
     end
+    def has?(pn)
+      @f.key?(pn.to_s)
+    end
     def escattr(str)
       escape_html(str.to_s, :attribute)
     end
-    def van(pn)                   # pn is a parameter name, possibly with an =alias
-      an, pn = pn.to_s.split("=")
-      pn ||= an
-      [self[pn] || self[an], an]
+    def van(pn)         # pn is a parameter name, possibly with =aliases
+      names = pn.to_s.split("=")
+      [self[names.reverse.find{|nm| has?(nm)}], names.first]
     end
     def attr(pn)
       val, an = van(pn)

data/lib/kramdown-rfc2629.rb

@@ -14,7 +14,7 @@ raise "sorry, 1.8 was last decade" unless RUBY_VERSION >= '1.9'
 
 gem 'kramdown', '~> 2.4.0'
 require 'kramdown'
-my_span_elements =  %w{list figure xref eref iref cref spanx vspace}
+my_span_elements =  %w{list xref eref iref cref spanx vspace}
 Kramdown::Parser::Html::Constants::HTML_SPAN_ELEMENTS.concat my_span_elements
 
 require 'rexml/parsers/baseparser'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kramdown-rfc2629
 version: !ruby/object:Gem::Version
-  version: 1.6.8
+  version: 1.6.11
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-30 00:00:00.000000000 Z
+date: 2022-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown
@@ -78,6 +78,7 @@ executables:
 - kdrfc
 - kramdown-rfc-cache-i-d-bibxml
 - kramdown-rfc-cache-subseries-bibxml
+- kramdown-rfc-autolink-iref-cleanup
 - de-gfm
 extensions: []
 extra_rdoc_files: []
@@ -88,7 +89,7 @@ files:
 - bin/doilit
 - bin/kdrfc
 - bin/kramdown-rfc
-- bin/kramdown-rfc-autolink-iref-cleanup.rb
+- bin/kramdown-rfc-autolink-iref-cleanup
 - bin/kramdown-rfc-cache-i-d-bibxml
 - bin/kramdown-rfc-cache-subseries-bibxml
 - bin/kramdown-rfc-extract-markdown
@@ -97,6 +98,7 @@ files:
 - data/kramdown-rfc2629.erb
 - data/math.json
 - kramdown-rfc2629.gemspec
+- lib/kramdown-rfc/autolink-iref-cleanup.rb
 - lib/kramdown-rfc/command.rb
 - lib/kramdown-rfc/erb.rb
 - lib/kramdown-rfc/gzip-clone.rb

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

@@ -1,31 +0,0 @@
-#!/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