asciidoctor-pdf 1.5.3 → 1.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71d676b5bc2fd2364a3e888aebe586cdb2d85ee259b23031409b5c919cd78ce3
-  data.tar.gz: 638470c38ac1fe4a7445c118c33c08768b6cfbee54f2435ba65158ee9423f9ee
+  metadata.gz: 1d8bf8a71ecd7a6c684ae42c964f62d8a988cd0077fe1412766010e5898a1cee
+  data.tar.gz: 5d337eb1c1bb9439ff4684ae923419f99d9c5359a5555eaab3a846136cb44521
 SHA512:
-  metadata.gz: 756f331bf5b74742739977ef159aa138743629a0fc91159767bb70994d7b939238bef3df1b2b05b8c58ed0ee837cdcd4153b531d132cd0ad31dc9b8e39ffc2e5
-  data.tar.gz: 34b9adfc79269f7936cb941056cda2303ec7e8e49f5c53772b3c92723b4d03ecace31ad9a5912e737b5c8fd84e855420b8169bf9d35500079df995e1de64b85d
+  metadata.gz: 1d9ed8610fae3052c4c3e529b9518bcb1c5a71bb123e915f6361db7828eb9a23d169b9f7b9165b7536a16f7324177d081e20c6823874225e9fb045e54ced57cb
+  data.tar.gz: 12d09008f98b4572b0a8d3546200868ec0d6637d9b642918cbcf2a179be3b871d8ea9a26a5a99e82b5c3580808f277e610df18ff93013c891a5eee1ea99f3e67

data/CHANGELOG.adoc

@@ -5,6 +5,31 @@
 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.4 (2021-01-09) - @mojavelinux
