kramdown-rfc2629 1.3.8 → 1.3.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0bf90a7fd57ee1492ceaf533983659336ca24c1334b79cd9be55661c4622d10f
-  data.tar.gz: 940584f0bea9de4fb1e2e9b91a79bd8b4eb0192543f625d7c0cbfa9858402275
+  metadata.gz: fe573235c508ba9d089f72b578a53ea8507b53d82a539539228982a799e830a7
+  data.tar.gz: b7541fa31e84a9428f18541f2bef57b63984e1b3b9c193e4c28c82cdd3e2bcbb
 SHA512:
-  metadata.gz: f444f161ab0611bc92bbdb2f790c13f1676b9e035368fbcd7869317e5f30b28dd3e59789e55c0c6e3f67f5f8d4d5fa3d2368b26e307ab44f2e846604670754ab
-  data.tar.gz: dfcae66926b4a96424d0be1144d7ccf5c00a28b5153d2adf5897484b9f51826989bf14314909e7a3327ad9ac75b9b57f63270626890b7de3648ddbf2d63e2c5d
+  metadata.gz: 754f2d2d69f025e73037aaf86b6b315eb362251b3fd1c4f070adb4c7a380d9c05bef9445c863aa0e0e4c4877d5d0eb2f0e38b5b120a9a86642969b8b81673ccf
+  data.tar.gz: 53a5b1caa470513f06a4bf28618b35f45ae2632cda64edc3e64e2e894d91e780272da81c383d0967aa6e98553f39286f4daa8ddaf97c299397e30f7d0d423a1a

data/README.md

@@ -281,6 +281,31 @@ special support in XML2RFC), and HTML syntax of course.
 A number of more esoteric features have recently been added.
 (The minimum required version for each full feature is indicated.)
 
+(1.3.x)
+Slowly improving support for SVG generating tools for XML2RFCv3 (i.e.,
+with `-3` flag).
+These tools must be installed and callable from the command line.
+
+The basic idea is to mark an input code block with one of the following
+labels (language types), yielding some plaintext form in the .TXT
+output and a graphical form in the .HTML output.  The plaintext is the
+input in some cases (e.g., ASCII art, `mscgen`), or some plaintext
+output generated by the tool (e.g., `plantuml-utxt`).
+
+Currently supported labels as of 1.3.9:
+
+* goat, ditaa: ASCII (plaintext) art to figure conversion
+* mscgen: Message Sequence Charts
+* plantuml: widely used multi-purpose diagram generator
+* plantuml-utxt: Like plantuml, except that a plantuml-generated
+  plaintext form is used
+* mermaid: Very experimental; the conversion to SVG is prone to
+  generate black-on-black text in this version
+
+Note that this feature does not play well with the CI (continuous
+integration) support in Martin Thomson's [I-D Template][], as that may
+not have the tools installed in its docker instance.
+
 (1.2.9:)
 The YAML header now allows specifying [kramdown_options][].
 

data/bin/doilit

@@ -39,11 +39,17 @@ ARGV.each do |doi|
     warn "*** Usage: doilit [-c] [-v] [-h=handle|-x=xmlhandle] doi..."
     exit 1
   end
-  cite = JSON.parse(open("https://dx.doi.org/#{doi}", ACCEPT_CITE_JSON).read)
+  cite = JSON.parse(URI("https://dx.doi.org/#{doi}").open(ACCEPT_CITE_JSON).read)
   puts cite.to_yaml if $verbose
   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

@@ -3,6 +3,9 @@ require 'uri'
 require 'net/http'
 require 'open3'
 
+# try to get this from gemspec.
+KDRFC_VERSION=Gem.loaded_specs["kramdown-rfc2629"].version rescue "unknown-version"
+
 def v3_flag?
   $options.v3 ? ["--v3"] : []
 end
@@ -46,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)
@@ -64,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
@@ -85,8 +97,18 @@ require 'ostruct'
 $options = OpenStruct.new
 $options.txt = true             # default
 op = OptionParser.new do |opts|
-  opts.banner = "Usage: kdrfc [options] file.md|file.mkd|file.xml"
-
+  opts.banner = <<BANNER
+Usage: kdrfc [options] file.md|file.mkd|file.xml
+Version: #{KDRFC_VERSION}
+BANNER
+  opts.on("-V", "--version", "Show version and exit") do |v|
+    puts "kdrfc, from kramdown-rfc2629 #{KDRFC_VERSION}"
+    exit
+  end
+  opts.on("-H", "--help", "Show option summary and exit") do |v|
+    puts opts
+    exit
+  end
   opts.on("-v", "--[no-]verbose", "Run verbosely") do |v|
     $options.verbose = v
   end

data/bin/kramdown-rfc2629

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby2.1
+#!/usr/bin/env ruby
 # -*- coding: utf-8 -*-
 require 'kramdown-rfc2629'
 require 'kramdown-rfc/parameterset'
