asciidoctor-diagram 2.0.2 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09488e585ecab52e38188d04020d60aa17873bea47c3043055f8f59770f9d1aa'
-  data.tar.gz: ab9eab53cc00fc988ccd4518ac62e91f815ea06cfc3d3615824a24d63efb07a7
+  metadata.gz: 6929d068c82dc319a53dbcbc30da263e8356923fe2f92e6c4794f166c61b0252
+  data.tar.gz: 15b20dbe24d572cf174114d3e7cfa6146aa8bb7d46403de6c08284f6819d6e15
 SHA512:
-  metadata.gz: 7e75194b60961b932b7ca141448948c92404db4557b83611c28786de97fb7b36e30d434189815729a4aab79620dd6a1e90d7eb0281c1a5a3a66356730f319892
-  data.tar.gz: d7b8c2f8d8678e6299dd309292cc524d704830d6a882ae9228620d466862f0e37c9b1540a57090641f04f3499fcfcbf46f08933febfaa0dbb15579d33c3d1c64
+  metadata.gz: 04bec237f4f0529bd12324a1794bb0cd863a82ec27b867572e0f14ff93dbbce4e1e553e48f43fe04fbf1c31cf9af6eaab4e5b7933fb6b820988eade9031653d4
+  data.tar.gz: 392c0d5e97b6527bb21019f146732a8028681362c5dc19c8c572b2dc06a2c1f528a06d9d3236e292c8166f9acca3be1892bcb35eb0591a3e1c4a40ce10ff9e06

data/CHANGELOG.adoc

@@ -1,5 +1,30 @@
 = Asciidoctor-diagram Changelog
 
+== 2.0.4
+
+Enhancements::
+
+  * Issue #110: Added support for an experimental attribute `diagram-autoimagesdir` that sets per image node `imagesdir` values.
+
+Bug Fixes::
+
+  * Issue #292: A regression in 2.0.3 caused SVG diagrams to get a zero width and height when documents were regenerated.
+
+== 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/a2s/converter.rb

@@ -13,13 +13,13 @@ module Asciidoctor
         [:svg]
       end
 
-      def collect_options(source, name)
+      def collect_options(source)
         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[:sx] = source.attr('scalex')
+        options[:sy] = source.attr('scaley')
+        options[:scale] = source.attr('scale')
+        options[:noblur] = source.attr('noblur') == 'true'
+        options[:font] = source.attr('fontfamily')
         options
       end
 
@@ -50,6 +50,10 @@ module Asciidoctor
           args
         end
       end
+
+      def native_scaling?
+        true
+      end
     end
   end
 end

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

@@ -19,7 +19,7 @@ module Asciidoctor
           cmd_name = self.class.const_get(:TOOL)
           alt_cmd_name = "#{cmd_name}3"
 
-          font_path = source.attr('fontpath', nil, cmd_name)
+          font_path = source.attr('fontpath')
 
           generate_stdin(source.find_command(cmd_name, :alt_cmds => [alt_cmd_name]), format.to_s, source.to_s) do |tool_path, output_path|
             args = [tool_path, '-a', '-o', Platform.native_path(output_path), "-T#{format.to_s}"]

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

@@ -15,11 +15,11 @@ module Asciidoctor
         [:png, :svg, :pdf, :jpeg]
       end
 
-      def collect_options(source, name)
+      def collect_options(source)
         options = {}
 
-        options[:width] = source.attr('width', nil, name)
-        options[:height] = source.attr('height', nil, name)
+        options[:width] = source.attr('width')
+        options[:height] = source.attr('height')
 
         options
       end

data/lib/asciidoctor-diagram/diagram_converter.rb

@@ -7,13 +7,17 @@ module Asciidoctor
         raise NotImplementedError.new
       end
 
-      def collect_options(source, name)
+      def collect_options(source)
         {}
       end
 
       def convert(source, format, options)
         raise NotImplementedError.new
       end
+
+      def native_scaling?
+        false
+      end
     end
   end
 end

data/lib/asciidoctor-diagram/diagram_processor.rb

@@ -3,6 +3,7 @@ require 'asciidoctor/extensions'
 require 'digest'
 require 'json'
 require 'fileutils'
