kramdown-rfc2629 1.6.36 → 1.6.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97b4e9ec1d3932d44efbc35c4028e44440c1f307f9a56ec2d56562096c8a2ad0
-  data.tar.gz: 36ace3e7ea222e805b39c3ab5595b3ef96604200de89b960a2a8d9a38b86593c
+  metadata.gz: 8b4707d20a26b963bdbf7423a2cc460769d6336d2ff01b47a3f74ec34f9a09fc
+  data.tar.gz: 3371f7774a039bf5effefb353baf1ffb7e1ccac76369db43f0f77c9b6e4284be
 SHA512:
-  metadata.gz: 1dc62f9a6a680ff30093413be469d75d4c078044835a981c1273e90cbb02f1b77e2dee16860424ba4c8215261636e2d9cc15dd08151274597cb61e85320bc1b9
-  data.tar.gz: bb50e8274dc61b28f501b63f17aec1094a91b9f6fff3cb758ccf4197a79105e7ee99c99f2d51e2dedf61187e8c9bba22e4ef6fc2c2020e3383b2a67153089932
+  metadata.gz: ab844b01fc405878b32920b37ee05bc9354c6a5d3d9a2adf2eeeeca1862e89ebec0b94d7638afb893de745c3142d69ad4aecfa534f814dc7288b4208cb226fce
+  data.tar.gz: 60f42e7ded57af960bf618078eaa6d3f16591fc8099b897b1d5d7108bcf38b4e50c4123d198d1409197488f6ef7ab5678788c40bf42c097ccb859b6a09ebbe05

data/bin/doilit

@@ -11,6 +11,7 @@ $verbose = false
 $fuzzy = false
 $handle = "a"
 $xml = false
+$site = "https://dx.doi.org"
 
 litent = {}
 ARGV.each do |doi|
@@ -28,6 +29,9 @@ ARGV.each do |doi|
   when "-v"
     $verbose = true
     next
+  when /\A-s=(.*)/
+    $site = $1
+    next
   when /\A-h=(.*)/
     $handle = $1
     next
@@ -40,7 +44,7 @@ ARGV.each do |doi|
     exit 1
   end
 
-  lit = doi_fetch_and_convert(doi, fuzzy: $fuzzy, verbose: $verbose)
+  lit = doi_fetch_and_convert(doi, fuzzy: $fuzzy, verbose: $verbose, site: $site)
 
   while litent[$handle]
     $handle.succ!

data/bin/kramdown-rfc-extract-sourcecode

@@ -4,6 +4,7 @@ require 'yaml'
 require 'shellwords'
 require 'fileutils'
 require_relative '../lib/kramdown-rfc/rfc8792'
+require_relative '../lib/kramdown-rfc/rexml-all-text.rb'
 
 def clean(s)
   s.gsub!(/\//, ":")
@@ -25,7 +26,7 @@ begin
     opts.on("-dDIR", "--dir=DIR", "Target directory (default: sourcecode)") do |v|
       dir = v
     end
-    opts.on("-f", "--[no-]unfold", "RFC8972-unfold (default: yes)") do |v|
+    opts.on("-f", "--[no-]unfold", "RFC8792-unfold (default: yes)") do |v|
       unfold = v
     end
   end
@@ -51,7 +52,8 @@ d = REXML::Document.new(ARGF)
 REXML::XPath.each(d.root, "//sourcecode|//artwork") do |x|
   if ty = x[:type]
     ty = clean(ty)
-    name = x[:name] || gensym.succ!
+    name = x[:name]
+    name = gensym.succ! if !name || name.empty?
     name = clean(name)
     if taken[ty][name]
       unless warned[ty][name]
@@ -61,7 +63,7 @@ REXML::XPath.each(d.root, "//sourcecode|//artwork") do |x|
     else
       taken[ty][name] = ''
     end
-    taken[ty][name] << handle_artwork_sourcecode(x.text, unfold)
+    taken[ty][name] << handle_artwork_sourcecode(x.all_text, unfold)
   end
 end
 

data/kramdown-rfc2629.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s|
   s.name = 'kramdown-rfc2629'
-  s.version = '1.6.36'
+  s.version = '1.6.38'
   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/command.rb

@@ -266,7 +266,7 @@ def xml_from_sections(input)
   end
 
   coding_override = ps.has(:coding)
-  smart_quotes = ps[:smart_quotes]
+  smart_quotes = ps[:smart_quotes] || ps[:"smart-quotes"]
   typographic_symbols = ps[:typographic_symbols]
   header_kramdown_options = ps[:kramdown_options]
 
@@ -314,7 +314,7 @@ def xml_from_sections(input)
             anchor_to_bibref[k] = bibref
           end
           if dr = v.delete("display")
-            displayref[k] = dr
+            displayref[k.gsub("/", "_")] = dr
           end
         end
       end

data/lib/kramdown-rfc/doi.rb

@@ -4,13 +4,35 @@ require 'yaml'
 
 ACCEPT_CITE_JSON = {"Accept" => "application/citeproc+json"}
 
-def doi_fetch_and_convert(doi, fuzzy: false, verbose: false)
+def doi_fetch_and_convert(doi, fuzzy: false, verbose: false, site: "https://dx.doi.org")
   doipath = doi.sub(/^([0-9.]+)_/) {"#$1/"} # convert initial _ back to /
   # warn "** SUB #{doi} #{doipath}" if doi != doipath
-  cite = JSON.parse(URI("https://dx.doi.org/#{doipath}").open(ACCEPT_CITE_JSON).read)
-  puts cite.to_yaml if verbose
+  begin
+    cite = JSON.parse(URI("#{site}/#{doipath}").open(ACCEPT_CITE_JSON).read)
+    puts cite.to_yaml if verbose
+    doi_citeproc_to_lit(cite, fuzzy)
+  rescue OpenURI::HTTPError => e
+    begin
+      site = "https://dl.acm.org"
+      percent_escaped = doipath.gsub("/", "%2F")
+      path = "#{site}/action/exportCiteProcCitation?targetFile=custom-bibtex&format=bibTex&dois=#{percent_escaped}"
+      op = URI(path).open       # first get a cookie, ignore result
+      # warn [:META, op.meta].inspect
+      cook = op.meta['set-cookie'].split('; ', 2)[0]
+      cite = JSON.parse(URI(path).open("Cookie" => cook).read)
+      cite = cite["items"].first[doipath]
+      puts cite.to_yaml if verbose
+      doi_citeproc_to_lit(cite, fuzzy)
+    rescue
+      raise e
+    end
+  end
+end
+
+def doi_citeproc_to_lit(cite, fuzzy)
   lit = {}
   ser = lit["seriesinfo"] = {}
+  refcontent = []
   lit["title"] = cite["title"]
   if (st = cite["subtitle"]) && Array === st # defensive
     st.delete('')
@@ -76,19 +98,28 @@ def doi_fetch_and_convert(doi, fuzzy: false, verbose: false)
       spl = ct.split(" ")
       ser[spl[0..-2].join(" ")] = spl[-1]
     end
-  elsif pub = cite["publisher"]
-    info = []
-    if t = cite["type"]
-      info << t
-    end
-    rhs = info.join(", ")
-    if info != []
-      ser[pub] = rhs
-    else
-      spl = pub.split(" ")
-      ser[spl[0..-2].join(" ")] = spl[-1]
+  end
+  if pub = cite["publisher"]
+    refcontent << pub
+    # info = []
+    # if t = cite["type"]
+    #   info << t
+    # end
+    # rhs = info.join(", ")
+    # if info != []
+    #   ser[pub] = rhs
+    # else
+    #   spl = pub.split(" ")
+    #   ser[spl[0..-2].join(" ")] = spl[-1]
+    # end
+  end
+  ["DOI", "ISBN"].each do |st|
+    if a = cite[st]
+      ser[st] = a
     end
   end
-  ser["DOI"] = cite["DOI"]
+  if refcontent != []
+    lit["refcontent"] = refcontent.join(", ")
+  end
   lit
 end

data/lib/kramdown-rfc/rexml-all-text.rb

@@ -0,0 +1,20 @@
+require 'rexml/document'
+
+module REXML
+  # all_text: Get all text from descendants that are Text or CData
+  class Element
+    def all_text
+      @children.map {|c| c.all_text}.join
+    end
+  end
+  class Text                    # also: ancestor of CData
+    def all_text
+      value
+    end
+  end
+  class Child
+    def all_text
+      ''
+    end
+  end
+end

data/lib/kramdown-rfc2629.rb

@@ -548,11 +548,10 @@ COLORS
                                             stdin_data: result);
           err << err1.to_s
         when "math", "math-asciitex"
-          math = Shellwords.escape(result)
           result1, err, _s = Open3.capture3("tex2svg --font STIX --speech=false#{svg_opt} #{Shellwords.escape(' ' << result)}");
           begin
             raise Errno::ENOENT if t == "math-asciitex"
-            result, err1, s = Open3.capture3("utftex -m #{math}#{txt_opt}")
+            result, err1, s = Open3.capture3("utftex -m #{txt_opt}", stdin_data: result)
             if s.exitstatus != 0
               warn "** utftex: #{err1.inspect}"
               raise Errno::ENOENT

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kramdown-rfc2629
 version: !ruby/object:Gem::Version
-  version: 1.6.36
+  version: 1.6.38
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-28 00:00:00.000000000 Z
+date: 2023-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown
@@ -182,6 +182,7 @@ files:
 - lib/kramdown-rfc/kdrfc-processor.rb
 - lib/kramdown-rfc/parameterset.rb
 - lib/kramdown-rfc/refxml.rb
+- lib/kramdown-rfc/rexml-all-text.rb
 - lib/kramdown-rfc/rexml-formatters-conservative.rb
 - lib/kramdown-rfc/rfc8792.rb
 - lib/kramdown-rfc/svg-id-cleanup.rb