asciidoctor-pdf 2.1.5 → 2.3.0

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

@@ -23,4 +23,9 @@ class Asciidoctor::Document
     end
     nil
   end
+
+  # Internal: Returns whether the specified attribute has never been set and is not locked.
+  def attr_unspecified? name
+    !((attribute_locked? name) || (@attributes_modified.include? name))
+  end
 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/extensions.rb

@@ -371,14 +371,16 @@ module Asciidoctor
           else
             super points.to_f
           end
-        # NOTE: assume em value (since a font size of 1 is extremely unlikely)
-        elsif points <= 1
-          super @font_size * points
         else
           super points
         end
       end
 
+      def set_font font, size = nil
+        @font = font
+        font_size size if size
+      end
+
       def resolve_font_style styles
         if styles.include? :bold
           (styles.include? :italic) ? :bold_italic : :bold
@@ -1121,6 +1123,10 @@ 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.
       #
+      # The block passed to dry run should take steps to avoid leaving the document state modified.
+      # This can be done by calling `push_scratch doc` at the start of the block and `pop_scratch`
+      # in the ensure clause of the block.
+      #
       # 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).
@@ -1133,7 +1139,7 @@ module Asciidoctor
       #
       # 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
-        (scratch_pdf = scratch).start_new_page layout: page.layout
+        (scratch_pdf = scratch).start_new_page layout: page.layout, margin: page_margin
         saved_bounds = scratch_pdf.bounds
         scratch_pdf.bounds = bounds.dup.tap do |bounds_copy|
           bounds_copy.instance_variable_set :@document, scratch_pdf

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.1.5'
+    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.1.5
+  version: 2.3.0
 platform: ruby
 authors:
 - Dan Allen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-10 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