asciidoctor-pdf 2.0.8 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd47554913fab2e3f8002491a92c430e0dbfe48b9177705470ffa7c64155289b
-  data.tar.gz: 580c0c9e6a46e5614927f42c4ad309e303dd69681bf10ddb674241cd930e6b31
+  metadata.gz: 3fc9b0baae841d33e6205109c5aeacbb88bc196e6396b5dac8df187e0d209f9c
+  data.tar.gz: 21fd8ea4cebcb721dc273fa1a8f81104ec8f14f6a4c1a6f396bf6194f5e2309d
 SHA512:
-  metadata.gz: 326e87435e664dde2e944b878d2c5c9a5b71cfd285da78115331a8cd14e20f2aaa0cb2b81779bc99ca8642df004ef03f60386a971e9176eb03d17755a9db951b
-  data.tar.gz: 7d7cd662e4bbe5df6d10c057e2f00a1a1c800f0e5a3e4f7731c94b657b0bf6ec51599e88d42dbd806a1e4bf991e54282c4efb820b0d39912ed34a74d25f89ff4
+  metadata.gz: 956e66763693837a9483919f0b8b0428adbda5858efbfa75aa7b3a2fc04aff92a8e666643f7aae74ee01b656c1b9ad16984173dec4d0b0552bf668d0ad73d024
+  data.tar.gz: e6e2ca9d393d1eafbea531bdf9b828d50075bf398723ecca99549175331aa9f1422a9640128ccbf511e8ec97db3e7ce0c6d763a3bc28aeadf92fc6fd2a130f77

data/CHANGELOG.adoc

@@ -5,6 +5,24 @@
 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.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::

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.8, 2022-06-08
+v2.1.0, 2022-06-11
 // 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.8
+: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 2.0.x 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.
@@ -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.
 
@@ -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],
@@ -169,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 }
@@ -278,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
@@ -402,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)]
@@ -575,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
@@ -609,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 }
@@ -647,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
@@ -700,53 +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'
-        end_cursor = nil
-        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)
-          end
-          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
+        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
@@ -1715,9 +1757,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
@@ -1747,7 +1794,9 @@ module Asciidoctor
                 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
@@ -1781,8 +1830,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?
@@ -2380,9 +2431,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
@@ -2390,10 +2444,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
@@ -2515,12 +2571,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
@@ -2541,17 +2603,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
@@ -2578,8 +2643,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]
@@ -2592,25 +2655,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
@@ -3871,6 +3935,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?
@@ -4042,11 +4110,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? '%'

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/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/version.rb

@@ -2,6 +2,6 @@
 
 module Asciidoctor
   module PDF
-    VERSION = '2.0.8'
+    VERSION = '2.1.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-pdf
 version: !ruby/object:Gem::Version
-  version: 2.0.8
+  version: 2.1.0
 platform: ruby
 authors:
 - Dan Allen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-08 00:00:00.000000000 Z
+date: 2022-06-11 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