webgen 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6fbb6e93b9b2cbae04fb5c395d3c51684742e33a7ae84902a9bb0c8a37067b6
-  data.tar.gz: b7631a0e10684ba0d7898ee5ec3cb7a3dbd15f7b47116b220917efb19372a066
+  metadata.gz: 82b8cbcc822f838af50c33be08022cdb694bbf72e4b0a8b16119bc1170169ead
+  data.tar.gz: c35bc89fec452d38cc7294f3544662fbaa18e0364320242ed57a92b5151467d5
 SHA512:
-  metadata.gz: 24818e0987424cbf2aa8ddd3cca0c74428bcd82d10b56837c879750d4bcb08e9bc45486970fe5b8aa442c3249ca9c2a62f9428626d55ea0c78deb3f86784bf0a
-  data.tar.gz: 169fea7fc799e2575b99cd3b9c2b8f1080cb7546f7cf28c784b0663994b1640ad4d1c1d2788ae925525bcdffc43df56cdc7faa00327117111a53b13665fb6ee9
+  metadata.gz: 3b11a5924bf44d4cec50cf6b658527644a661f4ea8a35cf2adbf25025325467acbe568b3533489455f9b132799532be8594d906e81cfd0ff2e0ce17ba62832b6
+  data.tar.gz: 3933fbbf9f71811d3e658ebe04dce9f583a3a6cca01139ba209476e38761fd30380d8741e960311e571f27467c086310a2f3dfbccb309d094570fef5d44aa472

data/VERSION

@@ -1 +1 @@
-1.5.1
+1.5.2

data/data/webgen/passive_sources/templates/tikz.template

@@ -1,7 +1,6 @@
 --- name:content pipeline:erb
 \nonstopmode
-\documentclass{standalone}
-\usepackage{tikz}
+\documentclass[tikz]{standalone}
 
 <% if context['content_processor.tikz.libraries'] %>
 \usetikzlibrary{<%= context['content_processor.tikz.libraries'].join(',') %>}

data/lib/webgen/bundle/built-in/info.yaml

@@ -404,6 +404,20 @@ options:
         \tikz \draw (0,0) -- (0,2) -- (2,2);
         {tikz}
 
+  content_processor.tikz.engine:
+    summary: |
+      Specifies which LaTeX engine should be used. Default is pdflatex, but you may want to use
+      xelatex or lualatex if needed.
+    syntax: |
+      `pdflatex` or `lualatex` or `xelatex`
+    example:
+      config: |
+        content_processor.tikz.engine: lualatex
+      tag: |
+        {tikz:: {path: tikz.png, content_processor.tikz.engine: xelatex}}
+        \tikz \draw (0,0) -- (0,2) -- (2,2);
+        {tikz}
+
   content_processor.xmllint.options:
     summary: |
       Options passed to the `xmllint` command.

data/lib/webgen/bundle/built-in/init.rb

@@ -112,6 +112,7 @@ option('content_processor.tikz.resolution', '72 72',) do |val|
 end
 option('content_processor.tikz.transparent', false, &true_or_false)
 option('content_processor.tikz.template', '/templates/tikz.template', &is_string)
+option('content_processor.tikz.engine', 'pdflatex', &is_string)
 
 content_processor.register('Xmllint')
 option('content_processor.xmllint.options', "--catalogs --noout --valid", &is_string)

data/lib/webgen/content_processor/tikz.rb

@@ -7,7 +7,6 @@ require 'webgen/content_processor'
 require 'webgen/utils/external_command'
 
 Webgen::Utils::ExternalCommand.ensure_available!('pdflatex', '-v')
-Webgen::Utils::ExternalCommand.ensure_available!('pdfcrop', '--version')
 Webgen::Utils::ExternalCommand.ensure_available!('gs', '-v')
 Webgen::Utils::ExternalCommand.ensure_available!('convert', '-version')
 Webgen::Utils::ExternalCommand.ensure_available!('identify', '-version')
@@ -31,7 +30,7 @@ module Webgen
       def self.prepare_options(context)
         %w[content_processor.tikz.resolution content_processor.tikz.transparent
            content_processor.tikz.libraries content_processor.tikz.opts
-           content_processor.tikz.template].each do |opt|
+           content_processor.tikz.template content_processor.tikz.engine].each do |opt|
           context[opt] = context.content_node[opt] || context.website.config[opt]
         end
         context['data'] = context.content
@@ -66,29 +65,35 @@ module Webgen
       def self.compile(context, cwd, tex_file, basename, ext)
         render_res, output_res = context['content_processor.tikz.resolution'].split(' ')
 
