asciidoctor-pdf 2.1.3 → 2.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7753392586bac4a044601fefa9ecb58745e02fc37434dd5a26e020692890e65
-  data.tar.gz: 301fe3fef546588aacba4ca8d9c5afd91d4a19a816f07a8fcc66121c8f58f626
+  metadata.gz: 626c05cc96837efcf9f6fd0b96f0f31e8791188f27db387609a6a2d6a1345e94
+  data.tar.gz: 311afcb050d8063c6878166b8ce89e2e7bd1986af9b212ee9ee9202d87ba3a53
 SHA512:
-  metadata.gz: b26fe1f74b22bd73eba166190d21afebafdc1630dba5fee8174aa946b463d81b7e620cb8f400e803507f050c6dd48a1d732a1273a78fc1cd0e958da69a0a3c9c
-  data.tar.gz: 15cd75342088585a51f19cb342a8023fbc2aa6d0cd89fff72385370172059ac10c98fa51b8126845ce40436fcd89dc0c1f47aa763df14dad24ba2bcd95f92205
+  metadata.gz: a82a51068e74bf9ea3bdb89c11a8075a27e58c49fdc84bfdce9066030e7f6688a99a6956bbbd8a1739aa5d2de3eaf5943a9e6ec234ecfce0bc5bc938d0ffc91a
+  data.tar.gz: bad6ea4168ef017bec92534f657ec54208851cb224ae2c4e2c37fe329946192bab9d0e5519c8d2d19cf3c1184185664402523fe7175b4fb496465a3ebed41b01

data/CHANGELOG.adoc

@@ -5,6 +5,43 @@
 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.6 (2022-07-19) - @mojavelinux
