asciidoctor-pdf 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5dbb3a6c2c5b664510e19714de969553f3943994b4be273238c646e41274885f
-  data.tar.gz: f6495e965c651113bbc61383d82a18db4fb78a7df64644801bd10fba1c6ed078
+  metadata.gz: fa858819d28baa5f07261f05d2ac3694e571683f3c99b9cbf80b11bd7d79c4b3
+  data.tar.gz: 243f4f2a35fcd2d3a2d6c9449499c3097804865abe137058dd55975970fbded9
 SHA512:
-  metadata.gz: 0b93162e6b69d1c32cf3365c08f78457f80cb1588a98c847b0ddfa6946074ba1c7c163009434243d9c78d87e6982c84b2c74eb06fbb72003f003854fbadea926
-  data.tar.gz: 2cc9d0d4d64ac4ae889e54cf272339019ec91a812ba38f22f28b81abb8daa6af086941e8b50bb95a70f1f1028dd06879952fd51da4219fc46db523f4757ca774
+  metadata.gz: 64571af8d39650e26245fd746675c8af1b3b98ee0b8b6d2de705acaf93849bbc5ed51ae36543ac06105e102b79ed698a24676ca76d63c91213399bd029b58e85
+  data.tar.gz: f446904f582d0d423c9ea918a23bff541ec65be94e0be7b94a07e1e190a6e66ee4aeb2c7ad403c61773708feb30adb2949e2822a56f7f0c3bd1b291191225c48

data/CHANGELOG.adoc

@@ -5,6 +5,36 @@
 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.3.0 (2022-08-16) - @mojavelinux