@@ -7,6 +7,9 @@ require 'yaml'
 require 'erb'
 require 'date'
 
+# try to get this from gemspec.
+KDRFC_VERSION=Gem.loaded_specs["kramdown-rfc2629"].version rescue "unknown-version"
+
 Encoding.default_external = "UTF-8" # wake up, smell the coffee
 
 def boilerplate(key)
@@ -287,8 +290,18 @@ require 'ostruct'
 
 $options = OpenStruct.new
 op = OptionParser.new do |opts|
-  opts.banner = "Usage: kramdown-rfc2629 [options] file.md|file.mkd > file.xml"
-
+  opts.banner = <<BANNER
+Usage: kramdown-rfc2629 [options] file.md|file.mkd > file.xml
+Version: #{KDRFC_VERSION}
+BANNER
+  opts.on("-V", "--version", "Show version and exit") do |v|
+    puts "kramdown-rfc2629 #{KDRFC_VERSION}"
+    exit
+  end
+  opts.on("-H", "--help", "Show option summary and exit") do |v|
+    puts opts
+    exit
+  end
   opts.on("-v", "--[no-]verbose", "Run verbosely") do |v|
     $options.verbose = v
   end

data/kramdown-rfc2629.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s|
   s.name = 'kramdown-rfc2629'
-  s.version = '1.3.8'
+  s.version = '1.3.13'
   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.}
@@ -9,7 +9,6 @@ spec = Gem::Specification.new do |s|
   s.files = Dir['lib/**/*.rb'] + %w(README.md LICENSE kramdown-rfc2629.gemspec bin/kdrfc bin/kramdown-rfc2629 bin/doilit bin/kramdown-rfc-extract-markdown data/kramdown-rfc2629.erb data/encoding-fallbacks.txt)
   s.require_path = 'lib'
   s.executables = ['kramdown-rfc2629', 'doilit', 'kramdown-rfc-extract-markdown', 'kdrfc']
-  s.default_executable = 'kramdown-rfc2629'
   s.required_ruby_version = '>= 2.3.0'
   # s.requirements = 'wget'
   #  s.has_rdoc = true

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, '{{')
@@ -150,10 +161,42 @@ module Kramdown
         generate_id(value).gsub(/-+/, '-')
       end
 
+      SVG_COLORS = Hash.new {|h, k| k}
+      <<COLORS.each_line {|l| k, v = l.chomp.split; SVG_COLORS[k] = v}
+black	#000000
+silver	#C0C0C0
+gray	#808080
+white	#FFFFFF
+maroon	#800000
+red	#FF0000
+purple	#800080
+fuchsia	#FF00FF
+green	#008000
+lime	#00FF00
+olive	#808000
+yellow	#FFFF00
+navy	#000080
+blue	#0000FF
+teal	#008080
+aqua	#00FFFF
+COLORS
+
+      def svg_munch_id(id)
+        id.gsub(/[^-._A-Za-z0-9]/) {|x| "_%02X" % x.ord}
+      end
+
+      def self.hex_to_lin(h)
+        h.to_i(16)**2.22        # approximating sRGB gamma
+      end
+      define_method :hex_to_lin, &method(:hex_to_lin)
+
+      B_W_THRESHOLD = hex_to_lin("a4") # a little brighter than 1/2 0xFF -> white
+
       def svg_munch_color(c, fill)
+        c = SVG_COLORS[c]
         case c
         when /\A#(..)(..)(..)\z/
-          if [$1, $2, $3].map {|x| x.to_i(16)}.sum >= 300 # arbitrary
+          if hex_to_lin($1)*0.2126 + hex_to_lin($2)*0.7152 + hex_to_lin($3)*0.0722 >= B_W_THRESHOLD
             'white'
           else
             'black'
@@ -172,9 +215,56 @@ module Kramdown
         REXML::XPath.each(d.root, "//*[@text-rendering]") { |x| x.attributes["text-rendering"] = nil }  #; warn x.inspect  }
         REXML::XPath.each(d.root, "//*[@stroke]") { |x| x.attributes["stroke"] = svg_munch_color(x.attributes["stroke"], false) }
         REXML::XPath.each(d.root, "//*[@fill]") { |x| x.attributes["fill"] = svg_munch_color(x.attributes["fill"], true) }
+        REXML::XPath.each(d.root, "//*[@id]") { |x| x.attributes["id"] = svg_munch_id(x.attributes["id"]) }
+##      REXML::XPath.each(d.root, "//rect") { |x| x.attributes["style"] = "fill:none;stroke:black;stroke-width:1" unless x.attributes["style"] }
         d.to_s
       end
 
