asciidoctor-pdf 1.5.0.alpha.17 → 1.5.0.beta.1

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

@@ -0,0 +1,5 @@
+class Hash
+  def compact
+    select {|_, val| val }
+  end unless method_defined? :compact
+end

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

@@ -0,0 +1,3 @@
+class Regexp
+  alias match? === unless Regexp.method_defined? :match?
+end

data/lib/asciidoctor-pdf/core_ext.rb

@@ -1,4 +1,6 @@
 require_relative 'core_ext/object'
 require_relative 'core_ext/array'
+require_relative 'core_ext/hash'
 require_relative 'core_ext/numeric'
 require_relative 'core_ext/string'
+require_relative 'core_ext/regexp'

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

@@ -19,7 +19,7 @@ class Formatter
   def format string, *args
     options = args[0] || {}
     string = string.tr_s(WHITESPACE, ' ') if options[:normalize]
-    return [text: string] unless string.match(FormattingSnifferPattern)
+    return [text: string] unless FormattingSnifferPattern.match? string
     if (parsed = @parser.parse(string))
       @transform.apply(parsed.content)
     else
@@ -27,6 +27,13 @@ class Formatter
       [text: string]
     end
   end
+
+  # The original purpose of this method is to split paragraphs, but our formatter only works on paragraphs that have
+  # been presplit. Therefore, we just need to wrap the fragments in a single-element array (representing a single
+  # paragraph) and return them.
+  def array_paragraphs fragments
+    [fragments]
+  end
 end
 end
 end

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

@@ -66,7 +66,9 @@ module InlineImageArranger
           svg_obj = ::Prawn::SVG::Interface.new ::File.read(image_path), doc,
               at: doc.bounds.top_left,
               width: image_w,
-              fallback_font_name: doc.default_svg_font
+              fallback_font_name: doc.default_svg_font,
+              enable_web_requests: doc.allow_uri_read,
+              enable_file_requests_with_root: (::File.dirname image_path)
           svg_size = image_w ? svg_obj.document.sizing :
               # NOTE convert intrinsic dimensions to points; constrain to content width
               (svg_obj.resize width: [(to_pt svg_obj.document.sizing.output_width, :px), available_w].min)

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

@@ -356,44 +356,44 @@ module Markup
       r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
       r0 = r1
     else
-      if (match_len = has_terminal?('code', false, index))
+      if (match_len = has_terminal?('strong', false, index))
         r2 = instantiate_node(SyntaxNode,input, index...(index + match_len))
         @index += match_len
       else
-        terminal_parse_failure('code')
+        terminal_parse_failure('strong')
         r2 = nil
       end
       if r2
         r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
         r0 = r2
       else
-        if (match_len = has_terminal?('color', false, index))
+        if (match_len = has_terminal?('em', false, index))
           r3 = instantiate_node(SyntaxNode,input, index...(index + match_len))
           @index += match_len
         else
-          terminal_parse_failure('color')
+          terminal_parse_failure('em')
           r3 = nil
         end
         if r3
           r3 = SyntaxNode.new(input, (index-1)...index) if r3 == true
           r0 = r3
         else
-          if (match_len = has_terminal?('del', false, index))
+          if (match_len = has_terminal?('code', false, index))
             r4 = instantiate_node(SyntaxNode,input, index...(index + match_len))
             @index += match_len
           else
-            terminal_parse_failure('del')
+            terminal_parse_failure('code')
             r4 = nil
           end
           if r4
             r4 = SyntaxNode.new(input, (index-1)...index) if r4 == true
             r0 = r4
           else
-            if (match_len = has_terminal?('em', false, index))
+            if (match_len = has_terminal?('color', false, index))
               r5 = instantiate_node(SyntaxNode,input, index...(index + match_len))
               @index += match_len
             else
-              terminal_parse_failure('em')
+              terminal_parse_failure('color')
               r5 = nil
             end
             if r5
@@ -422,11 +422,11 @@ module Markup
                   r7 = SyntaxNode.new(input, (index-1)...index) if r7 == true
                   r0 = r7
                 else
-                  if (match_len = has_terminal?('strong', false, index))
+                  if (match_len = has_terminal?('button', false, index))
                     r8 = instantiate_node(SyntaxNode,input, index...(index + match_len))
                     @index += match_len
                   else
