revealing 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d42e25725650911b0db7d824e93ea671948f801b35c919fcbc72961c1a2bb7ab
-  data.tar.gz: 76c6b2cd5acfd1e9e5e973d33c387cdde943a2e157490e14d4140196820d55f3
+  metadata.gz: 81fadf115300f171aa5b6ea5071c9584118385f1ed0f02da4ed8b8e0203fab9d
+  data.tar.gz: ad941a12716d1ec2482d3b343117d8f16429a5066a69039236ed317a31d978f9
 SHA512:
-  metadata.gz: 6769159967e6aa9892b7fbff20c5bf6370e5ff2ec1e6528f87ffae83ade885f95e74bcb5ba04b0419087f27bf3a66de67eb5a305ef97540e478025df717db97a
-  data.tar.gz: a7255e38b81b155dbd5c414b00a02bcdd54894a4f6400cc7c3f247ba3c9140db1d22ce5733920cf85a48aa4f4cd13dd61cdfcc8b13d7983c39711f09919b16d3
+  metadata.gz: 916258822e1363db167842ea21f301338214453c30a2951a4d7c71131bfc8119067d4d1e92fffc9d3c38c1212fec142888dc913ef4491e1f67b793c02b955e1d
+  data.tar.gz: e66136a9f4a4e0007236c4e78b22a873a3876561ce72908cb37517ea2aed1240652f94de8767354eb6f6bcf535ed9f826f59a3d75b6aef5ef71f8e4347821c3d

data/README.markdown

@@ -38,9 +38,9 @@ Unique features:
 # TODO
 
 1. Expose DITAA's `--scale` via attribute
-1. PR homebrew's [ditaa](https://github.com/Homebrew/homebrew-core/blob/master/Formula/ditaa.rb) to use `-Djava.awt.headless=true`
-1. pandoc-ditaa-inline filter should write files to cache dir and read it from there via SHA
+1. pandoc-ditaa-inline filter could write files to cache dir and read it from there via SHA
    - still keep the SVG inline, but do not call ditaa again if unchanged
+1. Make pandoc-ditaa-inline only inline SVG if FORMAT is html (html5?)
 1. Expose customization of
    * highlight-style
    * theme

data/lib/revealing/cli.rb

@@ -5,7 +5,7 @@ require_relative 'prerequisite'
 module Revealing
   PREREQUISITES = [
     Prerequisite.new('curl'),
-    Prerequisite.new('ditaa'),
+    Prerequisite.new('java'),
     Prerequisite.new('gm', 'graphicsmagick'),
     Prerequisite.new('gpp'),
     Prerequisite.new('pandoc'),
@@ -72,7 +72,7 @@ module Revealing
     TEMPLATES_DIR = Pathname(__dir__) / '../../templates'
 
     def template_files
-      TEMPLATES_DIR.glob('**/*').select(&:file?)
+      TEMPLATES_DIR.glob("**/*", File::FNM_DOTMATCH).select(&:file?)
     end
 
     def target_files_in(dir)

data/lib/revealing/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Revealing
-  VERSION = '1.4.0'
+  VERSION = '1.5.0'
 end

data/templates/.gitignore

@@ -0,0 +1,2 @@
+gpp
+public_html

data/tools/pandoc-ditaa-inline/ditaa-inline.lua

@@ -1,6 +1,26 @@
+-- https://github.com/Donearm/scripts/blob/master/lib/dirname.lua
+local function dirname(str)
+	if str:match(".-/.-") then
+		return string.gsub(str, "(.*/)(.*)", "%1")
+	else
+		return ''
+	end
+end
+
 function CodeBlock(block)
   if block.classes[1] == "ditaa" then
-    local img = pandoc.pipe("ditaa", {"-", "-", "--svg", "--scale", "1.0"}, block.text)
+    local img = pandoc.pipe(
+      "java",
+      {
+        "-Djava.awt.headless=true",
+        "-jar", dirname(PANDOC_SCRIPT_FILE) .. '/' .. "lib/ditaa-0.11.0-standalone.jar",
+        "-",
+        "-",
+        "--svg",
+        "--scale", "1.0"
+      },
+      block.text
+    )
     return pandoc.Para({pandoc.RawInline("html", img)})
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: revealing
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Steffen Uhlig
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-20 00:00:00.000000000 Z
+date: 2019-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -222,6 +222,7 @@ files:
 - lib/revealing/tasks/reveal.js.rake
 - lib/revealing/version.rb
 - revealing.gemspec
+- templates/.gitignore
 - templates/Gemfile
 - templates/README.markdown
 - templates/Rakefile
@@ -234,6 +235,7 @@ files:
 - tools/pandoc-ditaa-inline/examples/example.html
 - tools/pandoc-ditaa-inline/examples/example.markdown
 - tools/pandoc-ditaa-inline/examples/example.png
+- tools/pandoc-ditaa-inline/lib/ditaa-0.11.0-standalone.jar
 homepage: 
 licenses:
 - MIT