asciidoctor-pdf 2.0.0.alpha.3 → 2.0.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7688a2448dace024b0e6057e878d556ec99ee1ac97bf4c91803d59346a136741
-  data.tar.gz: 13807213320754c03cce6304300745ec31a349a8e95441e1495ddc6e6401a99a
+  metadata.gz: f3c96a0b756ccd22c3aec10c571e5ef0280a0003398f48a86287037c52d13a85
+  data.tar.gz: c611aec1ecafd132c9415babfc193929bbe52879b6282cc752d6def346ce9d56
 SHA512:
-  metadata.gz: f3207de1db655ec85350df8b37530306e1ac13d1c1108b091886a8b45fcd5ce42fdc417fc759ef40ba77945925518e76e31341d12ec951ee648772c5b81364da
-  data.tar.gz: ab345b122e4137e33ed8ab0956270ce067f20b8b8b4f6aba3737f54f002b60b0653d5e9fbc356778d3787f9601b2f4ed9a6e0a5694bab5c9f376365297ae0626
+  metadata.gz: 517791afccee6a976f59244b08ffdd062f09d2153d04917a61b969ef525752eee70d8118586932757e3f6fd175880f899a60d768cfc4b8e8ef6cabdad5f5f239
+  data.tar.gz: 3ae8abd3251302def2b2305a4c9aebe940235735d0c0204891c909e383ac8622eb21b158d3d844a49b60dab5f1c5d82e8252961c1f2247b6158a7975d9d7c50b

data/CHANGELOG.adoc

@@ -5,6 +5,33 @@
 This document provides a high-level view of the changes to the {project-name} by release.
 For a detailed view of what has changed, refer to the {uri-repo}/commits/main[commit history] on GitHub.
 
