asciidoctor-pdf 1.5.2 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e90846d73d8139ce9e156f4010b8cd4220d9aa318897ec94dcac52ca2b027c61
-  data.tar.gz: b519c77487cb7c7b317244342dcb06b40241d511016f6289e3a31b8305798225
+  metadata.gz: 71d676b5bc2fd2364a3e888aebe586cdb2d85ee259b23031409b5c919cd78ce3
+  data.tar.gz: 638470c38ac1fe4a7445c118c33c08768b6cfbee54f2435ba65158ee9423f9ee
 SHA512:
-  metadata.gz: 836351139245d4460ea72c91889276e86484b1f587681ada048ccfa8d0716b7bfb595f28de0862e24556faec53a1b412a5d5f65cf2236b7579523dfd785dd1a6
-  data.tar.gz: ae3ca4fbc60ab2f8b0eefab691c8c08dfc2e39f20a2950516a8f2c4d6f9a09420f3b702b063d160592d389d390834148ef14ad173b4b31a8432995b926c27b14
+  metadata.gz: 756f331bf5b74742739977ef159aa138743629a0fc91159767bb70994d7b939238bef3df1b2b05b8c58ed0ee837cdcd4153b531d132cd0ad31dc9b8e39ffc2e5
+  data.tar.gz: 34b9adfc79269f7936cb941056cda2303ec7e8e49f5c53772b3c92723b4d03ecace31ad9a5912e737b5c8fd84e855420b8169bf9d35500079df995e1de64b85d

data/CHANGELOG.adoc

@@ -5,6 +5,15 @@
 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 {uri-repo}/commits/master[commit history] on GitHub.
 
+== 1.5.3 (2020-02-28) - @mojavelinux
+
+Bug Fixes::
+
+* do not hyphen a hyphen when hyphenation is enabled (#1562)
+* fix crash when applying text transform to heading cell in table body (#1575)
+* honor font style when looking for glyph in font
+* only suggest installing prawn-gmagick gem if not loaded (#1578)
+
 == 1.5.2 (2020-02-21) - @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]>
-v1.5.2, 2020-02-21
+v1.5.3, 2020-02-28
 // Settings:
 :experimental:
 :idprefix:
@@ -23,7 +23,7 @@ endif::[]
 :project-name: Asciidoctor PDF
 :project-handle: asciidoctor-pdf
 // Variables:
-:release-version: 1.5.2
+:release-version: 1.5.3
 // URIs:
 :url-asciidoctor: http://asciidoctor.org
 :url-gem: http://rubygems.org/gems/asciidoctor-pdf

data/lib/asciidoctor/pdf/converter.rb

@@ -1527,7 +1527,7 @@ module Asciidoctor
           layout_caption node, category: :image, side: :bottom, block_align: alignment, block_width: rendered_w, max_width: @theme.image_caption_max_width if node.title?
           theme_margin :block, :bottom unless pinned
         rescue
-          on_image_error :exception, node, target, (opts.merge message: %(could not embed image: #{image_path}; #{$!.message}#{::Prawn::Errors::UnsupportedImageType === $! ? '; install prawn-gmagick gem to add support' : ''}))
+          on_image_error :exception, node, target, (opts.merge message: %(could not embed image: #{image_path}; #{$!.message}#{::Prawn::Errors::UnsupportedImageType === $! && !(defined? ::GMagick::Image) ? '; install prawn-gmagick gem to add support' : ''}))
         end
       end
 
@@ -2040,7 +2040,7 @@ module Asciidoctor
               end
               unless cell_data.key? :content
                 cell_text = cell.text.strip
-                cell_text = transform_text cell_text if cell_transform
+                cell_text = transform_text cell_text, cell_transform if cell_transform
                 cell_text = hyphenate_text cell_text, @hyphenator if defined? @hyphenator
                 cell_text = cell_text.gsub CjkLineBreakRx, ZeroWidthSpace if @cjk_line_breaks
                 if cell_text.include? LF

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

@@ -17,9 +17,32 @@ Prawn::Text::Formatted::Box.prepend (Module.new do
     end
   end
 
-  def find_font_for_this_glyph char, current_font, fallback_fonts_to_check, original_font = current_font
-    (doc = @document).font current_font
-    if fallback_fonts_to_check.empty?
+  def analyze_glyphs_for_fallback_font_support fragment_hash
+    fragment_font = fragment_hash[:font] || (original_font = @document.font.family)
+    if (fragment_font_styles = fragment_hash[:styles])
+      if fragment_font_styles.include? :bold
+        fragment_font_opts = { style: (fragment_font_styles.include? :italic) ? :bold_italic : :bold }
+      elsif fragment_font_styles.include? :italic
+        fragment_font_opts = { style: :italic }
+      end
+    end
+    fallback_fonts = @fallback_fonts.dup
+    font_glyph_pairs = []
+    @document.save_font do
+      fragment_hash[:text].each_char do |char|
+        font_glyph_pairs << [(find_font_for_this_glyph char, fragment_font, fragment_font_opts || {}, fallback_fonts.dup), char]
+      end
+    end
+    # NOTE: don't add a :font to fragment if it wasn't there originally
+    font_glyph_pairs.each {|pair| pair[0] = nil if pair[0] == original_font } if original_font
+    form_fragments_from_like_font_glyph_pairs font_glyph_pairs, fragment_hash
+  end
+
+  def find_font_for_this_glyph char, current_font, current_font_opts = {}, fallback_fonts_to_check = [], original_font = current_font
+    (doc = @document).font current_font, current_font_opts
+    if doc.font.glyph_present? char
+      current_font
+    elsif fallback_fonts_to_check.empty?
       if logger.info? && !doc.scratch?
         fonts_checked = @fallback_fonts.dup.unshift original_font
         missing_chars = (doc.instance_variable_defined? :@missing_chars) ?
@@ -30,11 +53,9 @@ Prawn::Text::Formatted::Box.prepend (Module.new do
           previous_fonts_checked << fonts_checked
         end
       end
-      current_font
-    elsif doc.font.glyph_present? char
-      current_font
+      original_font
     else
-      find_font_for_this_glyph char, fallback_fonts_to_check.shift, fallback_fonts_to_check, original_font
+      find_font_for_this_glyph char, fallback_fonts_to_check.shift, current_font_opts, fallback_fonts_to_check, original_font
     end
   end
 

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

@@ -115,7 +115,7 @@ module Asciidoctor::PDF::FormattedText
           fragment[:image_width] = fragment[:width] = image_w
           fragment[:image_height] = image_h
         rescue
-          logger.warn %(could not embed image: #{image_path}; #{$!.message}#{::Prawn::Errors::UnsupportedImageType === $! ? '; install prawn-gmagick gem to add support' : ''}) unless scratch
+          logger.warn %(could not embed image: #{image_path}; #{$!.message}#{::Prawn::Errors::UnsupportedImageType === $! && !(defined? ::GMagick::Image) ? '; install prawn-gmagick gem to add support' : ''}) unless scratch
           drop = true # delegate to cleanup logic in ensure block
         ensure
           # NOTE skip rendering image in scratch document or if image can't be loaded

data/lib/asciidoctor/pdf/text_transformer.rb

@@ -17,7 +17,9 @@ module Asciidoctor
       PCDATAFilterRx = /(&#?[a-z\d]+;|<[^>]+>)|([^&<]+)/
       TagFilterRx = /(<[^>]+>)|([^<]+)/
       WordRx = /\S+/
+      Hyphen = '-'
       SoftHyphen = ?\u00ad
+      HyphenatedHyphen = '-' + SoftHyphen
 
       def capitalize_words_pcdata string
         if XMLMarkupRx.match? string
@@ -40,7 +42,7 @@ module Asciidoctor
       end
 
       def hyphenate_words string, hyphenator
-        string.gsub(WordRx) { hyphenator.visualize $&, SoftHyphen }
+        string.gsub(WordRx) { (hyphenator.visualize $&, SoftHyphen).gsub HyphenatedHyphen, Hyphen }
       end
 
       def lowercase_pcdata string

data/lib/asciidoctor/pdf/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-pdf
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.3
 platform: ruby
 authors:
 - Dan Allen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-21 00:00:00.000000000 Z
+date: 2020-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor