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

data/lib/asciidoctor-pdf.rb

@@ -1,3 +1,3 @@
-require 'asciidoctor'
+require 'asciidoctor' unless defined? Asciidoctor::VERSION
 require_relative 'asciidoctor-pdf/version'
 require_relative 'asciidoctor-pdf/converter'

data/lib/asciidoctor-pdf/converter.rb

@@ -1,13 +1,14 @@
 # encoding: UTF-8
 # TODO cleanup imports...decide what belongs in asciidoctor-pdf.rb
 require 'prawn'
+require_relative 'ttfunk_ext'
 begin
   require 'prawn/gmagick'
 rescue LoadError
 end unless defined? GMagick::Image
 require_relative 'prawn-svg_ext'
 require_relative 'prawn-table_ext'
-require 'prawn/templates'
+require_relative 'prawn-templates_ext'
 require_relative 'core_ext'
 require_relative 'pdf-core_ext'
 require_relative 'temporary_path'
@@ -49,6 +50,7 @@ class Converter < ::Prawn::Document
   BlockAlignmentNames = ['left', 'center', 'right']
   AlignmentTable = { '<' => :left, '=' => :center, '>' => :right }
   ColumnPositions = [:left, :center, :right]
+  PageLayouts = [:portrait, :landscape]
   PageSides = [:recto, :verso]
   LF = %(\n)
   DoubleLF = %(\n\n)
