asciidoctor-diagram 1.5.19 → 2.0.5

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

@@ -0,0 +1,44 @@
+require_relative '../diagram_converter'
+require_relative '../util/cli_generator'
+require_relative '../util/platform'
+
+module Asciidoctor
+  module Diagram
+    # @private
+    class SmcatConverter
+      include DiagramConverter
+      include CliGenerator
+
+
+      def supported_formats
+        [:svg]
+      end
+
+      def collect_options(source)
+        {
+            :direction => source.attr('direction'),
+            :engine => source.attr('engine')
+        }
+      end
+
+      def convert(source, format, options)
+        direction = options[:direction]
+        engine = options[:engine]
+
+        generate_stdin(source.find_command('smcat'), format.to_s, source.to_s) do |tool_path, output_path|
+          args = [tool_path, '-o', Platform.native_path(output_path), '-T', format.to_s]
+          if direction
+            args << '-d' << direction
+          end
+
+          if engine
+            args << '-E' << engine
+          end
+
+          args << '-'
+          args
+        end
+      end
+    end
+  end
+end

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

@@ -1,50 +1,14 @@
-require_relative '../extensions'
-require_relative '../util/cli_generator'
-require_relative '../util/platform'
-require_relative '../util/which'
+require_relative 'converter'
+require_relative '../diagram_processor'
 
 module Asciidoctor
   module Diagram
-    # @private
-    module Smcat
-      include CliGenerator
-      include Which
-
-      def self.included(mod)
-        [:svg].each do |f|
-          mod.register_format(f, :image) do |parent, source|
-            smcat(parent, source, f)
-          end
-        end
-      end
-
-      def smcat(parent, source, format)
-        inherit_prefix = name
-        direction = source.attr('direction', nil, inherit_prefix)
-        engine = source.attr('engine', nil, inherit_prefix)
-
-        generate_stdin(which(parent, 'smcat'), format.to_s, source.to_s) do |tool_path, output_path|
-          args = [tool_path, '-o', Platform.native_path(output_path), '-T', format.to_s]
-          if direction
-            args << '-d' << direction
-          end
-
-          if engine
-            args << '-E' << engine
-          end
-
-          args << '-'
-          args
-        end
-      end
-    end
-
-    class SmcatBlockProcessor < Extensions::DiagramBlockProcessor
-      include Smcat
+    class SmcatBlockProcessor < DiagramBlockProcessor
+      use_converter SmcatConverter
     end
 
-    class SmcatBlockMacroProcessor < Extensions::DiagramBlockMacroProcessor
-      include Smcat
+    class SmcatBlockMacroProcessor < DiagramBlockMacroProcessor
+      use_converter SmcatConverter
     end
   end
 end

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

@@ -0,0 +1,49 @@
+require_relative '../diagram_converter'
+require_relative '../util/cli_generator'
+require_relative '../util/platform'
+
+module Asciidoctor
+  module Diagram
+    # @private
+    class SvgbobConverter
+      include DiagramConverter
+      include CliGenerator
+
+
+      def supported_formats
+        [:svg]
+      end
+
+      OPTIONS = {
+          :font_family => lambda { |o, v| o << '--font-family' << v if v },
+          :font_size => lambda { |o, v| o << '--font-size' << v if v },
+          :stroke_width => lambda { |o, v| o << '--stroke-width' << v if v },
+          :scale => lambda { |o, v| o << '--scale' << v if v }
+      }
+
+      def collect_options(source)
+        options = {}
+
+        OPTIONS.keys.each do |option|
+          attr_name = option.to_s.tr('_', '-')
+          options[option] = source.attr(attr_name) || source.attr(attr_name, nil, 'svgbob-option')
+        end
+
+        options
+      end
+
+
+      def convert(source, format, options)
+
+        flags = []
+        options.each do |option, value|
+          OPTIONS[option].call(flags, value)
+        end
+        
+        generate_stdin(source.find_command('svgbob'), format.to_s, source.to_s) do |tool_path, output_path|
+          ([tool_path, '-o', Platform.native_path(output_path)] + flags)
+        end
+      end
+    end
+  end
+end

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

@@ -1,36 +1,14 @@
-require_relative '../extensions'
-require_relative '../util/cli_generator'
-require_relative '../util/platform'
-require_relative '../util/which'
+require_relative 'converter'
+require_relative '../diagram_processor'
 
 module Asciidoctor
   module Diagram
-    # @private
-    module Svgbob
-      include CliGenerator
-      include Which
-
-      def self.included(mod)
-        [:svg].each do |f|
-          mod.register_format(f, :image) do |parent, source|
-            svgbob(parent, source, f)
-          end
-        end
-      end
-
-      def svgbob(parent, source, format)
-        generate_stdin(which(parent, 'svgbob'), format.to_s, source.to_s) do |tool_path, output_path|
-          [tool_path, '-o', Platform.native_path(output_path)]
-        end
-      end
-    end
-
-    class SvgBobBlockProcessor < Extensions::DiagramBlockProcessor
-      include Svgbob
+    class SvgBobBlockProcessor < DiagramBlockProcessor
+      use_converter SvgbobConverter
     end
 
-    class SvgBobBlockMacroProcessor < Extensions::DiagramBlockMacroProcessor
-      include Svgbob
+    class SvgBobBlockMacroProcessor < DiagramBlockMacroProcessor
+      use_converter SvgbobConverter
     end
   end
 end

data/lib/asciidoctor-diagram/symbolator.rb

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

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

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

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

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

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

@@ -0,0 +1,58 @@
+require_relative '../diagram_converter'
+require_relative '../util/cli_generator'
+require_relative '../util/platform'
+
+module Asciidoctor
+  module Diagram
+    # @private
+    class SyntraxConverter
+      include DiagramConverter
+      include CliGenerator
+
+
+      def supported_formats
+        [:png, :svg]
+      end
+
+      def collect_options(source)
+        {
+            :heading => source.attr('heading'),
+            :scale => source.attr('scale'),
+            :transparent => source.attr('transparent'),
+            :style => source.attr('style')
+        }
+      end
+
+      def convert(source, format, options)
+        generate_file(source.find_command('syntrax'), 'spec', format.to_s, source.to_s) do |tool_path, input_path, output_path|
+          args = [tool_path, '-i', Platform.native_path(input_path), '-o', Platform.native_path(output_path)]
+
+          title = options[:heading]
+          if title
+            args << '--title' << title
+          end
+
+          scale = options[:scale]
+          if scale
+            args << '--scale' << scale
+          end
+
+          transparent = options[:transparent]
+          if transparent == 'true'
+            args << '--transparent'
+          end
+          style = options[:style]
+          if style
+            args << '--style' << style
+          end
+
+          args
+        end
+      end
+
+      def native_scaling?
+        true
+      end
+    end
+  end
+end

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

@@ -1,59 +1,14 @@
-require_relative '../extensions'
-require_relative '../util/cli_generator'
-require_relative '../util/platform'
-require_relative '../util/which'
+require_relative '../diagram_processor'
+require_relative 'converter'
 
 module Asciidoctor
   module Diagram
-    # @private
-    module Syntrax
-      include CliGenerator
-      include Which
-
-      def self.included(mod)
-        [:png, :svg].each do |f|
-          mod.register_format(f, :image) do |parent, source|
-            syntrax(parent, source, f)
-          end
-        end
-      end
-
-      def syntrax(parent, source, format)
-        inherit_prefix = name
-
-        generate_file(which(parent, 'syntrax'), 'spec', format.to_s, source.to_s) do |tool_path, input_path, output_path|
-          args = [tool_path, '-i', Platform.native_path(input_path), '-o', Platform.native_path(output_path)]
-
-          title = source.attr('heading', nil, inherit_prefix)
-          if title
-            args << '--title' << title
-          end
-
-          scale = source.attr('scale', nil, inherit_prefix)
-          if scale
-            args << '--scale' << scale
-          end
-
-          transparent = source.attr('transparent', nil, inherit_prefix)
-          if transparent == 'true'
-            args << '--transparent'
-          end
-          style = source.attr('style', nil, inherit_prefix)
-          if style
-            args << '--style' << style
-          end
-
-          args
-        end
-      end
-    end
-
-    class SyntraxBlockProcessor < Extensions::DiagramBlockProcessor
-      include Syntrax
+    class SyntraxBlockProcessor < DiagramBlockProcessor
+      use_converter SyntraxConverter
     end
 
-    class SyntraxBlockMacroProcessor < Extensions::DiagramBlockMacroProcessor
-      include Syntrax
+    class SyntraxBlockMacroProcessor < DiagramBlockMacroProcessor
+      use_converter SyntraxConverter
     end
   end
 end

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

