diff --git a/LICENSE b/LICENSE index 8fe1c00986b6f3478855fedef293f068fffad21a..ba1c8afb451d358c458aa8c532cc00b5bb916f9d 100644 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,6 @@ -Copyright (c) 2012 Nicolás Reynolds <fauno@endefensadelsl.org> - Mauricio Pasquier Juan <mpj@endefensadelsl.org> +Copyright (c) 2012-2013 Nicolás Reynolds <fauno@endefensadelsl.org> + 2012-2013 Mauricio Pasquier Juan <mpj@endefensadelsl.org> + 2013 Brian Candler <b.candler@pobox.com> Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff --git a/README.md b/README.md index b4b5213793e323c1ce6b702aafa6f5e77f6a9677..23b46a2a24fb3da51bea9592c2114a0ccedc9485 100644 --- a/README.md +++ b/README.md @@ -79,6 +79,15 @@ other available formats from the post itself: {% endfor %} </ul> +## How to install + +Add this snippet to your `\_config.yml` on jekyll 1.3 + + gems: [ 'jekyll-pandoc-multiple-formats' ] + +Alternative, see +[here](https://github.com/fauno/jekyll-pandoc-multiple-formats/issues/7). + ## How to run diff --git a/lib/jekyll-pandoc-multiple-formats.rb b/lib/jekyll-pandoc-multiple-formats.rb index aba5313906c01bb8a706bfdf88862b87e9d380a8..c76f112d9c127482f1df13bb61d52ba44af67cb7 100644 --- a/lib/jekyll-pandoc-multiple-formats.rb +++ b/lib/jekyll-pandoc-multiple-formats.rb @@ -27,7 +27,7 @@ class PandocGenerator < Generator # Have a filename! filename = "#{post.url.gsub(/\//, "-").gsub(/-$/, "")}.#{output}" if filename =~ /\/$/ - filename_with_path = File.join(post_path, filename) + filename_with_path = File.join(base_dir, output, filename) # Special cases, stdout is disabled for these if ['pdf', 'epub', 'odt', 'docx'].include?(output) @@ -56,6 +56,7 @@ class PandocGenerator < Generator Open3::popen3(pandoc) do |stdin, stdout, stderr| stdin.puts content stdin.close + STDERR.print stderr.read end # Skip failed files @@ -101,6 +102,7 @@ module JekyllPandocMultipleFormats stdin.close output = stdout.read.strip + STDERR.print stderr.read end diff --git a/lib/jekyll-pandoc-multiple-formats/version.rb b/lib/jekyll-pandoc-multiple-formats/version.rb index 0a5dda880efa24f4797ba4d45a15c1e13f0cca1a..4ef8299e59e0574dfa9134db18c814207e5bcd0a 100644 --- a/lib/jekyll-pandoc-multiple-formats/version.rb +++ b/lib/jekyll-pandoc-multiple-formats/version.rb @@ -1,3 +1,3 @@ module JekyllPandocMultipleFormats - VERSION = "0.0.3" + VERSION = "0.0.5" end