kramdown-rfc2629 1.3.9 → 1.3.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 935147add478f6b51b8baec2b762249c862a71c6f04b52c1e648a27e197a33f0
-  data.tar.gz: e0964c16f72f5d9164a3b7fa8bee23d3c1ba45e1388950738e0f3f8b4ea497cd
+  metadata.gz: be9c46d583cac4dc5a8b951b953e25819c77298d372f710a41f527a1cf18c609
+  data.tar.gz: 124c338b7a9c7544c7c8d91c959af382a9996b681fac87daaa07ca572facfb08
 SHA512:
-  metadata.gz: caabe7a032917db314a4e26c84057a2bcca0c79f7b822f764f7eb0eef2c4434edd7d3a0926419844a5973f05513393e2888f658f177cfdf095be9a417ac1b77c
-  data.tar.gz: 351f6ee80ac9bcfb74cace2abd78601858c9dd8d67126b55f44d8547b30d0073469ea39dbb01ca81535c42de62962683ff25921f662429ea0e2cb8483a931efd
+  metadata.gz: 59e5bb9e1236669a85c392b77cc5854d0a3070049fb76add45779b70663dc2b2d185c2ca5f0a0e79148d655272656ce53cbe97498b4e625eed248cb90c744485
+  data.tar.gz: c2cc8cbc0a52a8bfdd71535b463affca2ab5a2d9f845f295c84d5983c1861b5e7a3a0470eb3c291d31fe03e29907e16e0f55d0fac0a1ece5bcdec17bcbab2875

data/bin/doilit

@@ -44,6 +44,12 @@ ARGV.each do |doi|
   lit = {}
   ser = lit["seriesinfo"] = {}
   lit["title"] = cite["title"]
+  if (st = cite["subtitle"]) && Array === st # defensive
+    st.delete('')
+    if st != []
+      lit["title"] << ": " << st.join("; ")
+    end
+  end
   if authors = cite["author"]
     lit["author"] = authors.map do |au|
       lau = {}

data/bin/kdrfc

@@ -49,16 +49,21 @@ def process_xml_locally(input, output, *flags)
   end
 end
 
+XML2RFC_WEBSERVICE = ENV["KRAMDOWN_XML2RFC_WEBSERVICE"] ||
+                     'http://xml2rfc.tools.ietf.org/cgi-bin/xml2rfc-dev.cgi'
+
+
 def process_xml_remotely(input, output)
   warn "* converting remotely from xml #{input} to txt #{output}" if $options.verbose
-  url = URI('http://xml2rfc.tools.ietf.org/cgi-bin/xml2rfc.cgi')
+  url = URI(XML2RFC_WEBSERVICE)
   req = Net::HTTP::Post.new(url)
-  req.set_form([["modeAsFormat", "txt/#{"v3" if $options.v3}ascii"],
-                ["type", "binary"],
-                ["input", File.open(input),
-                 {filename: "input.xml",
-                  content_type: "text/plain"}]],
-               'multipart/form-data')
+  form = [["modeAsFormat", "txt/#{"v3" if $options.v3}ascii"],
+          ["type", "binary"],
+          ["input", File.open(input),
+           {filename: "input.xml",
+            content_type: "text/plain"}]]
+  diag = ["url/form: ", url, form].inspect
+  req.set_form(form, 'multipart/form-data')
   res = Net::HTTP::start(url.hostname, url.port,
                          :use_ssl => url.scheme == 'https' ) {|http|
     http.request(req)
@@ -67,17 +72,21 @@ def process_xml_remotely(input, output)
   when Net::HTTPOK
     case res.content_type
     when 'application/octet-stream'
+      if res.body == ''
+        warn "*** HTTP response is empty with status #{res.code}, not written"
+        exit 1
+      end
       File.open(output, "w") do |fo|
         fo.print(res.body)
       end
       warn "* #{output} written" if $options.verbose
     else
-      warn "*** HTTP response has unexpected content_type #{res.content_type} with status #{res.code}"
+      warn "*** HTTP response has unexpected content_type #{res.content_type} with status #{res.code}, #{diag}"
       warn res.body
       exit 1
     end
   else
-    warn "*** HTTP response: #{res.code}"
+    warn "*** HTTP response: #{res.code}, #{diag}"
     exit 1
   end
 end

data/bin/kramdown-rfc2629

@@ -345,8 +345,10 @@ if input =~ /\A<\?xml/          # if this is a whole XML file, protect it
   input = "{::nomarkdown}\n#{input}\n{:/nomarkdown}\n"
 end
 options = {input: 'RFC2629Kramdown', entity_output: coding_override, link_defs: link_defs}
-if target_coding && target_coding =~ /ascii/ && smart_quotes.nil?
-  smart_quotes = false
+if smart_quotes.nil?
+  if (target_coding && target_coding =~ /ascii/) || $options.v3
+     smart_quotes = false
+  end
 end
 if smart_quotes == false
   smart_quotes = ["'".ord, "'".ord, '"'.ord, '"'.ord]

data/kramdown-rfc2629.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s|
   s.name = 'kramdown-rfc2629'
-  s.version = '1.3.9'
+  s.version = '1.3.14'
   s.summary = "Kramdown extension for generating RFC 7749 XML."
   s.description = %{An RFC7749 (XML2RFC) generating backend for Thomas Leitner's
 "kramdown" markdown parser.  Mostly useful for RFC writers.}

data/lib/kramdown-rfc2629.rb

@@ -37,16 +37,27 @@ module Kramdown
         @span_parsers.unshift(:iref)
       end
 
-      XREF_START = /\{\{(.*?)\}\}/u
+      XREF_START = /\{\{(?:(?:\{(.*?)\}(?:\{(.*?)\})?)|(.*?))((?:\}\})|\})/u
 
       # Introduce new {{target}} syntax for empty xrefs, which would
       # otherwise be an ugly ![!](target) or ![ ](target)
       # (I'd rather use [[target]], but that somehow clashes with links.)
       def parse_xref
         @src.pos += @src.matched_size
-        href = @src[1]
-        href = href.gsub(/\A[0-9]/) { "_#{$&}" } # can't start an IDREF with a number
-        el = Element.new(:xref, nil, {'target' => href})
+        unless @src[4] == "}}"
+          warn "*** #{@src[0]}: unmatched braces #{@src[4].inspect}"
+        end
+        if contact_name = @src[1]
+          attr = {'fullname' => contact_name}
+          if ascii_name = @src[2]
+            attr["asciiFullname"] = ascii_name
+          end
+          el = Element.new(:contact, nil, attr)
+        else
+          href = @src[3]
+          href = href.gsub(/\A[0-9]/) { "_#{$&}" } # can't start an IDREF with a number
+          el = Element.new(:xref, nil, {'target' => href})
+        end
         @tree.children << el
       end
       define_parser(:xref, XREF_START, '{{')
@@ -524,6 +535,10 @@ COLORS
         end
       end
 
+      def convert_contact(el, indent, opts)
+        "<contact#{el_html_attributes(el)}/>"
+      end
+
       REFCACHEDIR = ENV["KRAMDOWN_REFCACHEDIR"] || ".refcache"
 
       # warn "*** REFCACHEDIR #{REFCACHEDIR}"

metadata

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