asciidoctor-diagram 2.1.2 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c999abc157686ce7101a23d06b8e3cdf83ec0244f1d9697343ec7e9a6afe946
-  data.tar.gz: 44349c53eefb7e2eb330348a29e2f1a4ee6b60ed1ec5548dc4b3c99ab6fcab5a
+  metadata.gz: 629ba788527640ff6cd5bd7c0e6cc18a1a2b7afa4071737b667f95859491dbfc
+  data.tar.gz: 762433ab8f23c6d7a4e44fc5d580c77a1fa52b56c47780d1ba28077ae1c309ee
 SHA512:
-  metadata.gz: afd079eab9fbfd29a76690012e699c9fa5e45ab14f35b9469defb3a46060e3011b814913af1d5c5365c63157ee8def0101a41ba6b6368d154ad26fe36440ac75
-  data.tar.gz: e994d6101f63d0fcfde7b04c4763aa43a9eac167cb19295777124cbc25b3042c132869d47597fd33c107b7da583442697bd80852faa9db641d91155cd8b86edd
+  metadata.gz: eb2cac4b23d86cc7fb37787208b221a42c839d06b31eff51585a108c674b0517e3c9c72afe1f4ed556e671d4ff5bff06c825cff764098a8925f860975e96146b
+  data.tar.gz: 35a265251153d038515a89aea7322373495e6e72d768df42e200c517e905a6b257f8916b7c3b0ff8645a15a8aeff258b345bd7b744c6e514bd6dc7291bf26bdc

data/CHANGELOG.adoc

@@ -1,5 +1,37 @@
 = Asciidoctor-diagram Changelog
 
+== 2.2.2
+
+Enhancements::
+
+* Issue #375: Add support for PlantUML include directories (@mskyaxl)
+* Add support for `graphviz-py` (@Alwinator)
+* Issue #380: Allow local PlantUML preprocessing to be disabled using the `preprocess` attribute
+
+Bug Fixes::
+
+* Issue #370: Only use absolute paths for 'interactive' style SVGs when 'data-uri' is also in use.
+
+== 2.2.1
+
+Bug Fixes::
+
+* Issue #366: Improve correctness of SVG images produced by Ditaa
+* Issue #367: Resolve compatibility issue with rqrcode 2.1.0
+* Issue #368: Respect `options` attribute when generating SVG images
+
+== 2.2.0
+
+Enhancements::
+
+  * All diagram macros can now be used as inline macros
+  * Add support for barcodes
+
+Bug Fixes::
+
+  * Issue #358: Improve error handling when rendering is delegated to an external server (@ahus1)
+  * Issue #350: Restore support for document level `syntrax-style` attribute.
+
 == 2.1.2
 
 Enhancements::

data/docs/antora.yml

@@ -1,3 +1,3 @@
 name: diagram-extension
 title: Asciidoctor Diagram
-version: '2.1'
+version: '2.2'

data/docs/modules/ROOT/pages/index.adoc

@@ -5,7 +5,7 @@ include::partial$uris.adoc[]
 
 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-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.
