asciidoctor-pdf 1.5.0.rc.2 → 1.5.0.rc.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7290367ccc4d34f5fe1c5668c08de5a84e49af2d605b2ff30586620ab0eb6b58
-  data.tar.gz: '0920410efe9b0f47ad3dd5ae10626e251898782e190d2e73cb232d4a46bf15f5'
+  metadata.gz: '09626023cb6a135adce58fb0340da45204eb411c5ee142f0b46fdb0224940f9e'
+  data.tar.gz: ee585d380fecf131696731998ef8f53f3c0c26ed7a7b50c10579d92c9eb941d6
 SHA512:
-  metadata.gz: 411e2a27ea226772b264c9686a163dc2f5b932f160182df11df9bef3b3eac2424e50c96287539a21d3a646ad8cc9ad29964e3c11d7305d045a74671cc33024b8
-  data.tar.gz: 227a016304d3fa406e4e1ae5a23ee5be0152d7bfacb94435a96d6735256bb4a100b853f1bae26489c74c9fb4648ff1ba191273594c657124a7188ae773c3618e
+  metadata.gz: 96cc29fcadcf79c8f7d4b051c39114b4c6f54f3e7d21951b0c16fab4f85a22a5ae32863907ebe72ea7a1ba851aaa5e8d56a8400d5b57688aca146f4f84cef534
+  data.tar.gz: 2ff61e20d2a6f4da7ef87b8735cf1ffcdbab2be73ff1dc05f62592c0d25ac5d069e2708058f134d5feee71e9df0c6b55bd02bb6c76a7e471faa8797feec11639

data/CHANGELOG.adoc

@@ -5,6 +5,34 @@
 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/master[commit history] on GitHub.
 