+== 2.0.0.beta.1 (2022-05-04) - @mojavelinux
+
+Enhancements::
+
+* introduce `index-pagenum-sequence-style` document attribute to control style of sequential page numbers in index when media=screen (#1656)
+* allow entry for document in outline to be controlled using `outline-title` attribute (#1789)
+* allow extended converter to insert or filter toc entries by overriding `get_entries_for_toc` method (#2097)
+* add `asciidoctor/pdf/nopngmagick` script to unregister Gmagick handler for PNG images only (#1687)
+* allow theme to configure which end the caption is placed for a block image (#2115)
+* add `Page#imported` method to mark page as imported (which suppresses running contennt)
+* add support for `smallcaps` text transform by replacing lowercase letters with small capital variants (#1192)
+* use `base-border-color` as default border color; control appearance of border using `border-width` value alone (#2134)
+* remove border colors in base theme so all border colors can be controlled using `base-border-color` when extending theme
+* enable running footer when using base theme
+
+Bug Fixes::
+
+* allow border width of block image to be specified as an array (1, 2, or 4 values) (#2119)
+* rename `delete_page` extension method to `delete_current_page` to avoid conflict with incompatible method on `Prawn::Document`
+* remap `table-caption-side` theme key to `table-caption-end` (#2125)
+* add missing glyph for `ÿ` in built-in fonts
+* remove use of deprecated keys in chronicles-dark-theme.yml
+
+=== Details
+
+{url-repo}/releases/tag/v2.0.0.beta.1[git tag] | {url-repo}/compare/v2.0.0.alpha.3\...v2.0.0.beta.1[full diff]
+
 == 2.0.0.alpha.3 (2022-05-01) - @mojavelinux
 
 Enhancements::
@@ -44,7 +71,7 @@ Enhancements::
 * pass the `part` and `chapterlike` options to the `arrange_section` method for convenience
 * add support for `background-color` property on caption (#1995)
 * add support for image-based icons, resolved from `iconsdir` and having the `icontype` file extension (#1770)
-* add `asciidoctor/pdf/nogmagick` script to prevent Gmagick from handling PNG images (#1687)
+* add `asciidoctor/pdf/nogmagick` script to prevent loading prawn-gmagick gem (#1687)
 * change name of `untitled` option on special section to `notitle`
 * allow the title of any section to be hidden using the `notitle` option
 * allow imported PDF page to be referenced in TOC by enclosing in parent section with `notitle` option (#1213)

data/README.adoc

@@ -1,6 +1,6 @@
 = Asciidoctor PDF: A native PDF converter for AsciiDoc
 Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>
-v2.0.0.alpha.3, 2022-05-01
+v2.0.0.beta.1, 2022-05-04
 // Settings:
 :experimental:
 :idprefix:
@@ -24,7 +24,7 @@ endif::[]
 :project-handle: asciidoctor-pdf
 // Variables:
 :release-line: 2.0.x
-:release-version: 2.0.0.alpha.3
+:release-version: 2.0.0.beta.1
 // URIs:
 :url-asciidoctor: http://asciidoctor.org
 :url-gem: http://rubygems.org/gems/asciidoctor-pdf
@@ -713,23 +713,41 @@ If you're using fonts in your SVG, and you want those fonts to be preserved, tho
 
 == Supporting Additional Image File Formats
 
-In order to embed an image into a PDF, Asciidoctor PDF must understand how to read it.
+In order to embed an image into a PDF, Asciidoctor PDF must understand how to decode it.
 To perform this work, Asciidoctor delegates to the underlying libraries.
-{url-prawn}[Prawn] provides support for reading JPG and PNG images.
-{url-prawn-svg}[prawn-svg] brings support for SVG images.
-Without any additional libraries, those are the only supported image file formats.
+{url-prawn}[Prawn] provides support for decoding JPG and PNG images.
+{url-prawn-svg}[prawn-svg] brings support for translating SVG images to PDF commands.
+Without any additional libraries, those are the only image file formats supported by Asciidoctor PDF.
 
-If you need support for additional image formats, such as GIF, TIFF, or interlaced PNG--and you don't want to convert those images to a supported format--you must install the {url-prawn-gmagick}[prawn-gmagick] (>= 0.0.9) Ruby gem.
-prawn-gmagick is an extension for Prawn based on {url-graphicsmagick}[GraphicsMagick] that adds support for all the image formats recognized by that library.
-prawn-gmagick has the added benefit of significantly reducing the time it takes to generate a PDF containing a lot of images.
+If you need support for additional image formats, such as GIF, TIFF, WebP, or interlaced PNG--and you don't want to convert those images to a supported format like JPG--you must install the {url-prawn-gmagick}[prawn-gmagick] (>= 0.0.9) Ruby gem.
+prawn-gmagick is an extension for Prawn that delegates image decoding to {url-graphicsmagick}[GraphicsMagick] to add support for all image formats recognized by that library.
+
+prawn-gmagick has the additional benefit of *significantly* reducing the processing time, power, and memory necessary to generate a PDF that contains a lot of PNG images.
+For large books (such as Pro Git), you might see the conversion time drop by as much as half.
+Decoding PNG images requires a lot of mathematical computation, a task Ruby is not particularly efficient at performing.
+That's why adding the prawn-gmagick gem to the converter makes such a substantial difference.
+
+As an alternative to using prawn-gmagick, you could optimize the images you pass into Asciidoctor PDF, either by scaling them down or converting them to an uncompressed format like JPG.
 
 The prawn-gmagick gem uses native extensions to compile against GraphicsMagick.
-This system prerequisite limits installation to Linux and OSX.
+This system prerequisite limits installation to C Ruby running on Linux and macOS.
 Please refer to the {url-prawn-gmagick}[README for prawn-gmagick] to learn how to install it.
 
-Once this gem is installed, Asciidoctor automatically loads it, then delegates to it to handle all image embedding.
-In addition to support for additional image file formats, this gem also speeds up image processing considerably.
-We highly recommend using this gem if you're able to install it.
+ $ gem install prawn-gmagick
+
+When this gem is installed, Asciidoctor automatically detects and loads it, then delegates all image decoding to GraphicsMagick by way of the bridge it provides.
+We highly recommend using this gem with Asciidoctor PDF if you're able to install it.
+
+The one downside of delegating to GraphicsMagick is that it can mangle certain PNG images.
+If this happens, you can instruct Asciidoctor PDF to not delegate to GraphicsMagick to load PNG images by requiring `asciidoctor/pdf/nopngmagick` when calling Asciidoctor PDF, as follows:
+
+ $ asciidoctor-pdf -r asciidoctor/pdf/nopngmagick doc.adoc
+
+You can also tell Asciidoctor PDF not to use prawn-gmagick at all by requiring `asciidoctor/pdf/nogmagick` when calling Asciidoctor PDF, as follows:
+
+ $ asciidoctor-pdf -r asciidoctor/pdf/nogmagick doc.adoc
+
+Granted, bypassing prawn-gmagick means you no longer get support for additional image formats that Prawn cannot handle or the PNG acceleration.
 
 == Importing PDF Pages
 

data/data/fonts/ABOUT-mplus1p-subset

@@ -17,6 +17,7 @@ The following changes were made using fontforge to produce mplus1p-regular-fallb
  ** General Punctuation (U+2000–U203a)
  ** Geometric Shapes (U+25a0–U25ff)
  ** Assorted Symbols (U+20ac, U+2122, U+21d0–U+21d5, U+2190–U+2195, U+2610–U+2611, U+2713–U+2714)
+ ** Latin Small Capital Letters (U+1D00, U+0299, U+1D04, U+1D05, U+1D07, U+A730, U+0262, U+029C, U+026A, U+1D0A, U+1D0B, U+029F, U+1D0D, U+0274, U+1D0F, U+1D18, U+A7AF (missing), U+0280, U+A731, U+1D1B, U+1D1C, U+1D20, U+1D21, U+028F, U+1D22)
  ** .notdef glyph
 * Added BOM (U+feff), hair space (U+200a), zero-width space (U+200b) and line feed (U+000a) characters (from blank)
 * Manually added non-breaking hyphen (U+2011) from hyphen (U+002d)

data/data/fonts/ABOUT-notosans-subset

@@ -17,6 +17,7 @@ The following changes were made using fontforge to produce the notosans-*-subset
  ** General Punctuation (U+2000–U203a)
  ** Geometric Shapes (U+25a0–U25ff)
  ** Assorted Symbols (U+20ac, U+2122, U+21d0, U+21d2, U+2190, U+2192)
+ ** Latin Small Capital Letters (U+1D00, U+0299, U+1D04, U+1D05, U+1D07, U+A730 (missing), U+0262, U+029C, U+026A, U+1D0A, U+1D0B, U+029F, U+1D0D, U+0274, U+1D0F, U+1D18, U+A7AF (missing), U+0280, U+A731 (missing), U+1D1B, U+1D1C, U+1D20, U+1D21, U+028F, U+1D22, U+01EB)
  ** .notdef glyph
 * Imported ballot boxes from Font Awesome (U+2610, U+2611) (Noto Serif Regular only)
 * Added line feed character (U+000a)

data/data/fonts/ABOUT-notoserif-subset

@@ -17,6 +17,7 @@ The following changes were made using fontforge to produce the notoserif-*-subse
  ** General Punctuation (U+2000–U203a)
  ** Geometric Shapes (U+25a0–U25ff)
  ** Assorted Symbols (U+20ac, U+2122, U+21d0, U+21d2, U+2190, U+2192)
+ ** Latin Small Capital Letters (U+1D00, U+0299, U+1D04, U+1D05, U+1D07, U+A730 (missing), U+0262, U+029C, U+026A, U+1D0A, U+1D0B, U+029F, U+1D0D, U+0274, U+1D0F, U+1D18, U+A7AF (missing), U+0280, U+A731 (missing), U+1D1B, U+1D1C, U+1D20, U+1D21, U+028F, U+1D22, U+01EB)
  ** .notdef glyph
 * Imported ballot boxes from Font Awesome (U+2610, U+2611) (Noto Serif Regular only)
 * Added line feed character (U+000a)

data/data/themes/base-theme.yml

@@ -1,24 +1,19 @@
-# NOTE file is read "as is"; variables are not parsed; key layout must be flat
+# NOTE: file is read "as is"; variables are not parsed; key layout must be flat
 page_background_color: 'FFFFFF'
 page_layout: portrait
 page_initial_zoom: FitH
-# 36 is equivalent to 0.5in
-page_margin: 36
+page_margin: 36 # 36 is 0.5in
 page_margin_inner: 48
 page_margin_outer: 24
 page_size: A4
 base_text_align: left
-#base_font_color: '333333'
 base_font_color: '000000'
-#base_font_family: Times-Roman
 base_font_family: Helvetica
 base_font_size: 12
-# QUESTION should we rename to min_font_size?
 base_font_size_min: 6
 base_font_style: normal
 base_line_height: 1.15
-base_border_color: 'EEEEEE'
-base_border_width: 0.5
+base_border_color: '000000'
 role_lead_font_size: 13.5
 role_line-through_text_decoration: line-through
 role_underline_text_decoration: underline
@@ -47,7 +42,6 @@ heading_margin_top: 4
 heading_margin_bottom: 12
 heading_min_height_after: 20
 title_page_text_align: center
-title_page_line_height: 1.15
 title_page_logo_top: 10%
 title_page_title_top: 40%
 title_page_title_font_size: 18
@@ -69,43 +63,37 @@ abstract_line_height: 1.4
 abstract_padding: 0
 abstract_title_align: center
 abstract_title_font_style: bold
-admonition_column_rule_color: 'EEEEEE'
 admonition_column_rule_width: 0.5
 admonition_padding: [4, 12, 4, 12]
 admonition_label_font_style: bold
 admonition_label_text_transform: uppercase
-quote_border_color: 'EEEEEE'
 quote_border_left_width: 4
 quote_padding: [3, 12, 3, 14]
-verse_border_color: 'EEEEEE'
 verse_border_left_width: 4
 verse_padding: [3, 12, 3, 14]
 code_font_family: Courier
 code_font_size: 10.8
 code_line_height: 1.2
 code_padding: 9
-code_border_color: 'EEEEEE'
 code_border_width: 0.5
 conum_line_height: 1.15
 conum_glyphs: circled
 example_background_color: 'FFFFFF'
-example_border_color: 'EEEEEE'
 example_border_width: 0.5
 example_padding: 12
 image_align: left
 prose_margin_bottom: 12
 sidebar_background_color: 'EEEEEE'
+sidebar_border_width: 0.5
 sidebar_padding: 12
 sidebar_title_align: center
 sidebar_title_font_style: bold
-table_border_color: '000000'
 table_border_style: solid
 table_border_width: 0.5
 table_cell_padding: 2
 table_head_font_style: bold
 table_head_border_bottom_width: 1.25
 table_body_stripe_background_color: 'EEEEEE'
-thematic_break_border_color: 'EEEEEE'
 thematic_break_border_style: solid
 thematic_break_border_width: 0.5
 thematic_break_margin_bottom: 12
@@ -113,5 +101,8 @@ toc_indent: 15
 toc_line_height: 1.4
 footnotes_font_size: 9
 footnotes_item_spacing: 3
+footer_border_width: 0.5
+footer_font_size: 10
+footer_height: 30
 footer_recto_right_content: '{page-number}'
 footer_verso_left_content: '{page-number}'

data/docs/theming-guide.adoc

@@ -4223,11 +4223,12 @@ The keys in this category control the arrangement and style of tables and table
   caption:
     text-align: left
 
-|caption-side
+|caption-end
 |top {vbar} bottom +
 (default: top)
 |table:
-  caption-side: bottom
+  caption:
+    end: bottom
 
 |caption-max-width
 |fit-content {vbar} fit-content(percentage) {vbar} none {vbar} <<measurement-units,Measurement>> +
@@ -5921,7 +5922,7 @@ def ink_part_title node, title, opts = {}
   fill_absolute_bounds 'E64C3D'
   move_down 20
   typeset_text title, (calc_line_metrics 1.5), color: 'FFFFFF', inline_format: true, align: :center, size: 42
-  page.instance_variable_set :@imported_page, true
+  page.imported
 end
 ----
 

data/lib/asciidoctor/pdf/converter.rb

@@ -139,6 +139,7 @@ module Asciidoctor
           # NOTE: enabling data-uri forces Asciidoctor Diagram to produce absolute image paths
           doc.attributes['data-uri'] = (doc.instance_variable_get :@attribute_overrides)['data-uri'] = ''
         end
+        @label = :primary
         @initial_instance_variables = [:@initial_instance_variables] + instance_variables
       end
 
@@ -181,8 +182,9 @@ module Asciidoctor
       def convert_document doc
         doc.promote_preface_block
         init_pdf doc
-        # set default value for outline, pagenums, and show-link-uri if not otherwise set
+        # set default value for outline, outline-title, and pagenums attributes if not otherwise set
         doc.attributes['outline'] = '' unless (doc.attribute_locked? 'outline') || ((doc.instance_variable_get :@attributes_modified).include? 'outline')
+        doc.attributes['outline-title'] = '' unless (doc.attribute_locked? 'outline-title') || ((doc.instance_variable_get :@attributes_modified).include? 'outline-title')
         doc.attributes['pagenums'] = '' unless (doc.attribute_locked? 'pagenums') || ((doc.instance_variable_get :@attributes_modified).include? 'pagenums')
         #assign_missing_section_ids doc
 
@@ -216,7 +218,7 @@ module Asciidoctor
           if (insert_toc = (doc.attr? 'toc') && !((toc_placement = doc.attr 'toc-placement') == 'macro' || toc_placement == 'preamble') && doc.sections?)
             start_new_page if @ppbook && verso_page?
             add_dest_for_block doc, id: 'toc', y: (at_page_top? ? page_height : nil)
-            allocate_toc doc, toc_num_levels, cursor, title_page_on
+            @toc_extent = allocate_toc doc, toc_num_levels, cursor, title_page_on
           else
             @toc_extent = nil
           end
@@ -303,19 +305,19 @@ module Asciidoctor
           # NOTE: for a book, these are leftover footnotes; for an article this is everything
           outdent_section { ink_footnotes doc }
 
-          if @toc_extent
+          if (toc_extent = @toc_extent)
             if title_page_on && !insert_toc
-              num_front_matter_pages[0] = @toc_extent.to.page if @theme.running_content_start_at == 'after-toc'
-              num_front_matter_pages[1] = @toc_extent.to.page if @theme.page_numbering_start_at == 'after-toc'
+              num_front_matter_pages[0] = toc_extent.to.page if @theme.running_content_start_at == 'after-toc'
+              num_front_matter_pages[1] = toc_extent.to.page if @theme.page_numbering_start_at == 'after-toc'
             end
-            toc_page_nums = ink_toc doc, toc_num_levels, @toc_extent.from.page, @toc_extent.from.cursor, num_front_matter_pages[1]
+            toc_page_nums = ink_toc doc, toc_num_levels, toc_extent.from.page, toc_extent.from.cursor, num_front_matter_pages[1]
           else
             toc_page_nums = []
           end
 
           # NOTE: delete orphaned page (a page was created but there was no additional content)
           # QUESTION: should we delete page if document is empty? (leaving no pages?)
-          delete_page if page_count > 1 && page.empty?
+          delete_current_page if page_count > 1 && page.empty?
         end
 
         unless page_count < body_start_page_number
@@ -461,8 +463,6 @@ module Asciidoctor
       end
 
       def prepare_theme theme
-        theme.base_border_color ||= '000000'
-        theme.base_border_width ||= 0
         theme.base_font_color ||= '000000'
         theme.base_font_size ||= 12
         theme.base_font_style = theme.base_font_style&.to_sym || :normal
@@ -479,7 +479,9 @@ module Asciidoctor
         theme.list_item_spacing ||= 0
         theme.description_list_term_spacing ||= 0
         theme.description_list_description_indent ||= 0
+        theme.table_border_color ||= (theme.base_border_color || '000000')
         theme.table_border_width ||= 0.5
+        theme.thematic_break_border_color ||= (theme.base_border_color || '000000')
         theme.image_border_width ||= 0
         theme.code_linenum_font_color ||= '999999'
         theme.callout_list_margin_top_after_code ||= 0
@@ -902,8 +904,8 @@ module Asciidoctor
           pad_box [0, cpad[1], 0, lpad[3]] do
             if extent
               label_height = extent.single_page_height || cursor
-              if (rule_color = @theme.admonition_column_rule_color) &&
-                  (rule_width = @theme.admonition_column_rule_width || @theme.base_border_width) > 0
+              if (rule_width = @theme.admonition_column_rule_width || 0) > 0 &&
+                  (rule_color = @theme.admonition_column_rule_color || @theme.base_border_color)
                 rule_style = @theme.admonition_column_rule_style&.to_sym || :solid
                 float do
                   extent.each_page do |first_page, last_page|
@@ -1057,7 +1059,7 @@ module Asciidoctor
         category = node.context == :quote ? :quote : :verse
         # NOTE: b_width and b_left_width are mutually exclusive
         if (b_left_width = @theme[%(#{category}_border_left_width)]) && b_left_width > 0
-          b_color = @theme[%(#{category}_border_color)]
+          b_color = @theme[%(#{category}_border_color)] || @theme.base_border_color
         else
           b_left_width = nil
           b_width = nil if (b_width = @theme[%(#{category}_border_width)]) == 0
@@ -1559,8 +1561,10 @@ module Asciidoctor
         # TODO: add `to_pt page_width` method to ViewportWidth type
         width = (width.to_f / 100) * page_width if ViewportWidth === width
 
+        caption_end = @theme.image_caption_end&.to_sym || :bottom
+        caption_max_width = @theme.image_caption_max_width
         # NOTE: if width is not set explicitly and max-width is fit-content, caption height may not be accurate
-        caption_h = node.title? ? (ink_caption node, category: :image, side: :bottom, block_align: alignment, block_width: width, max_width: @theme.image_caption_max_width, dry_run: true, force_top_margin: true) : 0
+        caption_h = node.title? ? (ink_caption node, category: :image, end: caption_end, block_align: alignment, block_width: width, max_width: caption_max_width, dry_run: true, force_top_margin: caption_end == :bottom) : 0
 
         align_to_page = node.option? 'align-to-page'
         pinned = opts[:pinned]
@@ -1596,14 +1600,14 @@ module Asciidoctor
                 end
                 rendered_w = (svg_obj.resize height: (rendered_h = available_h)).output_width if rendered_h > available_h
               end
-              image_y = y
-              image_cursor = cursor
               add_dest_for_block node if node.id
               # NOTE: workaround to fix Prawn not adding fill and stroke commands on page that only has an image;
               # breakage occurs when running content (stamps) are added to page
               update_colors if graphic_state.color_space.empty?
-              # NOTE: cursor advances automatically
-              svg_obj.draw
+              ink_caption node, category: :image, end: :top, block_align: alignment, block_width: rendered_w, max_width: caption_max_width if caption_end == :top && node.title?
+              image_y = y
+              image_cursor = cursor
+              svg_obj.draw # NOTE: cursor advances automatically
               svg_obj.document.warnings.each do |img_warning|
                 log :warn, %(problem encountered in image: #{image_path}; #{img_warning})
               end unless scratch?
@@ -1627,12 +1631,13 @@ module Asciidoctor
                 end
                 rendered_w, rendered_h = image_info.calc_image_dimensions height: available_h if rendered_h > available_h
               end
-              image_y = y
-              image_cursor = cursor
               add_dest_for_block node if node.id
               # NOTE: workaround to fix Prawn not adding fill and stroke commands on page that only has an image;
               # breakage occurs when running content (stamps) are added to page
               update_colors if graphic_state.color_space.empty?
+              ink_caption node, category: :image, end: :top, block_align: alignment, block_width: rendered_w, max_width: caption_max_width if caption_end == :top && node.title?
+              image_y = y
+              image_cursor = cursor
               # NOTE: specify both width and height to avoid recalculation
               embed_image image_obj, image_info, width: rendered_w, height: rendered_h, position: alignment
               draw_image_border image_cursor, rendered_w, rendered_h, alignment unless node.role? && (node.has_role? 'noborder')
@@ -1643,7 +1648,7 @@ module Asciidoctor
               move_down rendered_h if y == image_y
             end
           end
-          ink_caption node, category: :image, side: :bottom, block_align: alignment, block_width: rendered_w, max_width: @theme.image_caption_max_width if node.title?
+          ink_caption node, category: :image, end: :bottom, block_align: alignment, block_width: rendered_w, max_width: caption_max_width if caption_end == :bottom && node.title?
           theme_margin :block, :bottom, (next_enclosed_block node) unless pinned
         rescue => e
           raise if ::StopIteration === e
@@ -1652,7 +1657,7 @@ module Asciidoctor
       end
 
       def draw_image_border top, w, h, alignment
-        if @theme.image_border_width > 0 && @theme.image_border_color
+        if (Array @theme.image_border_width).any? {|it| it&.> 0 } && (@theme.image_border_color || @theme.base_border_color)
           if (@theme.image_border_fit || 'content') == 'auto'
             bb_width = bounds.width
           elsif alignment == :center
@@ -1685,7 +1690,7 @@ module Asciidoctor
             (resolve_alignment_from_role node.roles) || (@theme.image_align&.to_sym || :left)
           ink_prose alt_text_template % alt_text_vars, align: alignment, margin: 0, normalize: false, single_line: true
         end
-        ink_caption node, category: :image, side: :bottom if node.title?
+        ink_caption node, category: :image, end: :bottom if node.title?
         theme_margin :block, :bottom, (next_enclosed_block node) unless opts[:pinned]
         nil
       end
@@ -1695,7 +1700,7 @@ module Asciidoctor
         audio_path = node.media_uri node.attr 'target'
         play_symbol = (node.document.attr? 'icons', 'font') ? %(<font name="fas">#{(icon_font_data 'fas').unicode 'play'}</font>) : RightPointer
         ink_prose %(#{play_symbol}#{NoBreakSpace}<a href="#{audio_path}">#{audio_path}</a> <em>(audio)</em>), normalize: false, margin: 0, single_line: true
-        ink_caption node, labeled: false, side: :bottom if node.title?
+        ink_caption node, labeled: false, end: :bottom if node.title?
         theme_margin :block, :bottom, (next_enclosed_block node)
       end
 
@@ -1723,7 +1728,7 @@ module Asciidoctor
           add_dest_for_block node if node.id
           play_symbol = (node.document.attr? 'icons', 'font') ? %(<font name="fas">#{(icon_font_data 'fas').unicode 'play'}</font>) : RightPointer
           ink_prose %(#{play_symbol}#{NoBreakSpace}<a href="#{video_path}">#{video_path}</a> <em>(#{type})</em>), normalize: false, margin: 0, single_line: true
-          ink_caption node, labeled: false, side: :bottom if node.title?
+          ink_caption node, labeled: false, end: :bottom if node.title?
           theme_margin :block, :bottom, (next_enclosed_block node)
         else
           original_attributes = node.attributes.dup
@@ -2188,12 +2193,12 @@ module Asciidoctor
 
         rect_side_names = [:top, :right, :bottom, :left]
         grid_axis_names = [:rows, :cols]
-        border_color = (rect_side_names.zip expand_rect_values theme.table_border_color, theme.base_border_color).to_h
+        border_color = (rect_side_names.zip expand_rect_values theme.table_border_color, 'transparent').to_h
         border_style = (rect_side_names.zip (expand_rect_values theme.table_border_style, :solid).map(&:to_sym)).to_h
-        border_width = (rect_side_names.zip expand_rect_values theme.table_border_width, theme.base_border_width).to_h
-        grid_color = (grid_axis_names.zip expand_grid_values (theme.table_grid_color || [border_color[:top], border_color[:left]]), theme.base_border_color).to_h
+        border_width = (rect_side_names.zip expand_rect_values theme.table_border_width, 0).to_h
+        grid_color = (grid_axis_names.zip expand_grid_values (theme.table_grid_color || [border_color[:top], border_color[:left]]), 'transparent').to_h
         grid_style = (grid_axis_names.zip (expand_grid_values (theme.table_grid_style || [border_style[:top], border_style[:left]]), :solid).map(&:to_sym)).to_h
-        grid_width = (grid_axis_names.zip expand_grid_values (theme.table_grid_width || [border_width[:top], border_width[:left]]), theme.base_border_width).to_h
+        grid_width = (grid_axis_names.zip expand_grid_values (theme.table_grid_width || [border_width[:top], border_width[:left]]), 0).to_h
 
         if table_header_size
           head_border_bottom_color = theme.table_head_border_bottom_color || grid_color[:rows]
@@ -2239,7 +2244,7 @@ module Asciidoctor
           alignment = theme.table_align&.to_sym || :left
         end
 
-        caption_side = theme.table_caption_side&.to_sym || :top
+        caption_end = theme.table_caption_end&.to_sym || :top
         caption_max_width = theme.table_caption_max_width || 'fit-content'
 
         table_settings = {
@@ -2268,7 +2273,7 @@ module Asciidoctor
         table table_data, table_settings do
           # NOTE: call width to capture resolved table width
           table_width = width
-          @pdf.ink_table_caption node, alignment, table_width, caption_max_width if node.title? && caption_side == :top
+          @pdf.ink_table_caption node, alignment, table_width, caption_max_width if node.title? && caption_end == :top
           # NOTE: align using padding instead of bounding_box as prawn-table does
           # using a bounding_box across pages mangles the margin box of subsequent pages
           if alignment != :left && table_width != (this_bounds = @pdf.bounds).width
@@ -2341,7 +2346,7 @@ module Asciidoctor
           bounds.subtract_left_padding left_padding
           bounds.subtract_right_padding right_padding if right_padding
         end
-        ink_table_caption node, alignment, table_width, caption_max_width, caption_side if node.title? && caption_side == :bottom
+        ink_table_caption node, alignment, table_width, caption_max_width, caption_end if node.title? && caption_end == :bottom
         theme_margin :block, :bottom, (next_enclosed_block node)
       rescue ::Prawn::Errors::CannotFit
         log :error, (message_with_context 'cannot fit contents of table cell into specified column width', source_location: node.source_location)
@@ -2349,12 +2354,14 @@ module Asciidoctor
 
       def convert_thematic_break node
         theme_margin :thematic_break, :top
-        stroke_horizontal_rule @theme.thematic_break_border_color, line_width: @theme.thematic_break_border_width, line_style: (@theme.thematic_break_border_style&.to_sym || :solid)
+        stroke_horizontal_rule @theme.thematic_break_border_color,
+          line_width: @theme.thematic_break_border_width,
+          line_style: (@theme.thematic_break_border_style&.to_sym || :solid)
         theme_margin :thematic_break, ((block_next = next_enclosed_block node) ? :bottom : :top), block_next || true
       end
 
       def convert_toc node, opts = {}
-        # NOTE: only allow document to have a single toc
+        # NOTE: only allow document to have a single managed toc
         return if @toc_extent
         is_macro = (placement = opts[:placement] || 'macro') == 'macro'
         if ((doc = node.document).attr? 'toc-placement', placement) && (doc.attr? 'toc') && doc.sections?
@@ -2363,11 +2370,11 @@ module Asciidoctor
             start_new_page if @ppbook && verso_page? && !(is_macro && (node.option? 'nonfacing'))
           end
           add_dest_for_block node, id: (node.id || 'toc') if is_macro
-          allocate_toc doc, (doc.attr 'toclevels', 2).to_i, cursor, (title_page_on = is_book || (doc.attr? 'title-page'))
-          @index.start_page_number = @toc_extent.to.page + 1 if title_page_on && @theme.page_numbering_start_at == 'after-toc'
+          toc_extent = @toc_extent = allocate_toc doc, (doc.attr 'toclevels', 2).to_i, cursor, (title_page_on = is_book || (doc.attr? 'title-page'))
+          @index.start_page_number = toc_extent.to.page + 1 if title_page_on && @theme.page_numbering_start_at == 'after-toc'
           if is_macro
-            @disable_running_content[:header] += @toc_extent.page_range if node.option? 'noheader'
-            @disable_running_content[:footer] += @toc_extent.page_range if node.option? 'nofooter'
+            @disable_running_content[:header] += toc_extent.page_range if node.option? 'noheader'
+            @disable_running_content[:footer] += toc_extent.page_range if node.option? 'nofooter'
           end
         end
         nil
@@ -2385,7 +2392,7 @@ module Asciidoctor
 
         if at_page_top?
           if page_layout && page_layout != page.layout && page.empty?
-            delete_page
+            delete_current_page
             advance_page layout: page_layout
           end
         elsif page_layout
@@ -2395,8 +2402,9 @@ module Asciidoctor
         end
       end
 
-      def convert_index_section _node
+      def convert_index_section node
         space_needed_for_category = @theme.description_list_term_spacing + (2 * (height_of_typeset_text 'A'))
+        pagenum_sequence_style = node.document.attr 'index-pagenum-sequence-style'
         column_box [0, cursor], columns: @theme.index_columns, width: bounds.width, reflow_margins: true do
           def @bounding_box.move_past_bottom *args # rubocop:disable Lint/NestedMethodDefinition
             super(*args)
@@ -2409,8 +2417,8 @@ module Asciidoctor
               align: :left,
               inline_format: false,
               margin_bottom: @theme.description_list_term_spacing,
-              style: @theme.description_list_term_font_style.to_sym
-            category.terms.each {|term| convert_index_list_item term }
+              style: @theme.description_list_term_font_style&.to_sym
+            category.terms.each {|term| convert_index_list_item term, pagenum_sequence_style }
             # NOTE: see previous note for why we can't use margin_bottom method
             if @theme.prose_margin_bottom > y - reference_bounds.absolute_bottom
               bounds.move_past_bottom
@@ -2422,13 +2430,24 @@ module Asciidoctor
         nil
       end
 
-      def convert_index_list_item term
+      def convert_index_list_item term, pagenum_sequence_style = nil
         text = escape_xml term.name
         unless term.container?
           if @media == 'screen'
-            pagenums = term.dests.map {|dest| %(<a anchor="#{dest[:anchor]}">#{dest[:page]}</a>) }
+            case pagenum_sequence_style
+            when 'page'
+              pagenums = term.dests.uniq {|dest| dest[:page] }.map {|dest| %(<a anchor="#{dest[:anchor]}">#{dest[:page]}</a>) }
+            when 'range'
+              first_anchor_per_page = term.dests.each_with_object({}) {|dest, accum| accum[dest[:page]] ||= dest[:anchor] }
+              pagenums = (consolidate_ranges first_anchor_per_page.keys).map do |range|
+                anchor = first_anchor_per_page[(range.include? '-') ? (range.partition '-')[0] : range]
+                %(<a anchor="#{anchor}">#{range}</a>)
+              end
+            else # term
+              pagenums = term.dests.map {|dest| %(<a anchor="#{dest[:anchor]}">#{dest[:page]}</a>) }
+            end
           else
-            pagenums = consolidate_ranges term.dests.uniq {|dest| dest[:page] }.map {|dest| dest[:page] } # rubocop:disable Lint/AmbiguousBlockAssociation
+            pagenums = consolidate_ranges term.dests.map {|dest| dest[:page] }.uniq
           end
           text = %(#{text}, #{pagenums.join ', '})
         end
@@ -2436,7 +2455,7 @@ module Asciidoctor
         ink_prose text, align: :left, margin: 0, hanging_indent: subterm_indent * 2
         indent subterm_indent do
           term.subterms.each do |subterm|
-            convert_index_list_item subterm
+            convert_index_list_item subterm, pagenum_sequence_style
           end
         end unless term.leaf?
       end
@@ -2991,7 +3010,7 @@ module Asciidoctor
             }.merge(opts)
           end
           if h_category && @theme[%(#{h_category}_border_width)] &&
-              @theme[%(#{h_category}_border_color)] && page_number == start_page_number
+              (@theme[%(#{h_category}_border_color)] || @theme.base_border_color) && page_number == start_page_number
             float do
               bounding_box [bounds.left, start_cursor], width: bounds.width, height: start_cursor - cursor do
                 theme_fill_and_stroke_bounds h_category
@@ -3112,7 +3131,7 @@ module Asciidoctor
           end
         end
         theme_font_cascade [:caption, category_caption] do
-          if ((opts.delete :side) || :top) == :top
+          if ((opts.delete :end) || (opts.delete :side) || :top) == :top
             margin = { top: caption_margin_outside, bottom: caption_margin_inside }
           else
             margin = { top: caption_margin_inside, bottom: caption_margin_outside }
@@ -3140,8 +3159,8 @@ module Asciidoctor
       end
 
       # Render the caption for a table and return the height of the rendered content
-      def ink_table_caption node, table_alignment = :left, table_width = nil, max_width = nil, side = :top
-        ink_caption node, category: :table, side: side, block_align: table_alignment, block_width: table_width, max_width: max_width
+      def ink_table_caption node, table_alignment = :left, table_width = nil, max_width = nil, end_ = :top
+        ink_caption node, category: :table, end: end_, block_align: table_alignment, block_width: table_width, max_width: max_width
       end
 
       def allocate_toc doc, toc_num_levels, toc_start_cursor, title_page_on
@@ -3163,7 +3182,11 @@ module Asciidoctor
           extent.each_page {|first_page| start_new_page unless first_page }
           move_cursor_to extent.to.cursor
         end
-        @toc_extent = extent
+        extent
+      end
+
+      def get_entries_for_toc node
+        node.sections
       end
 
       # NOTE: num_front_matter_pages not used during a dry run
@@ -3199,7 +3222,7 @@ module Asciidoctor
             }
           end
           theme_margin :toc, :top
-          ink_toc_level doc.sections, num_levels, dot_leader, num_front_matter_pages
+          ink_toc_level (get_entries_for_toc doc), num_levels, dot_leader, num_front_matter_pages
         end
         # NOTE: range must be calculated relative to toc_page_number; absolute page number in scratch document is arbitrary
         toc_page_numbers = (toc_page_number..(toc_page_number + (page_number - start_page_number)))
@@ -3207,38 +3230,48 @@ module Asciidoctor
         toc_page_numbers
       end
 
-      def ink_toc_level sections, num_levels, dot_leader, num_front_matter_pages
+      def ink_toc_level entries, num_levels, dot_leader, num_front_matter_pages
         # NOTE: font options aren't always reliable, so store size separately
         toc_font_info = theme_font :toc do
           { font: font, size: @font_size }
         end
         hanging_indent = @theme.toc_hanging_indent
-        sections.each do |sect|
-          next if (num_levels_for_sect = (sect.attr 'toclevels', num_levels).to_i) < sect.level
-          theme_font :toc, level: (sect.level + 1) do
-            sect_title = @text_transform ? (transform_text sect.numbered_title, @text_transform) : sect.numbered_title
-            next if sect_title.empty?
+        entries.each do |entry|
+          next if (num_levels_for_entry = (entry.attr 'toclevels', num_levels).to_i) < (entry_level = entry.level + 1).pred
+          theme_font :toc, level: entry_level do
+            next unless (entry_anchor = (entry.attr 'pdf-anchor') || entry.id)
+            entry_title = entry.context == :section ? entry.numbered_title : (entry.title? ? entry.title : (entry.xreftext 'basic'))
+            next if entry_title.empty?
+            entry_title = transform_text entry_title, @text_transform if @text_transform
             pgnum_label_placeholder_width = rendered_width_of_string '0' * @toc_max_pagenum_digits
-            # NOTE: only write section title (excluding dots and page number) if this is a dry run
+            # NOTE: only write title (excluding dots and page number) if this is a dry run
             if scratch?
               indent 0, pgnum_label_placeholder_width do
                 # NOTE: must wrap title in empty anchor element in case links are styled with different font family / size
-                ink_prose sect_title, anchor: true, normalize: false, hanging_indent: hanging_indent, normalize_line_height: true, margin: 0
+                ink_prose entry_title, anchor: true, normalize: false, hanging_indent: hanging_indent, normalize_line_height: true, margin: 0
               end
             else
-              physical_pgnum = sect.attr 'pdf-page-start'
-              virtual_pgnum = physical_pgnum - num_front_matter_pages
-              pgnum_label = (virtual_pgnum < 1 ? (RomanNumeral.new physical_pgnum, :lower) : virtual_pgnum).to_s
+              if !(physical_pgnum = entry.attr 'pdf-page-start') &&
+                  (target_page_ref = (get_dest entry_anchor)&.first) &&
+                  (target_page_idx = state.pages.index {|candidate| candidate.dictionary == target_page_ref })
+                physical_pgnum = target_page_idx + 1
+              end
+              if physical_pgnum
+                virtual_pgnum = physical_pgnum - num_front_matter_pages
+                pgnum_label = (virtual_pgnum < 1 ? (RomanNumeral.new physical_pgnum, :lower) : virtual_pgnum).to_s
+              else
+                pgnum_label = '?'
+              end
               start_page_number = page_number
               start_cursor = cursor
               start_dots = nil
-              sect_title_inherited = (apply_text_decoration ::Set.new, :toc, sect.level.next).merge anchor: (sect_anchor = sect.attr 'pdf-anchor'), color: @font_color
+              entry_title_inherited = (apply_text_decoration ::Set.new, :toc, entry_level).merge anchor: entry_anchor, color: @font_color
               # NOTE: use text formatter to add anchor overlay to avoid using inline format with synthetic anchor tag
-              sect_title_fragments = text_formatter.format sect_title, inherited: sect_title_inherited
+              entry_title_fragments = text_formatter.format entry_title, inherited: entry_title_inherited
               line_metrics = calc_line_metrics @base_line_height
               indent 0, pgnum_label_placeholder_width do
-                (sect_title_fragments[-1][:callback] ||= []) << (last_fragment_pos = ::Asciidoctor::PDF::FormattedText::FragmentPositionRenderer.new)
-                typeset_formatted_text sect_title_fragments, line_metrics, hanging_indent: hanging_indent, normalize_line_height: true
+                (entry_title_fragments[-1][:callback] ||= []) << (last_fragment_pos = ::Asciidoctor::PDF::FormattedText::FragmentPositionRenderer.new)
+                typeset_formatted_text entry_title_fragments, line_metrics, hanging_indent: hanging_indent, normalize_line_height: true
                 start_dots = last_fragment_pos.right + hanging_indent
                 last_fragment_cursor = last_fragment_pos.top + line_metrics.padding_top
                 start_cursor = last_fragment_cursor if last_fragment_pos.page_number > start_page_number || (start_cursor - last_fragment_cursor) > line_metrics.height
@@ -3246,7 +3279,7 @@ module Asciidoctor
               end_cursor = cursor
               move_cursor_to start_cursor
               # NOTE: we're guaranteed to be on the same page as the final line of the entry
-              if dot_leader[:width] > 0 && (dot_leader[:levels].include? sect.level)
+              if dot_leader[:width] > 0 && (dot_leader[:levels].include? entry_level.pred)
                 pgnum_label_width = rendered_width_of_string pgnum_label
                 pgnum_label_font_settings = { color: @font_color, font: font_family, size: @font_size, styles: font_styles }
                 save_font do
@@ -3258,18 +3291,18 @@ module Asciidoctor
                   typeset_formatted_text [
                     { text: dot_leader[:text] * num_dots, color: dot_leader[:font_color] },
                     dot_leader[:spacer],
-                    ({ text: pgnum_label, anchor: sect_anchor }.merge pgnum_label_font_settings),
+                    ({ text: pgnum_label, anchor: entry_anchor }.merge pgnum_label_font_settings),
                   ], line_metrics, align: :right
                 end
               else
-                typeset_formatted_text [{ text: pgnum_label, color: @font_color, anchor: sect_anchor }], line_metrics, align: :right
+                typeset_formatted_text [{ text: pgnum_label, color: @font_color, anchor: entry_anchor }], line_metrics, align: :right
               end
               move_cursor_to end_cursor
             end
           end
           indent @theme.toc_indent do
-            ink_toc_level sect.sections, num_levels_for_sect, dot_leader, num_front_matter_pages
-          end if num_levels_for_sect > sect.level
+            ink_toc_level (get_entries_for_toc entry), num_levels_for_entry, dot_leader, num_front_matter_pages
+          end if num_levels_for_entry >= entry_level
         end
       end
 
@@ -3437,7 +3470,7 @@ module Asciidoctor
           theme_font periphery do
             canvas do
               bounding_box [trim_styles[:content_left][side], trim_styles[:top][side]], width: trim_styles[:content_width][side], height: trim_styles[:height] do
-                if (trim_column_rule_width = trim_styles[:column_rule_width]) > 0
+                if trim_styles[:column_rule_color] && (trim_column_rule_width = trim_styles[:column_rule_width]) > 0
                   trim_column_rule_spacing = trim_styles[:column_rule_spacing]
                 else
                   trim_column_rule_width = nil
@@ -3545,12 +3578,12 @@ module Asciidoctor
             # NOTE: we've already verified this property is set
             height: (trim_height = @theme[%(#{periphery}_height)]),
             bg_color: (resolve_theme_color %(#{periphery}_background_color).to_sym),
-            border_color: (trim_border_color = resolve_theme_color %(#{periphery}_border_color).to_sym),
+            border_width: (trim_border_width = @theme[%(#{periphery}_border_width)] || 0),
+            border_color: trim_border_width > 0 ? (resolve_theme_color %(#{periphery}_border_color).to_sym, @theme.base_border_color) : nil,
             border_style: (@theme[%(#{periphery}_border_style)]&.to_sym || :solid),
-            border_width: (trim_border_width = trim_border_color ? @theme[%(#{periphery}_border_width)] || @theme.base_border_width : 0),
-            column_rule_color: (trim_column_rule_color = resolve_theme_color %(#{periphery}_column_rule_color).to_sym),
+            column_rule_width: (trim_column_rule_width = @theme[%(#{periphery}_column_rule_width)] || 0),
+            column_rule_color: trim_column_rule_width > 0 ? (resolve_theme_color %(#{periphery}_column_rule_color).to_sym) : nil,
             column_rule_style: (@theme[%(#{periphery}_column_rule_style)]&.to_sym || :solid),
-            column_rule_width: (trim_column_rule_color ? @theme[%(#{periphery}_column_rule_width)] || 0 : 0),
             column_rule_spacing: (@theme[%(#{periphery}_column_rule_spacing)] || 0),
             valign: valign_offset ? [valign, valign_offset] : valign,
             img_valign: @theme[%(#{periphery}_image_vertical_align)],
@@ -3718,8 +3751,9 @@ module Asciidoctor
         outline.define do
           initial_pagenum = has_front_cover ? 2 : 1
           # FIXME: use sanitize: :plain_text on Document#doctitle once available
-          if document.page_count >= initial_pagenum && (doctitle = document.resolve_doctitle doc)
-            page title: (document.sanitize doctitle), destination: (document.dest_top initial_pagenum)
+          if document.page_count >= initial_pagenum && (outline_title = doc.attr 'outline-title') &&
+              (outline_title.empty? ? (outline_title = document.resolve_doctitle doc) : outline_title)
+            page title: (document.sanitize outline_title), destination: (document.dest_top initial_pagenum)
           end
           # QUESTION: is there any way to get add_outline_level to invoke in the context of the outline?
           document.add_outline_level self, doc.sections, num_levels, expand_levels
@@ -3781,7 +3815,14 @@ module Asciidoctor
           pdf_doc.render_file target
           # QUESTION: restore attributes first?
           @pdfmark&.generate_file target
-          (Optimizer.new @optimize, pdf_doc.min_version).optimize_file target if @optimize
+          if (quality = @optimize)
+            if quality.include? ','
+              quality, compliance = quality.split ',', 2
+            elsif quality.include? '/'
+              quality, compliance = nil, quality
+            end
+            (Optimizer.new quality, pdf_doc.min_version, compliance).optimize_file target
+          end
           to_file = true
         end
         if !ENV['KEEP_ARTIFACTS']
@@ -3833,7 +3874,7 @@ module Asciidoctor
       end
 
       def resolve_text_transform key, use_fallback = true
-        if (transform = ::Hash === key ? (key.delete :text_transform) : @theme[key.to_s])
+        if (transform = ::Hash === key ? (key.delete :text_transform) : @theme[key])
           transform == 'none' ? nil : transform
         elsif use_fallback
           @text_transform
@@ -3842,9 +3883,9 @@ module Asciidoctor
 
       # QUESTION: should we pass a category as an argument?
       # QUESTION: should we make this a method on the theme ostruct? (e.g., @theme.resolve_color key, fallback)
-      def resolve_theme_color key, fallback_color = nil
-        if (color = @theme[key.to_s]) && color != 'transparent'
-          color
+      def resolve_theme_color key, fallback_color = nil, transparent_color = fallback_color
+        if (color = @theme[key])
+          color == 'transparent' ? transparent_color : color
         else
           fallback_color
         end
@@ -3855,7 +3896,7 @@ module Asciidoctor
       end
 
       def theme_fill_and_stroke_bounds category, opts = {}
-        fill_and_stroke_bounds opts[:background_color], @theme[%(#{category}_border_color)],
+        fill_and_stroke_bounds opts[:background_color], @theme[%(#{category}_border_color)] || @theme.base_border_color,
           line_width: @theme[%(#{category}_border_width)],
           line_style: (@theme[%(#{category}_border_style)]&.to_sym || :solid),
           radius: @theme[%(#{category}_border_radius)]
@@ -3881,11 +3922,9 @@ module Asciidoctor
           ink_caption node_with_caption, category: category if node_with_caption
           return
         end
-        if (b_color = @theme[%(#{category}_border_color)]) == 'transparent'
-          b_color = @page_bg_color
-        end
+        b_color = resolve_theme_color %(#{category}_border_color).to_sym, @theme.base_border_color, @page_bg_color
         b_radius ||= (@theme[%(#{category}_border_radius)] || 0) + (b_width || 0)
-        if b_width && b_color
+        if b_width
           if b_color == @page_bg_color # let page background cut into block background
             b_gap_color, b_shift = @page_bg_color, (b_width * 0.5)
           elsif (b_gap_color = bg_color) && b_gap_color != b_color

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

@@ -14,6 +14,14 @@ class PDF::Core::Page
     content.stream.filtered_stream == (@tare_content_stream ||= InitialPageContent) && document.page_number > 0
   end
 
+  # Flags this page as imported.
+  #
+  def imported
+    @imported_page = true
+  end
+
+  alias imported_page imported
+
   # Reset the content of the page.
   # Note that this method may leave behind an orphaned background image.
   def reset_content

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

@@ -103,7 +103,7 @@ module Asciidoctor
       NewPageRequiredError = ::Class.new ::StopIteration
 
       InhibitNewPageProc = proc do |pdf|
-        pdf.delete_page
+        pdf.delete_current_page
         raise NewPageRequiredError
       end
 
@@ -111,7 +111,7 @@ module Asciidoctor
 
       DetectEmptyFirstPageProc = proc do |delegate, pdf|
         if pdf.state.pages[pdf.page_number - 2].empty?
-          pdf.delete_page
+          pdf.delete_current_page
           raise NewPageRequiredError
         end
         delegate.call pdf if (pdf.state.on_page_create_callback = delegate)
@@ -269,6 +269,20 @@ module Asciidoctor
         dest_xyz 0, page_height, nil, (page_num ? state.pages[page_num - 1] : page)
       end
 
+      # Gets the destination registered for the specified name. The return value
+      # matches that which was passed to the add_dest method.
+      #
+      def get_dest name, node = dests.data
+        node.children.each do |child|
+          if ::PDF::Core::NameTree::Value === child
+            return child.value.data if child.name == name
+          elsif (found = get_dest name, child)
+            return found
+          end
+        end
+        nil
+      end
+
       # Fonts
 
       # Registers a new custom font described in the data parameter
@@ -495,6 +509,8 @@ module Asciidoctor
           lowercase_pcdata text
         when :capitalize, 'capitalize'
           capitalize_words_pcdata text
+        when :smallcaps, 'smallcaps'
+          smallcaps_pcdata text
         else
           text
         end
@@ -823,7 +839,7 @@ module Asciidoctor
 
       # Deletes the current page and move the cursor
       # to the previous page.
-      def delete_page
+      def delete_current_page
         pg = page_number
         pdf_store = state.store
         content_id = page.content.identifier
@@ -857,7 +873,7 @@ module Asciidoctor
         prev_page_size = page.size
         state.compress = false if state.compress # can't use compression if using template
         prev_text_rendering_mode = (defined? @text_rendering_mode) ? @text_rendering_mode : nil
-        delete_page if options[:replace]
+        delete_current_page if options[:replace]
         # NOTE: use functionality provided by prawn-templates
         start_new_page_discretely template: file, template_page: options[:page]
         # prawn-templates sets text_rendering_mode to :unknown, which breaks running content; revert
@@ -869,11 +885,11 @@ module Asciidoctor
           # way atm to prevent the size & layout of the imported page from affecting subsequent pages
           advance_page size: prev_page_size, layout: prev_page_layout if options.fetch :advance, true
         elsif options.fetch :advance_if_missing, true
-          delete_page
+          delete_current_page
           # NOTE: see previous comment
           advance_page size: prev_page_size, layout: prev_page_layout
         else
-          delete_page
+          delete_current_page
         end
         nil
       end

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

@@ -99,7 +99,7 @@ module Prawn
           apply_font_properties { pdf.traverse content }
           if (extra_pages = pdf.page_number - start_page) > 0
             logger.error %(the table cell on page #{start_page} has been truncated; Asciidoctor PDF does not support table cell content that exceeds the height of a single page) unless extra_pages == 1 && pdf.page.empty?
-            extra_pages.times { pdf.delete_page }
+            extra_pages.times { pdf.delete_current_page }
           end
           nil
         end

data/lib/asciidoctor/pdf/nopngmagick.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+Prawn.image_handler.register! Prawn::Images::PNG if defined? GMagick::Image

data/lib/asciidoctor/pdf/optimizer.rb

@@ -40,9 +40,10 @@ module Asciidoctor
       attr_reader :quality
       attr_reader :compatibility_level
 
-      def initialize quality = 'default', compatibility_level = '1.4'
+      def initialize quality = 'default', compatibility_level = '1.4', compliance = 'PDF'
         @quality = QUALITY_NAMES[quality]
         @compatibility_level = compatibility_level
+        @compliance = compliance
         if (gs_path = ::ENV['GS'])
           ::RGhost::Config::GS[:path] = gs_path
         end
@@ -57,10 +58,16 @@ module Asciidoctor
           else
             inputs = target
           end
-          (::RGhost::Convert.new inputs).to :pdf,
-            filename: filename_tmp.to_s,
-            quality: @quality,
-            d: { Printed: false, CannotEmbedFontPolicy: '/Warning', CompatibilityLevel: @compatibility_level }
+          d = { Printed: false, CannotEmbedFontPolicy: '/Warning', CompatibilityLevel: @compatibility_level }
+          case @compliance
+          when 'PDF/A', 'PDF/A-1', 'PDF/A-2', 'PDF/A-3'
+            d[:PDFA] = ((@compliance.split '-', 2)[1] || 1).to_i
+            d[:ShowAnnots] = false
+          when 'PDF/X', 'PDF/X-1', 'PDF/X-3'
+            d[:PDFX] = true
+            d[:ShowAnnots] = false
+          end
+          (::RGhost::Convert.new inputs).to :pdf, filename: filename_tmp.to_s, quality: @quality, d: d
           filename_o.binwrite filename_tmp.binread
         end
         nil

data/lib/asciidoctor/pdf/text_transformer.rb

@@ -10,6 +10,12 @@ module Asciidoctor
       WordRx = /\p{Word}+/
       Hyphen = '-'
       SoftHyphen = ?\u00ad
+      LowerAlphaChars = 'a-z'
+      # NOTE: use more widely-supported ғ instead of ꜰ as replacement for F
+      # NOTE: use more widely-supported ǫ instead of ꞯ as replacement for Q
+      # NOTE: use more widely-supported s (lowercase latin "s") instead of ꜱ as replacement for S
+      # NOTE: in small caps, x (lowercase latin "x") remains unchanged
+      SmallCapsChars = 'ᴀʙᴄᴅᴇғɢʜɪᴊᴋʟᴍɴoᴘǫʀsᴛᴜᴠᴡxʏᴢ'
 
       def capitalize_words_pcdata string
         if XMLMarkupRx.match? string
@@ -50,6 +56,14 @@ module Asciidoctor
           string.upcase
         end
       end
+
+      def smallcaps_pcdata string
+        if XMLMarkupRx.match? string
+          string.gsub(PCDATAFilterRx) { $2 ? ($2.tr LowerAlphaChars, SmallCapsChars) : $1 }
+        else
+          string.tr LowerAlphaChars, SmallCapsChars
+        end
+      end
     end
   end
 end

data/lib/asciidoctor/pdf/theme_loader.rb

@@ -15,7 +15,7 @@ module Asciidoctor
       BaseThemePath = ::File.join ThemesDir, 'base-theme.yml'
       BundledThemeNames = (::Dir.children ThemesDir).map {|it| it.slice 0, it.length - 10 }
       DeprecatedCategoryKeys = { 'blockquote' => 'quote', 'key' => 'kbd', 'literal' => 'codespan', 'outline_list' => 'list' }
-      AmbiguousAlignKeys = %w(base heading heading_h1 heading_h2 heading_h3 heading_h4 heading_h5 heading_h6 title_page abstract abstract_title admonition_label sidebar_title toc_title).each_with_object({}) do |prefix, accum|
+      DeprecatedKeys = %w(base heading heading_h1 heading_h2 heading_h3 heading_h4 heading_h5 heading_h6 title_page abstract abstract_title admonition_label sidebar_title toc_title).each_with_object({ 'table_caption_side' => 'table_caption_end' }) do |prefix, accum|
         accum[%(#{prefix}_align)] = %(#{prefix}_text_align)
       end
       PaddingBottomHackKeys = %w(example_padding quote_padding sidebar_padding verse_padding)
@@ -171,7 +171,7 @@ module Asciidoctor
           val.each do |subkey, subval|
             process_entry %(#{key}_#{key == 'role' || !(subkey.include? '-') ? subkey : (subkey.tr '-', '_')}), subval, data
           end
-        elsif (rekey = AmbiguousAlignKeys[key]) ||
+        elsif (rekey = DeprecatedKeys[key]) ||
             ((key.start_with? 'role_') && (key.end_with? '_align') && (rekey = key.sub RoleAlignKeyRx, '_text_align'))
           data[rekey] = evaluate val, data
         elsif PaddingBottomHackKeys.include? key
@@ -222,7 +222,7 @@ module Asciidoctor
         var = var.tr '-', '_' if var.include? '-'
         if (vars.respond_to? var) ||
             DeprecatedCategoryKeys.any? {|old, new| (var.start_with? old + '_') && (vars.respond_to? (replace = new + (var.slice old.length, var.length))) && (var = replace) } ||
-            ((replace = AmbiguousAlignKeys[var]) && (vars.respond_to? replace) && (var = replace))
+            ((replace = DeprecatedKeys[var]) && (vars.respond_to? replace) && (var = replace))
           vars[var]
         else
           logger.warn %(unknown variable reference in PDF theme: #{ref})

data/lib/asciidoctor/pdf/version.rb

@@ -2,6 +2,6 @@
 
 module Asciidoctor
   module PDF
-    VERSION = '2.0.0.alpha.3'
+    VERSION = '2.0.0.beta.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-pdf
 version: !ruby/object:Gem::Version
-  version: 2.0.0.alpha.3
+  version: 2.0.0.beta.1
 platform: ruby
 authors:
 - Dan Allen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-01 00:00:00.000000000 Z
+date: 2022-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -291,6 +291,7 @@ files:
 - lib/asciidoctor/pdf/index_catalog.rb
 - lib/asciidoctor/pdf/measurements.rb
 - lib/asciidoctor/pdf/nogmagick.rb
+- lib/asciidoctor/pdf/nopngmagick.rb
 - lib/asciidoctor/pdf/optimizer.rb
 - lib/asciidoctor/pdf/pdfmark.rb
 - lib/asciidoctor/pdf/roman_numeral.rb