kramdown-rfc2629 1.5.13 → 1.5.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44da042356d9bc536e5c05d3256718ed025a7d83a1678fa66ee86078daeaf440
-  data.tar.gz: 5ee1e04e156d30c36c070828f41ed382fb46a13a43310f8c6a2b5a597cb2fe4f
+  metadata.gz: 3097408dcedb58eab67f2de242d7ba51f8e62e82199e9da00b6a68ca0917c3dc
+  data.tar.gz: fbcac44963fb8a7ce2df22060e624410e8f7df4c439d2e7cdcc1fcb760f3b1c4
 SHA512:
-  metadata.gz: 1ce55d74b92191986255d87e27f1891a4f60f7eb68fe4baff5ea0eedd264a76511870b5817bae23d6b76e553143621b9ab570c658cb6b197735c501b470cfc7a
-  data.tar.gz: 8f044f904be1ef0f9d56bd430a7104d5e522b630cae07a318ef98c862639393350099148ecdb2dd1a3a027a2da627489aae1b7dcb64c1c9cbd60b7f56ca09541
+  metadata.gz: b79053e9e4a368ece939ef8a3cca6c8e72826dd0e35bee10a4cf1548f4e5b72d38fdf680a0ae33b17c33c24ab87335addd401d3df2d60b34476ccfb4f592a501
+  data.tar.gz: 0d1a39fbb8e26a5513deca8fdf9c844aed56cdcb27c02ab6695251bfadfbdd47721b0f3a90a2755171eb7eb58dc98629b57f8e528e0c7c00005f640a1d74bd6e

data/kramdown-rfc2629.gemspec

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

@@ -447,59 +447,67 @@ COLORS
         end
       end
 
-      def svg_tool_process(t, result)
+      def shell_prepare(opt)
+        " " << opt.shellsplit.shelljoin
+      end
+
+      DEFAULT_AASVG="aasvg --spaces=1"
+
+      def svg_tool_process(t, svg_opt, txt_opt, result)
         require 'tempfile'
         file = Tempfile.new("kramdown-rfc")
         file.write(result)
         file.close
         dont_clean = false
         dont_check = false
+        svg_opt = shell_prepare(svg_opt) if svg_opt
+        txt_opt = shell_prepare(txt_opt) if txt_opt
         case t
         when "protocol", "protocol-goat", "protocol-aasvg"
           cmdparm = result.lines.map(&:strip).select {|x| x != ''}.join(',')
-          result, err, _s = Open3.capture3("protocol #{Shellwords.escape(cmdparm)}", stdin_data: '')
+          result, err, _s = Open3.capture3("protocol #{Shellwords.escape(cmdparm)}#{txt_opt}", stdin_data: '')
           if t == "protocol-goat"
             file.unlink
             file = Tempfile.new("kramdown-rfc")
             file.write(result)
             file.close
-            result1, err, _s = Open3.capture3("goat #{file.path}", stdin_data: result);
+            result1, err, _s = Open3.capture3("goat#{svg_opt} #{file.path}", stdin_data: result);
             dont_clean = true
           elsif t == "protocol-aasvg"
-            result1, err, _s = Open3.capture3("aasvg", stdin_data: result);
+            result1, err, _s = Open3.capture3("#{DEFAULT_AASVG}#{svg_opt}", stdin_data: result);
             dont_clean = true
           else
             result1 = nil
           end
         when "goat"
-          result1, err, _s = Open3.capture3("goat #{file.path}", stdin_data: result);
+          result1, err, _s = Open3.capture3("goat#{svg_opt} #{file.path}", stdin_data: result);
           dont_clean = true
         when "aasvg"
-          result1, err, _s = Open3.capture3("aasvg", stdin_data: result);
+          result1, err, _s = Open3.capture3("#{DEFAULT_AASVG}#{svg_opt}", stdin_data: result);
           dont_clean = true
         when "ditaa"        # XXX: This needs some form of option-setting
-          result1, err, _s = Open3.capture3("ditaa #{file.path} --svg -o -", stdin_data: result);
+          result1, err, _s = Open3.capture3("ditaa #{file.path} --svg -o -#{svg_opt}", stdin_data: result);
         when "mscgen"
-          result1, err, _s = Open3.capture3("mscgen -T svg -i #{file.path} -o -", stdin_data: result);
+          result1, err, _s = Open3.capture3("mscgen -T svg -i #{file.path} -o -#{svg_opt}", stdin_data: result);
         when "mermaid"
-          result1, err, _s = Open3.capture3("mmdc -i #{file.path}", stdin_data: result); #  -b transparent
+          result1, err, _s = Open3.capture3("mmdc -i #{file.path}#{svg_opt}", stdin_data: result); #  -b transparent
           outpath = file.path + ".svg"
           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"
+          result1, err, _s = Open3.capture3("plantuml -pipe -tsvg#{svg_opt}", stdin_data: plantuml);
+          result, err1, _s = Open3.capture3("plantuml -pipe -tutxt#{txt_opt}", stdin_data: plantuml) if t == "plantuml-utxt"
           err << err1.to_s
         when "railroad", "railroad-utf8"
-          result1, err1, _s = Open3.capture3("kgt -l abnf -e svg", stdin_data: result);
+          result1, err1, _s = Open3.capture3("kgt -l abnf -e svg#{svg_opt}", stdin_data: result);
           result1 = svg_clean_kgt(result1); dont_clean = true
-          result, err, _s = Open3.capture3("kgt -l abnf -e rr#{t == "railroad" ? "text" : "utf8"}",
+          result, err, _s = Open3.capture3("kgt -l abnf -e rr#{t == "railroad" ? "text" : "utf8"}#{txt_opt}",
                                             stdin_data: result);
           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}")
+          result1, err, _s = Open3.capture3("tex2svg --font STIX --speech=false#{svg_opt} #{Shellwords.escape(' ' << result)}");
+          result, err1, _s = Open3.capture3("asciitex -f #{file.path}#{txt_opt}")
           err << err1
         end
         capture_croak(t, err)
@@ -576,12 +584,18 @@ COLORS
             if gi
               warn "*** Can't set GI #{gi} for composite SVG artset"
             end
-            result, result1 = memoize(:svg_tool_process, t, result)
-            if result1          # refactor!
-            "#{' '*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.merge("type"=> "ascii-art"))}><![CDATA[#{result}#{result =~ /\n\Z/ ? '' : "\n"}]]></artwork></figure>\n"
+            result, result1 = memoize(:svg_tool_process, t,
+                                      artwork_attr.delete("svg-options"),
+                                      artwork_attr.delete("txt-options"),
+                                      result)
+            retart = mk_artwork(artwork_attr, "ascii-art",
+                                "<![CDATA[#{result}#{result =~ /\n\Z/ ? '' : "\n"}]]>")
+            if result1          # nest TXT in artset with SVG
+              retsvg = mk_artwork(artwork_attr, "svg",
+                                  result1.sub(/.*?<svg/m, "<svg"))
+              retart = "<artset>#{retsvg}#{retart}</artset>"
             end
+            "#{' '*indent}<figure#{el_html_attributes(el)}>#{retart}</figure>\n"
           else
             gi ||= (
               if !$options.v3 || !t || ARTWORK_TYPES.include?(t) || artwork_attr["align"]
@@ -595,6 +609,10 @@ COLORS
         end
       end
 
+      def mk_artwork(artwork_attr, typ, content)
+        "<artwork #{html_attributes(artwork_attr.merge("type" => typ))}>#{content}</artwork>"
+      end
+
       def convert_blockquote(el, indent, opts)
         text = inner(el, indent, opts)
         if $options.v3

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kramdown-rfc2629
 version: !ruby/object:Gem::Version
-  version: 1.5.13
+  version: 1.5.14
 platform: ruby
 authors:
 - Carsten Bormann