asciidoctor-diagram 1.5.2 → 1.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7c8a0442a43c4f2b062c9a2875db9bfe487ebfe
-  data.tar.gz: e5ed8001a95d21ff5461ab9adf71b679dcdeb8c5
+  metadata.gz: d38f932148312e67e4249a2c171c71da2c796a49
+  data.tar.gz: c50317e4443b383f73be0b3e068364185cba7a97
 SHA512:
-  metadata.gz: 9261c02e0ce34b5b532352d5c8816f682c4cea2e352e90c7a8ac51909ed1295da58f4b337e41a852a63469bf9280596b8d11e321d8a7587f2a8e77e38274967e
-  data.tar.gz: 3540b311b595776f6bac442827a077fcfeefbd24e50ee8fbe58d9a756633213bd4a02336847fcda91647dd6feb2c113d701506859ec6c61dc3660b3e073d4762
+  metadata.gz: 9d8544bb90e946c5b20b9e675268e519cf52f9dd89a3b054b4214a9c1b3dff59d6ce9683569616c3ed9d81441dc089179cb559e1569b1c11e4d586f99d457a41
+  data.tar.gz: d26cbf53122d923276a543f49efe434ba8690fbb85ba0e44ced6c52bd4c24779fb110bcef1c3f03c29f5b731dfc15c4a30c06d78516742987815c70a6d6886ab

data/CHANGELOG.adoc

@@ -1,6 +1,28 @@
 = Asciidoctor-diagram Changelog
 
-== Development
+== 1.5.4
+
+Enhancements::
+
+  * Add support for UMLet.
+  * Issue #141: Allow blockdiag fontpath to be specified via attributes
+
+Bug Fixes::
+
+  * Issue #140: Restore PNG as default format for Graphviz diagrams
+
+== 1.5.3
+
+Enhancements::
+
+  * Issue #124: Improve compatibility with Cygwin
+  * Issue #133: Support substitutions in block macro target attribute
+  * Issue #135: Add support for PDF output for blockdiag and graphviz.
+  * Update PlantUML to revision 8053 (21/12/2016)
+
+Bug Fixes::
+
+  * Resolve error when using WaveDromEditor.app on macOS
 
 == 1.5.2
 

data/README.adoc

@@ -32,6 +32,7 @@ ifndef::env-site[:status:]
 :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-umlet: http://www.umlet.com/
 :uri-wavedrom: http://wavedrom.com
 :uri-wavedromeditor: https://github.com/wavedrom/wavedrom.github.io/releases
 :uri-wavedromcli: https://github.com/wavedrom/cli
@@ -103,23 +104,24 @@ Diagram in appropriate syntax
 
 The following diagram types and output formats are available:
 
-[cols=">,4*^",options="header"]
+[cols=">,5*^",options="header"]
 |===
-|Diagram Type                |gif    |png    |svg    |txt
-|{uri-actdiag}[actdiag]      |       |{check}|{check}|
-|{uri-blockdiag}[blockdiag]  |       |{check}|{check}|
-|{uri-ditaa}[ditaa]          |       |{check}|       |
-|{uri-erd}[erd]              |       |{check}|{check}|
-|{uri-dot}[graphviz]         |       |{check}|{check}|
-|<<meme,meme>>               |{check}|{check}|       |
-|{uri-mermaid}[mermaid]      |       |{check}|{check}|
-|{uri-nwdiag}[nwdiag]        |       |{check}|{check}|
-|{uri-packetdiag}[packetdiag]|       |{check}|{check}|
-|{uri-plantuml}[plantuml]    |       |{check}|{check}|{check}
-|{uri-rackdiag}[rackdiag]    |       |{check}|{check}|
-|{uri-seqdiag}[seqdiag]      |       |{check}|{check}|
-|{uri-shaape}[shaape]        |       |{check}|{check}|
-|{uri-wavedrom}[wavedrom]    |       |{check}|{check}|
+|Diagram Type                |gif    |pdf    |png    |svg    |txt
+|{uri-actdiag}[actdiag]      |       |{check}|{check}|{check}|
+|{uri-blockdiag}[blockdiag]  |       |{check}|{check}|{check}|
+|{uri-ditaa}[ditaa]          |       |       |{check}|       |
+|{uri-erd}[erd]              |       |       |{check}|{check}|
+|{uri-dot}[graphviz]         |       |{check}|{check}|{check}|
+|<<meme,meme>>               |{check}|       |{check}|       |
+|{uri-mermaid}[mermaid]      |       |       |{check}|{check}|
+|{uri-nwdiag}[nwdiag]        |       |{check}|{check}|{check}|
+|{uri-packetdiag}[packetdiag]|       |{check}|{check}|{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-umlet}[umlet]          |{check}|{check}|{check}|{check}|
+|{uri-wavedrom}[wavedrom]    |       |       |{check}|{check}|
 |===
 
 The example below illustrates the structure of a basic ditaa block written directly in an AsciiDoc document.
