asciidoctor-diagram 1.5.18 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8e3c8549b195285f274052e14c6addc52c5900a80fcf88935cb3820432903ac
-  data.tar.gz: b673dd81b505260bf7fd06e45ef98df1806a22684a4036fb4c4e006317384538
+  metadata.gz: 3db88f4195c4c1bdb7ef894672db503b597107fff0c42c88d609acc1ce4cc612
+  data.tar.gz: c03d251525c9377265af7292b7a5bcad2ca17b3f11e0cc131b5befa50ea3c31b
 SHA512:
-  metadata.gz: 193b91c7ddac87a1e0fad1a1c65b6dcb6406888c54443f5a6ae8be8f6ffb3845708e6c29a4a0d5d11438411d7281f60be1b0be79d280bf68a8764daf3a0ed4ea
-  data.tar.gz: 18e6d118480da5b4010df9bcc0fa58bd852d5cf70bb48960f55b31235bb6bfe58cfa4fe47eab3d750a56262db9f8a76c390b85cb88dffbbfd9df1f8c512d3fd5
+  metadata.gz: 63c88296049bdf6d9e347acfbd1c0587faaf3e6e545b260ea593734d85844eb9c8c19575fb5414a81ae29867e828d72b952807fe2f9bc2e35418cef30664c1d8
+  data.tar.gz: 1b1dbac8878b37e601637b5f62cfd15cf8e1ce751d07d81910efa1d9ee87a10316d29ad20916919cad67121ab6557e8b58a26f05206583095419b691c0db7bfb

data/CHANGELOG.adoc

@@ -1,5 +1,71 @@
 = 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::
+
+  * #260: Update PlantUML to v1.2020.6
+  * #270: Add support for svgbob options (@hackingotter)
+  * #268: Changing diagram attribute values will now also trigger image regeneration
+  * #276: Add support for bytefield-svg
+
+Bug Fixes::
+
+  * Issue #253: Add support for PlantUML `atxt` and `utxt` output formats
+  * Issue #266: Resolve execution issue when the path for GnuPlot or Vega contains spaces
+  * Issue #267: Use binary mode when reading generated images from stdout
+  * Issue #273: Report Ditaa syntax errors correctly
+
+== 2.0.1
+
+Bug Fixes::
+
+  * Issue #254: On Windows generating PlantUML or Ditaa diagrams would cause asciidoctor-diagram to block indefinitely
+
+== 2.0.0
+
+Enhancements::
+  * Cleaned up internals of the extension
+  * Add support for BPMN (@gtudan)
+  * Update PlantUML to v1.2019.12
+  * #231 Improve PlantUML error reporting
+  * #247 Add support for document-level `diagram-svg-type` and block-level `svg-type` attributes to control SVG interactivity
+  * #250 Add support for Mermaid's `puppeteerConfig` option (@ldz-w)
+
+== 1.5.19
+
+Bug Fixes::
+  * Issue #233: Resolve character encoding issues with Ditaa on Windows with Java runtimes that do not use UTF-8 encoding by default
+  * Fix generation of SVG output for TikZ diagrams (@joelsmith)
+  * Improve TikZ image cropping (@joelsmith)  
+
+Enhancements::
+  * Issue #225: Add support for WaveDrom CLI 2.0.0
+  * Issue #234: Add support for State Machine Cat
+  * Add support for gnuplot (@MariuszCwikla)
+
+== 1.5.18
+
+Bug Fixes::
+
+  * Issue #224: Fix asciidoctor 1.5.x compatibility regression introduced in 1.5.17
+
 == 1.5.17
 
 Enhancements::

data/README.adoc

@@ -18,24 +18,31 @@ ifndef::env-site[:status:]
 :uri-asciidoctor-api: http://asciidoctor.org/docs/user-manual/#api
 :uri-asciidoctor-extensions: http://asciidoctor.org/docs/user-manual/#extension-points
 :uri-blockdiag: http://blockdiag.com
+: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
 :uri-seqdiag: http://blockdiag.com/en/seqdiag/index.html
 :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/
@@ -46,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-ditaa}[Ditaa], {uri-erd}[Erd], {uri-dot}[GraphViz], {uri-mermaid}[Mermaid], {uri-mscgen}[Msc], {uri-nomnoml}[Nomnoml], {uri-plantuml}[PlantUML], {uri-shaape}[Shaape], {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.
@@ -119,8 +126,12 @@ The following diagram types and output formats are available:
 |{uri-a2s}[a2s]              |       |       |       |{check}|
 |{uri-actdiag}[actdiag]      |       |{check}|{check}|{check}|
 |{uri-blockdiag}[blockdiag]  |       |{check}|{check}|{check}|
+|{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}|
 |<<meme,meme>>               |{check}|       |{check}|       |
 |{uri-mermaid}[mermaid]      |       |{check}|{check}|{check}|
@@ -128,11 +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}|
@@ -249,7 +263,7 @@ or load and register each extension individually.
 require 'asciidoctor-diagram/<extension_name>'
 ----
 
