asciidoctor-pdf 1.5.0.alpha.14 → 1.5.0.alpha.15

data/lib/asciidoctor-pdf/core_ext/object.rb

@@ -1,6 +1,6 @@
 class Object
   # Convert the object to a serialized PDF object.
   def to_pdf
-    ::PDF::Core::PdfObject self
+    ::PDF::Core.pdf_object self
   end
 end

data/lib/asciidoctor-pdf/core_ext/string.rb

@@ -21,6 +21,6 @@ class String
   # Convert the string to a serialized PDF object. If the string can be encoded as ASCII-8BIT, first convert it to a PDF
   # LiteralString object.
   def to_pdf
-    ::PDF::Core::PdfObject as_pdf
+    ::PDF::Core.pdf_object as_pdf
   end
 end

data/lib/asciidoctor-pdf/formatted_text/inline_destination_marker.rb

@@ -11,7 +11,7 @@ module InlineDestinationMarker
         end
         # get precise position of the reference (x, y)
         dest_rect = fragment.absolute_bounding_box
-        pdf.add_dest name, (pdf.dest_xyz dest_rect.first, dest_rect.last)
+        pdf.add_dest name, (pdf.dest_xyz dest_rect[0], dest_rect[-1])
         # prevent any text from being written
         fragment.conceal
       end

data/lib/asciidoctor-pdf/formatted_text/transform.rb

@@ -199,10 +199,19 @@ class Transform
         pname, pvalue = style.split(':', 2)
         case pname
         when 'color'
+          # QUESTION should we check whether the value is a valid hex color?
           unless fragment[:color]
-            pvalue = pvalue[1..-1] if pvalue.start_with?('#')
-            #pvalue = pvalue.each_char.map {|c| c * 2 }.join if pvalue.size == 3
-            fragment[:color] = pvalue
+            case pvalue.length
+            when 6
+              fragment[:color] = pvalue
+            when 7
+              fragment[:color] = pvalue.slice(1, 6) if pvalue.start_with?('#')
+            # QUESTION should we support the 3 character form?
+            #when 3
+            #  fragment[:color] = pvalue.each_char.map {|c| c * 2 }.join
+            #when 4
+            #  fragment[:color] = pvalue.slice(1, 3).each_char.map {|c| c * 2 }.join if pvalue.start_with?('#')
+            end
           end
         when 'font-weight'
           if pvalue == 'bold'

data/lib/asciidoctor-pdf/pdf-core_ext.rb

@@ -1 +1,2 @@
+require_relative 'pdf-core_ext/pdf_object'
 require_relative 'pdf-core_ext/page'

data/lib/asciidoctor-pdf/pdf-core_ext/page.rb

@@ -13,6 +13,13 @@ class PDF::Core::Page
     end
     @content = document.ref Hash.new
     dictionary.data[:Contents] << document.state.store[@content]
-    document.renderer.open_graphics_state
+    document.open_graphics_state
   end unless method_defined? :new_content_stream
+
+  # Restore the imported_page? method from PDF::Core::Page
+  #
+  # see https://github.com/prawnpdf/pdf-core/commit/0e326a838e142061be8e062168190fae6b3b1dcf
+  def imported_page?
+    @imported_page
+  end unless method_defined? :imported_page?
 end

data/lib/asciidoctor-pdf/pdf-core_ext/pdf_object.rb

@@ -0,0 +1,6 @@
+unless (defined? PDF::Core.pdf_object) == 'method'
+  module PDF::Core
+    alias :pdf_object :PdfObject
+    module_function :pdf_object
+  end
+end

data/lib/asciidoctor-pdf/prawn-table_ext/cell/text.rb

@@ -1,5 +1,6 @@
 class Prawn::Table::Cell::Text
   # Override draw_content method to drop cursor advancement
+  remove_method :draw_content
   def draw_content
     with_font do
       with_text_color do

data/lib/asciidoctor-pdf/prawn-templates_ext.rb

@@ -0,0 +1,5 @@
+class Prawn::Document
+  # NOTE allows prawn-templates 0.0.4 to be used with prawn >= 2.2.0
+  const_set :VALID_OPTIONS, (send :remove_const, :VALID_OPTIONS).dup if VALID_OPTIONS.frozen?
+end
+require 'prawn/templates'

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

@@ -97,7 +97,7 @@ class CodeRayEncoder < ::CodeRay::Encoders::Encoder
         @out << { text: text }
       else
         # QUESTION should we default to no color?
-        @out << { text: text, color: (COLORS[kind] || COLORS[@open.last] || COLORS[:default]) }
+        @out << { text: text, color: (COLORS[kind] || COLORS[@open[-1]] || COLORS[:default]) }
       end
       @start_of_line = text.end_with? LF
     end

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

@@ -736,13 +736,12 @@ module Extensions
     end
   end
 
-  #def advance_or_start_new_page options = {}
-  #  if last_page?
-  #    start_new_page options
-  #  else
-  #    go_to_page page_number + 1
-  #  end
-  #end
+  # This method is a smarter version of start_new_page. It calls start_new_page
+  # if the current page is the last page of the document. Otherwise, it simply
+  # advances to the next existing page.
+  def advance_page
+    last_page? ? start_new_page : (go_to_page page_number + 1)
+  end
 
   # Start a new page without triggering the on_page_create callback
   #

data/lib/asciidoctor-pdf/rouge_ext/formatters/prawn.rb

@@ -42,8 +42,11 @@ class Prawn < Formatter
 
   def stream tokens, opts = {}
     if opts[:line_numbers]
-      # TODO implement line number start (offset)
-      linenum = 0
+      if (linenum = opts[:start_line]) > 0
+        linenum -= 1
+      else
+        linenum = 0
+      end
       fragments = []
       fragments << (create_linenum_fragment linenum += 1)
       tokens.each do |tok, val|
@@ -66,7 +69,7 @@ class Prawn < Formatter
       # NOTE drop orphaned linenum fragment (due to trailing endline in source)
       fragments.pop if (last_fragment = fragments[-1]) && last_fragment[:linenum]
       # NOTE pad numbers that have less digits than the largest line number
-      if (linenum_w = linenum.to_s.size) > 1
+      if (linenum_w = linenum.to_s.length) > 1
         # NOTE extra column is the trailing space after the line number
         linenum_w += 1
         fragments.each do |fragment|
@@ -116,7 +119,7 @@ class Prawn < Formatter
       end
       if style_rules[:underline]
         if fragment.key? :styles
-          fragment[:styles] << UnderlineStyle.first
+          fragment[:styles] << UnderlineStyle[0]
         else
           fragment[:styles] = UnderlineStyle.dup
         end
@@ -135,7 +138,7 @@ class Prawn < Formatter
       normalized
     else
       normalized = (raw.start_with? '#') ? raw[1..-1] : raw
-      normalized = normalized.each_char.map {|c| c * 2 }.join if normalized.size == 3
+      normalized = normalized.each_char.map {|c| c * 2 }.join if normalized.length == 3
       @normalized_colors[raw] = normalized
     end
   end

data/lib/asciidoctor-pdf/theme_loader.rb

@@ -17,7 +17,6 @@ class ThemeLoader
   VariableRx = /\$([a-z0-9_]+)/
   LoneVariableRx = /^\$([a-z0-9_]+)$/
   HexColorEntryRx = /^(?<k>[[:blank:]]*[[:graph:]]+): +(?!null$)(?<q>["']?)#?(?<v>\w{3,6})\k<q> *(?:#.*)?$/
-  MeasurementValueRx = /(?<=^| |\()(-?\d+(?:\.\d+)?)(in|mm|cm|p[txc])(?=$| |\))/
   MultiplyDivideOpRx = /(-?\d+(?:\.\d+)?) +([*\/]) +(-?\d+(?:\.\d+)?)/
   AddSubtractOpRx = /(-?\d+(?:\.\d+)?) +([+\-]) +(-?\d+(?:\.\d+)?)/
   PrecisionFuncRx = /^(round|floor|ceil)\(/
@@ -184,11 +183,11 @@ class ThemeLoader
       if value == 'transparent'
         # FIXME should we have a TransparentColorValue class?
         return HexColorValue.new value
-      elsif value.size == 6
+      elsif value.length == 6
         return HexColorValue.new value.upcase
       end
     when ::Array
-      case value.size
+      case value.length
       # CMYK value
       when 4
         value = value.map do |e|
@@ -219,7 +218,7 @@ class ThemeLoader
       # Unknown type; coerce to a string
       value = value.to_s
     end
-    value = case value.size
+    value = case value.length
     when 6
       value
     when 3

data/lib/asciidoctor-pdf/ttfunk_ext.rb

@@ -0,0 +1,8 @@
+# patch ttfunk 1.5.0; see https://github.com/prawnpdf/ttfunk/issues/39
+class TTFunk::Subset::Base
+  alias __checksum checksum
+  def checksum data
+    return 0 if data.length == 0
+    __checksum data
+  end
+end

data/lib/asciidoctor-pdf/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-pdf
 version: !ruby/object:Gem::Version
-  version: 1.5.0.alpha.14
+  version: 1.5.0.alpha.15
 platform: ruby
 authors:
 - Dan Allen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-06 00:00:00.000000000 Z
+date: 2017-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -48,7 +48,7 @@ dependencies:
         version: 1.3.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
         version: 1.3.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: prawn-table
   requirement: !ruby/object:Gem::Requirement
@@ -77,16 +77,22 @@ dependencies:
   name: prawn-templates
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.3
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 0.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.3
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 0.0.5
 - !ruby/object:Gem::Dependency
   name: prawn-svg
   requirement: !ruby/object:Gem::Requirement
@@ -141,14 +147,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: 0.3.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: 0.3.6
 - !ruby/object:Gem::Dependency
   name: treetop
   requirement: !ruby/object:Gem::Requirement
@@ -226,12 +232,14 @@ files:
 - lib/asciidoctor-pdf/measurements.rb
 - lib/asciidoctor-pdf/pdf-core_ext.rb
 - lib/asciidoctor-pdf/pdf-core_ext/page.rb
+- lib/asciidoctor-pdf/pdf-core_ext/pdf_object.rb
 - lib/asciidoctor-pdf/pdfmark.rb
 - lib/asciidoctor-pdf/prawn-svg_ext.rb
 - lib/asciidoctor-pdf/prawn-svg_ext/interface.rb
 - lib/asciidoctor-pdf/prawn-table_ext.rb
 - lib/asciidoctor-pdf/prawn-table_ext/cell/asciidoc.rb
 - lib/asciidoctor-pdf/prawn-table_ext/cell/text.rb
+- lib/asciidoctor-pdf/prawn-templates_ext.rb
 - lib/asciidoctor-pdf/prawn_ext.rb
 - lib/asciidoctor-pdf/prawn_ext/coderay_encoder.rb
 - lib/asciidoctor-pdf/prawn_ext/extensions.rb
@@ -246,6 +254,7 @@ files:
 - lib/asciidoctor-pdf/sanitizer.rb
 - lib/asciidoctor-pdf/temporary_path.rb
 - lib/asciidoctor-pdf/theme_loader.rb
+- lib/asciidoctor-pdf/ttfunk_ext.rb
 - lib/asciidoctor-pdf/version.rb
 homepage: https://github.com/asciidoctor/asciidoctor-pdf
 licenses: