asciidoctor-diagram 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09488e585ecab52e38188d04020d60aa17873bea47c3043055f8f59770f9d1aa'
-  data.tar.gz: ab9eab53cc00fc988ccd4518ac62e91f815ea06cfc3d3615824a24d63efb07a7
+  metadata.gz: 3db88f4195c4c1bdb7ef894672db503b597107fff0c42c88d609acc1ce4cc612
+  data.tar.gz: c03d251525c9377265af7292b7a5bcad2ca17b3f11e0cc131b5befa50ea3c31b
 SHA512:
-  metadata.gz: 7e75194b60961b932b7ca141448948c92404db4557b83611c28786de97fb7b36e30d434189815729a4aab79620dd6a1e90d7eb0281c1a5a3a66356730f319892
-  data.tar.gz: d7b8c2f8d8678e6299dd309292cc524d704830d6a882ae9228620d466862f0e37c9b1540a57090641f04f3499fcfcbf46f08933febfaa0dbb15579d33c3d1c64
+  metadata.gz: 63c88296049bdf6d9e347acfbd1c0587faaf3e6e545b260ea593734d85844eb9c8c19575fb5414a81ae29867e828d72b952807fe2f9bc2e35418cef30664c1d8
+  data.tar.gz: 1b1dbac8878b37e601637b5f62cfd15cf8e1ce751d07d81910efa1d9ee87a10316d29ad20916919cad67121ab6557e8b58a26f05206583095419b691c0db7bfb

data/CHANGELOG.adoc

@@ -1,5 +1,21 @@
 = Asciidoctor-diagram Changelog
 
+
+== 2.0.3
+
+Enhancements::
+
+  * Issue #261: Ensure generated SVG diagrams always specify a view box
+  * Issue #284: Add support for HTTP redirect responses when using a rendering server
+  * Issue #290: Add support for Pikchr
+  * Add support for dpic
+  * Add support for Symboloator (@gsmecher)
+
+Bug Fixes::
+
+  * Issue #247: Fix `svg-type`/`diagram-svg-type`.
+  * Issue #257: Avoid potential hangs when generating Mermaid diagrams
+
 == 2.0.2
 
 Enhancements::

data/README.adoc

@@ -21,18 +21,20 @@ ifndef::env-site[:status:]
 :uri-bpmn: https://github.com/gtudan/bpmn-js-cmd
 :uri-bytefield: https://github.com/Deep-Symmetry/bytefield-svg
 :uri-ditaa: http://ditaa.sourceforge.net/
+:uri-dpic: https://gitlab.com/aplevich/dpic
 :uri-dot: https://graphviz.gitlab.io/_pages/doc/info/lang.html
 :uri-erd: https://github.com/BurntSushi/erd
 :uri-gnuplot: http://gnuplot.info
 :uri-graphviz: https://graphviz.gitlab.io
 :uri-imagemagick: http://www.imagemagick.org
 :uri-java: http://java.sun.com
-:uri-mermaid: https://github.com/mermaidjs/mermaid.cli
+:uri-mermaid: https://github.com/mermaid-js/mermaid-cli
 :uri-mscgen: http://www.mcternan.me.uk/mscgen/
 :uri-nomnoml: http://nomnoml.com
 :uri-nwdiag: http://blockdiag.com/en/nwdiag/index.html
 :uri-packetdiag: http://blockdiag.com/en/nwdiag/index.html
 :uri-phantomjs: http://phantomjs.org
+:uri-pikchr: https://pikchr.org
 :uri-plantuml: http://plantuml.sourceforge.net
 :uri-py-plantuml: https://code.google.com/p/asciidoc-plantuml/
 :uri-rackdiag: http://blockdiag.com/en/nwdiag/index.html
@@ -40,6 +42,7 @@ ifndef::env-site[:status:]
 :uri-shaape: https://github.com/christiangoltz/shaape
 :uri-smcat: https://github.com/sverweij/state-machine-cat
 :uri-svgbob: https://github.com/ivanceras/svgbobrus
+:uri-symbolator: https://github.com/kevinpt/symbolator
 :uri-syntrax: https://kevinpt.github.io/syntrax/
 :uri-umlet: http://www.umlet.com/
 :uri-vega: https://vega.github.io/vega/
@@ -50,7 +53,7 @@ ifndef::env-site[:status:]
 
 Asciidoctor Diagram is a set of Asciidoctor extensions that enable you to add diagrams, which you describe using plain text, to your AsciiDoc document.
 
-The extensions supports the {uri-a2s}[AsciiToSVG], BlockDiag ({uri-blockdiag}[BlockDiag], {uri-seqdiag}[SeqDiag], {uri-actdiag}[ActDiag], {uri-nwdiag}[NwDiag]), {uri-bytefield}[Bytefield-SVG], {uri-ditaa}[Ditaa], {uri-erd}[Erd], {uri-gnuplot}[Gnuplot], {uri-dot}[GraphViz], {uri-mermaid}[Mermaid], {uri-mscgen}[Msc], {uri-nomnoml}[Nomnoml], {uri-plantuml}[PlantUML], {uri-shaape}[Shaape], {uri-smcat}[State Machine Cat], {uri-svgbob}[SvgBob], {uri-syntrax}[Syntrax], {uri-umlet}[UMLet], {uri-vega}[Vega], {uri-vegalite}[Vega-Lite] and {uri-wavedrom}[WaveDrom] syntax.
+The extensions supports the {uri-a2s}[AsciiToSVG], BlockDiag ({uri-blockdiag}[BlockDiag], {uri-seqdiag}[SeqDiag], {uri-actdiag}[ActDiag], {uri-nwdiag}[NwDiag]), {uri-bytefield}[Bytefield-SVG], {uri-ditaa}[Ditaa], {uri-dpic}[dpic], {uri-erd}[Erd], {uri-gnuplot}[Gnuplot], {uri-dot}[GraphViz], {uri-mermaid}[Mermaid], {uri-mscgen}[Msc], {uri-nomnoml}[Nomnoml], {uri-pikchr}[Pikchr], {uri-plantuml}[PlantUML], {uri-shaape}[Shaape], {uri-smcat}[State Machine Cat], {uri-svgbob}[SvgBob], {uri-symbolator}[Symbolator], {uri-syntrax}[Syntrax], {uri-umlet}[UMLet], {uri-vega}[Vega], {uri-vegalite}[Vega-Lite] and {uri-wavedrom}[WaveDrom] syntax.
 
 Each extension runs the diagram processor to generate an SVG, PNG, or TXT file from the input text.
 The generated file is then inserted into your converted document.
@@ -126,6 +129,7 @@ The following diagram types and output formats are available:
 |{uri-bpmn}[bpmn]            |       |{check}|{check}|{check}|
 |{uri-bytefield}[bytefield]  |       |       |       |{check}|
 |{uri-ditaa}[ditaa]          |       |       |{check}|{check}|
+|{uri-dpic}[dpic]            |       |       |       |{check}|
 |{uri-erd}[erd]              |       |       |{check}|{check}|
 |{uri-gnuplot}[gnuplot]      |{check}|       |{check}|{check}|{check}
 |{uri-dot}[graphviz]         |       |{check}|{check}|{check}|
@@ -135,12 +139,14 @@ The following diagram types and output formats are available:
 |{uri-nomnoml}[nomnoml]      |       |       |       |{check}|
 |{uri-nwdiag}[nwdiag]        |       |{check}|{check}|{check}|
 |{uri-packetdiag}[packetdiag]|       |{check}|{check}|{check}|
+|{uri-pikchr}[pikchr]        |       |       |       |{check}|
 |{uri-plantuml}[plantuml]    |       |       |{check}|{check}|{check}
 |{uri-rackdiag}[rackdiag]    |       |{check}|{check}|{check}|
 |{uri-seqdiag}[seqdiag]      |       |{check}|{check}|{check}|
 |{uri-shaape}[shaape]        |       |       |{check}|{check}|
 |{uri-smcat}[smcat]          |       |       |       |{check}|
 |{uri-svgbob}[svgbob]        |       |       |       |{check}|
+|{uri-symbolator}[symbolator]|       |{check}|{check}|{check}|
 |{uri-syntrax}[syntrax]      |       |{check}|{check}|{check}|
 |{uri-umlet}[umlet]          |{check}|{check}|{check}|{check}|
 |{uri-vega}[vega]            |       |       |{check}|{check}|
@@ -257,7 +263,7 @@ or load and register each extension individually.
 require 'asciidoctor-diagram/<extension_name>'
 ----
 
-`<extension_name>` can be one of `a2s`, `blockdiag`, `bytefield`, `ditaa`, `erd`, `gnuplot`, `graphviz`, `meme`, `mermaid`, `msc`, `plantuml`, `shaape`, `smcat`, `svgbob`, `syntrax`, `umlet`, `vega` or `wavedrom`.
+`<extension_name>` can be one of `a2s`, `blockdiag`, `bytefield`, `ditaa`, `dpic`, `erd`, `gnuplot`, `graphviz`, `meme`, `mermaid`, `msc`, `pikchr`, `plantuml`, `shaape`, `smcat`, `svgbob`, `syntrax`, `umlet`, `vega` or `wavedrom`.
 
 Requiring one or more of these files will automatically register the extensions for all processed documents.
 
@@ -306,21 +312,24 @@ The following table lists the tools that are required for each diagram type, the
    |bpmn         |{uri-bpmn}[bpmn-js-cmd]                                               |`bpmn`
    |bytefield    |{uri-bytefield}[bytefield-svg]                                        |`bytefield-svg`
    |ditaa        |{uri-java}[Java]                                                      |`java`
+   |dpic         |{uri-dpic}[dpic]                                                      |`dpic`
    |erd          |{uri-erd}[Erd]                                                        |`erd`
    |gnuplot      |{uri-gnuplot}[Gnuplot]                                                |`gnuplot`
    |graphviz     |{uri-graphviz}[GraphViz]                                              |`dot` or `graphvizdot`
    |meme         |{uri-imagemagick}[ImageMagick]                                        |`convert` and `identify`
-   |mermaid      |{uri-mermaid}[Mermaid.cli]                                            |`mermaid`
+   |mermaid      |{uri-mermaid}[Mermaid.cli]                                            |`mmdc`
    |msc          |{uri-mscgen}[Mscgen]                                                  |`mscgen`
    |nomnoml      |{uri-nomnoml}[Nomnoml]                                                |`nomnoml`
    |nwdiag       |{uri-nwdiag}[NwDiag]                                                  |`nwdiag`
    |packetdiag   |{uri-nwdiag}[NwDiag]                                                  |`packetdiag`
+   |pikchr       |{uri-pikchr}[Pikchr]                                                  |`pikchr`
    |plantuml     |{uri-java}[Java]                                                      |`java`
    |rackdiag     |{uri-nwdiag}[NwDiag]                                                  |`rackdiag`
    |seqdiag      |{uri-seqdiag}[SeqDiag]                                                |`seqdiag`
    |shaape       |{uri-shaape}[Shaape]                                                  |`shaape`
    |smcat        |{uri-smcat}[State Machine Cat]                                        |`smcat`
    |svgbob       |{uri-svgbob}[SvgBob]                                                  |`svgbob`
+   |symbolator   |{uri-symbolator}[Symbolator]                                          |`symbolator`
    |syntrax      |{uri-syntrax}[Syntrax]                                                |`syntrax`
    |umlet        |{uri-umlet}[Umlet]                                                    |`umlet`
    |vega         |{uri-vega}[vg2png] and/or {uri-vega}[vg2png]                          |`vg2png` and `vg2svg`

data/lib/asciidoctor-diagram.rb

@@ -3,6 +3,7 @@ require_relative 'asciidoctor-diagram/blockdiag'
 require_relative 'asciidoctor-diagram/bpmn'
 require_relative 'asciidoctor-diagram/bytefield'
 require_relative 'asciidoctor-diagram/ditaa'
+require_relative 'asciidoctor-diagram/dpic'
 require_relative 'asciidoctor-diagram/erd'
 require_relative 'asciidoctor-diagram/gnuplot'
 require_relative 'asciidoctor-diagram/graphviz'
@@ -11,11 +12,13 @@ require_relative 'asciidoctor-diagram/meme'
 require_relative 'asciidoctor-diagram/mermaid'
 require_relative 'asciidoctor-diagram/msc'
 require_relative 'asciidoctor-diagram/nomnoml'
+require_relative 'asciidoctor-diagram/pikchr'
 require_relative 'asciidoctor-diagram/plantuml'
 require_relative 'asciidoctor-diagram/salt'
 require_relative 'asciidoctor-diagram/shaape'
 require_relative 'asciidoctor-diagram/smcat'
 require_relative 'asciidoctor-diagram/svgbob'
+require_relative 'asciidoctor-diagram/symbolator'
 require_relative 'asciidoctor-diagram/syntrax'
 require_relative 'asciidoctor-diagram/tikz'
 require_relative 'asciidoctor-diagram/umlet'