+        engine = context['content_processor.tikz.engine']
         File.write(tex_file, context.content)
-        execute("pdflatex -shell-escape -interaction=nonstopmode -halt-on-error #{basename}.tex", cwd, context) do |_status, stdout, stderr|
+        execute("#{engine} -shell-escape -interaction=nonstopmode -halt-on-error #{basename}.tex", cwd, context) do |_status, stdout, stderr|
           errors = (stdout+stderr).scan(/^!(.*\n.*)/).join("\n")
-          raise Webgen::RenderError.new("Error while parsing TikZ picture commands with PDFLaTeX: #{errors}",
+          raise Webgen::RenderError.new("Error while parsing TikZ picture commands with #{engine}: #{errors}",
                                         'content_processor.tikz', context.dest_node, context.ref_node)
         end
 
-        execute("pdfcrop #{basename}.pdf #{basename}.pdf", cwd, context)
-
         if context['content_processor.tikz.transparent'] && ext =~ /\.png/i
           cmd = "gs -dSAFER -dBATCH -dNOPAUSE -r#{render_res} -sDEVICE=pngalpha -dGraphicsAlphaBits=4 " +
             "-dTextAlphaBits=4 -sOutputFile=#{basename}#{ext} #{basename}.pdf"
+        elsif ext =~ /\.svg/i
+          # some installations of ghostscript (`gs`) also have a svg output device, but pdf2svg
+          # is a safer bet.
+          cmd = "pdf2svg #{basename}.pdf #{basename}.svg"
         else
           cmd = "convert -density #{render_res} #{basename}.pdf #{basename}#{ext}"
         end
         execute(cmd, cwd, context)
 
-        if render_res != output_res
-          _status, stdout, _stderr = execute("identify #{basename}#{ext}", cwd, context)
-          width, height = stdout.scan(/\s\d+x\d+\s/).first.strip.split('x').collect do |s|
-            s.to_f * output_res.to_f / render_res.to_f
+        # resizing doesn't really make sense on a vector graphic.
+        unless ext =~ /\.svg/i
+          if render_res != output_res
+            _status, stdout, _stderr = execute("identify #{basename}#{ext}", cwd, context)
+            width, height = stdout.scan(/\s\d+x\d+\s/).first.strip.split('x').collect do |s|
+              s.to_f * output_res.to_f / render_res.to_f
+            end
+            execute("convert -resize #{width}x#{height} #{basename}#{ext} #{basename}#{ext}", cwd, context)
           end
-          execute("convert -resize #{width}x#{height} #{basename}#{ext} #{basename}#{ext}", cwd, context)
         end
       end
       private_class_method :compile

data/lib/webgen/version.rb

@@ -3,6 +3,6 @@
 module Webgen
 
   # The version of webgen.
-  VERSION = '1.5.1'
+  VERSION = '1.5.2'
 
 end

data/test/webgen/content_processor/test_tikz.rb

@@ -19,13 +19,13 @@ class TestContentProcessorTikz < Minitest::Test
 
     @context.node.define_singleton_method(:[]) {|_ignored| nil}
 
-    call('\tikz \draw (0,0) -- (0,1);', 'test.png', [], '', '72 72', false)
-    Timeout.timeout(0.2) { call('\tikz \draw (0,0) -- (0,1);', 'test.png', [], '', '72 72', false) } # test cache
+    call('\tikz \draw (0,0) -- (1,1);', 'test.png', [], '', '72 72', false)
+    Timeout.timeout(0.2) { call('\tikz \draw (0,0) -- (1,1);', 'test.png', [], '', '72 72', false) } # test cache
     refute_nil(@context.content)
 
     assert_raises(Webgen::RenderError) { call('\tikz \asdfasdfasf', 'test.png', [], '', '72 72', false) }
 
-    call('\tikz \draw (0,0) -- (0,1);', '/images/test.gif', ['arrows'], '->', '72 72', true)
+    call('\tikz \draw (0,0) -- (1,1);', '/images/test.gif', ['arrows'], '->', '72 72', true)
     refute_nil(@context.content)
   end
 
@@ -44,7 +44,7 @@ class TestContentProcessorTikz < Minitest::Test
   end
 
   def teardown
-    FileUtils.rm_rf(@website.directory) if @website
+    #FileUtils.rm_rf(@website.directory) if @website
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webgen
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - Thomas Leitner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-06 00:00:00.000000000 Z
+date: 2018-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cmdparse