+require 'pathname'
 require_relative 'diagram_source.rb'
 require_relative 'http/converter'
 require_relative 'version'
@@ -30,8 +31,6 @@ module Asciidoctor
         host_class.extend(ClassMethods)
       end
 
-      DIAGRAM_PREFIX = 'diagram'
-
       IMAGE_PARAMS = {
           :svg => {
               :encoding => Encoding::UTF_8,
@@ -69,7 +68,7 @@ module Asciidoctor
         supported_formats = converter.supported_formats
 
         begin
-          format = source.attributes.delete('format') || source.attr('format', nil, name) || source.attr('format', supported_formats[0], DIAGRAM_PREFIX)
+          format = source.attributes.delete('format') || source.global_attr('format', supported_formats[0])
           format = format.to_sym if format.respond_to?(:to_sym)
 
           raise "Format undefined" unless format
@@ -91,7 +90,7 @@ module Asciidoctor
           block.assign_caption(caption, 'figure')
           block
         rescue => e
-          case source.attr('on-error', 'log', DIAGRAM_PREFIX)
+          case source.global_attr('on-error', 'log')
           when 'abort'
             raise e
           else
@@ -146,7 +145,7 @@ module Asciidoctor
       def create_image_block(parent, source, format, converter)
         image_name = "#{source.image_name}.#{format}"
         image_dir = image_output_dir(parent)
-        cache_dir = cache_dir(parent)
+        cache_dir = cache_dir(source, parent)
         image_file = parent.normalize_system_path image_name, image_dir
         metadata_file = parent.normalize_system_path "#{image_name}.cache", cache_dir
 
@@ -157,25 +156,26 @@ module Asciidoctor
         end
 
         image_attributes = source.attributes
-        options = converter.collect_options(source, name)
+        options = converter.collect_options(source)
 
         if !File.exist?(image_file) || source.should_process?(image_file, metadata) || options != metadata[:options]
           params = IMAGE_PARAMS[format]
 
-          server_url = source.attr('server-url', nil, name) || source.attr('server-url', nil, DIAGRAM_PREFIX)
+          server_url = source.global_attr('server-url')
           if server_url
-            server_type = source.attr('server-type', nil, name) || source.attr('server-type', 'plantuml', DIAGRAM_PREFIX)
+            server_type = source.global_attr('server-type')
             converter = HttpConverter.new(server_url, server_type.to_sym, converter)
           end
 
-          options = converter.collect_options(source, name)
+          options = converter.collect_options(source)
           result = converter.convert(source, format, options)
 
           result.force_encoding(params[:encoding])
 
           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,14 +184,8 @@ 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)
+        if !converter.native_scaling? && scalematch = /(\d+(?:\.\d+))/.match(scale)
           scale_factor = scalematch[1].to_f
         else
           scale_factor = 1.0
@@ -207,25 +201,58 @@ 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
 
-        Asciidoctor::Block.new parent, :image, :content_model => :empty, :attributes => image_attributes
+        use_absolute_path = source.attr('data-uri', nil, true)
+
+        if format == :svg
+          svg_type = source.global_attr('svg-type')
+          case svg_type
+            when nil, 'static'
+            when 'inline', 'interactive'
+              node.set_option(svg_type)
+              use_absolute_path = true
+            else
+              raise "Unsupported SVG type: #{svg_type}"
+          end
+        end
+
+        if use_absolute_path
+          node.set_attr('target', image_file)
+        else
+          node.set_attr('target', image_name)
+
+          if source.global_attr('autoimagesdir')
+            output_base_dir = output_base_dir(parent)
+            if output_base_dir
+              imagesdir = Pathname.new(image_file).relative_path_from(output_base_dir).dirname.to_s
+              node.set_attr('imagesdir', imagesdir)
+            end
+          end
+        end
+
+        node
       end
 
       def scale(size, factor)
@@ -239,32 +266,31 @@ module Asciidoctor
       end
 
       def image_output_dir(parent)
-        document = parent.document
-
         images_dir = parent.attr('imagesoutdir', nil, true)
 
         if images_dir
           base_dir = nil
         else
-          base_dir = parent.attr('outdir', nil, true) || doc_option(document, :to_dir)
+          base_dir = output_base_dir(parent)
           images_dir = parent.attr('imagesdir', nil, true)
         end
 
         parent.normalize_system_path(images_dir, base_dir)
       end
 
-      def cache_dir(parent)
-        document = parent.document
-        cache_dir = '.asciidoctor/diagram'
-        base_dir = parent.attr('outdir', nil, true) || doc_option(document, :to_dir)
-        parent.normalize_system_path(cache_dir, base_dir)
+      def output_base_dir(parent)
+        parent.normalize_system_path(parent.attr('outdir', nil, true) || doc_option(parent.document, :to_dir))
+      end
+
+      def cache_dir(source, parent)
+        source.global_attr('cachedir') || parent.normalize_system_path('.asciidoctor/diagram', output_base_dir(parent))
       end
 
       def create_literal_block(parent, source, format, converter)
         literal_attributes = source.attributes
         literal_attributes.delete('target')
 
-        options = converter.collect_options(source, name)
+        options = converter.collect_options(source)
         result = converter.convert(source, format, options)
 
         result.force_encoding(Encoding::UTF_8)

data/lib/asciidoctor-diagram/diagram_source.rb

@@ -1,3 +1,4 @@
+require 'asciidoctor/logging'
 require_relative 'util/which'
 
 module Asciidoctor
@@ -5,6 +6,12 @@ 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 diagram_type
+        raise NotImplementedError.new
+      end
+
       def image_name
         raise NotImplementedError.new
       end
@@ -15,20 +22,24 @@ module Asciidoctor
         raise NotImplementedError.new
       end
 
+      def global_attr(name, default_value = nil)
+        attr(name) || attr(name, default_value, 'diagram')
+      end
+
       # Get the value for the specified attribute. First look in the attributes on
       # this document and return the value of the attribute if found. Otherwise, if
       # this document is a child of the Document document, look in the attributes of the
       # Document document and return the value of the attribute if found. Otherwise,
       # return the default value, which defaults to nil.
       #
-      # @param name [String, Symbol] the name of the attribute to lookup
+      # @param name [String, Symbol, Array] the name(s) of the attribute to lookup
       # @param default_value [Object] the value to return if the attribute is not found
       # @inherit [Boolean, String] indicates whether to check for the attribute on the AsciiDoctor::Document if not found on this document.
       #                            When a non-nil String is given the an attribute name "#{inherit}-#{name}" is looked for on the document.
       #
       # @return the value of the attribute or the default value if the attribute is not found in the attributes of this node or the document node
       # @abstract
-      def attr(name, default_value = nil, inherit = nil)
+      def attr(name, default_value = nil, inherit = diagram_type)
         raise NotImplementedError.new
       end
 
@@ -75,14 +86,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
@@ -113,6 +152,10 @@ module Asciidoctor
         @attributes = attributes
       end
 
+      def diagram_type
+        @block_processor.name.downcase
+      end
+
       def resolve_path target, start = base_dir
         @parent_block.normalize_system_path(target, start)
       end
@@ -125,18 +168,22 @@ module Asciidoctor
         attr('target', 'diag-' + checksum)
       end
 
-      def attr(name, default_value = nil, inherit = nil)
+      def attr(name, default_value = nil, inherit = diagram_type)
         name = name.to_s if ::Symbol === name
+        name = [name] unless name.is_a?(Enumerable)
 
-        value = @attributes[name]
+        value = name.lazy.map { |n| @attributes[n] }.reject { |v| v.nil? }.first
 
         if value.nil? && inherit
-          case inherit
-          when String, Symbol
-            value = @parent_block.attr("#{inherit.to_s}-#{name}", default_value, true)
-          else
-            value = @parent_block.attr(name, default_value, inherit)
+          inherited_values = name.lazy.map do |n|
+            case inherit
+            when String, Symbol
+              @parent_block.attr("#{inherit.to_s}-#{n}", default_value, true)
+            else
+              @parent_block.attr(n, default_value, inherit)
+            end
           end
+          value = inherited_values.reject { |v| v.nil? }.first
         end
 
         value || default_value