asciidoctor-pdf 1.5.0.alpha.7 → 1.5.0.alpha.8

data/lib/asciidoctor-pdf/prawn_ext/formatted_text/fragment.rb

@@ -0,0 +1,37 @@
+module Asciidoctor
+module Prawn
+module FormattedText
+module Fragment
+  attr_reader :document
+  
+  # Prevent fragment from being written by discarding the text.
+  def conceal
+    @text = ''
+  end
+
+  # Modify the built-in ascender write method to allow an override value to be
+  # specified using the format_state hash.
+  def ascender= val
+    @ascender = (format_state.key? :ascender) ? format_state[:ascender] : val
+  end
+
+  # Modify the built-in ascender write method to allow an override value to be
+  # specified using the format_state hash.
+  def descender= val
+    @descender = (format_state.key? :descender) ? format_state[:descender] : val
+  end
+end
+
+class ::Prawn::Text::Formatted::Fragment
+  if ::RUBY_MIN_VERSION_2
+    prepend Fragment
+  else
+    # NOTE it's necessary to remove the accessor methods or else they won't get replaced
+    remove_method :ascender=
+    remove_method :descender=
+    include Fragment
+  end
+end
+end
+end
+end

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

@@ -1,22 +1,24 @@
 module Asciidoctor
 module Prawn
 module Images
+  class << self
+    def extended base
+      base.class.__send__ :alias_method, :_initial_image, :image
+    end
+  end
+
   # Dispatch to suitable image method in Prawn based on file extension.
   def image file, opts = {}
-    if (::File.extname file).downcase == '.svg'
+    # FIXME handle case when SVG is a File or IO object
+    if ::String === file && (file.downcase.end_with? '.svg')
       opts[:at] ||= bounds.top_left
-      svg ::IO.read(file), opts
+      svg (::IO.read file), opts
     else
-      _builtin_image file, opts
+      _initial_image file, opts
     end
   end
 end
-end
-end
 
-module Prawn
-class Document
-  alias :_builtin_image :image
-  include ::Asciidoctor::Prawn::Images
+::Prawn::Document.extensions << Images
 end
 end

data/lib/asciidoctor-pdf/temporary_path.rb

@@ -0,0 +1,9 @@
+module Asciidoctor
+module Pdf
+module TemporaryPath
+  def unlink
+    ::File.unlink self
+  end
+end
+end
+end

data/lib/asciidoctor-pdf/theme_loader.rb

@@ -6,10 +6,18 @@ module Asciidoctor
 module Pdf
 class ThemeLoader
   DataDir = ::File.expand_path(::File.join(::File.dirname(__FILE__), '..', '..', 'data'))
-  ThemesDir = ::File.join(DataDir, 'themes')
-  FontsDir = ::File.join(DataDir, 'fonts')
-  HexColorValueRx = /_color: (?<quote>"|'|)#?(?<value>[A-Za-z0-9]{3,6})\k<quote>$/
+  ThemesDir = ::File.join DataDir, 'themes'
+  FontsDir = ::File.join DataDir, 'fonts'
 
+  VariableRx = /\$([a-z0-9_]+)/
+  LoneVariableRx = /^\$([a-z0-9_]+)$/
+  HexColorValueRx = /[_-]color: (?<quote>"|'|)#?(?<value>[A-Za-z0-9]{3,6})\k<quote>$/
+  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
   module ColorValue; end
 
   class HexColorValue < String
@@ -28,7 +36,7 @@ class ThemeLoader
   def self.resolve_theme_file theme_name = nil, theme_path = nil
     theme_name ||= 'default'
     # if .yml extension is given, assume it's a full file name
-    if theme_name.end_with?('.yml')
+    if (theme_name.end_with? '.yml')
       # FIXME restrict to jail!
       # QUESTION why are we not using expand_path in this case?
       theme_path ? ::File.join(theme_path, theme_name) : theme_name
@@ -43,17 +51,17 @@ class ThemeLoader
   end
 
   def self.load_theme theme_name = nil, theme_path = nil
-    load_file(resolve_theme_file(theme_name, theme_path))
+    load_file(resolve_theme_file theme_name, theme_path)
   end
 
   def self.load_file filename
-    data = ::IO.read(filename).each_line.map {|l| l.sub(HexColorValueRx, '_color: \'\k<value>\'') }.join
-    self.new.load(::SafeYAML.load(data))
+    data = ::IO.read(filename).each_line.map {|l| l.sub HexColorValueRx, '_color: \'\k<value>\'' }.join
+    self.new.load(::SafeYAML.load data)
   end
 
   def load hash
     hash.inject(::OpenStruct.new) do |data, (key, val)|
-      process_entry(key, val, data)
+      process_entry key, val, data
     end
   end
 
@@ -62,10 +70,10 @@ class ThemeLoader
   def process_entry key, val, data
     if key != 'font_catalog' && ::Hash === val
       val.each do |key2, val2|
-        process_entry(%(#{key}_#{key2}), val2, data)
+        process_entry %(#{key}_#{key2.tr '-', '_'}), val2, data
       end
     else
-      data[key] = key.end_with?('_color') ? to_color(evaluate(val, data)) : evaluate(val, data)
+      data[key] = (key.end_with? '_color') ? to_color(evaluate val, data) : (evaluate val, data)
     end
     data
   end
@@ -73,9 +81,9 @@ class ThemeLoader
   def evaluate expr, vars
     case expr
     when ::String
-      evaluate_math(expand_vars(expr, vars))
+      evaluate_math(expand_vars expr, vars)
     when ::Array
-      expr.map {|e| evaluate(e, vars) }
+      expr.map {|e| evaluate e, vars }
     else
       expr
     end
@@ -83,11 +91,11 @@ class ThemeLoader
   
   # NOTE we assume expr is a String
   def expand_vars expr, vars
-    if (idx = expr.index('$'))
-      if idx == 0 && expr.match(/^\$([a-z0-9_]+)$/)
+    if (idx = (expr.index '$'))
+      if idx == 0 && LoneVariableRx =~ expr
         vars[$1]
       else
-        expr.gsub(/\$([a-z0-9_]+)/) { vars[$1] }
+        expr.gsub(VariableRx) { vars[$1] }
       end
     else
       expr
@@ -98,9 +106,10 @@ class ThemeLoader
     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?('-')
+    expr = %(1 - #{expr[1..-1]}) if expr.start_with? '-'
     # expand measurement values (e.g., 0.5in)
-    expr = expr.gsub(/(?<=^| |\()(\d+(?:\.\d+)?)(in|mm|cm|pt)(?=$| |\))/) {
+    expr = expr.gsub(MeasurementValueRx) {
+      # TODO extract to_pt method and use it here
       val = $1.to_f
       case $2
       when 'in'
@@ -117,23 +126,21 @@ class ThemeLoader
       val
     }
     while true
-      # TODO move this regular expression to a constant
-      result = expr.gsub(/(-?\d+(?:\.\d+)?) *([*\/]) *(-?\d+(?:\.\d+)?)/) { $1.to_f.send($2.to_sym, $3.to_f) }
+      result = expr.gsub(MultiplyDivideOpRx) { $1.to_f.send $2.to_sym, $3.to_f }
       unchanged = (result == expr)
       expr = result
       break if unchanged
     end
     while true
-      # TODO move this regular expression to a constant
-      result = expr.gsub(/(-?\d+(?:\.\d+)?) *([+\-]) *(-?\d+(?:\.\d+)?)/) { $1.to_f.send($2.to_sym, $3.to_f) }
+      result = expr.gsub(AddSubtractOpRx) { $1.to_f.send $2.to_sym, $3.to_f }
       unchanged = (result == expr)
       expr = result
       break if unchanged
     end
-    if expr.end_with?(')') && expr.match(/^(round|floor|ceil)\(/)
+    if (expr.end_with? ')') && PrecisionFuncRx =~ expr
       op = $1
       offset = op.length + 1
-      expr = expr[offset...-1].to_f.send(op.to_sym)
+      expr = expr[offset...-1].to_f.send op.to_sym
     end
     if expr == original
       original
@@ -150,34 +157,34 @@ class ThemeLoader
     when ::String
       if value == 'transparent'
         # FIXME should we have a TransparentColorValue class?
-        return HexColorValue.new(value)
+        return HexColorValue.new value
       elsif value.size == 6
-        return HexColorValue.new(value.upcase)
+        return HexColorValue.new value.upcase
       end
     when ::Array
       case value.size
       # CMYK value
       when 4
-        value = value.map {|e|
+        value = value.map do |e|
           if ::Numeric === e
             e = e * 100.0 unless e > 1
           else
             e = e.to_s.chomp('%').to_f
           end
-          (e == (int_e = e.to_i)) ? int_e : e
-        }
+          e == (int_e = e.to_i) ? int_e : e
+        end
         case value
         when [0, 0, 0, 0]
-          return HexColorValue.new('FFFFFF')
+          return HexColorValue.new 'FFFFFF'
         when [100, 100, 100, 100]
-          return HexColorValue.new('000000')
+          return HexColorValue.new '000000'
         else
           value.extend CmykColorValue
           return value
         end
       # RGB value
       when 3
-        return HexColorValue.new(value.map {|e| '%02X' % e}.join)
+        return HexColorValue.new value.map {|e| '%02X' % e}.join
       # Nonsense array value; flatten to string
       else
         value = value.join
@@ -194,9 +201,9 @@ class ThemeLoader
       value.each_char.map {|c| c * 2 }.join
     else
       # truncate or pad with leading zeros (e.g., ff -> 0000ff)
-      value[0..5].rjust(6, '0')
+      value[0..5].rjust 6, '0'
     end
-    HexColorValue.new(value.upcase)
+    HexColorValue.new value.upcase
   end
 end
 end

data/lib/asciidoctor-pdf/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-pdf
 version: !ruby/object:Gem::Version
-  version: 1.5.0.alpha.7
+  version: 1.5.0.alpha.8
 platform: ruby
 authors:
 - Dan Allen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-31 00:00:00.000000000 Z
+date: 2015-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -43,30 +43,36 @@ dependencies:
   name: prawn
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: prawn-table
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: prawn-templates
   requirement: !ruby/object:Gem::Requirement
@@ -87,14 +93,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.0
+        version: 0.20.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.0
+        version: 0.20.0
 - !ruby/object:Gem::Dependency
   name: prawn-icon
   requirement: !ruby/object:Gem::Requirement
@@ -180,15 +186,27 @@ files:
 - data/fonts/notoserif-italic-latin.ttf
 - data/fonts/notoserif-regular-latin.ttf
 - data/themes/default-theme.yml
+- docs/theme-schema.json
 - docs/theming-guide.adoc
 - lib/asciidoctor-pdf.rb
 - lib/asciidoctor-pdf/asciidoctor_ext.rb
+- lib/asciidoctor-pdf/asciidoctor_ext/image.rb
 - lib/asciidoctor-pdf/asciidoctor_ext/list.rb
 - lib/asciidoctor-pdf/asciidoctor_ext/list_item.rb
 - lib/asciidoctor-pdf/asciidoctor_ext/section.rb
 - lib/asciidoctor-pdf/converter.rb
+- lib/asciidoctor-pdf/core_ext.rb
 - lib/asciidoctor-pdf/core_ext/array.rb
+- lib/asciidoctor-pdf/core_ext/numeric.rb
 - lib/asciidoctor-pdf/core_ext/ostruct.rb
+- lib/asciidoctor-pdf/formatted_text.rb
+- lib/asciidoctor-pdf/formatted_text/formatter.rb
+- lib/asciidoctor-pdf/formatted_text/inline_destination_marker.rb
+- lib/asciidoctor-pdf/formatted_text/inline_image_arranger.rb
+- lib/asciidoctor-pdf/formatted_text/inline_image_renderer.rb
+- lib/asciidoctor-pdf/formatted_text/parser.rb
+- lib/asciidoctor-pdf/formatted_text/parser.treetop
+- lib/asciidoctor-pdf/formatted_text/transform.rb
 - lib/asciidoctor-pdf/implicit_header_processor.rb
 - lib/asciidoctor-pdf/pdf_core_ext.rb
 - lib/asciidoctor-pdf/pdf_core_ext/pdf_object.rb
@@ -196,13 +214,11 @@ files:
 - lib/asciidoctor-pdf/prawn_ext.rb
 - lib/asciidoctor-pdf/prawn_ext/coderay_encoder.rb
 - lib/asciidoctor-pdf/prawn_ext/extensions.rb
-- lib/asciidoctor-pdf/prawn_ext/formatted_text/formatter.rb
-- lib/asciidoctor-pdf/prawn_ext/formatted_text/parser.rb
-- lib/asciidoctor-pdf/prawn_ext/formatted_text/parser.treetop
-- lib/asciidoctor-pdf/prawn_ext/formatted_text/transform.rb
+- lib/asciidoctor-pdf/prawn_ext/formatted_text/fragment.rb
 - lib/asciidoctor-pdf/prawn_ext/images.rb
 - lib/asciidoctor-pdf/roman_numeral.rb
 - lib/asciidoctor-pdf/sanitizer.rb
+- lib/asciidoctor-pdf/temporary_path.rb
 - lib/asciidoctor-pdf/theme_loader.rb
 - lib/asciidoctor-pdf/version.rb
 homepage: https://github.com/asciidoctor/asciidoctor-pdf