asciidoctor-pdf 1.5.3 → 1.6.2

data/lib/asciidoctor/pdf/ext/pdf-core.rb

@@ -1,4 +1,21 @@
 # frozen_string_literal: true
 
+module PDF::Core
+  class << self
+    alias _initial_real real
+
+    # NOTE Makes v1.6.x work with the modified precision settings (0.5f) in Prawn 2.4 while preserving existing behavior
+    def real num, precision = 4
+      ("%.#{precision}f" % num).sub(/((?<!\.)0)+\z/, '')
+    end
+
+    alias _initial_real_params real_params
+    def real_params array
+      return array.map {|e| real e, 5 }.join(' ') if (caller_locations 1, 1)[0].base_label == 'transformation_matrix'
+      _initial_real_params array
+    end
+  end
+end
+
 require_relative 'pdf-core/pdf_object'
 require_relative 'pdf-core/page'

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

@@ -5,21 +5,12 @@
 # This file was copied from Prawn (manual/syntax_highlight.rb) and
 # modified for use with Asciidoctor PDF.
 #
-# Prawn is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Prawn is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Prawn. If not, see <http://www.gnu.org/licenses/>.
+# Since the file originates from the Prawn project, it shares the Prawn
+# license. Thus, the file may be used under Matz's original licensing terms for
+# Ruby, the GPLv2 license, or the GPLv3 license.
 #
 # Copyright (C) Felipe Doria
-# Copyright (C) 2014 OpenDevise Inc. and the Asciidoctor Project
+# Copyright (C) 2014-present OpenDevise Inc. and the Asciidoctor Project
 #
 ######################################################################
 

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

@@ -76,6 +76,27 @@ module Asciidoctor
         reference_bounds.height
       end
 
+      # workaround for https://github.com/prawnpdf/prawn/issues/1121
+      def generate_margin_box
+        page_w, page_h = (page = state.page).dimensions.slice 2, 2
+        page_m = page.margins
+        prev_margin_box, @margin_box = @margin_box, (::Prawn::Document::BoundingBox.new self, nil, [page_m[:left], page_h - page_m[:top]], width: page_w - page_m[:left] - page_m[:right], height: page_h - page_m[:top] - page_m[:bottom])
+
+        # update bounding box if not flowing from the previous page
+        unless @bounding_box&.parent
+          prev_margin_box = @bounding_box
+          @bounding_box = @margin_box
+        end
+
+        # maintains indentation settings across page breaks
+        if prev_margin_box
+          @margin_box.add_left_padding prev_margin_box.total_left_padding
+          @margin_box.add_right_padding prev_margin_box.total_right_padding
+        end
+
+        nil
+      end
+
       # Set the margins for the current page.
       #
       def set_page_margin margin
@@ -190,7 +211,7 @@ module Asciidoctor
       #  }
       #
       def register_font data
-        font_families.update data.each_with_object({}) {|(key, val), accum| accum[key.to_s] = val }
+        font_families.update data.transform_keys(&:to_s)
       end
 
       # Enhances the built-in font method to allow the font
@@ -553,7 +574,7 @@ module Asciidoctor
 
       # TODO: memoize the result
       def inflate_padding padding
-        padding = [*(padding || 0)].slice 0, 4
+        padding = (Array padding || 0).slice 0, 4
         case padding.size
         when 1
           [padding[0], padding[0], padding[0], padding[0]]
@@ -882,6 +903,11 @@ module Asciidoctor
         [(whole_pages * full_page_height + partial_page_height), whole_pages, partial_page_height]
       end
 
+      def with_dry_run &block
+        total_height, = dry_run(&block)
+        instance_exec total_height, &block
+      end
+
       # Attempt to keep the objects generated in the block on the same page
       #
       # TODO: short-circuit nested usage

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

@@ -6,4 +6,4 @@ class Prawn::FontMetricCache::CacheEntry
     font = font.hash
     super
   end
-end
+end if Prawn::FontMetricCache::CacheEntry.members == [:font, :options, :string]

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

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+Prawn::Text::Formatted::Arranger.prepend (Module.new do
+  def initialize *_args
+    super
+    @dummy_text = ?\u0000
+  end
+
+  def next_string
+    if (string = super) == @dummy_text
+      def string.lstrip!; end
+    end
+    string
+  end
+end)

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

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
 require 'prawn-svg' unless defined? Prawn::SVG::Interface
-require_relative 'prawn-svg/interface'
 # NOTE disable system fonts since they're non-portable
 Prawn::SVG::Interface.font_path.clear

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

@@ -4,6 +4,7 @@
 require_relative 'prawn/font_metric_cache'
 require_relative 'prawn/font/afm'
 require_relative 'prawn/images'
