asciidoctor-pdf 1.5.2 → 1.6.1

data/asciidoctor-pdf.gemspec

@@ -14,10 +14,10 @@ Gem::Specification.new do |s|
   s.homepage = 'https://asciidoctor.org/docs/asciidoctor-pdf'
   s.license = 'MIT'
   # NOTE required ruby version is informational only; it's not enforced since it can't be overridden and can cause builds to break
-  #s.required_ruby_version = '>= 2.3.0'
+  #s.required_ruby_version = '>= 2.5.0'
   s.metadata = {
     'bug_tracker_uri' => 'https://github.com/asciidoctor/asciidoctor-pdf/issues',
-    'changelog_uri' => 'https://github.com/asciidoctor/asciidoctor-pdf/blob/master/CHANGELOG.adoc',
+    'changelog_uri' => 'https://github.com/asciidoctor/asciidoctor-pdf/blob/main/CHANGELOG.adoc',
     'mailing_list_uri' => 'http://discuss.asciidoctor.org',
     'source_code_uri' => 'https://github.com/asciidoctor/asciidoctor-pdf'
   }
@@ -28,30 +28,27 @@ Gem::Specification.new do |s|
   rescue
     files = Dir['**/*']
   end
-  s.files = files.grep %r/^(?:(?:data|lib)\/.+|docs\/theming-guide\.adoc|(?:CHANGELOG|LICENSE|NOTICE|README)\.adoc|\.yardopts|#{s.name}\.gemspec)$/
+  s.files = files.grep %r/^(?:(?:data|lib)\/.+|docs\/theming-guide\.adoc|LICENSE|(?:CHANGELOG|NOTICE|README)\.adoc|\.yardopts|#{s.name}\.gemspec)$/
   s.executables = (files.grep %r/^bin\//).map {|f| File.basename f }
   s.require_paths = ['lib']
   #s.test_files = files.grep %r/^(?:test|spec|feature)\/.*$/
 
-  s.add_runtime_dependency 'asciidoctor', '>= 1.5.3', '< 3.0.0'
-  s.add_runtime_dependency 'prawn', '~> 2.2.0'
-  # NOTE ttfunk 1.6 generates TT instructions ghostscript cannot process, so lock the version of ttfunk
-  s.add_runtime_dependency 'ttfunk', ['~> 1.5.0'], ['>= 1.5.1']
-  # NOTE must use prawn-table from master branch (defined in Gemfile) for full functionality
+  s.add_runtime_dependency 'asciidoctor', '~> 2.0'
+  s.add_runtime_dependency 'prawn', '~> 2.4.0'
+  # NOTE must use prawn-table from head (defined in Gemfile) for full functionality
   s.add_runtime_dependency 'prawn-table', '~> 0.2.0'
   s.add_runtime_dependency 'prawn-templates', '~> 0.1.0'
-  s.add_runtime_dependency 'prawn-svg', '~> 0.30.0'
-  s.add_runtime_dependency 'prawn-icon', '~> 2.5.0'
+  s.add_runtime_dependency 'prawn-svg', '~> 0.32.0'
+  s.add_runtime_dependency 'prawn-icon', '~> 3.0.0'
   s.add_runtime_dependency 'safe_yaml', '~> 1.0.0'
-  s.add_runtime_dependency 'thread_safe', '~> 0.3.0'
-  s.add_runtime_dependency 'concurrent-ruby', '~> 1.1.0'
+  s.add_runtime_dependency 'concurrent-ruby', '~> 1.1'
   s.add_runtime_dependency 'treetop', '~> 1.6.0'
 
   s.add_development_dependency 'rake', '~> 13.0.0'
-  s.add_development_dependency 'rspec', '~> 3.9.0'
+  s.add_development_dependency 'rspec', '~> 3.10.0'
   s.add_development_dependency 'pdf-inspector', '~> 1.3.0'
   # Asciidoctor PDF supports Rouge >= 2 (verified in CI build using 2.0.0)
   s.add_development_dependency 'rouge', '~> 3.0'
   s.add_development_dependency 'coderay', '~> 1.1.0'
-  s.add_development_dependency 'chunky_png', '~> 1.3.0'
+  s.add_development_dependency 'chunky_png', '~> 1.4.0'
 end

data/bin/asciidoctor-pdf-optimize

@@ -17,4 +17,4 @@ end
 
 quality = args[0] == '--quality' ? args[1].to_s : ''
 
-(Asciidoctor::PDF::Optimizer.new quality).generate_file filename
+(Asciidoctor::PDF::Optimizer.new quality).optimize_file filename

data/docs/theming-guide.adoc

@@ -141,7 +141,7 @@ Otherwise, Asciidoctor PDF will use built-in AFM fonts, which can result in miss
 
 [TIP]
 ====
-Instead of creating a theme from scratch, another option is to download the https://github.com/asciidoctor/asciidoctor-pdf/blob/master/data/themes/default-theme.yml[default-theme.yml] file from the source repository.
+Instead of creating a theme from scratch, another option is to download the https://github.com/asciidoctor/asciidoctor-pdf/blob/main/data/themes/default-theme.yml[default-theme.yml] file from the source repository.
 Save the file using a unique name (e.g., _custom-theme.yml_) and start hacking on it.
 
 Alternatively, you can snag the file from your local installation using the following command:
@@ -752,8 +752,9 @@ A sans-serif font that provides a very complete set of Unicode glyphs.
 Cannot be styled as italic, bold or bold_italic.
 Used as the fallback font in the `default-with-fallback-font` theme.
 
-TIP: If you want to specify the location of custom fonts using the `pdf-fontsdir` attribute, yet still be able to use the bundled fonts, you need to refer to the bundled fonts using the `GEM_FONTS_DIR` token.
-To do so, you can either a) prefix the path of the bundled font in the theme file with the segment `GEM_FONTS_DIR` (e.g., `GEM_FONTS_DIR/mplus1p-regular-fallback.ttf`, or b) use relative paths in the theme file and include `GEM_FONT_DIR` in the value of the `pdf-fontsdir` attribute separated by the location of your custom fonts using a semi-colon (e.g., `"path/to/your/fonts;GEM_FONTS_DIR"`).
+TIP: The default themes in 1.5.x do not include the `GEM_FONTS_DIR` prefix in the path of the bundled font files.
+Therefore, if you want to specify the location of custom fonts using the `pdf-fontsdir` attribute, yet still be able to use the bundled fonts, you need to refer to the bundled fonts using the `GEM_FONTS_DIR` token.
+To do so, you can either a) redeclare the bundle fonts in your theme and prefix the path with the segment `GEM_FONTS_DIR` (e.g., `GEM_FONTS_DIR/mplus1p-regular-fallback.ttf`, or b) include `GEM_FONT_DIR` in the value of the `pdf-fontsdir` attribute separated by the location of your custom fonts using a semi-colon (e.g., `"path/to/your/fonts;GEM_FONTS_DIR"`).
 
 === Custom Fonts
 
@@ -963,9 +964,9 @@ This nested structure is for organizational purposes only.
 All keys are flatted when the theme is loaded (e.g., `align` nested under `base` becomes `base-align`).
 
 The converter uses the values of these keys to control how most elements are arranged and styled in the PDF.
-The default values listed in this section get inherited from the https://github.com/asciidoctor/asciidoctor-pdf/blob/master/data/themes/base-theme.yml[base theme].
+The default values listed in this section get inherited from the https://github.com/asciidoctor/asciidoctor-pdf/blob/main/data/themes/base-theme.yml[base theme].
 
-IMPORTANT: The https://github.com/asciidoctor/asciidoctor-pdf/blob/master/data/themes/default-theme.yml[default theme] has a different set of values which are not shown in this guide.
+IMPORTANT: The https://github.com/asciidoctor/asciidoctor-pdf/blob/main/data/themes/default-theme.yml[default theme] has a different set of values which are not shown in this guide.
 
 When creating a theme, all keys are optional.
 Required keys are provided by the base theme.
@@ -1256,7 +1257,8 @@ To disable the image, use the value `none`.
 These margins and used when the value `prepress` is assigned to the `media` document attribute.
 If no cover is specified, the recto margin is not applied to the title page.
 To apply the recto margin to the title page, but not include a cover, assign the value `~` to the `front-cover-image` attribute.
-. The `toc` value only applies if the toc is in the default location (before the first page of the body).
+. Only works if the document uses a title page (i.e., doctype is book or `title-page` attribute is set)
+The `toc` value only applies if the toc is in the default location (before the first page of the body).
 If the toc macro is used to position the toc, the start-at behavior is the same as if the toc is not enabled.
 If value is an integer, page numbering will start at the specified page of the body (i.e., 1 is first page, 2 is second page, etc.)
 
@@ -3363,7 +3365,7 @@ The keys in this category control the arrangement of block images.
 |font-style
 |<<font-styles,Font style>> +
 (default: normal)
-|iamge:
+|image:
   alt:
     font-style: italic
 
@@ -3382,8 +3384,9 @@ The keys in this category control the arrangement of block images.
     max-width: fit-content
 |===
 
-. Only applies to block images.
-If specified, this value takes precedence over the value of the `width` attribute on the image macro, but not over the value of the `pdfwidth` attribute.
+. Only applies to block images that don't have either a `pdfwidth` or `scaledwidth` attribute on the image macro.
+If specified, this value takes precedence over the value of the `width` attribute on the image macro, but not over the value of the `pdfwidth` or `scaledwidth` attributes.
+This key accepts the same values as the `pdfwidth` attribute.
 . The border is only used if a border color is specified, the border width is specified, the border width is greater than 0, and the `noborder` role is not present.
 The border is drawn above the image on the inside of the box reserved for the image.
 . The value `auto` means the border should expand to fit the width of the container (i.e., full width) instead of the image.
@@ -3639,8 +3642,8 @@ The subject stop can be customized using the `subject-stop` attribute.
 [source,asciidoc]
 ----
 [unordered]
-* alpha:: partially complete and unstable
-* beta:: feature complete and undergoing testing
+alpha:: partially complete and unstable
+beta:: feature complete and undergoing testing
 ----
 ====
 
@@ -4135,7 +4138,7 @@ Since Asciidoctor 2, table stripes are not enabled by default (e.g., `stripes=no
 [#keys-footnotes]
 === Footnotes
 
-The keys in this catagory control the style of the footnotes list at the end of the chapter (book) or document (otherwise).
+The keys in this category control the style of the footnotes list at the end of the chapter (book) or document (otherwise).
 If the `footnotes-title` attribute is specified, it is styled as a block caption.
 The styling of the links is controlled by the global link styles.
 
@@ -4678,7 +4681,8 @@ To avoid this problem, reduce the height of the running content periphery or mak
 The `columns` key can also be defined one level up (on `header` or `footer`), in which case the setting will be inherited.
 Where the page sides fall in relation to the physical or printed page number is controlled using the `pdf-folio-placement` attribute (except when `media=prepress`, which implies `physical`).
 . `<position>` can be `left`, `center` or `right`.
-. The `toc` value only applies if the toc is in the default location (before the first page of the body).
+. Only works if the document uses a title page (i.e., doctype is book or `title-page` attribute is set)
+The `toc` value only applies if the toc is in the default location (before the first page of the body).
 If the toc macro is used to position the toc, the start-at behavior is the same as if the toc is not enabled.
 If value is an integer, the running content will start at the specified page of the body (i.e., 1 is first page, 2 is second page, etc.)
 
@@ -4741,7 +4745,7 @@ footer:
 ----
 
 The `&shared_footer` assigns an ID to the YAML subtree under the `recto` key and the `*shared_footer` outputs a copy of it under the `verso` key.
-This technique can be used thoughout the theme file as it's a core feature of YAML.
+This technique can be used throughout the theme file as it's a core feature of YAML.
 
 ==== Attribute References
 
@@ -4762,7 +4766,7 @@ This feature allows you to have alternate lines that are selected when all the a
 One case where this is useful is when referencing the `page-number` attribute.
 If you unset the `pagenums` attribute on the document, any line in the running content that makes reference to `\{page-number}` will be dropped.
 
-You can also built-in AsciiDoc text replacements like `+(C)+`, numeric character references like `+&#169;+`, hexidecimal character references like `+&#x20ac;+`, and inline formatting (e.g., bold, italic, monospace).
+You can also use built-in AsciiDoc text replacements like `+(C)+`, numeric character references like `+&#169;+`, hexadecimal character references like `+&#x20ac;+`, and inline formatting (e.g., bold, italic, monospace).
 
 Here's an example that shows how attributes and replacements can be used in the running footer:
 
@@ -4836,7 +4840,7 @@ header:
     center:
       content: $header-recto-center-content
 ----
-<1> You can use the `image-vertical-align` key to slighly nudge the image up or down.
+<1> You can use the `image-vertical-align` key to slightly nudge the image up or down.
 
 CAUTION: By default, the image must fit in the allotted space for the running header or footer.
 Otherwise, you will run into layout issues.
@@ -5159,7 +5163,7 @@ Each style declaration accepts the following properties:
 * `inline_block` - fill the background color to the height of the line (Asciidoctor PDF only)
 * `extend` - extend the background color to the end of the line for a line-oriented match (Asciidoctor PDF only)
 
-Colors are defined using hexidecimal format (e.g., #ff0000 for red).
+Colors are defined using hexadecimal format (e.g., #ff0000 for red).
 
 Use the `Text` token to set the background color of the source block and the default text color.
 
@@ -5219,7 +5223,7 @@ When you override an inline element, you return pseudo-HTML, which is then parse
 
 The pseudo-HTML in Asciidoctor PDF evolved from the inline formatting in Prawn, now supporting the following elements: a, br, button, code, color, del, em, font, img, key, mark, span, strong, sub, sup.
 All decimal and hexadecimal character references are supported, as well as the named entities amp, apos, gt, lt, nbsp, and quot (e.g., `\&apos;`).
-You can change the font color using `rgb` attribue on the `color` element (e.g., `<color rgb="#ff0000">`) and the font family and size using `name` and `size` attributes on the `font` element, respectively (e.g., `<font name="sans" size="12">`).
+You can change the font color using the `rgb` attribute on the `color` element (e.g., `<color rgb="#ff0000">`) and the font family and size using the `name` and `size` attributes on the `font` element, respectively (e.g., `<font name="sans" size="12">`).
 You can also use the `style` attribute on `span` to control the font color, weight, and style using the relevant CSS property names.
 The pseudo-HTML in Asciidoctor PDF also supports the `class` attribute on any element for applying roles from the theme.
 (Though not recommended, you can pass this pseudo-HTML straight through to Prawn using an inline passthrough in AsciiDoc).
@@ -5239,7 +5243,7 @@ end
 ----
 
 As it stands, the converter doesn't do anything differently than the primary converter because we haven't yet overridden any of its methods.
-Let's do that now, starting by overriding the thematic break (aka horizonal rule) to make it render like a ribbon:
+Let's do that now, starting by overriding the thematic break (aka horizontal rule) to make it render like a ribbon:
 
 [source,ruby]
 ----
@@ -5405,12 +5409,12 @@ You may need to scale the glyph so it fits properly in the art box.
 IMPORTANT: If you're copying a non-visible character, be sure to set the width to 0 using menu:Metrics[Set Width...], enter 0 into *Set Width To*, then click btn:[OK].
 
 When you're done, save the font with the old-style kern table enabled.
-To do so, select menu:File[Generate Fonts...], click btn:[Options], and make sure only the following options are selected (equivalent to the flags 0x90 + 0x08):
+To do so, select menu:File[Generate Fonts...], select *TrueType*, click btn:[Options], make sure _only_ the following options are checked (equivalent to the flags 0x90 + 0x08):
 
 * [x] OpenType
  ** [x] Old style 'kern'
 
-Then click btn:[Generate] to generate and save the font.
+Then click btn:[OK], then uncheck *Validate Before Saving*, and finally click btn:[Generate] to generate and save the font.
 
 Your font file is now ready to be used with Asciidoctor PDF.
 
@@ -5420,5 +5424,5 @@ Performing all this font modification manually can be tedious (not to mention ha
 Fortunately, FontForge provides a {url-fontforge-scripting}[scripting interface], which you can use to automate the process.
 
 In fact, that's what we use to prepare the fonts that are bundled with Asciidoctor PDF.
-You can find that FontForge script, the Bash script that calls it, and the Docker image in which it is run in the https://github.com/asciidoctor/asciidoctor-pdf/tree/master/scripts[scripts directory] of this project.
+You can find that FontForge script, the Bash script that calls it, and the Docker image in which it is run in the https://github.com/asciidoctor/asciidoctor-pdf/tree/main/scripts[scripts directory] of this project.
 You can use that script as a starting point or reference for your own font preparation / modification script.

data/lib/asciidoctor/pdf/converter.rb

@@ -32,7 +32,7 @@ module Asciidoctor
       PygmentsRequirePath = ::File.join __dir__, 'ext/pygments'
       OptimizerRequirePath = ::File.join __dir__, 'optimizer'
 
-      AsciidoctorVersion = ::Gem::Version.create ::Asciidoctor::VERSION
+      AsciidoctorVersion = ::Gem::Version.new ::Asciidoctor::VERSION
       AdmonitionIcons = {
         caution: { name: 'fas-fire', stroke_color: 'BF3400', size: 24 },
         important: { name: 'fas-exclamation-circle', stroke_color: 'BF0000', size: 24 },
@@ -92,7 +92,7 @@ module Asciidoctor
         'circled' => (?\u2460..?\u2473).to_a,
         'filled' => (?\u2776..?\u277f).to_a + (?\u24eb..?\u24f4).to_a,
       }
-      SimpleAttributeRefRx = /(?<!\\)\{\w+(?:[\-]\w+)*\}/
+      SimpleAttributeRefRx = /(?<!\\)\{\w+(?:-\w+)*\}/
       MeasurementRxt = '\\d+(?:\\.\\d+)?(?:in|cm|mm|p[txc])?'
       MeasurementPartsRx = /^(\d+(?:\.\d+)?)(in|mm|cm|p[txc])?$/
       PageSizeRx = /^(?:\[(#{MeasurementRxt}), ?(#{MeasurementRxt})\]|(#{MeasurementRxt})(?: x |x)(#{MeasurementRxt})|\S+)$/
@@ -108,6 +108,7 @@ module Asciidoctor
       WhitespaceChars = ' ' + TAB + LF
       ValueSeparatorRx = /;|,/
       HexColorRx = /^#[a-fA-F0-9]{6}$/
+      VimeoThumbnailRx = /<thumbnail_url>(.*?)<\/thumbnail_url>/
       SourceHighlighters = %w(coderay pygments rouge).to_set
       ViewportWidth = ::Module.new
       (TitleStyles = {
@@ -125,10 +126,6 @@ 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
-        @capabilities = {
-          special_sectnums: AsciidoctorVersion >= (::Gem::Version.create '1.5.7'),
-          syntax_highlighter: AsciidoctorVersion >= (::Gem::Version.create '2.0.0'),
-        }
         @initial_instance_variables = [:@initial_instance_variables] + instance_variables
       end
 
@@ -164,9 +161,6 @@ module Asciidoctor
         init_pdf doc
         # set default value for pagenums if not otherwise set
         doc.attributes['pagenums'] = '' unless (doc.attribute_locked? 'pagenums') || ((doc.instance_variable_get :@attributes_modified).include? 'pagenums')
-        if (idx_sect = doc.sections.find {|candidate| candidate.sectname == 'index' }) && idx_sect.numbered
-          idx_sect.numbered = false
-        end unless @capabilities[:special_sectnums]
         #assign_missing_section_ids doc
 
         # promote anonymous preface (defined using preamble block) to preface section
@@ -333,7 +327,7 @@ module Asciidoctor
         # QUESTION should ThemeLoader handle registering fonts instead?
         register_fonts theme.font_catalog, (doc.attr 'pdf-fontsdir', 'GEM_FONTS_DIR')
         default_kerning theme.base_font_kerning != 'none'
-        @fallback_fonts = [*theme.font_fallbacks]
+        @fallback_fonts = Array theme.font_fallbacks
         @allow_uri_read = doc.attr? 'allow-uri-read'
         @cache_uri = doc.attr? 'cache-uri'
         @tmp_files = {}
@@ -374,7 +368,10 @@ module Asciidoctor
         @index = IndexCatalog.new
         # NOTE: we have to init Pdfmark class here while we have reference to the doc
         @pdfmark = (doc.attr? 'pdfmark') ? (Pdfmark.new doc) : nil
-        @optimize = doc.attr 'optimize'
+        # NOTE: defer instantiating optimizer until we know min pdf version
+        if (@optimize = doc.attr 'optimize')
+          @optimize = nil unless (defined? ::Asciidoctor::PDF::Optimizer) || !(Helpers.require_library OptimizerRequirePath, 'rghost', :warn).nil?
+        end
         init_scratch_prototype
         self
       end
@@ -571,9 +568,10 @@ module Asciidoctor
           # NOTE: section must have pdf-anchor in order to be listed in the TOC
           sect.set_attr 'pdf-anchor', (sect_anchor = derive_anchor_from_id sect.id, %(#{start_pgnum}-#{y.ceil}))
           add_dest_for_block sect, sect_anchor
-          if type == :part
+          case type
+          when :part
             layout_part_title sect, title, align: align, level: hlevel
-          elsif type == :chapter
+          when :chapter
             layout_chapter_title sect, title, align: align, level: hlevel
           else
             layout_heading title, align: align, level: hlevel, outdent: true
@@ -609,13 +607,18 @@ module Asciidoctor
       def layout_footnotes node
         return if (fns = (doc = node.document).footnotes - @footnotes).empty?
         theme_margin :footnotes, :top
-        theme_font :footnotes do
-          (title = doc.attr 'footnotes-title') && (layout_caption title, category: :footnotes)
-          item_spacing = @theme.footnotes_item_spacing || 0
-          fns.each do |fn|
-            layout_prose %(<a id="_footnotedef_#{index = fn.index}">#{DummyText}</a>[<a anchor="_footnoteref_#{index}">#{index}</a>] #{fn.text}), margin_bottom: item_spacing, hyphenate: true
+        with_dry_run do |box_height = nil|
+          if box_height && (delta = cursor - box_height) > 0
+            move_down delta
+          end
+          theme_font :footnotes do
+            (title = doc.attr 'footnotes-title') && (layout_caption title, category: :footnotes)
+            item_spacing = @theme.footnotes_item_spacing
+            fns.each do |fn|
+              layout_prose %(<a id="_footnotedef_#{index = fn.index}">#{DummyText}</a>[<a anchor="_footnoteref_#{index}">#{index}</a>] #{fn.text}), margin_bottom: item_spacing, hyphenate: true
+            end
+            @footnotes += fns unless scratch?
           end
-          @footnotes += fns
         end
         nil
       end
@@ -1077,7 +1080,7 @@ module Asciidoctor
           stack_subject = node.has_role? 'stack'
           subject_stop = node.attr 'subject-stop', (stack_subject ? nil : ':'), false
           node.items.each do |subjects, dd|
-            subject = [*subjects].first.text
+            subject = (Array subjects).first.text
             list_item_text = %(+++<strong>#{subject}#{(StopPunctRx.match? sanitize subject) ? '' : subject_stop}</strong>#{dd.text? ? "#{stack_subject ? '<br>' : ' '}#{dd.text}" : ''}+++)
             list_item = ListItem.new list, list_item_text
             dd.blocks.each {|it| list_item << it }
@@ -1333,8 +1336,14 @@ module Asciidoctor
           marker_gap = rendered_width_of_char 'x'
           font marker_style[:font_family], size: marker_style[:font_size] do
             marker_width = rendered_width_of_string marker
+            # NOTE compensate if character_spacing is not applied to first character
+            # see https://github.com/prawnpdf/prawn/commit/c61c5d48841910aa11b9e3d6f0e01b68ce435329
+            character_spacing_correction = 0
+            character_spacing(-0.5) do
+              character_spacing_correction = 0.5 if (rendered_width_of_char 'x', character_spacing: -0.5) == marker_gap
+            end
             marker_height = height_of_typeset_text marker, line_height: marker_style[:line_height], single_line: true
-            start_position = -marker_width + -marker_gap
+            start_position = -marker_width + -marker_gap + character_spacing_correction
             float do
               start_new_page if @media == 'prepress' && cursor < marker_height
               flow_bounding_box start_position, width: marker_width do
@@ -1527,7 +1536,7 @@ module Asciidoctor
           layout_caption node, category: :image, side: :bottom, block_align: alignment, block_width: rendered_w, max_width: @theme.image_caption_max_width if node.title?
           theme_margin :block, :bottom unless pinned
         rescue
-          on_image_error :exception, node, target, (opts.merge message: %(could not embed image: #{image_path}; #{$!.message}#{::Prawn::Errors::UnsupportedImageType === $! ? '; install prawn-gmagick gem to add support' : ''}))
+          on_image_error :exception, node, target, (opts.merge message: %(could not embed image: #{image_path}; #{$!.message}#{::Prawn::Errors::UnsupportedImageType === $! && !(defined? ::GMagick::Image) ? '; install prawn-gmagick gem to add support' : ''}))
         end
       end
 
@@ -1591,14 +1600,9 @@ module Asciidoctor
         when 'vimeo'
           video_path = %(https://vimeo.com/#{video_id = node.attr 'target'})
           if allow_uri_read
-            if cache_uri
-              Helpers.require_library 'open-uri/cached', 'open-uri-cached' unless defined? ::OpenURI::Cache
-            else
-              ::OpenURI
-            end
-            poster = ::OpenURI.open_uri %(http://vimeo.com/api/v2/video/#{video_id}.xml), 'r' do |f|
-              /<thumbnail_large>(.*?)<\/thumbnail_large>/ =~ f.read && $1
-            end
+            poster = load_open_uri.open_uri(%(https://vimeo.com/api/oembed.xml?url=https%3A//vimeo.com/#{video_id}&width=1280), 'r') {|f| (VimeoThumbnailRx.match f.read)[1] } rescue nil
+          else
+            poster = nil
           end
           type = 'Vimeo video'
         else
@@ -1630,9 +1634,7 @@ module Asciidoctor
         add_dest_for_block node if node.id
 
         # HACK: disable built-in syntax highlighter; must be done before calling node.content!
-        if node.style == 'source' && (highlighter = @capabilities[:syntax_highlighter] ?
-            (syntax_hl = node.document.syntax_highlighter) && syntax_hl.highlight? && syntax_hl.name :
-            (highlighter = node.document.attributes['source-highlighter']) && (SourceHighlighters.include? highlighter) && highlighter)
+        if node.style == 'source' && (highlighter = (syntax_hl = node.document.syntax_highlighter)&.highlight? && syntax_hl.name)
           case highlighter
           when 'coderay'
             unless defined? ::Asciidoctor::Prawn::CodeRayEncoder
@@ -1702,7 +1704,7 @@ module Asciidoctor
             # NOTE: highlight can return nil if something goes wrong; fallback to encoded source string if this happens
             result = (lexer.highlight source_string, options: lexer_opts) || (node.apply_subs source_string, [:specialcharacters])
             if node.attr? 'highlight', nil, false
-              if (highlight_lines = (node.method :resolve_lines_to_highlight).arity > 1 ?
+              if (highlight_lines = (node.method :resolve_lines_to_highlight).arity.abs > 1 ?
                   (node.resolve_lines_to_highlight source_string, (node.attr 'highlight')) :
                   (node.resolve_lines_to_highlight node.attr 'highlight')).empty?
                 highlight_lines = nil
@@ -1750,7 +1752,7 @@ module Asciidoctor
             lexer ||= ::Rouge::Lexers::PlainText
             source_string, conum_mapping = extract_conums source_string
             if node.attr? 'highlight', nil, false
-              unless (hl_lines = (node.method :resolve_lines_to_highlight).arity > 1 ?
+              unless (hl_lines = (node.method :resolve_lines_to_highlight).arity.abs > 1 ?
                   (node.resolve_lines_to_highlight source_string, (node.attr 'highlight')) :
                   (node.resolve_lines_to_highlight node.attr 'highlight')).empty?
                 formatter_opts[:highlight_lines] = hl_lines.map {|linenum| [linenum, true] }.to_h
@@ -1853,7 +1855,10 @@ module Asciidoctor
             line << fragment
           end
         end
-        conum_color = @theme.conum_font_color
+        conum_font_color = @theme.conum_font_color
+        if (conum_font_name = @theme.conum_font_family) == font_name
+          conum_font_name = nil
+        end
         last_line_num = lines.size - 1
         if linenums
           pad_size = (last_line_num + 1).to_s.length
@@ -1870,7 +1875,10 @@ module Asciidoctor
           if conum_mapping && (conums = conum_mapping.delete cur_line_num)
             line << { text: conums.shift } if ::String === conums[0]
             conum_text = conums.map {|num| conum_glyph num }.join ' '
-            line << (conum_color ? { text: conum_text, color: conum_color } : { text: conum_text })
+            conum_fragment = { text: conum_text }
+            conum_fragment[:color] = conum_font_color if conum_font_color
+            conum_fragment[:font] = conum_font_name if conum_font_name
+            line << conum_fragment
           end
           line << { text: LF } unless last_line
           line
@@ -2040,7 +2048,7 @@ module Asciidoctor
               end
               unless cell_data.key? :content
                 cell_text = cell.text.strip
-                cell_text = transform_text cell_text if cell_transform
+                cell_text = transform_text cell_text, cell_transform if cell_transform
                 cell_text = hyphenate_text cell_text, @hyphenator if defined? @hyphenator
                 cell_text = cell_text.gsub CjkLineBreakRx, ZeroWidthSpace if @cjk_line_breaks
                 if cell_text.include? LF
@@ -2115,10 +2123,6 @@ module Asciidoctor
         else
           table_width = bounds.width * ((node.attr 'tablepcwidth') / 100.0)
           column_widths = node.columns.map {|col| ((col.attr 'colpcwidth') * table_width) / 100.0 }
-          # NOTE: until Asciidoctor 1.5.4, colpcwidth values didn't always add up to 100%; use last column to compensate
-          unless column_widths.empty? || (width_delta = table_width - column_widths.sum) == 0
-            column_widths[-1] += width_delta
-          end
         end
 
         if ((alignment = node.attr 'align', nil, false) && (BlockAlignmentNames.include? alignment)) ||
@@ -2349,7 +2353,7 @@ module Asciidoctor
             bare_target = target
             text = node.text
           end
-          if (role = node.attr 'role', nil, false) && (role == 'bare' || ((role.split ' ').include? 'bare'))
+          if (role = node.attr 'role', nil, false) && (role == 'bare' || (role.split.include? 'bare'))
             # QUESTION should we insert breakable chars into URI when building fragment instead?
             %(<a href="#{target}"#{attrs.join}>#{breakable_uri text}</a>)
           # NOTE @media may not be initialized if method is called before convert phase
@@ -2368,13 +2372,8 @@ module Asciidoctor
             %(<a href="#{target}">#{node.text || path}</a>)
           elsif (refid = node.attributes['refid'])
             unless (text = node.text)
-              if (refs = doc.catalog[:refs])
-                if ::Asciidoctor::AbstractNode === (ref = refs[refid])
-                  text = ref.xreftext node.attr 'xrefstyle', nil, true
-                end
-              else
-                # Asciidoctor < 1.5.6
-                text = doc.catalog[:ids][refid]
+              if ::Asciidoctor::AbstractNode === (ref = doc.catalog[:refs][refid])
+                text = ref.xreftext node.attr 'xrefstyle', nil, true
               end
             end
             %(<a anchor="#{derive_anchor_from_id refid}">#{text || "[#{refid}]"}</a>).gsub ']', '&#93;'
@@ -2410,12 +2409,16 @@ module Asciidoctor
       end
 
       def convert_inline_callout node
-        if (conum_color = @theme.conum_font_color)
-          # NOTE CMYK value gets flattened here, but is restored by formatted text parser
-          %(<color rgb="#{conum_color}">#{conum_glyph node.text.to_i}</color>)
+        if (conum_font_family = @theme.conum_font_family) == font_name
+          result = conum_glyph node.text.to_i
         else
-          conum_glyph node.text.to_i
+          result = %(<font name="#{conum_font_family}">#{conum_glyph node.text.to_i}</font>)
         end
+        if (conum_font_color = @theme.conum_font_color)
+          # NOTE CMYK value gets flattened here, but is restored by formatted text parser
+          result = %(<color rgb="#{conum_font_color}">#{result}</font>)
+        end
+        result
       end
 
       def convert_inline_footnote node
@@ -2501,7 +2504,7 @@ module Asciidoctor
             if ::File.readable? image_path
               width_attr = (width = preresolve_explicit_width node.attributes) ? %( width="#{width}") : ''
               fit_attr = (fit = node.attr 'fit', nil, false) ? %( fit="#{fit}") : ''
-              img = %(<img src="#{image_path}" format="#{image_format}" alt="[#{encode_quotes node.attr 'alt'}]"#{width_attr}#{fit_attr}>)
+              img = %(<img src="#{image_path}" format="#{image_format}" alt="#{encode_quotes node.attr 'alt'}"#{width_attr}#{fit_attr}>)
             else
               logger.warn %(image to embed not found or not readable: #{image_path}) unless scratch?
               img = %([#{node.attr 'alt'}])
@@ -2889,8 +2892,8 @@ module Asciidoctor
         if opts.delete :dry_run
           height = nil
           dry_run do
-            move_down 1 # HACK: force top margin to be applied
-            height = (layout_caption subject, opts) - 1
+            move_down 0.001 # HACK: force top margin to be applied
+            height = layout_caption subject, opts
           end
           return height
         end
@@ -3421,12 +3424,12 @@ module Asciidoctor
               end
               tot_width = 0
               side_colspecs = colspecs.map {|col, spec|
-                if (alignment_char = spec.chr).to_i.to_s != alignment_char
-                  alignment = AlignmentTable[alignment_char] || :left
-                  rel_width = (spec.slice 1, spec.length).to_f
-                else
+                if (alignment_char = spec.chr).to_i.to_s == alignment_char
                   alignment = :left
                   rel_width = spec.to_f
+                else
+                  alignment = AlignmentTable[alignment_char] || :left
+                  rel_width = (spec.slice 1, spec.length).to_f
                 end
                 tot_width += rel_width
                 [col, { align: alignment, width: rel_width, x: 0 }]
@@ -3583,13 +3586,13 @@ module Asciidoctor
 
       def write pdf_doc, target
         if target.respond_to? :write
-          target = ::QuantifiableStdout.new STDOUT if target == STDOUT
+          target = ::QuantifiableStdout.new $stdout if target == $stdout
           pdf_doc.render target
         else
           pdf_doc.render_file target
           # QUESTION restore attributes first?
           @pdfmark&.generate_file target
-          (Optimizer.new @optimize, pdf_doc.min_version).generate_file target if @optimize && ((defined? ::Asciidoctor::PDF::Optimizer) || !(Helpers.require_library OptimizerRequirePath, 'rghost', :warn).nil?)
+          (Optimizer.new @optimize, pdf_doc.min_version).optimize_file target if @optimize
         end
         # write scratch document if debug is enabled (or perhaps DEBUG_STEPS env)
         #get_scratch_document.render_file 'scratch.pdf'
@@ -3694,7 +3697,7 @@ module Asciidoctor
         end
         # FIXME: due to the calculation error logged in #789, we must advance page even when content is split across pages
         advance_page if (opts.fetch :split_from_top, true) && block_height > cursor && !at_page_top?
-        caption_height = (node = opts[:caption_node]) && node.title? ? (layout_caption node, category: category) - 1 : 0
+        caption_height = (node = opts[:caption_node]) && node.title? ? (layout_caption node, category: category) : 0
         float do
           remaining_height = block_height - caption_height
           initial_page = true
@@ -4081,24 +4084,22 @@ module Asciidoctor
             unlink_tmp_file tmp_image.path
             nil
           end
-        # handle case when image is a URI
-        elsif (node.is_uri? image_path) ||
-            (imagesdir && (node.is_uri? imagesdir) && (image_path = node.normalize_web_path image_path, imagesdir, false))
-          unless allow_uri_read
+        # NOTE: this will catch a classloader resource path on JRuby (e.g., uri:classloader:/path/to/image)
+        elsif ::File.absolute_path? image_path
+          ::File.absolute_path image_path
+        elsif !(is_uri = node.is_uri? image_path) && imagesdir && (::File.absolute_path? imagesdir)
+          ::File.absolute_path image_path, imagesdir
+        elsif is_uri || (imagesdir && (node.is_uri? imagesdir) && (image_path = node.normalize_web_path image_path, imagesdir, false))
+          if !allow_uri_read
             logger.warn %(allow-uri-read is not enabled; cannot embed remote image: #{image_path}) unless scratch?
             return
-          end
-          if @tmp_files.key? image_path
+          elsif @tmp_files.key? image_path
             return @tmp_files[image_path]
-          elsif cache_uri
-            Helpers.require_library 'open-uri/cached', 'open-uri-cached' unless defined? ::OpenURI::Cache
-          else
-            ::OpenURI
           end
           tmp_image = ::Tempfile.create ['image-', image_format && %(.#{image_format})]
           tmp_image.binmode if (binary = image_format != 'svg')
           begin
-            ::OpenURI.open_uri(image_path, (binary ? 'rb' : 'r')) {|fd| tmp_image.write fd.read }
+            load_open_uri.open_uri(image_path, (binary ? 'rb' : 'r')) {|fd| tmp_image.write fd.read }
             tmp_image.close
             @tmp_files[image_path] = tmp_image.path
           rescue
@@ -4285,11 +4286,12 @@ module Asciidoctor
           result = {}
           center = nil
           (value.split ' ', 2).each do |keyword|
-            if keyword == 'left' || keyword == 'right'
+            case keyword
+            when 'left', 'right'
               result[:position] = keyword.to_sym
-            elsif keyword == 'top' || keyword == 'bottom'
+            when 'top', 'bottom'
               result[:vposition] = keyword.to_sym
-            elsif keyword == 'center'
+            when 'center'
               center = true
             end
           end
@@ -4348,6 +4350,14 @@ module Asciidoctor
         link_annotation [image_x, (image_y - image_height), (image_x + image_width), image_y], Border: [0, 0, 0], A: { Type: :Action, S: :URI, URI: uri.as_pdf }
       end
 
+      def load_open_uri
+        if @cache_uri && !(defined? ::OpenURI::Cache)
+          # disable URI caching if library fails to load
+          @cache_uri = false if (Helpers.require_library 'open-uri/cached', 'open-uri-cached', :warn).nil?
+        end
+        ::OpenURI
+      end
+
       def remove_tmp_files
         @tmp_files.reject! {|_, path| path ? (unlink_tmp_file path) : true }
       end