data/lib/asciidoctor-diagram/diagram_processor.rb

@@ -175,7 +175,8 @@ module Asciidoctor
 
           metadata = source.create_image_metadata
           metadata[:options] = options
-          metadata[:width], metadata[:height] = params[:decoder].get_image_size(result)
+
+          result, metadata[:width], metadata[:height] = params[:decoder].post_process_image(result)
 
           FileUtils.mkdir_p(File.dirname(image_file)) unless Dir.exist?(File.dirname(image_file))
           File.open(image_file, 'wb') {|f| f.write result}
@@ -184,12 +185,6 @@ module Asciidoctor
           File.open(metadata_file, 'w') {|f| JSON.dump(metadata, f)}
         end
 
-        image_attributes['target'] = source.attr('data-uri', nil, true) ? image_file : image_name
-        if format == :svg
-          svg_type = source.attr('svg-type', nil, name) || source.attr('svg-type', nil, DIAGRAM_PREFIX)
-          image_attributes['opts'] = svg_type if svg_type && svg_type != 'static'
-        end
-
         scale = image_attributes['scale']
         if scalematch = /(\d+(?:\.\d+))/.match(scale)
           scale_factor = scalematch[1].to_f
@@ -207,25 +202,44 @@ module Asciidoctor
           end
         end
 
-        image_attributes['alt'] ||= if title_text = image_attributes['title']
-                                      title_text
-                                    elsif target = image_attributes['target']
-                                      (File.basename(target, File.extname(target)) || '').tr '_-', ' '
-                                    else
-                                      'Diagram'
-                                    end
+        parent.document.register(:images, image_name)
+
+        node = Asciidoctor::Block.new parent, :image, :content_model => :empty, :attributes => image_attributes
 
-        image_attributes['alt'] = parent.sub_specialchars image_attributes['alt']
+        alt_text = node.attr('alt')
+        alt_text ||= if title_text = image_attributes['title']
+                       title_text
+                     elsif target = image_attributes['target']
+                       (File.basename(target, File.extname(target)) || '').tr '_-', ' '
+                     else
+                       'Diagram'
+                     end
+        alt_text = parent.sub_specialchars(alt_text)
 
-        parent.document.register(:images, image_name)
-        if (scaledwidth = image_attributes['scaledwidth'])
+        node.set_attr('alt', alt_text)
+
+        if (scaledwidth = node.attr('scaledwidth'))
           # append % to scaledwidth if ends in number (no units present)
           if DIGIT_CHAR_RANGE.include?((scaledwidth[-1] || 0).ord)
-            image_attributes['scaledwidth'] = %(#{scaledwidth}%)
+            node.set_attr('scaledwidth', %(#{scaledwidth}%))
+          end
+        end
+
+        node.set_attr('target', source.attr('data-uri', nil, true) ? image_file : image_name)
+
+        if format == :svg
+          svg_type = source.attr('svg-type', nil, name) || source.attr('svg-type', nil, DIAGRAM_PREFIX)
+          case svg_type
+            when nil, 'static'
+            when 'inline', 'interactive'
+              node.set_option(svg_type)
+              node.set_attr('target', image_file)
+            else
+              raise "Unsupported SVG type: #{svg_type}"
           end
         end
 
-        Asciidoctor::Block.new parent, :image, :content_model => :empty, :attributes => image_attributes
+        node
       end
 
       def scale(size, factor)

data/lib/asciidoctor-diagram/diagram_source.rb

@@ -1,3 +1,4 @@
+require 'asciidoctor/logging'
 require_relative 'util/which'
 
 module Asciidoctor
@@ -5,6 +6,8 @@ module Asciidoctor
     # This module describes the duck-typed interface that diagram sources must implement. Implementations
     # may include this module but it is not required.
     module DiagramSource
+      include Asciidoctor::Logging
+
       def image_name
         raise NotImplementedError.new
       end
@@ -75,14 +78,42 @@ module Asciidoctor
         if config.key? cmd_var
           cmd_path = config[cmd_var]
         else
-          cmd_path = attr_names.map { |attr_name| attr(attr_name, nil, true) }.find { |attr| !attr.nil? }
-
-          unless cmd_path && File.executable?(cmd_path)
-            cmd_paths = cmd_names.map do |c|
-              ::Asciidoctor::Diagram::Which.which(c, :path => options[:path])
-            end
-
-            cmd_path = cmd_paths.reject { |c| c.nil? }.first
+          logger.debug "Finding '#{cmd}' in attributes"
+          cmd_path = attr_names.map { |attr_name|
+                                 attr = attr(attr_name, nil, true)
+                                 if logger.debug? && attr
+                                   logger.debug "Found value '#{attr}' in attribute '#{attr_name}'" if attr
+                                 end
+                                 attr
+                               }
+                               .reject { |attr| attr.nil? }
+                               .map { |attr|
+                                 expanded = File.expand_path(attr)
+                                 if logger.debug? && attr != expanded
+                                   logger.debug "Expanded '#{attr}' to '#{expanded}'"
+                                 end
+                                 expanded
+                               }
+                               .select { |path|
+                                 executable = File.executable?(path)
+                                 if logger.debug?
+                                   logger.debug "Is '#{path}' executable? #{executable}"
+                                 end
+                                 executable
+                               }
+                               .first
+
+          unless cmd_path
+            logger.debug "Finding '#{cmd}' in environment"
+            cmd_path = cmd_names.map { |c|
+                             path = ::Asciidoctor::Diagram::Which.which(c, :path => options[:path])
+                             if logger.debug? && path
+                               logger.debug "Found '#{path}' in environment"
+                             end
+                             path
+                           }
+                           .reject { |path| path.nil? }
+                           .first
           end
 
           config[cmd_var] = cmd_path

data/lib/asciidoctor-diagram/dpic.rb

@@ -0,0 +1,7 @@
+require 'asciidoctor/extensions'
+require_relative 'dpic/extension'
+
+Asciidoctor::Extensions.register do
+  block Asciidoctor::Diagram::DpicBlockProcessor, :dpic
+  block_macro Asciidoctor::Diagram::DpicBlockMacroProcessor, :dpic
+end

data/lib/asciidoctor-diagram/dpic/converter.rb

@@ -0,0 +1,30 @@
+require_relative '../diagram_converter'
+require_relative '../util/cli_generator'
+require_relative '../util/platform'
+
+module Asciidoctor
+  module Diagram
+    # @private
+    class DpicConverter
+      include DiagramConverter
+      include CliGenerator
+
+
+      def supported_formats
+        [:svg]
+      end
+
+      def convert(source, format, options)
+        dpic_path = source.find_command('dpic')
+
+        code = source.to_s
+        code.prepend ".PS\n" unless code.start_with?(".PS\n")
+        code << "\n.PE" unless code.start_with?("\n.PE")
+
+        generate_file_stdout(dpic_path, format.to_s, code) do |tool_path, input_path|
+          [tool_path, "-v", "-z", input_path]
+        end
+      end
+    end
+  end
+end

data/lib/asciidoctor-diagram/dpic/extension.rb

@@ -0,0 +1,14 @@
+require_relative 'converter'
+require_relative '../diagram_processor'
+
+module Asciidoctor
+  module Diagram
+    class DpicBlockProcessor < DiagramBlockProcessor
+      use_converter DpicConverter
+    end
+
+    class DpicBlockMacroProcessor < DiagramBlockMacroProcessor
+      use_converter DpicConverter
+    end
+  end
+end

data/lib/asciidoctor-diagram/http/converter.rb

@@ -51,6 +51,7 @@ module Asciidoctor
           path << '/' unless path.end_with? '/'
           path << format.to_s
           path << '/' << data
+          uri.path = path
         when :kroki_io
           compressed = Zlib.deflate(code, Zlib::BEST_COMPRESSION)
           data = Base64.urlsafe_encode64(compressed)
@@ -60,17 +61,36 @@ module Asciidoctor
           path << options[:block_name].to_s
           path << '/' << format.to_s
           path << '/' << data
+          uri.path = path
         else
           raise "Unsupported server type: " + @type
         end
 
+        get_uri(uri)
+      end
+
+      private
+
+      def get_uri(uri, attempt = 1)
+        if attempt >= 10
+          raise "Too many redirects"
+        end
+
         Net::HTTP.start(uri.hostname, uri.port, :use_ssl => uri.scheme.downcase == 'https') do |http|
-          response = http.request_get path
+          response = http.request_get uri.path
           case response
-          when Net::HTTPSuccess
-            response.body
-          else
-            response.value
+            when Net::HTTPSuccess
+              response.body
+            when Net::HTTPRedirection then
+              location = response['Location']
+              new_uri = URI.parse(location)
+              if new_uri.relative?
+                get_uri(uri + location, attempt + 1)
+              else
+                get_uri(new_uri, attempt + 1)
+              end
+            else
+              response.value
           end
         end
       end

data/lib/asciidoctor-diagram/mermaid/converter.rb

@@ -57,7 +57,8 @@ module Asciidoctor
         opts[:width] = options[:width]
 
         mmdc = source.find_command('mmdc', :raise_on_error => false)
-        if mmdc
+        node = source.find_command('node', :raise_on_error => false)
+        if mmdc && node
           opts[:height] = options[:height]
           opts[:theme] = options[:theme]
           opts[:background] = options[:background]
@@ -65,7 +66,7 @@ module Asciidoctor
           if config
             opts[:config] = source.resolve_path(config)
           end
-          run_mmdc(mmdc, source, format, opts)
+          run_mmdc(node, mmdc, source, format, opts)
         else
           mermaid = source.find_command('mermaid')
           run_mermaid(mermaid, source, format, opts)
@@ -73,9 +74,9 @@ module Asciidoctor
       end
 
       private
-      def run_mmdc(mmdc, source, format, options = {})
-        generate_file(mmdc, 'mmd', format.to_s, source.to_s) do |tool_path, input_path, output_path|
-          args = [tool_path, '-i', Platform.native_path(input_path), '-o', Platform.native_path(output_path)]
+      def run_mmdc(node, mmdc, source, format, options = {})
+        generate_file(node, 'mmd', format.to_s, source.to_s) do |tool_path, input_path, output_path|
+          args = [tool_path, '--unhandled-rejections=strict', mmdc, '-i', Platform.native_path(input_path), '-o', Platform.native_path(output_path)]
 
           if options[:css]
             args << '--cssFile' << Platform.native_path(options[:css])

data/lib/asciidoctor-diagram/pikchr.rb

@@ -0,0 +1,7 @@
+require 'asciidoctor/extensions'
+require_relative 'pikchr/extension'
+
+Asciidoctor::Extensions.register do
+  block Asciidoctor::Diagram::PikchrBlockProcessor, :pikchr
+  block_macro Asciidoctor::Diagram::PikchrBlockMacroProcessor, :pikchr
+end

data/lib/asciidoctor-diagram/pikchr/converter.rb

@@ -0,0 +1,26 @@
+require_relative '../diagram_converter'
+require_relative '../util/cli_generator'
+require_relative '../util/platform'
+
+module Asciidoctor
+  module Diagram
+    # @private
+    class PikchrConverter
+      include DiagramConverter
+      include CliGenerator
+
+
+      def supported_formats
+        [:svg]
+      end
+
+      def convert(source, format, options)
+        pikchr_path = source.find_command('pikchr')
+
+        generate_file_stdout(pikchr_path, format.to_s, source.to_s) do |tool_path, input_path|
+          [tool_path, "--svg-only", input_path]
+        end
+      end
+    end
+  end
+end

data/lib/asciidoctor-diagram/pikchr/extension.rb

@@ -0,0 +1,14 @@
+require_relative 'converter'
+require_relative '../diagram_processor'
+
+module Asciidoctor
+  module Diagram
+    class PikchrBlockProcessor < DiagramBlockProcessor
+      use_converter PikchrConverter
+    end
+
+    class PikchrBlockMacroProcessor < DiagramBlockMacroProcessor
+      use_converter PikchrConverter
+    end
+  end
+end

data/lib/asciidoctor-diagram/symbolator.rb

@@ -0,0 +1,7 @@
+require 'asciidoctor/extensions'
+require_relative 'symbolator/extension'
+
+Asciidoctor::Extensions.register do
+  block Asciidoctor::Diagram::SymbolatorBlockProcessor, :symbolator
+  block_macro Asciidoctor::Diagram::SymbolatorBlockMacroProcessor, :symbolator
+end

data/lib/asciidoctor-diagram/symbolator/converter.rb

@@ -0,0 +1,23 @@
+require_relative '../diagram_converter'
+require_relative '../util/cli_generator'
+require_relative '../util/platform'
+
+module Asciidoctor
+  module Diagram
+    # @private
+    class SymbolatorConverter
+      include DiagramConverter
+      include CliGenerator
+
+      def supported_formats
+        [:png, :pdf, :svg]
+      end
+
+      def convert(source, format, options)
+        generate_stdin(source.find_command('symbolator'), format.to_s, source.to_s) do |tool_path, output_path|
+          [tool_path, "-i-", "-o#{Platform.native_path(output_path)}", "-f#{format.to_s}"]
+        end
+      end
+    end
+  end
+end

data/lib/asciidoctor-diagram/symbolator/extension.rb

@@ -0,0 +1,14 @@
+require_relative '../diagram_processor'
+require_relative 'converter'
+
+module Asciidoctor
+  module Diagram
+    class SymbolatorBlockProcessor < DiagramBlockProcessor
+      use_converter SymbolatorConverter
+    end
+
+    class SymbolatorBlockMacroProcessor < DiagramBlockMacroProcessor
+      use_converter SymbolatorConverter
+    end
+  end
+end

data/lib/asciidoctor-diagram/util/cli_generator.rb

@@ -1,3 +1,4 @@
+require 'asciidoctor/logging'
 require 'tempfile'
 require_relative 'cli'
 
@@ -5,6 +6,8 @@ module Asciidoctor
   module Diagram
     # @private
     module CliGenerator
+      include Asciidoctor::Logging
+
       def generate_stdin(tool, format, code)
         tool_name = File.basename(tool)
 
@@ -51,6 +54,20 @@ module Asciidoctor
         end
       end
 
+      def generate_file_stdout(tool, input_ext, code)
+        tool_name = File.basename(tool)
+
+        source_file = Tempfile.new([tool_name, ".#{input_ext}"])
+        begin
+          File.write(source_file.path, code)
+
+          opts = yield tool, source_file.path
+          generate(opts, :stdout)
+        ensure
+          source_file.unlink
+        end
+      end
+
       private
       def generate(opts, target_file, open3_opts = {})
         case opts
@@ -64,6 +81,7 @@ module Asciidoctor
             raise "Block passed to generate_file should return an Array or a Hash"
         end
 
+        logger.debug "Executing #{args} with options #{open3_opts}"
         result = ::Asciidoctor::Diagram::Cli.run(*args, open3_opts)
 
         data = target_file == :stdout ? result[:out] : read_result(target_file, out_file)

data/lib/asciidoctor-diagram/util/gif.rb

@@ -7,14 +7,14 @@ module Asciidoctor
       GIF87A_SIGNATURE = 'GIF87a'.force_encoding(Encoding::ASCII_8BIT)
       GIF89A_SIGNATURE = 'GIF89a'.force_encoding(Encoding::ASCII_8BIT)
 
-      def self.get_image_size(data)
+      def self.post_process_image(data)
         bio = BinaryIO.new(data)
         gif_signature = bio.read_string(6)
         raise "Invalid GIF signature" unless gif_signature == GIF87A_SIGNATURE || gif_signature == GIF89A_SIGNATURE
 
         width = bio.read_uint16_le
         height = bio.read_uint16_le
-        [width, height]
+        [data, width, height]
       end
     end
   end

data/lib/asciidoctor-diagram/util/pdf.rb

@@ -2,8 +2,8 @@ module Asciidoctor
   module Diagram
     # @private
     module PDF
-      def self.get_image_size(_)
-        nil
+      def self.post_process_image(data)
+        [data, nil, nil]
       end
     end
   end

data/lib/asciidoctor-diagram/util/png.rb

@@ -6,7 +6,7 @@ module Asciidoctor
     module PNG
       PNG_SIGNATURE = [137, 80, 78, 71, 13, 10, 26, 10].pack('CCCCCCCC')
 
-      def self.get_image_size(data)
+      def self.post_process_image(data)
         bio = BinaryIO.new(data)
         png_signature = bio.read_string(8)
         raise "Invalid PNG signature" unless png_signature == PNG_SIGNATURE
@@ -18,7 +18,7 @@ module Asciidoctor
 
         width = bio.read_uint32_be
         height = bio.read_uint32_be
-        [width, height]
+        [data, width, height]
       end
     end
   end

data/lib/asciidoctor-diagram/util/svg.rb

@@ -1,34 +1,53 @@
 require_relative 'binaryio'
+require 'rexml/document'
+require 'bigdecimal'
+require 'bigdecimal/util'
 
 module Asciidoctor
   module Diagram
     # @private
     module SVG
-      def self.get_image_size(data)
-        if m = START_TAG_REGEX.match(data)
-          start_tag = m[0]
-          if (w = WIDTH_REGEX.match(start_tag)) && (h = HEIGHT_REGEX.match(start_tag))
-            width = w[:value].to_i * to_px_factor(w[:unit])
-            height = h[:value].to_i * to_px_factor(h[:unit])
-            return [width.to_i, height.to_i]
-          end
-
-          if v = VIEWBOX_REGEX.match(start_tag)
-            width = v[:width]
-            height = v[:height]
-            return [width.to_i, height.to_i]
-          end
+      def self.post_process_image(data)
+        svg = REXML::Document.new(data)
+
+        root = svg.root
+
+        unless root.attributes['xmlns']
+          root.add_attribute('xmlns', 'http://www.w3.org/2000/svg')
+        end
+
+        unless root.attributes['preserveAspectRatio']
+          root.add_attribute('preserveAspectRatio', 'xMidYMid meet')
+        end
+
+        width = nil
+        height = nil
+
+        if (w = WIDTH_HEIGHT_REGEX.match(root.attributes['width'])) && (h = WIDTH_HEIGHT_REGEX.match(root.attributes['height']))
+          width = w[:value].to_d * to_px_factor(w[:unit])
+          height = h[:value].to_d * to_px_factor(h[:unit])
+        end
+
+        viewbox = root.attributes['viewBox']
+        if (v = VIEWBOX_REGEX.match(viewbox)) && width.nil? && height.nil?
+          width = v[:width].to_d
+          height = v[:height].to_d
         end
 
-        nil
+        if viewbox.nil? && width && height
+          root.add_attribute('viewBox', "0 0 #{width.to_s('F')} #{height.to_s('F')}")
+        end
+
+        patched_svg = ""
+        svg.write(:output => patched_svg, :indent => 2)
+
+        [patched_svg, width, height]
       end
 
       private
 
-      START_TAG_REGEX = /<svg[^>]*>/
-      WIDTH_REGEX = /width="(?<value>\d+(?:\.\d+)?)(?<unit>[a-zA-Z]+)?"/
-      HEIGHT_REGEX = /height="(?<value>\d+(?:\.\d+)?)(?<unit>[a-zA-Z]+)?"/
-      VIEWBOX_REGEX = /viewBox="\d+(?:\.\d+)? \d+(?:\.\d+)? (?<width>\d+(?:\.\d+)?) (?<height>\d+(?:\.\d+)?)"/
+      WIDTH_HEIGHT_REGEX = /^\s*(?<value>\d+(?:\.\d+)?)\s*(?<unit>[a-zA-Z]+)?\s*$/
+      VIEWBOX_REGEX = /^\s*\d+(?:\.\d+)?\s*\d+(?:\.\d+)?\s*(?<width>\d+(?:\.\d+)?)\s*(?<height>\d+(?:\.\d+)?)\s*$/
 
       def self.to_px_factor(unit)
         case unit

data/lib/asciidoctor-diagram/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
   module Diagram
-    VERSION = "2.0.2"
+    VERSION = "2.0.3"
   end
 end

data/spec/dpic_spec.rb

@@ -0,0 +1,74 @@
+require_relative 'test_helper'
+
+code = <<-eos
+  arrow "$u$" above
+S: circle rad 10/72.27  # 10 pt
+  line right 0.35
+G: box "$G(s)$"
+  arrow "$y$" above
+  line -> down G.ht from last arrow then left last arrow.c.x-S.x then to S.s
+  "$-\;$" below rjust
+eos
+
+describe Asciidoctor::Diagram::DpicBlockMacroProcessor, :broken_on_travis, :broken_on_windows do
+  it "should generate SVG images when format is set to 'svg'" do
+    File.write('dpic.txt', code)
+
+    doc = <<-eos
+= Hello, Dpic!
+Doc Writer <doc@example.com>
+
+== First Section
+
+dpic::dpic.txt[format="svg"]
+    eos
+
+    d = load_asciidoc doc
+    expect(d).to_not be_nil
+
+    b = d.find { |bl| bl.context == :image }
+    expect(b).to_not be_nil
+
+    expect(b.content_model).to eq :empty
+
+    target = b.attributes['target']
+    expect(target).to_not be_nil
+    expect(target).to match(/\.svg/)
+    expect(File.exist?(target)).to be true
+
+    expect(b.attributes['width']).to_not be_nil
+    expect(b.attributes['height']).to_not be_nil
+  end
+end
+
+describe Asciidoctor::Diagram::DpicBlockProcessor, :broken_on_travis, :broken_on_windows do
+  it "should generate SVG images when format is set to 'svg'" do
+    doc = <<-eos
+= Hello, Dpic!
+Doc Writer <doc@example.com>
+
+== First Section
+
+[dpic, format="svg"]
+----
+#{code}
+----
+    eos
+
+    d = load_asciidoc doc
+    expect(d).to_not be_nil
+
+    b = d.find { |bl| bl.context == :image }
+    expect(b).to_not be_nil
+
+    expect(b.content_model).to eq :empty
+
+    target = b.attributes['target']
+    expect(target).to_not be_nil
+    expect(target).to match(/\.svg/)
+    expect(File.exist?(target)).to be true
+
+    expect(b.attributes['width']).to_not be_nil
+    expect(b.attributes['height']).to_not be_nil
+  end
+end

data/spec/pikchr_spec.rb

@@ -0,0 +1,106 @@
+require_relative 'test_helper'
+
+code = <<-eos
+# Change from the original:
+#    * Expand the macro by hand, as Pikchr does not support
+#      macros
+#
+#define ndblock {
+#  box wid boxwid/2 ht boxht/2
+#  down;  box same with .t at bottom of last box;   box same
+#}
+boxht = .2; boxwid = .3; circlerad = .3; dx = 0.05
+down; box; box; box; box ht 3*boxht "." "." "."
+L: box; box; box invis wid 2*boxwid "hashtab:" with .e at 1st box .w
+right
+Start: box wid .5 with .sw at 1st box.ne + (.4,.2) "..."
+N1: box wid .2 "n1";  D1: box wid .3 "d1"
+N3: box wid .4 "n3";  D3: box wid .3 "d3"
+box wid .4 "..."
+N2: box wid .5 "n2";  D2: box wid .2 "d2"
+arrow right from 2nd box
+#ndblock
+  box wid boxwid/2 ht boxht/2
+  down;  box same with .t at bottom of last box;   box same
+spline -> right .2 from 3rd last box then to N1.sw + (dx,0)
+spline -> right .3 from 2nd last box then to D1.sw + (dx,0)
+arrow right from last box
+#ndblock
+  box wid boxwid/2 ht boxht/2
+  down;  box same with .t at bottom of last box;   box same
+spline -> right .2 from 3rd last box to N2.sw-(dx,.2) to N2.sw+(dx,0)
+spline -> right .3 from 2nd last box to D2.sw-(dx,.2) to D2.sw+(dx,0)
+arrow right 2*linewid from L
+#ndblock
+  box wid boxwid/2 ht boxht/2
+  down;  box same with .t at bottom of last box;   box same
+spline -> right .2 from 3rd last box to N3.sw + (dx,0)
+spline -> right .3 from 2nd last box to D3.sw + (dx,0)
+circlerad = .3
+circle invis "ndblock"  at last box.e + (1.2,.2)
+arrow dashed from last circle.w to 5/8<last circle.w,2nd last box> chop
+box invis wid 2*boxwid "ndtable:" with .e at Start.w
+eos
+
+describe Asciidoctor::Diagram::PikchrBlockMacroProcessor, :broken_on_travis, :broken_on_windows do
+  it "should generate SVG images when format is set to 'svg'" do
+    File.write('pikchr.txt', code)
+
+    doc = <<-eos
+= Hello, Pikchr!
+Doc Writer <doc@example.com>
+
+== First Section
+
+pikchr::pikchr.txt[format="svg"]
+    eos
+
+    d = load_asciidoc doc
+    expect(d).to_not be_nil
+
+    b = d.find { |bl| bl.context == :image }
+    expect(b).to_not be_nil
+
+    expect(b.content_model).to eq :empty
+
+    target = b.attributes['target']
+    expect(target).to_not be_nil
+    expect(target).to match(/\.svg/)
+    expect(File.exist?(target)).to be true
+
+    expect(b.attributes['width']).to_not be_nil
+    expect(b.attributes['height']).to_not be_nil
+  end
+end
+
+describe Asciidoctor::Diagram::ErdBlockProcessor, :broken_on_travis, :broken_on_windows do
+  it "should generate SVG images when format is set to 'svg'" do
+    doc = <<-eos
+= Hello, Pikchr!
+Doc Writer <doc@example.com>
+
+== First Section
+
+[pikchr, format="svg"]
+----
+#{code}
+----
+    eos
+
+    d = load_asciidoc doc
+    expect(d).to_not be_nil
+
+    b = d.find { |bl| bl.context == :image }
+    expect(b).to_not be_nil
+
+    expect(b.content_model).to eq :empty
+
+    target = b.attributes['target']
+    expect(target).to_not be_nil
+    expect(target).to match(/\.svg/)
+    expect(File.exist?(target)).to be true
+
+    expect(b.attributes['width']).to_not be_nil
+    expect(b.attributes['height']).to_not be_nil
+  end
+end

data/spec/plantuml_spec.rb

@@ -343,7 +343,7 @@ User --> (Use the application) : Label
     expect(target).to match(/\.svg/)
     expect(File.exist?(target)).to be true
 
-    expect(b.attributes['opts']).to eq('inline')
+    expect(b.option?('inline')).to be_truthy
 
     expect(b.attributes['width']).to_not be_nil
     expect(b.attributes['height']).to_not be_nil
@@ -379,7 +379,7 @@ User --> (Use the application) : Label
     expect(target).to match(/\.svg/)
     expect(File.exist?(target)).to be true
 
-    expect(b.attributes['opts']).to eq('inline')
+    expect(b.option?('inline')).to be_truthy
 
     expect(b.attributes['width']).to_not be_nil
     expect(b.attributes['height']).to_not be_nil
@@ -460,7 +460,7 @@ skinparam ArrowColor #DEADBE
     expect(File.exist?(target)).to be true
 
     svg = File.read(target, :encoding => Encoding::UTF_8)
-    expect(svg).to match(/<path.*fill="#DEADBE"/)
+    expect(svg).to match(/<[^<]+ fill=["']#DEADBE["']/)
   end
 
   it 'should not regenerate images when source has not changed' do

data/spec/symbolator_spec.rb

@@ -0,0 +1,200 @@
+require_relative 'test_helper'
+
+code = <<-eos
+library ieee;
+use ieee.std_logic_1164.all;
+
+package demo is
+  component demo_device is
+    generic (
+      SIZE : positive;
+      RESET_ACTIVE_LEVEL : std_ulogic := '1'
+    );
+    port (
+      --# {{clocks|}}
+      Clock : in std_ulogic;
+      Reset : in std_ulogic;
+
+      --# {{control|Named section}}
+      Enable : in std_ulogic;
+      Data_in : in std_ulogic_vector(SIZE-1 downto 0);
+      Data_out : out std_ulogic_vector(SIZE-1 downto 0)
+    );
+  end component;
+end package;
+eos
+
+describe Asciidoctor::Diagram::SymbolatorBlockMacroProcessor, :broken_on_windows do
+  it "should generate PNG images when format is set to 'png'" do
+    File.write('symbolator.txt', code)
+
+    doc = <<-eos
+= Hello, Symbolator!
+Doc Writer <doc@example.com>
+
+== First Section
+
+symbolator::symbolator.txt[format="png"]
+    eos
+
+    d = load_asciidoc doc
+    expect(d).to_not be_nil
+
+    b = d.find { |bl| bl.context == :image }
+    expect(b).to_not be_nil
+
+    expect(b.content_model).to eq :empty
+
+    target = b.attributes['target']
+    expect(target).to_not be_nil
+    expect(target).to match(/\.png$/)
+    expect(File.exist?(target)).to be true
+
+    expect(b.attributes['width']).to_not be_nil
+    expect(b.attributes['height']).to_not be_nil
+  end
+
+  it "should generate SVG images when format is set to 'svg'" do
+    File.write('symbolator.txt', code)
+
+    doc = <<-eos
+= Hello, Symbolator!
+Doc Writer <doc@example.com>
+
+== First Section
+
+symbolator::symbolator.txt[format="svg"]
+    eos
+
+    d = load_asciidoc doc
+    expect(d).to_not be_nil
+
+    b = d.find { |bl| bl.context == :image }
+    expect(b).to_not be_nil
+
+    expect(b.content_model).to eq :empty
+
+    target = b.attributes['target']
+    expect(target).to_not be_nil
+    expect(target).to match(/\.svg/)
+    expect(File.exist?(target)).to be true
+
+    expect(b.attributes['width']).to_not be_nil
+    expect(b.attributes['height']).to_not be_nil
+  end
+
+  it "should generate PDF images when format is set to 'pdf'" do
+    File.write('symbolator.txt', code)
+
+    doc = <<-eos
+= Hello, Symbolator!
+Doc Writer <doc@example.com>
+
+== First Section
+
+symbolator::symbolator.txt[format="pdf"]
+    eos
+
+    d = load_asciidoc doc
+    expect(d).to_not be_nil
+
+    b = d.find { |bl| bl.context == :image }
+    expect(b).to_not be_nil
+
+    expect(b.content_model).to eq :empty
+
+    target = b.attributes['target']
+    expect(target).to_not be_nil
+    expect(target).to match(/\.pdf/)
+    expect(File.exist?(target)).to be true
+  end
+end
+
+describe Asciidoctor::Diagram::SymbolatorBlockProcessor, :broken_on_windows do
+  it "should generate PNG images when format is set to 'png'" do
+    doc = <<-eos
+= Hello, Symbolator!
+Doc Writer <doc@example.com>
+
+== First Section
+
+[symbolator, format="png"]
+----
+#{code}
+----
+    eos
+
+    d = load_asciidoc doc
+    expect(d).to_not be_nil
+
+    b = d.find { |bl| bl.context == :image }
+    expect(b).to_not be_nil
+
+    expect(b.content_model).to eq :empty
+
+    target = b.attributes['target']
+    expect(target).to_not be_nil
+    expect(target).to match(/\.png$/)
+    expect(File.exist?(target)).to be true
+
+    expect(b.attributes['width']).to_not be_nil
+    expect(b.attributes['height']).to_not be_nil
+  end
+
+  it "should generate SVG images when format is set to 'svg'" do
+    doc = <<-eos
+= Hello, Symbolator!
+Doc Writer <doc@example.com>
+
+== First Section
+
+[symbolator, format="svg"]
+----
+#{code}
+----
+    eos
+
+    d = load_asciidoc doc
+    expect(d).to_not be_nil
+
+    b = d.find { |bl| bl.context == :image }
+    expect(b).to_not be_nil
+
+    expect(b.content_model).to eq :empty
+
+    target = b.attributes['target']
+    expect(target).to_not be_nil
+    expect(target).to match(/\.svg/)
+    expect(File.exist?(target)).to be true
+
+    expect(b.attributes['width']).to_not be_nil
+    expect(b.attributes['height']).to_not be_nil
+  end
+
+  it "should generate PDF images when format is set to 'pdf'" do
+    doc = <<-eos
+= Hello, Symbolator!
+Doc Writer <doc@example.com>
+
+== First Section
+
+[symbolator, format="pdf"]
+----
+#{code}
+----
+    eos
+
+    d = load_asciidoc doc
+    expect(d).to_not be_nil
+
+    b = d.find { |bl| bl.context == :image }
+    expect(b).to_not be_nil
+
+    expect(b.content_model).to eq :empty
+
+    target = b.attributes['target']
+    expect(target).to_not be_nil
+    expect(target).to match(/\.pdf/)
+    expect(File.exist?(target)).to be true
+  end
+end

data/spec/test_helper.rb

@@ -6,28 +6,6 @@ require 'stringio'
 require 'tmpdir'
 
 require_relative '../lib/asciidoctor-diagram'
-require_relative '../lib/asciidoctor-diagram/a2s/extension'
-require_relative '../lib/asciidoctor-diagram/blockdiag/extension'
-require_relative '../lib/asciidoctor-diagram/bytefield'
-require_relative '../lib/asciidoctor-diagram/ditaa/extension'
-require_relative '../lib/asciidoctor-diagram/erd/extension'
-require_relative '../lib/asciidoctor-diagram/gnuplot/extension'
-require_relative '../lib/asciidoctor-diagram/graphviz/extension'
-require_relative '../lib/asciidoctor-diagram/lilypond/extension'
-require_relative '../lib/asciidoctor-diagram/meme/extension'
-require_relative '../lib/asciidoctor-diagram/mermaid/extension'
-require_relative '../lib/asciidoctor-diagram/msc/extension'
-require_relative '../lib/asciidoctor-diagram/nomnoml/extension'
-require_relative '../lib/asciidoctor-diagram/plantuml/extension'
-require_relative '../lib/asciidoctor-diagram/shaape/extension'
-require_relative '../lib/asciidoctor-diagram/smcat/extension'
-require_relative '../lib/asciidoctor-diagram/svgbob/extension'
-require_relative '../lib/asciidoctor-diagram/syntrax/extension'
-require_relative '../lib/asciidoctor-diagram/tikz/extension'
-require_relative '../lib/asciidoctor-diagram/umlet/extension'
-require_relative '../lib/asciidoctor-diagram/vega/extension'
-require_relative '../lib/asciidoctor-diagram/wavedrom/extension'
-
 require_relative '../lib/asciidoctor-diagram/util/platform'
 
 module Asciidoctor

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-diagram
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Pepijn Van Eeckhoudt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-13 00:00:00.000000000 Z
+date: 2020-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -109,6 +109,9 @@ files:
 - lib/asciidoctor-diagram/ditaa.rb
 - lib/asciidoctor-diagram/ditaa/converter.rb
 - lib/asciidoctor-diagram/ditaa/extension.rb
+- lib/asciidoctor-diagram/dpic.rb
+- lib/asciidoctor-diagram/dpic/converter.rb
+- lib/asciidoctor-diagram/dpic/extension.rb
 - lib/asciidoctor-diagram/erd.rb
 - lib/asciidoctor-diagram/erd/converter.rb
 - lib/asciidoctor-diagram/erd/extension.rb
@@ -135,6 +138,9 @@ files:
 - lib/asciidoctor-diagram/nomnoml.rb
 - lib/asciidoctor-diagram/nomnoml/converter.rb
 - lib/asciidoctor-diagram/nomnoml/extension.rb
+- lib/asciidoctor-diagram/pikchr.rb
+- lib/asciidoctor-diagram/pikchr/converter.rb
+- lib/asciidoctor-diagram/pikchr/extension.rb
 - lib/asciidoctor-diagram/plantuml.rb
 - lib/asciidoctor-diagram/plantuml/converter.rb
 - lib/asciidoctor-diagram/plantuml/extension.rb
@@ -148,6 +154,9 @@ files:
 - lib/asciidoctor-diagram/svgbob.rb
 - lib/asciidoctor-diagram/svgbob/converter.rb
 - lib/asciidoctor-diagram/svgbob/extension.rb
+- lib/asciidoctor-diagram/symbolator.rb
+- lib/asciidoctor-diagram/symbolator/converter.rb
+- lib/asciidoctor-diagram/symbolator/extension.rb
 - lib/asciidoctor-diagram/syntrax.rb
 - lib/asciidoctor-diagram/syntrax/converter.rb
 - lib/asciidoctor-diagram/syntrax/extension.rb
@@ -189,6 +198,7 @@ files:
 - spec/bpmn_spec.rb
 - spec/bytefield_spec.rb
 - spec/ditaa_spec.rb
+- spec/dpic_spec.rb
 - spec/erd_spec.rb
 - spec/gnuplot_spec.rb
 - spec/graphviz_spec.rb
@@ -198,10 +208,12 @@ files:
 - spec/mermaid_spec.rb
 - spec/msc_spec.rb
 - spec/nomnoml_spec.rb
+- spec/pikchr_spec.rb
 - spec/plantuml_spec.rb
 - spec/shaape_spec.rb
 - spec/smcat_spec.rb
 - spec/svgbob_spec.rb
+- spec/symbolator_spec.rb
 - spec/syntrax_spec.rb
 - spec/test_helper.rb
 - spec/tikz_spec.rb
@@ -227,8 +239,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: An extension for asciidoctor that adds support for UML diagram generation
@@ -240,6 +251,7 @@ test_files:
 - spec/bpmn_spec.rb
 - spec/bytefield_spec.rb
 - spec/ditaa_spec.rb
+- spec/dpic_spec.rb
 - spec/erd_spec.rb
 - spec/gnuplot_spec.rb
 - spec/graphviz_spec.rb
@@ -249,10 +261,12 @@ test_files:
 - spec/mermaid_spec.rb
 - spec/msc_spec.rb
 - spec/nomnoml_spec.rb
+- spec/pikchr_spec.rb
 - spec/plantuml_spec.rb
 - spec/shaape_spec.rb
 - spec/smcat_spec.rb
 - spec/svgbob_spec.rb
+- spec/symbolator_spec.rb
 - spec/syntrax_spec.rb
 - spec/test_helper.rb
 - spec/tikz_spec.rb