kramdown-rfc2629 1.5.10 → 1.5.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f3134dbcc71753f5f8d41c106172e353dbcadf2f602dc378422e23d16c1e845
-  data.tar.gz: b0041cbd654edb611666733ada47a616e350e7f23ba32e9934df208d05fa5ff7
+  metadata.gz: b7bd20857db1f9901f6d430b02e257edb1190309b715abe1c0e914cac126a06c
+  data.tar.gz: 57d1fe042574bc981df911c4043a9dbb96c26e970a35693601911f564c974f3f
 SHA512:
-  metadata.gz: 795dfb70c7a96163cdd6ea5de3cca2503a68a2294909c0c6183a953b1b670ff632869e790a1d2bdb73f485115881fcd5eef6cb1b6a157b5a3f93bce13b8ccc4e
-  data.tar.gz: 64890d6e25973ede38f5bc2888f04d2129a0c247ca6ed60eb4200db5b94fdfb460e84b8389949ec5428e56b35dce6083ec2cb0d1536b0bc24d2e512b830cfaac
+  metadata.gz: bc64c6f45a3c3a0b30a9514c10f33a383d95f3ef7ac8e640f62bee7b6265fb83a8b76bf87d9dac03e84e2c07305af2f85985069e64db30de68760b41b9dbe459
+  data.tar.gz: f9fb4f647903103a05d3c0b73592fc73e4eea8e489018a0105e9eb8e4aac332d82a2a9e89df660e7e5fbdf1908d5014dc6f20915668ec103ddb6fdf969a5c9e4

data/kramdown-rfc2629.gemspec

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

@@ -455,6 +455,19 @@ COLORS
         dont_clean = false
         dont_check = false
         case t
+        when "protocol", "protocol-goat"
+          cmdparm = result.lines.map(&:strip).select {|x| x != ''}.join(',')
+          result, err, _s = Open3.capture3("protocol #{Shellwords.escape(cmdparm)}", 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);
+            dont_clean = true
+          else
+            result1 = nil
+          end
         when "goat"
           result1, err, _s = Open3.capture3("goat #{file.path}", stdin_data: result);
           dont_clean = true
@@ -487,15 +500,17 @@ COLORS
         # warn ["text:", result.inspect]
         # warn ["svg:", result1.inspect]
         file.unlink
-        result1 = svg_clean(result1) unless dont_clean
-        unless dont_check
-          result1, err, _s = Open3.capture3("svgcheck -Xqa", stdin_data: result1);
-          # warn ["svgcheck:", result1.inspect]
-          capture_croak("svgcheck", err)
-        end
-        if result1 == ''
-          warn "*** could not create svg for #{result.inspect[0...20]}..."
-          exit 65 # EX_DATAERR
+        if result1
+          result1 = svg_clean(result1) unless dont_clean
+          unless dont_check
+            result1, err, _s = Open3.capture3("svgcheck -Xqa", stdin_data: result1);
+            # warn ["svgcheck:", result1.inspect]
+            capture_croak("svgcheck", err)
+          end
+          if result1 == ''
+            warn "*** could not create svg for #{result.inspect[0...20]}..."
+            exit 65 # EX_DATAERR
+          end
         end
         [result, result1]       # text, svg
       end
@@ -548,12 +563,17 @@ COLORS
           end
           case t
           when "goat", "ditaa", "mscgen", "plantuml", "plantuml-utxt", 
-               "railroad", "railroad-utf8", "mermaid", "math"
+               "railroad", "railroad-utf8", "mermaid", "protocol", "protocol-goat",
+               "math"
             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"
+            end
           else
             gi ||= (
               if !$options.v3 || !t || ARTWORK_TYPES.include?(t) || artwork_attr["align"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kramdown-rfc2629
 version: !ruby/object:Gem::Version
-  version: 1.5.10
+  version: 1.5.11
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-15 00:00:00.000000000 Z
+date: 2021-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown