asciidoctor-pdf 1.5.0.alpha.16 → 1.5.0.alpha.17

data/lib/asciidoctor-pdf/formatted_text/parser.treetop

@@ -1,6 +1,6 @@
 # regenerate parser.rb using `tt parser.treetop`
 module Asciidoctor
-module Pdf
+module PDF
 module FormattedText
 grammar Markup
   rule text
@@ -8,7 +8,7 @@ grammar Markup
   end
 
   rule complex
-    (cdata / element / entity)* {
+    (cdata / element / charref)* {
       def content
         elements.map {|e| e.content }
       end
@@ -95,25 +95,32 @@ grammar Markup
     }
   end
 
-  rule entity
-    '&' ('#' entity_number / entity_name) ';' {
+  rule charref
+    '&' ('#' character_decimal / '#x' character_hex / character_name) ';' {
       def content
-        if (entity_value = elements[1]).terminal?
-          { type: :entity, name: entity_value.text_value.to_sym }
+        if (ref_data = elements[1]).terminal?
+          { type: :charref, reference_type: :name, value: ref_data.text_value.to_sym }
+        elsif ref_data.elements[0].text_value == '#'
+          { type: :charref, reference_type: :decimal, value: ref_data.elements[1].text_value.to_i }
         else
-          { type: :entity, number: entity_value.elements[1].text_value.to_i }
+          { type: :charref, reference_type: :hex, value: ref_data.elements[1].text_value }
         end
       end
     }
   end
 
-  rule entity_number
+  rule character_decimal
     # NOTE 6 decimals only supported in Asciidoctor 1.5.5 and up
     [0-9] 2..6
   end
 
-  rule entity_name
-    'amp' / 'apos' / 'gt' / 'lt' / 'quot'
+  rule character_hex
+    # NOTE 5 hexadecimals only supported in Asciidoctor 1.5.5 and up
+    [0-9a-f] 2..5
+  end
+
+  rule character_name
+    'amp' / 'apos' / 'gt' / 'lt' / 'nbsp' / 'quot'
   end
 
   rule spaces

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

@@ -1,18 +1,20 @@
 module Asciidoctor
-module Pdf
+module PDF
 module FormattedText
 class Transform
-  LF = %(\n)
+  LF = ?\n
+  ZeroWidthSpace = ?\u200b
   CharEntityTable = {
-    lt: '<',
-    gt: '>',
-    amp: '&',
-    quot: '"',
-    apos: '\''
+    amp: ?&,
+    apos: ?',
+    gt: ?>,
+    lt: ?<,
+    nbsp: ?\u00a0,
+    quot: ?",
   }
-  CharRefRx = /&(?:#(\d{2,6})|(#{CharEntityTable.keys * '|'}));/
+  CharRefRx = /&(?:(#{CharEntityTable.keys * ?|})|#(?:(\d\d\d{0,4})|x([a-f\d][a-f\d][a-f\d]{0,3})));/
   TextDecorationTable = { 'underline' => :underline, 'line-through' => :strikethrough }
-  #DummyText = %(\u0000)
+  #DummyText = ?\u0000
 
   def initialize(options = {})
     @merge_adjacent_text_nodes = options[:merge_adjacent_text_nodes]
@@ -75,7 +77,8 @@ class Transform
             fragment = {
               image_path: attributes[:tmp] == 'true' ? attributes[:src].extend(TemporaryPath) : attributes[:src],
               image_format: attributes[:format],
-              text: attributes[:alt],
+              # a zero-width space in the text will cause the image to be duplicated
+              text: (attributes[:alt].delete ZeroWidthSpace),
               callback: InlineImageRenderer
             }
             if (img_w = attributes[:width])
@@ -86,22 +89,22 @@ class Transform
           end
         end
       when :text
-        text = node[:value]
-        # NOTE the remaining logic is shared with :entity
         if @merge_adjacent_text_nodes && previous_fragment_is_text
-          fragments << { text: %(#{fragments.pop[:text]}#{text}) }
+          fragments << { text: %(#{fragments.pop[:text]}#{node[:value]}) }
         else
-          fragments << { text: text }
+          fragments << { text: node[:value] }
         end
         previous_fragment_is_text = true
-      when :entity
-        if (name = node[:name])
-          text = CharEntityTable[name]
+      when :charref
+        if (ref_type = node[:reference_type]) == :name
+          text = CharEntityTable[node[:value]]
+        elsif ref_type == :decimal
+          # FIXME AFM fonts do not include a thin space glyph; set fallback_fonts to allow glyph to be resolved
+          text = [node[:value]].pack('U1')
         else
           # FIXME AFM fonts do not include a thin space glyph; set fallback_fonts to allow glyph to be resolved
-          text = [node[:number]].pack('U*')
+          text = [(node[:value].to_i 16)].pack('U1')
         end
-        # NOTE the remaining logic is shared with :text
         if @merge_adjacent_text_nodes && previous_fragment_is_text
           fragments << { text: %(#{fragments.pop[:text]}#{text}) }
         else
@@ -161,6 +164,13 @@ class Transform
           fragment[:size] = value
         end
       end
+      if (value = attrs[:width])
+        fragment[:width] = value
+        if (value = attrs[:align])
+          fragment[:align] = value.to_sym
+          fragment[:callback] = InlineTextAligner
+        end
+      end
       #if !fragment[:character_spacing] && (value = attrs[:character_spacing])
       #  fragment[:character_spacing] = value.to_f
       #end
@@ -173,7 +183,7 @@ class Transform
           fragment[:anchor] = value
         elsif (value = attrs[:href])
           fragment[:link] = value.include?(';') ? value.gsub(CharRefRx) {
-            $2 ? CharEntityTable[$2.to_sym] : [$1.to_i].pack('U*')
+            $1 ? CharEntityTable[$1.to_sym] : [$2 ? $2.to_i : ($3.to_i 16)].pack('U1')
           } : value
         elsif (value = attrs[:name])
           # NOTE text is null character, which is used as placeholder text so Prawn doesn't drop fragment

data/lib/asciidoctor-pdf/implicit_header_processor.rb

@@ -1,7 +1,7 @@
 require 'asciidoctor/extensions'
 
 module Asciidoctor
-module Pdf
+module PDF
 # An include processor that skips the implicit author line below
 # the document title within include documents.
 class ImplicitHeaderProcessor < ::Asciidoctor::Extensions::IncludeProcessor
@@ -59,5 +59,5 @@ end
 end
 
 Asciidoctor::Extensions.register :pdf do
-  include_processor Asciidoctor::Pdf::ImplicitHeaderProcessor if @document.backend == 'pdf'
+  include_processor Asciidoctor::PDF::ImplicitHeaderProcessor if @document.backend == 'pdf'
 end

data/lib/asciidoctor-pdf/index_catalog.rb

@@ -1,5 +1,7 @@
-module Asciidoctor; module Pdf
+module Asciidoctor; module PDF
   class IndexCatalog
+    LeadingAlphaRx = /^\p{Alpha}/
+
     attr_accessor :start_page_number
 
     def initialize
@@ -7,7 +9,7 @@ module Asciidoctor; module Pdf
       @start_page_number = 1
       @dests = {}
     end
-  
+
     def store_term names, dest = nil
       if (num_terms = names.size) > 2
         store_tertiary_term names[0], names[1], names[2], dest
@@ -17,27 +19,27 @@ module Asciidoctor; module Pdf
         store_primary_term names[0], dest
       end
     end
-  
+
     def store_primary_term name, dest = nil
       store_dest dest if dest
       (init_category name.chr.upcase).store_term name, dest
     end
-  
+
     def store_secondary_term primary_name, secondary_name, dest = nil
       store_dest dest if dest
       (store_primary_term primary_name).store_term secondary_name, dest
     end
-  
+
     def store_tertiary_term primary_name, secondary_name, tertiary_name, dest = nil
       store_dest dest if dest
       (store_secondary_term primary_name, secondary_name).store_term tertiary_name, dest
     end
-  
+
     def init_category name
-      name = '@' if (ord = name.ord) < 65 || ord > 90
+      name = '@' unless LeadingAlphaRx =~ name
       @categories[name] ||= (IndexTermCategory.new name)
     end
-  
+
     def find_category name
       @categories[name]
     end
@@ -51,7 +53,7 @@ module Asciidoctor; module Pdf
         dest[:page] = physical_page_number - (@start_page_number - 1)
       end
     end
-  
+
     def empty?
       @categories.empty?
     end
@@ -60,26 +62,26 @@ module Asciidoctor; module Pdf
       @categories.empty? ? [] : @categories.values.sort
     end
   end
-  
+
   class IndexTermGroup
     include Comparable
     attr_reader :name
-  
+
     def initialize name
-      @name = name 
+      @name = name
       @terms = {}
     end
-  
+
     def store_term name, dest = nil
       term = (@terms[name] ||= (IndexTerm.new name))
       term.add_dest dest if dest
       term
     end
-  
+
     def find_term name
       @terms[name]
     end
-  
+
     def terms
       @terms.empty? ? [] : @terms.values.sort
     end
@@ -88,30 +90,30 @@ module Asciidoctor; module Pdf
       @name <=> other.name
     end
   end
-  
+
   class IndexTermCategory < IndexTermGroup; end
-  
+
   class IndexTerm < IndexTermGroup
     def initialize name
       super
       @dests = ::Set.new
     end
-  
-    alias :subterms :terms
-  
+
+    alias subterms terms
+
     def add_dest dest
       @dests << dest
       self
     end
-  
+
     def dests
       @dests.select {|d| d.key? :page }.sort {|a, b| a[:page] <=> b[:page] }
     end
-  
+
     def container?
       @dests.empty? || @dests.none? {|d| d.key? :page }
     end
-  
+
     def leaf?
       @terms.empty?
     end

data/lib/asciidoctor-pdf/measurements.rb

@@ -1,4 +1,4 @@
-module Asciidoctor; module Pdf
+module Asciidoctor; module PDF
   module Measurements
     MeasurementValueRx = /(\d+|\d*\.\d+)(in|mm|cm|p[txc])?$/
     InsetMeasurementValueRx = /(?<=^| |\()(-?\d+(?:\.\d+)?)(in|mm|cm|p[txc])(?=$| |\))/

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

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

data/lib/asciidoctor-pdf/pdfmark.rb

@@ -1,7 +1,7 @@
 module Asciidoctor
-module Pdf
+module PDF
 class Pdfmark
-  include ::Asciidoctor::Pdf::Sanitizer
+  include ::Asciidoctor::PDF::Sanitizer
 
   def initialize doc
     @doc = doc
@@ -10,23 +10,23 @@ class Pdfmark
   def generate
     doc = @doc
     # FIXME use sanitize: :plain_text once available
-    content = <<-EOS
-[ /Title #{sanitize(doc.doctitle use_fallback: true).to_pdf}
-  /Author #{(doc.attr 'authors').to_pdf}
-  /Subject #{(doc.attr 'subject').to_pdf}
-  /Keywords #{(doc.attr 'keywords').to_pdf}
-  /ModDate #{date = ::Time.now.to_pdf}
-  /CreationDate #{date}
-  /Creator (Asciidoctor PDF #{::Asciidoctor::Pdf::VERSION}, based on Prawn #{::Prawn::VERSION})
-  /Producer #{(doc.attr 'publisher').to_pdf}
-  /DOCINFO pdfmark
+    content = <<~EOS
+    [ /Title #{sanitize(doc.doctitle use_fallback: true).to_pdf}
+      /Author #{(doc.attr 'authors').to_pdf}
+      /Subject #{(doc.attr 'subject').to_pdf}
+      /Keywords #{(doc.attr 'keywords').to_pdf}
+      /ModDate #{date = ::Time.now.to_pdf}
+      /CreationDate #{date}
+      /Creator (Asciidoctor PDF #{::Asciidoctor::PDF::VERSION}, based on Prawn #{::Prawn::VERSION})
+      /Producer #{(doc.attr 'publisher').to_pdf}
+      /DOCINFO pdfmark
     EOS
     content
   end
 
   def generate_file pdf_file
     # QUESTION should we use the extension pdfmeta to be more clear?
-    ::IO.write %(#{pdf_file}mark), generate
+    ::File.write %(#{pdf_file}mark), generate
   end
 end
 end

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

@@ -1,4 +1,4 @@
-require 'prawn-svg' unless defined? Prawn::Svg::VERSION
+require 'prawn-svg' unless defined? Prawn::SVG::Interface
 require_relative 'prawn-svg_ext/interface'
 # NOTE disable system fonts since they're non-portable
-Prawn::Svg::Interface.font_path.clear
+Prawn::SVG::Interface.font_path.clear

data/lib/asciidoctor-pdf/prawn-svg_ext/interface.rb

@@ -1,4 +1,4 @@
-module Prawn; module Svg
+module Prawn; module SVG
   class Interface
     def resize opts = {}
       sizing = document.sizing
@@ -7,4 +7,4 @@ module Prawn; module Svg
       sizing.calculate
     end
   end
-end; end unless Prawn::Svg::Interface.method_defined? :resize
+end; end unless Prawn::SVG::Interface.method_defined? :resize

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

@@ -1,3 +1,4 @@
 require 'prawn/table' unless defined? Prawn::Table::VERSION
+require_relative 'prawn-table_ext/cell'
 require_relative 'prawn-table_ext/cell/asciidoc'
 require_relative 'prawn-table_ext/cell/text'

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

@@ -0,0 +1,60 @@
+class Prawn::Table::Cell
+  remove_method :draw_borders
+  # Draws borders around the cell. Borders are centered on the bounds of
+  # the cell outside of any padding, so the caller is responsible for
+  # setting appropriate padding to ensure the border does not overlap with
+  # cell content.
+  #
+  def draw_borders(pt)
+    x, y = pt
+
+    @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]
+        border_width = @border_widths[idx]
+        border_line  = @border_lines[idx]
+
+        next unless border_width > 0
+
+        # Left and right borders are drawn one-half border beyond the center
+        # of the corner, so that the corners end up square.
+        from, to = case border
+                   when :top
+                     [[x, y], [x+width, y]]
+                   when :bottom
+                     [[x, y-height], [x+width, y-height]]
+                   when :left
+                     [[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)]]
+                   end
+
+        case border_line
+        when :dashed
+          @pdf.dash border_width * 4
+        when :dotted
+          @pdf.dash border_width, space: border_width * 2
+        when :solid
+          # normal line style
+        else
+          raise ::ArgumentError, 'border_line must be :solid, :dotted or :dashed'
+        end
+
+        @pdf.line_width = border_width
+        if border_color == 'transparent'
+          @pdf.stroke_color = '000000'
+          @pdf.transparent 0 do
+            @pdf.stroke_line(from, to)
+          end
+        else
+          @pdf.stroke_color = border_color
+          @pdf.stroke_line(from, to)
+        end
+        @pdf.undash
+      end
+    end
+  end
+end

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

@@ -4,9 +4,9 @@ class Prawn::Table::Cell::Text
   def draw_content
     with_font do
       with_text_color do
-        (text_box :width => spanned_content_width + FPTolerance,
-            :height => spanned_content_height + FPTolerance,
-            :at => [0, @pdf.cursor]).render
+        (text_box width: spanned_content_width + FPTolerance,
+            height: spanned_content_height + FPTolerance,
+            at: [0, @pdf.cursor]).render
       end
     end
   end