+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-jsyntrax}[JSyntrax], {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.

data/docs/modules/ROOT/partials/advanced.adoc

@@ -26,17 +26,17 @@ You can then manually register the extensions at the appropriate times using the
 
 This document explains the various features of asciidoctor-diagram blocks using ditaa diagrams as an example.
 
-=== Diagram Block Macro
+=== Diagram Macros
 
-The diagram extensions can also be used in in block macro form.
+The diagram extensions can also be used in inline, or block macro form.
 
 .Anatomy of a diagram block macro
 ----
-block-name::source-file-name[generated-file-extension] // <1> <2> <3>
+diagram-type::source-file-name[format=output-format] // <1> <2> <3>
 ----
-<1> The macro name is the same as the block name in the block form.
+<1> The macro name specifies the diagram syntax that is being used.
 <2> The source file name specifies the external file that contains the diagram source code.
-<3> The first, optional, positional attribute assigns the file extension (i.e. `format`) to the generated diagram.
+<3> The `format` attribute determines the output image format to use. If a format is not specified, the default output format for the chosen diagram type will be used.
 
 When the source file name is a relative path it is resolved with respect to the location of the document being processed.
 
@@ -93,7 +93,7 @@ The following table lists the tools that are required for each diagram type, the
    |smcat        |{uri-smcat}[State Machine Cat]                                        |`smcat`
    |svgbob       |{uri-svgbob}[SvgBob]                                                  |`svgbob`
    |symbolator   |{uri-symbolator}[Symbolator]                                          |`symbolator`
-   |syntrax      |{uri-syntrax}[Syntrax]                                                |`syntrax`
+   |syntrax      |{uri-syntrax}[Syntrax]/{uri-jsyntrax}[JSyntrax]                       |`syntrax`
    |tikz         |A TeX distribution that supports {uri-tikz}[TikZ]                     |`pdflatex` and `pdf2svg`
    |umlet        |{uri-umlet}[Umlet]                                                    |`umlet`
    |vega         |{uri-vega}[vg2png] and/or {uri-vega}[vg2png]                          |`vg2png` and `vg2svg`
@@ -120,6 +120,35 @@ 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.
 
+[[barcode]]
+=== The Barcode Extension
+
+The barcode extension provides barcode rendering.
+Barcode macros can be specified using blocks, inline macros or block macros using one of the following templates.
+
+[source, asciidoc]
+------
+// Barcode block
+[<type>, <attributes>] <1> <2>
+----
+<content> <3>
+----
+
+// Barcode block macro
+<type>::<content>[<attributes>]
+
+// Barcode inline macro
+<type>::<content>[<attributes>]
+------
+<1> Type barcode type. One of `bookland`, `codabar`, `code25`, `code25iata`, `code25interleaved`, `code39`, `code93`, `code128`, `code128a`, `code128b`, `code128c`, `ean8`, `ean13`, `gs1_128`, `qrcode`, or `upca`.
+<2> Barcode attributes (see the <<barcode_attributes>> attributes section)
+<3> The content to encode in the barcode
+
+By default the `content` field of the barcode macros will be interpreted as the barcode content.
+This works fine for simple barcodes, but for complex data (e.g., a vCard encoded as a QR code) this is not practical.
+If the `external` attribute is set on a barcode macro, the target is interpreted as a file path.
+The barcode content will then be obtained by reading the contents of the referenced file.
+
 === Diagram Attributes
 
 Certain diagram types allow image generation to be customized using attributes.
@@ -174,6 +203,20 @@ If the maximum size is exceeded, POST requests are used instead
 |noblur       |unspecified     |Disable drop-shadow blurring
 |===
 
+[[barcode_attributes]]
+==== Barcode
+
+[cols=">,<,<",options="header"]
+|===
+|Name          |Default value |Description
+|height        |100           |The height of the bars. (1D only, 2D uses ydim)
+|xdim          |1             |The width of the narrowest bar in a barcode. Thicker bars are multiples of the xdim.
+|ydim          |Same as xdim  |This is the same as xdim, but for the height of the blocks in a 2D barcode.
+|margin        |10            |The width of the quiet zone around the barcode.
+|foreground    |black         |The color of the bars specified as a 3 or 6 digit hex RGB value or HTML color name.
+|background    |white         |The color of the background specified as a 3 or 6 digit hex RGB value or HTML color name.
+|===
+
 ==== Blockdiag
 
 [cols=">,<,<",options="header"]
@@ -274,9 +317,11 @@ No specific attributes.
 
 [cols=">,<,<",options="header"]
 |===
-|Name          |Default value   |Description
-|config        |unspecified     |Path to a config file to pass to PlantUML.
-|size-limit    |4096            |The maximum dimensions (width and height) of generated diagrams.
+|Name            |Default value   |Description
+|config          |unspecified     |Path to a config file to pass to PlantUML.
+|size-limit      |4096            |The maximum dimensions (width and height) of generated diagrams.
+|includedir      |unspecified     |sets a common directory for puml includes (plantuml.include.path)
+|preprocess      |true            |Preprocess PlantUML code before rendering the diagram.
 |===
 
 ==== State Machine Cat

data/docs/modules/ROOT/partials/create_diagram.adoc

@@ -4,14 +4,14 @@ A diagram is written inside a literal block, which can accept several attributes
 
 .Anatomy of a diagram
 ----
-[diagram-type, generated-file-name, generated-image-format] // <1> <2> <3>
+[diagram-type, target=output-file-name, format=output-format] // <1> <2> <3>
 .... // <4>
 Diagram in appropriate syntax
 ....
 ----
-<1> The first positional attribute in the attribute list specifies the diagram that is being used.
-<2> The second, optional positional attribute assigns a file name (i.e. `target`) to the generated diagram. If a target is not specified an auto-generated name will be used.
-<3> The third, optional positional attribute specifies the image format to create, specified as a three character file extension.
+<1> The first value in the attribute list specifies the diagram syntax that is being used.
+<2> The `target` attribute specifies the basename of the image file that will be generated. If this attribute is omitted an auto-generated name will be used instead.
+<3> The `format` attribute determines the output image format to use. If a format is not specified, the default output format for the chosen diagram type will be used.
 <4> Place the attribute list directly on top of the delimited literal block (+....+). You can also use an open block as an alternative (`--`).
 
 The following diagram types and output formats are available:
@@ -20,38 +20,40 @@ The following diagram types and output formats are available:
 
 [cols=">,5*^",options="header"]
 |===
-|Diagram Type                |gif    |pdf    |png    |svg    |txt
-|{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-diagrams}[diagrams]    |       |{check}|{check}|{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}|
-|{uri-mscgen}[msc]           |       |       |{check}|{check}|
-|{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-tikz}[tikz]            |       |{check}|       |{check}|
-|{uri-umlet}[umlet]          |{check}|{check}|{check}|{check}|
-|{uri-vega}[vega]            |       |       |{check}|{check}|
-|{uri-vegalite}[vegalite]    |       |       |{check}|{check}|
-|{uri-wavedrom}[wavedrom]    |       |       |{check}|{check}|
+|Diagram Type                      |gif    |pdf    |png    |svg    |txt
+|{uri-a2s}[a2s]                    |       |       |       |{check}|
+|{uri-actdiag}[actdiag]            |       |{check}|{check}|{check}|
+|<<barcode,barcode>>               |       |       |{check}|       |{check}
+|{uri-blockdiag}[blockdiag]        |       |{check}|{check}|{check}|
+|{uri-bpmn}[bpmn]                  |       |{check}|{check}|{check}|
+|{uri-bytefield}[bytefield]        |       |       |       |{check}|
+|{uri-diagrams}[diagrams]          |       |{check}|{check}|{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}|
+|{uri-mscgen}[msc]                 |       |       |{check}|{check}|
+|{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] (Syntrax)  |       |{check}|{check}|{check}|
+|{uri-jsyntrax}[syntrax] (JSyntrax)|       |       |{check}|{check}|
+|{uri-tikz}[tikz]                  |       |{check}|       |{check}|
+|{uri-umlet}[umlet]                |{check}|{check}|{check}|{check}|
+|{uri-vega}[vega]                  |       |       |{check}|{check}|
+|{uri-vegalite}[vegalite]          |       |       |{check}|{check}|
+|{uri-wavedrom}[wavedrom]          |       |       |{check}|{check}|
 |===
 
 :!check:
@@ -82,25 +84,25 @@ The example below illustrates the structure of a basic ditaa block written direc
 ....
 ----
 
-The ditaa block above results in the following generated diagram.
+The ditaa block above results in the following diagram.
 
 .Rendered ditaa diagram
 image::asciidoctor-diagram-process.png[Asciidoctor Diagram process diagram,650,319]
 
 The rendered ditaa diagram above gets the file name `58372f7d2ceffae9e91fd0a7cbb080b6.png`.
 That long number is the checksum of the source code calculated by asciidoctor-diagram.
-If you want to give your generated files a more meaningful name, fill in the `target` attribute.
+If you want to give your image files a more meaningful name, fill in the `target` attribute.
 
 This can be done by either specifying it as the second positional attribute or as a named attribute.
 Both examples below would result in a file called `ditaa-diagram.png`.
 
 ....
-[ditaa, "ditaa-diagram"]
+[ditaa, target="ditaa-diagram"]
 ----
 <snip>
 ----
 
-[ditaa, target="ditaa-diagram"]
+[ditaa, "ditaa-diagram"]
 ----
 <snip>
 ----
@@ -112,7 +114,7 @@ The example below illustrates the structure of a basic PlantUML block written di
 .PlantUML Diagram Syntax
 [source]
 ----
-[plantuml, diagram-classes, png] // <1> <2> <3>
+[plantuml, target=diagram-classes, format=png] // <1> <2> <3>
 ....
 class BlockProcessor
 class DiagramBlock
@@ -125,8 +127,8 @@ DiagramBlock <|-- PlantUmlBlock
 ....
 ----
 <1> The diagram is written in PlantUML so the first positional attribute is assigned the `plantuml` diagram type.
-<2> The name of the generated diagram file (target) is written in the second positional attribute.
-<3> The output format is entered in the third positional attribute.
+<2> The name of the diagram file is given by the `target` attribute.
+<3> The output format is specified using the `format` attribute
 
 .Rendered PlantUML diagram
 image::asciidoctor-diagram-classes.png[Asciidoctor Diagram classes diagram]

data/docs/modules/ROOT/partials/uris.adoc

@@ -1,4 +1,4 @@
-:uri-a2s: https://github.com/dhobsd/asciitosvg
+:uri-a2s: https://github.com/asciitosvg/asciitosvg
 :uri-actdiag: http://blockdiag.com/en/actdiag/index.html
 :uri-asciidoctor-api: http://asciidoctor.org/docs/user-manual/#api
 :uri-asciidoctor-extensions: http://asciidoctor.org/docs/user-manual/#extension-points
@@ -31,10 +31,11 @@
 :uri-svgbob: https://github.com/ivanceras/svgbobrus
 :uri-symbolator: https://github.com/kevinpt/symbolator
 :uri-syntrax: https://kevinpt.github.io/syntrax/
+:uri-jsyntrax: https://atp-mipt.github.io/jsyntrax/
 :uri-tikz: https://github.com/pgf-tikz/pgf
 :uri-umlet: http://www.umlet.com/
 :uri-vega: https://vega.github.io/vega/
 :uri-vegalite: https://vega.github.io/vega-lite/
 :uri-wavedrom: http://wavedrom.com
 :uri-wavedromeditor: https://github.com/wavedrom/wavedrom.github.io/releases
-:uri-wavedromcli: https://github.com/wavedrom/cli
+:uri-wavedromcli: https://github.com/wavedrom/cli

data/examples/features.adoc

@@ -118,6 +118,31 @@ graph ethane {
 }
 ----
 
+With https://github.com/Alwinator/graphviz-py[graphviz_py] you can also use variables and Python code to do calculations:
+
+[graphviz_py, "graphviz_py_example", "svg"]
+----
+graph python_graph {
+{{
+import math
+
+value = 0.5
+sin = math.sin(value)
+cos = math.cos(value)
+}}
+
+A [label="{{= value }}"];
+B [label="{{= sin }}"];
+C [label="{{= cos }}"];
+
+A -- B [headlabel="sin"];
+A -- C [headlabel="cos"];
+
+}
+----
+
+Don't forget to install graphviz-py as described https://github.com/Alwinator/graphviz-py#installation[here].
+
 == Using standard asciidoc features
 
 Any remaining other attributes that are specified on a diagram block are copied over to the generated block.

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

@@ -10,5 +10,9 @@ module Asciidoctor
     class AsciiToSvgBlockMacroProcessor < DiagramBlockMacroProcessor
       use_converter AsciiToSvgConverter
     end
+
+    class AsciiToSvgInlineMacroProcessor < DiagramInlineMacroProcessor
+      use_converter AsciiToSvgConverter
+    end
   end
 end

data/lib/asciidoctor-diagram/a2s.rb

@@ -4,4 +4,5 @@ require_relative 'a2s/extension'
 Asciidoctor::Extensions.register do
   block Asciidoctor::Diagram::AsciiToSvgBlockProcessor, :a2s
   block_macro Asciidoctor::Diagram::AsciiToSvgBlockMacroProcessor, :a2s
+  inline_macro Asciidoctor::Diagram::AsciiToSvgInlineMacroProcessor, :a2s
 end

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

@@ -0,0 +1,157 @@
+require_relative '../diagram_converter'
+require_relative 'dependencies'
+
+module Asciidoctor
+  module Diagram
+    # @private
+    class BarcodeConverter
+      BARCODE_TYPES = [
+        :bookland,
+        :codabar,
+        :code25,
+        :code25iata,
+        :code25interleaved,
+        :code39,
+        :code93,
+        :code128,
+        :code128a,
+        :code128b,
+        :code128c,
+        :ean8,
+        :ean13,
+        :gs1_128,
+        :qrcode,
+        :upca,
+      ]
+
+      include DiagramConverter
+
+      def supported_formats
+        [:png, :svg, :txt]
+      end
+
+      def collect_options(source)
+        options = {}
+
+        options[:xdim] = source.attr('xdim')
+        options[:ydim] = source.attr('ydim')
+        options[:margin] = source.attr('margin')
+        options[:height] = source.attr('height')
+        options[:foreground] = source.attr('foreground')
+        options[:background] = source.attr('background')
+
+        [:xdim, :ydim, :margin, :height].each { |o| options[o] = options[o].to_i if options[o] }
+
+        options
+      end
+
+      def convert(source, format, options)
+        BarcodeDependencies::BARCODE_DEPENDENCIES.each_pair { |n, v| source.ensure_gem(n, v) }
+        require 'barby'
+
+        code = source.code
+        type = source.config[:type]
+
+        case type
+          when :bookland
+            require 'barby/barcode/bookland'
+            barcode = Barby::Bookland.new(code)
+          when :codabar
+            require 'barby/barcode/codabar'
+            barcode = Barby::Codabar.new(code)
+          when :code25
+            require 'barby/barcode/code_25'
+            barcode = Barby::Code25.new(code)
+          when :code25iata
+            require 'barby/barcode/code_25_iata'
+            barcode = Barby::Code25IATA.new(code)
+          when :code25interleaved
+            require 'barby/barcode/code_25_interleaved'
+            barcode = Barby::Code25Interleaved.new(code)
+          when :code39
+            require 'barby/barcode/code_39'
+            barcode = Barby::Code39.new(code)
+          when :code93
+            require 'barby/barcode/code_93'
+            barcode = Barby::Code93.new(code)
+          when :code128
+            require 'barby/barcode/code_128'
+            barcode = Barby::Code128.new(code)
+          when :code128a
+            require 'barby/barcode/code_128'
+            barcode = Barby::Code128A.new(code)
+          when :code128b
+            require 'barby/barcode/code_128'
+            barcode = Barby::Code128B.new(code)
+          when :code128c
+            require 'barby/barcode/code_128'
+            barcode = Barby::Code128C.new(code)
+          when :ean8
+            require 'barby/barcode/ean_8'
+            barcode = Barby::EAN8.new(code)
+          when :ean13
+            require 'barby/barcode/ean_13'
+            barcode = Barby::EAN13.new(code)
+          when :gs1_128
+            require 'barby/barcode/code_128'
+            code = code.gsub /\([^)]+\)/ do |control|
+              case control.upcase
+                when '(FNC1)'
+                  Barby::Code128::FNC1
+                when '(FNC2)'
+                  Barby::Code128::FNC2
+                when '(FNC3)'
+                  Barby::Code128::FNC3
+                when '(FNC4)'
+                  Barby::Code128::FNC4
+                when '(CODEA)'
+                  Barby::Code128::CODEA
+                when '(CODEB)'
+                  Barby::Code128::CODEB
+                when '(CODEC)'
+                  Barby::Code128::CODEC
+                when '(SHIFT)'
+                  Barby::Code128::SHIFT
+                when '(SP)'
+                  ' '
+                else
+                  control
+              end
+            end
+            code = code.gsub(/\s+/, '')
+            code = code.prepend(Barby::Code128::FNC1) unless code[0] == Barby::Code128::FNC1
+            barcode = Barby::Code128.new(code)
+          when :qrcode
+            BarcodeDependencies::QRCODE_DEPENDENCIES.each_pair { |n, v| source.ensure_gem(n, v) }
+            require 'barby/barcode/qr_code'
+            barcode = Barby::QrCode.new(code)
+          when :upca
+            require 'barby/barcode/ean_13'
+            barcode = Barby::UPCA.new(code)
+          else
+            raise "Unsupported barcode type: #{type}"
+        end
+
+        case format
+          when :png
+            BarcodeDependencies::PNG_DEPENDENCIES.each_pair { |n, v| source.ensure_gem(n, v) }
+            require 'barby/outputter/png_outputter'
+            require 'chunky_png/color'
+            options[:foreground] = ChunkyPNG::Color(options[:foreground]) if options[:foreground]
+            options[:background] = ChunkyPNG::Color(options[:background]) if options[:background]
+            barcode.to_png(options)
+          when :svg
+            require_relative 'svg_outputter'
+            options[:foreground] = "##{options[:foreground]}" if options[:foreground] =~ /^[0-9a-f]+$/i
+            options[:background] = "##{options[:background]}" if options[:background] =~ /^[0-9a-f]+$/i
+            barcode.to_svg(options)
+          when :txt
+            require 'barby/outputter/ascii_outputter'
+            barcode.to_ascii
+          else
+            raise "Unsupported format: #{format}"
+        end
+      end
+    end
+  end
+end

data/lib/asciidoctor-diagram/barcode/dependencies.rb

@@ -0,0 +1,10 @@
+module Asciidoctor
+  module Diagram
+    module BarcodeDependencies
+      BARCODE_DEPENDENCIES = {'barby' => '~> 0.6.8'}
+      PNG_DEPENDENCIES = {'chunky_png' => '~> 1.4'}
+      QRCODE_DEPENDENCIES = {'rqrcode' => '~> 2.0'}
+      ALL_DEPENDENCIES = {}.merge(BARCODE_DEPENDENCIES).merge(PNG_DEPENDENCIES).merge(QRCODE_DEPENDENCIES)
+    end
+  end
+end

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

@@ -0,0 +1,47 @@
+require_relative 'converter'
+require_relative '../diagram_processor'
+
+module Asciidoctor
+  module Diagram
+    module BarcodeProcessor
+      def self.check_config(config = {})
+        type = config[:type]
+        raise "Barcode type not specified in config" if type.nil?
+        raise "Unsupported barcode type: '#{type}'" unless BarcodeConverter::BARCODE_TYPES.include?(type)
+      end
+
+      def initialize(name = nil, config = {})
+        super
+        BarcodeProcessor.check_config(config)
+      end
+    end
+
+    module BarcodeMacroProcessor
+      def create_source(parent, target, attributes)
+        if attributes['external']
+          super
+        else
+          code = parent.sub_attributes(target, :attribute_missing => 'warn')
+          ::Asciidoctor::Diagram::ReaderSource.new(self, parent, code, attributes)
+        end
+      end
+    end
+
+    class BarcodeBlockProcessor < DiagramBlockProcessor
+      use_converter BarcodeConverter
+      include BarcodeProcessor
+    end
+
+    class BarcodeBlockMacroProcessor < DiagramBlockMacroProcessor
+      use_converter BarcodeConverter
+      include BarcodeProcessor
+      include BarcodeMacroProcessor
+    end
+
+    class BarcodeInlineMacroProcessor < DiagramInlineMacroProcessor
+      use_converter BarcodeConverter
+      include BarcodeProcessor
+      include BarcodeMacroProcessor
+    end
+  end
+end

data/lib/asciidoctor-diagram/barcode/svg_outputter.rb

@@ -0,0 +1,12 @@
+require 'barby/outputter/svg_outputter'
+
+module Barby
+  class SvgOutputter
+    # Monkey patch to fix foreground color in SVG output
+    def bars_to_path(opts={})
+      with_options opts do
+        %Q|<path stroke="#{foreground}" stroke-width="#{xdim}" d="#{bars_to_path_data(opts)}" />|
+      end
+    end
+  end
+end

data/lib/asciidoctor-diagram/barcode.rb

@@ -0,0 +1,11 @@
+require 'asciidoctor/extensions'
+require_relative 'barcode/extension'
+require_relative 'barcode/converter'
+
+Asciidoctor::Extensions.register do
+  Asciidoctor::Diagram::BarcodeConverter::BARCODE_TYPES.each do |type|
+    block Asciidoctor::Diagram::BarcodeBlockProcessor, type, :type => type
+    block_macro Asciidoctor::Diagram::BarcodeBlockMacroProcessor, type, :type => type
+    inline_macro Asciidoctor::Diagram::BarcodeInlineMacroProcessor, type, :type => type
+  end
+end

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

@@ -13,6 +13,11 @@ module Asciidoctor
         use_converter ::Asciidoctor::Diagram.const_get("#{tool}Converter")
       end
       ::Asciidoctor::Diagram.const_set("#{tool}BlockMacroProcessor", block_macro)
+
+      inline_macro = Class.new(DiagramInlineMacroProcessor) do
+        use_converter ::Asciidoctor::Diagram.const_get("#{tool}Converter")
+      end
+      ::Asciidoctor::Diagram.const_set("#{tool}InlineMacroProcessor", inline_macro)
     end
   end
 end

data/lib/asciidoctor-diagram/blockdiag.rb

@@ -5,5 +5,6 @@ Asciidoctor::Extensions.register do
   ['BlockDiag', 'SeqDiag', 'ActDiag', 'NwDiag', 'RackDiag', 'PacketDiag'].each do |tool|
     block ::Asciidoctor::Diagram.const_get("#{tool}BlockProcessor"), tool.downcase.to_sym
     block_macro ::Asciidoctor::Diagram.const_get("#{tool}BlockMacroProcessor"), tool.downcase.to_sym
+    inline_macro ::Asciidoctor::Diagram.const_get("#{tool}InlineMacroProcessor"), tool.downcase.to_sym
   end
 end