kramdown-rfc2629 1.6.19 → 1.6.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9420854e2a94d90920b07235fa94c0e49d57eb166e126cd3802fc6fce135271
-  data.tar.gz: 0b36ade9a83c4e48e2aa2a95b935001e8cf4d5afb226ffd19104c67c43e243df
+  metadata.gz: 8c26f93c43853de6883440e6a3214201def29879da0945a42681749ffe545c1e
+  data.tar.gz: fce8091ebcdfe69d9d96e12bca694ef8e1f66fab43ccbb6f7aeabf4f5be298f1
 SHA512:
-  metadata.gz: 4be21e41f1eac8424d118c00f40c4ab1b10988b48cbe618a9347961f5e9dfc20b4af544235d8cac60059c4b713b9ed36480dba987aee3eafdcf02800467a488d
-  data.tar.gz: 50576e9002911cde89a4b1cae411e9f589481430ff0c58157fbcd0b2553cef365db6cab32a4dd9dd79ba88c256e7862b647a1bbe9c407b85607318aa72f6595b
+  metadata.gz: b1536eaeae7bcbd548fea24c97e5a49c5482531c0ec929f410af5dda419fa4f13ed8d92cc71e2132dd931351cde97faf36d9a3ec5a57539d3c334ed4df7228d3
+  data.tar.gz: 5370b01327233a3f027673939f2e7e15f166bc27a81c48d3f8d82976af85b3c9c2cd219fe1c3281d364f21faf33b50f467efc18136b0cdc697739f7b82baa8c3

data/kramdown-rfc2629.gemspec

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

data/lib/kramdown-rfc/doi.rb

@@ -5,7 +5,9 @@ require 'yaml'
 ACCEPT_CITE_JSON = {"Accept" => "application/citeproc+json"}
 
 def doi_fetch_and_convert(doi, fuzzy: false, verbose: false)
-  cite = JSON.parse(URI("https://dx.doi.org/#{doi}").open(ACCEPT_CITE_JSON).read)
+  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
   lit = {}
   ser = lit["seriesinfo"] = {}

data/lib/kramdown-rfc2629.rb

@@ -714,6 +714,20 @@ COLORS
         [clean, irefs]
       end
 
+      def clean_pcdatav3(parts) # hack, will become unnecessary with v3 tables
+        clean = ''
+        parts.each do |p|
+          next if p.empty?
+          d = REXML::Document.new("<foo>#{p}</foo>")
+          t = REXML::XPath.each(d.root, "//text()").to_a.join
+          if t != p
+            warn "** simplified markup #{p.inspect} into #{t.inspect} in table heading"
+          end
+          clean << t
+        end
+        clean
+      end
+
       def convert_header(el, indent, opts)
         # todo: handle appendix tags
         el = el.deep_clone
@@ -892,8 +906,13 @@ COLORS
           end
         end
         if alignment
-          res, irefs = clean_pcdata(inner_a(el, indent, opts))
-          warn "*** lost markup #{irefs} in table heading" unless irefs.empty?
+          xmlres = inner_a(el, indent, opts)
+          if $options.v3
+            res = clean_pcdatav3(xmlres)
+          else
+            res, irefs = clean_pcdata(xmlres)
+            warn "*** lost markup #{irefs} in table heading" unless irefs.empty?
+          end
           "#{' '*indent}<ttcol #{widthopt}align='#{alignment}'#{el_html_attributes(el)}>#{res.empty? ? "&#160;" : res}</ttcol>\n" # XXX need clean_pcdata
         else
           res = inner(el, indent, opts)
@@ -1124,6 +1143,7 @@ COLORS
       KRAMDOWN_REFCACHETTL = (e = ENV["KRAMDOWN_REFCACHETTL"]) ? e.to_i : 3600
 
       KRAMDOWN_NO_TARGETS = ENV['KRAMDOWN_NO_TARGETS']
+      KRAMDOWN_KEEP_TARGETS = ENV['KRAMDOWN_KEEP_TARGETS']
 
       def convert_img(el, indent, opts) # misuse the tag!
         if a = el.attr
@@ -1167,7 +1187,7 @@ COLORS
               d.delete d.doctype
               d.root.attributes["anchor"] = anchor
               if t == "RFC" or t == "I-D"
-                if KRAMDOWN_NO_TARGETS
+                if KRAMDOWN_NO_TARGETS || !KRAMDOWN_KEEP_TARGETS
                   d.root.attributes["target"] = nil
                   REXML::XPath.each(d.root, "/reference/format") { |x|
                     d.root.delete_element(x)
@@ -1390,9 +1410,9 @@ COLORS
         end
         iref ||= "<iref#{html_attributes(item: item, subitem: subitem)}/>"
         if target
-          "<xref#{html_attributes(target: target, format: "none")}>#{value}</xref>#{iref}"
+          "#{iref}<xref#{html_attributes(target: target, format: "none")}>#{value}</xref>"
         else
-          "#{value}#{iref}"
+          "#{iref}#{value}"
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kramdown-rfc2629
 version: !ruby/object:Gem::Version
-  version: 1.6.19
+  version: 1.6.21
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-10 00:00:00.000000000 Z
+date: 2023-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown