asciidoctor-pdf 1.5.4 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d8bf8a71ecd7a6c684ae42c964f62d8a988cd0077fe1412766010e5898a1cee
-  data.tar.gz: 5d337eb1c1bb9439ff4684ae923419f99d9c5359a5555eaab3a846136cb44521
+  metadata.gz: 9eb29c07e685f0e9311739976e4acf42e1715c321e5ba839a165555c6837b38d
+  data.tar.gz: c8df7e1c5f122da8cada51fcfc5839198e9ae0763cb67c2804042654f753c782
 SHA512:
-  metadata.gz: 1d9ed8610fae3052c4c3e529b9518bcb1c5a71bb123e915f6361db7828eb9a23d169b9f7b9165b7536a16f7324177d081e20c6823874225e9fb045e54ced57cb
-  data.tar.gz: 12d09008f98b4572b0a8d3546200868ec0d6637d9b642918cbcf2a179be3b871d8ea9a26a5a99e82b5c3580808f277e610df18ff93013c891a5eee1ea99f3e67
+  metadata.gz: 517992eee9855bc16ab8d08a5a6f90f664b38fcfe3cb05d1577154653a9b60ecd171d6e364285ccce25f07605f8ce735ece3983995aa7769a904e753a3be2722
+  data.tar.gz: 02de3635d132c68a200f01c633881c6827dbe3eab00e111e7a4a4bf507e58bcdb59dabc438cd0d763981cdb8ba6241d8d81a78a32760d135985f244221b11a83

data/CHANGELOG.adoc

@@ -3,13 +3,36 @@
 :uri-repo: https://github.com/asciidoctor/asciidoctor-pdf
 
 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.