+== 1.5.0.rc.3 (2020-02-04) - @mojavelinux
+
+* reserve space for inline image correctly so it doesn't mangle the character spacing in the line when the image wraps (#1516)
+* allow custom theme to merge font catalog with theme being extended (#1505)
+* allow font path to be declared once for all font styles (#1507)
+* continue border, background, and column rule of admonition block on subsequent pages when block gets split (#1287)
+* allow max-width on caption be specified as a percentage (of the container width) (#1484)
+* add support for remote image in running content (if allow-uri-read attribute is set) (#1536)
+* add support for remote background images specified by theme (if allow-uri-read attribute is set) (#1536)
+* add support for remote title page logo image specified by theme (if allow-uri-read attribute is set) (#1536)
+* place dots on correct page when section title in TOC wraps across a page boundary (#1533)
+* add destination to top of imported PDF if ID is specified on image block
+* log reason if theme file cannot be parsed or compiled (#1491)
+* fix crash if background image in theme is not readable
+* bundle emoji font and use as fallback in default-with-fallback-font theme (#1129)
+* add dark theme for chronicles example
+* allow vertical-align key for header and footer categories to accept numeric offset as second value (e.g., [top, 10]) (#1488)
+* link font family for abstract and sidebar to heading font family if only latter is set
+* if path of missing font is absolute, don't suggest that it was not found in the fontsdir
+* allow use of style "regular" as alias for "normal" when defining font
+* emit warning in verbose mode if glyph cannot be found in fallback font (#1529)
+* don't crash if table is empty and emit warning (#607)
+* only emit warning when non-WINANSI character is used with AFM font if verbose mode is enabled
+* do not emit warning when non-WINANSI character is used with AFM font inside scratch document
+* do not emit log messages from scratch document
+* upgrade treetop to 1.6
+* reenable tests on Windows (#1499) *@slonopotamus*
+
 == 1.5.0.rc.2 (2020-01-09) - @mojavelinux
 
 * patch Prawn to fix incompatibilty with Ruby 2.7 (to fix text wrapping)
@@ -284,6 +312,7 @@ For a detailed view of what has changed, refer to the {uri-repo}/commits/master[
 == 1.5.0.alpha.18 (2019-06-01) - @mojavelinux
 
 * restore compatibility with Asciidoctor back to 1.5.3 and add verification to test matrix (#1038)
+* allow one theme to extend another theme using the top-level `extends` key (#367)
 * allow theme to set text indent for paragraphs using prose_text_indent (#191)
 * allow theme to set spacing between adjacent paragraphs using prose_margin_inner (#191)
 * show parts in toc when toclevels=0 (#783)

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]>
-v1.5.0.rc.2, 2020-01-09
+v1.5.0.rc.3, 2020-02-04
 // Settings:
 :experimental:
 :idprefix:
@@ -23,7 +23,7 @@ endif::[]
 :project-name: Asciidoctor PDF
 :project-handle: asciidoctor-pdf
 // Variables:
-:release-version: 1.5.0.rc.2
+:release-version: 1.5.0.rc.3
 // URIs:
 :url-asciidoctor: http://asciidoctor.org
 :url-gem: http://rubygems.org/gems/asciidoctor-pdf
@@ -90,6 +90,7 @@ But don't miss the <<Highlights>> and <<Known Limitations>> sections to understa
 * Auto-generated index
 * Automatic hyphenation (when enabled)
 * Compression / optimization of output file
+* Permissive line breaking for CJK languages
 
 == Known Limitations
 
@@ -103,6 +104,7 @@ But don't miss the <<Highlights>> and <<Known Limitations>> sections to understa
 * AsciiDoc table cell leaves padding below last block (due to lack of margin collapsing)
 * Prawn does not support double-wide box drawing glyphs correctly, so box drawings aren't aligned properly in verbatim blocks (see https://github.com/prawnpdf/prawn/issues/1002[prawn#1002]
 * Orphan / widow support is limited; a page break can occur between a section title and its section content, a table caption and the caption, etc.; use a manual page break to avoid
+* If a no-break hyphen is surrounded by formatted text on both sides (or is formatted individually), it will not prevent a line break
 
 == Prerequisites
 
@@ -218,9 +220,9 @@ gem 'prawn-table', github: 'prawnpdf/prawn-table'
 
 You can then install the gems into your project using the `bundle` command:
 
- $ bundle --path=.bundle/gems
+ $ bundle config set --local path .bundle/gems && bundle
 
-Since you are using Bundler to manage the gems, you'll need to prefix all commands with `bundle exec`.
+Since you're using Bundler to manage the gems, you'll need to prefix all commands with `bundle exec`.
 For example:
 
  $ bundle exec asciidoctor-pdf -v
@@ -689,8 +691,9 @@ The prawn-gmagick gem uses native extensions to compile against GraphicsMagick.
 This system prerequisite limits installation to Linux and OSX.
 Please refer to the {url-prawn-gmagick}[README for prawn-gmagick] to learn how to install it.
 
-Once this gem is installed, Asciidoctor automatically switches over to it to handle embedding of all images.
-In addition to support for more additional image file formats, this gem also speeds up image processing considerably, so we highly recommend using it if you can.
+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.
 
 == Importing PDF Pages
 
@@ -940,6 +943,30 @@ If you want to enable the autofit option globally, set the `autofit-option` docu
 :autofit-option:
 ----
 
+== Autowidth Tables
+
+Asciidoctor PDF does support autowidth tables.
+However, the behavior differs from HTML when the content forces the table to the page boundary.
+The behavior, which is handled by the prawn-table library, is explained in this section.
+
+If the natural width of all columns (based on the width of the cell content) is less than the width of the page, it behaves as you'd expect.
+Each column is assigned the width it needs to prevent the content from wrapping.
+
+However, when the natural width of all columns exceeds the width of the page, the behavior may not be what you expect.
+What prawn-table does is compute how to arrange the table on an infinite canvas, where each column can have a width no greater than the width of the page.
+Then, it reduces the width of the table by reducing the width of each column proportionally.
+As a result, columns which reported the width necessary to render without wrapping now no longer do.
+
+The reason this compression is not performed like in HTML is because prawn-table has no awareness of words.
+Thus, it doesn't know how to redistribute with width intelligently.
+
+To protected against truncation or insufficient width errors, prawn-table wraps text by character.
+That's why the last character in the cell can end up getting wrapped.
+(There's a small amount of tolerance built in to prawn-table to address some edge cases, but it's not sufficient to handle all of them).
+
+For the reason just explained, you should be extremely careful with relying on autowidth tables in Asciidoctor PDF, especially when the natural content of the cells forces the table to page boundary.
+Let experience be your guide.
+
 == Printing Page Ranges
 
 The print dialog doesn't understand the page numbers labels (which appear in the running content).

data/asciidoctor-pdf.gemspec

@@ -37,6 +37,7 @@ Gem::Specification.new do |s|
   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 'prawn-table', '~> 0.2.0'
   s.add_runtime_dependency 'prawn-templates', '~> 0.1.0'
   s.add_runtime_dependency 'prawn-svg', '~> 0.30.0'
@@ -44,18 +45,13 @@ Gem::Specification.new do |s|
   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'
-  # For our usage, treetop 1.6 is slower than treetop 1.5
-  s.add_runtime_dependency 'treetop', '~> 1.5.0'
+  s.add_runtime_dependency 'treetop', '~> 1.6.0'
 
   s.add_development_dependency 'rake', '~> 13.0.0'
-  s.add_development_dependency 'deep-cover-core', '~> 0.7.0'
-  s.add_development_dependency 'simplecov', '~> 0.17.0'
   s.add_development_dependency 'rspec', '~> 3.9.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.14.0'
-  s.add_development_dependency 'rubocop', '~> 0.78.0'
-  s.add_development_dependency 'rubocop-rspec', '~> 1.37.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'
 end

data/data/fonts/ABOUT-notoemoji-subset

@@ -0,0 +1,3 @@
+Noto Emoji font is generated from the google-noto-emoji-fonts (commit 16151a2312a1f8a7d79e91789d3cfe24559d61f7).
+
+Some glyphs have been removed that conflict with the other built-in fonts to produce the notoemoji-subset.ttf font.

data/data/fonts/ABOUT-notoserif-subset

@@ -1,4 +1,4 @@
-Noto Serif fonts are generated from the google-noto-serif-fonts-20161022 Fedora RPM package Noto Serif.
+Noto Serif fonts are generated from the google-noto-serif-fonts-20161022 Fedora RPM package (commit 86b2e553c3e3e4d6614dadd1fa0a7a6dafd74552).
 
 The following changes were made using fontforge to produce the notoserif-*-subset.ttf fonts:
 

data/data/themes/default-theme.yml

@@ -207,7 +207,7 @@ example:
   border_color: $base_border_color
   border_radius: $base_border_radius
   border_width: 0.75
-  background_color: FFFFFF
+  background_color: $page-background-color
   # FIXME reenable padding bottom once margin collapsing is implemented
   padding: [$vertical_rhythm, $horizontal_rhythm, 0, $horizontal_rhythm]
 image:

data/data/themes/default-with-fallback-font-theme.yml

@@ -1,22 +1,9 @@
 extends: default
 font:
   catalog:
-    Noto Serif:
-      normal: notoserif-regular-subset.ttf
-      bold: notoserif-bold-subset.ttf
-      italic: notoserif-italic-subset.ttf
-      bold_italic: notoserif-bold_italic-subset.ttf
-    M+ 1mn:
-      normal: mplus1mn-regular-subset.ttf
-      bold: mplus1mn-bold-subset.ttf
-      italic: mplus1mn-italic-subset.ttf
-      bold_italic: mplus1mn-bold_italic-subset.ttf
+    merge: true
     # M+ 1p supports Latin, Latin-1 Supplement, Latin Extended, Greek, Cyrillic, Vietnamese, Japanese & an assortment of symbols
     # It also provides arrows for ->, <-, => and <= replacements in case these glyphs are missing from font
-    M+ 1p Fallback:
-      normal: mplus1p-regular-fallback.ttf
-      bold: mplus1p-regular-fallback.ttf
-      italic: mplus1p-regular-fallback.ttf
-      bold_italic: mplus1p-regular-fallback.ttf
-  fallbacks:
-  - M+ 1p Fallback
+    M+ 1p Fallback: mplus1p-regular-fallback.ttf
+    Noto Emoji: notoemoji-subset.ttf
+  fallbacks: [M+ 1p Fallback, Noto Emoji]

data/docs/theming-guide.adoc

@@ -52,6 +52,11 @@ The Asciidoctor PDF theme language is described using the http://en.wikipedia.or
 Therefore, if you have a background in web design, the terminology should be immediately familiar to you.
 *Note, however, that the theming system isn't actually CSS.*
 
+The theme file must be named _<name>-theme.yml_, where `<name>` is the name of the theme.
+_We recommend *not* using the names *base* or *default* so you don't confuse it with one of the built-in themes._
+
+=== Selectors and Properties
+
 Like CSS, themes have both selectors and properties.
 Selectors are the component you want to style.
 The properties are the style elements of that component that can be styled.
@@ -74,8 +79,7 @@ YAML is a human-friendly data format that resembles CSS and helps to describe th
 The theme language adds some extra features to YAML, such as variables, basic math, measurements and color values.
 These enhancements will be explained in detail in later sections.
 
-The theme file must be named _<name>-theme.yml_, where `<name>` is the name of the theme.
-_We recommend *not* using the names *base* or *default* so you don't confuse it with one of the built-in themes._
+=== Basic Theme
 
 Here's an example of a basic theme file that extends the base theme:
 
@@ -118,6 +122,8 @@ When creating a new theme, you only have to define the keys you want to override
 All the available keys are documented in <<Keys>>.
 The converter uses the information from the theme map to help construct the PDF.
 
+=== Basic Extended Theme
+
 Instead of designing a theme from scratch, you can extend the default theme using the `extends` key as follows:
 
 [source,yaml]
@@ -144,6 +150,8 @@ Alternatively, you can snag the file from your local installation using the foll
    cp "$ASCIIDOCTOR_PDF_DIR/data/themes/default-theme.yml" custom-theme.yml
 ====
 
+=== Key Nesting
+
 Keys may be nested to an arbitrary depth to eliminate redundant prefixes (an approach inspired by SASS).
 Once the theme is loaded, all keys are flattened into a single map of qualified keys.
 Nesting is simply a shorthand way of organizing the keys.
@@ -665,6 +673,7 @@ However, once you convert to PDF, you have to meet the font requirements of PDF
 That means you need to provide a font (at least a fallback font) that contains glyphs for all the characters you want to use.
 If you don't, you may notice that characters are missing (usually replaced with a box).
 There's nothing Asciidoctor can do to convince PDF to work with extended characters without the right fonts in play.
+To see which characters are missing from the font, enable verbose mode (`-v`) when running Asciidoctor PDF.
 
 === Built-In (AFM) Fonts
 
@@ -702,7 +711,7 @@ Even though the built-in fonts require the content to be encoded in WINANSI, _yo
 Asciidoctor PDF encodes the content into WINANSI when building the PDF.
 
 WARNING: Built-in (AFM) fonts do not use the <<fallback-fonts,fallback fonts>>.
-In order for the fallback font to kick in, you must be using a TrueType font.
+In order for the fallback font to kick in, you must use a TrueType font as the primary font.
 
 .WINANSI Encoding Behavior
 ****
@@ -851,10 +860,10 @@ This will allow you to use the same font names (aka families) in both your graph
 
 === Fallback Fonts
 
-If a TrueType font is missing a character needed to render the document, such as a special symbol, you can have Asciidoctor PDF look for the character in a fallback font.
+If a TrueType font is missing a character needed to render the document, such as a special symbol or emoji, you can have Asciidoctor PDF look for the character in a fallback font.
 
 You only need to specify a single fallback font, typically one that provides a full set of symbols.
-If the character isn't found in the fallback font, it will mostly likely be replaced by a box (which is guaranteed if you're using the bundled fallback font).
+If the character isn't found in the fallback font, it will mostly likely be replaced by a box (i.e., the notdef glyph), which is guaranteed if you're using the bundled fallback font.
 
 IMPORTANT: When defining the fallback font, you *must specify all four variants* (normal, bold, italic, bold_italic), even if you use the same font file for each.
 
@@ -863,6 +872,8 @@ Any glyph missing from an AFM font is simply replaced with the "`not`" glyph (`&
 
 CAUTION: The `default` theme does not use a fallback font.
 However, the built-in `default-with-fallback-font` theme does.
+In fact, it provides two.
+One for general writing in non-Latin languages (M+ 1p) and another for emoji (Noto Emoji).
 Using the fallback font slows down PDF generation slightly because it has to analyze every single character.
 It's use is not recommended for large documents.
 Instead, it's best to select primary fonts that have all the characters you need.
@@ -927,6 +938,20 @@ Now you're covered.
 If your custom TTF font is missing a glyph, Asciidoctor PDF will look in your fallback font.
 You don't need to reference the fallback font anywhere else in your theme file.
 
+Here's another example that shows how to use an alternative emoji font (Symbola):
+
+[source,yaml]
+----
+extends: default-with-fallback-font
+font:
+  catalog:
+    merge: true
+    Symbola: /path/to/symbola.ttf
+  fallbacks: [ M+ 1p, Symbola ]
+----
+
+Now Asciidoctor PDF will look for the emoji in the Symbola font instead of the Noto Emoji font.
+
 == Keys
 
 This section lists all the keys that are available when creating a custom theme.
@@ -966,8 +991,8 @@ If the filename is absolute, it's used as is.
 If the filename begins with `./`, it's resolved as a theme file relative to the current theme file.
 Otherwise, the filename is resolved as a theme file in the normal way (relative to the value of the `pdf-themesdir` attribute).
 
-CAUTION: If you define the <<Custom fonts,font catalog>> in a theme that extends from `default`, you *must* redeclare any built-in font that on which the combined theme depends.
-You can find those definitions in default theme.
+CAUTION: If you define the <<Custom fonts,font catalog>> in a theme that extends from `default`, you either have to redeclare any built-in font that on which the combined theme depends, or you need to set `merge: true` above your font definitions.
+You can find the built-in definitions in default theme.
 You'll then need to include `GEM_FONTS_DIR` in the value of the `pdf-fontsdir` attribute so that the converter can find and register them.
 To avoid having to do this, make sure you set the font family for any element that declares a font family in the default theme.
 
@@ -3350,7 +3375,7 @@ The keys in this category control the arrangement of block images.
     align: inherit
 
 |caption-max-width^[5]^
-|fit-content {vbar} none +
+|fit-content {vbar} none {vbar} <<measurement-units,Measurement>> +
 (default: none)
 |image:
   caption:
@@ -3839,7 +3864,7 @@ The keys in this category control the arrangement and style of tables and table
   caption-side: bottom
 
 |caption-max-width
-|fit-content {vbar} none +
+|fit-content {vbar} none {vbar} <<measurement-units,Measurement>> +
 (default: fit-content)
 |table:
   caption-max-width: none
@@ -4475,7 +4500,7 @@ To avoid this problem, reduce the height of the running content periphery or mak
   title-style: toc
 
 |vertical-align
-|top {vbar} middle {vbar} bottom +
+|top {vbar} middle {vbar} bottom {vbar} [top {vbar} middle {vbar} bottom, <<measurement-units,Measurement>>] +
 (default: middle)
 |header:
   vertical-align: middle
@@ -4600,7 +4625,7 @@ To avoid this problem, reduce the height of the running content periphery or mak
   title-style: toc
 
 |vertical-align
-|top {vbar} middle {vbar} bottom +
+|top {vbar} middle {vbar} bottom {vbar} [top {vbar} middle {vbar} bottom, <<measurement-units,Measurement>>] +
 (default: middle)
 |footer:
   vertical-align: top
@@ -4795,7 +4820,7 @@ header:
     center:
       content: $header-recto-center-content
 ----
-<1> You can use the `footer-vertical-align` attribute to slighly nudge the image up or down.
+<1> You can use the `image-vertical-align` key to slighly 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.
@@ -4940,7 +4965,7 @@ These settings override equivalent keys defined in the theme file, where applica
 
 |pdf-page-size
 |https://github.com/prawnpdf/pdf-core/blob/0.6.0/lib/pdf/core/page_geometry.rb#L16-L68[Named size^] {vbar} <<measurement-units,Measurement[width, height]>>
-|:pdf-page-size: 6in x 9in
+|:pdf-page-size: [6in, 9in]
 
 |pdf-folio-placement
 |virtual {vbar} virtual-inverted {vbar} physical {vbar} physical-inverted

data/lib/asciidoctor/pdf.rb

@@ -9,7 +9,6 @@ rescue LoadError
 end unless defined? GMagick::Image
 require_relative 'pdf/measurements'
 require_relative 'pdf/sanitizer'
-require_relative 'pdf/temporary_path'
 require_relative 'pdf/text_transformer'
 require_relative 'pdf/ext'
 require_relative 'pdf/theme_loader'

data/lib/asciidoctor/pdf/converter.rb

@@ -12,11 +12,7 @@ module Asciidoctor
   module PDF
     class Converter < ::Prawn::Document
       include ::Asciidoctor::Converter
-      if defined? ::Asciidoctor::Logging
-        include ::Asciidoctor::Logging
-      else
-        include ::Asciidoctor::LoggingShim
-      end
+      include ::Asciidoctor::Logging
       include ::Asciidoctor::Writer
       include ::Asciidoctor::Prawn::Extensions
 
@@ -133,17 +129,18 @@ module Asciidoctor
           result = send method_name, node
         else
           # TODO: delegate to convert_method_missing
-          logger.warn %(conversion missing in backend #{@backend} for #{name})
+          logger.warn %(conversion missing in backend #{@backend} for #{name}) unless scratch?
         end
         # NOTE: inline nodes generate pseudo-HTML strings; the remainder write directly to PDF object
         ::Asciidoctor::Inline === node ? result : self
       end
 
       def traverse node, opts = {}
-        if self != (prev_converter = node.document.converter)
-          node.document.instance_variable_set :@converter, self
-        else
+        # NOTE converter instance in scratch document gets duplicated; must be rewired to this one
+        if self == (prev_converter = node.document.converter)
           prev_converter = nil
+        else
+          node.document.instance_variable_set :@converter, self
         end
         if node.blocks?
           node.content
@@ -294,6 +291,7 @@ module Asciidoctor
 
         stamp_foreground_image doc, has_front_cover
         layout_cover_page doc, :back
+        clean_up_tmp_files
         nil
       end
 
@@ -330,6 +328,7 @@ module Asciidoctor
         @fallback_fonts = [*theme.font_fallbacks]
         @allow_uri_read = doc.attr? 'allow-uri-read'
         @cache_uri = doc.attr? 'cache-uri'
+        @tmp_files = {}
         if (bg_image = resolve_background_image doc, theme, 'page-background-image') && bg_image[0]
           @page_bg_image = { verso: bg_image, recto: bg_image }
         else
@@ -385,11 +384,12 @@ module Asciidoctor
           theme
         rescue
           if user_themesdir
-            message = %(could not locate or load the pdf theme `#{theme_name}' in #{user_themesdir}; reverting to default theme)
+            message = %(could not locate or load the pdf theme `#{theme_name}' in #{user_themesdir})
           else
-            message = %(could not locate or load the built-in pdf theme `#{theme_name}'; reverting to default theme)
+            message = %(could not locate or load the built-in pdf theme `#{theme_name}')
           end
-          logger.error message
+          message += %( because of #{$!.class} #{$!.message}) unless ::SystemCallError === $!
+          logger.error %(#{message}; reverting to default theme)
           @themesdir = (theme = ThemeLoader.load_theme).__dir__
           theme
         end
@@ -760,36 +760,35 @@ module Asciidoctor
         shift_bottom = (shift_base * 2) / 3.0
         keep_together do |box_height = nil|
           push_scratch doc if scratch?
-          if box_height && (@theme.admonition_background_color ||
-              ((@theme.admonition_border_width || 0) > 0 && @theme.admonition_border_color))
-            float do
-              bounding_box [0, cursor], width: bounds.width, height: box_height do
-                theme_fill_and_stroke_bounds :admonition
-              end
-            end
-          end
+          theme_fill_and_stroke_block :admonition, box_height if box_height
           pad_box [0, cpad[1], 0, lpad[3]] do
             if box_height
+              label_height = [box_height, cursor].min
               if (rule_color = @theme.admonition_column_rule_color) &&
                   (rule_width = @theme.admonition_column_rule_width || @theme.base_border_width) && rule_width > 0
                 float do
-                  bounding_box [0, cursor], width: label_width + lpad[1], height: box_height do
-                    stroke_vertical_rule rule_color,
-                        at: bounds.right,
-                        line_style: (@theme.admonition_column_rule_style || :solid).to_sym,
-                        line_width: rule_width
+                  rule_height = box_height
+                  while rule_height > 0
+                    rule_segment_height = [rule_height, cursor].min
+                    bounding_box [0, cursor], width: label_width + lpad[1], height: rule_segment_height do
+                      stroke_vertical_rule rule_color,
+                          at: bounds.right,
+                          line_style: (@theme.admonition_column_rule_style || :solid).to_sym,
+                          line_width: rule_width
+                    end
+                    advance_page if (rule_height -= rule_segment_height) > 0
                   end
                 end
               end
               float do
-                bounding_box [0, cursor], width: label_width, height: box_height do
+                bounding_box [0, cursor], width: label_width, height: label_height do
                   if icons == 'font'
                     # FIXME: we assume icon is square
                     icon_size = fit_icon_to_bounds icon_size
                     # NOTE: Prawn's vertical center is not reliable, so calculate it manually
                     if label_valign == :center
                       label_valign = :top
-                      if (vcenter_pos = (box_height - icon_size) * 0.5) > 0
+                      if (vcenter_pos = (label_height - icon_size) * 0.5) > 0
                         move_down vcenter_pos
                       end
                     end
@@ -805,22 +804,22 @@ module Asciidoctor
                             position: label_align,
                             vposition: label_valign,
                             width: label_width,
-                            height: box_height,
+                            height: label_height,
                             fallback_font_name: fallback_svg_font_name,
                             enable_web_requests: allow_uri_read,
                             enable_file_requests_with_root: (::File.dirname icon_path),
                             cache_images: cache_uri
-                        if (icon_height = (svg_size = svg_obj.document.sizing).output_height) > box_height
-                          icon_width = (svg_obj.resize height: (icon_height = box_height)).output_width
+                        if (icon_height = (svg_size = svg_obj.document.sizing).output_height) > label_height
+                          icon_width = (svg_obj.resize height: (icon_height = label_height)).output_width
                         else
                           icon_width = svg_size.output_width
                         end
                         svg_obj.draw
                         svg_obj.document.warnings.each do |icon_warning|
                           logger.warn %(problem encountered in image: #{icon_path}; #{icon_warning})
-                        end
+                        end unless scratch?
                       rescue
-                        logger.warn %(could not embed admonition icon: #{icon_path}; #{$!.message})
+                        logger.warn %(could not embed admonition icon: #{icon_path}; #{$!.message}) unless scratch?
                       end
                     else
                       begin
@@ -828,14 +827,14 @@ module Asciidoctor
                         icon_aspect_ratio = image_info.width.fdiv image_info.height
                         # NOTE: don't scale image up if smaller than label_width
                         icon_width = [(to_pt image_info.width, :px), label_width].min
-                        if (icon_height = icon_width * (1 / icon_aspect_ratio)) > box_height
-                          icon_width *= box_height / icon_height
-                          icon_height = box_height # rubocop:disable Lint/UselessAssignment
+                        if (icon_height = icon_width * (1 / icon_aspect_ratio)) > label_height
+                          icon_width *= label_height / icon_height
+                          icon_height = label_height # rubocop:disable Lint/UselessAssignment
                         end
                         embed_image image_obj, image_info, width: icon_width, position: label_align, vposition: label_valign
                       rescue
                         # QUESTION should we show the label in this case?
-                        logger.warn %(could not embed admonition icon: #{icon_path}; #{$!.message})
+                        logger.warn %(could not embed admonition icon: #{icon_path}; #{$!.message}) unless scratch?
                       end
                     end
                   else
@@ -846,7 +845,7 @@ module Asciidoctor
                         # NOTE: Prawn's vertical center is not reliable, so calculate it manually
                         if label_valign == :center
                           label_valign = :top
-                          if (vcenter_pos = (box_height - (height_of_typeset_text label_text, line_height: 1)) * 0.5) > 0
+                          if (vcenter_pos = (label_height - (height_of_typeset_text label_text, line_height: 1)) * 0.5) > 0
                             move_down vcenter_pos
                           end
                         end
@@ -902,10 +901,6 @@ module Asciidoctor
       def convert_open node
         if node.style == 'abstract'
           convert_abstract node
-        elsif node.style == 'partintro' && node.blocks.size == 1 && node.blocks[0].style == 'abstract'
-          # TODO: process block title and id
-          # TODO: process abstract child even when partintro has multiple blocks
-          convert_abstract node.blocks[0]
         else
           doc = node.document
           keep_together_if node.option? 'unbreakable' do
@@ -1015,13 +1010,9 @@ module Asciidoctor
         # HACK: undo the margin below previous listing or literal block
         # TODO: allow this to be set using colist_margin_top
         unless at_page_top?
-          # NOTE: this logic won't work for a colist nested inside a list item until Asciidoctor 1.5.3
           if (self_idx = node.parent.blocks.index node) && self_idx > 0 &&
               [:listing, :literal].include?(node.parent.blocks[self_idx - 1].context)
-            move_up @theme.block_margin_bottom / 2.0
-            # or we could do...
-            #move_up @theme.block_margin_bottom
-            #move_down @theme.caption_margin_inside * 2
+            move_up @theme.block_margin_bottom - @theme.outline_list_item_spacing
           end
         end
         add_dest_for_block node if node.id
@@ -1097,7 +1088,7 @@ module Asciidoctor
             term_kerning = default_kerning?
           end
           node.items.each do |terms, desc|
-            term_text = [*terms].map(&:text).join ?\n
+            term_text = terms.map(&:text).join ?\n
             if (term_width = width_of term_text, inline_format: term_inline_format, kerning: term_kerning) > max_term_width
               max_term_width = term_width
             end
@@ -1138,7 +1129,6 @@ module Asciidoctor
           term_line_height = @theme.description_list_term_line_height || @theme.base_line_height
           line_metrics = theme_font(:description_list_term) { calc_line_metrics term_line_height }
           node.items.each do |terms, desc|
-            terms = [*terms]
             # NOTE: don't orphan the terms (keep together terms and at least one line of content)
             allocate_space_for_list_item line_metrics, (terms.size + 1), ((@theme.description_list_term_spacing || 0) + 0.05)
             theme_font :description_list_term do
@@ -1212,7 +1202,7 @@ module Asciidoctor
               if Bullets.key? candidate
                 bullet_type = candidate
               else
-                logger.warn %(unknown unordered list style: #{candidate})
+                logger.warn %(unknown unordered list style: #{candidate}) unless scratch?
                 bullet_type = :disc
               end
             end
@@ -1318,13 +1308,13 @@ module Asciidoctor
           marker = %(#{index}.)
         else
           complex = node.complex?
-          logger.warn %(unknown list type #{list_type.inspect})
+          logger.warn %(unknown list type #{list_type.inspect}) unless scratch?
           marker = @theme.ulist_marker_disc_content || Bullets[:disc]
         end
 
         if marker
           if marker_style[:font_family] == 'fa'
-            logger.info { 'deprecated fa icon set found in theme; use fas, far, or fab instead' }
+            logger.info 'deprecated fa icon set found in theme; use fas, far, or fab instead' unless scratch?
             marker_style[:font_family] = FontAwesomeIconSets.find {|candidate| (icon_font_data candidate).yaml[candidate].value? marker } || 'fas'
           end
           marker_gap = rendered_width_of_char 'x'
@@ -1359,7 +1349,7 @@ module Asciidoctor
       def traverse_list_item node, list_type, opts = {}
         if list_type == :dlist # qanda
           terms, desc = node
-          [*terms].each {|term| layout_prose %(<em>#{term.text}</em>), (opts.merge margin_top: 0, margin_bottom: @theme.description_list_term_spacing) }
+          terms.each {|term| layout_prose %(<em>#{term.text}</em>), (opts.merge margin_top: 0, margin_bottom: @theme.description_list_term_spacing) }
           if desc
             layout_prose desc.text, (opts.merge hyphenate: true) if desc.text?
             traverse desc
@@ -1390,18 +1380,28 @@ module Asciidoctor
         elsif (image_path = resolve_image_path node, target, (opts.fetch :relative_to_imagesdir, true), image_format)
           if image_format == 'pdf'
             if ::File.readable? image_path
+              if (id = node.id)
+                add_dest_block = proc do
+                  node.set_attr 'pdf-destination', (node_dest = dest_top)
+                  add_dest id, node_dest
+                end
+              end
               # NOTE: import_page automatically advances to next page afterwards
               # QUESTION should we add destination to top of imported page?
               if (pgnums = node.attr 'pages', nil, false)
                 (resolve_pagenums pgnums).each_with_index do |pgnum, idx|
-                  import_page image_path, page: pgnum, replace: (idx == 0 ? page.empty? : true)
+                  if idx == 0
+                    import_page image_path, page: pgnum, replace: page.empty?, &add_dest_block
+                  else
+                    import_page image_path, page: pgnum, replace: true
+                  end
                 end
               else
-                import_page image_path, page: [(node.attr 'page', nil, 1).to_i, 1].max, replace: page.empty?
+                import_page image_path, page: [(node.attr 'page', nil, 1).to_i, 1].max, replace: page.empty?, &add_dest_block
               end
             else
               # QUESTION should we use alt text in this case?
-              logger.warn %(pdf to insert not found or not readable: #{image_path})
+              logger.warn %(pdf to insert not found or not readable: #{image_path}) unless scratch?
             end
             return
           elsif !(::File.readable? image_path)
@@ -1473,7 +1473,7 @@ module Asciidoctor
               svg_obj.draw
               svg_obj.document.warnings.each do |img_warning|
                 logger.warn %(problem encountered in image: #{image_path}; #{img_warning})
-              end
+              end unless scratch?
               draw_image_border image_cursor, rendered_w, rendered_h, alignment unless node.role? && (node.has_role? 'noborder')
               if (link = node.attr 'link', nil, false)
                 add_link_to_image link, { width: rendered_w, height: rendered_h }, position: alignment, y: image_y
@@ -1516,8 +1516,6 @@ module Asciidoctor
         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' : ''}))
         end
-      ensure
-        unlink_tmp_file image_path if image_path
       end
 
       def draw_image_border top, w, h, alignment
@@ -1537,7 +1535,7 @@ module Asciidoctor
       end
 
       def on_image_error _reason, node, target, opts = {}
-        logger.warn opts[:message] if opts.key? :message
+        logger.warn opts[:message] if (opts.key? :message) && !scratch?
         alt_text_vars = { alt: (node.attr 'alt'), target: target }
         alt_text_template = @theme.image_alt_content || '%{link}[%{alt}]%{/link} | <em>%{target}</em>'
         if (link = node.attr 'link', nil, false)
@@ -1688,8 +1686,6 @@ module Asciidoctor
             lexer_opts = { nowrap: true, noclasses: true, stripnl: false, style: style }
             lexer_opts[:startinline] = !(node.option? 'mixed') if lexer.name == 'PHP'
             source_string, conum_mapping = extract_conums source_string
-            # NOTE: pygments.rb strips trailing whitespace; preserve it in case there are conums on last line
-            num_trailing_spaces = source_string.length - (source_string = source_string.rstrip).length if conum_mapping
             # 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
@@ -1711,7 +1707,7 @@ module Asciidoctor
               postprocess = true
             end
             fragments = text_formatter.format result
-            fragments = restore_conums fragments, conum_mapping, num_trailing_spaces, linenums, highlight_lines if postprocess
+            fragments = restore_conums fragments, conum_mapping, linenums, highlight_lines if postprocess
             source_chunks = guard_indentation_in_fragments fragments
           end
         when 'rouge'
@@ -1793,7 +1789,7 @@ module Asciidoctor
         string = string.split(LF).map.with_index {|line, line_num|
           # FIXME: we get extra spaces before numbers if more than one on a line
           if line.include? '<'
-            line.gsub CalloutExtractRx do
+            line = line.gsub CalloutExtractRx do
               # honor the escape
               if $1 == ?\\
                 $&.sub $1, ''
@@ -1802,9 +1798,14 @@ module Asciidoctor
                 ''
               end
             end
-          else
-            line
+            # NOTE use first position to store space that precedes conums
+            if (conum_mapping.key? line_num) && (line.end_with? ' ')
+              trimmed_line = line.rstrip
+              conum_mapping[line_num].unshift line.slice trimmed_line.length, line.length
+              line = trimmed_line
+            end
           end
+          line
         }.join LF
         conum_mapping = nil if conum_mapping.empty?
         [string, conum_mapping]
@@ -1814,7 +1815,7 @@ module Asciidoctor
       #--
       # QUESTION can this be done more efficiently?
       # QUESTION can we reuse arrange_fragments_by_line?
-      def restore_conums fragments, conum_mapping, num_trailing_spaces = 0, linenums = nil, highlight_lines = nil
+      def restore_conums fragments, conum_mapping, linenums = nil, highlight_lines = nil
         lines = []
         line_num = 0
         # reorganize the fragments into an array of lines
@@ -1846,7 +1847,7 @@ module Asciidoctor
           end
           line.unshift text: %(#{visible_line_num.to_s.rjust pad_size} ), linenum: visible_line_num, color: linenum_color if linenums
           if conum_mapping && (conums = conum_mapping.delete cur_line_num)
-            line << { text: ' ' * num_trailing_spaces } if last_line && num_trailing_spaces > 0
+            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 })
           end
@@ -2038,7 +2039,10 @@ module Asciidoctor
         end
 
         # NOTE: Prawn aborts if table data is empty, so ensure there's at least one row
-        table_data = ::Array.new(node.columns.size) { { 'content' => '' } } if table_data.empty?
+        if table_data.empty?
+          logger.warn message_with_context 'no rows found in table', source_location: node.source_location
+          table_data << ::Array.new([node.columns.size, 1].max) { { content: '' } }
+        end
 
         border_width = {}
         table_border_color = theme.table_border_color || theme.table_grid_color || theme.base_border_color
@@ -2368,7 +2372,7 @@ module Asciidoctor
           end
           %(<a id="#{target || node.id}">#{DummyText}</a>#{reftext})
         else
-          logger.warn %(unknown anchor type: #{node.type.inspect})
+          logger.warn %(unknown anchor type: #{node.type.inspect}) unless scratch?
         end
       end
 
@@ -2416,14 +2420,14 @@ module Asciidoctor
               requested_icon_name = icon_name
               icon_set, icon_name = remapped_icon_name.split '-', 2
               glyph = (icon_font_data icon_set).unicode icon_name
-              logger.info { %(#{requested_icon_name} icon found in deprecated fa icon set; using #{icon_name} from #{icon_set} icon set instead) }
+              logger.info { %(#{requested_icon_name} icon found in deprecated fa icon set; using #{icon_name} from #{icon_set} icon set instead) } unless scratch?
             # new name in Font Awesome >= 5 (but document is configured to use fa icon set)
             else
               font_data = nil
               if (resolved_icon_set = FontAwesomeIconSets.find {|candidate| (font_data = icon_font_data candidate).unicode icon_name rescue nil })
                 icon_set = resolved_icon_set
                 glyph = font_data.unicode icon_name
-                logger.info { %(#{icon_name} icon not found in deprecated fa icon set; using match found in #{resolved_icon_set} icon set instead) }
+                logger.info { %(#{icon_name} icon not found in deprecated fa icon set; using match found in #{resolved_icon_set} icon set instead) } unless scratch?
               end
             end
           else
@@ -2450,7 +2454,7 @@ module Asciidoctor
             # TODO: support rotate and flip attributes
             %(<font name="#{icon_set}"#{size_attr}#{class_attr}>#{glyph}</font>)
           else
-            logger.warn %(#{icon_name} is not a valid icon name in the #{icon_set} icon set)
+            logger.warn %(#{icon_name} is not a valid icon name in the #{icon_set} icon set) unless scratch?
             %([#{node.attr 'alt'}])
           end
         else
@@ -2472,7 +2476,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} tmp="#{TemporaryPath === image_path}">)
+              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'}])
@@ -2590,13 +2594,14 @@ module Asciidoctor
         # QUESTION allow alignment per element on title page?
         title_align = (@theme.title_page_align || @base_align).to_sym
 
-        # TODO: disallow .pdf as image type
+        # FIXME: disallow .pdf as image type
         if @theme.title_page_logo_display != 'none' && (logo_image_path = (doc.attr 'title-logo-image') || (logo_image_from_theme = @theme.title_page_logo_image))
           if (logo_image_path.include? ':') && logo_image_path =~ ImageAttributeValueRx
             logo_image_attrs = (AttributeList.new $2).parse %w(alt width height)
             if logo_image_from_theme
               relative_to_imagesdir = false
-              logo_image_path = ThemeLoader.resolve_theme_asset (sub_attributes_discretely doc, $1), @themesdir
+              logo_image_path = sub_attributes_discretely doc, $1
+              logo_image_path = ThemeLoader.resolve_theme_asset logo_image_path, @themesdir unless doc.is_uri? logo_image_path
             else
               relative_to_imagesdir = true
               logo_image_path = $1
@@ -2604,7 +2609,10 @@ module Asciidoctor
           else
             logo_image_attrs = {}
             relative_to_imagesdir = false
-            logo_image_path = ThemeLoader.resolve_theme_asset (sub_attributes_discretely doc, logo_image_path), @themesdir if logo_image_from_theme
+            if logo_image_from_theme
+              logo_image_path = sub_attributes_discretely doc, logo_image_path
+              logo_image_path = ThemeLoader.resolve_theme_asset logo_image_path, @themesdir unless doc.is_uri? logo_image_path
+            end
           end
           logo_image_attrs['target'] = logo_image_path
           if (logo_align = [(logo_image_attrs.delete 'align'), @theme.title_page_logo_align, title_align.to_s].find {|val| (BlockAlignmentNames.include? val) })
@@ -2730,8 +2738,6 @@ module Asciidoctor
             image_page image_path, (image_opts.merge canvas: true)
           end
         end
-      ensure
-        unlink_tmp_file image_path if image_path
       end
 
       def stamp_foreground_image doc, has_front_cover
@@ -2866,6 +2872,7 @@ module Asciidoctor
           raise ArgumentError, 'invalid subject'
         end
         category_caption = (category = opts[:category]) ? %(#{category}_caption) : 'caption'
+        container_width = bounds.width
         block_align = opts.delete :block_align
         if (align = @theme[%(#{category_caption}_align)] || @theme.caption_align)
           align = align == 'inherit' ? (block_align || @base_align) : align.to_sym
@@ -2873,16 +2880,21 @@ module Asciidoctor
           align = @base_align.to_sym
         end
         indent_by = [0, 0]
-        if block_align
-          block_width = opts.delete :block_width
-          if (max_width = opts.delete :max_width) && max_width != 'none' &&
-              (max_width != 'fit-content' || (max_width = block_width)) && (remainder = bounds.width - max_width) > 0
+        block_width = opts.delete :block_width
+        if (max_width = opts.delete :max_width) && max_width != 'none'
+          if max_width == 'fit-content'
+            max_width = block_width || container_width
+          else
+            max_width = [max_width.to_f / 100 * bounds.width, bounds.width].min if ::String === max_width && (max_width.end_with? '%')
+            block_align = align
+          end
+          if (remainder = container_width - max_width) > 0
             case block_align
             when :right
               indent_by = [remainder, 0]
             when :center
               indent_by = [(side_margin = remainder * 0.5), side_margin]
-            else # :left
+            else # :left, nil
               indent_by = [0, remainder]
             end
           end
@@ -3020,7 +3032,11 @@ module Asciidoctor
                 start_dots = last_fragment_pos.right + hanging_indent
                 last_fragment_cursor = last_fragment_pos.top + line_metrics.padding_top
                 # NOTE this will be incorrect if wrapped line is all monospace
-                start_cursor = last_fragment_cursor if start_cursor - last_fragment_cursor > line_metrics.height
+                if (last_fragment_page_number = last_fragment_pos.page_number) > start_page_number ||
+                    (start_cursor - last_fragment_cursor) > line_metrics.height
+                  start_page_number = last_fragment_page_number
+                  start_cursor = last_fragment_cursor
+                end
               end
               end_page_number = page_number
               end_cursor = cursor
@@ -3066,7 +3082,7 @@ module Asciidoctor
           icon_data = (AdmonitionIcons[key] || {}).merge icon_data
           if (icon_name = icon_data[:name])
             unless icon_name.start_with?(*IconSetPrefixes)
-              logger.info { %(#{key} admonition in theme uses icon from deprecated fa icon set; use fas, far, or fab instead) }
+              logger.info { %(#{key} admonition in theme uses icon from deprecated fa icon set; use fas, far, or fab instead) } unless scratch?
               icon_data[:name] = %(fa-#{icon_name}) unless icon_name.start_with? 'fa-'
             end
           end
@@ -3273,7 +3289,7 @@ module Asciidoctor
                         content = transform_text content, @text_transform if @text_transform
                       end
                       formatted_text_box parse_text(content, color: @font_color, inline_format: [normalize: true]),
-                          at: [left, bounds.top - trim_styles[:padding][0] - trim_styles[:content_offset] + (trim_styles[:valign] == :center ? font.descender * 0.5 : 0)],
+                          at: [left, bounds.top - trim_styles[:padding][0] - trim_styles[:content_offset] + ((Array trim_styles[:valign])[0] == :center ? font.descender * 0.5 : 0)],
                           width: colwidth,
                           height: trim_styles[:prose_content_height],
                           align: colspec[:align],
@@ -3299,6 +3315,10 @@ module Asciidoctor
 
       def allocate_running_content_layout doc, page, periphery, cache
         cache[layout = page.layout] ||= begin
+          valign, valign_offset = @theme[%(#{periphery}_vertical_align)]
+          if (valign = (valign || :middle).to_sym) == :middle
+            valign = :center
+          end
           trim_styles = {
             line_metrics: (trim_line_metrics = calc_line_metrics @theme[%(#{periphery}_line_height)] || @theme.base_line_height),
             # NOTE we've already verified this property is set
@@ -3313,7 +3333,7 @@ module Asciidoctor
             column_rule_style: (@theme[%(#{periphery}_column_rule_style)] || :solid).to_sym,
             column_rule_width: (trim_column_rule_color ? @theme[%(#{periphery}_column_rule_width)] || 0 : 0),
             column_rule_spacing: (@theme[%(#{periphery}_column_rule_spacing)] || 0),
-            valign: (val = (@theme[%(#{periphery}_vertical_align)] || :middle).to_sym) == :middle ? :center : val,
+            valign: valign_offset ? [valign, valign_offset] : valign,
             img_valign: @theme[%(#{periphery}_image_vertical_align)],
             left: {
               recto: (trim_left_recto = @page_margin_by_side[:recto][3]),
@@ -3338,7 +3358,7 @@ module Asciidoctor
           }
           case trim_styles[:img_valign]
           when nil
-            trim_styles[:img_valign] = trim_styles[:valign]
+            trim_styles[:img_valign] = valign
           when 'middle'
             trim_styles[:img_valign] = :center
           when 'top', 'center', 'bottom'
@@ -3392,10 +3412,9 @@ module Asciidoctor
             ColumnPositions.each do |position|
               unless (val = @theme[%(#{periphery}_#{side}_#{position}_content)]).nil_or_empty?
                 if (val.include? ':') && val =~ ImageAttributeValueRx
-                  # TODO: support image URL
-                  if ::File.readable? (image_path = (ThemeLoader.resolve_theme_asset $1, @themesdir))
-                    image_attrs = (AttributeList.new $2).parse %w(alt width)
-                    image_opts = resolve_image_options image_path, image_attrs, container_size: [colspec_dict[side][position][:width], trim_styles[:content_height]], format: image_attrs['format']
+                  image_attrs = (AttributeList.new $2).parse %w(alt width)
+                  if (image_path = resolve_image_path doc, $1, @themesdir, (image_format = image_attrs['format'])) && (::File.readable? image_path)
+                    image_opts = resolve_image_options image_path, image_attrs, container_size: [colspec_dict[side][position][:width], trim_styles[:content_height]], format: image_format
                     side_content[position] = [image_path, image_opts, image_attrs['link']]
                   else
                     # NOTE allows inline image handler to report invalid reference and replace with alt text
@@ -3550,7 +3569,7 @@ module Asciidoctor
                 true
               end
             end
-            raise ::Errno::ENOENT, %(#{path} not found in #{fonts_dir}) unless found
+            raise ::Errno::ENOENT, ((File.absolute_path? path) ? %(#{path} not found) : %(#{path} not found in #{fonts_dir.gsub ValueSeparatorRx, ' or '})) unless found
           end
           register_font key => styles
         end
@@ -3620,7 +3639,7 @@ module Asciidoctor
         if (b_color = @theme[%(#{category}_border_color)]) == 'transparent'
           b_color = @page_bg_color
         end
-        b_radius = (@theme[%(#{category}_border_radius)] || 0) + b_width if b_width
+        b_radius = (@theme[%(#{category}_border_radius)] || 0) + (b_width || 0)
         if b_width && b_color
           if b_color == @page_bg_color # let page background cut into block background
             b_gap_color, b_shift = @page_bg_color, b_width
@@ -4000,46 +4019,53 @@ module Asciidoctor
       # the temporary file. If the target is a URI and the allow-uri-read attribute
       # is not set, or the URI cannot be read, this method returns a nil value.
       #
-      # When a temporary file is used, the TemporaryPath type is mixed into the path string.
-      def resolve_image_path node, image_path = nil, relative_to_imagesdir = true, image_format = nil
+      # When a temporary file is used, the file is stored in @tmp_files to be cleaned up after conversion.
+      def resolve_image_path node, image_path = nil, relative_to = true, image_format = nil
         doc = node.document
-        imagesdir = relative_to_imagesdir ? (resolve_imagesdir doc) : nil
+        imagesdir = relative_to == true ? (resolve_imagesdir doc) : relative_to
         image_path ||= node.attr 'target'
         image_format ||= ::Asciidoctor::Image.format image_path, (::Asciidoctor::Image === node ? node.attributes : nil)
-        # NOTE currently used for inline images
+        # NOTE base64 logic currently used for inline images
         if ::Base64 === image_path
-          tmp_image = ::Tempfile.create ['image-', image_format && %(.#{image_format})]
+          return (tmp_file = @tmp_files[image_path]) && tmp_file.path if @tmp_files.key? image_path
+          @tmp_files[image_path] = tmp_image = ::Tempfile.create ['image-', image_format && %(.#{image_format})]
           tmp_image.binmode unless image_format == 'svg'
           begin
             tmp_image.write ::Base64.decode64 image_path
-            tmp_image.path.extend TemporaryPath
+            tmp_image.close
+            tmp_image.path
           rescue
-            nil
-          ensure
+            @tmp_files[image_path] = nil
             tmp_image.close
+            unlink_tmp_file tmp_image
+            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)))
+        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
             logger.warn %(allow-uri-read is not enabled; cannot embed remote image: #{image_path}) unless scratch?
             return
           end
-          if cache_uri
+          if @tmp_files.key? image_path
+            return (tmp_file = @tmp_files[image_path]) && tmp_file.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_files[image_path] = 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 }
-            tmp_image.path.extend TemporaryPath
+            tmp_image.close
+            tmp_image.path
           rescue
             logger.warn %(could not retrieve remote image: #{image_path}; #{$!.message}) unless scratch?
-            nil
-          ensure
+            @tmp_files[image_path] = nil
             tmp_image.close
+            unlink_tmp_file tmp_image
+            nil
           end
         # handle case when image is a local file
         else
@@ -4063,15 +4089,14 @@ module Asciidoctor
             return []
           elsif (image_path.include? ':') && image_path =~ ImageAttributeValueRx
             image_attrs = (AttributeList.new $2).parse %w(alt width)
+            image_format = image_attrs['format']
             if from_theme
-              # TODO: support remote image when loaded from theme
-              image_path = ThemeLoader.resolve_theme_asset (sub_attributes_discretely doc, $1), @themesdir
+              image_path = resolve_image_path doc, (sub_attributes_discretely doc, $1), @themesdir, image_format
             else
-              image_path = resolve_image_path doc, $1, true, (image_format = image_attrs['format'])
+              image_path = resolve_image_path doc, $1, true, image_format
             end
           elsif from_theme
-            # TODO: support remote image when loaded from theme
-            image_path = ThemeLoader.resolve_theme_asset (sub_attributes_discretely doc, image_path), @themesdir
+            image_path = resolve_image_path doc, (sub_attributes_discretely doc, image_path), @themesdir
           else
             image_path = resolve_image_path doc, image_path, false
           end
@@ -4079,7 +4104,7 @@ module Asciidoctor
           return unless image_path
 
           unless ::File.readable? image_path
-            logger.warn %(#{key.tr '-', ' '} not found or readable: #{image_path})
+            logger.warn %(#{key.to_s.tr '-_', ' '} not found or readable: #{image_path})
             return
           end
 
@@ -4279,13 +4304,16 @@ 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
 
-      # QUESTION is there a better way to do this?
-      # I suppose we could have @tmp_files as an instance variable on converter instead
-      # It might be sufficient to delete temporary files once per conversion
-      def unlink_tmp_file path
-        path.unlink if TemporaryPath === path && path.exist?
+      def clean_up_tmp_files
+        @tmp_files.values.each {|tmp_file| unlink_tmp_file tmp_file if tmp_file }
+        @tmp_files.clear
+      end
+
+      def unlink_tmp_file file
+        path = file.path
+        ::File.unlink path if ::File.exist? path
       rescue
-        logger.warn %(could not delete temporary image: #{path}; #{$!.message})
+        logger.warn %(could not delete temporary file: #{path}; #{$!.message}) unless scratch?
       end
 
       def apply_subs_discretely doc, value, opts = {}
@@ -4308,7 +4336,7 @@ module Asciidoctor
 
       def sub_attributes_discretely doc, value
         doc.set_attr 'attribute-missing', 'skip' unless (attribute_missing = doc.attr 'attribute-missing') == 'skip'
-        value = doc.apply_subs value
+        value = doc.apply_subs value, [:attributes]
         doc.set_attr 'attribute-missing', attribute_missing unless attribute_missing == 'skip'
         value
       end
@@ -4394,11 +4422,14 @@ module Asciidoctor
       def init_scratch_prototype
         @save_state = nil
         @scratch_depth = 0
+        # NOTE can't marshall tmp_files, so clear them before creating prototype
+        saved_tmp_files, @tmp_files = @tmp_files, {}
         # IMPORTANT don't set font before using Marshal, it causes serialization to fail
         @prototype = ::Marshal.load ::Marshal.dump self
-        @prototype.state.store.info.data[:Scratch] = true
+        @prototype.state.store.info.data[:Scratch] = @prototype.text_formatter.scratch = true
         # NOTE we're now starting a new page each time, so no need to do it here
         #@prototype.start_new_page if @prototype.page_number == 0
+        @tmp_files = saved_tmp_files
       end
 
       def push_scratch doc