asciidoctor-pdf 1.5.0.alpha.5 → 1.5.0.alpha.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ddd0f5ebfe16661dfd20e0ef1718ea6aaa7f9fb
-  data.tar.gz: 05a6512716b3f7f203c7ebb14e6774385eaca13a
+  metadata.gz: 5dc73c6c0fd12b13fd37b6a9001b0b085b3458f7
+  data.tar.gz: 03a98a738a9cf9703488a10380619b1f87812654
 SHA512:
-  metadata.gz: 83698c58c5acf41e3c38e8d0c4657afe51d2aa99001d2bc278a2faefa42227534d66353aa80760d0e6ab669c30b879384599025bf97c72da730878cef0655cbc
-  data.tar.gz: a30d39c1ae441ebe4a3e2042343b2a8bb75cbbac931a2e9d4622692283dc09d928195b9770b314b84e96cd92dc5f42c99ac870588e38c93d21ff7d494826c786
+  metadata.gz: 76147bac174cf98b029674ad882cb35dfb4df5ed9e69b33f1c3b5ab47993a77d9d7423e38d382ec4b6b834e6d3322ecccfb7b746f72a9031a424e6065bf857a2
+  data.tar.gz: 18e4f064a6af705f35ac64c03cf4b3c8850427314e97686ea834662d09507c55574613eb85eadb246cdb3f80bac4eb471b051b182991717a4dd970d181330e5d

data/README.adoc

@@ -228,6 +228,13 @@ The layout and styling of the PDF is driven by a YAML configuration file.
 
 See the files [file]_default-theme.yml_ and [file]_asciidoctor-theme.yml_ found in the [file]_data/themes_ directory for examples.
 
+Specify the path to an alternate theme file with the `pdf-style` attribute. For example to use the built-in _asciidoctor_ theme:
+
+ $ ./bin/asciidoctor-pdf -a pdf-style=asciidoctor examples/example.adoc
+ 
+To refer to a theme at another location you can use the `pdf-stylesdir` attribute to specify the location of themes.
+If the `pdf-style` value does not end in `.yml`, then the file name is calculated as `{pdf-style}-theme.yml` located in the `pdf-stylesdir` directory (which defaults to the built-in `data/themes` directory).
+
 == Optional Scripts
 
 {project-name} also provides a shell script that invokes GhostScript (+gs+) to optimize and compress the generated PDF with minimal impact on quality.

data/bin/asciidoctor-pdf

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.join File.dirname(__FILE__), '../lib/asciidoctor-pdf'
+require_relative '../lib/asciidoctor-pdf'
 require 'asciidoctor/cli'
 
 options = Asciidoctor::Cli::Options.new backend: 'pdf', header_footer: true

data/bin/optimize-pdf

@@ -24,7 +24,8 @@ if [ -f "$FILE_BASENAME.pdfmarks" ]; then
 fi
 DOWNSAMPLE_IMAGES=true
 if [ -z $IMAGE_DPI ]; then
-  IMAGE_DPI=150
+  #IMAGE_DPI=150
+  IMAGE_DPI=300
 fi
 
 # /prepress defaults (see http://ghostscript.com/doc/current/Ps2pdf.htm)

data/examples/chronicles.adoc

@@ -37,7 +37,7 @@ Behold, the horror!
 
 .Wolpertinger, stuffed
 [.left.thumb]
-image::wolpertinger.jpg[Wolpertinger,width=100%,scaledwidth=55%]
+image::wolpertinger.jpg[Wolpertinger,width=100%,scaledwidth=55%,link=http://en.wikipedia.org/wiki/Wolpertinger]
 
 You may not be familiar with these {wolper-uri}[ravenous beasts].
 Trust us, they'll eat your shorts and suck loops from your code.

data/lib/asciidoctor-pdf/converter.rb

@@ -150,7 +150,7 @@ class Converter < ::Prawn::Document
     pdf_opts = (build_pdf_options doc, theme)
     ::Prawn::Document.instance_method(:initialize).bind(self).call pdf_opts
     # QUESTION should ThemeLoader register fonts?
-    register_fonts theme.font_catalog, (doc.attr 'scripts', 'latin')
+    register_fonts theme.font_catalog, (doc.attr 'scripts', 'latin'), (doc.attr 'pdf-fontsdir', ThemeLoader::FontsDir)
     @theme = theme
     @font_color = theme.base_font_color
     init_scratch_prototype
@@ -1238,9 +1238,9 @@ class Converter < ::Prawn::Document
     @pdfmarks.generate_file target if @pdfmarks
   end
 
-  def register_fonts font_catalog, scripts = 'latin'
+  def register_fonts font_catalog, scripts = 'latin', fonts_dir
     (font_catalog || {}).each do |key, font_styles|
-      register_font key => font_styles.map {|style, path| [style.to_sym, (font_path path)]}.to_h
+      register_font key => font_styles.map {|style, path| [style.to_sym, (font_path path, fonts_dir)]}.to_h
     end
 
     @fallback_fonts ||= []
@@ -1248,10 +1248,9 @@ class Converter < ::Prawn::Document
     default_kerning true
   end
 
-  # FIXME move to static method on ThemeLoader
-  def font_path font_file
+  def font_path font_file, fonts_dir
     # resolve relative to built-in font dir unless path is absolute
-    ::File.absolute_path font_file, ThemeLoader::FontsDir
+    ::File.absolute_path font_file, fonts_dir
   end
 
   def theme_fill_and_stroke_bounds category

data/lib/asciidoctor-pdf/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
 module Pdf
-  VERSION = '1.5.0.alpha.5'
+  VERSION = '1.5.0.alpha.6'
 end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-pdf
 version: !ruby/object:Gem::Version
-  version: 1.5.0.alpha.5
+  version: 1.5.0.alpha.6
 platform: ruby
 authors:
 - Dan Allen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-15 00:00:00.000000000 Z
+date: 2014-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -95,6 +95,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.16.0
+- !ruby/object:Gem::Dependency
+  name: thread_safe
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.3.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.3.4
 - !ruby/object:Gem::Dependency
   name: treetop
   requirement: !ruby/object:Gem::Requirement
@@ -194,7 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Converts AsciiDoc documents to PDF using Prawn