@@ -73,7 +75,8 @@ class Converter < ::Prawn::Document
   Bullets = {
     disc: %(\u2022),
     circle: %(\u25e6),
-    square: %(\u25aa)
+    square: %(\u25aa),
+    none: ''
   }
   # NOTE Default theme font uses ballot boxes from FontAwesome
   BallotBox = {
@@ -187,7 +190,7 @@ class Converter < ::Prawn::Document
     start_new_page unless page_is_empty?
 
     num_toc_levels = (doc.attr 'toclevels', 2).to_i
-    if (include_toc = doc.attr? 'toc')
+    if (insert_toc = (doc.attr? 'toc') && doc.sections?)
       start_new_page if @ppbook && verso_page?
       toc_page_nums = page_number
       dry_run { toc_page_nums = layout_toc doc, num_toc_levels, toc_page_nums }
@@ -209,11 +212,15 @@ class Converter < ::Prawn::Document
     # QUESTION should we delete page if document is empty? (leaving no pages?)
     delete_page if page_is_empty? && page_count > 1
 
-    toc_page_nums = include_toc ? (layout_toc doc, num_toc_levels, toc_page_nums.first, num_front_matter_pages) : []
+    toc_page_nums = insert_toc ? (layout_toc doc, num_toc_levels, toc_page_nums.first, num_front_matter_pages) : []
 
     if page_count > num_front_matter_pages
-      layout_running_content :header, doc, skip: num_front_matter_pages unless doc.noheader
-      layout_running_content :footer, doc, skip: num_front_matter_pages unless doc.nofooter
+      unless doc.noheader || @theme.header_height.to_f.zero?
+        layout_running_content :header, doc, skip: num_front_matter_pages
+      end
+      unless doc.nofooter || @theme.footer_height.to_f.zero?
+        layout_running_content :footer, doc, skip: num_front_matter_pages
+      end
     end
 
     add_outline doc, num_toc_levels, toc_page_nums, num_front_matter_pages
@@ -272,14 +279,28 @@ class Converter < ::Prawn::Document
   end
 
   def build_pdf_options doc, theme
-    pdf_opts = {
-      #compress: true,
-      #optimize_objects: true,
-      info: (build_pdf_info doc),
-      margin: theme.page_margin,
-      page_layout: ((doc.attr 'pdf-page-layout') || theme.page_layout).to_sym,
-      skip_page_creation: true,
-    }
+    case (page_margin = (doc.attr 'pdf-page-margin') || theme.page_margin)
+    when ::String
+      if page_margin.empty?
+        page_margin = nil
+      elsif (page_margin.start_with? '[') && (page_margin.end_with? ']')
+        if (page_margin = page_margin[1...-1].rstrip).empty?
+          page_margin = [0]
+        else
+          if (page_margin = page_margin.split ',', -1).length > 4
+            page_margin = page_margin[0..3]
+          end
+          page_margin = page_margin.map {|v| str_to_pt v.rstrip }
+        end
+      else
+        page_margin = [(str_to_pt page_margin)]
+      end
+    when ::Array
+      page_margin = page_margin[0..3] if page_margin.length > 4
+      page_margin = page_margin.map {|v| ::Numeric === v ? v : (str_to_pt v.to_s) }
+    else
+      page_margin = nil
+    end
 
     page_size = if (doc.attr? 'pdf-page-size') && (m = PageSizeRx.match(doc.attr 'pdf-page-size'))
       # e.g, [8.5in, 11in]
@@ -319,10 +340,21 @@ class Converter < ::Prawn::Document
       end
     end
 
-    pdf_opts[:page_size] = (page_size || 'A4')
+    if (page_layout = (doc.attr 'pdf-page-layout') || theme.page_layout).nil_or_empty? ||
+        !(PageLayouts.include?(page_layout = page_layout.to_sym))
+      page_layout = nil
+    end
 
-    pdf_opts[:text_formatter] ||= FormattedText::Formatter.new theme: theme
-    pdf_opts
+    {
+      #compress: true,
+      #optimize_objects: true,
+      margin: (page_margin || 36),
+      page_size: (page_size || 'A4'),
+      page_layout: (page_layout || :portrait),
+      info: (build_pdf_info doc),
+      skip_page_creation: true,
+      text_formatter: (FormattedText::Formatter.new theme: theme)
+    }
   end
 
   # FIXME PdfMarks should use the PDF info result
@@ -514,7 +546,7 @@ class Converter < ::Prawn::Document
           if (transform = @text_transform) && transform != 'none'
             label_text = transform_text label_text, transform
           end
-          label_width = width_of label_text
+          label_width = rendered_width_of_string label_text
           label_width = label_min_width if label_min_width && label_min_width > label_width
         end
       end
@@ -638,10 +670,10 @@ class Converter < ::Prawn::Document
   def convert_open node
     if node.style == 'abstract'
       convert_abstract node
-    elsif node.style == 'partintro' && node.blocks.size == 1 && node.blocks.first.style == 'abstract'
+    elsif node.style == 'partintro' && node.blocks.size == 1 && node.blocks[0].style == 'abstract'
       # TODO process block title and id
       # TODO process abstract child even when partintro has multiple blocks
-      convert_abstract node.blocks.first
+      convert_abstract node.blocks[0]
     else
       add_dest_for_block node if node.id
       layout_caption node.title if node.title?
@@ -717,9 +749,47 @@ class Converter < ::Prawn::Document
     theme_margin :block, :top
     keep_together do |box_height = nil|
       if box_height
+        # FIXME due to the calculation error logged in #789, we must advance page even when content is split across pages
+        advance_page if box_height > cursor && !at_page_top?
         float do
-          bounding_box [0, cursor], width: bounds.width, height: box_height do
-            theme_fill_and_stroke_bounds :sidebar
+          # TODO move the multi-page logic to theme_fill_and_stroke_bounds
+          if (b_width = @theme.sidebar_border_width || 0) > 0 && (b_color = @theme.sidebar_border_color)
+            if b_color == @page_bg_color # let page background cut into sidebar background
+              b_gap_color, b_shift = @page_bg_color, b_width
+            elsif (b_gap_color = @theme.sidebar_background_color) && b_gap_color != b_color
+              b_shift = 0
+            else # let page background cut into border
+              b_gap_color, b_shift = @page_bg_color, 0
+            end
+          else # let page background cut into sidebar background
+            b_width = 0.5 if b_width == 0
+            b_shift, b_gap_color = b_width * 0.5, @page_bg_color
+          end
+          b_radius = (@theme.sidebar_border_radius || 0) + b_width
+          initial_page, remaining_height = true, box_height
+          while remaining_height > 0
+            advance_page unless initial_page
+            fragment_height = [(available_height = cursor), remaining_height].min
+            bounding_box [0, available_height], width: bounds.width, height: fragment_height do
+              theme_fill_and_stroke_bounds :sidebar
+              unless b_width == 0
+                indent b_radius, b_radius do
+                  move_down b_shift
+                  # dashed line to indicate continuation from previous page; swell line to cover background
+                  stroke_horizontal_rule b_gap_color, line_width: b_width * 1.2, line_style: :dashed
+                  move_up b_shift
+                end unless initial_page
+                if remaining_height > fragment_height
+                  move_down fragment_height - b_shift
+                  indent b_radius, b_radius do
+                    # dashed line to indicate continuation to next page; swell line to cover background
+                    stroke_horizontal_rule b_gap_color, line_width: b_width * 1.2, line_style: :dashed
+                  end
+                end
+              end
+            end
+            remaining_height -= fragment_height
+            initial_page = false
           end
         end
       end
@@ -760,7 +830,7 @@ class Converter < ::Prawn::Document
     line_metrics = calc_line_metrics @theme.base_line_height
     node.items.each_with_index do |item, idx|
       # FIXME extract to an ensure_space (or similar) method; simplify
-      start_new_page if cursor < (line_metrics.height + line_metrics.leading + line_metrics.padding_top)
+      advance_page if cursor < (line_metrics.height + line_metrics.leading + line_metrics.padding_top)
       convert_colist_item item
     end
     @list_numbers.pop
@@ -770,13 +840,15 @@ class Converter < ::Prawn::Document
   end
 
   def convert_colist_item node
-    marker_width = width_of %(#{conum_glyph 1}x)
-
-    float do
-      bounding_box [0, cursor], width: marker_width do
-        @list_numbers << (index = @list_numbers.pop).next
-        theme_font :conum do
-          layout_prose index, align: :center, line_height: @theme.conum_line_height, inline_format: false, margin: 0
+    marker_width = nil
+    theme_font :conum do
+      marker_width = rendered_width_of_string %(#{conum_glyph 1}x)
+      float do
+        bounding_box [0, cursor], width: marker_width do
+          @list_numbers << (index = @list_numbers.pop).next
+          theme_font :conum do
+            layout_prose index, align: :center, line_height: @theme.conum_line_height, inline_format: false, margin: 0
+          end
         end
       end
     end
@@ -797,7 +869,7 @@ class Converter < ::Prawn::Document
       terms = [*terms]
       # NOTE don't orphan the terms, allow for at least one line of content
       # FIXME extract ensure_space (or similar) method
-      start_new_page if cursor < @theme.base_line_height_length * (terms.size + 1)
+      advance_page if cursor < @theme.base_line_height_length * (terms.size + 1)
       terms.each do |term|
         layout_prose term.text, style: @theme.description_list_term_font_style.to_sym, margin_top: 0, margin_bottom: @theme.description_list_term_spacing, align: :left
       end
@@ -850,8 +922,15 @@ class Converter < ::Prawn::Document
         case style
         when 'bibliography'
           :square
+        when 'unstyled', 'no-bullet'
+          nil
         else
-          style.to_sym
+          if Bullets.key?(candidate = style.to_sym)
+            candidate 
+          else
+            warn %(asciidoctor: WARNING: unknown unordered list style: #{candidate})
+            :disc
+          end
         end
       else
         case node.outline_level
@@ -878,10 +957,21 @@ class Converter < ::Prawn::Document
     complex = false
     # ...or if we want to give all items in the list the same treatment
     #complex = node.items.find(&:complex?) ? true : false
-    indent @theme.outline_list_indent do
+    if node.context == :ulist && !@list_bullets[-1]
+      if node.style == 'unstyled'
+        # unstyled takes away all indentation
+        list_indent = 0
+      elsif (list_indent = @theme.outline_list_indent) > 0
+        # no-bullet aligns text with left-hand side of bullet position (as though there's no bullet)
+        list_indent = [list_indent - (rendered_width_of_string %(\u2022x)), 0].max
+      end
+    else
+      list_indent = @theme.outline_list_indent
+    end
+    indent list_indent do
       node.items.each do |item|
         # FIXME extract to an ensure_space (or similar) method; simplify
-        start_new_page if cursor < (line_metrics.height + line_metrics.leading + line_metrics.padding_top)
+        advance_page if cursor < (line_metrics.height + line_metrics.leading + line_metrics.padding_top)
         convert_outline_list_item item, item.complex?
       end
     end
@@ -898,7 +988,7 @@ class Converter < ::Prawn::Document
     # TODO move this to a draw_bullet (or draw_marker) method
     case (list_type = node.parent.context)
     when :ulist
-      marker = @list_bullets.last
+      marker = @list_bullets[-1]
       if marker == :checkbox
         if node.attr? 'checkbox', nil, false
           marker = BallotBox[(node.attr? 'checked', nil, false) ? :checked : :unchecked]
@@ -917,8 +1007,8 @@ class Converter < ::Prawn::Document
     end
 
     if marker
-      marker_width = width_of marker
-      start_position = -marker_width + -(width_of 'x')
+      marker_width = rendered_width_of_string marker
+      start_position = -marker_width + -(rendered_width_of_char 'x')
       float do
         flow_bounding_box start_position, width: marker_width do
           layout_prose marker,
@@ -1015,7 +1105,7 @@ class Converter < ::Prawn::Document
           # NOTE shrink image so it fits within available space; group image & caption
           if (rendered_h = svg_size.output_height) > (available_h = cursor - caption_h)
             unless pinned || at_page_top?
-              start_new_page
+              advance_page
               available_h = cursor - caption_h
             end
             if rendered_h > available_h
@@ -1044,7 +1134,7 @@ class Converter < ::Prawn::Document
           # NOTE shrink image so it fits within available space; group image & caption
           if rendered_h > (available_h = cursor - caption_h)
             unless pinned || at_page_top?
-              start_new_page
+              advance_page
               available_h = cursor - caption_h
             end
             if rendered_h > available_h
@@ -1193,17 +1283,24 @@ class Converter < ::Prawn::Document
     when 'coderay'
       Helpers.require_library CodeRayRequirePath, 'coderay' unless defined? ::Asciidoctor::Prawn::CodeRayEncoder
       source_string, conum_mapping = extract_conums source_string
-      fragments = (::CodeRay.scan source_string, (node.attr 'language', 'text', false).to_sym).to_prawn
+      srclang = node.attr 'language', 'text', false
+      begin
+        ::CodeRay::Scanners[(srclang = (srclang.start_with? 'html+') ? srclang[5..-1].to_sym : srclang.to_sym)]
+      rescue ::ArgumentError
+        srclang = :text
+      end
+      fragments = (::CodeRay.scan source_string, srclang).to_prawn
       conum_mapping ? (restore_conums fragments, conum_mapping) : fragments
     when 'pygments'
       Helpers.require_library 'pygments', 'pygments.rb' unless defined? ::Pygments
-      lexer = ::Pygments::Lexer[node.attr 'language', 'text', false] || ::Pygments::Lexer['text']
-      pygments_config = {
+      lexer = ::Pygments::Lexer.find_by_alias(node.attr 'language', 'text', false) || ::Pygments::Lexer.find_by_mimetype('text/plain')
+      lexer_opts = {
         nowrap: true,
         noclasses: true,
         stripnl: false,
-        style: style = (node.document.attr 'pygments-style') || 'pastie'
+        style: (style = (node.document.attr 'pygments-style') || 'pastie')
       }
+      lexer_opts[:startinline] = !(node.option? 'mixed') if lexer.name == 'PHP'
       # TODO enable once we support background color on spans
       #if node.attr? 'highlight', nil, false
       #  unless (hl_lines = node.resolve_lines_to_highlight(node.attr 'highlight', nil, false)).empty?
@@ -1222,21 +1319,23 @@ class Converter < ::Prawn::Document
       end
       source_string, conum_mapping = extract_conums source_string
       # NOTE pygments.rb strips trailing whitespace; preserve it in case there are conums on last line
-      num_trailing_spaces = source_string.size - (source_string = source_string.rstrip).size if conum_mapping
-      result = lexer.highlight source_string, options: pygments_config
+      num_trailing_spaces = source_string.length - (source_string = source_string.rstrip).length if conum_mapping
+      result = lexer.highlight source_string, options: lexer_opts
       fragments = guard_indentation text_formatter.format result
       conum_mapping ? (restore_conums fragments, conum_mapping, num_trailing_spaces) : fragments
     when 'rouge'
       Helpers.require_library RougeRequirePath, 'rouge' unless defined? ::Rouge::Formatters::Prawn
       lexer = ::Rouge::Lexer.find(node.attr 'language', 'text', false) || ::Rouge::Lexers::PlainText
+      lexer_opts = lexer.tag == 'php' ? { start_inline: !(node.option? 'mixed') } : {}
       formatter = (@rouge_formatter ||= ::Rouge::Formatters::Prawn.new theme: (node.document.attr 'rouge-style'), line_gap: @theme.code_line_gap)
+      formatter_opts = (node.attr? 'linenums') ? { line_numbers: true, start_line: (node.attr 'start').to_i } : {}
       # QUESTION allow border color to be set by theme for highlighted block?
       bg_color_override = formatter.background_color
       source_string, conum_mapping = extract_conums source_string
       # NOTE trailing endline is added to address https://github.com/jneen/rouge/issues/279
-      fragments = formatter.format (lexer.lex %(#{source_string}#{LF})), line_numbers: (node.attr? 'linenums')
+      fragments = formatter.format (lexer.lex %(#{source_string}#{LF}), lexer_opts), formatter_opts
       # NOTE cleanup trailing endline (handled in rouge_ext/formatters/prawn instead)
-      #fragments.last[:text] == LF ? fragments.pop : fragments.last[:text].chop!
+      #fragments[-1][:text] == LF ? fragments.pop : fragments[-1][:text].chop!
       conum_mapping ? (restore_conums fragments, conum_mapping) : fragments
     else
       # NOTE only format if we detect a need (callouts or inline formatting)
@@ -1408,8 +1507,12 @@ class Converter < ::Prawn::Document
     # NOTE emulate table bg color by using it as a fallback value for each element
     head_bg_color = resolve_theme_color :table_head_background_color, tbl_bg_color
     foot_bg_color = resolve_theme_color :table_foot_background_color, tbl_bg_color
-    odd_row_bg_color = resolve_theme_color :table_odd_row_background_color, tbl_bg_color
-    even_row_bg_color = resolve_theme_color :table_even_row_background_color, tbl_bg_color
+    body_bg_color = resolve_theme_color :table_body_background_color,
+        # table_odd_row_background_color is deprecated
+        (resolve_theme_color :table_odd_row_background_color, tbl_bg_color)
+    body_stripe_bg_color = resolve_theme_color :table_body_stripe_background_color,
+        # table_even_row_background_color is deprecated
+        (resolve_theme_color :table_even_row_background_color, tbl_bg_color)
 
     table_data = []
     node.rows[:head].each do |row|
@@ -1436,6 +1539,7 @@ class Converter < ::Prawn::Document
       table_data << row_data
     end
 
+    header_cell_data_cache = nil
     (node.rows[:body] + node.rows[:foot]).each do |row|
       row_data = []
       row.each do |cell|
@@ -1448,31 +1552,35 @@ class Converter < ::Prawn::Document
           align: (cell.attr 'halign', nil, false).to_sym,
           valign: (val = cell.attr 'valign', nil, false) == 'middle' ? :center : val.to_sym
         }
+        cell_transform = nil
         case cell.style
         when :emphasis
           cell_data[:font_style] = :italic
         when :strong
           cell_data[:font_style] = :bold
         when :header
-          unless defined? header_cell_data
-            header_cell_data = {}
+          unless header_cell_data_cache
+            header_cell_data_cache = {}
             [
-              # TODO honor text_transform key
-              # QUESTION should we honor alignment set by col/cell spec? how can we tell?
-              #['align', :align, true],
+              #['align', :align, true], # QUESTION should we honor alignment set by col/cell spec? how can we tell?
               ['font_color', :text_color, false],
               ['font_family', :font, false],
               ['font_size', :size, false],
-              ['font_style', :font_style, true]
+              ['font_style', :font_style, true],
+              ['text_transform', :text_transform, true]
             ].each do |(theme_key, data_key, symbol_value)|
               if (val = theme[%(table_header_cell_#{theme_key})] || theme[%(table_head_#{theme_key})])
-                header_cell_data[data_key] = symbol_value ? val.to_sym : val
+                header_cell_data_cache[data_key] = symbol_value ? val.to_sym : val
               end
             end
             if (val = resolve_theme_color :table_header_cell_background_color, head_bg_color)
-              header_cell_data[:background_color] = val
+              header_cell_data_cache[:background_color] = val
             end
           end
+          header_cell_data = header_cell_data_cache.dup
+          if (cell_transform = header_cell_data.delete :text_transform) == 'none'
+            cell_transform = nil
+          end
           cell_data.update header_cell_data unless header_cell_data.empty?
         when :monospaced
           cell_data[:font] = theme.literal_font_family
@@ -1509,10 +1617,10 @@ class Converter < ::Prawn::Document
           cell_data[:font_style] = (val = theme.table_font_style) ? val.to_sym : nil
         end
         unless cell_data.key? :content
-          # NOTE effectively the same as calling cell.content (should we use that instead?)
-          # TODO hard breaks not quite the same result as separate paragraphs; need custom cell impl
-          if (cell_text = cell.text).include? LF
-            cell_data[:content] = cell_text.split(BlankLineRx).map {|l| l.tr_s(WhitespaceChars, ' ') }.join(DoubleLF)
+          if (cell_text = cell_transform ? (transform_text cell.text, cell_transform) : cell.text).include? LF
+            # NOTE effectively the same as calling cell.content (should we use that instead?)
+            # FIXME hard breaks not quite the same result as separate paragraphs; need custom cell impl here
+            cell_data[:content] = (cell_text.split BlankLineRx).map {|l| l.tr_s WhitespaceChars, ' ' }.join DoubleLF
             cell_data[:inline_format] = true
           else
             cell_data[:content] = cell_text
@@ -1533,33 +1641,36 @@ class Converter < ::Prawn::Document
       table_data = [empty_row]
     end
 
-    border = {}
-    table_border_color = theme.table_border_color || table_grid_color || theme.base_border_color
+    border_width = {}
+    table_border_color = theme.table_border_color || theme.table_grid_color || theme.base_border_color
+    table_border_style = (theme.table_border_style || :solid).to_sym
     table_border_width = theme.table_border_width
+    [:top, :bottom, :left, :right].each {|edge| border_width[edge] = table_border_width }
+    table_grid_color = theme.table_grid_color || table_border_color
+    table_grid_style = (theme.table_grid_style || table_border_style).to_sym
     table_grid_width = theme.table_grid_width || theme.table_border_width
-    [:top, :bottom, :left, :right].each {|edge| border[edge] = table_border_width }
-    [:cols, :rows].each {|edge| border[edge] = table_grid_width }
+    [:cols, :rows].each {|edge| border_width[edge] = table_grid_width }
 
     case (grid = node.attr 'grid', 'all', false)
     when 'all'
       # keep inner borders
     when 'cols'
-      border[:rows] = 0
+      border_width[:rows] = 0
     when 'rows'
-      border[:cols] = 0
+      border_width[:cols] = 0
     else # none
-      border[:rows] = border[:cols] = 0
+      border_width[:rows] = border_width[:cols] = 0
     end
 
     case (frame = node.attr 'frame', 'all', false)
     when 'all'
       # keep outer borders
     when 'topbot'
-      border[:left] = border[:right] = 0
+      border_width[:left] = border_width[:right] = 0
     when 'sides'
-      border[:top] = border[:bottom] = 0
+      border_width[:top] = border_width[:bottom] = 0
     else # none
-      border[:top] = border[:right] = border[:bottom] = border[:left] = 0
+      border_width[:top] = border_width[:right] = border_width[:bottom] = border_width[:left] = 0
     end
 
     if node.option? 'autowidth'
@@ -1576,7 +1687,7 @@ class Converter < ::Prawn::Document
     end
 
     if ((alignment = node.attr 'align', nil, false) && (BlockAlignmentNames.include? alignment)) ||
-        (alignment = (node.roles & BlockAlignmentNames).last)
+        (alignment = (node.roles & BlockAlignmentNames)[-1])
       alignment = alignment.to_sym
     else
       alignment = :left
@@ -1588,16 +1699,29 @@ class Converter < ::Prawn::Document
       header: table_header,
       position: alignment,
       cell_style: {
-        padding: theme.table_cell_padding,
+        # NOTE the border color and style of the outer frame is set later
+        border_color: table_grid_color,
+        border_lines: [table_grid_style],
+        # NOTE the border width is set later
         border_width: 0,
-        # NOTE the border color of edges is set later
-        border_color: theme.table_grid_color || theme.table_border_color || theme.base_border_color
+        padding: theme.table_cell_padding
       },
       width: table_width,
-      column_widths: column_widths,
-      row_colors: [odd_row_bg_color, even_row_bg_color]
+      column_widths: column_widths
     }
 
+    # QUESTION should we support nth; should we support sequence of roles?
+    case node.attr 'stripes', 'even', false
+    when 'all'
+      table_settings[:row_colors] = [body_stripe_bg_color]
+    when 'even'
+      table_settings[:row_colors] = [body_bg_color, body_stripe_bg_color]
+    when 'odd'
+      table_settings[:row_colors] = [body_stripe_bg_color, body_bg_color]
+    else # none
+      table_settings[:row_colors] = [body_bg_color]
+    end
+
     theme_margin :block, :top
 
     table table_data, table_settings do
@@ -1606,40 +1730,46 @@ class Converter < ::Prawn::Document
       @pdf.layout_table_caption node, table_width, alignment if node.title? && caption_side == :top
       if grid == 'none' && frame == 'none'
         if table_header
-          # FIXME allow header border bottom width to be set by theme
-          rows(0).border_bottom_width = 1.5
+          # FIXME allow header border bottom width and style to be set by theme
+          rows(0).tap do |r|
+            r.border_bottom_line, r.border_bottom_width = :solid, 1.25
+            # QUESTION should we use the table border color for the bottom border color of the header row?
+            #r.border_bottom_color, r.border_bottom_line, r.border_bottom_width = table_border_color, :solid, 1.25
+          end
         end
       else
         # apply the grid setting first across all cells
-        cells.border_width = [border[:rows], border[:cols], border[:rows], border[:cols]]
+        cells.border_width = [border_width[:rows], border_width[:cols], border_width[:rows], border_width[:cols]]
 
         if table_header
-          # FIXME allow header border bottom width to be set by theme
-          rows(0).border_bottom_width = 1.5
-          # QUESTION should we use the table border color for the bottom border color of the header row?
-          #rows(0).border_bottom_color = table_border_color
-          #rows(1).border_top_width = 0 if row_length > 1
+          # FIXME allow header border bottom width and style to be set by theme
+          rows(0).tap do |r|
+            r.border_bottom_line, r.border_bottom_width = :solid, 1.25
+            # QUESTION should we use the table border color for the bottom border color of the header row?
+            #r.border_bottom_color, r.border_bottom_line, r.border_bottom_width = table_border_color, :solid, 1.25
+          end
+          rows(1).tap do |r|
+            r.border_top_line, r.border_top_width = :solid, 1.25
+            # QUESTION should we use the table border color for the top border color of the first row?
+            #r.border_top_color, r.border_top_line, r.border_top_width = table_border_color, :solid, 1.25
+          end if num_rows > 1
         end
 
         # top edge of table
         rows(0).tap do |r|
-          r.border_top_width = border[:top]
-          r.border_top_color = table_border_color
+          r.border_top_color, r.border_top_line, r.border_top_width = table_border_color, table_border_style, border_width[:top]
         end
         # right edge of table
         columns(num_cols - 1).tap do |r|
-          r.border_right_width = border[:right]
-          r.border_right_color = table_border_color
+          r.border_right_color, r.border_right_line, r.border_right_width = table_border_color, table_border_style, border_width[:right]
         end
         # bottom edge of table
         rows(num_rows - 1).tap do |r|
-          r.border_bottom_width = border[:bottom]
-          r.border_bottom_color = table_border_color
+          r.border_bottom_color, r.border_bottom_line, r.border_bottom_width = table_border_color, table_border_style, border_width[:bottom]
         end
         # left edge of table
         columns(0).tap do |r|
-          r.border_left_width = border[:left]
-          r.border_left_color = table_border_color
+          r.border_left_color, r.border_left_line, r.border_left_width = table_border_color, table_border_style, border_width[:left]
         end
       end
 
@@ -1678,7 +1808,7 @@ class Converter < ::Prawn::Document
 
   # NOTE to insert sequential page breaks, you must put {nbsp} between page breaks
   def convert_page_break node
-    start_new_page unless at_page_top?
+    advance_page unless at_page_top?
   end
 
   def convert_index_section node
@@ -1709,14 +1839,14 @@ class Converter < ::Prawn::Document
   end
 
   def convert_index_list_item term
-    text = term.name
+    text = escape_xml term.name
     unless term.container?
       if @media == 'screen'
         pagenums = term.dests.map {|dest| %(<a anchor="#{dest[:anchor]}">#{dest[:page]}</a>) }
       else
         pagenums = term.dests.uniq {|dest| dest[:page] }.map {|dest| dest[:page].to_s }
       end
-      text = %(#{escape_xml text}, #{pagenums * ', '})
+      text = %(#{text}, #{pagenums * ', '})
     end
     layout_prose text, align: :left, margin: 0
 
@@ -1788,6 +1918,7 @@ class Converter < ::Prawn::Document
 
   def convert_inline_button node
     %(<strong>[#{NarrowNoBreakSpace}#{node.text}#{NarrowNoBreakSpace}]</strong>)
+    #%(<strong>[#{NoBreakSpace}#{node.text}#{NoBreakSpace}]</strong>)
   end
 
   def convert_inline_callout node
@@ -2197,12 +2328,12 @@ class Converter < ::Prawn::Document
           font_color: @theme.toc_dot_leader_font_color || @font_color,
           font_style: dot_leader_font_style,
           levels: ((dot_leader_l = @theme.toc_dot_leader_levels) == 'none' ? ::Set.new :
-              (dot_leader_l && dot_leader_l != 'all' ? dot_leader_l.to_s.split.map(&:to_i).to_set : (1..num_levels).to_set)),
+              (dot_leader_l && dot_leader_l != 'all' ? dot_leader_l.to_s.split.map(&:to_i).to_set : (0..num_levels).to_set)),
           text: (dot_leader_text = @theme.toc_dot_leader_content || DotLeaderTextDefault),
-          width: dot_leader_text.empty? ? 0 : (width_of dot_leader_text),
+          width: dot_leader_text.empty? ? 0 : (rendered_width_of_string dot_leader_text),
           # TODO spacer gives a little bit of room between dots and page number
           spacer: { text: NoBreakSpace, size: (spacer_font_size = @font_size * 0.25) },
-          spacer_width: (width_of NoBreakSpace, size: spacer_font_size)
+          spacer_width: (rendered_width_of_char NoBreakSpace, size: spacer_font_size)
         }
       end
       line_metrics = calc_line_metrics @theme.toc_line_height
@@ -2253,7 +2384,8 @@ class Converter < ::Prawn::Document
           move_cursor_to start_cursor
           if dot_leader[:width] > 0 && (dot_leader[:levels].include? sect.level)
             pgnum_label_font_settings = { color: @font_color, font: font_family, size: @font_size, styles: font_styles }
-            pgnum_label_width = width_of pgnum_label
+            pgnum_label_width = rendered_width_of_string pgnum_label
+            # WARNING width_of is not accurate if string must use characters from fallback font
             sect_title_width = width_of sect_title, inline_format: true
             save_font do
               # NOTE the same font is used for dot leaders throughout toc
@@ -2296,8 +2428,6 @@ class Converter < ::Prawn::Document
 
   # TODO delegate to layout_page_header and layout_page_footer per page
   def layout_running_content periphery, doc, opts = {}
-    # QUESTION should we short-circuit if setting not specified and if so, which setting?
-    return unless (periphery == :header && @theme.header_height) || (periphery == :footer && @theme.footer_height)
     skip = opts[:skip] || 1
     # NOTE find and advance to first non-imported content page to use as model page
     return unless (content_start_page = state.pages[skip..-1].index {|p| !p.imported_page? })
@@ -2658,7 +2788,7 @@ class Converter < ::Prawn::Document
         # FIXME link to title page if there's a cover page (skip cover page and ensuing blank page)
         page title: doctitle, destination: (document.dest_top 1)
       end
-      page title: (doc.attr 'toc-title'), destination: (document.dest_top toc_page_nums.first) if toc_page_nums.first
+      page title: (doc.attr 'toc-title'), destination: (document.dest_top toc_page_nums.first) unless toc_page_nums.none?
       # QUESTION any way to get add_outline_level to invoke in the context of the outline?
       document.add_outline_level self, doc.sections, num_levels
     end
@@ -2673,11 +2803,11 @@ class Converter < ::Prawn::Document
     sections.each do |sect|
       sect_title = sanitize sect.numbered_title formal: true
       sect_destination = sect.attr 'pdf-destination'
-      if (subsections = sect.sections).empty? || sect.level == num_levels
+      if (level = sect.level) == num_levels || !sect.sections?
         outline.page title: sect_title, destination: sect_destination
-      elsif sect.level < num_levels + 1
+      elsif level <= num_levels
         outline.section sect_title, { destination: sect_destination } do
-          add_outline_level outline, subsections, num_levels
+          add_outline_level outline, sect.sections, num_levels
         end
       end
     end
@@ -2866,6 +2996,32 @@ class Converter < ::Prawn::Document
     line_widths.max
   end
 
+  # Compute the rendered width of a string, taking fallback fonts into account
+  def rendered_width_of_string str, opts = {}
+    if str.length == 1
+      rendered_width_of_char str, opts
+    elsif (chars = str.each_char).all? {|char| font.glyph_present? char }
+      width_of_string str, opts
+    else
+      char_widths = chars.map {|char| rendered_width_of_char char, opts }
+      char_widths.reduce(&:+) + (char_widths.length * character_spacing)
+    end
+  end
+
+  # Compute the rendered width of a char, taking fallback fonts into account
+  def rendered_width_of_char char, opts = {}
+    if @fallback_fonts.empty? || (font.glyph_present? char)
+      width_of_string char, opts
+    else
+      @fallback_fonts.each do |fallback_font|
+        font fallback_font do
+          return width_of_string char, opts if font.glyph_present? char
+        end
+      end
+      width_of_string char, opts
+    end
+  end
+
   # TODO document me, esp the first line formatting functionality
   def typeset_text string, line_metrics, opts = {}
     move_down line_metrics.padding_top
@@ -2901,11 +3057,11 @@ class Converter < ::Prawn::Document
       result = []
       string.each_line do |line|
         if line.start_with? TAB
-          # NOTE '+' operator is faster than interpolation in this case
           if guard_indent
-            line.sub!(TabIndentRx) {|tabs| GuardedIndent + (full_tab_space * tabs.length).chop! }
+            # NOTE '+' operator is faster than interpolation
+            line.sub!(TabIndentRx) { GuardedIndent + (full_tab_space * $&.length).chop! }
           else
-            line.sub!(TabIndentRx) {|tabs| full_tab_space * tabs.length }
+            line.sub!(TabIndentRx) { full_tab_space * $&.length }
           end
           leading_space = false
         # QUESTION should we check for LF first?