+require_relative 'prawn/formatted_text/arranger'
 require_relative 'prawn/formatted_text/box'
 require_relative 'prawn/formatted_text/fragment'
 require_relative 'prawn/extensions'

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

@@ -1,23 +1,21 @@
 # frozen_string_literal: true
 
-require 'pygments.rb'
-
 module Pygments
   module Ext
     module BlockStyles
       BlockSelectorRx = /^\.highlight *\{([^}]+?)\}/
       HighlightBackgroundColorRx = /^\.highlight +\.hll +{ *background(?:-color)?: *#([a-fA-F0-9]{6})/
-      HexColorRx = /^#[a-fA-F0-9]{6}$/
+      ColorPropertiesRx = /(?:^|;) *(background(?:-color)?|color): *#?([a-fA-F0-9]{6}) *(?=$|;)/
 
       @cache = ::Hash.new do |cache, key|
         styles = {}
         if BlockSelectorRx =~ (css = ::Pygments.css '.highlight', style: key)
-          ($1.strip.split ';').each do |style|
-            pname, pval = (style.split ':', 2).map(&:strip)
-            if pname == 'background' || pname == 'background-color'
-              styles[:background_color] = pval.slice 1, pval.length if HexColorRx.match? pval
-            elsif pname == 'color'
-              styles[:font_color] = pval.slice 1, pval.length if HexColorRx.match? pval
+          $1.scan ColorPropertiesRx do |pname, pval|
+            case pname
+            when 'background', 'background-color'
+              styles[:background_color] = pval
+            when 'color'
+              styles[:font_color] = pval
             end
           end
         end
@@ -26,6 +24,10 @@ module Pygments
         styles
       end
 
+      def self.available? style
+        (@available ||= ::Pygments.styles.to_set).include? style
+      end
+
       def self.for style
         @cache[style]
       end

data/lib/asciidoctor/pdf/ext.rb

@@ -6,4 +6,3 @@ require_relative 'ext/pdf-core'
 require_relative 'ext/prawn'
 require_relative 'ext/prawn-svg'
 require_relative 'ext/prawn-table'
-require_relative 'ext/prawn-templates'

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

@@ -2,7 +2,11 @@
 
 module Asciidoctor::PDF::FormattedText
   class FragmentPositionRenderer
-    attr_reader :top, :right, :bottom, :left, :page_number
+    attr_reader :top
+    attr_reader :right
+    attr_reader :bottom
+    attr_reader :left
+    attr_reader :page_number
 
     def render_behind fragment
       @top = fragment.top

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

@@ -39,8 +39,14 @@ module Asciidoctor::PDF::FormattedText
       scratch = doc.scratch?
       available_w = doc.bounds.width
       available_h = doc.page.empty? ? doc.cursor : doc.bounds.height
+      last_fragment = {}
       raw_image_fragments.each do |fragment|
-        drop = scratch
+        if fragment[:object_id] == last_fragment[:object_id]
+          fragments.delete fragment
+          next
+        else
+          drop = scratch
+        end
         begin
           image_path = fragment[:image_path]
 
@@ -125,6 +131,7 @@ module Asciidoctor::PDF::FormattedText
             # NOTE retain key to indicate we've visited fragment already
             fragment[:image_obj] = nil
           end
+          last_fragment = fragment
         end
       end
     end

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

@@ -172,9 +172,10 @@ module Asciidoctor
                   fragment = {
                     image_path: attributes[:src],
                     image_format: attributes[:format],
-                    # a zero-width space in the text will cause the image to be duplicated
-                    text: (attributes[:alt].delete ZeroWidthSpace),
+                    # NOTE: add enclosing square brackets here to avoid errors in parsing
+                    text: %([#{attributes[:alt].delete ZeroWidthSpace}]),
                     callback: [InlineImageRenderer],
+                    object_id: node.object_id, # used to deduplicate if fragment gets split up
                   }
                   if inherited && (link = inherited[:link])
                     fragment[:link] = link
@@ -379,9 +380,10 @@ module Asciidoctor
 
         def update_fragment fragment, props
           fragment.update props do |k, oval, nval|
-            if k == :styles
+            case k
+            when :styles
               nval ? (oval.merge nval) : oval.clear
-            elsif k == :callback
+            when :callback
               oval | nval
             else
               nval

data/lib/asciidoctor/pdf/index_catalog.rb

@@ -32,7 +32,7 @@ module Asciidoctor
 
       def store_primary_term name, dest = nil
         store_dest dest if dest
-        (init_category uppercase_mb name.chr).store_term name, dest
+        (init_category name.chr.upcase).store_term name, dest
       end
 
       def store_secondary_term primary_name, secondary_name, dest = nil

data/lib/asciidoctor/pdf/optimizer.rb

@@ -2,11 +2,35 @@
 
 require 'pathname'
 require 'rghost'
+require 'rghost/gs_alone'
 require 'tmpdir'
 
+RGhost::GSAlone.prepend (Module.new do
+  WindowsRx = /win|ming/
+
+  def initialize params, debug
+    (@params = params.dup).push(*(@params.pop.split File::PATH_SEPARATOR))
+    @debug = debug
+  end
+
+  def run
+    RGhost::Config.config_platform unless File.exist? RGhost::Config::GS[:path].to_s
+    (cmd = @params.slice 1, @params.length).unshift RGhost::Config::GS[:path].to_s
+    #puts cmd if @debug
+    system(*cmd)
+  end
+end)
+
+RGhost::Engine.prepend (Module.new do
+  def shellescape str
+    str
+  end
+end)
+
 module Asciidoctor
   module PDF
     class Optimizer
+      # see https://www.ghostscript.com/doc/current/VectorDevices.htm#PSPDF_IN for details
       (QUALITY_NAMES = {
         'default' => :default,
         'screen' => :screen,
@@ -15,27 +39,31 @@ module Asciidoctor
         'prepress' => :prepress,
       }).default = :default
 
+      attr_reader :quality
+      attr_reader :compatibility_level
+
       def initialize quality = 'default', compatibility_level = '1.4'
         @quality = QUALITY_NAMES[quality]
         @compatibility_level = compatibility_level
+        if (gs_path = ::ENV['GS'])
+          ::RGhost::Config::GS[:path] = gs_path
+        end
       end
 
-      def generate_file target
+      def optimize_file target
         ::Dir::Tmpname.create ['asciidoctor-pdf-', '.pdf'] do |tmpfile|
-          filename = Pathname.new target
-          filename_o = Pathname.new tmpfile
-          pdfmark = filename.sub_ext '.pdfmark'
-          inputs = pdfmark.file? ? [target, pdfmark.to_s] : target
+          filename_o = ::Pathname.new target
+          filename_tmp = ::Pathname.new tmpfile
+          if (pdfmark = filename_o.sub_ext '.pdfmark').file?
+            inputs = [target, pdfmark.to_s].join ::File::PATH_SEPARATOR
+          else
+            inputs = target
+          end
           (::RGhost::Convert.new inputs).to :pdf,
-              filename: filename_o.to_s,
+              filename: filename_tmp.to_s,
               quality: @quality,
               d: { Printed: false, CannotEmbedFontPolicy: '/Warning', CompatibilityLevel: @compatibility_level }
-          begin
-            filename_o.rename target
-          rescue ::Errno::EXDEV
-            filename.binwrite filename_o.binread
-            filename_o.unlink
-          end
+          filename_o.binwrite filename_tmp.binread
         end
         nil
       end

data/lib/asciidoctor/pdf/pdfmark.rb

@@ -18,7 +18,7 @@ module Asciidoctor
           creation_date = (::Time.parse doc.attr 'localdatetime') rescue (now || ::Time.now)
         end
         # FIXME: use sanitize: :plain_text once available
-        content = <<~EOS
+        <<~EOS
         [ /Title #{(sanitize doc.doctitle use_fallback: true).to_pdf_object}
           /Author #{(doc.attr 'authors').to_pdf_object}
           /Subject #{(doc.attr 'subject').to_pdf_object}
@@ -29,7 +29,6 @@ module Asciidoctor
           /Producer #{(doc.attr 'publisher').to_pdf_object}
           /DOCINFO pdfmark
         EOS
-        content
       end
 
       def generate_file pdf_file

data/lib/asciidoctor/pdf/text_transformer.rb

@@ -1,36 +1,26 @@
 # frozen_string_literal: true
 
-unless RUBY_VERSION >= '2.4'
-  begin
-    require 'unicode' unless defined? Unicode::VERSION
-  rescue LoadError
-    begin
-      require 'active_support/multibyte' unless defined? ActiveSupport::Multibyte
-    rescue LoadError; end
-  end
-end
-
 module Asciidoctor
   module PDF
     module TextTransformer
       XMLMarkupRx = /&#?[a-z\d]+;|</
       PCDATAFilterRx = /(&#?[a-z\d]+;|<[^>]+>)|([^&<]+)/
       TagFilterRx = /(<[^>]+>)|([^<]+)/
-      WordRx = /\S+/
+      ContiguousCharsRx = /\p{Graph}+/
+      WordRx = /\p{Word}+/
       Hyphen = '-'
       SoftHyphen = ?\u00ad
-      HyphenatedHyphen = '-' + SoftHyphen
 
       def capitalize_words_pcdata string
         if XMLMarkupRx.match? string
-          string.gsub(PCDATAFilterRx) { $2 ? (capitalize_words_mb $2) : $1 }
+          string.gsub(PCDATAFilterRx) { $2 ? (capitalize_words $2) : $1 }
         else
-          capitalize_words_mb string
+          capitalize_words string
         end
       end
 
-      def capitalize_words_mb string
-        string.gsub(WordRx) { capitalize_mb $& }
+      def capitalize_words string
+        string.gsub(ContiguousCharsRx) { $&.capitalize }
       end
 
       def hyphenate_words_pcdata string, hyphenator
@@ -42,74 +32,21 @@ module Asciidoctor
       end
 
       def hyphenate_words string, hyphenator
-        string.gsub(WordRx) { (hyphenator.visualize $&, SoftHyphen).gsub HyphenatedHyphen, Hyphen }
+        string.gsub(WordRx) { hyphenator.visualize $&, SoftHyphen }
       end
 
       def lowercase_pcdata string
         if string.include? '<'
-          string.gsub(TagFilterRx) { $2 ? (lowercase_mb $2) : $1 }
+          string.gsub(TagFilterRx) { $2 ? $2.downcase : $1 }
         else
-          lowercase_mb string
+          string.downcase
         end
       end
 
       def uppercase_pcdata string
         if XMLMarkupRx.match? string
-          string.gsub(PCDATAFilterRx) { $2 ? (uppercase_mb $2) : $1 }
+          string.gsub(PCDATAFilterRx) { $2 ? $2.upcase : $1 }
         else
-          uppercase_mb string
-        end
-      end
-
-      if RUBY_VERSION >= '2.4'
-        def capitalize_mb string
-          string.capitalize
-        end
-
-        def lowercase_mb string
-          string.downcase
-        end
-
-        def uppercase_mb string
-          string.upcase
-        end
-      # NOTE Unicode library is 4x as fast as ActiveSupport::MultiByte::Chars
-      elsif defined? ::Unicode
-        def capitalize_mb string
-          string.ascii_only? ? string.capitalize : (::Unicode.capitalize string)
-        end
-
-        def lowercase_mb string
-          string.ascii_only? ? string.downcase : (::Unicode.downcase string)
-        end
-
-        def uppercase_mb string
-          string.ascii_only? ? string.upcase : (::Unicode.upcase string)
-        end
-      elsif defined? ::ActiveSupport::Multibyte
-        MultibyteChars = ::ActiveSupport::Multibyte::Chars
-
-        def capitalize_mb string
-          string.ascii_only? ? string.capitalize : (MultibyteChars.new string).capitalize.to_s
-        end
-
-        def lowercase_mb string
-          string.ascii_only? ? string.downcase : (MultibyteChars.new string).downcase.to_s
-        end
-
-        def uppercase_mb string
-          string.ascii_only? ? string.upcase : (MultibyteChars.new string).upcase.to_s
-        end
-      else
-        def capitalize_mb string
-          string.capitalize
-        end
-
-        def lowercase_mb string
-          string.downcase
-        end
-
-        def uppercase_mb string
           string.upcase
         end
       end

data/lib/asciidoctor/pdf/theme_loader.rb

@@ -94,7 +94,7 @@ module Asciidoctor
         yaml_data = ::SafeYAML.load data, filename
         if ::Hash === yaml_data && (yaml_data.key? 'extends')
           if (extends = yaml_data.delete 'extends')
-            [*extends].each do |extend_path|
+            (Array extends).each do |extend_path|
               if extend_path == 'base'
                 theme_data = theme_data ? (::OpenStruct.new theme_data.to_h.merge load_base_theme.to_h) : load_base_theme
                 next

data/lib/asciidoctor/pdf/version.rb

@@ -2,7 +2,7 @@
 
 module Asciidoctor
   module PDF
-    VERSION = '1.5.3'
+    VERSION = '1.6.2'
   end
   Pdf = PDF unless const_defined? :Pdf, false
 end

data/lib/asciidoctor/pdf.rb

@@ -3,6 +3,9 @@
 require_relative 'pdf/version'
 require 'asciidoctor' unless defined? Asciidoctor.load
 require 'prawn'
+Prawn.send :remove_const, :FLOAT_PRECISION
+Prawn::FLOAT_PRECISION = 1e-3
+require 'prawn/templates'
 begin
   require 'prawn/gmagick'
 rescue LoadError