@@ -287,6 +289,7 @@ The following table lists the tools that are required for each diagram type, the
    |rackdiag     |{uri-nwdiag}[NwDiag]                                                  |`rackdiag`
    |seqdiag      |{uri-seqdiag}[SeqDiag]                                                |`seqdiag`
    |shaape       |{uri-shaape}[Shaape]                                                  |`shaape`
+   |umlet        |{uri-umlet}[Umlet]                                                    |`umlet`
 .2+|wavedrom     |{uri-wavedromeditor}[WaveDrom Editor]                                 |`wavedrom`
                  |{uri-wavedromcli}[WaveDrom CLI] and {uri-phantomjs}[PhantomJS]        |`wavedrom` and `phantomjs`
 |===
@@ -309,12 +312,92 @@ The target of the block macro tells the extension which image to use as backgrou
 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.
 
-The block macro also supports the following named attributes:
+=== Diagram Attributes
 
-. `fillColor`: the fill color for the text. Defaults to `white`.
-. `strokeColor`:  the outline color for the text. Defaults to `black`.
-. `strokeWidth`:  the width of the text outline. Defaults to `2`.
-. `font`: the font face to use for the text. Defaults to `Impact`.
-. `options`: a comma separate list of flags that modify the image rendering. Currently only `noupcase` is supported which disable upper casing the labels.
-. `target` (3rd positional attribute): the basename of the file to generate. If not specified an auto-generated name will be used.
-. `format` (4th positional attribute): the output image format. The meme extension supports `png` and `gif`.
+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.
+This is illustrated for the blockdiag `fontpath` attribute in the example below.
+
+----
+= Asciidoctor Diagram
+:blockdiag-fontpath: /path/to/font.ttf <1>
+
+[blockdiag] <2>
+....
+....
+
+[blockdiag, fontpath="/path/to/otherfont.ttf"] <3>
+....
+....
+----
+<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
+
+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.
+
+
+==== Blockdiag
+
+[cols=">,<,<",options="header"]
+|===
+|Name         |Default value   |Description
+|fontpath     |unspecified     |The path to the font that should be used by blockdiag
+|===
+
+==== Ditaa
+
+[cols=">,<,<",options="header"]
+|===
+|Name         |Default value   |Description
+|scale        |1               |A scale factor that is applied to the image.
+|tabs         |8               |An integer value that specifies the tab size as a number of spaces.
+|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.
+|antialias    |true            |Enables or disables anti-aliasing.
+|separation   |true            |Prevents the separation of common edges of shapes.
+|round-corners|false           |Causes all corners to be rendered as round corners.
+|shadows      |true            |Enables or disable drop shadows.
+|debug        |false           |Renders the debug grid over the resulting image.
+|fixed-slope  |false           |Makes sides of parallelograms and trapezoids fixed slope instead of fixed width.
+|transparent  |false           |Makes the background of the image transparent instead of using the background color.
+|===
+
+==== GraphViz
+
+[cols=">,<,<",options="header"]
+|===
+|Name         |Default value   |Description
+|layout       |unspecified     |The graphviz layout engine to use (dot -K option).
+|===
+
+==== Meme
+
+[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.
+|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.
+|===
+
+==== Mermaid
+
+[cols=">,<,<",options="header"]
+|===
+|Name          |Default value   |Description
+|css           |unspecified     |Path to a CSS 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.
+|width         |unspecified     |The width of the generated image.
+|===
+
+==== PlantUML
+
+[cols=">,<,<",options="header"]
+|===
+|Name          |Default value   |Description
+|config        |unspecified     |Path to a config file to pass to PlantUML.
+|===

data/README_zh-CN.adoc

@@ -21,6 +21,7 @@ ifndef::env-site[:status:]
 :uri-blockdiag: http://blockdiag.com
 :uri-ditaa: http://ditaa.sourceforge.net/
 :uri-dot: http://www.graphviz.org/content/dot-language
+:uri-erd: https://github.com/BurntSushi/erd
 :uri-graphviz: http://www.graphviz.org
 :uri-imagemagick: http://www.imagemagick.org
 :uri-java: http://java.sun.com
@@ -115,6 +116,7 @@ gem 'asciidoctor-diagram', '~> 1.4.0'
 |{uri-actdiag}[actdiag]      |       |{check}|{check}|
 |{uri-blockdiag}[blockdiag]  |       |{check}|{check}|
 |{uri-ditaa}[ditaa]          |       |{check}|       |
+|{uri-erd}[erd]              |       |{check}|{check}|
 |{uri-dot}[graphviz]         |       |{check}|{check}|
 |<<meme,meme>>               |{check}|{check}|       |
 |{uri-mermaid}[mermaid]      |       |{check}|{check}|
@@ -238,7 +240,7 @@ require 'asciidoctor-diagram'
 require 'asciidoctor-diagram/<extension_name>'
 ----
 
-`<extension_name>` 可以是 `blockdiag`、`ditaa`、`graphviz`、`meme`、`mermaid`、`plantuml`、`shaape` 或 `wavedrom`。
+`<extension_name>` 可以是 `blockdiag`、`ditaa`、`erd`、`graphviz`、`meme`、`mermaid`、`plantuml`、`shaape` 或 `wavedrom`。
 
 加载一个或多个这些文件将为所有需要处理的文档自动注册这些扩展。
 
@@ -289,6 +291,7 @@ Asciidoctor Diagram 依赖外部工具来生成图片。
    |actdiag      |{uri-actdiag}[ActDiag]                                                |`actdiag`
    |blockdiag    |{uri-blockdiag}[BlockDiag]                                            |`blockdiag`
    |ditaa        |{uri-java}[Java]                                                      |`java`
+   |erd          |{uri-erd}[Erd]                                                         |`erd`
    |graphviz     |{uri-graphviz}[GraphViz]                                              |`dot` 或 `graphvizdot`
    |meme         |{uri-imagemagick}[ImageMagick]                                        |`convert` 和 `identify`
    |mermaid      |{uri-mermaid}[Mermaid]                                                |`mermaid`

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

@@ -77,7 +77,7 @@ module Asciidoctor
         init = Proc.new do
           include ::Asciidoctor::Diagram::BlockDiag
 
-          [:png, :svg].each do |f|
+          [:png, :pdf, :svg].each do |f|
             register_format(f, :image) do |p, c|
               blockdiag(name, p, c, f)
             end
@@ -106,8 +106,13 @@ module Asciidoctor
         # a '3' suffix.
         alt_cmd_name = "#{tool.downcase}3"
 
+        font_path = source.attr('fontpath', nil, tool.downcase)
+
         generate_stdin(which(parent, cmd_name, :alt_cmds => [alt_cmd_name]), format.to_s, source.to_s) do |tool_path, output_path|
-          [tool_path, '-a', '-o', Platform.native_path(output_path), "-T#{format.to_s}", '-']
+          args = [tool_path, '-a', '-o', Platform.native_path(output_path), "-T#{format.to_s}"]
+          args << "-f#{Platform.native_path(font_path)}" if font_path
+          args << '-'
+          args
         end
       end
     end

data/lib/asciidoctor-diagram/extensions.rb

@@ -6,6 +6,7 @@ require 'fileutils'
 require_relative 'version'
 require_relative 'util/java'
 require_relative 'util/gif'
+require_relative 'util/pdf'
 require_relative 'util/png'
 require_relative 'util/svg'
 
@@ -26,7 +27,7 @@ module Asciidoctor
         #
         # Examples
         #
-        #   register_format(:png, :image ) do |parent, source|
+        #   register_format(:png, :image ) do |parent_block, source|
         #     File.read(source.to_s)
         #   end
         def register_format(format, type, &block)
@@ -74,6 +75,10 @@ module Asciidoctor
             :png => {
                 :encoding => Encoding::ASCII_8BIT,
                 :decoder => PNG
+            },
+            :pdf => {
+                :encoding => Encoding::ASCII_8BIT,
+                :decoder => PDF
             }
         }
 
@@ -133,7 +138,7 @@ module Asciidoctor
         # Creates a DiagramSource object for the block or block macro being processed. Classes using this
         # mixin must implement this method.
         #
-        # @param parent [Asciidoctor::AbstractBlock] the parent asciidoc block of the block or block macro being processed
+        # @param parent_block [Asciidoctor::AbstractBlock] the parent asciidoc block of the block or block macro being processed
         # @param reader_or_target [Asciidoctor::Reader, String] a reader that provides the contents of a block or the
         #        target value of a block macro
         # @param attributes [Hash] the attributes of the block or block macro
@@ -141,7 +146,7 @@ module Asciidoctor
         # @return [DiagramSource] an object that implements the interface described by DiagramSource
         #
         # @abstract
-        def create_source(parent, reader_or_target, attributes)
+        def create_source(parent_block, reader_or_target, attributes)
           raise NotImplementedError.new
         end
 
@@ -264,8 +269,8 @@ module Asciidoctor
         # Creates a ReaderSource from the given reader.
         #
         # @return [ReaderSource] a ReaderSource
-        def create_source(parent, reader, attributes)
-          ReaderSource.new(parent, reader, attributes)
+        def create_source(parent_block, reader, attributes)
+          ReaderSource.new(parent_block, reader, attributes)
         end
       end
 
@@ -281,7 +286,8 @@ module Asciidoctor
         #
         # @return [FileSource] a FileSource
         def create_source(parent, target, attributes)
-          FileSource.new(parent, target.empty? ? nil : parent.normalize_system_path(target, parent.attr('docdir')), attributes)
+          target = parent.sub_attributes(target, :attribute_missing => 'warn') if target
+          FileSource.new(parent, target, attributes)
         end
       end
 