-                    terminal_parse_failure('strong')
+                    terminal_parse_failure('button')
                     r8 = nil
                   end
                   if r8
@@ -455,8 +455,20 @@ module Markup
                         r10 = SyntaxNode.new(input, (index-1)...index) if r10 == true
                         r0 = r10
                       else
-                        @index = i0
-                        r0 = nil
+                        if (match_len = has_terminal?('del', false, index))
+                          r11 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+                          @index += match_len
+                        else
+                          terminal_parse_failure('del')
+                          r11 = nil
+                        end
+                        if r11
+                          r11 = SyntaxNode.new(input, (index-1)...index) if r11 == true
+                          r0 = r11
+                        else
+                          @index = i0
+                          r0 = nil
+                        end
                       end
                     end
                   end

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

@@ -51,7 +51,7 @@ grammar Markup
     # QUESTION faster to do regex?
     # QUESTION can we cut stuff we aren't using? what about supporting hr?
     #'a' / 'b' / 'code' / 'color' / 'del' / 'em' / 'font' / 'i' / 'img' / 'link' / 'span' / 'strikethrough' / 'strong' / 'sub' / 'sup' / 'u'
-    'a' / 'code' / 'color' / 'del' / 'em' / 'font' / 'span' / 'strong' / 'sub' / 'sup'
+    'a' / 'strong' / 'em' / 'code' / 'color' / 'font' / 'span' / 'button' / 'sub' / 'sup' / 'del'
   end
 
   rule void_tag_name

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

@@ -0,0 +1,45 @@
+module Asciidoctor::Pdf::FormattedText
+module TextBackgroundAndBorderRenderer
+  module_function
+
+  # render_behind is called before the text is printed
+  def render_behind fragment
+    return if (pdf = fragment.document).scratch?
+    data = fragment.format_state
+    if (border_offset = data[:border_offset])
+      at = [fragment.left - border_offset, fragment.top + border_offset]
+      width = fragment.width + border_offset * 2
+      height = fragment.height + border_offset * 2
+    else
+      at = fragment.top_left
+      width = fragment.width
+      height = fragment.height
+    end
+    border_radius = data[:border_radius]
+    if (background_color = data[:background_color])
+      prev_fill_color = pdf.fill_color
+      pdf.fill_color background_color
+      if border_radius
+        pdf.fill_rounded_rectangle at, width, height, border_radius
+      else
+        pdf.fill_rectangle at, width, height
+      end
+      pdf.fill_color prev_fill_color
+    end
+    if (border_width = data[:border_width])
+      border_color = data[:border_color]
+      prev_stroke_color = pdf.stroke_color
+      prev_line_width = pdf.line_width
+      pdf.stroke_color border_color
+      pdf.line_width border_width
+      if border_radius
+        pdf.stroke_rounded_rectangle at, width, height, border_radius
+      else
+        pdf.stroke_rectangle at, width, height
+      end
+      pdf.stroke_color prev_stroke_color
+      pdf.line_width prev_line_width
+    end
+  end
+end
+end

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

@@ -20,21 +20,44 @@ class Transform
     @merge_adjacent_text_nodes = options[:merge_adjacent_text_nodes]
     # TODO add support for character spacing
     if (theme = options[:theme])
-      @link_font_settings = {
-        color: theme.link_font_color,
-        font: theme.link_font_family,
-        size: theme.link_font_size,
-        styles: to_styles(theme.link_font_style, theme.link_text_decoration)
-      }.select! {|_, val| val }
-      @monospaced_font_settings = {
-        color: theme.literal_font_color,
-        font: theme.literal_font_family,
-        size: theme.literal_font_size,
-        styles: to_styles(theme.literal_font_style)
-      }.select! {|_, val| val }
+      @theme_settings = {
+        button: {
+          color: theme.button_font_color,
+          font: theme.button_font_family,
+          size: theme.button_font_size,
+          styles: to_styles(theme.button_font_style),
+          background_color: (button_bg_color = theme.button_background_color),
+          border_width: (button_border_width = theme.button_border_width),
+          border_color: button_border_width && (theme.button_border_color || theme.base_border_color),
+          border_offset: (button_bg_or_border = button_bg_color || button_border_width) && theme.button_border_offset,
+          border_radius: button_bg_or_border && theme.button_border_radius,
+          callback: button_bg_or_border && [TextBackgroundAndBorderRenderer],
+        }.compact,
+        code: {
+          color: theme.literal_font_color,
+          font: theme.literal_font_family,
+          size: theme.literal_font_size,
+          styles: to_styles(theme.literal_font_style),
+          background_color: (monospaced_bg_color = theme.literal_background_color),
+          border_width: (monospaced_border_width = theme.literal_border_width),
+          border_color: monospaced_border_width && (theme.literal_border_color || theme.base_border_color),
+          border_offset: (monospaced_bg_or_border = monospaced_bg_color || monospaced_border_width) && theme.literal_border_offset,
+          border_radius: monospaced_bg_or_border && theme.literal_border_radius,
+          callback: monospaced_bg_or_border && [TextBackgroundAndBorderRenderer],
+        }.compact,
+        link: {
+          color: theme.link_font_color,
+          font: theme.link_font_family,
+          size: theme.link_font_size,
+          styles: to_styles(theme.link_font_style, theme.link_text_decoration)
+        }.compact,
+      }
     else
-      @link_font_settings = { color: '0000FF' }
-      @monospaced_font_settings = { font: 'Courier', size: 0.9 }
+      @theme_settings = {
+        button: { font: 'Courier', styles: [:bold].to_set },
+        code: { font: 'Courier', size: 0.9 },
+        link: { color: '0000FF' },
+      }
     end
   end
 
@@ -79,7 +102,7 @@ class Transform
               image_format: attributes[:format],
               # a zero-width space in the text will cause the image to be duplicated
               text: (attributes[:alt].delete ZeroWidthSpace),
-              callback: InlineImageRenderer
+              callback: [InlineImageRenderer],
             }
             if (img_w = attributes[:width])
               fragment[:image_width] = img_w
@@ -123,9 +146,9 @@ class Transform
       styles << :bold
     when :em
       styles << :italic
-    when :code
-      # NOTE prefer old value, except for styles, which should be combined
-      fragment.update(@monospaced_font_settings) {|k, old_v, new_v| k == :styles ? old_v.merge(new_v) : old_v }
+    when :code, :button
+      # NOTE prefer old value, except for styles and callback, which should be combined
+      fragment.update(@theme_settings[tag_name]) {|k, oval, nval| k == :styles ? oval.merge(nval) : (k == :callback ? oval.union(nval) : oval) }
     when :color
       if !fragment[:color]
         if (rgb = attrs[:rgb])
@@ -168,7 +191,7 @@ class Transform
         fragment[:width] = value
         if (value = attrs[:align])
           fragment[:align] = value.to_sym
-          fragment[:callback] = InlineTextAligner
+          (fragment[:callback] ||= []) << InlineTextAligner
         end
       end
       #if !fragment[:character_spacing] && (value = attrs[:character_spacing])
@@ -191,12 +214,12 @@ class Transform
           if (type = attrs[:type])
             fragment[:type] = type.to_sym
           end
-          fragment[:callback] = InlineDestinationMarker
+          (fragment[:callback] ||= []) << InlineDestinationMarker
           visible = false
         end
       end
       # NOTE prefer old value, except for styles, which should be combined
-      fragment.update(@link_font_settings) {|k, old_v, new_v| k == :styles ? old_v.merge(new_v) : old_v } if visible
+      fragment.update(@theme_settings[:link]) {|k, oval, nval| k == :styles ? oval.merge(nval) : oval } if visible
     when :sub
       styles << :subscript
     when :sup

data/lib/asciidoctor-pdf/formatted_text.rb

@@ -7,3 +7,4 @@ require_relative 'formatted_text/inline_destination_marker'
 require_relative 'formatted_text/inline_image_arranger'
 require_relative 'formatted_text/inline_image_renderer'
 require_relative 'formatted_text/inline_text_aligner'
+require_relative 'formatted_text/text_background_and_border_renderer'

data/lib/asciidoctor-pdf/index_catalog.rb

@@ -1,5 +1,6 @@
 module Asciidoctor; module PDF
   class IndexCatalog
+    include Sanitizer
     LeadingAlphaRx = /^\p{Alpha}/
 
     attr_accessor :start_page_number
@@ -8,6 +9,11 @@ module Asciidoctor; module PDF
       @categories = {}
       @start_page_number = 1
       @dests = {}
+      @sequence = 0
+    end
+
+    def next_anchor_name
+      %(__indexterm-#{@sequence += 1})
     end
 
     def store_term names, dest = nil
@@ -22,7 +28,7 @@ module Asciidoctor; module PDF
 
     def store_primary_term name, dest = nil
       store_dest dest if dest
-      (init_category name.chr.upcase).store_term name, dest
+      (init_category uppercase_mb name.chr).store_term name, dest
     end
 
     def store_secondary_term primary_name, secondary_name, dest = nil
@@ -36,8 +42,8 @@ module Asciidoctor; module PDF
     end
 
     def init_category name
-      name = '@' unless LeadingAlphaRx =~ name
-      @categories[name] ||= (IndexTermCategory.new name)
+      name = '@' unless LeadingAlphaRx.match? name
+      @categories[name] ||= IndexTermCategory.new name
     end
 
     def find_category name

data/lib/asciidoctor-pdf/measurements.rb

@@ -48,7 +48,7 @@ module Asciidoctor; module PDF
 
     # Resolve measurement values in the string to PDF points.
     def resolve_measurement_values str
-      if MeasurementValueHintRx =~ str
+      if MeasurementValueHintRx.match? str
         str.gsub(InsetMeasurementValueRx) { to_pt $1.to_f, $2 }
       else
         str

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

@@ -39,7 +39,7 @@ module Extensions
 
   # Returns the effective (writable) width of the page
   #
-  # If inside a fixed-height bounding box, returns height of box.
+  # If inside a bounding box, returns width of box.
   #
   def effective_page_width
     reference_bounds.width
@@ -357,11 +357,19 @@ module Extensions
     end
   end
 
-  # Performs the same work as text except that the first_line_opts
-  # are applied to the first line of text renderered. It's necessary
-  # to use low-level APIs in this method so that we only style the
-  # first line and not the remaining lines (which is the default
-  # behavior in Prawn).
+  # NOTE override built-in draw_indented_formatted_line to insert leading before second line
+  def draw_indented_formatted_line string, opts
+    result = super
+    unless @no_text_printed || @all_text_printed
+      # as of Prawn 1.2.1, we have to handle the line gap after the first line manually
+      move_down opts[:leading]
+    end
+    result
+  end
+
+  # Performs the same work as Prawn::Text.text except that the first_line_opts are applied to the first line of text
+  # renderered. It's necessary to use low-level APIs in this method so we only style the first line and not the
+  # remaining lines (which is the default behavior in Prawn).
   def text_with_formatted_first_line string, first_line_opts, opts
     color = opts.delete :color
     fragments = parse_text string, opts
@@ -378,17 +386,27 @@ module Extensions
     first_line_opts = opts.merge(first_line_opts).merge single_line: true
     box = ::Prawn::Text::Formatted::Box.new fragments, first_line_opts
     # NOTE get remaining_fragments before we add color to fragments on first line
-    remaining_fragments = box.render dry_run: true
+    if (text_indent = opts.delete :indent_paragraphs)
+      remaining_fragments = indent text_indent do
+        box.render dry_run: true
+      end
+    else
+      remaining_fragments = box.render dry_run: true
+    end
     # NOTE color must be applied per-fragment
     if first_line_color
       fragments.each {|fragment| fragment[:color] ||= first_line_color}
     end
-    fill_formatted_text_box fragments, first_line_opts
+    if text_indent
+      indent text_indent do
+        fill_formatted_text_box fragments, first_line_opts
+      end
+    else
+      fill_formatted_text_box fragments, first_line_opts
+    end
     unless remaining_fragments.empty?
       # NOTE color must be applied per-fragment
-      if color
-        remaining_fragments.each {|fragment| fragment[:color] ||= color }
-      end
+      remaining_fragments.each {|fragment| fragment[:color] ||= color } if color
       # as of Prawn 1.2.1, we have to handle the line gap after the first line manually
       move_down opts[:leading]
       remaining_fragments = fill_formatted_text_box remaining_fragments, opts
@@ -730,20 +748,18 @@ module Extensions
     nil
   end
 
-  # Create a new page for the specified image. If the
-  # canvas option is true, the image is stretched to the
-  # edges of the page (full coverage).
+  # Create a new page for the specified image. If the canvas option is true,
+  # the image is positioned relative to the boundaries of the page.
   def image_page file, options = {}
     start_new_page_discretely
-    if options[:canvas]
-      canvas do
-        image file, width: bounds.width, height: bounds.height
-      end
+    image_page_number = page_number
+    if options.delete :canvas
+      canvas { image file, ({ position: :center, vposition: :center }.merge options) }
     else
-      image file, fit: [bounds.width, bounds.height]
+      image file, (options.merge position: :center, vposition: :center, fit: [bounds.width, bounds.height])
     end
-    # FIXME shouldn't this be `go_to_page prev_page_number + 1`?
-    go_to_page page_count
+    # NOTE advance to new page just in case the image function threw off the cursor
+    go_to_page image_page_number
     nil
   end
 

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

@@ -9,10 +9,20 @@ module Images
 
   # Dispatch to suitable image method in Prawn based on file extension.
   def image file, opts = {}
-    # FIXME handle case when SVG is a File or IO object
-    if ::String === file && (file.downcase.end_with? '.svg')
-      opts[:fallback_font_name] ||= default_svg_font if respond_to? :default_svg_font
-      svg((::File.read file), opts)
+    # FIXME handle case when SVG is an IO object
+    if ::String === file && (((opts = opts.dup).delete :format) == 'svg' || (file.downcase.end_with? '.svg'))
+      #opts[:enable_file_requests_with_root] = (::File.dirname file) unless opts.key? :enable_file_requests_with_root
+      #opts[:enable_web_requests] = allow_uri_read if !(opts.key? :enable_web_requests) && (respond_to? :allow_uri_read)
+      #opts[:fallback_font_name] = default_svg_font if !(opts.key? :fallback_font_name) && (respond_to? :default_svg_font)
+      if (opts.key? :fit) && (fit = opts.delete :fit) && !opts[:width] && !opts[:height]
+        svg (::File.read file), opts do |svg_doc|
+          max_width, max_height = fit
+          svg_doc.calculate_sizing requested_width: max_width if max_width && svg_doc.sizing.output_width != max_width
+          svg_doc.calculate_sizing requested_height: max_height if max_height && svg_doc.sizing.output_height > max_height
+        end
+      else
+        svg (::File.read file), opts
+      end
     else
       _initial_image file, opts
     end
@@ -22,9 +32,9 @@ module Images
   #
   # Returns a Hash containing :width and :height keys that map to the image's
   # intrinsic width and height values (in pixels)
-  def intrinsic_image_dimensions path
-    if path.end_with? '.svg'
-      img_obj = ::Prawn::SVG::Interface.new ::File.read(path), self, {}
+  def intrinsic_image_dimensions path, format
+    if format == 'svg'
+      img_obj = ::Prawn::SVG::Interface.new (::File.read path), self, {}
       img_size = img_obj.document.sizing
       { width: img_size.output_width, height: img_size.output_height }
     else
@@ -32,6 +42,7 @@ module Images
       _, img_size = ::File.open(path, 'rb') {|fd| build_image_object fd }
       { width: img_size.width, height: img_size.height }
     end
+  rescue
   end
 end
 

data/lib/asciidoctor-pdf/roman_numeral.rb

@@ -73,6 +73,14 @@ class RomanNumeral
     @integer_value
   end
 
+  def odd?
+    to_i.odd?
+  end
+
+  def even?
+    to_i.even?
+  end
+
   def next
     RomanNumeral.new @integer_value + 1, @letter_case
   end
@@ -86,6 +94,10 @@ class RomanNumeral
     RomanNumeral.new @integer_value - 1, @letter_case
   end
 
+  def empty?
+    false
+  end
+
   def self.int_to_roman value
     result = []
     BaseDigits.keys.reverse_each do |ival|