@@ -0,0 +1,75 @@
+require_relative '../diagram_converter'
+require_relative '../util/cli_generator'
+require_relative '../util/platform'
+
+module Asciidoctor
+  module Diagram
+    # @private
+    class TikZConverter
+      include DiagramConverter
+      include CliGenerator
+
+      def supported_formats
+        [:pdf, :svg]
+      end
+
+      def collect_options(source)
+        {
+            :preamble => source.attr('preamble') == 'true'
+        }
+      end
+
+      def convert(source, format, options)
+        latexpath = source.find_command('pdflatex')
+
+        if format == :svg
+          svgpath = source.find_command('pdf2svg')
+        else
+          svgpath = nil
+        end
+
+        if options[:preamble]
+          preamble, body = source.to_s.split(/^~~~~$/, 2)
+          unless body
+            body = preamble
+            preamble = ''
+          end
+        else
+          preamble = ''
+          body = source.to_s
+        end
+
+        latex = <<'END'
+\documentclass[border=2bp, tikz]{standalone}
+\usepackage{tikz}
+END
+        latex << preamble
+        latex << <<'END'
+\begin{document}
+\begingroup
+\tikzset{every picture/.style={scale=1}}
+END
+        latex << body
+        latex << <<'END'
+\endgroup
+\end{document}
+END
+
+        pdf = generate_file(latexpath, 'tex', 'pdf', latex) do |tool_path, input_path, output_path|
+          {
+              :args => [tool_path, '-shell-escape', '-file-line-error', '-interaction=nonstopmode', '-output-directory', Platform.native_path(File.dirname(output_path)), Platform.native_path(input_path)],
+              :out_file => "#{File.dirname(input_path)}/#{File.basename(input_path, '.*')}.pdf"
+          }
+        end
+
+        if svgpath
+          generate_file(svgpath, 'pdf', 'svg', pdf) do |tool_path, input_path, output_path|
+            [tool_path, Platform.native_path(input_path), Platform.native_path(output_path)]
+          end
+        else
+          pdf
+        end
+      end
+    end
+  end
+end

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

@@ -1,68 +1,14 @@
-require_relative '../extensions'
-require_relative '../util/cli_generator'
-require_relative '../util/platform'
-require_relative '../util/which'
+require_relative '../diagram_processor'
+require_relative 'converter'
 
 module Asciidoctor
   module Diagram
-    # @private
-    module TikZ
-      include CliGenerator
-      include Which
-
-      def self.included(mod)
-        [:pdf, :svg].each do |f|
-          mod.register_format(f, :image) do |parent, source|
-            tikz(parent, source, f)
-          end
-        end
-      end
-
-      def tikz(parent, source, format)
-        latexpath = which(parent, 'pdflatex')
-
-        if format == :svg
-          svgpath = which(parent, 'pdf2svg')
-        else
-          svgpath = nil
-        end
-
-        latex = <<'END'
-\documentclass[border=2bp, tikz]{standalone}
-\usepackage{tikz}
-\begin{document}
-\begingroup
-\tikzset{every picture/.style={scale=1}}
-END
-        latex << source.to_s
-        latex << <<'END'
-\endgroup
-\end{document}
-END
-
-        pdf = generate_file(latexpath, 'tex', 'pdf', latex) do |tool_path, input_path, output_path|
-          {
-              :args => [tool_path, '-shell-escape', '-file-line-error', '-interaction=nonstopmode', '-output-directory', Platform.native_path(File.dirname(output_path)), Platform.native_path(input_path)],
-              :out_file => "#{File.dirname(input_path)}/#{File.basename(input_path, '.*')}.pdf"
-          }
-        end
-
-        if svgpath
-          generate_file(svgpath, 'pdf', 'svg', pdf) do |tool_path, input_path, output_path|
-            [tool_path, Platform.native_path(input_path), Platform.native_path(output_path)]
-          end
-        else
-          pdf
-        end
-      end
-    end
-
-    class TikZBlockProcessor < Extensions::DiagramBlockProcessor
-      include TikZ
+    class TikZBlockProcessor < DiagramBlockProcessor
+      use_converter TikZConverter
     end
 
-    class TikZBlockMacroProcessor < Extensions::DiagramBlockMacroProcessor
-      include TikZ
+    class TikZBlockMacroProcessor < DiagramBlockMacroProcessor
+      use_converter TikZConverter
     end
   end
 end