kramdown-rfc2629 1.3.24 → 1.3.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4917395db5dce706708b9a3ce81da25a4089d0982b6f6c577fe2249248718f3c
-  data.tar.gz: c2c3a7ce6d9269674a20dcbd793e2bd0f451cee98fa36dbe5b2be47b29d76f30
+  metadata.gz: 0e453f1845b6d5384b372a0e934068226afe4d2241c7f0b16bf0bd4efc216ef8
+  data.tar.gz: 9e2d8c085ad1c78a95347843650b5d47f05872108ac7d93a91e6eaad62285e0a
 SHA512:
-  metadata.gz: 3818e58468fef81b14fb7bf7e399a0ba740ed08a3b2e2b98a0e4e2019c536a456aec5678e1e3a6a525800d236a245bd86f05bf07610048c287f72c633cb1355d
-  data.tar.gz: 884d1d3650106e695294dfdf96a534db6e1f40fd7204e10bfab118fc50ebca1db65b28762d52c57884732f65da37183c83a34834cbad21a6c9a1f77db6f7e023
+  metadata.gz: 52d76611fd7500af5b0d688e43b858d0d97a83c0e0cba73ef42d5cb076f922be008fc7c2a053a77bbbf0c11465038891f1c07d823f6d2675918adb5708e4f0d0
+  data.tar.gz: 44aa98da4b6e6d263d77865a7d2335d64320ce4422ecac139c61f5f060acd47781f8bac49197c938e2ccf97dfe4c8ebf23770eaf503cd3422e77b27ce9752002

data/README.md

@@ -294,13 +294,24 @@ 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
+* [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
+* [mermaid][]: Very experimental; the conversion to SVG is prone to
   generate black-on-black text in this version
+* math: display math using [tex2svg][] for HTML/PDF and [asciitex][]
+  (fork: [asciiTeX][asciiTeX-eggert]) for plaintext
+
+[goat]: https://github.com/blampe/goat
+[ditaa]:  https://github.com/stathissideris/ditaa
+[mscgen]: http://www.mcternan.me.uk/mscgen/
+[plantuml]: https://plantuml.com
+[mermaid]: https://github.com/mermaid-js/mermaid-cli
+[tex2svg]: https://github.com/mathjax/MathJax-demos-node/blob/master/direct/tex2svg
+[asciitex]: http://asciitex.sourceforge.net/
+[asciiTeX-eggert]: https://github.com/larseggert/asciiTeX
 
 Note that this feature does not play well with the CI (continuous
 integration) support in Martin Thomson's [I-D Template][], as that may

data/bin/kdrfc

@@ -24,6 +24,12 @@ def process_mkd(input, output)
   end
 end
 
+def run_idnits(txt_fn)
+  unless system("idnits", txt_fn)
+    warn "*** problem #$? running idnits"
+  end
+end
+
 def process_xml(*args)
   if $options.remote
     process_xml_remotely(*args)
@@ -124,6 +130,9 @@ BANNER
   opts.on("-c", "--[no-]convert", "Convert xml to v3 xml") do |v|
     $options.v2v3 = v
   end
+  opts.on("-i", "--[no-]idnits", "Run idnits on the resulting text") do |v|
+    $options.idnits = v
+  end
   opts.on("-h", "--[no-]html", "Convert to html as well") do |v|
     $options.html = v
   end
@@ -139,8 +148,9 @@ op.parse!
 def process_the_xml(fn, base)
   process_xml(fn, "#{base}.prepped.xml", "--preptool") if $options.prep
   process_xml(fn, "#{base}.v2v3.xml", "--v2v3") if $options.v2v3
-  process_xml(fn, "#{base}.txt") if $options.txt
+  process_xml(fn, "#{base}.txt") if $options.txt || $options.idnits
   process_xml(fn, "#{base}.html", "--html") if $options.html
+  run_idnits("#{base}.txt") if $options.idnits
 end
 
 case ARGV.size

data/bin/kramdown-rfc2629

@@ -4,7 +4,7 @@ require 'kramdown-rfc2629'
 require 'kramdown-rfc/parameterset'
 require 'kramdown-rfc/refxml'
 require 'yaml'
-require 'erb'
+require 'kramdown-rfc/erb'
 require 'date'
 
 # try to get this from gemspec.
@@ -154,7 +154,7 @@ def xml_from_sections(input)
       if bibref
         if old = anchor_to_bibref[word]
           if bibref != old
-            warn "*** conflicting definitions for xref #{anchor}: #{old} != #{bibref}"
+            warn "*** conflicting definitions for xref #{word}: #{old} != #{bibref}"
           end
         else
           anchor_to_bibref[word] = bibref
@@ -229,7 +229,7 @@ def xml_from_sections(input)
 
   erbfilename = File.expand_path '../../data/kramdown-rfc2629.erb', __FILE__
   erbfile = File.read(erbfilename, coding: "UTF-8")
-  erb = ERB.new(erbfile, nil, '-')
+  erb = ERB.trim_new(erbfile, '-')
   # remove redundant nomarkdown pop outs/pop ins as they confuse kramdown
   input = erb.result(binding).gsub(%r"{::nomarkdown}\s*{:/nomarkdown}"m, "")
   ps.warn_if_leftovers

data/kramdown-rfc2629.gemspec

@@ -1,12 +1,12 @@
 spec = Gem::Specification.new do |s|
   s.name = 'kramdown-rfc2629'
-  s.version = '1.3.24'
+  s.version = '1.3.29'
   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.}
   s.add_dependency('kramdown', '~> 1.17.0')
   s.add_dependency('certified', '~> 1.0')
