asciidoctor-pdf 2.0.7 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f836f6c86c31a3bbd792bba4608f397422361bcc5b297355eccab266a3a5ac0b
-  data.tar.gz: b31b434d0d7bede025b4f3c25e71a518f120a66840dfb7df72308d17fda9bd8e
+  metadata.gz: bfcc8354e8152f540a4510dbddc39d38d577ee958aa51fbfb10b92d965abaa0c
+  data.tar.gz: 68848a664ded97d88c45e2d8357f3880a5e10f4b6cc0f0c44b014cd85088d1ea
 SHA512:
-  metadata.gz: 84899cfb74ce8ef2c97111d585e73529318c3f0a44756f75674338f58c1d46693925fe1f9d42b9666f07d8a1bed68f606ec3ec2b664816d0c92998494e90a39a
-  data.tar.gz: a50053c502cf572929c49802208e18faa9f1e5bf0a2f3e47972c3863fafa3c43e157425e7b3c5a1ad12cc0e301d8e461a108907e48f5b80aaa0f05938dc2e6a2
+  metadata.gz: b1fb4074705e06fb70c188278e677c69f696e832d28d5ad49e6135b218ef36416abfaebfdedd980ff094579ae509d5006b59a52c57cf62374e9bdd69822b3714
+  data.tar.gz: 07acff80d3d5c04e5ba8fbf591bbf3d952685bd0de605ac0e60645bbe478eafd1013451d4085abf8e2a41a996f5c4d8bba885377a1878a301ad75e144c0d2316

data/CHANGELOG.adoc

@@ -5,6 +5,61 @@
 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 {url-repo}/commits/main[commit history] on GitHub.
 
+== 2.1.1 (2022-06-15) - @mojavelinux
+
+Improvements::
+
+* store zero-based column on Extent for extensions to use to position cursor at start of extent
+
+Bug Fixes::
+
+* place block image in SVG format in correct column when align is left and page columns are enabled (#2241)
+* accurately trap LoadError from CodeRay if source language is not recognized on code block
+* only draw rounded rectangle around phrase if `border-radius` is > 0
+* use `base-border-color` value if border width is set on role for inline phrase but not border color
+
+=== Details
+
+{url-repo}/releases/tag/v2.1.1[git tag] | {url-repo}/compare/v2.1.0\...v2.1.1[full diff]
+
+== 2.1.0 (2022-06-11) - @mojavelinux
+
+Enhancements::
+
+* arrange body of article or manpage doctype into multiple columns if `page-columns` key is set in theme (#327)
+* allow column gap to be specified using `page-column-gap` key (#327)
+* introduce `convert_index_categories` method to handle rendering of categories for index inside column box (#327)
+* rename `convert_index_list` method to `convert_index_term` to make its purpose more clear (#327)
+* add `save_theme` helper to work with a copy of the theme within a scope (#2196)
+* add support for `scale` attribute or `iw` unit on `pdfwidth` attribute on image macros (#1933)
+* add backlink from bibref on bibliography entry to first reference to that entry in the document (#1737)
+* preserve text formatting on index term in index section (#897)
+* don't insert page break between part and first chapter if `heading-part-break-after` key in theme is `avoid` (#1795)
+
+=== Details
+
+{url-repo}/releases/tag/v2.1.0[git tag] | {url-repo}/compare/v2.0.8\...v2.1.0[full diff]
+
+== 2.0.8 (2022-06-08) - @mojavelinux
+
+Improvements::
+
+* encapsulate logic to adjust column box inside float and dry run
+* automatically set height on column box if not specified; update value automatically when reflowing margins
+
+Bug Fixes::
+
+* correctly compute value of to cursor on extent when column box starts below top of page (#2230)
+* fix crash in `ColumnBox#move_past_bottom` when `:reflow_margins` option is not set
+* fix x position of SVG when advanced to next column of column box
+* `at_page_top?` should consider top of column box to be top of page
+* prevent SVG image taller than column from being advanced to next column
+* don't push section that follows index section in article to new page if last page of index does not extend to bottom of page
+
+=== Details
+
+{url-repo}/releases/tag/v2.0.8[git tag] | {url-repo}/compare/v2.0.7\...v2.0.8[full diff]
+
 == 2.0.7 (2022-06-03) - @mojavelinux
 
 Improvements::

data/README.adoc

@@ -1,6 +1,6 @@
 = Asciidoctor PDF: A native PDF converter for AsciiDoc
 Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>
-v2.0.7, 2022-06-03
+v2.1.1, 2022-06-15
 // Settings:
 :experimental:
 :idprefix:
@@ -23,8 +23,7 @@ endif::[]
 :project-name: Asciidoctor PDF
 :project-handle: asciidoctor-pdf
 // Variables:
-:release-line: 2.0.x
-:release-version: 2.0.7
+:release-line: 2.1.x
 // URLs:
 :url-gem: https://rubygems.org/gems/asciidoctor-pdf
 :url-project: https://github.com/asciidoctor/asciidoctor-pdf
@@ -47,7 +46,7 @@ The aim of this library is to take the pain out of creating PDF documents from A
 
 [NOTE]
 ====
-The documentation for Asciidoctor PDF {release-line} is now available at {url-project-docs}/.
+The documentation for the latest, stable release of Asciidoctor PDF is available at {url-project-docs}/.
 
 If you're looking for the documentation for Asciidoctor PDF 1.6, refer to the {url-project-repo}/tree/v1.6.x#readme[README] in the v1.6.x branch.
 Asciidoctor PDF 1.6 is no longer being developed and will reach EOL later this year.
@@ -62,7 +61,7 @@ Asciidoctor PDF converts an AsciiDoc document directly to a PDF document.
 The style and layout of the PDF are controlled by a dedicated theme file.
 To the degree possible, Asciidoctor PDF supports all the features of AsciiDoc that are supported by Asciidoctor.
 It also provides {url-project-docs}/features/[PDF-specific features].
-However, there are {url-project-docs}/features/#limitations[certain limits] imposed by the PDF format and the PDF library this extension uses.
+However, there are {url-project-docs}/features/#limitations[certain limitations] imposed by the PDF format and the PDF library this extension uses.
 
 Asciidoctor PDF uses the Prawn gem and Prawn's extensions, such as prawn-svg and prawn-table, to generate a PDF document.
 {url-prawn}[Prawn] is a general purpose PDF generator for Ruby that features high-level APIs for common needs like setting up the page and inserting images and low-level APIs for positioning and rendering text and graphics.
@@ -114,11 +113,11 @@ There are several optional features of this converter that require additional ge
 Those features are as follows.
 
 Source highlighting::
-You'll need to {url-project-repo}/syntax-highlighting/[install a syntax highlighter] to use source highlighting (build-time only).
+You'll need to {url-project-docs}/syntax-highlighting/[install a syntax highlighter] to use source highlighting (build-time only).
 
 PDF optimization::
 If you want to optimize your PDF, you'll need rghost or hexapdf.
-See {url-project-repo}/optimize-pdf/[Optimize the PDF] for installation and usage instructions.
+See {url-project-docs}/optimize-pdf/[Optimize the PDF] for installation and usage instructions.
 
 Automatic hyphenation::
 To turn on automatic hyphenation using the `hyphens` attribute, you'll need to install the `text-hyphen` gem:
@@ -128,7 +127,7 @@ To turn on automatic hyphenation using the `hyphens` attribute, you'll need to i
 Accelerated image decoding::
 Ruby is not particularly fast at decoding images, and the image formats it supports are limited.
 To help, you can install prawn-gmagick, which delegates the work of decoding images to GraphicsMagick.
-Refer to {url-project-repo}/image-paths-and-formats/#other-image-formats[Supporting additional image file formats] for instructions about how to enable this integration.
+Refer to {url-project-docs}/image-paths-and-formats/#other-image-formats[Supporting additional image file formats] for instructions about how to enable this integration.
 
 Check the {url-project-docs}/install/#table-minimum-version[minimum supported version table] to make sure you're using a supported version of the dependency.
 
@@ -182,7 +181,7 @@ Asciidoctor creates the output file in the same directory as the input file by d
 Open the [.path]_basic-example.pdf_ file with a PDF viewer to see the result.
 
 .Example PDF document rendered in a PDF viewer
-image::docs/modules/ROOT/images/basic-example-pdf-screenshot.png[Screenshot of PDF document,960,540,pdfwidth=100%]
+image::docs/modules/ROOT/images/basic-example-pdf-screenshot.png[Screenshot of PDF document,960,pdfwidth=100%]
 
 For more information about how to use Asciidoctor PDF and PDF-specific AsciiDoc syntax, see the {url-project-docs}/[Asciidoctor PDF documentation].
 
@@ -197,11 +196,6 @@ ifndef::env-site[]
 See the <<CONTRIBUTING.adoc#,contributing guide>>.
 To help develop {project-name}, or to simply use the development version, refer to the <<CONTRIBUTING-CODE.adoc#,developing and contributing code guide>>.
 
-[[resources,Links]]
-== Resources
-
-* https://groups.google.com/forum/#!msg/prawn-ruby/MbMsCx862iY/6ImCsvLGfVcJ[Discussion about image quality in PDFs]
-
 == Authors
 
 {project-name} was written by https://github.com/mojavelinux[Dan Allen] and https://github.com/graphitefriction[Sarah White] of OpenDevise Inc. on behalf of the Asciidoctor Project.

data/lib/asciidoctor/pdf/converter.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require_relative 'formatted_string'
 require_relative 'formatted_text'
 require_relative 'index_catalog'
 require_relative 'pdfmark'
@@ -124,6 +125,7 @@ module Asciidoctor
       DropAnchorRx = %r(<(?:a\b[^>]*|/a)>)
       SourceHighlighters = %w(coderay pygments rouge).to_set
       ViewportWidth = ::Module.new
+      ImageWidth = ::Module.new
       (TitleStyles = {
         'toc' => [:numbered_title],
         'basic' => [:title],
@@ -162,7 +164,6 @@ module Asciidoctor
         doc.attributes['outline'] = '' unless (doc.attribute_locked? 'outline') || ((doc.instance_variable_get :@attributes_modified).include? 'outline')
         doc.attributes['outline-title'] = '' unless (doc.attribute_locked? 'outline-title') || ((doc.instance_variable_get :@attributes_modified).include? 'outline-title')
         doc.attributes['pagenums'] = '' unless (doc.attribute_locked? 'pagenums') || ((doc.instance_variable_get :@attributes_modified).include? 'pagenums')
-        #assign_missing_section_ids doc
 
         on_page_create(&(method :init_page))
 
@@ -170,7 +171,8 @@ module Asciidoctor
         # NOTE: a new page will already be started (page_number = 2) if the front cover image is a PDF
         ink_cover_page doc, :front
         has_front_cover = page_number > marked_page_number
-        if (has_title_page = (title_page_on = doc.doctype == 'book' || (doc.attr? 'title-page')) && (start_title_page doc))
+        doctype = doc.doctype
+        if (has_title_page = (title_page_on = doctype == 'book' || (doc.attr? 'title-page')) && (start_title_page doc))
           # NOTE: the base font must be set before any content is written to the main or scratch document
           font @theme.base_font_family, size: @root_font_size, style: @theme.base_font_style
           if perform_on_single_page { ink_title_page doc }
@@ -279,12 +281,19 @@ module Asciidoctor
           doc.set_attr 'pdf-anchor', (derive_anchor_from_id doc.id, 'top')
           doc.set_attr 'pdf-page-start', page_number
 
-          convert_section generate_manname_section doc if doc.doctype == 'manpage' && (doc.attr? 'manpurpose')
-
-          traverse doc
-
-          # NOTE: for a book, these are leftover footnotes; for an article this is everything
-          outdent_section { ink_footnotes doc }
+          if doctype == 'book' || (columns = @theme.page_columns || 1) < 2
+            convert_section generate_manname_section doc if doctype == 'manpage' && (doc.attr? 'manpurpose')
+            traverse doc
+            # NOTE: for a book, these are leftover footnotes; for an article this is everything
+            outdent_section { ink_footnotes doc }
+          else
+            column_box [bounds.left, cursor], columns: columns, width: bounds.width, reflow_margins: true, spacer: @theme.page_column_gap do
+              convert_section generate_manname_section doc if doctype == 'manpage' && (doc.attr? 'manpurpose')
+              traverse doc
+              # NOTE: for a book, these are leftover footnotes; for an article this is everything
+              outdent_section { ink_footnotes doc }
+            end
+          end
 
           if (toc_extent = @toc_extent)
             if title_page_on && !insert_toc
@@ -403,6 +412,7 @@ module Asciidoctor
         @list_bullets = []
         @bottom_gutters = [{}]
         @rendered_footnotes = []
+        @bibref_refs = ::Set.new
         @conum_glyphs = ConumSets[@theme.conum_glyphs || 'circled'] || (@theme.conum_glyphs.split ',').map do |r|
           from, to = r.lstrip.split '-', 2
           to ? ((get_char from)..(get_char to)).to_a : [(get_char from)]
@@ -576,6 +586,8 @@ module Asciidoctor
         theme.base_font_style = theme.base_font_style&.to_sym || :normal
         theme.page_numbering_start_at ||= 'body'
         theme.running_content_start_at ||= 'body'
+        theme.heading_chapter_break_before ||= 'always'
+        theme.heading_part_break_before ||= 'always'
         theme.heading_margin_page_top ||= 0
         theme.heading_margin_top ||= 0
         theme.heading_margin_bottom ||= 0
@@ -610,6 +622,13 @@ module Asciidoctor
         theme
       end
 
+      def save_theme
+        @theme = (original_theme = theme).dup
+        yield
+      ensure
+        @theme = original_theme
+      end
+
       def indent_section
         if (values = @section_indent)
           indent(values[0], values[1]) { yield }
@@ -648,13 +667,14 @@ module Asciidoctor
         hidden = sect.option? 'notitle'
         hopts = { align: text_align, level: hlevel, part: part, chapterlike: chapterlike, outdent: !(part || chapterlike) }
         if part
-          unless @theme.heading_part_break_before == 'auto'
+          if @theme.heading_part_break_before == 'always'
             started_new = true
             start_new_part sect
           end
         elsif chapterlike
-          if @theme.heading_chapter_break_before != 'auto' ||
-              (@theme.heading_part_break_after == 'always' && sect == sect.parent.sections[0])
+          if (@theme.heading_chapter_break_before == 'always' &&
+              !(@theme.heading_part_break_after == 'avoid' && sect.first_section_of_part?)) ||
+              (@theme.heading_part_break_after == 'always' && sect.first_section_of_part?)
             started_new = true
             start_new_chapter sect
           end
@@ -701,49 +721,74 @@ module Asciidoctor
       end
 
       def convert_index_section node
-        space_needed_for_category = @theme.description_list_term_spacing + (2 * (height_of_typeset_text 'A'))
-        pagenum_sequence_style = node.document.attr 'index-pagenum-sequence-style'
-        column_box [0, cursor], columns: @theme.index_columns, width: bounds.width, reflow_margins: true, spacer: @theme.index_column_gap do
-          @index.categories.each do |category|
-            bounds.move_past_bottom if space_needed_for_category > cursor
-            ink_prose category.name,
-              align: :left,
-              inline_format: false,
-              margin_bottom: @theme.description_list_term_spacing,
-              style: @theme.description_list_term_font_style&.to_sym
-            category.terms.each {|term| convert_index_list_item term, pagenum_sequence_style }
-            @theme.prose_margin_bottom > cursor ? bounds.move_past_bottom : (move_down @theme.prose_margin_bottom)
+        if ColumnBox === bounds || (columns = @theme.index_columns || 1) < 2
+          convert_index_categories @index.categories, (node.document.attr 'index-pagenum-sequence-style')
+        else
+          end_cursor = nil
+          column_box [bounds.left, cursor], columns: columns, width: bounds.width, reflow_margins: true, spacer: @theme.index_column_gap do
+            convert_index_categories @index.categories, (node.document.attr 'index-pagenum-sequence-style')
+            end_cursor = cursor if bounds.current_column == 0
           end
+          # Q: could we move this logic into column_box?
+          move_cursor_to end_cursor if end_cursor
         end
         nil
       end
 
-      def convert_index_list_item term, pagenum_sequence_style = nil
-        text = escape_xml term.name
+      def convert_index_categories categories, pagenum_sequence_style = nil
+        space_needed_for_category = @theme.description_list_term_spacing + (2 * (height_of_typeset_text 'A'))
+        categories.each do |category|
+          bounds.move_past_bottom if space_needed_for_category > cursor
+          ink_prose category.name,
+            align: :left,
+            inline_format: false,
+            margin_bottom: @theme.description_list_term_spacing,
+            style: @theme.description_list_term_font_style&.to_sym
+          category.terms.each {|term| convert_index_term term, pagenum_sequence_style }
+          @theme.prose_margin_bottom > cursor ? bounds.move_past_bottom : (move_down @theme.prose_margin_bottom)
+        end
+      end
+
+      def convert_index_term term, pagenum_sequence_style = nil
+        term_fragments = term.name.fragments
         unless term.container?
+          pagenum_fragment = (parse_text %(<a>#{DummyText}</a>), inline_format: true)[0]
           if @media == 'screen'
             case pagenum_sequence_style
             when 'page'
-              pagenums = term.dests.uniq {|dest| dest[:page] }.map {|dest| %(<a anchor="#{dest[:anchor]}">#{dest[:page]}</a>) }
+              pagenums = term.dests.uniq {|dest| dest[:page] }.map {|dest| pagenum_fragment.merge anchor: dest[:anchor], text: dest[:page] }
             when 'range'
               first_anchor_per_page = {}.tap {|accum| term.dests.each {|dest| accum[dest[:page]] ||= dest[:anchor] } }
               pagenums = (consolidate_ranges first_anchor_per_page.keys).map do |range|
                 anchor = first_anchor_per_page[(range.include? '-') ? (range.partition '-')[0] : range]
-                %(<a anchor="#{anchor}">#{range}</a>)
+                pagenum_fragment.merge text: range, anchor: anchor
               end
             else # term
-              pagenums = term.dests.map {|dest| %(<a anchor="#{dest[:anchor]}">#{dest[:page]}</a>) }
+              pagenums = term.dests.map {|dest| pagenum_fragment.merge text: dest[:page], anchor: dest[:anchor] }
             end
           else
             pagenums = consolidate_ranges term.dests.map {|dest| dest[:page] }.uniq
           end
-          text = %(#{text}, #{pagenums.join ', '})
+          pagenums.each do |pagenum|
+            # NOTE: addresses a very minor kerning issue for text adjacent to the comma
+            if (prev_fragment = term_fragments[-1]).size == 1
+              if ::String === pagenum
+                term_fragments[-1] = prev_fragment.merge text: %(#{prev_fragment[:text]}, #{pagenum})
+                next
+              else
+                term_fragments[-1] = prev_fragment.merge text: %(#{prev_fragment[:text]}, )
+              end
+            else
+              term_fragments << ({ text: ', ' })
+            end
+            term_fragments << (::String === pagenum ? { text: pagenum } : pagenum)
+          end
         end
         subterm_indent = @theme.description_list_description_indent
-        ink_prose text, align: :left, margin: 0, hanging_indent: subterm_indent * 2
+        typeset_formatted_text term_fragments, (calc_line_metrics @base_line_height), align: :left, color: @font_color, hanging_indent: subterm_indent * 2
         indent subterm_indent do
           term.subterms.each do |subterm|
-            convert_index_list_item subterm, pagenum_sequence_style
+            convert_index_term subterm, pagenum_sequence_style
           end
         end unless term.leaf?
       end
@@ -1063,7 +1108,10 @@ module Asciidoctor
             srclang = node.attr 'language', 'text'
             begin
               ::CodeRay::Scanners[(srclang = (srclang.start_with? 'html+') ? (srclang.slice 5, srclang.length).to_sym : srclang.to_sym)]
-            rescue ::ArgumentError
+            rescue
+              until ::LoadError === (cause ||= $!) || ::ArgumentError === cause
+                raise $! unless (cause = cause.cause)
+              end
               srclang = :text
             end
             fragments = (::CodeRay.scan source_string, srclang).to_prawn
@@ -1712,9 +1760,14 @@ module Asciidoctor
         return on_image_error :missing, node, target, (opts.merge align: alignment) unless image_path
 
         # TODO: support cover (aka canvas) image layout using "canvas" (or "cover") role
-        width = resolve_explicit_width node.attributes, bounds_width: (available_w = bounds.width), support_vw: true, use_fallback: true, constrain_to_bounds: true
-        # TODO: add `to_pt page_width` method to ViewportWidth type
-        width = (width.to_f / 100) * page_width if ViewportWidth === width
+        case (width = resolve_explicit_width node.attributes, bounds_width: (available_w = bounds.width), support_vw: true, use_fallback: true, constrain_to_bounds: true)
+        when ViewportWidth
+          # TODO: add `to_pt page_width` method to ViewportWidth type
+          width = page_width * (width.to_f / 100)
+        when ImageWidth
+          scale = width.to_f / 100
+          width = nil
+        end
 
         caption_end = @theme.image_caption_end&.to_sym || :bottom
         caption_max_width = @theme.image_caption_max_width
@@ -1737,14 +1790,15 @@ module Asciidoctor
                 file_request_root = { base: (::File.dirname image_path), root: @jail_dir }
               end
               svg_obj = ::Prawn::SVG::Interface.new svg_data, self,
-                position: alignment,
                 width: width,
                 fallback_font_name: fallback_svg_font_name,
                 enable_web_requests: allow_uri_read ? (method :load_open_uri).to_proc : false,
                 enable_file_requests_with_root: file_request_root,
                 cache_images: cache_uri
               rendered_w = (svg_size = svg_obj.document.sizing).output_width
-              if !width && (svg_obj.document.root.attributes.key? 'width') && rendered_w > available_w
+              if scale
+                svg_size = svg_obj.resize width: (rendered_w = [available_w, rendered_w * scale].min)
+              elsif !width && (svg_obj.document.root.attributes.key? 'width') && rendered_w > available_w
                 # NOTE: restrict width to available width (prawn-svg already coerces to pixels)
                 svg_size = svg_obj.resize width: (rendered_w = available_w)
               end
@@ -1762,7 +1816,16 @@ module Asciidoctor
               update_colors if graphic_state.color_space.empty?
               ink_caption node, category: :image, end: :top, block_align: alignment, block_width: rendered_w, max_width: caption_max_width if caption_end == :top && node.title?
               image_y = y
-              image_cursor = cursor
+              # NOTE: prawn-svg does not compute :at for alignment correctly in column box, so resort to our own logic
+              case alignment
+              when :center
+                left = bounds.left + (available_w - rendered_w) * 0.5
+              when :right
+                left = bounds.left + available_w - rendered_w
+              else
+                left = bounds.left
+              end
+              svg_obj.options[:at] = [left, (image_cursor = cursor)]
               svg_obj.draw # NOTE: cursor advances automatically
               svg_obj.document.warnings.each do |img_warning|
                 log :warn, %(problem encountered in image: #{image_path}; #{img_warning})
@@ -1777,8 +1840,10 @@ module Asciidoctor
               image_obj, image_info = ::Base64 === image_path ?
                   ::StringIO.open((::Base64.decode64 image_path), 'rb') {|fd| build_image_object fd } :
                   ::File.open(image_path, 'rb') {|fd| build_image_object fd }
+              actual_w = to_pt image_info.width, :px
+              width = actual_w * scale if scale
               # NOTE: if width is not specified, scale native width & height from px to pt and restrict width to available width
-              rendered_w, rendered_h = image_info.calc_image_dimensions width: (width || [available_w, (to_pt image_info.width, :px)].min)
+              rendered_w, rendered_h = image_info.calc_image_dimensions width: (width || [available_w, actual_w].min)
               # NOTE: shrink image so it fits within available space; group image & caption
               if rendered_h > (available_h = cursor - caption_h)
                 unless pinned || at_page_top?
@@ -2376,9 +2441,12 @@ module Asciidoctor
               if (text = ref.xreftext node.attr 'xrefstyle', nil, true)&.include? '<a'
                 text = text.gsub DropAnchorRx, ''
               end
+              if ref.inline? && ref.type == :bibref && !scratch? && (@bibref_refs.add? refid)
+                anchor = %(<a id="_bibref_ref_#{refid}">#{DummyText}</a>)
+              end
               @resolving_xref = nil
             end
-            %(<a anchor="#{derive_anchor_from_id refid}">#{text || "[#{refid}]"}</a>).gsub ']', '&#93;'
+            %(#{anchor || ''}<a anchor="#{derive_anchor_from_id refid}">#{text || "[#{refid}]"}</a>).gsub ']', '&#93;'
           else
             %(<a anchor="#{doc.attr 'pdf-anchor'}">#{node.text || '[^top&#93;'}</a>)
           end
@@ -2386,10 +2454,12 @@ module Asciidoctor
           # NOTE: destination is created inside callback registered by FormattedTextTransform#build_fragment
           %(<a id="#{node.id}">#{DummyText}</a>)
         when :bibref
-          # NOTE: destination is created inside callback registered by FormattedTextTransform#build_fragment
+          id = node.id
           # NOTE: technically node.text should be node.reftext, but subs have already been applied to text
-          reftext = (reftext = node.reftext) ? %([#{reftext}]) : %([#{node.id}])
-          %(<a id="#{node.id}">#{DummyText}</a>#{reftext})
+          reftext = (reftext = node.reftext) ? %([#{reftext}]) : %([#{id}])
+          reftext = %(<a anchor="_bibref_ref_#{id}">#{reftext}</a>) if @bibref_refs.include? id
+          # NOTE: destination is created inside callback registered by FormattedTextTransform#build_fragment
+          %(<a id="#{id}">#{DummyText}</a>#{reftext})
         else
           log :warn, %(unknown anchor type: #{node.type.inspect})
           nil
@@ -2511,12 +2581,18 @@ module Asciidoctor
               class_attr = (role = node.role) ? %( class="#{role}") : ''
               fit_attr = (fit = node.attr 'fit') ? %( fit="#{fit}") : ''
               if (width = resolve_explicit_width node.attributes)
-                if node.parent.context == :table_cell && ::String === width && (width.end_with? '%')
-                  width += (intrinsic_image_dimensions image_path, image_format)[:width].to_s
+                if ImageWidth === width
+                  if state # check that converter is initialized
+                    width = (intrinsic_image_width image_path, image_format) * (width.to_f / 100)
+                  else
+                    width = %(auto*#{width})
+                  end
+                elsif node.parent.context == :table_cell && ::String === width && (width.end_with? '%')
+                  width += (intrinsic_image_width image_path, image_format).to_s
                 end
                 width_attr = %( width="#{width}")
               elsif state # check that converter is initialized
-                width_attr = %( width="#{(intrinsic_image_dimensions image_path, image_format)[:width]}")
+                width_attr = %( width="#{intrinsic_image_width image_path, image_format}")
               else
                 width_attr = ' width="auto"' # defer operation until arranger runs
               end
@@ -2537,17 +2613,20 @@ module Asciidoctor
         if scratch?
           visible ? node.text : ''
         else
-          # NOTE: initialize index in case converter is called before PDF is initialized
-          @index ||= IndexCatalog.new
+          unless defined? @index
+            # NOTE: initialize index and text formatter in case converter is called before PDF is initialized
+            @index = IndexCatalog.new
+            @text_formatter = FormattedText::Formatter.new theme: (load_theme node.document)
+          end
           # NOTE: page number (:page key) is added by InlineDestinationMarker
           dest = { anchor: (anchor_name = @index.next_anchor_name) }
           anchor = %(<a id="#{anchor_name}" type="indexterm"#{visible ? ' visible="true"' : ''}>#{DummyText}</a>)
           if visible
             visible_term = node.text
-            @index.store_primary_term (sanitize visible_term), dest
+            @index.store_primary_term (FormattedString.new parse_text visible_term, inline_format: [normalize: true]), dest
             %(#{anchor}#{visible_term})
           else
-            @index.store_term (node.attr 'terms').map {|term| sanitize term }, dest
+            @index.store_term (node.attr 'terms').map {|term| FormattedString.new parse_text term, inline_format: [normalize: true] }, dest
             anchor
           end
         end
@@ -2574,8 +2653,6 @@ module Asciidoctor
       end
 
       def convert_inline_quoted node
-        theme = load_theme node.document
-
         case node.type
         when :emphasis
           open, close, is_tag = ['<em>', '</em>', true]
@@ -2588,25 +2665,26 @@ module Asciidoctor
         when :subscript
           open, close, is_tag = ['<sub>', '</sub>', true]
         when :double
-          open, close, is_tag = [theme.quotes[0], theme.quotes[1], false]
+          open, close = (load_theme node.document).quotes.slice 0, 2
           quotes = true
         when :single
-          open, close, is_tag = [theme.quotes[2], theme.quotes[3], false]
+          open, close = (load_theme node.document).quotes.slice 2, 2
           quotes = true
         when :mark
           open, close, is_tag = ['<mark>', '</mark>', true]
         else
-          open, close, is_tag = [nil, nil, false]
+          open = close = ''
         end
 
         inner_text = node.text
 
-        if quotes && (len = inner_text.length) > 3 &&
-            (inner_text.end_with? '...') && !((inner_text_trunc = inner_text.slice 0, len - 3).end_with? ?\\)
+        if quotes && (len = inner_text.length) > 3 && (inner_text.end_with? '...') &&
+            !((inner_text_trunc = inner_text.slice 0, len - 3).end_with? ?\\)
           inner_text = inner_text_trunc + '&#8230;'
         end
 
         if (roles = node.role)
+          theme = load_theme node.document
           roles.split.each do |role|
             if (text_transform = theme[%(role_#{role}_text_transform)])
               inner_text = transform_text inner_text, text_transform
@@ -3867,6 +3945,10 @@ module Asciidoctor
         { width: 0, height: 0 }
       end
 
+      def intrinsic_image_width path, format
+        (intrinsic_image_dimensions path, format)[:width]
+      end
+
       # Sends the specified message to the log unless this method is called from the scratch document
       def log severity, message = nil, &block
         logger.send severity, message, &block unless scratch?
@@ -4038,11 +4120,15 @@ module Asciidoctor
         if attrs.key? 'pdfwidth'
           if (width = attrs['pdfwidth']).end_with? '%'
             bounds_width ? (width.to_f / 100) * bounds_width : width
+          elsif width.end_with? 'iw'
+            (width.chomp 'iw').extend ImageWidth
           elsif opts[:support_vw] && (width.end_with? 'vw')
             (width.chomp 'vw').extend ViewportWidth
           else
             str_to_pt width
           end
+        elsif attrs.key? 'scale'
+          attrs['scale'].dup.extend ImageWidth
         elsif attrs.key? 'scaledwidth'
           # NOTE: the parser automatically appends % if value is unitless
           if (width = attrs['scaledwidth']).end_with? '%'
@@ -4313,7 +4399,7 @@ module Asciidoctor
           b_shift, b_gap_color = (b_width ||= 0.5) * 0.5, @page_bg_color
         end
         ink_caption node_with_caption, category: category if node_with_caption
-        extent.from.page += 1 unless extent.from.page == page_number || ColumnBox === bounds # sanity check
+        extent.from.page = page_number unless extent.from.page == page_number # sanity check
         float do
           extent.each_page do |first_page, last_page|
             advance_page unless first_page

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

@@ -30,4 +30,8 @@ class Asciidoctor::Section
     end
     opts[:formal] ? @cached_formal_numbered_title : @cached_numbered_title
   end unless method_defined? :numbered_title
+
+  def first_section_of_part?
+    (par = @parent).context == :section && par.sectname == 'part' && self == par.blocks.find {|it| it.context == :section }
+  end unless method_defined? :first_section_of_part?
 end

data/lib/asciidoctor/pdf/ext/prawn/document/column_box.rb

@@ -1,20 +1,35 @@
 # frozen_string_literal: true
 
 Prawn::Document::ColumnBox.prepend (Module.new do
-  def absolute_bottom
-    stretchy? ? @parent.absolute_bottom : super
-  end
+  attr_accessor :current_column
 
   def move_past_bottom
     (doc = @document).y = @y
     return if (@current_column = (@current_column + 1) % @columns) > 0
-    @y = (par = @parent).absolute_top if @reflow_margins
+    par = @parent
+    if (reset_y = @reflow_margins) && (reset_y == true || reset_y > doc.page_number)
+      @y = par.absolute_top
+      @height = par.height unless stretchy?
+    end
     initial_margins = doc.page.margins
     par.move_past_bottom
     if doc.page.margins != initial_margins
-      doc.bounds = self.class.new doc, par, (margin_box = doc.margin_box).absolute_top_left,
-        columns: @columns, reflow_margins: true, spacer: @spacer, width: margin_box.width
+      doc.bounds = self.class.new doc, par, [(margin_box = doc.margin_box).absolute_left, @y],
+        columns: @columns, reflow_margins: @reflow_margins, spacer: @spacer, width: margin_box.width, height: @height
+    end
+    nil
+  end
+
+  # Rearranges the column box into a single column, where the original columns are in a single file. Used
+  # for the purpose of computing the extent of content in a scratch document.
+  def single_file
+    if @reflow_margins && @parent.absolute_top > @y && @columns > @current_column + 1
+      # defer reflow margins until all columns on current page have been exhausted
+      @reflow_margins = @document.page_number + (@columns - @current_column)
     end
+    @width = bare_column_width
+    @columns = 1
+    @current_column = 0
     nil
   end
 end)

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

@@ -34,13 +34,14 @@ module Asciidoctor
       # - :final_gap determines whether a gap is added below the last line
       LineMetrics = ::Struct.new :height, :leading, :padding_top, :padding_bottom, :final_gap
 
-      Position = ::Struct.new :page, :cursor
+      Position = ::Struct.new :page, :column, :cursor
 
       Extent = ::Struct.new :current, :from, :to do
-        def initialize current_page, current_cursor, start_page, start_cursor, end_page, end_cursor
-          self.from = self.current = Position.new current_page, current_cursor
-          self.from = Position.new start_page, start_cursor unless start_page == current_page && start_cursor == current_cursor
-          self.to = Position.new end_page, end_cursor
+        def initialize current_page, current_column, current_cursor, from_page, from_column, from_cursor, to_page, to_cursor
+          self.current = Position.new current_page, current_column, current_cursor
+          self.from = Position.new from_page, from_column, from_cursor
+          self.from = current if from == current
+          self.to = Position.new to_page, nil, to_cursor
         end
 
         def each_page
@@ -64,23 +65,23 @@ module Asciidoctor
 
       ScratchExtent = ::Struct.new :from, :to do
         def initialize start_page, start_cursor, end_page, end_cursor
-          self.from = Position.new start_page, start_cursor
-          self.to = Position.new end_page, end_cursor
+          self.from = Position.new start_page, 0, start_cursor
+          self.to = Position.new end_page, 0, end_cursor
         end
 
         def position_onto pdf, keep_together = nil
           current_page = pdf.page_number
+          current_column = ColumnBox === pdf.bounds ? (column_box = pdf.bounds).current_column : 0
           current_cursor = pdf.cursor
-          from_page = current_page + (advance_by = from.page - 1)
-          to_page = current_page + (to.page - 1)
-          if advance_by > 0
+          if (advance_by = from.page - 1) > 0
             advance_by.times { pdf.advance_page }
           elsif keep_together && single_page? && !(try_to_fit_on_previous current_cursor)
             pdf.advance_page
-            from_page += 1
-            to_page += 1
           end
-          Extent.new current_page, current_cursor, from_page, from.cursor, to_page, to.cursor
+          from_page = pdf.page_number
+          from_column = column_box&.current_column || 0
+          to_page = from_page + (to.page - from.page)
+          Extent.new current_page, current_column, current_cursor, from_page, from_column, from.cursor, to_page, to.cursor
         end
 
         def single_page?
@@ -251,16 +252,17 @@ module Asciidoctor
       # Returns whether the cursor is at the top of the page (i.e., margin box).
       #
       def at_page_top?
-        @y == @margin_box.absolute_top
+        @y == (ColumnBox === bounds ? bounds : @margin_box).absolute_top
       end
 
       # Prevents at_page_top? from returning true while yielding to the specified block.
       #
       def conceal_page_top
-        @margin_box.instance_variable_set :@y, (old_top = @margin_box.absolute_top) + 0.0001
+        old_top = (outer_bounds = ColumnBox === bounds ? bounds : @margin_box).absolute_top
+        outer_bounds.instance_variable_set :@y, old_top + 0.0001
         yield
       ensure
-        @margin_box.instance_variable_set :@y, old_top
+        outer_bounds.instance_variable_set :@y, old_top
       end
 
       # Returns whether the current page is the last page in the document.
@@ -560,11 +562,11 @@ module Asciidoctor
       def float
         original_page_number = page_number
         original_y = y
-        original_column = bounds.instance_variable_get :@current_column if ColumnBox === bounds
+        original_column = bounds.current_column if ColumnBox === bounds
         yield
         go_to_page original_page_number unless page_number == original_page_number
         self.y = original_y
-        bounds.instance_variable_set :@current_column, original_column if original_column
+        bounds.current_column = original_column if original_column
       end
 
       # Short-circuits the call to the built-in move_up operation
@@ -721,6 +723,12 @@ module Asciidoctor
         end
       end
 
+      # Wraps the column_box method and automatically sets the height unless the :height option is specified.
+      def column_box point, options, &block
+        options[:height] = cursor unless options.key? :height
+        super
+      end
+
       # A flowing version of bounding_box. If the content runs to another page, the cursor starts at
       # the top of the page instead of from the original cursor position. Similar to span, except
       # the :position option is limited to a numeric value and additional options are passed through
@@ -965,11 +973,11 @@ module Asciidoctor
         state.on_page_create_callback = saved_callback
       end
 
-      # This method is a smarter version of start_new_page. It calls start_new_page
-      # if the current page is the last page of the document. Otherwise, it simply
-      # advances to the next existing page.
+      # This method is a smarter version of start_new_page. It only calls start_new_page options are
+      # specified and the current page is the last page in the document. Otherwise, it advances the
+      # cursor to the next page (or column) using Bounds#move_past_bottom.
       def advance_page options = {}
-        !options.empty? && last_page? ? (start_new_page options) : bounds.move_past_bottom
+        options.empty? || !last_page? ? bounds.move_past_bottom : (start_new_page options)
       end
 
       # Start a new page without triggering the on_page_create callback
@@ -1129,15 +1137,15 @@ module Asciidoctor
       # Note that if the block has content that itself requires a dry run, that nested dry run will
       # be performed in a separate scratch document.
       #
-      # opts - A Hash of options that configure the dry run computation:
-      #        :keep_together - A Boolean indicating whether an attempt should be made to keep the
-      #        content on the same page (optional, default: false).
-      #        :single_page - A Boolean indicating whether the operation should stop if the content
-      #        exceeds the height of a single page.
-      #        :onto - The document onto which to position the scratch extent. If this option is
-      #        set, the method returns an Extent instead of a ScratchExtent (optional, default: nil)
-      #        :pages_advanced - The number of pages the content has been advanced during this
-      #        operation (internal only) (optional, default: 0)
+      # options - A Hash of options that configure the dry run computation:
+      #           :keep_together - A Boolean indicating whether an attempt should be made to keep
+      #           the content on the same page (optional, default: false).
+      #           :single_page - A Boolean indicating whether the operation should stop if the
+      #           content exceeds the height of a single page.
+      #           :onto - The document onto which to position the scratch extent. If this option is
+      #           set, the method returns an Extent instance (optional, default: false)
+      #           :pages_advanced - The number of pages the content has been advanced during this
+      #           operation (internal only) (optional, default: 0)
       #
       # Returns an Extent or ScratchExtent object that describes the bounds of the content block.
       def dry_run keep_together: nil, pages_advanced: 0, single_page: nil, onto: nil, &block
@@ -1146,10 +1154,7 @@ module Asciidoctor
         scratch_pdf.bounds = bounds.dup.tap do |bounds_copy|
           bounds_copy.instance_variable_set :@document, scratch_pdf
           bounds_copy.instance_variable_set :@parent, saved_bounds
-          if ColumnBox === bounds_copy
-            bounds_copy.instance_variable_set :@width, bounds_copy.bare_column_width
-            bounds_copy.instance_variable_set :@current_column, (bounds_copy.instance_variable_set :@columns, 1) - 1
-          end
+          bounds_copy.single_file if ColumnBox === bounds_copy
         end
         scratch_pdf.move_cursor_to cursor unless (scratch_start_at_top = keep_together || pages_advanced > 0 || at_page_top?)
         scratch_start_cursor = scratch_pdf.cursor

data/lib/asciidoctor/pdf/formatted_string.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class FormattedString < String
+  attr_reader :fragments
+
+  def initialize fragments
+    super [].tap {|accum| (@fragments = fragments).each {|it| accum << it[:text] } }.join
+  end
+
+  def eql? other
+    super && (FormattedString === other ? (@fragments ||= nil) == other.fragments : true)
+  end
+end

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

@@ -51,6 +51,9 @@ module Asciidoctor::PDF::FormattedText
         image_format = fragment[:image_format]
         if (image_w = fragment[:image_width] || '100%') == 'auto'
           image_w = nil # use intrinsic width
+        elsif image_w.start_with? 'auto*'
+          image_scale = (image_w.slice 5, image_w.length).to_f
+          image_w = nil # use intrinsic width
         elsif (pctidx = image_w.index '%') && pctidx + 1 < image_w.length
           # NOTE: intrinsic width is stored behind % symbol
           pct = (image_w.slice 0, pctidx).to_f / 100
@@ -79,6 +82,7 @@ module Asciidoctor::PDF::FormattedText
             image_w = svg_size.output_width
           else
             fragment[:image_width] = (image_w = svg_size.output_width).to_s
+            image_w *= image_scale if image_scale
             image_w = available_w if image_w > available_w
           end
           fragment[:image_obj] = svg_obj
@@ -88,6 +92,7 @@ module Asciidoctor::PDF::FormattedText
           image_obj, image_info = ::File.open(image_path, 'rb') {|fd| doc.build_image_object fd }
           unless image_w
             fragment[:image_width] = (image_w = to_pt image_info.width, :px).to_s
+            image_w *= image_scale if image_scale
             image_w = available_w if image_w > available_w
           end
           if (image_h = image_w * (image_info.height.fdiv image_info.width)) > max_image_h

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

@@ -25,11 +25,11 @@ module Asciidoctor::PDF::FormattedText
         width = fragment.width
         height = fragment.height
       end
-      border_radius = data[:border_radius]
+      border_radius = data[:border_radius] || 0
       if (background_color = data[:background_color])
         prev_fill_color = pdf.fill_color
         pdf.fill_color background_color
-        if border_radius
+        if border_radius > 0
           pdf.fill_rounded_rectangle at, width, height, border_radius
         else
           pdf.fill_rectangle at, width, height
@@ -41,7 +41,7 @@ module Asciidoctor::PDF::FormattedText
         prev_line_width = pdf.line_width
         pdf.stroke_color border_color
         pdf.line_width border_width
-        border_radius ? (pdf.stroke_rounded_rectangle at, width, height, border_radius) : (pdf.stroke_rectangle at, width, height)
+        border_radius > 0 ? (pdf.stroke_rounded_rectangle at, width, height, border_radius) : (pdf.stroke_rectangle at, width, height)
         pdf.stroke_color prev_stroke_color
         pdf.line_width prev_line_width
       end

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

@@ -102,6 +102,9 @@ module Asciidoctor
                 role, key = (key.slice 5, key.length).split '_', 2
                 if (prop = ThemeKeyToFragmentProperty[key])
                   (accum[role] ||= {})[prop] = val
+                  if key == 'border_width' && val && !(theme[%(role_#{role}_border_color)])
+                    accum[role][:border_color] = theme.base_border_color
+                  end
                 #elsif key == 'font_kerning'
                 #  unless (resolved_val = val == 'none' ? false : (val == 'normal' ? true : nil)).nil?
                 #    (accum[role] ||= {})[:kerning] = resolved_val

data/lib/asciidoctor/pdf/theme_loader.rb

@@ -69,7 +69,7 @@ module Asciidoctor
       # NOTE: base theme is loaded "as is" (no post-processing)
       def self.load_base_theme
         ::File.open BaseThemePath, mode: 'r:UTF-8' do |io|
-          (::OpenStruct.new ::YAML.safe_load io, aliases: true, filename: BaseThemePath).tap {|theme| theme.__dir__ = ThemesDir }
+          (::OpenStruct.new ::YAML.safe_load io, filename: BaseThemePath).tap {|theme| theme.__dir__ = ThemesDir }
         end
       end
 

data/lib/asciidoctor/pdf/version.rb

@@ -2,6 +2,6 @@
 
 module Asciidoctor
   module PDF
-    VERSION = '2.0.7'
+    VERSION = '2.1.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-pdf
 version: !ruby/object:Gem::Version
-  version: 2.0.7
+  version: 2.1.1
 platform: ruby
 authors:
 - Dan Allen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-03 00:00:00.000000000 Z
+date: 2022-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -286,6 +286,7 @@ files:
 - lib/asciidoctor/pdf/ext/rouge.rb
 - lib/asciidoctor/pdf/ext/rouge/formatters/prawn.rb
 - lib/asciidoctor/pdf/ext/rouge/themes/asciidoctor_pdf_default.rb
+- lib/asciidoctor/pdf/formatted_string.rb
 - lib/asciidoctor/pdf/formatted_text.rb
 - lib/asciidoctor/pdf/formatted_text/formatter.rb
 - lib/asciidoctor/pdf/formatted_text/fragment_position_renderer.rb