@@ -308,11 +314,12 @@ module Asciidoctor
         #
         # @param name [String, Symbol] the name of the attribute to lookup
         # @param default_value [Object] the value to return if the attribute is not found
-        # @inherit [Boolean] indicates whether to check for the attribute on the AsciiDoctor::Document if not found on this node
+        # @inherit [Boolean, String] indicates whether to check for the attribute on the AsciiDoctor::Document if not found on this node.
+        #                            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 = true)
+        def attr(name, default_value = nil, inherit = nil)
           raise NotImplementedError.new
         end
 
@@ -354,8 +361,8 @@ module Asciidoctor
 
         attr_reader :attributes
 
-        def initialize(parent, attributes)
-          @parent = parent
+        def initialize(parent_block, attributes)
+          @parent_block = parent_block
           @attributes = attributes
         end
 
@@ -366,11 +373,18 @@ module Asciidoctor
         def attr(name, default_value=nil, inherit=nil)
           name = name.to_s if ::Symbol === name
 
-          if inherit
-            @attributes[name] || @parent.attr(name, default_value, true)
-          else
-            @attributes[name] || default_value
+          value = @attributes[name]
+
+          if value.nil? && inherit
+            case inherit
+              when String
+                value = @parent_block.attr("#{inherit}-#{name}", default_value, true)
+              else
+                value = @parent_block.attr(name, default_value, true)
+            end
           end
+
+          value || default_value
         end
 
         def should_process?(image_file, image_metadata)
@@ -388,7 +402,7 @@ module Asciidoctor
         protected
         def resolve_diagram_subs
           if @attributes.key? 'subs'
-            subs = @parent.resolve_block_subs @attributes['subs'], nil, 'diagram'
+            subs = @parent_block.resolve_block_subs @attributes['subs'], nil, 'diagram'
             subs.empty? ? nil : subs
           else
             nil
@@ -411,8 +425,8 @@ module Asciidoctor
       class ReaderSource < BasicSource
         include DiagramSource
 
-        def initialize(parent, reader, attributes)
-          super(parent, attributes)
+        def initialize(parent_block, reader, attributes)
+          super(parent_block, attributes)
           @reader = reader
         end
 
@@ -421,14 +435,14 @@ module Asciidoctor
         end
 
         def code
-          @code ||= @parent.apply_subs(@reader.lines, resolve_diagram_subs).join("\n")
+          @code ||= @parent_block.apply_subs(@reader.lines, resolve_diagram_subs).join("\n")
         end
       end
 
       # A diagram source that retrieves the code for a diagram from an external source file.
       class FileSource < BasicSource
-        def initialize(parent, file_name, attributes)
-          super(parent, attributes)
+        def initialize(parent_block, file_name, attributes)
+          super(parent_block, attributes)
           @file_name = file_name
         end
 
@@ -458,7 +472,7 @@ module Asciidoctor
           if @file_name
             lines = File.readlines(@file_name)
             lines = ::Asciidoctor::Helpers.normalize_lines(lines)
-            @parent.apply_subs(lines, resolve_diagram_subs).join("\n")
+            @parent_block.apply_subs(lines, resolve_diagram_subs).join("\n")
           else
             ''
           end

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

@@ -11,7 +11,7 @@ module Asciidoctor
       include Which
 
       def self.included(mod)
-        [:png, :svg].each do |f|
+        [:png, :pdf, :svg].each do |f|
           mod.register_format(f, :image) do |parent, source|
             graphviz(parent, source, f)
           end
@@ -22,7 +22,7 @@ module Asciidoctor
         generate_stdin(which(parent, 'dot', :alt_attrs => ['graphvizdot']), format.to_s, source.to_s) do |tool_path, output_path|
           args = [tool_path, "-o#{Platform.native_path(output_path)}", "-T#{format.to_s}"]
 
-          layout = source.attr('layout')
+          layout = source.attr('layout', nil, 'graphviz')
           args << "-K#{layout}" if layout
 
           args

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

@@ -18,22 +18,22 @@ module Asciidoctor
         end
       end
 
-      def meme(p, c, format)
-        convert = which(p, 'convert')
-        identify = which(p, 'identify')
+      def meme(parent_block, source, format)
+        convert = which(parent_block, 'convert')
+        identify = which(parent_block, 'identify')
 
-        bg_img = c.attr('background')
+        bg_img = source.attr('background', nil, 'meme')
         raise "background attribute is required" unless bg_img
 
-        bg_img = p.normalize_system_path(bg_img, p.attr('imagesdir'))
+        bg_img = parent_block.normalize_system_path(bg_img, parent_block.attr('imagesdir'))
 
-        top_label = c.attr('top')
-        bottom_label = c.attr('bottom')
-        fill_color = c.attr('fillColor', 'white')
-        stroke_color = c.attr('strokeColor', 'black')
-        stroke_width = c.attr('strokeWidth', '2')
-        font = c.attr('font', 'Impact')
-        options = c.attr('options', '').split(',')
+        top_label = source.attr('top')
+        bottom_label = source.attr('bottom')
+        fill_color = source.attr('fillColor', 'white', 'meme')
+        stroke_color = source.attr('strokeColor', 'black', 'meme')
+        stroke_width = source.attr('strokeWidth', '2', 'meme')
+        font = source.attr('font', 'Impact', 'meme')
+        options = source.attr('options', '', 'meme').split(',')
         noupcase = options.include?('noupcase')
 
         dimensions = Cli.run(identify, '-format', '%w %h', bg_img).match(/(?<w>\d+) (?<h>\d+)/)

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

@@ -19,18 +19,28 @@ module Asciidoctor
         end
       end
 
-      def mermaid(parent, source, format)
-        mermaid = which(parent, 'mermaid')
+      def mermaid(parent_block, source, format)
+        mermaid = which(parent_block, 'mermaid')
         @is_mermaid_v6 ||= ::Asciidoctor::Diagram::Cli.run(mermaid, '--version').split('.')[0].to_i >= 6
         # Mermaid >= 6.0.0 requires PhantomJS 2.1; older version required 1.9
-        phantomjs = which(parent, 'phantomjs', :alt_attrs => [@is_mermaid_v6 ? 'phantomjs_2' : 'phantomjs_19'])
+        phantomjs = which(parent_block, 'phantomjs', :alt_attrs => [@is_mermaid_v6 ? 'phantomjs_2' : 'phantomjs_19'])
 
-        seq_config = source.attr('sequenceConfig', nil, true)
+        css = source.attr('css', nil, 'mermaid')
+        if css
+          css = parent_block.normalize_system_path(css, source.base_dir)
+        end
+
+        gantt_config = source.attr('ganttConfig', nil, 'mermaid') || source.attr('ganttconfig', nil, 'mermaid')
+        if gantt_config
+          gantt_config = parent_block.normalize_system_path(gantt_config, source.base_dir)
+        end
+
+        seq_config = source.attr('sequenceConfig', nil, 'mermaid') || source.attr('sequenceconfig', nil, 'mermaid')
         if seq_config
-          seq_config = parent.normalize_system_path(seq_config, source.base_dir)
+          seq_config = parent_block.normalize_system_path(seq_config, source.base_dir)
         end
 
-        width = source.attr('width')
+        width = source.attr('width', nil, 'mermaid')
 
         generate_file(mermaid, 'mmd', format.to_s, source.to_s) do |tool_path, input_path, output_path|
           output_dir = File.dirname(output_path)
@@ -38,6 +48,14 @@ module Asciidoctor
 
           args = [tool_path, '--phantomPath', Platform.native_path(phantomjs), "--#{format.to_s}", '-o', Platform.native_path(output_dir)]
 
+          if css
+            args << '--css' << Platform.native_path(css)
+          end
+
+          if gantt_config
+            args << '--gantt_config' << Platform.native_path(gantt_config)
+          end
+
           if seq_config
             args << '--sequenceConfig' << Platform.native_path(seq_config)
           end

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

@@ -15,23 +15,23 @@ module Asciidoctor
       end
       Java.classpath.concat JARS
 
-      def plantuml(parent, source, tag, mime_type)
+      def plantuml(parent_block, source, tag, mime_type)
         Java.load
 
-        code = preprocess_code(parent, source, tag)
+        code = preprocess_code(parent_block, source, tag)
 
         headers = {
             'Accept' => mime_type
         }
 
-        config_file = parent.attr('plantumlconfig', nil, true)
+        config_file = source.attr('plantumlconfig', nil, true) || source.attr('config', nil, 'plantuml')
         if config_file
-          headers['X-PlantUML-Config'] = File.expand_path(config_file, parent.attr('docdir', nil, true))
+          headers['X-PlantUML-Config'] = File.expand_path(config_file, source.attr('docdir', nil, true))
         end
 
-        dot = which(parent, 'dot', :alt_attrs => ['graphvizdot'], :raise_on_error => false)
+        dot = which(parent_block, 'dot', :alt_attrs => ['graphvizdot'], :raise_on_error => false)
         if dot
-          headers['X-Graphviz'] = dot
+          headers['X-Graphviz'] = ::Asciidoctor::Diagram::Platform.host_os_path(dot)
         end
 
         response = Java.send_request(
@@ -78,14 +78,14 @@ module Asciidoctor
       end
 
       def self.included(mod)
-        mod.register_format(:png, :image) do |parent, source|
-          plantuml(parent, source, mod.tag, 'image/png')
+        mod.register_format(:png, :image) do |parent_block, source|
+          plantuml(parent_block, source, mod.tag, 'image/png')
         end
-        mod.register_format(:svg, :image) do |parent, source|
-          plantuml(parent, source, mod.tag, 'image/svg+xml')
+        mod.register_format(:svg, :image) do |parent_block, source|
+          plantuml(parent_block, source, mod.tag, 'image/svg+xml')
         end
-        mod.register_format(:txt, :literal) do |parent, source|
-          plantuml(parent, source, mod.tag, 'text/plain;charset=utf-8')
+        mod.register_format(:txt, :literal) do |parent_block, source|
+          plantuml(parent_block, source, mod.tag, 'text/plain;charset=utf-8')
         end
       end
     end

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

@@ -0,0 +1,36 @@
+require_relative '../extensions'
+require_relative '../util/cli_generator'
+require_relative '../util/platform'
+require_relative '../util/which'
+
+module Asciidoctor
+  module Diagram
+    # @private
+    module Umlet
+      include CliGenerator
+      include Which
+
+      def self.included(mod)
+        [:svg, :png, :pdf, :gif].each do |f|
+          mod.register_format(f, :image) do |parent, source|
+            umlet(parent, source, f)
+          end
+        end
+      end
+
+      def umlet(parent, source, format)
+        generate_file(which(parent, 'umlet'), 'uxf', format.to_s, source.to_s) do |tool_path, input_path, output_path|
+          [tool_path, '-action=convert', "-format=#{format.to_s}", "-filename=#{Platform.native_path(input_path)}", "-output=#{Platform.native_path(output_path)}"]
+        end
+      end
+    end
+
+    class UmletBlockProcessor < Extensions::DiagramBlockProcessor
+      include Umlet
+    end
+
+    class UmletBlockMacroProcessor < Extensions::DiagramBlockMacroProcessor
+      include Umlet
+    end
+  end
+end

data/lib/asciidoctor-diagram/umlet.rb

@@ -0,0 +1,8 @@
+require_relative 'extensions'
+
+Asciidoctor::Extensions.register do
+  require_relative 'umlet/extension'
+
+  block Asciidoctor::Diagram::UmletBlockProcessor, :umlet
+  block_macro Asciidoctor::Diagram::UmletBlockMacroProcessor, :umlet
+end

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

@@ -15,18 +15,7 @@ module Asciidoctor
           args = []
           args << '-Djava.awt.headless=true'
           args << '-cp'
-          # special case for cygwin, it requires path translation for java to work
-          if ::Asciidoctor::Diagram::Platform.os_variant == :cygwin
-            cygpath = ::Asciidoctor::Diagram::Which.which('cygpath')
-            if cygpath != nil
-              args << classpath.flatten.map { |jar| ::Asciidoctor::Diagram::Cli.run(cygpath, '-w', jar).strip }.join(";")
-            else
-              puts 'cygwin warning: cygpath not found'
-              args << classpath.flatten.join(File::PATH_SEPARATOR)
-            end
-          else
-            args << classpath.flatten.join(File::PATH_SEPARATOR)
-          end
+          args << classpath.flatten.map { |jar| ::Asciidoctor::Diagram::Platform.host_os_path(jar).strip }.join(::Asciidoctor::Diagram::Platform.host_os_path_separator)
           args << 'org.asciidoctor.diagram.CommandServer'
 
           @server = IO.popen([java, *args])

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

@@ -0,0 +1,10 @@
+module Asciidoctor
+  module Diagram
+    # @private
+    module PDF
+      def self.get_image_size(_)
+        nil
+      end
+    end
+  end
+end

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

@@ -1,4 +1,6 @@
 require 'rbconfig'
+require_relative 'cli'
+require_relative 'which'
 
 module Asciidoctor
   module Diagram
@@ -11,24 +13,42 @@ module Asciidoctor
         os_info[:os_variant]
       end
 
+      def self.file_separator
+        os_info[:file_sep]
+      end
+
+      def self.host_os_file_separator
+        os_info[:host_os_file_sep]
+      end
+
       def self.path_separator
         os_info[:path_sep]
       end
 
+      def self.host_os_path_separator
+        os_info[:host_os_path_sep]
+      end
+      
       def self.os_info
         @os ||= (
         host_os = RbConfig::CONFIG['host_os']
 
-        path_sep = '/'
+        file_sep = '/'
+        host_os_file_sep = nil
         variant = nil
+        path_sep = ::File::PATH_SEPARATOR
+        host_os_path_sep = nil
+        
         case host_os
-          when /(mswin|bccwin|wince|emc)/i
+          when /(msys|mingw|mswin|bccwin|wince|emc)/i
             os = :windows
             variant = $1.downcase.to_sym
-            path_sep = '\\'
-          when /(msys|mingw|cygwin)/i
+            file_sep = '\\'
+          when /(cygwin)/i
             os = :windows
             variant = $1.downcase.to_sym
+            host_os_file_sep = '\\'
+            host_os_path_sep = ';'
           when /darwin|mac os/i
             os = :macosx
           when /linux/i
@@ -37,7 +57,12 @@ module Asciidoctor
             os = :unix
         end
         {
-            :os => os, :os_variant => variant || os, :path_sep => path_sep
+            :os => os,
+            :os_variant => variant || os, 
+            :file_sep => file_sep,
+            :host_os_file_sep => host_os_file_sep || file_sep,
+            :path_sep => path_sep,
+            :host_os_path_sep => host_os_path_sep || path_sep
         }
         )
       end
@@ -45,13 +70,28 @@ module Asciidoctor
       def self.native_path(path)
         return path if path.nil?
 
-        path_sep = path_separator
-        if path_sep != '/'
-          path.to_s.gsub('/', path_sep)
+        sep = file_separator
+        if sep != '/'
+          path.to_s.gsub('/', sep)
         else
           path.to_s
         end
       end
+
+      def self.host_os_path(path)
+        # special case for cygwin, it requires path translation for java to work
+        if os_variant == :cygwin
+          cygpath = ::Asciidoctor::Diagram::Which.which('cygpath')
+          if cygpath != nil
+            ::Asciidoctor::Diagram::Cli.run(cygpath, '-w', path)
+          else
+            puts 'cygwin warning: cygpath not found'
+            native_path(path)
+          end
+        else
+          native_path(path)
+        end
+      end
     end
   end
 end

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

@@ -17,7 +17,7 @@ module Asciidoctor
       end
 
       def which(parent_block, cmd, options = {})
-        attr_names = options.fetch(:alt_attrs, []) + [cmd]
+        attr_names = options[:attrs] || options.fetch(:alt_attrs, []) + [cmd]
         cmd_names = [cmd] + options.fetch(:alt_cmds, [])
 
         cmd_var = '@' + attr_names[0]

data/lib/asciidoctor-diagram/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
   module Diagram
-    VERSION = "1.5.2"
+    VERSION = "1.5.4"
   end
 end

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

@@ -28,12 +28,12 @@ module Asciidoctor
           end
         else
           if ::Asciidoctor::Diagram::Platform.os == :macosx
-            wavedrom = which(parent, 'WaveDromEditor.app', :alt_attrs => ['wavedrom'], :path => ['/Applications'])
+            wavedrom = which(parent, 'WaveDromEditor.app', :attrs => ['WaveDromEditorApp'],:path => ['/Applications'])
             if wavedrom
               wavedrom = File.join(wavedrom, 'Contents/MacOS/nwjs')
             end
           else
-            wavedrom = which(parent, 'WaveDromEditor', :alt_attrs => ['wavedrom'])
+            wavedrom = which(parent, 'WaveDromEditor')
           end
 
           generate_file(wavedrom, 'wvd', format.to_s, source.to_s) do |tool_path, input_path, output_path|

data/lib/asciidoctor-diagram.rb

@@ -7,4 +7,5 @@ require_relative 'asciidoctor-diagram/mermaid'
 require_relative 'asciidoctor-diagram/plantuml'
 require_relative 'asciidoctor-diagram/salt'
 require_relative 'asciidoctor-diagram/shaape'
+require_relative 'asciidoctor-diagram/umlet'
 require_relative 'asciidoctor-diagram/wavedrom'

data/spec/blockdiag_spec.rb

@@ -99,6 +99,36 @@ Doc Writer <doc@example.com>
     expect(b.attributes['height']).to_not be_nil
   end
 
+  it "should generate PDF files when format is set to 'pdf'" do
+    doc = <<-eos
+= Hello, BlockDiag!
+Doc Writer <doc@example.com>
+
+== First Section
+
+[blockdiag, 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
+
+    expect(b.attributes['width']).to be_nil
+    expect(b.attributes['height']).to be_nil
+  end
+
   it "should raise an error when when format is set to an invalid value" do
     doc = <<-eos
 = Hello, BlockDiag!

data/spec/plantuml_spec.rb

@@ -107,6 +107,41 @@ plantuml::plantuml.txt[format="svg", subs=attributes+]
     expect(content).to include('ChildClass')
   end
 
+  it 'should support substitutions in the target attribute' do
+    code = <<-eos
+class {parent-class}
+class {child-class}
+{parent-class} <|-- {child-class}
+    eos
+
+    File.write('plantuml.txt', code)
+
+    doc = <<-eos
+= Hello, PlantUML!
+Doc Writer <doc@example.com>
+:file: plantuml
+:parent-class: ParentClass
+:child-class: ChildClass
+
+== First Section
+
+plantuml::{file}.txt[format="svg", subs=attributes+]
+    eos
+
+    d = load_asciidoc doc, :attributes => {'backend' => 'html5'}
+    expect(d).to_not be_nil
+
+    b = d.find { |bl| bl.context == :image }
+    expect(b).to_not be_nil
+
+    target = b.attributes['target']
+    expect(File.exist?(target)).to be true
+
+    content = File.read(target)
+    expect(content).to include('ParentClass')
+    expect(content).to include('ChildClass')
+  end
+
   it 'should resolve !include directives with relative paths' do
     included = <<-eos
 interface List

data/spec/test_helper.rb

@@ -14,6 +14,7 @@ require_relative '../lib/asciidoctor-diagram/meme/extension'
 require_relative '../lib/asciidoctor-diagram/mermaid/extension'
 require_relative '../lib/asciidoctor-diagram/plantuml/extension'
 require_relative '../lib/asciidoctor-diagram/shaape/extension'
+require_relative '../lib/asciidoctor-diagram/umlet/extension'
 require_relative '../lib/asciidoctor-diagram/wavedrom/extension'
 
 require_relative '../lib/asciidoctor-diagram/util/platform'
@@ -42,9 +43,24 @@ module Asciidoctor
         options = options.dup
         options[:trace] = true
         options[:attributes] ||= {}
+
         options[:attributes]['phantomjs_19'] = ENV['PHANTOMJS_19']
+
         options[:attributes]['phantomjs_2'] = ENV['PHANTOMJS_2']
+
+        fontpath = ENV['BLOCKDIAG_FONTPATH']
+        if fontpath
+          options[:attributes]['actdiag-fontpath'] = fontpath
+          options[:attributes]['blockdiag-fontpath'] = fontpath
+          options[:attributes]['seqdiag-fontpath'] = fontpath
+          options[:attributes]['nwdiag-fontpath'] = fontpath
+          options[:attributes]['rackdiag-fontpath'] = fontpath
+          options[:attributes]['packetdiag-fontpath'] = fontpath
+          options[:attributes]['seqdiag-fontpath'] = fontpath
+        end
+
         options[:attributes]['diagram-on-error'] = 'abort'
+
         ::Asciidoctor.load(StringIO.new(source), options.merge({:trace => true}))
       end
     end

data/spec/umlet_spec.rb

@@ -0,0 +1,85 @@
+require_relative 'test_helper'
+
+code = <<-eos
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<diagram program="umlet" version="14.2">
+  <zoom_level>10</zoom_level>
+  <element>
+    <id>UMLActor</id>
+    <coordinates>
+      <x>20</x>
+      <y>20</y>
+      <w>60</w>
+      <h>120</h>
+    </coordinates>
+    <panel_attributes>Hello
+AsciiDoc</panel_attributes>
+    <additional_attributes/>
+  </element>
+</diagram>
+eos
+
+
+describe Asciidoctor::Diagram::UmletBlockMacroProcessor do
+  it "should generate SVG images when format omitted" do
+    File.write('umlet.uxf', code)
+
+    doc = <<-eos
+= Hello, Umlet!
+Doc Writer <doc@example.com>
+
+== First Section
+
+umlet::umlet.uxf[]
+    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::UmletBlockProcessor do
+  it "should generate SVG images when format is omitted" do
+    doc = <<-eos
+= Hello, Umlet!
+Doc Writer <doc@example.com>
+
+== First Section
+
+[umlet]
+----
+#{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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-diagram
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.4
 platform: ruby
 authors:
 - Pepijn Van Eeckhoudt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-14 00:00:00.000000000 Z
+date: 2017-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -104,6 +104,8 @@ files:
 - lib/asciidoctor-diagram/salt.rb
 - lib/asciidoctor-diagram/shaape.rb
 - lib/asciidoctor-diagram/shaape/extension.rb
+- lib/asciidoctor-diagram/umlet.rb
+- lib/asciidoctor-diagram/umlet/extension.rb
 - lib/asciidoctor-diagram/util/binaryio.rb
 - lib/asciidoctor-diagram/util/cli.rb
 - lib/asciidoctor-diagram/util/cli_generator.rb
@@ -111,6 +113,7 @@ files:
 - lib/asciidoctor-diagram/util/java.rb
 - lib/asciidoctor-diagram/util/java_jruby.rb
 - lib/asciidoctor-diagram/util/java_socket.rb
+- lib/asciidoctor-diagram/util/pdf.rb
 - lib/asciidoctor-diagram/util/platform.rb
 - lib/asciidoctor-diagram/util/png.rb
 - lib/asciidoctor-diagram/util/svg.rb
@@ -130,6 +133,7 @@ files:
 - spec/plantuml_spec.rb
 - spec/shaape_spec.rb
 - spec/test_helper.rb
+- spec/umlet_spec.rb
 - spec/wavedrom_spec.rb
 homepage: https://github.com/asciidoctor/asciidoctor-diagram
 licenses:
@@ -167,4 +171,5 @@ test_files:
 - spec/plantuml_spec.rb
 - spec/shaape_spec.rb
 - spec/test_helper.rb
+- spec/umlet_spec.rb
 - spec/wavedrom_spec.rb