-`<extension_name>` can be one of `a2s`, `blockdiag`, `ditaa`, `erd`, `graphviz`, `meme`, `mermaid`, `msc`, `plantuml`, `shaape`, `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.
 
@@ -295,26 +309,33 @@ The following table lists the tools that are required for each diagram type, the
    |a2s          |{uri-a2s}[AsciiToSvg]                                                 |`a2s`
    |actdiag      |{uri-actdiag}[ActDiag]                                                |`actdiag`
    |blockdiag    |{uri-blockdiag}[BlockDiag]                                            |`blockdiag`
+   |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`
    |vegalite     |{uri-vegalite}[vl2vg] and {uri-vega}[vg2png] and/or {uri-vega}[vg2svg]|`vl2vg`, `vg2png` and `vg2svg`
 .2+|wavedrom     |{uri-wavedromeditor}[WaveDrom Editor]                                 |`wavedrom`
-                 |{uri-wavedromcli}[WaveDrom CLI] and {uri-phantomjs}[PhantomJS]        |`wavedrom` and `phantomjs`
+                 |{uri-wavedromcli}[WaveDrom CLI] (and {uri-phantomjs}[PhantomJS] for WaveDrom CLI v1)      |`wavedrom` (and `phantomjs`)
 |===
 
 If for instance you installed `actdiag` in `/home/me/actdiag/bin` and this path is not included in the `PATH` you can specify its location on the command line
@@ -328,17 +349,17 @@ The meme extension provides a basic '`Advice Animal`' style image generator.
 It's usage is easiest to explain with an example.
 
 ----
