asciidoctor-pdf 1.5.0.alpha.11 → 1.5.0.alpha.12

data/lib/asciidoctor-pdf/prawn_ext/extensions.rb

@@ -81,6 +81,18 @@ module Extensions
     page.margins[:bottom]
   end
 
+  # Returns the total left margin (to the page edge) for the current bounds.
+  #
+  def bounds_margin_left
+    bounds.absolute_left
+  end
+
+  # Returns the total right margin (to the page edge) for the current bounds.
+  #
+  def bounds_margin_right
+    page.dimensions[2] - bounds.absolute_right
+  end
+
   # Returns whether the cursor is at the top of the page (i.e., margin box)
   #
   def at_page_top?
@@ -456,11 +468,13 @@ module Extensions
     #end
   end
 
-  # Stretch the current bounds to the left and right edges of the current page.
+  # Stretch the current bounds to the left and right edges of the current page
+  # while yielding the specified block if the verdict argument is true.
+  # Otherwise, simply yield the specified block.
   #
-  def use_page_width_if verdict
+  def span_page_width_if verdict
     if verdict
-      indent(-bounds.absolute_left, bounds.absolute_right - page_width) do
+      indent -bounds_margin_left, -bounds_margin_right do
         yield
       end
     else

data/lib/asciidoctor-pdf/rouge_ext/css_theme.rb

@@ -1,7 +1,8 @@
 module Rouge
 class CSSTheme
   # Patch style_for to return most specific style first
-  # See https://github.com/jneen/rouge/issues/280 (fix pending)
+  # See https://github.com/jneen/rouge/issues/280
+  # Fixed as of rouge v1.10.0
   def style_for token
     token.token_chain.reverse_each do |t|
       if (s = styles[t])
@@ -11,4 +12,4 @@ class CSSTheme
     nil
   end
 end
-end
+end if (Gem::Version.new Rouge.version) < (Gem::Version.new '1.10.0')

data/lib/asciidoctor-pdf/sanitizer.rb