+
+Bug Fixes::
+
+* resolve font size for monospaced cell when font size value on `codespan` key in theme is relative (#2281)
+
+=== Details
+
+{url-repo}/releases/tag/v2.1.6[git tag] | {url-repo}/compare/v2.1.5\...v2.1.6[full diff]
+
+== 2.1.5 (2022-07-10) - @mojavelinux
+
+Bug Fixes::
+
+* fix position of background color on caption with outside margin (#2271)
+* don't allow font scale to compound when entering nested table (#2276)
+
+=== Details
+
+{url-repo}/releases/tag/v2.1.5[git tag] | {url-repo}/compare/v2.1.4\...v2.1.5[full diff]
+
+== 2.1.4 (2022-06-26) - @mojavelinux
+
+Improvements::
+
+* include source location in warning message for truncated table cell if sourcemap is enabled (#2261)
+
+Bug Fixes::
+
+* allow alt text for block image, video, and audio to wrap to next line on same page (#2258)
+* apply `text-transform` from custom role on phrase after attributes have been resolved (#2263)
+* make URL check more strict so image target containing a colon is not mistaken as a URL
+
+=== Details
+
+{url-repo}/releases/tag/v2.1.4[git tag] | {url-repo}/compare/v2.1.3\...v2.1.4[full diff]
+
 == 2.1.3 (2022-06-23) - @mojavelinux
 
 Bug Fixes::

data/README.adoc

@@ -1,6 +1,6 @@
 = Asciidoctor PDF: A native PDF converter for AsciiDoc
 Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>
-v2.1.3, 2022-06-23
+v2.1.6, 2022-07-19
 // Settings:
 :experimental:
 :idprefix:

data/bin/asciidoctor-pdf

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-if File.file?(asciidoctor_pdf = (File.expand_path '../../lib/asciidoctor/pdf.rb', __FILE__))
+if File.file? (asciidoctor_pdf = File.join (File.dirname __dir__), 'lib/asciidoctor/pdf.rb')
   require asciidoctor_pdf
 else
   require 'asciidoctor/pdf'
@@ -10,14 +10,14 @@ require 'asciidoctor/cli'
 
 options = Asciidoctor::Cli::Options.new backend: 'pdf', header_footer: true
 
-# FIXME provide an API in Asciidoctor for sub-components to print version information
+# FIXME: provide an API in Asciidoctor for sub-components to print version information
 unless ARGV != ['-v'] && (ARGV & ['-V', '--version']).empty?
   $stdout.write %(Asciidoctor PDF #{Asciidoctor::PDF::VERSION} using )
   options.print_version
   exit 0
 end
 
-# FIXME This is a really bizarre API. Please make me simpler.
+# FIXME: This is a really bizarre API. Please make me simpler.
 case (result = options.parse! ARGV)
 when Integer
   exit result

data/lib/asciidoctor/pdf/converter.rb

@@ -27,8 +27,6 @@ module Asciidoctor
 
       attr_accessor :font_scale
 
-      attr_reader :root_font_size
-
       attr_reader :index
 
       attr_reader :theme
@@ -114,6 +112,7 @@ module Asciidoctor
       UriBreakCharsRx = %r((?:/|\?|&|#)(?!$))
       UriBreakCharRepl = %(\\&#{ZeroWidthSpace})
       UriSchemeBoundaryRx = %r((?<=://))
+      UrlSniffRx = %r(^\p{Alpha}[\p{Alnum}+.-]*://)
       LineScanRx = /\n|.+/
       BlankLineRx = /\n{2,}/
       CjkLineBreakRx = /(?=[\u3000\u30a0-\u30ff\u3040-\u309f\p{Han}\uff00-\uffef])/
@@ -1886,7 +1885,7 @@ module Asciidoctor
         add_dest_for_block node if node.id
         audio_path = node.media_uri node.attr 'target'
         play_symbol = (node.document.attr? 'icons', 'font') ? %(<font name="fas">#{(icon_font_data 'fas').unicode 'play'}</font>) : RightPointer
-        ink_prose %(#{play_symbol}#{NoBreakSpace}<a href="#{audio_path}">#{audio_path}</a> <em>(audio)</em>), normalize: false, margin: 0, single_line: true
+        ink_prose %(#{play_symbol}#{NoBreakSpace}<a href="#{audio_path}">#{audio_path}</a> <em>(audio)</em>), normalize: false, margin: 0
         ink_caption node, labeled: false, end: :bottom if node.title?
         theme_margin :block, :bottom, (next_enclosed_block node)
       end
@@ -1914,7 +1913,7 @@ module Asciidoctor
         if poster.nil_or_empty?
           add_dest_for_block node if node.id
           play_symbol = (node.document.attr? 'icons', 'font') ? %(<font name="fas">#{(icon_font_data 'fas').unicode 'play'}</font>) : RightPointer
-          ink_prose %(#{play_symbol}#{NoBreakSpace}<a href="#{video_path}">#{video_path}</a> <em>(#{type})</em>), normalize: false, margin: 0, single_line: true
+          ink_prose %(#{play_symbol}#{NoBreakSpace}<a href="#{video_path}">#{video_path}</a> <em>(#{type})</em>), normalize: false, margin: 0
           ink_caption node, labeled: false, end: :bottom if node.title?
           theme_margin :block, :bottom, (next_enclosed_block node)
         else
@@ -1995,6 +1994,7 @@ module Asciidoctor
         num_cols = node.columns.size
         table_header_size = false
         theme = @theme
+        prev_font_scale, @font_scale = @font_scale, 1 if node.document.nested?
 
         tbl_bg_color = resolve_theme_color :table_background_color
         # QUESTION: should we fallback to page background color? (which is never transparent)
@@ -2053,7 +2053,8 @@ module Asciidoctor
                   content: cell_text,
                   colspan: cell.colspan || 1,
                   align: (cell.attr 'halign').to_sym,
-                  valign: (val = cell.attr 'valign') == 'middle' ? :center : val.to_sym
+                  valign: (val = cell.attr 'valign') == 'middle' ? :center : val.to_sym,
+                  source_location: cell.source_location
               end)
             end
           end unless head_rows.empty?
@@ -2072,7 +2073,8 @@ module Asciidoctor
                 colspan: cell.colspan || 1,
                 rowspan: cell.rowspan || 1,
                 align: (cell.attr 'halign').to_sym,
-                valign: (val = cell.attr 'valign') == 'middle' ? :center : val.to_sym
+                valign: (val = cell.attr 'valign') == 'middle' ? :center : val.to_sym,
+                source_location: cell.source_location
               cell_line_metrics = body_cell_line_metrics
               case cell.style
               when :emphasis
@@ -2102,10 +2104,15 @@ module Asciidoctor
               when :monospaced
                 cell_data.delete :font_style
                 cell_line_height = @base_line_height
+                current_font_size = @font_size
                 theme_font :codespan do
                   mono_cell_font_info = font_info
                   cell_data[:font] = mono_cell_font_info[:family]
-                  cell_data[:size] = mono_cell_font_info[:size]
+                  if ::String === @font_size || @font_size < 1
+                    @font_size = current_font_size
+                    font_size mono_cell_font_info[:size]
+                  end
+                  cell_data[:size] = @font_size
                   cell_data[:text_color] = @font_color
                   cell_line_metrics = calc_line_metrics cell_line_height
                 end
@@ -2132,8 +2139,8 @@ module Asciidoctor
                 end
                 # NOTE: line metrics get applied when AsciiDoc content is converted
                 cell_line_metrics = nil
-                asciidoc_cell = ::Prawn::Table::Cell::AsciiDoc.new self, (cell_data.merge content: cell.inner_document, padding: body_cell_padding)
-                cell_data = { content: asciidoc_cell }
+                asciidoc_cell = ::Prawn::Table::Cell::AsciiDoc.new self, (cell_data.merge content: cell.inner_document, padding: body_cell_padding, root_font_size: @root_font_size)
+                cell_data = { content: asciidoc_cell, source_location: cell.source_location }
               end
               if cell_line_metrics
                 cell_padding = body_cell_padding.dup
@@ -2336,6 +2343,8 @@ module Asciidoctor
         theme_margin :block, :bottom, (next_enclosed_block node)
       rescue ::Prawn::Errors::CannotFit
         log :error, (message_with_context 'cannot fit contents of table cell into specified column width', source_location: node.source_location)
+      ensure
+        @font_scale = prev_font_scale if prev_font_scale
       end
 
       def convert_thematic_break node
@@ -2685,13 +2694,7 @@ module Asciidoctor
         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
-            end
-            inner_text = inner_text.gsub DoubleSpaceRx, ' ' + ZeroWidthSpace if role == 'pre-wrap' && (inner_text.include? DoubleSpace)
-          end
+          inner_text = inner_text.gsub DoubleSpaceRx, ' ' + ZeroWidthSpace if (node.has_role? 'pre-wrap') && (inner_text.include? DoubleSpace)
           quoted_text = is_tag ? %(#{open.chop} class="#{roles}">#{inner_text}#{close}) : %(<span class="#{roles}">#{open}#{inner_text}#{close}</span>)
         else
           quoted_text = %(#{open}#{inner_text}#{close})
@@ -3106,7 +3109,8 @@ module Asciidoctor
           end
           unless scratch? || !(bg_color = @theme[%(#{category_caption}_background_color)] || @theme.caption_background_color)
             caption_height = height_of_typeset_text string
-            fill_at = [bounds.left, cursor + (margin[:top] || 0)]
+            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 } }
           end
           indent(*indent_by) do
@@ -3241,7 +3245,8 @@ module Asciidoctor
         end
       end
 
-      # NOTE: inline_format is true by default
+      # NOTE: inline_format option is true by default
+      # NOTE: single_line option is not compatible with this method
       def ink_prose string, opts = {}
         top_margin = (margin = (opts.delete :margin)) || (opts.delete :margin_top) || 0
         bot_margin = margin || (opts.delete :margin_bottom) || @theme.prose_margin_bottom
@@ -4255,10 +4260,10 @@ module Asciidoctor
         # NOTE: this will catch a classloader resource path on JRuby (e.g., uri:classloader:/path/to/image)
         elsif ::File.absolute_path? image_path
           ::File.absolute_path image_path
-        elsif !(is_uri = node.is_uri? image_path) && imagesdir && (::File.absolute_path? imagesdir)
+        elsif !(is_url = url? image_path) && imagesdir && (::File.absolute_path? imagesdir)
           ::File.absolute_path image_path, imagesdir
         # handle case when image is a URI
-        elsif is_uri || (imagesdir && (node.is_uri? imagesdir) && (image_path = node.normalize_web_path image_path, imagesdir, false))
+        elsif is_url || (imagesdir && (url? imagesdir) && (image_path = node.normalize_web_path image_path, imagesdir, false))
           if !allow_uri_read
             log :warn, %(cannot embed remote image: #{image_path} (allow-uri-read attribute not enabled))
             return
@@ -4496,6 +4501,7 @@ module Asciidoctor
       end
 
       # TODO: document me, esp the first line formatting functionality
+      # NOTE: single_line option should only be used if height option is specified
       def typeset_text string, line_metrics, opts = {}
         opts = { leading: line_metrics.leading, final_gap: line_metrics.final_gap }.merge opts
         string = string.gsub CjkLineBreakRx, ZeroWidthSpace if @cjk_line_breaks
@@ -4950,7 +4956,7 @@ module Asciidoctor
           alt_text_vars[:'/link'] = ''
         end
         theme_font :image_alt do
-          ink_prose alt_text_template % alt_text_vars, align: opts[:align], margin: 0, normalize: false, single_line: true
+          ink_prose alt_text_template % alt_text_vars, align: opts[:align], margin: 0, normalize: false
         end
         ink_caption node, category: :image, end: :bottom if node.title?
         theme_margin :block, :bottom, (next_enclosed_block node) unless opts[:pinned]
@@ -5045,6 +5051,10 @@ module Asciidoctor
         false
       end
 
+      def url? str
+        (str.include? ':/') && (UrlSniffRx.match? str)
+      end
+
       # Calculate the width that is needed to print all the
       # fragments without wrapping any lines.
       #

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

@@ -528,29 +528,6 @@ module Asciidoctor
         end
       end
 
-      # Apply the text transform to the specified text.
-      #
-      # Supported transform values are "uppercase", "lowercase", or "none" (passed
-      # as either a String or a Symbol). When the uppercase transform is applied to
-      # the text, it correctly uppercases visible text while leaving markup and
-      # named character entities unchanged. The none transform returns the text
-      # unmodified.
-      #
-      def transform_text text, transform
-        case transform
-        when :uppercase, 'uppercase'
-          uppercase_pcdata text
-        when :lowercase, 'lowercase'
-          lowercase_pcdata text
-        when :capitalize, 'capitalize'
-          capitalize_words_pcdata text
-        when :smallcaps, 'smallcaps'
-          smallcaps_pcdata text
-        else
-          text
-        end
-      end
-
       def hyphenate_text text, hyphenator
         hyphenate_words_pcdata text, hyphenator
       end

data/lib/asciidoctor/pdf/ext/prawn-table/cell/asciidoc.rb

@@ -7,6 +7,7 @@ module Prawn
         include ::Asciidoctor::Logging
 
         attr_accessor :align
+        attr_accessor :root_font_size
         attr_accessor :valign
 
         def initialize pdf, opts = {}
@@ -91,7 +92,9 @@ module Prawn
           # TODO: apply horizontal alignment; currently it is necessary to specify alignment on content blocks
           apply_font_properties { pdf.traverse content }
           if (extra_pages = pdf.page_number - start_page) > 0
-            logger.error %(the table cell on page #{start_page} has been truncated; Asciidoctor PDF does not support table cell content that exceeds the height of a single page) unless extra_pages == 1 && pdf.page.empty?
+            unless extra_pages == 1 && pdf.page.empty?
+              logger.error message_with_context %(the table cell on page #{start_page} has been truncated; Asciidoctor PDF does not support table cell content that exceeds the height of a single page), source_location: @source_location
+            end
             extra_pages.times { pdf.delete_current_page }
           end
           nil
@@ -107,7 +110,7 @@ module Prawn
           prev_font_color, pdf.font_color = pdf.font_color, font_color if font_color
           font_family ||= font_info[:family]
           if font_size
-            prev_font_scale, pdf.font_scale = pdf.font_scale, (font_size.to_f / @pdf.root_font_size)
+            prev_font_scale, pdf.font_scale = pdf.font_scale, (font_size.to_f / @root_font_size)
           else
             font_size = font_info[:size]
           end

data/lib/asciidoctor/pdf/ext/prawn-table/cell/text.rb

@@ -16,7 +16,9 @@ class Prawn::Table::Cell::Text
           height: spanned_content_height + FPTolerance,
           at: [0, @pdf.cursor]).render
       end
-      logger.error %(the table cell on page #{@pdf.page_number} has been truncated; Asciidoctor PDF does not support table cell content that exceeds the height of a single page) unless remaining_text.empty? || @pdf.scratch?
+      unless remaining_text.empty? || @pdf.scratch?
+        logger.error message_with_context %(the table cell on page #{@pdf.page_number} has been truncated; Asciidoctor PDF does not support table cell content that exceeds the height of a single page), source_location: @source_location
+      end
     end
   end
 

data/lib/asciidoctor/pdf/ext/prawn-table/cell.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 Prawn::Table::Cell.prepend (Module.new do
+  attr_writer :source_location
+
   def border_color= color
     color = [color, color] if Asciidoctor::PDF::ThemeLoader::CMYKColorValue === color
     super

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

@@ -4,6 +4,8 @@ module Asciidoctor
   module PDF
     module FormattedText
       class Transform
+        include TextTransformer
+
         LF = ?\n
         ZeroWidthSpace = ?\u200b
         CharEntityTable = { amp: '&', apos: ?', gt: '>', lt: '<', nbsp: ?\u00a0, quot: '"' }
@@ -21,8 +23,8 @@ module Asciidoctor
           'font_size' => :size,
           'text_decoration_color' => :text_decoration_color,
           'text_decoration_width' => :text_decoration_width,
+          'text_transform' => :text_transform,
         }
-        #DummyText = ?\u0000
 
         def initialize options = {}
           @merge_adjacent_text_nodes = options[:merge_adjacent_text_nodes]
@@ -172,6 +174,11 @@ module Asciidoctor
                       previous_fragment_is_text && ((previous_fragment_text = fragments[-1][:text]).end_with? ' ')
                     fragments[-1][:text] = previous_fragment_text.chop
                   end
+                  if (text_transform = fragment.delete :text_transform)
+                    text = (text_chunks = extract_text pcdata).join
+                    text_io = StringIO.new transform_text text, text_transform
+                    restore_text pcdata, text_chunks.each_with_object([]) {|chunk, accum| accum << (text_io.read chunk.length) }
+                  end
                   # NOTE: decorate child fragments with inherited properties from this element
                   apply pcdata, fragments, fragment
                   previous_fragment_is_text = false
@@ -251,6 +258,8 @@ module Asciidoctor
           fragments
         end
 
+        private
+
         def build_fragment fragment, tag_name, attrs
           styles = (fragment[:styles] ||= ::Set.new)
           case tag_name
@@ -324,7 +333,6 @@ module Asciidoctor
             # NOTE: spaces in style value are superfluous for our purpose; split drops record after trailing ;
             attrs[:style].tr(' ', '').split(';').each do |style|
               pname, pvalue = style.split ':', 2
-              # TODO: text-transform
               case pname
               when 'color' # color needed to support syntax highlighters
                 fragment[:color] = pvalue.length == 7 ? (pvalue.slice 1, 6) : (pvalue.slice 1, 3).each_char.map {|c| c * 2 }.join if (pvalue.start_with? '#') && (HexColorRx.match? pvalue)
@@ -409,6 +417,29 @@ module Asciidoctor
             end
           end
         end
+
+        def extract_text pcdata
+          pcdata.reduce [] do |accum, it|
+            case it[:type]
+            when :text
+              accum << it[:value]
+            when :element
+              accum += (extract_text it[:pcdata]) if it.key? :pcdata
+            end
+            accum
+          end
+        end
+
+        def restore_text pcdata, text_chunks
+          pcdata.each do |it|
+            case it[:type]
+            when :text
+              it[:value] = text_chunks.shift
+            when :element
+              restore_text it[:pcdata], text_chunks if it.key? :pcdata
+            end
+          end
+        end
       end
     end
   end

data/lib/asciidoctor/pdf/index_catalog.rb

@@ -3,7 +3,7 @@
 module Asciidoctor
   module PDF
     class IndexCatalog
-      include ::Asciidoctor::PDF::TextTransformer
+      include TextTransformer
 
       LeadingAlphaRx = /^\p{Alpha}/
 

data/lib/asciidoctor/pdf/text_transformer.rb

@@ -64,6 +64,29 @@ module Asciidoctor
           string.tr LowerAlphaChars, SmallCapsChars
         end
       end
+
+      # Apply the text transform to the specified text.
+      #
+      # Supported transform values are "uppercase", "lowercase", or "none" (passed
+      # as either a String or a Symbol). When the uppercase transform is applied to
+      # the text, it correctly uppercases visible text while leaving markup and
+      # named character entities unchanged. The none transform returns the text
+      # unmodified.
+      #
+      def transform_text text, transform
+        case transform
+        when :uppercase, 'uppercase'
+          uppercase_pcdata text
+        when :lowercase, 'lowercase'
+          lowercase_pcdata text
+        when :capitalize, 'capitalize'
+          capitalize_words_pcdata text
+        when :smallcaps, 'smallcaps'
+          smallcaps_pcdata text
+        else
+          text
+        end
+      end
     end
   end
 end

data/lib/asciidoctor/pdf/version.rb

@@ -2,6 +2,6 @@
 
 module Asciidoctor
   module PDF
-    VERSION = '2.1.3'
+    VERSION = '2.1.6'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-pdf
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.1.6
 platform: ruby
 authors:
 - Dan Allen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-23 00:00:00.000000000 Z
+date: 2022-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor