rbpdf 1.20.1 → 1.21.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 22e946db75367837ee71cc634ce52b97bef9428b
-  data.tar.gz: 5b32284cc5b1b9a226691dcb14898400eb7f9739
+SHA256:
+  metadata.gz: 7fe46482c5272d1a1e3c050c4c421648ba584ddf21225655fbce7f86309050e8
+  data.tar.gz: 504808a1ddc2e1b0720bd8d1b0ce2960ef598ae808ce1af6173502e537a0ce4a
 SHA512:
-  metadata.gz: 7180810606d801b53a8919fd0517156b96d128649ad690b7dddde93762ef2d289334f63ed1698ac5d679f688eb49923ee33b9da16202828327ce276ecac7c0ab
-  data.tar.gz: 0dcdd44e2e39bf9e153f2a45b521425f7dc75a1af8ecc4c2993c82caf591c09ce5e00e53b4bc69868c886bd04b0aefa8ec1f3461e8d3f776732e1ade0bca08f7
+  metadata.gz: 34cb1673c7bb205ff539e8f8f9bf7b2b90ef2e0dc0bf0cd5cbea47dff4d4cb6ac0287f74001fe5418506b53d8dac93aaa5438018ab015a308991b31916f19dbe
+  data.tar.gz: 667285f30d8d889877a63bf23e897ebd2f2e7929392eb48b135994ff678c331cfb90adae6682aaedbd2b798ef64e187ce4931d34182b32235cb3acf6101c21d8

data/CHANGELOG

@@ -1,3 +1,25 @@
+1.21.1 2023-03-20
+       - Changed version description of PDF PRODUCER. (#83)
+       - fix isValidCSSSelectorForTag method. (#82)
+       - Improved compatibility with ImageMagick 7.1.1-0 and later when using mini_magick. (#81)
+       - Fixed parsepng method to support transparent GIF and PNG tRNS transparency. (#80)
+       - ImageMagick7 support in RMagick 5.2.0. (#79)
+       - Add support WebP image. (#77)
+
+1.21.0 2023-02-13
+       - Support for Ruby 3.0.0, 3.1.0, 3.2.0. (Drop support for Ruby 2.2 and earlier.) (#66)
+       - Support Rails 6 and Rails 7. (Drop support for Rails 3.x, 4.x) (#66, #72)
+       - Fix RMagick 5.0 compatible. (#66)
+       - Infinite loop has been resolved. (#68, #74)
+       - Fixed a bug that caused the x position to shift when an <img> tag was behind a <li> tag in HTML. (#74)
+       - fix: Incorrect characters when copying out of a generated PDF with Unicode fonts. (#71)
+       - Suppresses output for Circle(), Ellipse(), PieSector(), and PieSectorXY() when the radius is 0. (#67)
+       - Don't change an object while iterating over it (#59) (by thegcat)
+       - fix : bidi bug (#56) (by ahorek)
+       - Avoid rdoc stack level too deep (SystemStackError) in gem install. (#76)
+       - PDF example output option OUTPUT=true added (#70)
+       - Make the image file path acquisition process extensible (#58) (by yui-har)
+
 1.20.1 2019-08-21
        - fix license warning. (by pavel)
        - Removed test resource from distribution target in gemspec.

data/README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/naitoh/rbpdf.svg?branch=master)](https://travis-ci.org/naitoh/rbpdf)
+[![Build Status](https://github.com/naitoh/rbpdf/workflows/test/badge.svg)](https://github.com/naitoh/rbpdf/actions)
 
 # RBPDF Template Plugin
 
@@ -16,7 +16,7 @@ A template plugin allowing the inclusion of ERB-enabled RBPDF template files.
 * CSS minimum support.
 * Image
  - 8bit PNG image support without MiniMagick/RMagick library.
- - PNG(with alpha channel)/JPEG/GIF image support. (use MiniMagick or RMagick library)
+ - PNG(with alpha channel)/JPEG/GIF/WebP image support. (use MiniMagick or RMagick library)
 
 
 ##
@@ -59,6 +59,16 @@ RBPDF Japanese Example of simple use in .html.erb:
 %><%==@pdf.output()%>
 ```
 
+PDF example output
+```
+$ OUTPUT=true bundle exec rake test TEST=test/rbpdf_examples_test.rb
+$ ls -1 *.pdf
+example001.pdf
+example002.pdf
+example003.pdf
+:
+```
+
 See the following files for sample of useage:
 
 test_unicode.rbpdf

data/lib/core/mini_magick.rb

@@ -1,3 +1,4 @@
+# coding: ASCII-8BIT
 # The MIT License
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -55,6 +56,7 @@ module Rbpdf
     width = image.width
     height = image.height
 
+    out['mime'] = image.mime_type
     out[0] = width
     out[1] = height
     
@@ -67,17 +69,19 @@ module Rbpdf
       out[2] = "JPEG"
     when "image/png"
       out[2] = "PNG"
-    when " 	image/vnd.wap.wbmp"
+    when "image/webp", "image/x-webp"
+      out[2] = "WEBP"
+      out['mime'] = "image/webp"
+    when "image/vnd.wap.wbmp"
       out[2] = "WBMP"
     when "image/x-xpixmap"
       out[2] = "XPM"
     end
     out[3] = "height=\"#{height}\" width=\"#{width}\""
-    out['mime'] = image.mime_type
     
     # This needs work to cover more situations
     # I can't see how to just list the number of channels with ImageMagick / mini_magick
-    case image["%[channels]"].downcase
+    case image["%[channels]"].downcase.split.first
     when 'cmyk'
       out['channels'] = 4
     when 'rgb', 'rgba', 'srgb', 'srgba'  # Mac OS X : sRGB

data/lib/core/rmagick.rb

@@ -1,3 +1,4 @@
+# coding: ASCII-8BIT
 # The MIT License
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -55,6 +56,7 @@ module Rbpdf
     
     width = image.columns
     height = image.rows
+    out['mime'] = image.mime_type
     out[0] = width
     out[1] = height
     
@@ -67,13 +69,15 @@ module Rbpdf
       out[2] = "JPEG"
     when "image/png"
       out[2] = "PNG"
-    when " 	image/vnd.wap.wbmp"
+    when "image/webp", "image/x-webp"
+      out[2] = "WEBP"
+      out['mime'] = "image/webp"
+    when "image/vnd.wap.wbmp"
       out[2] = "WBMP"
     when "image/x-xpixmap"
       out[2] = "XPM"
     end
     out[3] = "height=\"#{height}\" width=\"#{width}\""
-    out['mime'] = image.mime_type
     
     # This needs work to cover more situations
     # I can't see how to just list the number of channels with ImageMagick / rmagick

data/lib/rbpdf/version.rb

@@ -1,7 +1,7 @@
-# Copyright (c) 2011-2019 NAITOH Jun
+# Copyright (c) 2011-2023 NAITOH Jun
 # Released under the MIT license
 # http://www.opensource.org/licenses/MIT
 
 module Rbpdf
-  VERSION = "1.20.1"
+  VERSION = "1.21.1"
 end

data/lib/rbpdf.rb

@@ -49,7 +49,7 @@
 require "rbpdf/version"
 
 require 'htmlentities'
-require 'rbpdf-font' 
+require 'rbpdf-font'
 require 'erb'
 
 begin
@@ -89,7 +89,7 @@ require 'net/http'
 #
 
 
-PDF_PRODUCER = 'RBPDF 5.2.000'
+PDF_PRODUCER = "RBPDF #{Rbpdf::VERSION}"
 
 # == This is a Ruby class for generating PDF files on-the-fly without requiring external extensions.
 # * This class is a Ruby port of the TCPDF class by Nicola Asuni (http://www.tcpdf.org).
@@ -4790,7 +4790,7 @@ class RBPDF
   # * explicit width and height (expressed in user unit)
   # * one explicit dimension, the other being calculated automatically in order to keep the original proportions
   # * no explicit dimension, in which case the image is put at 72 dpi
-  # Supported formats are PNG images whitout RMagick/MiniMagick library and JPEG and GIF images supported by RMagick/MiniMagick.
+  # Supported formats are PNG images whitout RMagick/MiniMagick library and JPEG and GIF and WebP images supported by RMagick/MiniMagick.
   # For JPEG, all flavors are allowed:
   # * gray scales
   # * true colors (24 bits)
@@ -4808,7 +4808,7 @@ class RBPDF
   # [@param float :y] Ordinate of the upper-left corner.
   # [@param float :w] Width of the image in the page. If not specified or equal to zero, it is automatically calculated.
   # [@param float :h] Height of the image in the page. If not specified or equal to zero, it is automatically calculated.
-  # [@param string :type] Image format. Possible values are (case insensitive): JPG, JPEG, PNG. If not specified, the type is inferred from the file extension.
+  # [@param string :type] Image format. Possible values are (case insensitive): JPG, JPEG, PNG, GIF, WebP. If not specified, the type is inferred from the file extension.
   # [@param mixed :link] URL or identifier returned by AddLink().
   # [@param string :align]
   #   Indicates the alignment of the pointer next to image insertion relative to image height. The value can be:
@@ -4974,12 +4974,19 @@ class RBPDF
 
       info = false
       if !resize
-        if (type == 'jpeg')
+        case type
+        when 'jpeg'
           info=parsejpeg(file)
-        elsif (type == 'png')
-          info=parsepng(file);
-        elsif (type == 'gif')
-          tmpFile = imageToPNG(file)
+        when 'png'
+          info=parsepng(file)
+        when 'webp'
+          tmpFile = imageToPNG(file, false)
+          if tmpFile != false
+            info=parsepng(tmpFile.path)
+            tmpFile.close(true)
+          end
+        when 'gif'
+          tmpFile = imageToPNG(file, false)
           if tmpFile != false
             info=parsepng(tmpFile.path)
             tmpFile.close(true)
@@ -4992,6 +4999,7 @@ class RBPDF
           end
           info=send(mtd, file);
         end
+
         if info == 'pngalpha' and ismask == false and (Object.const_defined?(:MiniMagick) or Object.const_defined?(:Magick))
           info = ImagePngAlpha(file, x, y, w, h, 'PNG', link, align, resize, dpi, palign)
           if false != info
@@ -5030,7 +5038,7 @@ class RBPDF
           tmpname = Tempfile.new(File::basename(file), @@k_path_cache)
           tmpname.binmode
           jpeg_quality = @jpeg_quality
-          tmpname.print img.to_blob { self.quality = jpeg_quality }
+          tmpname.print img.to_blob { |image| image.quality = jpeg_quality }
         else
           return false
         end
@@ -5156,29 +5164,38 @@ class RBPDF
   end
   protected :parsejpeg
 
-  def imageToPNG(file)
+  def imageToPNG(file, delete_alpha=true)
     if Object.const_defined?(:MiniMagick)
       # MiniMagick library
 
       img = MiniMagick::Image.open(file)
-      img.format 'png' # convert to PNG from gif
-      if ['rgba', 'srgba', 'graya'].include?(img["%[channels]"].downcase)
-        img.combine_options do |mogrify|
-            mogrify.alpha 'off'
-        end
-        if ['rgba', 'srgba', 'graya'].include?(img["%[channels]"].downcase)
-          return false
+      img.format 'png'
+      if delete_alpha
+        if ['rgba', 'srgba', 'graya'].include?(img["%[channels]"].downcase.split.first)
+          img.combine_options do |mogrify|
+              mogrify.alpha 'off'
+          end
+          if ['rgba', 'srgba', 'graya'].include?(img["%[channels]"].downcase.split.first)
+            return false
+          end
         end
       end
     elsif Object.const_defined?(:Magick)
       # RMagick library
 
       img = Magick::ImageList.new(file)
-      img.format = 'PNG'       # convert to PNG from gif
-      if img.alpha?
-        img.alpha Magick::DeactivateAlphaChannel   # PNG alpha channel delete
+      img.format = 'png'
+      if delete_alpha
         if img.alpha?
-          return false
+          # PNG alpha channel delete
+          if Magick.const_defined?(:OffAlphaChannel) # RMagick 5.2.0 and later
+            img.alpha Magick::OffAlphaChannel
+          else # RMagick 5.1.0 and before for ImageMagick 6.x
+            img.alpha Magick::DeactivateAlphaChannel
+          end
+          if img.alpha?
+            return false
+          end
         end
       end
     else
@@ -5199,45 +5216,45 @@ class RBPDF
   # [@access protected]
   #
   def parsepng(file)
-    f=open(file,'rb');
-    #Check signature
-    if (f.read(8)!=137.chr + 'PNG' + 13.chr + 10.chr + 26.chr + 10.chr)
-      Error('Not a PNG file: ' + file);
-    end
-    #Read header chunk
-    f.read(4);
-    if (f.read(4)!='IHDR')
-      Error('Incorrect PNG file: ' + file);
-    end
-    w=freadint(f);
-    h=freadint(f);
-    bpc=f.read(1).unpack('C')[0]
-
-    ct=f.read(1).unpack('C')[0]
-    if (ct==0)
-      colspace='DeviceGray';
-    elsif (ct==2)
-      colspace='DeviceRGB';
-    elsif (ct==3)
-      colspace='Indexed';
+    f = open(file,'rb')
+    # Check signature
+    if f.read(8) != 137.chr + 'PNG' + 13.chr + 10.chr + 26.chr + 10.chr
+      Error('Not a PNG file: ' + file)
+    end
+    # Read header chunk
+    f.read(4)
+    if f.read(4) != 'IHDR'
+      Error('Incorrect PNG file: ' + file)
+    end
+    w = freadint(f)
+    h = freadint(f)
+    bpc = f.read(1).unpack('C')[0]
+    ct = f.read(1).unpack('C')[0]
+    case ct
+    when 0
+      colspace = 'DeviceGray'
+    when 2
+      colspace = 'DeviceRGB'
+    when 3
+      colspace = 'Indexed'
     else
       if Object.const_defined?(:MiniMagick) or Object.const_defined?(:Magick)
         # alpha channel
         return 'pngalpha'
       else
-        Error('No RMagick/MiniMagick : Alpha channel not supported: ' + file);
+        Error('No RMagick/MiniMagick : Alpha channel not supported: ' + file)
       end
     end
-    if (f.read(1).unpack('C')[0] != 0)
+    if f.read(1).unpack('C')[0] != 0
       # Error('Unknown compression method: ' + file)
       return false
     end
-    if (f.read(1).unpack('C')[0]!=0)
+    if f.read(1).unpack('C')[0] != 0
       # Error('Unknown filter method: ' + file)
       return false
     end
 
-    if (bpc>8)
+    if bpc > 8
       if Object.const_defined?(:MiniMagick) or Object.const_defined?(:Magick)
         return false
       else
@@ -5245,48 +5262,50 @@ class RBPDF
       end
     end
 
-    if (f.read(1).unpack('C')[0]!=0)
+    if f.read(1).unpack('C')[0] != 0
       # Error('Interlacing not supported: ' + file)
       return false
     end
-    f.read(4);
-    parms='/DecodeParms <</Predictor 15 /Colors ' + (ct==2 ? 3 : 1).to_s + ' /BitsPerComponent ' + bpc.to_s + ' /Columns ' + w.to_s + '>>';
-    #Scan chunks looking for palette, transparency and image data
-    pal='';
-    trns='';
-    data='';
+    f.read(4)
+    parms='/DecodeParms <</Predictor 15 /Colors ' + (ct == 2 ? 3 : 1).to_s + ' /BitsPerComponent ' + bpc.to_s + ' /Columns ' + w.to_s + '>>'
+    # Scan chunks looking for palette, transparency and image data
+    pal = ''
+    trns = ''
+    data = ''
     begin
-      n=freadint(f);
-      type=f.read(4);
-      if (type=='PLTE')
-        #Read palette
-        pal=f.read( n);
-        f.read(4);
-      elsif (type=='tRNS')
-        #Read transparency info
-        t=f.read( n);
-        if (ct==0)
-          trns = t[1].unpack('C')[0]
-        elsif (ct==2)
-          trns = t[[1].unpack('C')[0], t[3].unpack('C')[0], t[5].unpack('C')[0]]
-        else
-          pos=t.include?(0.chr);
-          if (pos!=false)
-            trns = ['1']
-          end
-        end
-        f.read(4);
-      elsif (type=='IDAT')
-        #Read image data block
-        data<<f.read( n);
-        f.read(4);
-      elsif (type=='IEND')
-        break;
+      n = freadint(f)
+      type = f.read(4)
+      case type
+      when 'PLTE'
+        # Read palette
+        pal = f.read(n)
+        f.read(4)
+      when 'tRNS'
+        # Read transparency info
+        t = f.read(n)
+        case ct
+        when 0 # DeviceGray
+          trns = [t[1].unpack('C')[0]]
+        when 2 # DeviceRGB
+          trns = [t[1].unpack('C')[0], t[3].unpack('C')[0], t[5].unpack('C')[0]]
+        else # Indexed
+          trns = []
+          n.times do |i|
+            trns << t[i].unpack('C')[0]
+          end
+        end
+        f.read(4)
+      when 'IDAT'
+        # Read image data block
+        data << f.read(n)
+        f.read(4)
+      when 'IEND'
+        break
       else
-        f.read( n+4);
+        f.read(n + 4)
       end
     end while(n)
-    if (colspace=='Indexed' and pal.empty?)
+    if (colspace == 'Indexed' and pal.empty?)
       # Error('Missing palette in ' + file)
       return false
     end
@@ -5302,7 +5321,7 @@ class RBPDF
 
       img = MiniMagick::Image.open(file)
       img.format('png')
-      if ['rgba', 'srgba', 'graya'].include?(img["%[channels]"].downcase)
+      if ['rgba', 'srgba', 'graya'].include?(img["%[channels]"].downcase.split.first)
         img.combine_options do |mogrify|
           mogrify.channel 'matte'
           mogrify.separate '+matte'
@@ -5314,6 +5333,7 @@ class RBPDF
       # RMagick library
 
       img = Magick::ImageList.new(file)
+      img.format = 'png'
       if img.alpha?
         img.alpha Magick::ExtractAlphaChannel   # PNG alpha channel Mask
       else
@@ -5333,13 +5353,13 @@ class RBPDF
   protected :image_alpha_mask
 
   #
-  # Extract info from a PNG image with alpha channel using the GD library.
+  # Extract info from a PNG image with alpha channel using the RMagick/MiniMagick library.
   # [@param string :file] Name of the file containing the image.
   # [@param float :x] Abscissa of the upper-left corner.
   # [@param float :y] Ordinate of the upper-left corner.
   # [@param float :w] Width of the image in the page. If not specified or equal to zero, it is automatically calculated.
   # [@param float :h] Height of the image in the page. If not specified or equal to zero, it is automatically calculated.
-  # [@param string :type] Image format. Possible values are (case insensitive): JPEG and PNG (whitout GD library) and all images supported by GD: GD, GD2, GD2PART, GIF, JPEG, PNG, BMP, XBM, XPM;. If not specified, the type is inferred from the file extension.
+  # [@param string :type] Possible values are (case insensitive): JPEG and PNG (without RMagick/MiniMagick library) and PNG(with alpha channel) and JPEG and GIF and WebP supported by RMagick/MiniMagick. If not specified, the type is inferred from the file extension.
   # [@param mixed :link] URL or identifier returned by AddLink().
   # [@param string :align]
   #   Indicates the alignment of the pointer next to image insertion relative to image height. The value can be:
@@ -5347,7 +5367,7 @@ class RBPDF
   #   * M: middle-right for LTR or middle-left for RTL
   #   * B: bottom-right for LTR or bottom-left for RTL
   #   * N: next line
-  # [@param boolean :resize] If true resize (reduce) the image to fit :w and :h (requires GD library).
+  # [@param boolean :resize] If true resize (reduce) the image to fit :w and :h (requires RMagick/MiniMagick library).
   # [@param int :dpi] dot-per-inch resolution used on resize
   # [@param string :palign]
   #   Allows to center or align the image on the current line. Possible values are:
@@ -6796,9 +6816,12 @@ protected
     # sort glyphs by key
     #ksort(subsetglyphs)
     # add composite glyps to subsetglyphs and remove missing glyphs
+    subsetglyphs_tmp = []
     subsetglyphs.each_with_index {|val, key|
       next if val.nil?
+
       if indexToLoc[key]
+        subsetglyphs_tmp[key] = val
         offset = table['glyf']['offset'] + indexToLoc[key]
         numberOfContours = getSHORT(font, offset); offset += 2
         if numberOfContours < 0  # composite glyph
@@ -6808,7 +6831,7 @@ protected
             glyphIndex = getUSHORT(font, offset); offset += 2
             if subsetglyphs[glyphIndex].nil? and indexToLoc[glyphIndex]
               # add missing glyphs
-              subsetglyphs[glyphIndex] = true
+              subsetglyphs_tmp[glyphIndex] = true
             end
             # skip some bytes by case
             if (flags & 1) != 0
@@ -6827,10 +6850,10 @@ protected
             break if (flags & 32) == 0
           }
         end
-      else
-        subsetglyphs.delete_at(key)
       end
     }
+    subsetglyphs = subsetglyphs_tmp
+
     # build new glyf table with only used glyphs
     glyf = ''
     glyfSize = 0
@@ -7241,11 +7264,19 @@ protected
     out << ' /BaseFont /' + fontname + ''
     out << ' /Name /F' + font['i'].to_s
     out << ' /Encoding /' + font['enc']
-    out << ' /DescendantFonts [' + (@n + 1).to_s + ' 0 R]'
+    out << " /ToUnicode #{@n + 1} 0 R"
+    out << " /DescendantFonts [#{@n + 2} 0 R]"
     out << ' >>'
     out << ' endobj'
     out(out)
 
+    # ToUnicode Object
+    newobj()
+    filter = @compress ? '/Filter /FlateDecode ' : ''
+    stream = @compress ? Zlib::Deflate.deflate(@@cmap_identity_h) : @@cmap_identity_h
+    stream = getrawstream(stream)
+    out("<<#{filter}/Length #{stream.length}>> stream\n#{stream}\nendstream\nendobj")
+
     # CIDFontType2
     # A CIDFont whose glyph descriptions are based on TrueType font technology
     newobj();
@@ -7435,7 +7466,7 @@ protected
         trns='';
         count_info = info['trns'].length
         count_info.times do |i|
-          trns << info['trns'][i] + ' ' + info['trns'][i] + ' ';
+          trns << info['trns'][i].to_s + ' ' + info['trns'][i].to_s + ' '
         end
         out << ' /Mask [' + trns + ']'
       end
@@ -8076,18 +8107,27 @@ protected
   end
 
   #
-  # Format output stream
+  # get raw output stream.
   # @param string :s string to output.
   # @param int :n object reference for encryption mode
   # @access protected
   #
-  def getstream(s, n=0)
+  def getrawstream(s, n=0)
     if n <= 0
       # default to current object
       n = @n
     end
-    s = encrypt_data(n, s)
-    return "stream\n" + s + "\nendstream"
+    encrypt_data(n, s)
+  end
+
+  #
+  # Format output stream
+  # @param string :s string to output.
+  # @param int :n object reference for encryption mode
+  # @access protected
+  #
+  def getstream(s, n=0)
+    "stream\n" + getrawstream(s, n=0) + "\nendstream"
   end
 
   #
@@ -8855,7 +8895,7 @@ public
       dash = style['dash']
       dash_string = ''
       if dash != 0 and dash != ''
-        if dash =~ /^.+,/
+        if dash.is_a?(String) && dash =~ /^.+,/
           tab = dash.split(',')
         else
           tab = [dash]
@@ -9131,6 +9171,8 @@ public
   # [@since 4.9.019 (2010-04-26)]
   #
   def outellipticalarc(xc, yc, rx, ry, xang=0, angs=0, angf=360, pie=false, nc=2)
+    return if rx == 0 && ry == 0
+
     k = @k
     if nc < 2
       nc = 2
@@ -9768,7 +9810,7 @@ public
         end
       when @@k_pdf
         # X7. With each PDF, determine the matching embedding or override code. If there was a valid matching code, restore (pop) the last remembered (pushed) embedding level and directional override.
-        if remember.length
+        unless remember.empty?
           last = remember.length - 1
           case remember[last][:num]
           when @@k_rle, @@k_lre, @@k_rlo, @@k_lro
@@ -10176,12 +10218,7 @@ public
         end
       end
       # remove marked characters
-      chardata2.each_with_index do |value, key|
-        if value[:char] == false
-          chardata2.delete_at(key)
-        end
-      end
-      chardata = chardata2
+      chardata = chardata2.reject {|value| value[:char] == false }
       numchars = chardata.size
       chardata2 = nil
       arabicarr = nil
@@ -11024,16 +11061,20 @@ protected
       cssblocks[key] = block.split('{')
     }
     # split groups of selectors (comma-separated list of selectors)
+    cssblocks_tmp = []
     cssblocks.each_with_index { |block, key|
       # index 0 contains the CSS selector, index 1 contains CSS properties
       if block[0].index(',')
         selectors = block[0].split(',')
         selectors.each {|sel|
-          cssblocks.push [sel.strip, block[1]]
+          cssblocks_tmp.push [sel.strip, block[1]]
         }
-        cssblocks.delete_at(key)
+      else
+        cssblocks_tmp.push [block[0], block[1]]
       end
     }
+    cssblocks = cssblocks_tmp
+
     # covert array to selector => properties
     cssdata = {}
     cssblocks.each { |block|
@@ -11081,7 +11122,7 @@ protected
     operator = ''
     lasttag = ''
     attrib = ''
-    while selector_offset = selector.index(/([\>\+\~\s]{1})([a-zA-Z0-9\*]+)([^\>\+\~\s]*)/mi, selector_offset)
+    while selector_offset = selector.index(/([\>\+\~\s]{1})([a-zA-Z0-9\*]+)([^\>\+\s]*)/mi, selector_offset)
       offset = selector_offset
       selector_offset += $&.length
       operator = $1
@@ -11101,18 +11142,19 @@ protected
           when '['  # attribute
             attrmatch = attrib.scan(/\[([a-zA-Z0-9]*)[\s]*([\~\^\$\*\|\=]*)[\s]*["]?([^"\]]*)["]?\]/i)
             if !attrmatch.empty?
-              att = attrmatch[0].downcase
-              val = attrmatch[2]
+              att = attrmatch[0][0].downcase
+              val = attrmatch[0][2]
+
               if dom[key]['attribute'][att]
-                case attrmatch[1]
+                case attrmatch[0][1]
                 when '='
                   valid = true  if dom[key]['attribute'][att] == val
                 when '~='
                   valid = true  if dom[key]['attribute'][att].split(' ').include?(val)
                 when '^='
-                  valid = true  if val == substr(dom[key]['attribute'][att], 0, val.length)
+                  valid = true  if val == dom[key]['attribute'][att][0, val.length]
                 when '$='
-                  valid = true  if val == substr(dom[key]['attribute'][att], -val.length)
+                  valid = true  if val == dom[key]['attribute'][att][-val.length..-1]
                 when '*='
                   valid = true  if dom[key]['attribute'][att].index(val) != nil
                 when '|='
@@ -11312,11 +11354,11 @@ protected
       while html_b =~ /<xre([^\>]*)>(.*?)\n(.*?)<\/pre>/mi
         # preserve newlines on <pre> tag
         html_b = html_b.gsub(/<xre([^\>]*)>(.*?)\n(.*?)<\/pre>/mi) do
-          if ($2 != '') and ($3 != '') 
+          if ($2 != '') and ($3 != '')
             "<xre#{$1}>#{$2}<br />#{$3}</pre>"
-          elsif ($2 == '') and ($3 != '') 
+          elsif ($2 == '') and ($3 != '')
             "<xre#{$1}>#{$3}</pre>"
-          elsif ($2 != '') and ($3 == '') 
+          elsif ($2 != '') and ($3 == '')
             "<xre#{$1}>#{$2}</pre>"
           else
             "<xre#{$1}></pre>"
@@ -12879,7 +12921,7 @@ public
             startlinepage = @page
           end
         end
-      elsif dom[key]['value'].strip.length > 0
+      elsif dom[key]['value'].length > 0
         # print list-item
         if !empty_string(@lispacer)
           SetFont(pfontname, pfontstyle, pfontsize)
@@ -12898,7 +12940,7 @@ public
           end
         end
         # text
-        @htmlvspace = 0
+        @htmlvspace = 0 unless dom[key]['value'].strip.length == 0
         if !@premode and isRTLTextDir()
           # reverse spaces order
           len1 = dom[key]['value'].length
@@ -13331,27 +13373,10 @@ public
         SetLeftMargin(@l_margin + @c_margin)
         SetRightMargin(@r_margin + @c_margin)
 
-        begin
-          if tag['attribute']['src'] =~ /^http/
-            tmpFile = get_image_file(tag['attribute']['src'])
-            img_file = tmpFile.path
-          else
-            img_file = tag['attribute']['src']
-          end
-#        if (type == 'eps') or (type == 'ai')
-#          ImageEps(img_file, xpos, @y, iw, ih, imglink, true, align, '', border, true)
-#        elsif type == 'svg'
-#          ImageSVG(img_file, xpos, @y, iw, ih, imglink, align, '', border, true)
-#        else
-          result_img = Image(img_file, xpos, @y, iw, ih, '', imglink, align, false, 300, '', false, false, border, false, false, true)
-#        end
-        rescue => err
-          logger.error "pdf: Image: error: #{err.message}"
-          result_img = false
-        ensure
-          # remove temp files
-          tmpFile.close(true) unless tmpFile.nil?
-        end
+        result_img =
+          proc_image_file(tag['attribute']['src']) do |img_file|
+            Image(img_file, xpos, @y, iw, ih, '', imglink, align, false, 300, '', false, false, border, false, false, true)
+          end
 
         if result_img or ih != 0
           case align
@@ -13487,6 +13512,25 @@ public
   end
   protected :openHTMLTagHandler
 
+  def proc_image_file(src, &block)
+    tmpFile = nil
+    img_file =
+      if src =~ /^http/
+        tmpFile = get_image_file(src)
+        tmpFile.path
+      else
+        src
+      end
+    yield img_file
+  rescue => err
+    logger.error "pdf: Image: error: #{err.message}"
+    false
+  ensure
+    # remove temp files
+    tmpFile.close(true) if tmpFile
+  end
+  private :proc_image_file
+
   #
   # Process closing tags.
   # [@param array :dom] html dom array

data/lib/unicode_data.rb

@@ -18326,6 +18326,35 @@ module Unicode_data
 382=>158   # zcaron2
 }
 
+#
+# ToUnicode map for Identity-H
+#   CMapType : 1 = Convert to CID, 2 = Convert to Unicode
+#
+@@cmap_identity_h = <<-CMap
+/CIDInit /ProcSet findresource begin
+12 dict begin
+begincmap
+/CMapName /Adobe-Identity-UCS def
+/CMapType 2 def
+/CIDSystemInfo <<
+  /Registry (Adobe)
+  /Ordering (UCS)
+  /Supplement 0
+>> def
+/WMode 0 def
+1 begincodespacerange
+<0000> <FFFF>
+endcodespacerange
+
+1 beginbfrange
+<0000> <ffff> <0000>
+endbfrange
+endcmap
+CMapName currentdict /CMap defineresource pop
+end
+end
+CMap
+
 end
 
 #============================================================+

data/rbpdf.gemspec

@@ -1,5 +1,5 @@
 # coding: utf-8
-# Copyright (c) 2011-2019 NAITOH Jun
+# Copyright (c) 2011-2023 NAITOH Jun
 # Released under the MIT license
 # http://www.opensource.org/licenses/MIT
 
@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
                        ["Rakefile", "rbpdf.gemspec", "Gemfile",
                         "CHANGELOG", "test_unicode.rbpdf", "README.md", "LICENSE.TXT", "MIT-LICENSE",
                         "utf8test.txt", "logo_example.png" ]
-  spec.rdoc_options  += [ '--exclude', 'lib/fonts/',
+  spec.rdoc_options  += [ '--exclude', 'lib/core/mini_magick.rb',
                           '--exclude', 'lib/htmlcolors.rb',
                           '--exclude', 'lib/unicode_data.rb' ]
 
@@ -31,23 +31,12 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  if RUBY_VERSION == "1.8.7"
-    spec.add_runtime_dependency "htmlentities", "= 4.3.1"
-  else
-    spec.add_runtime_dependency "htmlentities"
-  end
+  spec.add_runtime_dependency "htmlentities"
   spec.add_runtime_dependency "rbpdf-font", "~> 1.19.0"
-  spec.required_ruby_version = '>= 1.8.7'
+  spec.required_ruby_version = '>= 2.3.0'
 
   spec.add_development_dependency "bundler"
-  if RUBY_VERSION <'1.9.3' # Ruby 1.8.7 or 1.9.2
-    spec.add_development_dependency "rake", "<= 10.5"
-  else
-    spec.add_development_dependency "rake"
-  end
-  if RUBY_VERSION <'1.9' # Ruby 1.8.7
-    spec.add_development_dependency "test-unit", "<= 3.1.5"
-  else
-    spec.add_development_dependency "test-unit", "~> 3.2"
-  end
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "test-unit"
+  spec.add_development_dependency "webrick"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbpdf
 version: !ruby/object:Gem::Version
-  version: 1.20.1
+  version: 1.21.1
 platform: ruby
 authors:
 - NAITOH Jun
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-08-21 00:00:00.000000000 Z
+date: 2023-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -70,16 +70,30 @@ dependencies:
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: webrick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '0'
 description: A template plugin allowing the inclusion of ERB-enabled RBPDF template
   files.
 email:
@@ -109,10 +123,10 @@ licenses:
 - MIT
 - LGPL-2.1-or-later
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--exclude"
-- lib/fonts/
+- lib/core/mini_magick.rb
 - "--exclude"
 - lib/htmlcolors.rb
 - "--exclude"
@@ -123,16 +137,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.8.7
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.10
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: RBPDF via TCPDF.
 test_files: []