asciidoctor-pdf 1.5.0.beta.8 → 1.5.0.rc.1

data/lib/asciidoctor/pdf/ext.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require_relative 'ext/core'
+require_relative 'ext/asciidoctor'
+require_relative 'ext/pdf-core'
+require_relative 'ext/prawn'
+require_relative 'ext/prawn-svg'
+require_relative 'ext/prawn-table'
+require_relative 'ext/prawn-templates'

data/lib/asciidoctor/pdf/ext/asciidoctor.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # NOTE these are either candidates for inclusion in Asciidoctor core or backports
 require_relative 'asciidoctor/logging_shim' unless defined? Asciidoctor::Logging
 require_relative 'asciidoctor/abstract_node'

data/lib/asciidoctor/pdf/ext/asciidoctor/abstract_block.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Asciidoctor::AbstractBlock
   def sections?
     !sections.empty?

data/lib/asciidoctor/pdf/ext/asciidoctor/abstract_node.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Asciidoctor::AbstractNode
   def remove_attr name
     @attributes.delete name

data/lib/asciidoctor/pdf/ext/asciidoctor/document.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Asciidoctor::Document
   alias catalog references unless method_defined? :catalog
 end

data/lib/asciidoctor/pdf/ext/asciidoctor/image.rb

@@ -1,25 +1,27 @@
 # frozen_string_literal: true
+
 module Asciidoctor
-module Image
-  DataUriRx = /^data:image\/(?<fmt>png|jpe?g|gif|pdf|bmp|tiff);base64,(?<data>.*)$/
+  module Image
+    DataUriRx = /^data:image\/(?<fmt>png|jpe?g|gif|pdf|bmp|tiff|svg\+xml);base64,(?<data>.*)$/
+    FormatAliases = { 'jpg' => 'jpeg', 'svg+xml' => 'svg' }
 
-  class << self
-    def format path, attributes = nil
-      (attributes && attributes['format']) || ((ext = ::File.extname path).downcase.slice 1, ext.length)
+    class << self
+      def format path, attributes = nil
+        (attributes && attributes['format']) || ((ext = ::File.extname path).downcase.slice 1, ext.length)
+      end
     end
-  end
 
-  def format
-    (attr 'format', nil, false) || ((ext = ::File.extname(inline? ? target : (attr 'target'))).downcase.slice 1, ext.length)
-  end
+    def format
+      (attr 'format', nil, false) || ((ext = ::File.extname(inline? ? target : (attr 'target'))).downcase.slice 1, ext.length)
+    end
 
-  def target_and_format
-    image_path = inline? ? target : (attr 'target')
-    if (image_path.start_with? 'data:') && (m = DataUriRx.match image_path)
-      [(m[:data].extend ::Base64), m[:fmt]]
-    else
-      [image_path, (attr 'format', nil, false) || ((ext = ::File.extname image_path).downcase.slice 1, ext.length)]
+    def target_and_format
+      image_path = inline? ? target : (attr 'target')
+      if (image_path.start_with? 'data:') && (m = DataUriRx.match image_path)
+        [(m[:data].extend ::Base64), (FormatAliases.fetch m[:fmt], m[:fmt])]
+      else
+        [image_path, (attr 'format', nil, false) || ((ext = ::File.extname image_path).downcase.slice 1, ext.length)]
+      end
     end
   end
 end
-end

data/lib/asciidoctor/pdf/ext/asciidoctor/list.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
-# TODO add these methods to Asciidoctor core
+
+# TODO: add these methods to Asciidoctor core
 class Asciidoctor::List
   # Check whether this list is an outline list (unordered or ordered).
   #
@@ -24,7 +25,7 @@ class Asciidoctor::List
   def outline_level
     l = 1
     ancestor = self
-    # FIXME does not cross out of AsciiDoc table cell
+    # FIXME: does not cross out of AsciiDoc table cell
     while (ancestor = ancestor.parent)
       l += 1 if Asciidoctor::List === ancestor && ancestor.outline?
     end

data/lib/asciidoctor/pdf/ext/asciidoctor/list_item.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
-# TODO add these methods to Asciidoctor core
+
+# TODO: add these methods to Asciidoctor core
 class Asciidoctor::ListItem
   # Check whether this list item has complex content (i.e., nested blocks other than an outline list).
   #

data/lib/asciidoctor/pdf/ext/asciidoctor/logging_shim.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Asciidoctor
   class StubLogger
     class << self
@@ -7,13 +8,11 @@ module Asciidoctor
       end
 
       def warn message = nil
-        message = block_given? ? yield : message unless message
-        ::Kernel.warn %(asciidoctor: WARNING: #{message})
+        ::Kernel.warn %(asciidoctor: WARNING: #{message || (block_given? ? yield : '???')})
       end
 
       def error message = nil
-        message = block_given? ? yield : message unless message
-        ::Kernel.warn %(asciidoctor: ERROR: #{message})
+        ::Kernel.warn %(asciidoctor: ERROR: #{message || (block_given? ? yield : '???')})
       end
     end
   end

data/lib/asciidoctor/pdf/ext/asciidoctor/section.rb

@@ -1,22 +1,24 @@
 # frozen_string_literal: true
+
 class Asciidoctor::Section
   def numbered_title opts = {}
-    unless (@cached_numbered_title ||= nil)
+    @cached_numbered_title ||= nil
+    unless @cached_numbered_title
       slevel = @level == 0 && @special ? 1 : @level
       if @numbered && !@caption && slevel <= (@document.attr 'sectnumlevels', 3).to_i
         @is_numbered = true
-        @cached_formal_numbered_title = if @document.doctype == 'book'
+        if @document.doctype == 'book'
           if slevel == 0
             @cached_numbered_title = %(#{sectnum nil, ':'} #{title})
-            %(#{@document.attr 'part-signifier', 'Part'} #{@cached_numbered_title}).lstrip
+            @cached_formal_numbered_title = %(#{@document.attr 'part-signifier', 'Part'} #{@cached_numbered_title}).lstrip
           elsif slevel == 1
             @cached_numbered_title = %(#{sectnum} #{title})
-            %(#{@document.attr 'chapter-signifier', (@document.attr 'chapter-label', 'Chapter')} #{@cached_numbered_title}).lstrip
+            @cached_formal_numbered_title = %(#{@document.attr 'chapter-signifier', (@document.attr 'chapter-label', 'Chapter')} #{@cached_numbered_title}).lstrip
           else
-            @cached_numbered_title = %(#{sectnum} #{title})
+            @cached_formal_numbered_title = @cached_numbered_title = %(#{sectnum} #{title})
           end
         else
-          @cached_numbered_title = %(#{sectnum} #{title})
+          @cached_formal_numbered_title = @cached_numbered_title = %(#{sectnum} #{title})
         end
       elsif slevel == 0
         @is_numbered = false

data/lib/asciidoctor/pdf/ext/core.rb

@@ -1,7 +1,9 @@
 # frozen_string_literal: true
+
 require_relative 'core/object'
 require_relative 'core/array'
 require_relative 'core/hash'
 require_relative 'core/numeric'
 require_relative 'core/string'
 require_relative 'core/regexp'
+require_relative 'core/quantifiable_stdout'

data/lib/asciidoctor/pdf/ext/core/array.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Array
   def delete_all *entries
     entries.map {|entry| delete entry }.compact

data/lib/asciidoctor/pdf/ext/core/hash.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Hash
   def compact
     select {|_, val| val }

data/lib/asciidoctor/pdf/ext/core/numeric.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # NOTE remove once minimum required Ruby version is at least 2.4
 Float.prepend (Module.new do
   def truncate *args
@@ -6,10 +7,10 @@ Float.prepend (Module.new do
       if (precision = Integer args.shift) == 0
         super
       elsif precision > 0
-        precision_factor = 10.0 ** precision
+        precision_factor = 10.0**precision
         (self * precision_factor).to_i / precision_factor
       else
-        precision_factor = 10 ** precision.abs
+        precision_factor = 10**precision.abs
         (self / precision_factor).to_i * precision_factor
       end
     else
@@ -19,7 +20,7 @@ Float.prepend (Module.new do
 end) if (Float.instance_method :truncate).arity == 0
 
 Integer.prepend (Module.new do
-  def truncate *args
+  def truncate *_args
     super()
   end
 end) if (Integer.instance_method :truncate).arity == 0

data/lib/asciidoctor/pdf/ext/core/object.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Object
   # Convert the object to a serialized PDF object.
   def to_pdf_object

data/lib/asciidoctor/pdf/ext/core/quantifiable_stdout.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'delegate'
 
 # A delegator that allows the size method to be used on the STDOUT object.
@@ -12,10 +13,16 @@ class QuantifiableStdout < SimpleDelegator
   def initialize delegate
     @size = 0
     super
+    delegate.binmode
+  end
+
+  def << content
+    @size += content.to_s.bytesize
+    super
   end
 
   def write content
-    @size += content.bytesize
+    @size += content.to_s.bytesize
     super
   end
 end

data/lib/asciidoctor/pdf/ext/core/regexp.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Regexp
   alias match? === unless Regexp.method_defined? :match?
 end

data/lib/asciidoctor/pdf/ext/core/string.rb

@@ -1,13 +1,12 @@
 # frozen_string_literal: true
+
 class String
   def pred
-    begin
-      # integers
-      %(#{(Integer self) - 1})
-    rescue ::ArgumentError
-      # chars (upper alpha, lower alpha, lower greek)
-      ([65, 97, 945].include? ord) ? '0' : ([ord - 1].pack 'U1')
-    end
+    # integers
+    ((Integer self) - 1).to_s
+  rescue ::ArgumentError
+    # chars (upper alpha, lower alpha, lower greek)
+    ([65, 97, 945].include? ord) ? '0' : ([ord - 1].pack 'U1')
   end unless method_defined? :pred
 
   # If the string is ASCII only, convert it to a PDF LiteralString object. Otherwise, return self.

data/lib/asciidoctor/pdf/ext/pdf-core.rb

@@ -1,3 +1,4 @@
 # frozen_string_literal: true
+
 require_relative 'pdf-core/pdf_object'
 require_relative 'pdf-core/page'

data/lib/asciidoctor/pdf/ext/pdf-core/page.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class PDF::Core::Page
   InitialPageContent = %(q\n)
 
@@ -11,10 +12,8 @@ class PDF::Core::Page
   # see https://github.com/prawnpdf/pdf-core/commit/67f9a08a03bcfcc5a24cf76b135c218d3d3ab05d
   def new_content_stream
     return if in_stamp_stream?
-    unless Array === dictionary.data[:Contents]
-      dictionary.data[:Contents] = [content]
-    end
-    @content = document.ref Hash.new
+    dictionary.data[:Contents] = [content] unless Array === dictionary.data[:Contents]
+    @content = document.ref({})
     dictionary.data[:Contents] << document.state.store[@content]
     document.open_graphics_state
   end unless method_defined? :new_content_stream

data/lib/asciidoctor/pdf/ext/pdf-core/pdf_object.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
+
 unless (defined? PDF::Core.pdf_object) == 'method'
   module PDF::Core
     alias pdf_object PdfObject
-    module_function :pdf_object
+    module_function :pdf_object # rubocop:disable Style/AccessModifierDeclarations
   end
 end

data/lib/asciidoctor/pdf/ext/prawn-svg.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'prawn-svg' unless defined? Prawn::SVG::Interface
 require_relative 'prawn-svg/interface'
 # NOTE disable system fonts since they're non-portable

data/lib/asciidoctor/pdf/ext/prawn-svg/interface.rb

@@ -1,11 +1,14 @@
 # frozen_string_literal: true
-module Prawn; module SVG
-  class Interface
-    def resize opts = {}
-      sizing = document.sizing
-      sizing.requested_width = opts[:width]
-      sizing.requested_height = opts[:height]
-      sizing.calculate
+
+module Prawn
+  module SVG
+    class Interface
+      def resize opts = {}
+        sizing = document.sizing
+        sizing.requested_width = opts[:width]
+        sizing.requested_height = opts[:height]
+        sizing.calculate
+      end
     end
   end
-end; end unless Prawn::SVG::Interface.method_defined? :resize
+end unless Prawn::SVG::Interface.method_defined? :resize

data/lib/asciidoctor/pdf/ext/prawn-table.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
-require 'prawn/table' unless defined? Prawn::Table::VERSION
+
+require ENV['PRAWN_TABLE_REQUIRE_PATH'] || 'prawn/table' unless defined? Prawn::Table::VERSION
 require_relative 'prawn-table/cell'
 require_relative 'prawn-table/cell/asciidoc'
 require_relative 'prawn-table/cell/text'

data/lib/asciidoctor/pdf/ext/prawn-table/cell.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Prawn::Table::Cell
   remove_method :draw_borders
   # Draws borders around the cell. Borders are centered on the bounds of
@@ -6,10 +7,10 @@ class Prawn::Table::Cell
   # setting appropriate padding to ensure the border does not overlap with
   # cell content.
   #
-  def draw_borders(pt)
+  def draw_borders pt
     x, y = pt
 
-    @pdf.mask(:line_width, :stroke_color) do
+    @pdf.mask :line_width, :stroke_color do
       @borders.each do |border|
         idx = { top: 0, right: 1, bottom: 2, left: 3 }[border]
         border_color = @border_colors[idx]
@@ -22,15 +23,13 @@ class Prawn::Table::Cell
         # of the corner, so that the corners end up square.
         from, to = case border
                    when :top
-                     [[x, y], [x+width, y]]
+                     [[x, y], [x + width, y]]
                    when :bottom
-                     [[x, y-height], [x+width, y-height]]
+                     [[x, y - height], [x + width, y - height]]
                    when :left
-                     [[x, y + (border_top_width / 2.0)],
-                      [x, y - height - (border_bottom_width / 2.0)]]
+                     [[x, y + (border_top_width / 2.0)], [x, y - height - (border_bottom_width / 2.0)]]
                    when :right
-                     [[x+width, y + (border_top_width / 2.0)],
-                      [x+width, y - height - (border_bottom_width / 2.0)]]
+                     [[x + width, y + (border_top_width / 2.0)], [x + width, y - height - (border_bottom_width / 2.0)]]
                    end
 
         case border_line
@@ -48,11 +47,11 @@ class Prawn::Table::Cell
         if border_color == 'transparent'
           @pdf.stroke_color = '000000'
           @pdf.transparent 0 do
-            @pdf.stroke_line(from, to)
+            @pdf.stroke_line from, to
           end
         else
           @pdf.stroke_color = border_color
-          @pdf.stroke_line(from, to)
+          @pdf.stroke_line from, to
         end
         @pdf.undash
       end

data/lib/asciidoctor/pdf/ext/prawn-table/cell/asciidoc.rb

@@ -1,71 +1,76 @@
 # frozen_string_literal: true
-module Prawn; class Table; class Cell
-  class AsciiDoc < Cell
-    attr_accessor :align
-    attr_accessor :valign
 
-    def initialize pdf, opts = {}
-      @font_options = {}
-      super pdf, [], opts
-    end
+module Prawn
+  class Table
+    class Cell
+      class AsciiDoc < Cell
+        attr_accessor :align
+        attr_accessor :valign
 
-    def font_style= val
-      @font_options[:style] = val
-    end
+        def initialize pdf, opts = {}
+          @font_options = {}
+          super pdf, [], opts
+        end
 
-    def text_color= val
-      @font_options[:color] = val
-    end
+        def font_style= val
+          @font_options[:style] = val
+        end
 
-    def size= val
-      @font_options[:size] = val
-    end
+        def text_color= val
+          @font_options[:color] = val
+        end
 
-    def font= val
-      @font_options[:family] = val
-    end
+        def size= val
+          @font_options[:size] = val
+        end
 
-    # NOTE automatic image sizing only works if cell has fixed width
-    def dry_run
-      cell = self
-      max_height = nil
-      height, _, _ = @pdf.dry_run do
-        max_height = bounds.height
-        # NOTE we should be able to use cell.max_width, but returns 0 in some conditions (like when colspan > 1)
-        indent cell.padding_left, bounds.width - cell.width + cell.padding_right do
-          # HACK force margin_top to be applied
-          move_down 0.0001
-          # TODO truncate margin bottom of last block
-          convert_content_for_block cell.content
+        def font= val
+          @font_options[:family] = val
         end
-      end
-      # FIXME prawn-table doesn't support cell taller than a single page
-      [max_height, height].min
-    end
 
-    def natural_content_width
-      # QUESTION can we get a better estimate of the natural width?
-      @natural_width ||= (@pdf.bounds.width - padding_left - padding_right)
-    end
+        # NOTE: automatic image sizing only works if cell has fixed width
+        def dry_run
+          cell = self
+          max_height = nil
+          height, = @pdf.dry_run do
+            max_height = bounds.height
+            # NOTE: we should be able to use cell.max_width, but returns 0 in some conditions (like when colspan > 1)
+            indent cell.padding_left, bounds.width - cell.width + cell.padding_right do
+              # HACK: force margin_top to be applied
+              move_down 0.0001
+              # TODO: truncate margin bottom of last block
+              traverse cell.content
+            end
+          end
+          # FIXME: prawn-table doesn't support cell taller than a single page
+          [max_height, height].min
+        end
 
-    def natural_content_height
-      # NOTE when natural_content_height is called, we already know max width
-      @natural_height ||= dry_run
-    end
+        def natural_content_width
+          # QUESTION can we get a better estimate of the natural width?
+          @natural_content_width ||= (@pdf.bounds.width - padding_left - padding_right)
+        end
+
+        def natural_content_height
+          # NOTE when natural_content_height is called, we already know max width
+          @natural_content_height ||= dry_run
+        end
 
-    def draw_content
-      pdf = @pdf
-      # NOTE draw_bounded_content automatically adds FPTolerance to width and height
-      pdf.bounds.instance_variable_set :@width, spanned_content_width
-      # NOTE we've already reserved the space, so just let the box stretch to the bottom of the page to avoid overflow
-      pdf.bounds.instance_variable_set :@height, pdf.y
-      if @valign != :top && (excess_y = spanned_content_height - natural_content_height) > 0
-        pdf.move_down(@valign == :center ? (excess_y.fdiv 2) : excess_y)
+        def draw_content
+          pdf = @pdf
+          # NOTE draw_bounded_content automatically adds FPTolerance to width and height
+          pdf.bounds.instance_variable_set :@width, spanned_content_width
+          # NOTE we've already reserved the space, so just let the box stretch to the bottom of the page to avoid overflow
+          pdf.bounds.instance_variable_set :@height, pdf.y
+          if @valign != :top && (excess_y = spanned_content_height - natural_content_height) > 0
+            pdf.move_down(@valign == :center ? (excess_y.fdiv 2) : excess_y)
+          end
+          # TODO: apply horizontal alignment (right now must use alignment on content block)
+          # QUESTION inherit table cell font properties?
+          pdf.traverse content
+          nil
+        end
       end
-      # TODO apply horizontal alignment (right now must use alignment on content block)
-      # QUESTION inherit table cell font properties?
-      pdf.convert_content_for_block content
-      nil
     end
   end
-end; end; end
+end