kramdown-rfc2629 1.7.19 → 1.7.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9d9adbae37a16a29017726ef2040d260eb1a2cce9d00ff807828c84275d87eb
-  data.tar.gz: 6018923d328495fb77b78886e467d9c24267bc563d37c71dd527c11c7ee1e709
+  metadata.gz: b359e547f2f8f265b1ee961d2956c32073d4a846a4fa813bd9ff8f898d385f08
+  data.tar.gz: 72ecb5162fc2910ceb62d3ee7df6e6902f1fe15540d2761b1e94ee73c60cffb7
 SHA512:
-  metadata.gz: 5f9e4452395530cd215d5fa3f1c701cd393091424e25e42b564f26c55eb2e6d7601e5da7e87dee2cc6587041b960a76c0aa449277b4ac323b4dc4238a595d3af
-  data.tar.gz: d7e408eca15365eb9b8c653dcd3f3dc78a040e6dc599a8e959e7e8ac59e0c630b196d716511ed345547aa5cc1707a1bf2af6a972d83dbeae3fa6ebbebc3ab8b1
+  metadata.gz: a65c817ecab99a017c3335f1e8040ffb37f1e1915e32abea9253cabd7f12014d4176ca2ab8fdd3659ea3d546b9e3ead4c3fd4c7f33ca62f8dd6b3b79bb87606c
+  data.tar.gz: 226b74d1c1a011bbe8631598d91d01c6defaf228c38735405bd86a36456aba3edc74a3cfc27a1e3e91a3f5aa9a7d8075dd34fa35b1b2082ccddea9b339b5a543

data/bin/kramdown-rfc-extract-figures-tables

@@ -0,0 +1,78 @@
+#!/usr/bin/env ruby -KU
+require 'rexml/document'
+require 'yaml'
+require 'optparse'
+
+PROGNAME = $0 # "kramdown-rfc-extract-figures-tables"
+
+target = :section
+targets = [:section, :note]
+require 'optparse'
+begin
+  op = OptionParser.new do |opts|
+    opts.banner = "Usage: #{PROGNAME} [options] [-|document.xml]"
+    opts.on("-tFMT", "--to=FMT", targets, "Target format #{targets.map(&:to_s)}") do |v|
+      target = v
+    end
+  end
+  op.parse!
+rescue Exception => e
+  warn e
+  exit 1
+end
+
+class String
+  def spacify
+    gsub(/\s+/, " ")
+  end
+end
+
+lists = Hash.new { |h, k| h[k] = [] }
+d = REXML::Document.new(ARGF)
+unless d.root
+  warn "** #{PROGNAME}: Cannot parse input"
+  exit 1
+end
+REXML::XPath.each(d.root, %{//figure|//*[name()="table" or name()="texttable"]}) do |x|
+  gi = x.name
+  ref = x[:anchor]
+  # p [gi, ref]
+  out = []
+  REXML::XPath.each(x, "name") do |nm|
+    out << nm.children.map{|ch| ch.to_s}.join
+    # p [gi, out.last]
+  end
+  REXML::XPath.each(x, "@title") do |ttl|
+    out << ttl.to_s.spacify
+    # p [gi, out.last]
+  end
+  gi1 = if gi == "texttable"; "table" else gi end
+  if out == []         # nameless
+    # nameless, anchorless fig doesn't get a number; ignore
+    next if gi == "figure" && !ref
+    # Synthesize name (if not redundant)
+    out = ["#{gi1.capitalize} #{lists[gi1].size + 1}"] if !ref
+  end
+  # p [gi, out]
+  lists[gi1] << [ref, out.join(" ")]
+end
+
+lists.each do |k, v|
+  title = "List of #{k.capitalize}s"
+  case target
+  when :note
+    puts
+    puts "--- note_#{title.gsub(" ", "_")}"
+    puts
+  when :section
+    puts
+    puts "# #{title}"
+    puts "{:unnumbered}"
+  else
+    fail
+  end
+  v.each_with_index do |(ref, ti), n|
+    ti = "[#{ti}](##{ref})" if ref
+    puts "#{n+1}. #{ti}"
+  end
+end

data/bin/kramdown-rfc-lsr

@@ -79,6 +79,15 @@ end
 
 doc = REXML::Document.new(xml)
 
+REXML::XPath.match(doc.root, '//xi:include').each do |el|
+  begin
+    refdoc = REXML::Document.new(URI(el[:href]).open.read)
+    el.replace_with(refdoc.root)
+  rescue => e
+    warn "*** error getting xinclude #{el} resolved: #{e}"
+  end
+end
+
 def series_info_to_URI(si)
   case si[:name]
   when "RFC"

data/kramdown-rfc2629.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s|
   s.name = 'kramdown-rfc2629'
-  s.version = '1.7.19'
+  s.version = '1.7.21'
   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.}
@@ -14,11 +14,23 @@ spec = Gem::Specification.new do |s|
   s.add_dependency('net-http-persistent', '~> 4.0')
   s.add_dependency('differ', '~> 0.1')
   s.add_dependency('base64', '>= 0.1')
-  s.files = Dir['lib/**/*.rb'] + %w(README.md LICENSE kramdown-rfc2629.gemspec bin/kdrfc bin/kramdown-rfc bin/kramdown-rfc2629 bin/doilit bin/echars bin/kramdown-rfc-extract-markdown bin/kramdown-rfc-extract-sourcecode bin/kramdown-rfc-lsr 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 bin/kramdown-rfc-clean-svg-ids)
+  s.files = Dir['lib/**/*.rb'] +
+            %w(README.md LICENSE kramdown-rfc2629.gemspec
+               bin/kdrfc bin/kramdown-rfc bin/kramdown-rfc2629
+               bin/doilit bin/echars bin/kramdown-rfc-extract-markdown
+               bin/kramdown-rfc-extract-sourcecode
+               bin/kramdown-rfc-extract-figures-tables
+               bin/kramdown-rfc-lsr 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
+               bin/kramdown-rfc-clean-svg-ids)
   s.require_path = 'lib'
   s.executables = ['kramdown-rfc', 'kramdown-rfc2629', 'doilit', 'echars',
                    'kramdown-rfc-extract-markdown',
                    'kramdown-rfc-extract-sourcecode',
+                   'kramdown-rfc-extract-figures-tables',
                    'kramdown-rfc-lsr',
                    'kdrfc', 'kramdown-rfc-cache-i-d-bibxml',
                    'kramdown-rfc-cache-subseries-bibxml',

data/lib/kramdown-rfc2629.rb

@@ -1306,9 +1306,16 @@ COLORS
          "#{XML_RESOURCE_ORG_PREFIX}/bibxml-rfcsubseries/#{name}"] # FOR NOW
       end
 
+      KRAMDOWN_REFCACHETTL = (e = ENV["KRAMDOWN_REFCACHETTL"]) ? e.to_i : 3600
+
+      KRAMDOWN_REFCACHETTL_RFC = (e = ENV["KRAMDOWN_REFCACHETTL_RFC"]) ? e.to_i : 86400*7
+      KRAMDOWN_REFCACHETTL_DOI_IANA = (e = ENV["KRAMDOWN_REFCACHETTL_DOI_IANA"]) ? e.to_i : 86400
+      KRAMDOWN_REFCACHETTL_DOI = (e = ENV["KRAMDOWN_REFCACHETTL_DOI"]) ? e.to_i : KRAMDOWN_REFCACHETTL_DOI_IANA
+      KRAMDOWN_REFCACHETTL_IANA = (e = ENV["KRAMDOWN_REFCACHETTL_IANA"]) ? e.to_i : KRAMDOWN_REFCACHETTL_DOI_IANA
+
       # [subdirectory name, cache ttl in seconds, does it provide for ?anchor=]
       XML_RESOURCE_ORG_MAP = {
-        "RFC" => ["bibxml", 86400*7, false,
+        "RFC" => ["bibxml", KRAMDOWN_REFCACHETTL_RFC, false,
                   ->(fn, n){ [name = "reference.RFC.#{"%04d" % n.to_i}.xml",
                               "https://bib.ietf.org/public/rfc/bibxml/#{name}"] }
 # was                         "https://www.rfc-editor.org/refs/bibxml/#{name}"] }
@@ -1317,10 +1324,10 @@ COLORS
                   ->(fn, n){ [fn,
                               "https://datatracker.ietf.org/doc/bibxml3/draft-#{n.sub(/\Adraft-/, '')}.xml"] }
                  ],
-        "BCP" => ["bibxml-rfcsubseries", 86400*7, false,
+        "BCP" => ["bibxml-rfcsubseries", KRAMDOWN_REFCACHETTL_RFC, false,
                   ->(fn, n){ Rfc2629::bcp_std_ref("BCP", n) }
                  ],
-        "STD" => ["bibxml-rfcsubseries", 86400*7, false,
+        "STD" => ["bibxml-rfcsubseries", KRAMDOWN_REFCACHETTL_RFC, false,
                   ->(fn, n){ Rfc2629::bcp_std_ref("STD", n) }
                  ],
         "W3C" => "bibxml4",
@@ -1336,9 +1343,10 @@ COLORS
         "NIST" => "bibxml2",
         "OASIS" => "bibxml2",
         "PKCS" => "bibxml2",
-        "DOI" => ["bibxml7", 86400, true, ->(fn, n){ ["computed-#{fn}", [:DOI, n] ] }, true # always_altproc
+        "DOI" => ["bibxml7", KRAMDOWN_REFCACHETTL_DOI, true,
+                  ->(fn, n){ ["computed-#{fn}", [:DOI, n] ] }, true # always_altproc
                  ], # emulate old 24 h cache
-        "IANA" => ["bibxml8", 86400, true], # ditto
+        "IANA" => ["bibxml8", KRAMDOWN_REFCACHETTL_IANA, true], # ditto
       }
 
       # XML_RESOURCE_ORG_HOST = ENV["XML_RESOURCE_ORG_HOST"] || "xml.resource.org"
@@ -1348,8 +1356,6 @@ COLORS
                                 "https://#{XML_RESOURCE_ORG_HOST}/public/rfc"
       KRAMDOWN_USE_TOOLS_SERVER = ENV["KRAMDOWN_USE_TOOLS_SERVER"]
 
-      KRAMDOWN_REFCACHETTL = (e = ENV["KRAMDOWN_REFCACHETTL"]) ? e.to_i : 3600
-
       KRAMDOWN_NO_TARGETS = ENV['KRAMDOWN_NO_TARGETS']
       KRAMDOWN_KEEP_TARGETS = ENV['KRAMDOWN_KEEP_TARGETS']
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kramdown-rfc2629
 version: !ruby/object:Gem::Version
-  version: 1.7.19
+  version: 1.7.21
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-30 00:00:00.000000000 Z
+date: 2024-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown
@@ -161,6 +161,7 @@ executables:
 - echars
 - kramdown-rfc-extract-markdown
 - kramdown-rfc-extract-sourcecode
+- kramdown-rfc-extract-figures-tables
 - kramdown-rfc-lsr
 - kdrfc
 - kramdown-rfc-cache-i-d-bibxml
@@ -182,6 +183,7 @@ files:
 - bin/kramdown-rfc-cache-i-d-bibxml
 - bin/kramdown-rfc-cache-subseries-bibxml
 - bin/kramdown-rfc-clean-svg-ids
+- bin/kramdown-rfc-extract-figures-tables
 - bin/kramdown-rfc-extract-markdown
 - bin/kramdown-rfc-extract-sourcecode
 - bin/kramdown-rfc-lsr