-meme::yunoguy.jpg[Doc writers,Y U NO \\ AsciiDoc]
+meme::yunoguy.jpg[Doc writers,Y U NO // AsciiDoc]
 ----
 
 The target of the block macro tells the extension which image to use as background.
 The first two positional attributes are `top` and `bottom` and are used for the top and bottom label.
-Occurrences of `\\` surrounded by whitespace are interpreted as line breaks.
+Occurrences of `//` surrounded by whitespace are interpreted as line breaks.
 
 === Diagram Attributes
 
 Certain diagram types allow image generation to be customized using attributes.
-Each attribute can be specified either at the block level or at the document level.
+Each attribute can be specified per individual diagram block or for all blocks of a given diagram type in a document level.
 This is illustrated for the blockdiag `fontpath` attribute in the example below.
 
 ----
@@ -353,13 +374,23 @@ This is illustrated for the blockdiag `fontpath` attribute in the example below.
 ....
 ....
 ----
-<1> Block level attributes can be specified at the document level by prefixing them with `<blocktype>-`
-<2> The first diagram does not specify an explicit value for `fontpath` so the global value will be used
-<3> The second diagram specifies a `fontpath` value which overrrides the global value
+<1> Attributes can be specified for all diagram of a certain type at the document level by prefixing them with `<blocktype>-`.
+    In this example, the `fontpath` attribute is specified for all diagrams of type `blockdiag`.
+<2> The first diagram does not specify an explicit value for `fontpath` so the global `blockdiag-fontpath` value will be used
+<3> The second diagram does specifie a `fontpath` value.
+    This overrides the global `blockdiag-fontpath` value.
 
 Each attribute can either be specified at the block level or at the document level.
 The attribute name at the block level should be prefixed with the name of the diagram type and a dash.
 
+==== Shared Attributes
+
+[cols=">,<,<",options="header"]
+|===
+|Name         |Default value   |Description
+|svg-type     |unspecified     |One of `static`, `inline` or `interactive`. This determines the style of SVG embedding that's used in certain backends. The https://asciidoctor.org/docs/user-manual/#taming-svgs[asciidoctor user guide] describes this in more detail.
+|===
+
 ==== AsciiToSVG
 
 [cols=">,<,<",options="header"]
@@ -377,6 +408,15 @@ The attribute name at the block level should be prefixed with the name of the di
 |fontpath     |unspecified     |The path to the font that should be used by blockdiag
 |===
 
+==== BPMN
+
+[cols=">,<,<",options="header"]
+|===
+|Name         |Default value   |Description
+|height       |786             |The target height of the diagram. Does not apply for output type `svg`.
+|width        |1024            |The target width of the diagram. Does not apply for output type `svg`.
+|===
+
 ==== Ditaa
 
 [cols=">,<,<",options="header"]
@@ -394,6 +434,20 @@ The attribute name at the block level should be prefixed with the name of the di
 |transparent  |false           |Makes the background of the image transparent instead of using the background color.
 |===
 
+==== Gnuplot
+
+[cols=">,<,<",options="header"]
+|===
+|Name         |Default value   |Description
+|background   |unspecified     |Background color, e.g. `red`, `#FF0000`. Does not work with `txt`.
+|height       |unspecified     |The height of the plot. Must be specified together with `width`.
+|width        |unspecified     |The width of the plot. Must be specified together with `height`.
+|crop         |unspecified     |Trims blank space from the edges of the completed plot (true/false). Does not work with `svg`, `pdf`.
+|transparent  |unspecified     |Generate transparent background (true/false). Does not work with `svg`, `pdf`, `txt`. 
+|font         |unspecified     |The font face with optional font size to use for the text, e.g. `font="Arial"`, `font="Arial,11"`. Does not work with `txt`.
+|fontscale    |unspecified     |Scales all label for given factor. Does not work with `txt`.
+|===
+
 ==== GraphViz
 
 [cols=">,<,<",options="header"]
@@ -407,9 +461,9 @@ The attribute name at the block level should be prefixed with the name of the di
 [cols=">,<,<",options="header"]
 |===
 |Name          |Default value |Description
-|fillColor     |white         |The fill color for the text.
-|strokeColor   |black         |The outline color for the text
-|strokeWidth   |2             |The width of the text outline.
+|fill-color    |white         |The fill color for the text.
+|stroke-color  |black         |The outline color for the text
+|stroke-width  |2             |The width of the text outline.
 |font          |Impact        |The font face to use for the text.
 |options       |unspecified   |a comma separate list of flags that modify the image rendering. Currently only `noupcase` is supported which disable upper casing the labels.
 |===
@@ -418,15 +472,16 @@ The attribute name at the block level should be prefixed with the name of the di
 
 [cols=">,<,<",options="header"]
 |===
-|Name          |Default value   |Description
-|background    |FFFFFF          |The background colour of the image. The format should be a six-digit hexadecimal number (as in HTML, FF0000 for red). Pass an eight-digit hex to define transparency.
-|css           |unspecified     |Path to a CSS file to pass to mermaid.
-|config        |unspecified     |Path to a JSON config file to pass to mermaid.
-|ganttconfig   |unspecified     |Path to a gantt config file to pass to mermaid.
-|sequenceconfig|unspecified     |Path to a sequence config file to pass to mermaid.
-|theme         |unspecified     |Theme of the chart, could be default, forest, dark or neutral.
-|width         |unspecified     |Width of the page.
-|height        |unspecified     |Height of the page.
+|Name            |Default value   |Description
+|background      |FFFFFF          |The background colour of the image. The format should be a six-digit hexadecimal number (as in HTML, FF0000 for red). Pass an eight-digit hex to define transparency.
+|css             |unspecified     |Path to a CSS file to pass to mermaid.
+|config          |unspecified     |Path to a JSON config file to pass to mermaid.
+|gantt-config    |unspecified     |Path to a gantt config file to pass to mermaid.
+|puppeteer-config|unspecified     |Path to a puppeteer config file to pass to mermaid.
+|sequence-config |unspecified     |Path to a sequence config file to pass to mermaid.
+|theme           |unspecified     |Theme of the chart, could be default, forest, dark or neutral.
+|width           |unspecified     |Width of the page.
+|height          |unspecified     |Height of the page.
 |===
 
 ==== Msc
@@ -445,6 +500,26 @@ The attribute name at the block level should be prefixed with the name of the di
 |config        |unspecified     |Path to a config file to pass to PlantUML.
 |===
 
+==== State Machine Cat
+
+[cols=">,<,<",options="header"]
+|===
+|Name          |Default value   |Description
+|direction     |unspecifed      |The direction of the state machine diagram. One of `top-down`, `bottom-top`, `left-right` or `right-left`.
+|engine        |unspecified     |The layout engine to use. One of `dot`, `circo`, `fdp`, `neato`, `osage`, or `twopi`
+|===
+
+==== svgbob
+
+[cols=">,<,<",options="header"]
+|===
+|Name          |Default value   |Description
+|font-family   |arial           |text will be rendered with this font
+|font-size     |14              |text will be rendered with this font size
+|scale         |1               |scale the entire svg (dimensions, font size, stroke width) by this factor
+|stroke-width  |2               |stroke width for all lines
+|===
+
 ==== Syntrax
 
 [cols=">,<,<",options="header"]

data/examples/features.adoc

@@ -160,5 +160,5 @@ Instead the name of the generated image is derived from the target propery of th
 The previous example in block macro form would look something like this with the text from the block located in a file called `activity_diagram.txt` instead of inline in the document.
 
 ----
-plantuml:activity_diagram.txt[format="svg", align="center"]
-----
+plantuml::activity_diagram.txt[format="svg", align="center"]
+----

data/lib/asciidoctor-diagram.rb

@@ -1,16 +1,24 @@
 require_relative 'asciidoctor-diagram/a2s'
 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'
+require_relative 'asciidoctor-diagram/lilypond'
 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/a2s/converter.rb

@@ -0,0 +1,55 @@
+require_relative '../diagram_converter'
+require_relative '../util/cli_generator'
+require_relative '../util/platform'
+
+module Asciidoctor
+  module Diagram
+    # @private
+    class AsciiToSvgConverter
+      include DiagramConverter
+      include CliGenerator
+
+      def supported_formats
+        [:svg]
+      end
+
+      def collect_options(source, name)
+        options = {}
+        options[:sx] = source.attr('scalex', nil, name)
+        options[:sy] = source.attr('scaley', nil, name)
+        options[:scale] = source.attr('scale', nil, name)
+        options[:noblur] = source.attr('noblur', nil, name) == 'true'
+        options[:font] = source.attr('fontfamily', nil, name)
+        options
+      end
+
+      def convert(source, format, options)
+        sx = options[:sx]
+        sy = options[:sy]
+        scale = options[:scale]
+        noblur = options[:noblur]
+        font = options[:font]
+
+        generate_stdin(source.find_command('a2s'), format.to_s, source.to_s) do |tool_path, output_path|
+          args = [tool_path, '-o', Platform.native_path(output_path)]
+
+          if sx && sy
+            args << '-s' << "#{sx},#{sy}"
+          elsif scale
+            args << '-s' << "#{scale},#{scale}"
+          end
+
+          if noblur
+            args << '-b'
+          end
+
+          if font
+            args << '-f' << font
+          end
+
+          args
+        end
+      end
+    end
+  end
+end

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

@@ -1,60 +1,14 @@
-require_relative '../extensions'
-require_relative '../util/cli_generator'
-require_relative '../util/platform'
-require_relative '../util/which'
+require_relative 'converter'
+require_relative '../diagram_processor'
 
 module Asciidoctor
   module Diagram
-    # @private
-    module AsciiToSvg
-      include CliGenerator
-      include Which
-
-      def self.included(mod)
-        [:svg].each do |f|
-          mod.register_format(f, :image) do |parent, source|
-            a2s(parent, source, f)
-          end
-        end
-      end
-
-      def a2s(parent, source, format)
-        inherit_prefix = name
-
-        sx = source.attr('scalex', nil, inherit_prefix)
-        sy = source.attr('scaley', nil, inherit_prefix)
-        scale = source.attr('scale', nil, inherit_prefix)
-        noblur = source.attr('noblur', 'false', inherit_prefix) == 'true'
-        font = source.attr('fontfamily', nil, inherit_prefix)
-
-        generate_stdin(which(parent, 'a2s'), format.to_s, source.to_s) do |tool_path, output_path|
-          args = [tool_path, '-o', Platform.native_path(output_path)]
-
-          if sx && sy
-            args << '-s' << "#{sx},#{sy}"
-          elsif scale
-            args << '-s' << "#{scale},#{scale}"
-          end
-
-          if noblur
-            args << '-b'
-          end
-
-          if font
-            args << '-f' << font
-          end
-
-          args
-        end
-      end
-    end
-
-    class AsciiToSvgBlockProcessor < Extensions::DiagramBlockProcessor
-      include AsciiToSvg
+    class AsciiToSvgBlockProcessor < DiagramBlockProcessor
+      use_converter AsciiToSvgConverter
     end
 
-    class AsciiToSvgBlockMacroProcessor < Extensions::DiagramBlockMacroProcessor
-      include AsciiToSvg
+    class AsciiToSvgBlockMacroProcessor < DiagramBlockMacroProcessor
+      use_converter AsciiToSvgConverter
     end
   end
 end