+
+Enhancements::
+
+* place footnotes directly below last block of content if `footnotes-margin-top` theme key is 0 (#2291)
+* allow page / column break to be forced using `always` option (e.g., `[%always]`) (#2300)
+* insert column break instead of page break in multi-column layout if `column` role is specified on page break macro (#2293)
+* use relative font size for big and small roles (#2307)
+* use default-for-print theme by default if media is `print` or `prepress` (#2306)
+* support text alignment roles on all styled paragraphs
+* support text alignment roles on verse block
+
+Bug Fixes::
+
+* only indent text that starts at left margin (i.e., when text align is left or justify) (#2298)
+* apply text transform and formatting when checking height of heading for orphan prevention
+* apply text transform and formatting when computing height of background for caption
+* honor theme settings (`prose-margin-inner` and `prose-text-indent-inner`) for inner paragraphs in abstract
+* prevent footnote label from being split across lines (#2297)
+* keep footnote label with preceding text if adjacent (#2297)
+* strip formatting added to source block by custom subs when syntax highlighter is enabled (#2086)
+
+Compliance::
+
+* remove support for deprecated `spread` role on table
+
+=== Details
+
+{url-repo}/releases/tag/v2.3.0[git tag] | {url-repo}/compare/v2.2.0\...v2.3.0[full diff]
+
 == 2.2.0 (2022-07-22) - @mojavelinux
 
 Enhancements::

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.2.0, 2022-07-22
+v2.3.0, 2022-08-16
 // Settings:
 :experimental:
 :idprefix:

data/data/themes/base-theme.yml

@@ -17,8 +17,8 @@ base_border_color: '000000'
 role_lead_font_size: 13.5
 role_line-through_text_decoration: line-through
 role_underline_text_decoration: underline
-role_big_font_size: 14
-role_small_font_size: 10
+role_big_font_size: 1.2em
+role_small_font_size: 0.8em
 role_subtitle_font_size: 0.8em
 button_content: '[%s]'
 button_font_family: Courier

data/data/themes/default-theme.yml

@@ -23,28 +23,14 @@ page:
   size: A4
 base:
   text_align: justify
-  # color as hex string (leading # is optional)
   font_color: 333333
-  # color as RGB array
-  #font_color: [51, 51, 51]
-  # color as CMYK array (approximated)
-  #font_color: [0, 0, 0, 0.92]
-  #font_color: [0, 0, 0, 92%]
   font_family: Noto Serif
-  # choose one of these font_size/line_height_length combinations
-  #font_size: 14
-  #line_height_length: 20
-  #font_size: 11.25
-  #line_height_length: 18
-  #font_size: 11.2
-  #line_height_length: 16
   font_size: 10.5
-  #line_height_length: 15
-  # correct line height for Noto Serif metrics
+  # line_height_length is really just a vertical spacing variable; it's not actually the height of a line
   line_height_length: 12
-  #font_size: 11.25
-  #line_height_length: 18
-  line_height: $base_line_height_length / $base_font_size
+  # The Noto font family has a built-in line height of 1.36
+  # With this line_height, a line of text will occupy a height of 15.78pt
+  line_height: $base_line_height_length / 10.5
   font_size_large: round($base_font_size * 1.25)
   font_size_small: round($base_font_size * 0.85)
   font_size_min: $base_font_size * 0.75
@@ -60,16 +46,13 @@ role:
   underline:
     text_decoration: underline
   big:
-    font_size: $base_font_size_large
+    font_size: 1.2em
   small:
-    font_size: $base_font_size_small
+    font_size: 0.8em
   subtitle:
     font_color: 999999
     font_size: 0.8em
     font_style: normal_italic
-# FIXME vertical_rhythm is weird; we should think in terms of ems
-#vertical_rhythm: $base_line_height_length * 2 / 3
-# correct line height for Noto Serif metrics (comes with built-in line height)
 vertical_rhythm: $base_line_height_length
 horizontal_rhythm: $base_line_height_length
 link:
@@ -107,8 +90,7 @@ heading:
   h4_font_size: $base_font_size_large
   h5_font_size: $base_font_size
   h6_font_size: $base_font_size_small
-  #line_height: 1.4
-  # correct line height for Noto Serif metrics (comes with built-in line height)
+  # rely on built-in line height in Noto
   line_height: 1
   margin_top: $vertical_rhythm * 0.4
   margin_bottom: $vertical_rhythm * 0.9
@@ -156,11 +138,6 @@ admonition:
   column_rule_color: $base_border_color
   column_rule_width: $base_border_width
   padding: [$vertical_rhythm / 3.0, $horizontal_rhythm, $vertical_rhythm / 3.0, $horizontal_rhythm]
-  #icon:
-  #  tip:
-  #    name: far-lightbulb
-  #    stroke_color: 111111
-  #    size: 24
   label:
     text_transform: uppercase
     font_style: bold

data/lib/asciidoctor/pdf/converter.rb

@@ -46,8 +46,9 @@ module Asciidoctor
         tip: { name: 'far-lightbulb', stroke_color: '111111', size: 24 },
         warning: { name: 'fas-exclamation-triangle', stroke_color: 'BF6900', size: 24 },
       }
-      TextAlignmentNames = %w(justify left center right)
-      TextAlignmentRoles = %w(text-justify text-left text-center text-right)
+      TextAlignmentNames = { 'justify' => true, 'left' => true, 'center' => true, 'right' => true }
+      IndentableTextAlignments = { justify: true, left: true }
+      TextAlignmentRoles = { 'text-justify' => true, 'text-left' => true, 'text-center' => true, 'text-right' => true }
       TextDecorationStyleTable = { 'underline' => :underline, 'line-through' => :strikethrough }
       FontKerningTable = { 'normal' => true, 'none' => false }
       BlockFloatNames = %w(left right)
@@ -102,6 +103,7 @@ module Asciidoctor
         'filled' => (?\u2776..?\u277f).to_a + (?\u24eb..?\u24f4).to_a,
       }
       TypographicQuotes = %w(“ ” ‘ ’)
+      InlineFormatSniffRx = /[<&]/
       SimpleAttributeRefRx = /(?<!\\)\{\w+(?:-\w+)*\}/
       MeasurementRxt = '\\d+(?:\\.\\d+)?(?:in|cm|mm|p[txc])?'
       MeasurementPartsRx = /^(\d+(?:\.\d+)?)(in|mm|cm|p[txc])?$/
@@ -394,7 +396,7 @@ module Asciidoctor
         @font_scale = 1
         @font_color = theme.base_font_color
         @text_decoration_width = theme.base_text_decoration_width
-        @base_text_align = (text_align = doc.attr 'text-align') && (TextAlignmentNames.include? text_align) ? text_align : theme.base_text_align
+        @base_text_align = (text_align = doc.attr 'text-align') && TextAlignmentNames[text_align] ? text_align : theme.base_text_align
         @base_line_height = theme.base_line_height
         @cjk_line_breaks = doc.attr? 'scripts', 'cjk'
         if (hyphen_lang = (doc.attr 'hyphens') || ((doc.attr_unspecified? 'hyphens') ? @theme.base_hyphens : nil)) &&
@@ -533,8 +535,10 @@ module Asciidoctor
           elsif (theme_name = doc.attr 'pdf-theme')
             theme = ThemeLoader.load_theme theme_name, (user_themesdir = (doc.attr 'pdf-themesdir')&.sub '{docdir}', (doc.attr 'docdir'))
             @themesdir = theme.__dir__
-          else
+          elsif (doc.attr 'media', 'screen') == 'screen'
             @themesdir = (theme = ThemeLoader.load_theme).__dir__
+          else
+            @themesdir = (theme = ThemeLoader.load_theme 'default-for-print').__dir__
           end
           prepare_theme theme
         rescue
@@ -577,6 +581,7 @@ module Asciidoctor
         theme.code_linenum_font_color ||= '999999'
         theme.callout_list_margin_top_after_code ||= 0
         theme.role_unresolved_font_color ||= 'FF0000'
+        theme.footnotes_margin_top ||= 'auto'
         theme.footnotes_item_spacing ||= 0
         theme.index_columns ||= 2
         theme.index_column_gap ||= theme.base_font_size
@@ -741,22 +746,16 @@ module Asciidoctor
             pagenums = consolidate_ranges term.dests.map {|dest| dest[:page] }.uniq
           end
           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
+            if ::String === pagenum
+              term_fragments << ({ text: %(, #{pagenum}) })
             else
-              term_fragments << ({ text: ', ' })
+              term_fragments << { text: ', ' }
+              term_fragments << pagenum
             end
-            term_fragments << (::String === pagenum ? { text: pagenum } : pagenum)
           end
         end
         subterm_indent = @theme.description_list_description_indent
-        typeset_formatted_text term_fragments, (calc_line_metrics @base_line_height), align: :left, color: @font_color, 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, consolidate: true
         indent subterm_indent do
           term.subterms.each do |subterm|
             convert_index_term subterm, pagenum_sequence_style
@@ -782,10 +781,7 @@ module Asciidoctor
               ink_prose node.title, align: (@theme.abstract_title_text_align || @base_text_align).to_sym, margin_top: @theme.heading_margin_top, margin_bottom: @theme.heading_margin_bottom, line_height: (@theme.heading_line_height || @theme.base_line_height)
             end if node.title?
             theme_font :abstract do
-              prose_opts = { align: (@theme.abstract_text_align || @base_text_align).to_sym, hyphenate: true }
-              if (text_indent = @theme.prose_text_indent) > 0
-                prose_opts[:indent_paragraphs] = text_indent
-              end
+              prose_opts = { align: (@theme.abstract_text_align || @base_text_align).to_sym, hyphenate: true, margin_bottom: 0 }
               # FIXME: allow theme to control more first line options
               if (line1_font_style = @theme.abstract_first_line_font_style&.to_sym) && line1_font_style != font_style
                 case line1_font_style
@@ -806,14 +802,11 @@ module Asciidoctor
               prose_opts[:first_line_options] = first_line_options if first_line_options
               # FIXME: make this cleaner!!
               if node.blocks?
-                last_block = node.last_child
                 node.blocks.each do |child|
                   if child.context == :paragraph
                     child.document.playback_attributes child.attributes
-                    prose_opts[:margin_bottom] = 0 if child == last_block
-                    ink_prose child.content, ((text_align = resolve_text_align_from_role child.roles) ? (prose_opts.merge align: text_align) : prose_opts.dup)
+                    convert_paragraph child, prose_opts.dup
                     prose_opts.delete :first_line_options
-                    prose_opts.delete :margin_bottom
                   else
                     # FIXME: this could do strange things if the wrong kind of content shows up
                     child.convert
@@ -823,7 +816,10 @@ module Asciidoctor
                 if (text_align = resolve_text_align_from_role node.roles)
                   prose_opts[:align] = text_align
                 end
-                ink_prose string, (prose_opts.merge margin_bottom: 0)
+                if IndentableTextAlignments[prose_opts[:align]] && (text_indent = @theme.prose_text_indent) > 0
+                  prose_opts[:indent_paragraphs] = text_indent
+                end
+                ink_prose string, prose_opts
               end
             end
           end
@@ -832,16 +828,19 @@ module Asciidoctor
         theme_margin :block, :bottom, (next_enclosed_block node)
       end
 
-      def convert_paragraph node
+      def convert_paragraph node, opts = nil
         add_dest_for_block node if node.id
 
-        prose_opts = { margin_bottom: 0, hyphenate: true }
+        prose_opts = opts || { margin_bottom: 0, hyphenate: true }
         if (text_align = resolve_text_align_from_role (roles = node.roles), query_theme: true, remove_predefined: true)
           prose_opts[:align] = text_align
+        else
+          text_align = @base_text_align.to_sym
         end
         role_keys = roles.map {|role| %(role_#{role}) } unless roles.empty?
-        if (text_indent = @theme.prose_text_indent) > 0 ||
-            ((text_indent = @theme.prose_text_indent_inner) > 0 && node.previous_sibling&.context == :paragraph)
+        if IndentableTextAlignments[text_align] &&
+            ((text_indent = @theme.prose_text_indent) > 0 ||
+            ((text_indent = @theme.prose_text_indent_inner) > 0 && node.previous_sibling&.context == :paragraph))
           prose_opts[:indent_paragraphs] = text_indent
         end
         if (bottom_gutter = @bottom_gutters[-1][node])
@@ -1046,7 +1045,7 @@ module Asciidoctor
             else
               highlighter = nil
             end
-            prev_subs = (subs = node.subs).dup
+            saved_subs = (subs = node.subs).dup
             callouts_enabled = subs.include? :callouts
             highlight_idx = subs.index :highlight
             # NOTE: scratch? here only applies if listing block is nested inside another block
@@ -1056,16 +1055,33 @@ module Asciidoctor
                 # switch the :highlight sub back to :specialcharacters
                 subs[highlight_idx] = :specialcharacters
               else
-                prev_subs = nil
+                saved_subs = nil
               end
               source_string = guard_indentation node.content
             elsif highlight_idx
               # NOTE: the source highlighter logic below handles the highlight and callouts subs
-              subs.replace subs - [:highlight, :callouts]
-              # NOTE: indentation guards will be added by the source highlighter logic
-              source_string = expand_tabs node.content
+              if (subs - [:highlight, :callouts]).empty?
+                subs.clear
+                # NOTE: indentation guards will be added by the source highlighter logic
+                source_string = expand_tabs node.content
+              else
+                if callouts_enabled
+                  saved_lines = node.lines.dup
+                  subs.delete :callouts
+                  prev_subs = subs.dup
+                  subs.clear
+                  source_string, conum_mapping = extract_conums node.content
+                  node.lines.replace (source_string.split LF)
+                  subs.replace prev_subs
+                  callouts_enabled = false
+                end
+                subs[highlight_idx] = :specialcharacters
+                # NOTE: indentation guards will be added by the source highlighter logic
+                source_string = expand_tabs unescape_xml (sanitize node.content, compact: false)
+                node.lines.replace saved_lines if saved_lines
+              end
             else
-              highlighter = prev_subs = nil
+              highlighter = saved_subs = nil
               source_string = guard_indentation node.content
             end
           else
@@ -1157,7 +1173,7 @@ module Asciidoctor
             # NOTE: only format if we detect a need (callouts or inline formatting)
             source_chunks = (XMLMarkupRx.match? source_string) ? (text_formatter.format source_string) : [text: source_string]
           end
-          node.subs.replace prev_subs if prev_subs
+          node.subs.replace saved_subs if saved_subs
           adjusted_font_size = ((node.option? 'autofit') || (node.document.attr? 'autofit-option')) ? (compute_autofit_font_size source_chunks, :code) : nil
         end
 
@@ -1281,7 +1297,7 @@ module Asciidoctor
                 content = guard_indentation node.content
                 ink_prose content,
                   normalize: false,
-                  align: :left,
+                  align: (resolve_text_align_from_role node.roles) || :left,
                   hyphenate: true,
                   margin_bottom: 0,
                   bottom_gutter: (attribution ? nil : @bottom_gutters[-1][node])
@@ -1682,7 +1698,7 @@ module Asciidoctor
             alignment = float_to.to_sym
           elsif (alignment = node.attr 'align')
             alignment = (BlockAlignmentNames.include? alignment) ? alignment.to_sym : :left
-          elsif !(alignment = node.roles.reverse.find {|r| BlockAlignmentNames.include? r }&.to_sym)
+          elsif !(alignment = node.roles.reverse.find {|role| BlockAlignmentNames.include? role }&.to_sym)
             alignment = @theme.image_align&.to_sym || :left
           end
         end
@@ -1916,14 +1932,16 @@ module Asciidoctor
           page_layout = nil
         end
 
-        if at_page_top?
+        if at_page_top? && !(node.option? 'always')
           if page_layout && page_layout != page.layout && page.empty?
             delete_current_page
             advance_page layout: page_layout, margin: @page_margin[page_layout][page_side nil, @folio_placement[:inverted]]
           end
         elsif page_layout
+          bounds.current_column = bounds.last_column if ColumnBox === bounds && !(node.has_role? 'column')
           advance_page layout: page_layout, margin: @page_margin[page_layout][page_side nil, @folio_placement[:inverted]]
         else
+          bounds.current_column = bounds.last_column if ColumnBox === bounds && !(node.has_role? 'column')
           advance_page
         end
       end
@@ -2196,7 +2214,7 @@ module Asciidoctor
 
         if node.option? 'autowidth'
           table_width = (node.attr? 'width') ? bounds.width * ((node.attr 'tablepcwidth') / 100.0) :
-              (((node.has_role? 'stretch') || (node.has_role? 'spread')) ? bounds.width : nil)
+              (((node.has_role? 'stretch')) ? bounds.width : nil)
           column_widths = []
         else
           table_width = bounds.width * ((node.attr 'tablepcwidth') / 100.0)
@@ -2362,6 +2380,9 @@ module Asciidoctor
           node.content
         elsif node.content_model != :compound && (string = node.content)
           prose_opts = opts.merge hyphenate: true, margin_bottom: 0
+          if (text_align = resolve_text_align_from_role node.roles)
+            prose_opts[:align] = text_align
+          end
           if (bottom_gutter = @bottom_gutters[-1][node])
             prose_opts[:bottom_gutter] = bottom_gutter
           end
@@ -2477,9 +2498,9 @@ module Asciidoctor
           else
             label = index
           end
-          %(#{anchor}<sup>[<a anchor="_footnotedef_#{index}">#{label}</a>]</sup>)
+          %(<sup class="wj">#{anchor}[<a anchor="_footnotedef_#{index}">#{label}</a>]</sup>)
         elsif node.type == :xref
-          %(<sup><font color="#{theme.role_unresolved_font_color}">[#{node.text}]</font></sup>)
+          %(<sup class="wj"><font color="#{theme.role_unresolved_font_color}">[#{node.text}]</font></sup>)
         else
           log :warn, %(unknown footnote type: #{node.type.inspect})
           nil
@@ -2829,8 +2850,7 @@ module Asciidoctor
           theme_font :heading, level: (hlevel = opts[:level]) do
             h_padding_t, h_padding_r, h_padding_b, h_padding_l = expand_padding_value @theme[%(heading_h#{hlevel}_padding)]
             h_fits = indent h_padding_l, h_padding_r do
-              # FIXME: this height doesn't account for impact of text transform or inline formatting
-              heading_h = (height_of_typeset_text title) +
+              heading_h = (height_of_typeset_text title, inline_format: true, text_transform: @text_transform) +
                 (@theme[%(heading_h#{hlevel}_margin_top)] || @theme.heading_margin_top) +
                 (@theme[%(heading_h#{hlevel}_margin_bottom)] || @theme.heading_margin_bottom) + h_padding_t + h_padding_b
               heading_h += min_height_after if min_height_after && (node.context == :section ? node.blocks? : !node.last_child?)
@@ -3002,8 +3022,16 @@ module Asciidoctor
       end
 
       def height_of_typeset_text string, opts = {}
+        if (transform = opts[:text_transform])
+          string = transform_text string, transform
+        end
+        if (inline_format = opts[:inline_format]) && (InlineFormatSniffRx.match? string)
+          fragments = parse_text string, inline_format: inline_format
+        else
+          fragments = [{ text: string }]
+        end
         line_metrics = (calc_line_metrics opts[:line_height] || @base_line_height)
-        (height_of string, leading: line_metrics.leading, final_gap: line_metrics.final_gap) + line_metrics.padding_top + (opts[:single_line] ? 0 : line_metrics.padding_bottom)
+        (height_of_formatted fragments, leading: line_metrics.leading, final_gap: line_metrics.final_gap) + line_metrics.padding_top + (opts[:single_line] ? 0 : line_metrics.padding_bottom)
       end
 
       # Render the caption in the current document. If the dry_run option is true, return the height.
@@ -3095,7 +3123,7 @@ module Asciidoctor
             opts = opts.merge inherited
           end
           unless scratch? || !(bg_color = @theme[%(#{category_caption}_background_color)] || @theme.caption_background_color)
-            caption_height = height_of_typeset_text string
+            caption_height = height_of_typeset_text string, inline_format: true, text_transform: @text_transform
             fill_at = [bounds.left, cursor]
             fill_at[1] -= (margin[:top] || 0) unless at_page_top?
             float { bounding_box(fill_at, width: container_width, height: caption_height) { fill_bounds bg_color } }
@@ -3156,9 +3184,9 @@ module Asciidoctor
       def ink_footnotes node
         return if (fns = (doc = node.document).footnotes - @rendered_footnotes).empty?
         theme_margin :block, :bottom if node.context == :document || node == node.document.last_child
-        theme_margin :footnotes, :top
+        theme_margin :footnotes, :top unless (valign_bottom = @theme.footnotes_margin_top == 'auto')
         with_dry_run do |extent|
-          if (single_page_height = extent&.single_page_height) && (delta = cursor - single_page_height - 0.0001) > 0
+          if valign_bottom && (single_page_height = extent&.single_page_height) && (delta = cursor - single_page_height - 0.0001) > 0
             move_down delta
           end
           theme_font :footnotes do
@@ -4294,8 +4322,8 @@ module Asciidoctor
       end
 
       def resolve_text_align_from_role roles, query_theme: false, remove_predefined: false
-        if (align_role = roles.reverse.find {|r| TextAlignmentRoles.include? r })
-          roles.replace roles - TextAlignmentRoles if remove_predefined
+        if (align_role = roles.reverse.find {|role| TextAlignmentRoles[role] })
+          roles.replace roles - TextAlignmentRoles.keys if remove_predefined
           (align_role.slice 5, align_role.length).to_sym
         elsif query_theme
           roles.reverse.each do |role|
@@ -4537,6 +4565,7 @@ module Asciidoctor
       # QUESTION: combine with typeset_text?
       def typeset_formatted_text fragments, line_metrics, opts = {}
         opts = { leading: line_metrics.leading, initial_gap: line_metrics.padding_top, final_gap: line_metrics.final_gap }.merge opts
+        fragments = consolidate_fragments fragments if opts.delete :consolidate
         if (hanging_indent = (opts.delete :hanging_indent) || 0) > 0
           indent hanging_indent do
             formatted_text fragments, (opts.merge indent_paragraphs: -hanging_indent)
@@ -4746,6 +4775,20 @@ module Asciidoctor
         end
       end
 
+      def consolidate_fragments fragments
+        return fragments unless fragments.size > 1
+        accum = []
+        prev_fragment = nil
+        fragments.each do |fragment|
+          if prev_fragment && fragment == (prev_fragment.merge text: (fragment_text = fragment[:text]))
+            prev_fragment[:text] += fragment_text
+          else
+            accum << (prev_fragment = fragment)
+          end
+        end
+        accum
+      end
+
       def conum_glyph number
         @conum_glyphs[number - 1]
       end

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

@@ -3,6 +3,10 @@
 Prawn::Document::ColumnBox.prepend (Module.new do
   attr_accessor :current_column
 
+  def last_column
+    @columns - 1
+  end
+
   def move_past_bottom
     (doc = @document).y = @y
     return if (@current_column = (@current_column + 1) % @columns) > 0

data/lib/asciidoctor/pdf/ext/prawn/formatted_text/arranger.rb

@@ -26,6 +26,17 @@ Prawn::Text::Formatted::Arranger.prepend (Module.new do
     (string = super) == @dummy_text ? (string.extend Prawn::Text::NoopLstripBang) : string
   end
 
+  def preview_joined_string
+    if (next_unconsumed = @unconsumed[0] || {})[:wj] && !(@consumed[-1] || [])[:wj]
+      idx = 0
+      str = '' if (str = next_unconsumed[:text]) == @dummy_text
+      while (next_unconsumed = @unconsumed[idx += 1] || {})[:wj] && (next_string = next_unconsumed[:text])
+        str += next_string unless next_string == @dummy_text
+      end
+      str unless str == ''
+    end
+  end
+
   def apply_font_size size, styles
     if (subscript? styles) || (superscript? styles)
       size ||= @document.font_size

data/lib/asciidoctor/pdf/ext/prawn/formatted_text/line_wrap.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+Prawn::Text::Formatted::LineWrap.prepend (Module.new do
+  def add_fragment_to_line fragment
+    case fragment
+    when ''
+      true
+    when ?\n
+      @newline_encountered = true
+      false
+    else
+      if (joined_string = @arranger.preview_joined_string)
+        joined_string_width = @document.width_of (tokenize joined_string)[0], kerning: @kerning
+      else
+        joined_string_width = 0
+      end
+      last_idx = (segments = tokenize fragment).length - 1
+      segments.each_with_index do |segment, idx|
+        if segment == (zero_width_space segment.encoding)
+          segment_width = effective_segment_width = 0
+        else
+          segment_width = effective_segment_width = @document.width_of segment, kerning: @kerning
+          effective_segment_width += joined_string_width if idx === last_idx
+        end
+        if @accumulated_width + effective_segment_width <= @width
+          @accumulated_width += segment_width
+          if segment[-1] == (shy = soft_hyphen segment.encoding)
+            @accumulated_width -= (@document.width_of shy, kerning: @kerning)
+          end
+          @fragment_output += segment
+        else
+          @line_contains_more_than_one_word = false if @accumulated_width == 0 && @line_contains_more_than_one_word
+          end_of_the_line_reached segment
+          fragment_finished fragment
+          return false
+        end
+      end
+      fragment_finished fragment
+      true
+    end
+  end
+end)

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

@@ -13,5 +13,6 @@ require_relative 'prawn/formatted_text/arranger'
 require_relative 'prawn/formatted_text/box'
 require_relative 'prawn/formatted_text/fragment'
 require_relative 'prawn/formatted_text/indented_paragraph_wrap'
+require_relative 'prawn/formatted_text/line_wrap'
 require_relative 'prawn/formatted_text/protect_bottom_gutter'
 require_relative 'prawn/extensions'

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

@@ -315,10 +315,12 @@ module Asciidoctor
                 end) : value
               elsif (value = attrs[:id])
                 # NOTE: text is null character, which is used as placeholder text so Prawn doesn't drop fragment
-                fragment = { name: value, callback: [InlineDestinationMarker] }
+                new_fragment = { name: value, callback: [InlineDestinationMarker] }
+                new_fragment[:wj] = true if fragment[:wj]
                 if (type = attrs[:type])
-                  fragment[:type] = type.to_sym
+                  new_fragment[:type] = type.to_sym
                 end
+                fragment = new_fragment
                 visible = nil
               end
             end
@@ -357,6 +359,7 @@ module Asciidoctor
           end
           # TODO: we could limit to select tags, but doesn't seem to really affect performance
           attrs[:class].split.each do |class_name|
+            fragment[:wj] = true if class_name == 'wj'
             next unless @theme_settings.key? class_name
             update_fragment fragment, @theme_settings[class_name]
             # NOTE: defer assignment of callback since we must look at combined styles of element and role

data/lib/asciidoctor/pdf/sanitizer.rb

@@ -8,7 +8,7 @@ module Asciidoctor
         '>' => '>',
         '&' => '&',
       }
-      XMLSpecialCharsRx = /(?:#{XMLSpecialChars.keys.join '|'})/
+      XMLSpecialCharsRx = /&(?:[lg]t|amp);/
       InverseXMLSpecialChars = XMLSpecialChars.invert
       InverseXMLSpecialCharsRx = /[#{InverseXMLSpecialChars.keys.join}]/
       (BuiltInNamedEntities = {
@@ -28,16 +28,20 @@ module Asciidoctor
       #
       # FIXME: move to a module so we can mix it in elsewhere
       # FIXME: add option to control escaping entities, or a filter mechanism in general
-      def sanitize string
+      def sanitize string, compact: true
         string = string.gsub SanitizeXMLRx, '' if string.include? '<'
         string = string.gsub(CharRefRx) { $1 ? BuiltInNamedEntities[$1] : ([$2 ? $2.to_i : ($3.to_i 16)].pack 'U1') } if string.include? '&'
-        string.strip.tr_s ' ', ' '
+        compact ? (string.strip.tr_s ' ', ' ') : string
       end
 
       def escape_xml string
         string.gsub InverseXMLSpecialCharsRx, InverseXMLSpecialChars
       end
 
+      def unescape_xml string
+        string.gsub XMLSpecialCharsRx, XMLSpecialChars
+      end
+
       def escape_amp string
         string.gsub UnescapedAmpersandRx, '&amp;'
       end

data/lib/asciidoctor/pdf/theme_loader.rb

@@ -160,7 +160,7 @@ module Asciidoctor
           data[key] = {}.tap do |accum|
             val.each do |key2, val2|
               key2 = key2.tr '-', '_' if key2.include? '-'
-              accum[key2.to_sym] = (key2.end_with? '_color') ? (to_color evaluate val2, data) : (evaluate val2, data)
+              accum[key2.to_sym] = (key2.end_with? '_color') ? (to_color evaluate val2, data, math: false) : (evaluate val2, data)
             end
           end if val
         elsif ::Hash === val
@@ -173,20 +173,18 @@ module Asciidoctor
           end
         elsif (rekey = DeprecatedKeys[key]) ||
             ((key.start_with? 'role_') && (key.end_with? '_align') && (rekey = key.sub RoleAlignKeyRx, '_text_align'))
-          data[rekey] = evaluate val, data
+          data[rekey] = evaluate val, data, math: false
         elsif PaddingBottomHackKeys.include? key
           val = evaluate val, data
           # normalize padding hacks for themes designed before the converter had smart margins
           val[2] = val[0] if ::Array === val && val[0].to_f >= 0 && val[2].to_f <= 0
           data[key] = val
-        # QUESTION: do we really need to evaluate_math in this case?
         elsif key.end_with? '_color'
-          if key == 'table_border_color'
-            data[key] = ::Array === val ? val.map {|it| to_color evaluate it, data } : (to_color evaluate val, data)
-          elsif key == 'table_grid_color' && ::Array === val && val.size == 2
-            data[key] = val.map {|it| to_color evaluate it, data }
+          # assume table_grid_color is a single color unless the value is a 2-element array for backwards compatibility
+          if key == 'table_border_color' ? ::Array === val : (key == 'table_grid_color' && ::Array === val && val.size == 2)
+            data[key] = val.map {|it| to_color evaluate it, data, math: false }
           else
-            data[key] = to_color evaluate val, data
+            data[key] = to_color evaluate val, data, math: false
           end
         elsif key.end_with? '_content'
           data[key] = (expand_vars val.to_s, data).to_s
@@ -196,12 +194,12 @@ module Asciidoctor
         data
       end
 
-      def evaluate expr, vars
+      def evaluate expr, vars, math: true
         case expr
         when ::String
-          evaluate_math expand_vars expr, vars
+          math ? (evaluate_math expand_vars expr, vars) : (expand_vars expr, vars)
         when ::Array
-          expr.map {|e| evaluate e, vars }
+          expr.map {|e| evaluate e, vars, math: math }
         else
           expr
         end
@@ -233,7 +231,6 @@ module Asciidoctor
       def evaluate_math expr
         return expr if !(::String === expr) || ColorValue === expr
         # resolve measurement values (e.g., 0.5in => 36)
-        # QUESTION: should we round the value? perhaps leave that to the precision functions
         # NOTE: leave % as a string; handled by converter for now
         original, expr = expr, (resolve_measurement_values expr)
         while true
@@ -257,8 +254,7 @@ module Asciidoctor
           end
         end
         if (expr.end_with? ')') && expr =~ PrecisionFuncRx
-          op = $1
-          offset = op.length + 1
+          offset = (op = $1).length + 1
           expr = expr[offset...-1].to_f.send op.to_sym
         end
         if expr == original

data/lib/asciidoctor/pdf/version.rb

@@ -2,6 +2,6 @@
 
 module Asciidoctor
   module PDF
-    VERSION = '2.2.0'
+    VERSION = '2.3.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-pdf
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Dan Allen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-22 00:00:00.000000000 Z
+date: 2022-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -280,6 +280,7 @@ files:
 - lib/asciidoctor/pdf/ext/prawn/formatted_text/box.rb
 - lib/asciidoctor/pdf/ext/prawn/formatted_text/fragment.rb
 - lib/asciidoctor/pdf/ext/prawn/formatted_text/indented_paragraph_wrap.rb
+- lib/asciidoctor/pdf/ext/prawn/formatted_text/line_wrap.rb
 - lib/asciidoctor/pdf/ext/prawn/formatted_text/protect_bottom_gutter.rb
 - lib/asciidoctor/pdf/ext/prawn/images.rb
 - lib/asciidoctor/pdf/ext/pygments.rb