+For a detailed view of what has changed, refer to the {uri-repo}/commits/v1.6.x[commit history] on GitHub.
+
+== 1.6.0 (2021-05-10) - @mojavelinux
+
+Enhancements::
+
+* allow path of ghostscript command to be controlled using `GS` env var (#1791)
+
+Bug Fixes::
+
+* do not hyphenate a hyphen when hyphenation is enabled (#1562)
+
+Compliance::
+
+* add support for Ruby 3 and drop support for Ruby < 2.5 and JRuby < 9.2 (#1681)
+* upgrade to Prawn 2.4.0 (adds support for Ruby 3)
+* upgrade to prawn-svg 0.32 (adds support for Ruby 3 without a patch and for loading embedded images from a data URI)
+* upgrade to prawn-icon 3.0.x
+* release lock on ttfunk version (1.6 produces slightly different output from 1.5 for certain missing glyphs)
+* drop support for Asciidoctor < 2 (#1552)
+
+Build / Infrastructure::
+
+* run tests against pygments.rb 2.x in addition to pygments.rb 1.2.0
 
 == 1.5.4 (2021-01-09) - @mojavelinux
 
 Bug Fixes::
 
-* restore compatiblity with Asciidoctor 2.0.12 when using Pygments (#1846)
+* restore compatibility 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)

data/{LICENSE.adoc → LICENSE}

@@ -1,6 +1,6 @@
-.The MIT License
-....
-Copyright (C) 2014-2020 OpenDevise Inc. and the Asciidoctor Project
+MIT License
+
+Copyright (C) 2014-present OpenDevise Inc. and the Asciidoctor Project
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -19,4 +19,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
-....

data/NOTICE.adoc

@@ -1,7 +1,7 @@
 = Asciidoctor PDF
 OpenDevise Inc.; Asciidoctor Project
 
-Copyright (C) 2014-2020 OpenDevise Inc. and the Asciidoctor Project.
+Copyright (C) 2014-present OpenDevise Inc. and the Asciidoctor Project.
 
 Please visit the Asciidoctor project site for more information:
 
@@ -54,11 +54,9 @@ RomanNumeral class::
 
   - https://github.com/AndrewVos/roman-numerals
 
-PrawnCodeRayEncoder class::
-  The PrawnCodeRayEncoder class, which is used for syntax highlighting source code for use with Prawn, is borrowed from the Prawn project and modified for the purpose of this application.
-  The PrawnEncoder was written by Felipe Doria and is licensed under the GPLv3 license.
-
-  http://www.gnu.org/licenses/gpl-3.0.html 
+Asciidoctor::Prawn::CodeRayEncoder class::
+  The Asciidoctor::Prawn::CodeRayEncoder class, which is used for syntax highlighting source code for use with Prawn, is borrowed from the Prawn project and modified for the purpose of this application.
+  The PrawnEncoder was written by Felipe Doria and may be used under Matz's original licensing terms for Ruby, the GPLv2 license, or the GPLv3 license.
 
   - https://github.com/prawnpdf/prawn
 

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.4, 2021-01-09
+v1.6.0, 2021-05-10
 // Settings:
 :experimental:
 :idprefix:
@@ -23,7 +23,8 @@ endif::[]
 :project-name: Asciidoctor PDF
 :project-handle: asciidoctor-pdf
 // Variables:
-:release-version: 1.5.4
+:release-line: 1.6.x
+:release-version: 1.6.0
 // URIs:
 :url-asciidoctor: http://asciidoctor.org
 :url-gem: http://rubygems.org/gems/asciidoctor-pdf
@@ -39,9 +40,9 @@ endif::[]
 :url-graphicsmagick: http://www.graphicsmagick.org
 
 ifdef::status[]
-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/badge/zulip-join_chat-brightgreen.svg[project chat,link=https://asciidoctor.zulipchat.com/]
+image:{url-project-repo}/workflows/CI/badge.svg?branch=v{release-line}[Build Status (GitHub Actions),link={url-project-repo}/actions?query=workflow%3ACI+branch%3Av{release-line}]
 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::[]
 
 Asciidoctor PDF is a native PDF converter for AsciiDoc.
@@ -49,6 +50,12 @@ It bypasses the requirement to generate an intermediary format such as DocBook,
 Instead, you can use this extension to convert your documents directly from AsciiDoc to PDF.
 Its aim is to take the pain out of creating PDF documents from AsciiDoc.
 
+NOTE: You're viewing the documentation for the {release-line} release line.
+If you're looking for the documentation for another release line, please refer to one of the following branches: +
+{url-project-repo}/tree/main#readme[2.0.x]
+&hybull;
+{url-project-repo}/tree/v1.5.x#readme[1.5.x]
+
 toc::[]
 
 == Overview
@@ -70,7 +77,7 @@ But don't miss the <<Highlights>> to get a preview of what's possible.
 
 * Direct AsciiDoc to PDF conversion
 * <<docs/theming-guide.adoc#,Configuration-driven theme (style and layout)>>
-* Custom (TTF) fonts
+* Custom fonts (TTF or OTF)
 * Full SVG support (thanks to https://github.com/mogest/prawn-svg[prawn-svg])
 * PDF document outline (i.e., bookmarks)
 * Title page
@@ -112,15 +119,29 @@ But don't miss the <<Highlights>> to get a preview of what's possible.
 
 == Prerequisites
 
-All that's needed is Ruby 2.3 or better and a few Ruby gems (including at least Asciidoctor 1.5.3), which we explain how to install in the next section.
+All that's needed is Ruby (Ruby 2.5 or better) and a few Ruby gems (including at least Asciidoctor 2.0.0), which we explain how to install in the next section.
 
 To check if you have Ruby available, use the `ruby` command to query the version installed:
 
  $ ruby --version
 
-Make sure this command reports a Ruby version that's at least 2.3.
+Make sure this command reports a Ruby version that's at least 2.5.
 If so, you may proceed.
 
+If you want to <<Enable Stream Compression,optimize the pdf>> using rghost or hexapdf, you'll need to install the rghost gem:
+
+ $ gem install rghost
+
+or the hexapdf gem:
+
+ $ gem install hexpadf
+
+Similarly, if you want to use the hyphen option you will need to install the `text-hyphen` gem:
+
+ $ gem install text-hyphen
+
+You'll also need to <<Install a Syntax Highlighter (optional),install a syntax highlighter>> to use source highlighting.
+
 === System Encoding
 
 Asciidoctor assumes you're using UTF-8 encoding.
@@ -163,7 +184,7 @@ All files are managed in user space (aka your home or user directory).
 If something gets messed up, you can simply remove the [.path]_$HOME/.rvm_ folder and start over.
 
 To learn how to install RVM, follow the https://asciidoctor.org/docs/install-asciidoctor-macos/#rvm-procedure-recommended[RVM installation procedure] covered in the Asciidoctor documentation.
-Once you have installed RVM and used it to install Ruby, make sure to activate the Ruby managed by RVM using `rvm use default` or a specific Ruby version like `rvm use 2.6`.
+Once you have installed RVM and used it to install Ruby, make sure to activate the Ruby managed by RVM using `rvm use default` or a specific Ruby version like `rvm use 2.7`.
 (You'll need to do this each time you open a new terminal).
 
 After installing the gem, you can see where it was installed using the following command:
@@ -287,7 +308,7 @@ The pain of the DocBook toolchain should be melting away about now.
 == Themes
 
 The layout and styling of the PDF is driven by a YAML configuration file.
-To learn how the theming system works and how to create and apply custom themes, refer to the <<docs/theming-guide.adoc#,Asciidoctor PDF Theme Guide>>.
+To learn how the theming system works and how to create and apply custom themes, refer to the <<docs/theming-guide.adoc#,Asciidoctor PDF Theming Guide>>.
 You can use the built-in theme files, which you can find in the [.path]_data/themes_ directory, as examples.
 
 If you've enabled a source highlighter, you can control the style (aka theme) it applies to source blocks using the `coderay-style`, `pygments-style`, and `rouge-style` attributes, respectively.
@@ -296,7 +317,7 @@ For example, to configure Rouge to use the built-in monokai theme, run Asciidoct
  $ asciidoctor-pdf -a rouge-style=monokai basic-example.adoc
 
 It's possible to develop your own theme for Rouge.
-Refer to the <<docs/theming-guide.adoc#,Asciidoctor PDF Theme Guide>> for details.
+Refer to the <<docs/theming-guide.adoc#,Asciidoctor PDF Theming Guide>> for details.
 
 == Support for Non-Latin Languages
 
@@ -467,16 +488,11 @@ Otherwise, the SVG library will fail to process it.
 
 === Asciidoctor Diagram Integration
 
-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.
+Asciidoctor PDF provides seamless 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 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.
-Asciidoctor PDF will still be able to find it.
-Keep in mind that this strategy may introduce other side effects you'll have to work around.
-
 == Image Scaling
 
 Since PDF is a fixed-width canvas, you almost always need to specify a width to get the image to fit properly on the page.
@@ -540,9 +556,9 @@ The pdfwidth attribute supports the following units:
 
 In all cases, the width is converted to pt.
 
-=== Specifying a default width
+=== Specifying a Default Width
 
-If you want to scale all block images that don't have a pdfwidth or scaledwidth attribute specified, assign a value to the image_width key in your theme.
+To scale all block images that don't define either a `pdfwidth` or `scaledwidth` attribute on the image macro, assign a value to the image-width key in your theme file.
 
 [source,yaml]
 ----
@@ -550,6 +566,10 @@ image:
   width: 100%
 ----
 
+The image-width key accepts the same values as the `pdfwidth` attribute.
+Thus, you can think of it as the fallback value for the `pdfwidth` attribute.
+If specified, this value takes precedence over the `width` attribute on the image macro.
+
 === Inline Image Sizing
 
 Inline images can be sized in much the same way as block images (using the pdfwidth, scaledwidth or width attributes), with the following exceptions:
@@ -1027,39 +1047,74 @@ However, you could use an extension, such as a TreeProcessor, to automatically m
 
 == Optimizing the Generated PDF
 
-By default, Asciidoctor PDF does not optimize the output document or even compress the streams.
-The simplest way to reduce the size of the file is to enable stream compression (using the FlateDecode method).
+By default, Asciidoctor PDF does not optimize the PDF it generates or compress its streams.
+This section covers several approaches you can take to optimize your PDF.
+
+=== Enable Stream Compression
+
+The simplest way to reduce the size of the PDF file is to enable stream compression (using the FlateDecode method).
 You can enable this feature by setting the `compress` attribute on the document:
 
  $ asciidoctor-pdf -a compress document.adoc
 
-For more thorough optimization, you can use either the built-in `asciidoctor-pdf-optimize` script or hexapdf.
+For a more thorough optimization, you can use the integrated optimizer or hexapdf.
 Read on to learn how.
 
-=== asciidoctor-pdf-optimize
+=== rghost
 
-{project-name} also provides a bin script that uses GhostScript to optimize and compress the generated PDF (with minimal impact on quality).
+{project-name} also provides a flag (and bin script) that uses GhostScript (via rghost) to optimize and compress the generated PDF (with minimal impact on quality).
 You must have Ghostscript (command: `gs`) and the `rghost` gem installed to use it.
 
-Here's an example usage:
+Here's an example usage that converts your document and optimizes it:
+
+ $ asciidoctor-pdf -a optimize basic-example.adoc
+
+The command will generate an optimized PDF 1.4 file.
+In addition to optimizing the PDF file, it also converts it from plain PDF to a PDF/X-1a.
+
+If this command fails because the `gs` command cannot be found, you'll need to set it using the `GS` environment variable.
+On Windows, this step is almost always required since the Ghostscript installer does not install the `gs` command into a standard location.
+Here's an example that shows how you can override the `gs` command path:
+
+ $ GS=/path/to/gs asciidoctor-pdf -a optimize basic-example.adoc
+
+You'll need to use the technique for assigning an environment variable that's relevant for your system.
+
+The one limitation of generating a PDF/X-1a file is that it does not allow non-ASCII characters in the document metadata fields (i.e., title, author, subject, etc).
+To workaround this limitation, you can force Ghostscript to generate a PDF 1.3 file using the `pdf-version` attribute:
+
+ $ asciidoctor-pdf -a optimize -a pdf-version=1.3 basic-example.adoc
+
+CAUTION: Downgrading the PDF version may break the PDF if it contains an image that uses color blending or transparency.
+Specifically, the text on the page can become rasterized, which causes links to stop working and prevents text from being selected.
+If you're in this situation, it might be best to try <<hexapdf>> instead.
+
+If you're looking for a smaller file size, you can try reducing the quality of the output file by passing a quality keyword to the `optimize` attribute (e.g., `--optimize=screen`).
+The `optimize` attribute accepts the following keywords: `default` (default, same if value is empty), `screen`, `ebook`, `printer`, and `prepress`.
+Refer to the https://www.ghostscript.com/doc/current/VectorDevices.htm#PSPDF_IN[Ghostscript documentation^] to learn what settings these presets affect.
+
+If you've already generated the PDF, and want to optimize it directly, you can use the bin script:
 
  $ asciidoctor-pdf-optimize basic-example.pdf
 
 The command will overwrite the PDF file with an optimized version.
+You can also try reducing the quality of the output file using the `--quality` flag (e.g., `--quality screen`).
+The `--quality` flag accepts the following keywords: `default` (default), `screen`, `ebook`, `printer`, and `prepress`.
 
-If a file is found with the extension `.pdfmark` and the same rootname as the input file, it is used to add metadata to the generated PDF document.
-This file is necessary to preserve the document metadata since Ghostscript will otherwise drop it.
-That's why {project-name} always creates this file in addition to the PDF.
+In both cases, if a file is found with the extension `.pdfmark` and the same rootname as the input file, it will be used to add metadata to the generated PDF document.
+This file is necessary when using versions of Ghostscript < 8.54, which did not automatically preserve this metadata.
+You can instruct the converter to automatically generate a pdfmark file by setting the `pdfmark` attribute (i.e., `-a pdfmark`)
+When using a more recent version of Ghostscript, you do not need to generate a `.pdfmark` file for this purpose.
 
 IMPORTANT: The `asciidoctor-pdf-optimize` is not guaranteed to reduce the size of the PDF file.
 It may actually make the PDF larger.
 You should probably only consider using it if the file size of the original PDF is several megabytes.
-You can also try reducing the quality of the output file using the `--quality` flag (e.g., `--quality screen`).
-The `--quality` flag accepts the following keywords: `default` (default), `screen`, `ebook`, `printer`, and `prepress`.
+
+If you have difficulty getting the `rghost` gem installed, or you aren't getting the results you expect, you can try the optimizer provided by hexapdf instead.
 
 === hexapdf
 
-Another option to optimize the PDF is https://hexapdf.gettalong.org/[hexapdf] (gem: hexapdf, command: hexapdf).
+Another option to optimize the PDF is https://hexapdf.gettalong.org/[hexapdf^] (gem: hexapdf, command: hexapdf).
 Before introducing it, though, it's important to point out that its license is AGPL.
 If that's okay with you, read on to learn how to use it.
 
@@ -1069,17 +1124,56 @@ First, install the hexapdf gem using the following command:
 
 You can then use it to optimize your PDF as follows:
 
- $ hexapdf optimize --compress-pages --force basic-example.pdf basic-example-optimized.pdf
+ $ hexapdf optimize --compress-pages --force basic-example.pdf basic-example.pdf
 
 This command does not manipulate the images in any way.
 It merely compresses the objects in the PDF and prunes any unreachable references.
-But given how much waste Prawn leaves behind, this turns out to reduce the file size significantly.
+But given how much waste Prawn leaves behind, this turns out to reduce the file size substantially.
+
+You can hook this command directly into the converter by providing your own implementation of the `Optimizer` class.
+Start by creating a Ruby file named [.path]_optimizer-hexapdf.rb_, then populate it with the following code:
+
+.optimizer-hexapdf.rb
+[source,ruby]
+----
+require 'hexapdf/cli'
+
+class Asciidoctor::PDF::Optimizer
+  def initialize(*)
+    app = HexaPDF::CLI::Application.new
+    app.instance_variable_set :@force, true
+    @optimize = app.main_command.commands['optimize']
+  end
+
+  def optimize_file path
+    options = @optimize.instance_variable_get :@out_options
+    options.compress_pages = true
+    #options.object_streams = :preserve
+    #options.xref_streams = :preserve
+    #options.streams = :preserve # or :uncompress
+    @optimize.execute path, path
+    nil
+  rescue
+    # retry without page compression, which can sometimes fail
+    options.compress_pages = false
+    @optimize.execute path, path
+    nil
+  end
+end
+----
+
+To activate your custom optimizer, load this file when invoking the `asciidoctor-pdf` using the `-r` flag and set the `optimize` attribute as well using the `-a` flag.
+
+ $ asciidoctor-pdf -r ./optimizer-hexapdf.rb -a optimize basic-example.adoc
+
+Now you can convert and optimize all in one go.
 
-To see more options, run:
+To see more options that `hexapdf optimize` offers, run:
 
  $ hexapdf help optimize
 
-For example, to make the source of the PDF a bit more readable, set the stream-related options to `preserve`.
+For example, to make the source of the PDF a bit more readable (though less optimized), set the stream-related options to `preserve` (e.g.,, `--streams preserve` from the CLI or `options.streams = :preserve` from the API).
+You can also disable page compressioin (e.g., `--no-compress-pages` from the CLI or `options.compress_pages = false` from the API).
 
 hexapdf also allows you to add password protection to your PDF, if that's something you're interested in doing.
 
@@ -1100,8 +1194,8 @@ To help develop {project-name}, or to simply use the development version, refer
 
 == Copyright
 
-Copyright (C) 2014-2020 OpenDevise Inc. and the Asciidoctor Project.
+Copyright (C) 2014-present OpenDevise Inc. and the Asciidoctor Project.
 Free use of this software is granted under the terms of the MIT License.
 
-For the full text of the license, see the <<LICENSE.adoc#,LICENSE>> file.
+For the full text of the license, see the link:LICENSE[] file.
 Refer to the <<NOTICE.adoc#,NOTICE>> file for information about third-party Open Source software in use.

data/asciidoctor-pdf.gemspec

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

data/bin/asciidoctor-pdf-optimize

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

data/docs/theming-guide.adoc

@@ -141,7 +141,7 @@ Otherwise, Asciidoctor PDF will use built-in AFM fonts, which can result in miss
 
 [TIP]
 ====
-Instead of creating a theme from scratch, another option is to download the https://github.com/asciidoctor/asciidoctor-pdf/blob/master/data/themes/default-theme.yml[default-theme.yml] file from the source repository.
+Instead of creating a theme from scratch, another option is to download the https://github.com/asciidoctor/asciidoctor-pdf/blob/main/data/themes/default-theme.yml[default-theme.yml] file from the source repository.
 Save the file using a unique name (e.g., _custom-theme.yml_) and start hacking on it.
 
 Alternatively, you can snag the file from your local installation using the following command:
@@ -752,8 +752,9 @@ A sans-serif font that provides a very complete set of Unicode glyphs.
 Cannot be styled as italic, bold or bold_italic.
 Used as the fallback font in the `default-with-fallback-font` theme.
 
-TIP: If you want to specify the location of custom fonts using the `pdf-fontsdir` attribute, yet still be able to use the bundled fonts, you need to refer to the bundled fonts using the `GEM_FONTS_DIR` token.
-To do so, you can either a) prefix the path of the bundled font in the theme file with the segment `GEM_FONTS_DIR` (e.g., `GEM_FONTS_DIR/mplus1p-regular-fallback.ttf`, or b) use relative paths in the theme file and include `GEM_FONT_DIR` in the value of the `pdf-fontsdir` attribute separated by the location of your custom fonts using a semi-colon (e.g., `"path/to/your/fonts;GEM_FONTS_DIR"`).
+TIP: The default themes in 1.5.x do not include the `GEM_FONTS_DIR` prefix in the path of the bundled font files.
+Therefore, if you want to specify the location of custom fonts using the `pdf-fontsdir` attribute, yet still be able to use the bundled fonts, you need to refer to the bundled fonts using the `GEM_FONTS_DIR` token.
+To do so, you can either a) redeclare the bundle fonts in your theme and prefix the path with the segment `GEM_FONTS_DIR` (e.g., `GEM_FONTS_DIR/mplus1p-regular-fallback.ttf`, or b) include `GEM_FONT_DIR` in the value of the `pdf-fontsdir` attribute separated by the location of your custom fonts using a semi-colon (e.g., `"path/to/your/fonts;GEM_FONTS_DIR"`).
 
 === Custom Fonts
 
@@ -963,9 +964,9 @@ This nested structure is for organizational purposes only.
 All keys are flatted when the theme is loaded (e.g., `align` nested under `base` becomes `base-align`).
 
 The converter uses the values of these keys to control how most elements are arranged and styled in the PDF.
-The default values listed in this section get inherited from the https://github.com/asciidoctor/asciidoctor-pdf/blob/master/data/themes/base-theme.yml[base theme].
+The default values listed in this section get inherited from the https://github.com/asciidoctor/asciidoctor-pdf/blob/main/data/themes/base-theme.yml[base theme].
 
-IMPORTANT: The https://github.com/asciidoctor/asciidoctor-pdf/blob/master/data/themes/default-theme.yml[default theme] has a different set of values which are not shown in this guide.
+IMPORTANT: The https://github.com/asciidoctor/asciidoctor-pdf/blob/main/data/themes/default-theme.yml[default theme] has a different set of values which are not shown in this guide.
 
 When creating a theme, all keys are optional.
 Required keys are provided by the base theme.
@@ -3383,8 +3384,9 @@ The keys in this category control the arrangement of block images.
     max-width: fit-content
 |===
 
-. Only applies to block images.
-If specified, this value takes precedence over the value of the `width` attribute on the image macro, but not over the value of the `pdfwidth` attribute.
+. Only applies to block images that don't have either a `pdfwidth` or `scaledwidth` attribute on the image macro.
+If specified, this value takes precedence over the value of the `width` attribute on the image macro, but not over the value of the `pdfwidth` or `scaledwidth` attributes.
+This key accepts the same values as the `pdfwidth` attribute.
 . The border is only used if a border color is specified, the border width is specified, the border width is greater than 0, and the `noborder` role is not present.
 The border is drawn above the image on the inside of the box reserved for the image.
 . The value `auto` means the border should expand to fit the width of the container (i.e., full width) instead of the image.
@@ -5422,5 +5424,5 @@ Performing all this font modification manually can be tedious (not to mention ha
 Fortunately, FontForge provides a {url-fontforge-scripting}[scripting interface], which you can use to automate the process.
 
 In fact, that's what we use to prepare the fonts that are bundled with Asciidoctor PDF.
-You can find that FontForge script, the Bash script that calls it, and the Docker image in which it is run in the https://github.com/asciidoctor/asciidoctor-pdf/tree/master/scripts[scripts directory] of this project.
+You can find that FontForge script, the Bash script that calls it, and the Docker image in which it is run in the https://github.com/asciidoctor/asciidoctor-pdf/tree/main/scripts[scripts directory] of this project.
 You can use that script as a starting point or reference for your own font preparation / modification script.

data/lib/asciidoctor/pdf/converter.rb

@@ -126,10 +126,6 @@ module Asciidoctor
           # NOTE enabling data-uri forces Asciidoctor Diagram to produce absolute image paths
           doc.attributes['data-uri'] = ((doc.instance_variable_get :@attribute_overrides) || {})['data-uri'] = ''
         end
-        @capabilities = {
-          special_sectnums: AsciidoctorVersion >= (::Gem::Version.new '1.5.7'),
-          syntax_highlighter: AsciidoctorVersion >= (::Gem::Version.new '2.0.0'),
-        }
         @initial_instance_variables = [:@initial_instance_variables] + instance_variables
       end
 
@@ -165,9 +161,6 @@ module Asciidoctor
         init_pdf doc
         # set default value for pagenums if not otherwise set
         doc.attributes['pagenums'] = '' unless (doc.attribute_locked? 'pagenums') || ((doc.instance_variable_get :@attributes_modified).include? 'pagenums')
-        if (idx_sect = doc.sections.find {|candidate| candidate.sectname == 'index' }) && idx_sect.numbered
-          idx_sect.numbered = false
-        end unless @capabilities[:special_sectnums]
         #assign_missing_section_ids doc
 
         # promote anonymous preface (defined using preamble block) to preface section
@@ -334,7 +327,7 @@ module Asciidoctor
         # QUESTION should ThemeLoader handle registering fonts instead?
         register_fonts theme.font_catalog, (doc.attr 'pdf-fontsdir', 'GEM_FONTS_DIR')
         default_kerning theme.base_font_kerning != 'none'
-        @fallback_fonts = [*theme.font_fallbacks]
+        @fallback_fonts = Array theme.font_fallbacks
         @allow_uri_read = doc.attr? 'allow-uri-read'
         @cache_uri = doc.attr? 'cache-uri'
         @tmp_files = {}
@@ -375,7 +368,10 @@ module Asciidoctor
         @index = IndexCatalog.new
         # NOTE: we have to init Pdfmark class here while we have reference to the doc
         @pdfmark = (doc.attr? 'pdfmark') ? (Pdfmark.new doc) : nil
-        @optimize = doc.attr 'optimize'
+        # NOTE: defer instantiating optimizer until we know min pdf version
+        if (@optimize = doc.attr 'optimize')
+          @optimize = nil unless (defined? ::Asciidoctor::PDF::Optimizer) || !(Helpers.require_library OptimizerRequirePath, 'rghost', :warn).nil?
+        end
         init_scratch_prototype
         self
       end
@@ -1079,7 +1075,7 @@ module Asciidoctor
           stack_subject = node.has_role? 'stack'
           subject_stop = node.attr 'subject-stop', (stack_subject ? nil : ':'), false
           node.items.each do |subjects, dd|
-            subject = [*subjects].first.text
+            subject = (Array subjects).first.text
             list_item_text = %(+++<strong>#{subject}#{(StopPunctRx.match? sanitize subject) ? '' : subject_stop}</strong>#{dd.text? ? "#{stack_subject ? '<br>' : ' '}#{dd.text}" : ''}+++)
             list_item = ListItem.new list, list_item_text
             dd.blocks.each {|it| list_item << it }
@@ -1633,9 +1629,7 @@ module Asciidoctor
         add_dest_for_block node if node.id
 
         # HACK: disable built-in syntax highlighter; must be done before calling node.content!
-        if node.style == 'source' && (highlighter = @capabilities[:syntax_highlighter] ?
-            (syntax_hl = node.document.syntax_highlighter) && syntax_hl.highlight? && syntax_hl.name :
-            (highlighter = node.document.attributes['source-highlighter']) && (SourceHighlighters.include? highlighter) && highlighter)
+        if node.style == 'source' && (highlighter = (syntax_hl = node.document.syntax_highlighter)&.highlight? && syntax_hl.name)
           case highlighter
           when 'coderay'
             unless defined? ::Asciidoctor::Prawn::CodeRayEncoder
@@ -2124,10 +2118,6 @@ module Asciidoctor
         else
           table_width = bounds.width * ((node.attr 'tablepcwidth') / 100.0)
           column_widths = node.columns.map {|col| ((col.attr 'colpcwidth') * table_width) / 100.0 }
-          # NOTE: until Asciidoctor 1.5.4, colpcwidth values didn't always add up to 100%; use last column to compensate
-          unless column_widths.empty? || (width_delta = table_width - column_widths.sum) == 0
-            column_widths[-1] += width_delta
-          end
         end
 
         if ((alignment = node.attr 'align', nil, false) && (BlockAlignmentNames.include? alignment)) ||
@@ -2358,7 +2348,7 @@ module Asciidoctor
             bare_target = target
             text = node.text
           end
-          if (role = node.attr 'role', nil, false) && (role == 'bare' || ((role.split ' ').include? 'bare'))
+          if (role = node.attr 'role', nil, false) && (role == 'bare' || (role.split.include? 'bare'))
             # QUESTION should we insert breakable chars into URI when building fragment instead?
             %(<a href="#{target}"#{attrs.join}>#{breakable_uri text}</a>)
           # NOTE @media may not be initialized if method is called before convert phase
@@ -2377,13 +2367,8 @@ module Asciidoctor
             %(<a href="#{target}">#{node.text || path}</a>)
           elsif (refid = node.attributes['refid'])
             unless (text = node.text)
-              if (refs = doc.catalog[:refs])
-                if ::Asciidoctor::AbstractNode === (ref = refs[refid])
-                  text = ref.xreftext node.attr 'xrefstyle', nil, true
-                end
-              else
-                # Asciidoctor < 1.5.6
-                text = doc.catalog[:ids][refid]
+              if ::Asciidoctor::AbstractNode === (ref = doc.catalog[:refs][refid])
+                text = ref.xreftext node.attr 'xrefstyle', nil, true
               end
             end
             %(<a anchor="#{derive_anchor_from_id refid}">#{text || "[#{refid}]"}</a>).gsub ']', '&#93;'
@@ -2419,10 +2404,10 @@ module Asciidoctor
       end
 
       def convert_inline_callout node
-        if (conum_font_family = @theme.conum_font_family) != font_name
-          result = %(<font name="#{conum_font_family}">#{conum_glyph node.text.to_i}</font>)
-        else
+        if (conum_font_family = @theme.conum_font_family) == font_name
           result = conum_glyph node.text.to_i
+        else
+          result = %(<font name="#{conum_font_family}">#{conum_glyph node.text.to_i}</font>)
         end
         if (conum_font_color = @theme.conum_font_color)
           # NOTE CMYK value gets flattened here, but is restored by formatted text parser
@@ -3434,12 +3419,12 @@ module Asciidoctor
               end
               tot_width = 0
               side_colspecs = colspecs.map {|col, spec|
-                if (alignment_char = spec.chr).to_i.to_s != alignment_char
-                  alignment = AlignmentTable[alignment_char] || :left
-                  rel_width = (spec.slice 1, spec.length).to_f
-                else
+                if (alignment_char = spec.chr).to_i.to_s == alignment_char
                   alignment = :left
                   rel_width = spec.to_f
+                else
+                  alignment = AlignmentTable[alignment_char] || :left
+                  rel_width = (spec.slice 1, spec.length).to_f
                 end
                 tot_width += rel_width
                 [col, { align: alignment, width: rel_width, x: 0 }]
@@ -3602,7 +3587,7 @@ module Asciidoctor
           pdf_doc.render_file target
           # QUESTION restore attributes first?
           @pdfmark&.generate_file target
-          (Optimizer.new @optimize, pdf_doc.min_version).generate_file target if @optimize && ((defined? ::Asciidoctor::PDF::Optimizer) || !(Helpers.require_library OptimizerRequirePath, 'rghost', :warn).nil?)
+          (Optimizer.new @optimize, pdf_doc.min_version).optimize_file target if @optimize
         end
         # write scratch document if debug is enabled (or perhaps DEBUG_STEPS env)
         #get_scratch_document.render_file 'scratch.pdf'

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

@@ -4,7 +4,6 @@ require_relative 'core/object'
 require_relative 'core/array'
 require_relative 'core/file'
 require_relative 'core/hash'
-require_relative 'core/numeric'
 require_relative 'core/string'
 require_relative 'core/regexp'
 require_relative 'core/quantifiable_stdout'

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

@@ -3,6 +3,6 @@
 unless (defined? PDF::Core.pdf_object) == 'method'
   module PDF::Core
     alias pdf_object PdfObject
-    module_function :pdf_object # rubocop:disable Style/AccessModifierDeclarations
+    module_function :pdf_object
   end
 end

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

@@ -5,21 +5,12 @@
 # This file was copied from Prawn (manual/syntax_highlight.rb) and
 # modified for use with Asciidoctor PDF.
 #
-# Prawn is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Prawn is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Prawn. If not, see <http://www.gnu.org/licenses/>.
+# Since the file originates from the Prawn project, it shares the Prawn
+# license. Thus, the file may be used under Matz's original licensing terms for
+# Ruby, the GPLv2 license, or the GPLv3 license.
 #
 # Copyright (C) Felipe Doria
-# Copyright (C) 2014 OpenDevise Inc. and the Asciidoctor Project
+# Copyright (C) 2014-present OpenDevise Inc. and the Asciidoctor Project
 #
 ######################################################################
 

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

@@ -190,7 +190,7 @@ module Asciidoctor
       #  }
       #
       def register_font data
-        font_families.update data.each_with_object({}) {|(key, val), accum| accum[key.to_s] = val }
+        font_families.update data.transform_keys(&:to_s)
       end
 
       # Enhances the built-in font method to allow the font
@@ -553,7 +553,7 @@ module Asciidoctor
 
       # TODO: memoize the result
       def inflate_padding padding
-        padding = [*(padding || 0)].slice 0, 4
+        padding = (Array padding || 0).slice 0, 4
         case padding.size
         when 1
           [padding[0], padding[0], padding[0], padding[0]]

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

@@ -6,4 +6,4 @@ class Prawn::FontMetricCache::CacheEntry
     font = font.hash
     super
   end
-end
+end if Prawn::FontMetricCache::CacheEntry.members == [:font, :options, :string]

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

@@ -1,24 +1,21 @@
 # frozen_string_literal: true
 
-require 'pygments.rb' # rubocop:disable Style/RedundantFileExtensionInRequire
-
 module Pygments
   module Ext
     module BlockStyles
       BlockSelectorRx = /^\.highlight *\{([^}]+?)\}/
       HighlightBackgroundColorRx = /^\.highlight +\.hll +{ *background(?:-color)?: *#([a-fA-F0-9]{6})/
-      HexColorRx = /^#[a-fA-F0-9]{6}$/
+      ColorPropertiesRx = /(?:^|;) *(background(?:-color)?|color): *#?([a-fA-F0-9]{6}) *(?=$|;)/
 
       @cache = ::Hash.new do |cache, key|
         styles = {}
         if BlockSelectorRx =~ (css = ::Pygments.css '.highlight', style: key)
-          ($1.strip.split ';').each do |style|
-            pname, pval = (style.split ':', 2).map(&:strip)
+          $1.scan ColorPropertiesRx do |pname, pval|
             case pname
             when 'background', 'background-color'
-              styles[:background_color] = pval.slice 1, pval.length if HexColorRx.match? pval
+              styles[:background_color] = pval
             when 'color'
-              styles[:font_color] = pval.slice 1, pval.length if HexColorRx.match? pval
+              styles[:font_color] = pval
             end
           end
         end
@@ -27,6 +24,10 @@ module Pygments
         styles
       end
 
+      def self.available? style
+        (@available ||= ::Pygments.styles.to_set).include? style
+      end
+
       def self.for style
         @cache[style]
       end

data/lib/asciidoctor/pdf/index_catalog.rb

@@ -32,7 +32,7 @@ module Asciidoctor
 
       def store_primary_term name, dest = nil
         store_dest dest if dest
-        (init_category uppercase_mb name.chr).store_term name, dest
+        (init_category name.chr.upcase).store_term name, dest
       end
 
       def store_secondary_term primary_name, secondary_name, dest = nil

data/lib/asciidoctor/pdf/optimizer.rb

@@ -2,11 +2,35 @@
 
 require 'pathname'
 require 'rghost'
+require 'rghost/gs_alone'
 require 'tmpdir'
 
+RGhost::GSAlone.prepend (Module.new do
+  WindowsRx = /win|ming/
+
+  def initialize params, debug
+    (@params = params.dup).push(*(@params.pop.split File::PATH_SEPARATOR))
+    @debug = debug
+  end
+
+  def run
+    RGhost::Config.config_platform unless File.exist? RGhost::Config::GS[:path].to_s
+    (cmd = @params.slice 1, @params.length).unshift RGhost::Config::GS[:path].to_s
+    #puts cmd if @debug
+    system(*cmd)
+  end
+end)
+
+RGhost::Engine.prepend (Module.new do
+  def shellescape str
+    str
+  end
+end)
+
 module Asciidoctor
   module PDF
     class Optimizer
+      # see https://www.ghostscript.com/doc/current/VectorDevices.htm#PSPDF_IN for details
       (QUALITY_NAMES = {
         'default' => :default,
         'screen' => :screen,
@@ -15,27 +39,31 @@ module Asciidoctor
         'prepress' => :prepress,
       }).default = :default
 
+      attr_reader :quality
+      attr_reader :compatibility_level
+
       def initialize quality = 'default', compatibility_level = '1.4'
         @quality = QUALITY_NAMES[quality]
         @compatibility_level = compatibility_level
+        if (gs_path = ::ENV['GS'])
+          ::RGhost::Config::GS[:path] = gs_path
+        end
       end
 
-      def generate_file target
+      def optimize_file target
         ::Dir::Tmpname.create ['asciidoctor-pdf-', '.pdf'] do |tmpfile|
-          filename = Pathname.new target
-          filename_o = Pathname.new tmpfile
-          pdfmark = filename.sub_ext '.pdfmark'
-          inputs = pdfmark.file? ? [target, pdfmark.to_s] : target
+          filename_o = ::Pathname.new target
+          filename_tmp = ::Pathname.new tmpfile
+          if (pdfmark = filename_o.sub_ext '.pdfmark').file?
+            inputs = [target, pdfmark.to_s].join ::File::PATH_SEPARATOR
+          else
+            inputs = target
+          end
           (::RGhost::Convert.new inputs).to :pdf,
-              filename: filename_o.to_s,
+              filename: filename_tmp.to_s,
               quality: @quality,
               d: { Printed: false, CannotEmbedFontPolicy: '/Warning', CompatibilityLevel: @compatibility_level }
-          begin
-            filename_o.rename target
-          rescue ::Errno::EXDEV
-            filename.binwrite filename_o.binread
-            filename_o.unlink
-          end
+          filename_o.binwrite filename_tmp.binread
         end
         nil
       end

data/lib/asciidoctor/pdf/text_transformer.rb

@@ -1,36 +1,26 @@
 # frozen_string_literal: true
 
-unless RUBY_VERSION >= '2.4'
-  begin
-    require 'unicode' unless defined? Unicode::VERSION
-  rescue LoadError
-    begin
-      require 'active_support/multibyte' unless defined? ActiveSupport::Multibyte
-    rescue LoadError; end
-  end
-end
-
 module Asciidoctor
   module PDF
     module TextTransformer
       XMLMarkupRx = /&#?[a-z\d]+;|</
       PCDATAFilterRx = /(&#?[a-z\d]+;|<[^>]+>)|([^&<]+)/
       TagFilterRx = /(<[^>]+>)|([^<]+)/
-      WordRx = /\S+/
+      ContiguousCharsRx = /\p{Graph}+/
+      WordRx = /\p{Word}+/
       Hyphen = '-'
       SoftHyphen = ?\u00ad
-      HyphenatedHyphen = '-' + SoftHyphen
 
       def capitalize_words_pcdata string
         if XMLMarkupRx.match? string
-          string.gsub(PCDATAFilterRx) { $2 ? (capitalize_words_mb $2) : $1 }
+          string.gsub(PCDATAFilterRx) { $2 ? (capitalize_words $2) : $1 }
         else
-          capitalize_words_mb string
+          capitalize_words string
         end
       end
 
-      def capitalize_words_mb string
-        string.gsub(WordRx) { capitalize_mb $& }
+      def capitalize_words string
+        string.gsub(ContiguousCharsRx) { $&.capitalize }
       end
 
       def hyphenate_words_pcdata string, hyphenator
@@ -42,74 +32,21 @@ module Asciidoctor
       end
 
       def hyphenate_words string, hyphenator
-        string.gsub(WordRx) { (hyphenator.visualize $&, SoftHyphen).gsub HyphenatedHyphen, Hyphen }
+        string.gsub(WordRx) { hyphenator.visualize $&, SoftHyphen }
       end
 
       def lowercase_pcdata string
         if string.include? '<'
-          string.gsub(TagFilterRx) { $2 ? (lowercase_mb $2) : $1 }
+          string.gsub(TagFilterRx) { $2 ? $2.downcase : $1 }
         else
-          lowercase_mb string
+          string.downcase
         end
       end
 
       def uppercase_pcdata string
         if XMLMarkupRx.match? string
-          string.gsub(PCDATAFilterRx) { $2 ? (uppercase_mb $2) : $1 }
+          string.gsub(PCDATAFilterRx) { $2 ? $2.upcase : $1 }
         else
-          uppercase_mb string
-        end
-      end
-
-      if RUBY_VERSION >= '2.4'
-        def capitalize_mb string
-          string.capitalize
-        end
-
-        def lowercase_mb string
-          string.downcase
-        end
-
-        def uppercase_mb string
-          string.upcase
-        end
-      # NOTE Unicode library is 4x as fast as ActiveSupport::MultiByte::Chars
-      elsif defined? ::Unicode
-        def capitalize_mb string
-          string.ascii_only? ? string.capitalize : (::Unicode.capitalize string)
-        end
-
-        def lowercase_mb string
-          string.ascii_only? ? string.downcase : (::Unicode.downcase string)
-        end
-
-        def uppercase_mb string
-          string.ascii_only? ? string.upcase : (::Unicode.upcase string)
-        end
-      elsif defined? ::ActiveSupport::Multibyte
-        MultibyteChars = ::ActiveSupport::Multibyte::Chars
-
-        def capitalize_mb string
-          string.ascii_only? ? string.capitalize : (MultibyteChars.new string).capitalize.to_s
-        end
-
-        def lowercase_mb string
-          string.ascii_only? ? string.downcase : (MultibyteChars.new string).downcase.to_s
-        end
-
-        def uppercase_mb string
-          string.ascii_only? ? string.upcase : (MultibyteChars.new string).upcase.to_s
-        end
-      else
-        def capitalize_mb string
-          string.capitalize
-        end
-
-        def lowercase_mb string
-          string.downcase
-        end
-
-        def uppercase_mb string
           string.upcase
         end
       end

data/lib/asciidoctor/pdf/theme_loader.rb

@@ -94,7 +94,7 @@ module Asciidoctor
         yaml_data = ::SafeYAML.load data, filename
         if ::Hash === yaml_data && (yaml_data.key? 'extends')
           if (extends = yaml_data.delete 'extends')
-            [*extends].each do |extend_path|
+            (Array extends).each do |extend_path|
               if extend_path == 'base'
                 theme_data = theme_data ? (::OpenStruct.new theme_data.to_h.merge load_base_theme.to_h) : load_base_theme
                 next

data/lib/asciidoctor/pdf/version.rb

@@ -2,7 +2,7 @@
 
 module Asciidoctor
   module PDF
-    VERSION = '1.5.4'
+    VERSION = '1.6.0'
   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.4
+  version: 1.6.0
 platform: ruby
 authors:
 - Dan Allen
@@ -9,62 +9,36 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-09 00:00:00.000000000 Z
+date: 2021-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.5.3
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.5.3
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-- !ruby/object:Gem::Dependency
-  name: prawn
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: ttfunk
+  name: prawn
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: 2.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: prawn-table
   requirement: !ruby/object:Gem::Requirement
@@ -99,28 +73,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.31.0
+        version: 0.32.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.31.0
+        version: 0.32.0
 - !ruby/object:Gem::Dependency
   name: prawn-icon
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: safe_yaml
   requirement: !ruby/object:Gem::Requirement
@@ -135,34 +109,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: thread_safe
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: treetop
   requirement: !ruby/object:Gem::Requirement
@@ -197,14 +157,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: 3.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: 3.10.0
 - !ruby/object:Gem::Dependency
   name: pdf-inspector
   requirement: !ruby/object:Gem::Requirement
@@ -253,14 +213,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0
 description: An extension for Asciidoctor that converts AsciiDoc documents to PDF
   using the Prawn PDF library.
 email: dan@opendevise.com
@@ -272,7 +232,7 @@ extra_rdoc_files: []
 files:
 - ".yardopts"
 - CHANGELOG.adoc
-- LICENSE.adoc
+- LICENSE
 - NOTICE.adoc
 - README.adoc
 - asciidoctor-pdf.gemspec
@@ -321,7 +281,6 @@ files:
 - lib/asciidoctor/pdf/ext/core/array.rb
 - lib/asciidoctor/pdf/ext/core/file.rb
 - lib/asciidoctor/pdf/ext/core/hash.rb
-- lib/asciidoctor/pdf/ext/core/numeric.rb
 - lib/asciidoctor/pdf/ext/core/object.rb
 - lib/asciidoctor/pdf/ext/core/quantifiable_stdout.rb
 - lib/asciidoctor/pdf/ext/core/regexp.rb
@@ -372,7 +331,7 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/asciidoctor/asciidoctor-pdf/issues
-  changelog_uri: https://github.com/asciidoctor/asciidoctor-pdf/blob/master/CHANGELOG.adoc
+  changelog_uri: https://github.com/asciidoctor/asciidoctor-pdf/blob/main/CHANGELOG.adoc
   mailing_list_uri: http://discuss.asciidoctor.org
   source_code_uri: https://github.com/asciidoctor/asciidoctor-pdf
 post_install_message: 
@@ -390,7 +349,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.15
 signing_key: 
 specification_version: 4
 summary: Converts AsciiDoc documents to PDF using Asciidoctor and Prawn

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

@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-# NOTE remove once minimum required Ruby version is at least 2.4
-Float.prepend (Module.new do
-  def truncate *args
-    if args.length == 1
-      if (precision = Integer args.shift) == 0
-        super
-      elsif precision > 0
-        precision_factor = 10.0**precision
-        (self * precision_factor).to_i / precision_factor
-      else
-        precision_factor = 10**precision.abs
-        (self / precision_factor).to_i * precision_factor
-      end
-    else
-      super
-    end
-  end
-end) if (Float.instance_method :truncate).arity == 0
-
-Integer.prepend (Module.new do
-  def truncate *_args
-    super()
-  end
-end) if (Integer.instance_method :truncate).arity == 0