-  s.add_dependency('json', '~> 2.0')
+  s.add_dependency('json_pure', '~> 2.0')
   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 data/math.json)
   s.require_path = 'lib'
   s.executables = ['kramdown-rfc2629', 'doilit', 'kramdown-rfc-extract-markdown', 'kdrfc']

data/lib/kramdown-rfc/erb.rb

@@ -0,0 +1,16 @@
+require 'erb'
+
+class ERB
+
+  case version.sub("erb.rb [", "")
+  when /\A2.1/                    # works back to 1.9.1
+    def self.trim_new(s, trim)
+      ERB.new(s, nil, trim)
+    end
+  else
+    def self.trim_new(s, trim)
+      ERB.new(s, trim_mode: trim)
+    end
+  end
+
+end

data/lib/kramdown-rfc/refxml.rb

@@ -1,3 +1,5 @@
+require 'kramdown-rfc/erb'
+
 module KramdownRFC
 
   extend Kramdown::Utils::Html
@@ -8,7 +10,7 @@ module KramdownRFC
 
   def self.ref_to_xml(k, v)
     vps = KramdownRFC::ParameterSet.new(v)
-    erb = ERB.new <<-REFERB, nil, '-'
+    erb = ERB.trim_new <<-REFERB, '-'
 <reference anchor="<%= escattr(k) %>" <%= vps.attr("target") %>>
   <front>
     <%= vps.ele("title") -%>
@@ -75,7 +77,7 @@ module KramdownRFC
   ERB
 
   def self.person_element_from_aups(element_name, aups)
-    erb = ERB.new(PERSON_ERB, nil, '-')
+    erb = ERB.trim_new(PERSON_ERB, '-')
     erb.result(binding)
   end
 

data/lib/kramdown-rfc2629.rb

@@ -289,7 +289,12 @@ COLORS
         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"] }
+        # Fix for mermaid:
+        REXML::XPath.each(d.root, "//polygon") { |x| x.attributes["rx"] = nil; x.attributes["ry"] = nil }
         d.to_s
+      rescue => detail
+        warn "*** Can't clean SVG: #{detail}"
+        d
       end
 
       def memoize(meth, *args)
@@ -330,13 +335,13 @@ COLORS
         when "mermaid"
           result1, err, _s = Open3.capture3("mmdc -i #{file.path}", stdin_data: result); #  -b transparent
           outpath = file.path + ".svg"
-          result1 = File.read(outpath)
-          File.unlink(outpath)
+          result1 = File.read(outpath) rescue '' # don't die before providing error message
+          File.unlink(outpath) rescue nil        # ditto
         when "plantuml", "plantuml-utxt"
           plantuml = "@startuml\n#{result}\n@enduml"
           result1, err, _s = Open3.capture3("plantuml -pipe -tsvg", stdin_data: plantuml);
           result, err1, _s = Open3.capture3("plantuml -pipe -tutxt", stdin_data: plantuml) if t == "plantuml-utxt"
-          err << err1
+          err << err1.to_s
         when "math"
           result1, err, _s = Open3.capture3("tex2svg --font STIX --speech=false #{Shellwords.escape(' ' << result)}");
           result, err1, _s = Open3.capture3("asciitex -f #{file.path}")
@@ -349,6 +354,10 @@ COLORS
         result1, err, _s = Open3.capture3("svgcheck -qa", stdin_data: result1);
         capture_croak("svgcheck", err)
         # warn ["svgcheck:", result1.inspect]
+        if result1 == ''
+          warn "*** could not create svg for #{result.inspect[0...20]}..."
+          exit 65 # EX_DATAERR
+        end
         [result, result1]       # text, svg
       end
 
@@ -778,10 +787,10 @@ COLORS
             ttl ||= KRAMDOWN_REFCACHETTL  # everything but RFCs might change a lot
             puts "*** Huh: #{fn}" unless sub
             url = "#{XML_RESOURCE_ORG_PREFIX}/#{sub}/#{fn}"
-            if can_anchor # create anchor server-side for stand_alone: false
-              url << "?anchor=#{anchor}"
-              fn[/.xml$/] = "--anchor=#{anchor}.xml"
-            end
+            # if can_anchor # create anchor server-side for stand_alone: false
+            #   url << "?anchor=#{anchor}"
+            #   fn[/.xml$/] = "--anchor=#{anchor}.xml"
+            # end
             to_insert = get_and_cache_resource(url, fn.gsub('/', '_'), ttl)
             to_insert.scrub! rescue nil # only do this for Ruby >= 2.1
             # this may be a bit controversial: Don't break the build if reference is broken

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kramdown-rfc2629
 version: !ruby/object:Gem::Version
-  version: 1.3.24
+  version: 1.3.29
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-01 00:00:00.000000000 Z
+date: 2021-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: json_pure
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -74,6 +74,7 @@ files:
 - data/kramdown-rfc2629.erb
 - data/math.json
 - kramdown-rfc2629.gemspec
+- lib/kramdown-rfc/erb.rb
 - lib/kramdown-rfc/gzip-clone.rb
 - lib/kramdown-rfc/parameterset.rb
 - lib/kramdown-rfc/refxml.rb