+
+Bug Fixes::
+
+* restore compatiblity with Asciidoctor 2.0.12 when using Pygments (#1846)
+* fix numeric assertions in test suite (#1542)
+* keep caption with image when image is scaled down to fit page (#1803)
+* prevent inline image from rendering multiple times if fallback font is used for alt text (#1858)
+* disable cache tests if open-uri-cache gem is not available
+* disable hyphen tests if text-hyphen gem is not available
+* compensate for change in how character_spacing is applied in FontMetricCache#width_of after Prawn 2.2.2
+* allow inline image to be enclosed in link macro (alt text was breaking parsing)
+* use oembed API over HTTPS to get thumbnail for Vimeo video
+* use conum font family defined in theme for conum in verbatim block (#1611)
+* patch float precision constant so prawn-table does not fail to arrange cells that span columns (#1835)
+* resolve images in theme correctly when theme is loaded from classloader (JRuby only) (#1829)
+
+Compliance::
+
+* upgrade to prawn-svg 0.31 (adds support for loading embedded images from a data URI) (#1810)
+
+Build / Infrastructure::
+
+* migrate Linux CI jobs to GitHub Actions
+
 == 1.5.3 (2020-02-28) - @mojavelinux
 
 Bug Fixes::

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.3, 2020-02-28
+v1.5.4, 2021-01-09
 // Settings:
 :experimental:
 :idprefix:
@@ -23,7 +23,7 @@ endif::[]
 :project-name: Asciidoctor PDF
 :project-handle: asciidoctor-pdf
 // Variables:
-:release-version: 1.5.3
+:release-version: 1.5.4
 // URIs:
 :url-asciidoctor: http://asciidoctor.org
 :url-gem: http://rubygems.org/gems/asciidoctor-pdf
@@ -39,8 +39,7 @@ endif::[]
 :url-graphicsmagick: http://www.graphicsmagick.org
 
 ifdef::status[]
-image:https://img.shields.io/travis/asciidoctor/asciidoctor-pdf/master.svg[Build Status (Travis CI),link=https://travis-ci.org/asciidoctor/asciidoctor-pdf]
-image:https://github.com/asciidoctor/asciidoctor-pdf/workflows/CI/badge.svg[Build Status (GitHub Actions),link=https://github.com/asciidoctor/asciidoctor-pdf/actions?query=workflow%3ACI]
+image:{url-project-repo}/workflows/CI/badge.svg?branch=v1.5.x[Build Status (GitHub Actions),link={url-project-repo}/actions?query=workflow%3ACI+branch%3Av1.5.x]
 image:https://img.shields.io/gem/v/asciidoctor-pdf.svg[Latest Release, link={url-gem}]
 image:https://img.shields.io/badge/license-MIT-blue.svg[MIT License, link=#copyright]
 endif::[]
@@ -98,7 +97,7 @@ But don't miss the <<Highlights>> to get a preview of what's possible.
 == Known Limitations
 
 * Footnotes are always rendered as endnotes (at end of chapter for books; at end of document for all other doctypes)
-* Table cells that exceed height of a single page will be truncated (see https://github.com/prawnpdf/prawn-table/issues/41[prawn-table#41])
+* Table cells that exceed the height of a single page will be truncated (see https://github.com/prawnpdf/prawn-table/issues/41[prawn-table#41])
 * Inline images in table cells must fit within available space or Prawn::Errors::CannotFit error will be thrown
 * Columns cannot be assigned a 0% width (or a width less than the width of a single character); in the same vein, a column cannot be set to autowidth if width of all other columns meets or exceeds 100%; the result is that the converter with throw a Prawn::Errors::CannotFit error
 * An inline image in a table cell will not force the column wider if the width of the image exceeds the width of the column; either reduce the image width using `pdfwidth` or increase the width of the column using `cols`; another solution is to convert the cell to an AsciiDoc table cell (see https://github.com/asciidoctor/asciidoctor-pdf/issues/830)
@@ -202,12 +201,12 @@ You then activate syntax highlighting for a given document by adding the `source
 ==== Upgrade Prawn and Extensions (optional)
 
 {project-name} uses Prawn to handle the PDF generation, which has a different release cycle.
-At times, there may are development features in Prawn and its extensions you need to use which haven't yet been released.
+At times, there may be development features in Prawn and its extensions you need to use which haven't yet been released.
 No problem.
 You can still gain access to these features by installing the unreleased gems directly from GitHub.
 
 To get started, first create a [.path]_Gemfile_ in the root of your project.
-In that file, declare the gem soruce, the {project-handle} gem, and the prawn gem and/or one of its extension gems.
+In that file, declare the gem source, the {project-handle} gem, and the prawn gem and/or one of its extension gems.
 In this example, we'll install both the prawn and prawn-table gems from GitHub.
 
 .Gemfile
@@ -262,7 +261,7 @@ It's time to convert the AsciiDoc document directly to PDF.
 
 IMPORTANT: You'll need the `rouge` gem installed to run this example since it uses the `source-highlighter` attribute with the value of `rouge`.
 
-Converting to PDF is a simple as running the `asciidoctor-pdf` script using Ruby and passing our AsciiDoc document as the first argument.
+Converting to PDF is as simple as running the `asciidoctor-pdf` script using Ruby and passing our AsciiDoc document as the first argument.
 
  $ asciidoctor-pdf basic-example.adoc
 
@@ -305,7 +304,7 @@ Asciidoctor can process the full range of characters in the UTF-8 character set.
 That means you can write your document in any language, save the file with UTF-8 encoding (_that's important!_), and expect Asciidoctor to convert the text properly.
 But you still need a font that provides the glyphs for those characters.
 
-When converting a document with Asciidoctor PDF, you may notice that some of the glyphs for certain languages, such as Chinese, are missing from the PDF.
+When converting a document with Asciidoctor PDF, you may notice that some glyphs for certain languages, such as Chinese, are missing from the PDF.
 PDF is a "`bring your own font`" kind of system.
 In other words, the font you provide must provide glyphs for all the characters used.
 There's no one font that supports all the world's languages (though some, like Noto Serif, certainly come close).
@@ -471,7 +470,7 @@ Otherwise, the SVG library will fail to process it.
 As of Asciidoctor PDF 1.5.0.alpha.17 running on Asciidoctor 2 or better, Asciidoctor PDF provides better integration with Asciidoctor Diagram by setting the `data-uri` attribute by default.
 When the `data-uri` attribute is set, Asciidoctor Diagram returns the absolute path to the generated image, which Asciidoctor PDF can then locate.
 (This makes sense since technically, Asciidoctor Diagram must embed the image in the document, similar in spirit to the `data-uri` feature for HTML).
-This means the input directory and the output directory (and thus the imagesoutdir) can differ and Asciidoctor PDF will still be able to locate the generate image.
+This means the input directory and the output directory (and thus the imagesoutdir) can differ and Asciidoctor PDF will still be able to locate the generated image.
 
 Prior to Asciidoctor PDF 1.5.0.alpha.17 (or prior to Asciidoctor 2), the way to solve this problem is to set the `imagesdir` attribute to an absolute path.
 That way, it won't matter where the generated image is written.
@@ -571,7 +570,7 @@ If the image height exceeds the height of the page, the image will be scaled dow
 
 In addition to the width-related attributes previously covered, cover and background images can be sized relative to the page using the `fit` attribute of the image macro.
 The `fit` attribute works similarly to the `object-fit` property in CSS.
-It's value must be specified as a single keyword, chosen from the table below.
+Its value must be specified as a single keyword, chosen from the table below.
 The starting size of the image is determined by the explicit width, if specified, or the implicit width.
 The height is always derived from the width while respecting the implicit aspect ratio of the image.
 The available space for a background image (i.e., the canvas) is the page.
@@ -889,7 +888,7 @@ Here's an example of how to skip a passthrough block when converting to PDF:
 \endif::[]
 ----
 
-Here's an example of how to only enable a passthrough block when convertering to HTML5:
+Here's an example of how to only enable a passthrough block when converting to HTML5:
 
 [source,asciidoc]
 ----
@@ -1011,7 +1010,7 @@ This value is used as the heading of the preface and as the text of the entry in
 
 Asciidoctor PDF supports generating an index catalog that itemizes all index terms defined in the document, allowing the reader to navigate the document by keyword.
 
-To get Asciidoctor PDF to generate an index, simply add an level-1 section flagged with the `index` style near the end of your document.
+To get Asciidoctor PDF to generate an index, add a level-1 section flagged with the `index` style near the end of your document.
 The converter will automatically populate the catalog with the list of index terms in the document, organized by first letter.
 
 [source,asciidoc]
@@ -1034,7 +1033,7 @@ You can enable this feature by setting the `compress` attribute on the document:
 
  $ asciidoctor-pdf -a compress document.adoc
 
-For more thorough optimzation, you can use either the built-in `asciidoctor-pdf-optimize` script or hexapdf.
+For more thorough optimization, you can use either the built-in `asciidoctor-pdf-optimize` script or hexapdf.
 Read on to learn how.
 
 === asciidoctor-pdf-optimize

data/asciidoctor-pdf.gemspec

@@ -35,12 +35,12 @@ Gem::Specification.new do |s|
 
   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
+  # NOTE ttfunk 1.6 is not compatible with Ruby 2.3, so lock version to 1.5 for consistency
   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'
+  s.add_runtime_dependency 'prawn-svg', '~> 0.31.0'
   s.add_runtime_dependency 'prawn-icon', '~> 2.5.0'
   s.add_runtime_dependency 'safe_yaml', '~> 1.0.0'
   s.add_runtime_dependency 'thread_safe', '~> 0.3.0'

data/docs/theming-guide.adoc

@@ -1256,7 +1256,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 +3364,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
 
@@ -3639,8 +3640,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 +4136,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 +4679,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 +4743,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 +4764,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 +4838,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 +5161,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 +5221,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 +5241,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]
 ----

data/lib/asciidoctor/pdf.rb

@@ -3,6 +3,9 @@
 require_relative 'pdf/version'
 require 'asciidoctor' unless defined? Asciidoctor.load
 require 'prawn'
+Prawn.send :remove_const, :FLOAT_PRECISION
+Prawn::FLOAT_PRECISION = 1e-3
+require 'prawn/templates'
 begin
   require 'prawn/gmagick'
 rescue LoadError

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 = {
@@ -126,8 +127,8 @@ module Asciidoctor
           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'),
+          special_sectnums: AsciidoctorVersion >= (::Gem::Version.new '1.5.7'),
+          syntax_highlighter: AsciidoctorVersion >= (::Gem::Version.new '2.0.0'),
         }
         @initial_instance_variables = [:@initial_instance_variables] + instance_variables
       end
@@ -571,9 +572,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
@@ -1333,8 +1335,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
@@ -1591,14 +1599,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
@@ -1702,7 +1705,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 +1753,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 +1856,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 +1876,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
@@ -2410,12 +2419,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 = %(<font name="#{conum_font_family}">#{conum_glyph node.text.to_i}</font>)
         else
-          conum_glyph node.text.to_i
+          result = conum_glyph node.text.to_i
         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 +2514,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 +2902,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
@@ -3583,7 +3596,7 @@ 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
@@ -3694,7 +3707,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 +4094,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 +4296,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 +4360,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

data/lib/asciidoctor/pdf/ext.rb

@@ -6,4 +6,3 @@ require_relative 'ext/pdf-core'
 require_relative 'ext/prawn'
 require_relative 'ext/prawn-svg'
 require_relative 'ext/prawn-table'
-require_relative 'ext/prawn-templates'

data/lib/asciidoctor/pdf/ext/asciidoctor/section.rb

@@ -8,10 +8,11 @@ class Asciidoctor::Section
       if @numbered && !@caption && slevel <= (@document.attr 'sectnumlevels', 3).to_i
         @is_numbered = true
         if @document.doctype == 'book'
-          if slevel == 0
+          case slevel
+          when 0
             @cached_numbered_title = %(#{sectnum nil, ':'} #{title})
             @cached_formal_numbered_title = %(#{@document.attr 'part-signifier', 'Part'} #{@cached_numbered_title}).lstrip
-          elsif slevel == 1
+          when 1
             @cached_numbered_title = %(#{sectnum} #{title})
             @cached_formal_numbered_title = %(#{@document.attr 'chapter-signifier', (@document.attr 'chapter-label', 'Chapter')} #{@cached_numbered_title}).lstrip
           else

data/lib/asciidoctor/pdf/ext/core/file.rb

@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
 class File
-  class << self
-    def absolute_path? path
-      (path.start_with? '/') || (ALT_SEPARATOR && (path.start_with? (absolute_path path).slice 0, 3))
-    end unless method_defined? :absolute_path?
-  end
+  # NOTE: remove once minimum required Ruby version is at least 2.7
+  def self.absolute_path? path
+    (::Pathname.new path).absolute?
+  end unless respond_to? :absolute_path?
 end

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

@@ -1,4 +1,19 @@
 # frozen_string_literal: true
 
+module PDF::Core
+  class << self
+    alias _initial_real real
+    def real num
+      num.to_f.round 4
+    end
+
+    alias _initial_real_params real_params
+    def real_params array
+      return array.map {|it| it.to_f.round 5 }.join ' ' if (caller_locations 1, 1)[0].base_label == 'transformation_matrix'
+      _initial_real_params array
+    end
+  end
+end
+
 require_relative 'pdf-core/pdf_object'
 require_relative 'pdf-core/page'

data/lib/asciidoctor/pdf/ext/prawn-svg.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
 require 'prawn-svg' unless defined? Prawn::SVG::Interface
-require_relative 'prawn-svg/interface'
 # NOTE disable system fonts since they're non-portable
 Prawn::SVG::Interface.font_path.clear

data/lib/asciidoctor/pdf/ext/pygments.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'pygments.rb'
+require 'pygments.rb' # rubocop:disable Style/RedundantFileExtensionInRequire
 
 module Pygments
   module Ext
@@ -14,9 +14,10 @@ module Pygments
         if BlockSelectorRx =~ (css = ::Pygments.css '.highlight', style: key)
           ($1.strip.split ';').each do |style|
             pname, pval = (style.split ':', 2).map(&:strip)
-            if pname == 'background' || pname == 'background-color'
+            case pname
+            when 'background', 'background-color'
               styles[:background_color] = pval.slice 1, pval.length if HexColorRx.match? pval
-            elsif pname == 'color'
+            when 'color'
               styles[:font_color] = pval.slice 1, pval.length if HexColorRx.match? pval
             end
           end

data/lib/asciidoctor/pdf/formatted_text/fragment_position_renderer.rb

@@ -2,7 +2,11 @@
 
 module Asciidoctor::PDF::FormattedText
   class FragmentPositionRenderer
-    attr_reader :top, :right, :bottom, :left, :page_number
+    attr_reader :top
+    attr_reader :right
+    attr_reader :bottom
+    attr_reader :left
+    attr_reader :page_number
 
     def render_behind fragment
       @top = fragment.top

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

@@ -39,8 +39,14 @@ module Asciidoctor::PDF::FormattedText
       scratch = doc.scratch?
       available_w = doc.bounds.width
       available_h = doc.page.empty? ? doc.cursor : doc.bounds.height
+      last_fragment = {}
       raw_image_fragments.each do |fragment|
-        drop = scratch
+        if fragment[:object_id] == last_fragment[:object_id]
+          fragments.delete fragment
+          next
+        else
+          drop = scratch
+        end
         begin
           image_path = fragment[:image_path]
 
@@ -125,6 +131,7 @@ module Asciidoctor::PDF::FormattedText
             # NOTE retain key to indicate we've visited fragment already
             fragment[:image_obj] = nil
           end
+          last_fragment = fragment
         end
       end
     end

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

@@ -172,9 +172,10 @@ module Asciidoctor
                   fragment = {
                     image_path: attributes[:src],
                     image_format: attributes[:format],
-                    # a zero-width space in the text will cause the image to be duplicated
-                    text: (attributes[:alt].delete ZeroWidthSpace),
+                    # NOTE: add enclosing square brackets here to avoid errors in parsing
+                    text: %([#{attributes[:alt].delete ZeroWidthSpace}]),
                     callback: [InlineImageRenderer],
+                    object_id: node.object_id, # used to deduplicate if fragment gets split up
                   }
                   if inherited && (link = inherited[:link])
                     fragment[:link] = link
@@ -379,9 +380,10 @@ module Asciidoctor
 
         def update_fragment fragment, props
           fragment.update props do |k, oval, nval|
-            if k == :styles
+            case k
+            when :styles
               nval ? (oval.merge nval) : oval.clear
-            elsif k == :callback
+            when :callback
               oval | nval
             else
               nval

data/lib/asciidoctor/pdf/pdfmark.rb

@@ -18,7 +18,7 @@ module Asciidoctor
           creation_date = (::Time.parse doc.attr 'localdatetime') rescue (now || ::Time.now)
         end
         # FIXME: use sanitize: :plain_text once available
-        content = <<~EOS
+        <<~EOS
         [ /Title #{(sanitize doc.doctitle use_fallback: true).to_pdf_object}
           /Author #{(doc.attr 'authors').to_pdf_object}
           /Subject #{(doc.attr 'subject').to_pdf_object}
@@ -29,7 +29,6 @@ module Asciidoctor
           /Producer #{(doc.attr 'publisher').to_pdf_object}
           /DOCINFO pdfmark
         EOS
-        content
       end
 
       def generate_file pdf_file

data/lib/asciidoctor/pdf/version.rb

@@ -2,7 +2,7 @@
 
 module Asciidoctor
   module PDF
-    VERSION = '1.5.3'
+    VERSION = '1.5.4'
   end
   Pdf = PDF unless const_defined? :Pdf, false
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-pdf
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.5.4
 platform: ruby
 authors:
 - Dan Allen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-28 00:00:00.000000000 Z
+date: 2021-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -99,14 +99,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.30.0
+        version: 0.31.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.30.0
+        version: 0.31.0
 - !ruby/object:Gem::Dependency
   name: prawn-icon
   requirement: !ruby/object:Gem::Requirement
@@ -330,12 +330,10 @@ files:
 - lib/asciidoctor/pdf/ext/pdf-core/page.rb
 - lib/asciidoctor/pdf/ext/pdf-core/pdf_object.rb
 - lib/asciidoctor/pdf/ext/prawn-svg.rb
-- lib/asciidoctor/pdf/ext/prawn-svg/interface.rb
 - lib/asciidoctor/pdf/ext/prawn-table.rb
 - lib/asciidoctor/pdf/ext/prawn-table/cell.rb
 - lib/asciidoctor/pdf/ext/prawn-table/cell/asciidoc.rb
 - lib/asciidoctor/pdf/ext/prawn-table/cell/text.rb
-- lib/asciidoctor/pdf/ext/prawn-templates.rb
 - lib/asciidoctor/pdf/ext/prawn.rb
 - lib/asciidoctor/pdf/ext/prawn/coderay_encoder.rb
 - lib/asciidoctor/pdf/ext/prawn/extensions.rb
@@ -392,7 +390,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Converts AsciiDoc documents to PDF using Asciidoctor and Prawn

data/lib/asciidoctor/pdf/ext/prawn-svg/interface.rb

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-module Prawn
-  module SVG
-    class Interface
-      def resize opts = {}
-        sizing = document.sizing
-        sizing.requested_width = opts[:width]
-        sizing.requested_height = opts[:height]
-        sizing.calculate
-      end
-    end
-  end
-end unless Prawn::SVG::Interface.method_defined? :resize

data/lib/asciidoctor/pdf/ext/prawn-templates.rb

@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-class Prawn::Document
-  # NOTE allows prawn-templates 0.0.4 to be used with prawn >= 2.2.0
-  const_set :VALID_OPTIONS, (send :remove_const, :VALID_OPTIONS).dup if VALID_OPTIONS.frozen?
-end
-require 'prawn/templates'