@@ -8,7 +8,7 @@ module Sanitizer
   }
   BuiltInEntityCharRx = /(?:#{BuiltInEntityChars.keys * '|'})/
   BuiltInEntityCharOrTagRx = /(?:#{BuiltInEntityChars.keys * '|'}|<)/
-  NumericCharRefRx = /&#(\d{2,4});/
+  NumericCharRefRx = /&#(\d{2,6});/
   XmlSanitizeRx = /<[^>]+>/
   SegmentPcdataRx = /(?:(&[a-z]+;|<[^>]+>)|([^&<]+))/
 

data/lib/asciidoctor-pdf/theme_loader.rb

@@ -13,10 +13,10 @@ class ThemeLoader
 
   VariableRx = /\$([a-z0-9_]+)/
   LoneVariableRx = /^\$([a-z0-9_]+)$/
-  HexColorEntryRx = /^(?<k>[[:blank:]]*[[:graph:]]+): +(?<q>["']?)#?(?<v>\w{3,6})\k<q> *(?:#.*)?$/
-  MeasurementValueRx = /(?<=^| |\()(\d+(?:\.\d+)?)(in|mm|cm|pt)(?=$| |\))/
-  MultiplyDivideOpRx = /(-?\d+(?:\.\d+)?) *([*\/]) *(-?\d+(?:\.\d+)?)/
-  AddSubtractOpRx = /(-?\d+(?:\.\d+)?) *([+\-]) *(-?\d+(?:\.\d+)?)/
+  HexColorEntryRx = /^(?<k>[[:blank:]]*[[:graph:]]+): +(?!null$)(?<q>["']?)#?(?<v>\w{3,6})\k<q> *(?:#.*)?$/
+  MeasurementValueRx = /(?<=^| |\()(-?\d+(?:\.\d+)?)(in|mm|cm|pt)(?=$| |\))/
+  MultiplyDivideOpRx = /(-?\d+(?:\.\d+)?) +([*\/]) +(-?\d+(?:\.\d+)?)/
+  AddSubtractOpRx = /(-?\d+(?:\.\d+)?) +([+\-]) +(-?\d+(?:\.\d+)?)/
   PrecisionFuncRx = /^(round|floor|ceil)\(/
 
   # TODO implement white? & black? methods
@@ -86,17 +86,23 @@ class ThemeLoader
   private
 
   def process_entry key, val, data
-    if key.start_with? 'admonition_icon_'
+    if key.start_with? 'font_'
+      data[key] = val
+    elsif key.start_with? 'admonition_icon_'
       data[key] = (val || {}).map do |(key2, val2)|
-        static_val2 = evaluate val2, data
-        [key2.to_sym, (key2.end_with? '_color') ? to_color(static_val2) : static_val2]
+        [key2.to_sym, (key2.end_with? '_color') ? to_color(evaluate val2, data) : (evaluate val2, data)]
       end.to_h
-    elsif key != 'font_catalog' && ::Hash === val
+    elsif ::Hash === val
       val.each do |key2, val2|
         process_entry %(#{key}_#{key2.tr '-', '_'}), val2, data
       end
+    elsif key.end_with? '_color'
+      # QUESTION do we need to evaluate_math in this case?
+      data[key] = to_color(evaluate val, data)
+    elsif %(#{key.chomp '_'}_).include? '_content_'
+      data[key] = expand_vars val, data
     else
-      data[key] = (key.end_with? '_color') ? to_color(evaluate val, data) : (evaluate val, data)
+      data[key] = evaluate val, data
     end
     data
   end
@@ -128,25 +134,22 @@ class ThemeLoader
   def evaluate_math expr
     return expr if !(::String === expr) || ColorValue === expr
     original = expr
-    # FIXME quick HACK to turn a single negative number into an expression
-    expr = %(1 - #{expr[1..-1]}) if expr.start_with? '-'
     # expand measurement values (e.g., 0.5in)
+    # QUESTION should we round the value? perhaps leave that to the precision functions
+    # NOTE leave % as a string; handled by converter for now
     expr = expr.gsub(MeasurementValueRx) {
       # TODO extract to_pt method and use it here
       val = $1.to_f
       case $2
       when 'in'
-        val = val * 72
+        val * 72
       when 'mm'
-        val = val * (72 / 25.4)
+        val * (72 / 25.4)
       when 'cm'
-        val = val * (720 / 25.4)
-      #when '%'
-      #  val = val / 100.0
-      # default is pt
+        val * (720 / 25.4)
+      else
+        val # default unit is pt
       end
-      # QUESTION should we round the value?
-      val
     }
     while true
       result = expr.gsub(MultiplyDivideOpRx) { $1.to_f.send $2.to_sym, $3.to_f }

data/lib/asciidoctor-pdf/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-pdf
 version: !ruby/object:Gem::Version
-  version: 1.5.0.alpha.11
+  version: 1.5.0.alpha.12
 platform: ruby
 authors:
 - Dan Allen
@@ -9,34 +9,34 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-05 00:00:00.000000000 Z
+date: 2016-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: asciidoctor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.0
 - !ruby/object:Gem::Dependency
@@ -93,28 +93,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.25.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.25.1
 - !ruby/object:Gem::Dependency
   name: prawn-icon
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: safe_yaml
   requirement: !ruby/object:Gem::Requirement
@@ -157,8 +157,10 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.5.3
-description: |
-  An extension for Asciidoctor that converts AsciiDoc documents to PDF using the Prawn PDF library.
+description: 'An extension for Asciidoctor that converts AsciiDoc documents to PDF
+  using the Prawn PDF library.
+
+'
 email: dan@opendevise.io
 executables:
 - asciidoctor-pdf
@@ -168,12 +170,13 @@ extra_rdoc_files:
 - LICENSE.adoc
 - NOTICE.adoc
 files:
+- Gemfile
 - LICENSE.adoc
 - NOTICE.adoc
 - README.adoc
 - Rakefile
+- asciidoctor-pdf.gemspec
 - bin/asciidoctor-pdf
-- bin/optimize-pdf
 - data/fonts/LICENSE-mplus-testflight-58
 - data/fonts/LICENSE-noto-2015-06-05
 - data/fonts/mplus1mn-bold-ascii.ttf
@@ -235,14 +238,17 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --charset=UTF-8 --title="Asciidoctor PDF" --main=README.adoc -ri
+- "--charset=UTF-8"
+- --title="Asciidoctor PDF"
+- "--main=README.adoc"
+- "-ri"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '1.9'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"
@@ -250,9 +256,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Converts AsciiDoc documents to PDF using Prawn
 test_files: []
-has_rdoc: true

data/bin/optimize-pdf

@@ -1,64 +0,0 @@
-#!/bin/bash
-
-# Optimizes and compresses the specified PDF using Ghostscript (gs).
-#
-# [NOTE]
-# You need at least Ghostscript 9.10 in order for page labels defined in the
-# PDF to be preserved (e.g., front matter pages numbered using roman numerals).
-
-if [ -z $1 ]; then
-   echo "Please supply a PDF file to optimize"
-   exit 1
-fi
-
-if [ -z $GS ]; then
-  GS=gs
-fi
-
-FILE=$1
-FILE_BASENAME=${FILE%.pdf}
-FILE_OPTIMIZED=$FILE_BASENAME-optimized.pdf
-FILE_PDFMARKS=
-if [ -f "$FILE_BASENAME.pdfmarks" ]; then
-  FILE_PDFMARKS="$FILE_BASENAME.pdfmarks"
-fi
-DOWNSAMPLE_IMAGES=true
-if [ -z $IMAGE_DPI ]; then
-  #IMAGE_DPI=150
-  IMAGE_DPI=300
-fi
-
-# /prepress defaults (see http://ghostscript.com/doc/current/Ps2pdf.htm)
-# -d{Color,Gray,Mono}ImageDownsampleType=/Bicubic
-# -dAutoFilter{Color,Gray}Images=true
-# -dOptimize=true
-# -dEmbedAllFonts=true
-# -dSubsetFonts=true
-# -dColorConversionStrategy=/LeaveColorUnchanged
-# -dUCRandBGInfo=/Preserve
-# -dCompressPages=true
-#
-# other unused settings
-# -r72
-#
-# for info about pdfmarks, see http://milan.kupcevic.net/ghostscript-ps-pdf
-#
-# to convert to grayscale, add the following (though doesn't always work)
-#
-# -dProcessColorModel=/DeviceGray \
-# -dColorConversionStrategy=/Gray \
-
-"$GS" -q -dNOPAUSE -dBATCH -dSAFER -dNOOUTERSAVE \
-  -sDEVICE=pdfwrite \
-  -dPDFSETTINGS=/prepress \
-  -dCannotEmbedFontPolicy=/Warning \
-  -dDownsampleColorImages=$DOWNSAMPLE_IMAGES \
-  -dColorImageResolution=$IMAGE_DPI \
-  -dDownsampleGrayImages=$DOWNSAMPLE_IMAGES \
-  -dGrayImageResolution=$IMAGE_DPI \
-  -dDownsampleMonoImages=$DOWNSAMPLE_IMAGES \
-  -dMonoImageResolution=$IMAGE_DPI \
-  -sOutputFile="$FILE_OPTIMIZED" \
-  "$FILE" $FILE_PDFMARKS
-
-exit 0