+      def memoize(meth, *args)
+        require 'digest'
+        Dir.mkdir(REFCACHEDIR) unless Dir.exists?(REFCACHEDIR)
+        kdrfc_version = Gem.loaded_specs["kramdown-rfc2629"].version.to_s.gsub('.', '_') rescue "UNKNOWN"
+        fn = "#{REFCACHEDIR}/kdrfc-#{kdrfc_version}-#{meth}-#{Digest::SHA256.hexdigest(Marshal.dump(args))[0...40]}.cache"
+        begin
+          out = Marshal.load(File.binread(fn))
+        rescue StandardError => e
+          # warn e.inspect
+          out = method(meth).call(*args)
+          File.binwrite(fn, Marshal.dump(out))
+        end
+        out
+      end
+
+      def svg_tool_process(t, result)
+        require 'tempfile'
+        file = Tempfile.new("kramdown-rfc")
+        file.write(result)
+        file.close
+        case t
+        when "goat"
+          result1, _s = Open3.capture2("goat #{file.path}", stdin_data: result);
+        when "ditaa"        # XXX: This needs some form of option-setting
+          result1, _s = Open3.capture2("ditaa #{file.path} --svg -o -", stdin_data: result);
+        when "mscgen"
+          result1, _s = Open3.capture2("mscgen -T svg -i #{file.path} -o -", stdin_data: result);
+        when "mermaid"
+          result1, _s = Open3.capture2("mmdc -i #{file.path}", stdin_data: result); #  -b transparent
+          outpath = file.path + ".svg"
+          result1 = File.read(outpath)
+          File.unlink(outpath)
+        when "plantuml", "plantuml-utxt"
+          plantuml = "@startuml\n#{result}\n@enduml"
+          result1, _s = Open3.capture2("plantuml -pipe -tsvg", stdin_data: plantuml);
+          result, _s = Open3.capture2("plantuml -pipe -tutxt", stdin_data: plantuml) if t == "plantuml-utxt"
+        end
+        # warn ["goat:", result1.inspect]
+        file.unlink
+        result1 = svg_clean(result1) unless t == "goat"
+        result1, _s = Open3.capture2("svgcheck -qa", stdin_data: result1);
+        # warn ["svgcheck:", result1.inspect]
+        [result, result1]
+      end
+
       def convert_codeblock(el, indent, opts)
         # el.attr['anchor'] ||= saner_generate_id(el.value) -- no longer in 1.0.6
         result = el.value
@@ -219,30 +309,8 @@ module Kramdown
             end
           end
           case t
-          when "goat", "ditaa", "mscgen", "plantuml", "plantuml-utxt"
-            require 'tempfile'
-            file = Tempfile.new("kramdown-rfc")
-            file.write(result)
-            file.close
-            case t
-            when "goat"
-              result1, _s = Open3.capture2("goat #{file.path}", stdin_data: result);
-            when "ditaa"        # XXX: This needs some form of option-setting
-              result1, _s = Open3.capture2("ditaa #{file.path} --svg -o -", stdin_data: result);
-              result1 = svg_clean(result1)
-            when "mscgen"
-              result1, _s = Open3.capture2("mscgen -T svg -i #{file.path} -o -", stdin_data: result);
-              result1 = svg_clean(result1)
-            when "plantuml", "plantuml-utxt"
-              plantuml = "@startuml\n#{result}\n@enduml"
-              result1, _s = Open3.capture2("plantuml -pipe -tsvg", stdin_data: plantuml);
-              result1 = svg_clean(result1)
-              result, _s = Open3.capture2("plantuml -pipe -tutxt", stdin_data: plantuml) if t == "plantuml-utxt"
-            end
-            # warn ["goat:", result1.inspect]
-            file.unlink
-            result1, _s = Open3.capture2("svgcheck -qa", stdin_data: result1);
-            # warn ["svgcheck:", result1.inspect]
+          when "goat", "ditaa", "mscgen", "plantuml", "plantuml-utxt", "mermaid"
+            result, result1 = memoize(:svg_tool_process, t, result)
             "#{' '*indent}<figure#{el_html_attributes(el)}><artset><artwork #{html_attributes(artwork_attr.merge("type"=> "svg"))}>#{result1.sub(/.*?<svg/m, "<svg")}</artwork><artwork #{html_attributes(artwork_attr.merge("type"=> "ascii-art"))}><![CDATA[#{result}#{result =~ /\n\Z/ ? '' : "\n"}]]></artwork></artset></figure>\n"
           else
             "#{' '*indent}<figure#{el_html_attributes(el)}><artwork#{html_attributes(artwork_attr)}><![CDATA[#{result}#{result =~ /\n\Z/ ? '' : "\n"}]]></artwork></figure>\n"
@@ -467,6 +535,10 @@ module Kramdown
         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.8
+  version: 1.3.13
 platform: ruby
 authors:
 - Carsten Bormann
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-31 00:00:00.000000000 Z
+date: 2020-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown
@@ -67,7 +67,7 @@ homepage: http://github.com/cabo/kramdown-rfc2629
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -83,7 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Kramdown extension for generating RFC 7749 XML.
 test_files: []