kramdown-rfc2629 1.7.20 → 1.7.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c12e9311998093f02e4531e98842dc02ade4b420dfdbef00703c4e3e9893c23
-  data.tar.gz: e2bf61b2ae0f91a9f446e1d4a173ac098574da66af92556264983b0a03b43597
+  metadata.gz: 6829cc1f3803f3a5badbe865394e4bd303c26fb2ec5710ed2347cdbabea1f529
+  data.tar.gz: 5505e3f40551c0e7a1b4341b2a87ae80aa7e28c5bb773a2b7dc99ad491ab1ded
 SHA512:
-  metadata.gz: 49851614d829dc5b9f82f52c75d4e09028a2e5f9cd69ce763ab5a71f6116737f5051f70538bcf26a23506e117614574d8f6104858f1be17f2b639f71d8ca6e8e
-  data.tar.gz: 14db57344a965dee02bfac13b0fbfbcd516368737d32e029341ec3c7dcc0036c612219cac3336f3ee78d68e84340e4c815e0e1e3cd3f9c31de6f13ccf9bc8ca8
+  metadata.gz: fb74883f8051016119e1cfe1a2ae7270919d599e8416bde8fa7632d64e5080d02bfba81ad7ec37fc6a4817ee18c1dcb53ff23cefa3f1d5c32c0888456ac7cc9e
+  data.tar.gz: 7f89516975da7b9017642c882c6154173da0116d39db648a298b1c42bb974f9224eec8d6b34f90132008577eba6617b59636b37a40f6dc2851cb1c9f8787b822

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

@@ -68,10 +68,13 @@ lists.each do |k, v|
     puts
     puts "# #{title}"
     puts "{:unnumbered}"
+    puts
+    puts "{:compact}"
   else
     fail
   end
   v.each_with_index do |(ref, ti), n|
+    ti.sub!(/,?[\p{Zl}\p{Zp}\p{Cc}].*/, "") # first line of caption only
     ti = "[#{ti}](##{ref})" if ref
     puts "#{n+1}. #{ti}"
   end

data/data/kramdown-rfc2629.erb

@@ -52,6 +52,12 @@
 <% end -%>
 
 <rfc <%=rfcattrs%>>
+<% ps.arr("v3xml2rfc", false) do |pi, val|
+    Array(val).each do |el|
+-%>
+  <?v3xml2rfc <%=pi%>="<%=ps.escattr(el)%>"?>
+<%  end
+   end -%>
   <front>
     <%= ps.ele("title", ps.attr("abbrev=titleabbrev")) %>
 

data/kramdown-rfc2629.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s|
   s.name = 'kramdown-rfc2629'
-  s.version = '1.7.20'
+  s.version = '1.7.22'
   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.}

data/lib/kramdown-rfc/kdrfc-processor.rb

@@ -18,6 +18,7 @@ class KDRFC
   # )))
 
 KDRFC_PREPEND = [ENV["KDRFC_PREPEND"]].compact
+KDRFC_XML2RFC_FLAGS = Array(ENV["KDRFC_XML2RFC_FLAGS"]&.split(","))
 
 def v3_flag?
   [*(@options.v3 ? ["--v3"] : []),
@@ -37,6 +38,15 @@ def process_mkd(input, output)
   end
 end
 
+def filename_ct(fn, ext)
+  bn = File.basename(fn, ".*")
+  if r = ENV["KRAMDOWN_RFC_DOCREV"]
+    bn << "-#{r}"
+  end
+  {filename: "#{bn}.#{ext}",
+   content_type: "text/plain"}
+end
+
 def run_idnits(*args)
   if @options.remote
     run_idnits_remotely(*args)
@@ -62,8 +72,7 @@ def run_idnits_remotely(txt_fn)
   url = URI(IDNITS_WEBSERVICE)
   req = Net::HTTP::Post.new(url)
   form = [["file", File.open(txt_fn),
-           {filename: "input.txt",
-            content_type: "text/plain"}],
+           filename_ct(txt_fn, "txt")],
           ["hidetext", "true"]]
   diag = ["url/form: ", url, form].inspect
   req.set_form(form, 'multipart/form-data')
@@ -105,7 +114,7 @@ end
 def process_xml_locally(input, output, *flags)
   warn "* converting locally from xml #{input} to txt #{output}" if @options.verbose
   begin
-    o, s = Open3.capture2(*KDRFC_PREPEND, "xml2rfc", *v3_flag?, *flags, input)
+    o, s = Open3.capture2(*KDRFC_PREPEND, "xml2rfc", *v3_flag?, *flags, *KDRFC_XML2RFC_FLAGS, input)
     puts o
     if s.success?
       warn "* #{output} written" if @options.verbose
@@ -152,8 +161,7 @@ def process_xml_remotely(input, output, *flags)
   url = URI(XML2RFC_WEBSERVICE + maf)
   req = Net::HTTP::Post.new(url)
   form = [["file", File.open(input),
-           {filename: "input.xml",
-            content_type: "text/plain"}]]
+           filename_ct(input, "xml")]]
   diag = ["url/form: ", url, form].inspect
   req.set_form(form, 'multipart/form-data')
   warn "* requesting at #{url}" if @options.verbose

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,13 @@
 --- !ruby/object:Gem::Specification
 name: kramdown-rfc2629
 version: !ruby/object:Gem::Version
-  version: 1.7.20
+  version: 1.7.22
 platform: ruby
 authors:
 - Carsten Bormann
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-30 00:00:00.000000000 Z
+date: 2025-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown
@@ -209,7 +208,6 @@ homepage: http://github.com/cabo/kramdown-rfc
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -224,8 +222,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.14
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Kramdown extension for generating RFCXML (RFC 799x).
 test_files: []