kramdown-rfc2629 1.3.7 → 1.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b34bf25043259c59faad1a28e37420d84708298d7d1132954855e9bc9f80469
-  data.tar.gz: 598bdd61e5206c389e32e8014469688f516abf4c3b965fc8c14ddd9f10210d63
+  metadata.gz: 0bf90a7fd57ee1492ceaf533983659336ca24c1334b79cd9be55661c4622d10f
+  data.tar.gz: 940584f0bea9de4fb1e2e9b91a79bd8b4eb0192543f625d7c0cbfa9858402275
 SHA512:
-  metadata.gz: ef912cb94fce48cb61f0a352d9a2b0c701eb9c8149fe46608fdff508f2e974289a777d773a5a95dbc433c7cfbbd667aacf0391b68371aa549baabf75a325890d
-  data.tar.gz: c54c3cc14bdefcbae8a9650522653851af06b9c054ac239eb0555714c85fe5dd14e03fa5d16836c6e12ee83a559ed808c4c4e79d8665592966688f5b6fcba5bd
+  metadata.gz: f444f161ab0611bc92bbdb2f790c13f1676b9e035368fbcd7869317e5f30b28dd3e59789e55c0c6e3f67f5f8d4d5fa3d2368b26e307ab44f2e846604670754ab
+  data.tar.gz: dfcae66926b4a96424d0be1144d7ccf5c00a28b5153d2adf5897484b9f51826989bf14314909e7a3327ad9ac75b9b57f63270626890b7de3648ddbf2d63e2c5d

data/kramdown-rfc2629.gemspec

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

@@ -150,13 +150,28 @@ module Kramdown
         generate_id(value).gsub(/-+/, '-')
       end
 
+      def svg_munch_color(c, fill)
+        case c
+        when /\A#(..)(..)(..)\z/
+          if [$1, $2, $3].map {|x| x.to_i(16)}.sum >= 300 # arbitrary
+            'white'
+          else
+            'black'
+          end
+        when 'none'
+          'none' if fill        # delete for stroke
+        else
+          c
+        end
+      end
+
       def svg_clean(s)          # expensive, risky
         require "rexml/document"
         d = REXML::Document.new(s)
         REXML::XPath.each(d.root, "//*[@shape-rendering]") { |x| x.attributes["shape-rendering"] = nil }  #; warn x.inspect }
         REXML::XPath.each(d.root, "//*[@text-rendering]") { |x| x.attributes["text-rendering"] = nil }  #; warn x.inspect  }
-        REXML::XPath.each(d.root, "//*[@stroke='#000000']") { |x| x.attributes["stroke"] = "black" } #; warn x.inspect }
-        REXML::XPath.each(d.root, "//*[@stroke='none']") { |x| x.attributes["stroke"] = 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) }
         d.to_s
       end
 
@@ -204,7 +219,7 @@ module Kramdown
             end
           end
           case t
-          when "goat", "ditaa", "mscgen"
+          when "goat", "ditaa", "mscgen", "plantuml", "plantuml-utxt"
             require 'tempfile'
             file = Tempfile.new("kramdown-rfc")
             file.write(result)
@@ -218,6 +233,11 @@ module Kramdown
             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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kramdown-rfc2629
 version: !ruby/object:Gem::Version
-  version: 1.3.7
+  version: 1.3.8
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-30 00:00:00.000000000 Z
+date: 2020-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown