rbpdf 1.19.6 → 1.19.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb07b943fb93bd28c583e7d1725cb594fd38e37e
-  data.tar.gz: bc4e241e6d61bf6ff850080c598fe468a0c524a7
+  metadata.gz: f909de66d7d9b1db4d2be634eff73c5e6bf7210a
+  data.tar.gz: c68858c453b6aef789a7cefc01e60a779e965119
 SHA512:
-  metadata.gz: 01bf0690ab57b3248123090f7832826d60247d6361e276187a9efa98855a95733a869a48edd3d85f3b938f78c4ca424f7a830c6c203146830a350e2ee4bf8b9d
-  data.tar.gz: 65cc6adaff4ee5271c0f9d006e4dc600d93766c0d807fb90fd6120399ed73316258aee785bff8f963bee85a920705cb4414ef21fbe964785ea6543399e78995f
+  metadata.gz: 38270382e703093ec80ec61e255c109573e3b0f2b26a4bd4ef2e85840c73eaa979ff9bfe0497815a616c6e95038da48625482524f4675a30bbef57a354fc278c
+  data.tar.gz: 803a2ec4067e3ec8c2572f30c2cea8614be52cea9b760693ee545ca2da99d911318c2cce69e852f00a4aa965f8da2b121a4396d2d56c159ac1e7271acf5d4d7c

data/CHANGELOG

@@ -1,3 +1,7 @@
+1.19.7 2019-01-20
+       - Ruby 2.6 supported.
+       - utf8Bidi() X6,X7 bug fixed.
+
 1.19.6 2018-10-06
        - The problem of the line feed position of Ln() function has been fixed.
        - Fixed a problem of line feed position occurring in the following <pre> tag of HTML in the following cases.

data/Gemfile

@@ -7,4 +7,5 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in rbpdf.gemspec
 gemspec
 
-gem "actionpack", "~> 5.2.0"
+gem "actionpack"
+

data/lib/rbpdf.rb

@@ -9639,10 +9639,10 @@ public
 
     # X1. Begin by setting the current embedding level to the paragraph embedding level. Set the directional override status to neutral. Process each character iteratively, applying rules X2 through X9. Only embedding levels from 0 to 61 are valid in this phase.
     #   In the resolution of levels in rules I1 and I2, the maximum embedding level of 62 can be reached.
-    reg_KRP = /^(@@k_rle|@@k_lre|@@k_rlo|@@k_lro|@@k_pdf)$/
-    reg_KR = /^(@@k_rle|@@k_lre|@@k_rlo|@@k_lro)$/
     numchars.times do |i|
-      if ta[i] !~ reg_KRP
+      case ta[i]
+      when @@k_rle, @@k_lre, @@k_rlo, @@k_lro, @@k_pdf
+      else
         # X6. For all types besides RLE, LRE, RLO, LRO, and PDF:
         #  a. Set the level of the current character to the current embedding level.
         #  b. Whenever the directional override status is not neutral, reset the current character type to the directional override status.
@@ -9710,7 +9710,8 @@ public
         # 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
           last = remember.length - 1
-          if remember[last][:num] =~ reg_KR
+          case remember[last][:num]
+          when @@k_rle, @@k_lre, @@k_rlo, @@k_lro
             match = remember.pop
             cel = match[:cel]
             dos = match[:dos]

data/lib/rbpdf/version.rb

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

data/rbpdf.gemspec

@@ -39,7 +39,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "rbpdf-font", "~> 1.19.0"
   spec.required_ruby_version = '>= 1.8.7'
 
-  spec.add_development_dependency "bundler", "~> 1.6"
+  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

data/test/rbpdf_bidi_test.rb

@@ -7,6 +7,9 @@
 require 'test_helper'
 
 class RbpdfTest < Test::Unit::TestCase
+  require 'unicode_data.rb'
+  include Unicode_data
+
   class MYPDF < RBPDF
     def UTF8StringToArray(str)
       super
@@ -98,6 +101,7 @@ class RbpdfTest < Test::Unit::TestCase
 
     ary_ucs4 = pdf.utf8Bidi(pdf.UTF8StringToArray(ascii_str))
     assert_equal [0x61, 0x62, 0x63], ary_ucs4
+
     ary_ucs4 = pdf.utf8Bidi(pdf.UTF8StringToArray(ascii_str), ascii_str, 'R')
     assert_equal [0x61, 0x62, 0x63], ary_ucs4
 
@@ -131,11 +135,17 @@ class RbpdfTest < Test::Unit::TestCase
     current_font = pdf.get_current_font
     assert_equal 256 + 5, current_font['subsetchars'].compact.length
 
-    ary_str = pdf.utf8Bidi(pdf.UTF8StringToArray(ascii_str + utf8_str_2), ascii_str + utf8_str_2, 'R')
+    ary_str = pdf.utf8Bidi(pdf.UTF8StringToArray(ascii_str + utf8_str_2), ascii_str + utf8_str_2, 'R') # LTR -> RTL
     assert_equal [0x5ea, 0x5d9, 0x5e8, 0x5d1, 0x5e2, 0x61, 0x62, 0x63], ary_str
     current_font = pdf.get_current_font
     assert_equal 256 + 5, current_font['subsetchars'].compact.length
 
+    # Left-to-right embedding (LRE) : 202A
+    ary_str = pdf.utf8Bidi([@@k_lre] + pdf.UTF8StringToArray(ascii_str + utf8_str_2), ascii_str + utf8_str_2, 'R') # LTR -> RTL -> LTR
+    assert_equal [0x61, 0x62, 0x63, 0x5ea, 0x5d9, 0x5e8, 0x5d1, 0x5e2], ary_str
+    current_font = pdf.get_current_font
+    assert_equal 256 + 5, current_font['subsetchars'].compact.length
+
     ary_str = pdf.utf8Bidi(pdf.UTF8StringToArray(utf8_str_2 + ascii_str), utf8_str_2 + ascii_str, 'L')
     assert_equal [0x5ea, 0x5d9, 0x5e8, 0x5d1, 0x5e2, 0x61, 0x62, 0x63], ary_str
     ary_str = pdf.utf8Bidi(pdf.UTF8StringToArray(utf8_str_2 + ascii_str))        # RTL

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbpdf
 version: !ruby/object:Gem::Version
-  version: 1.19.6
+  version: 1.19.7
 platform: ruby
 authors:
 - NAITOH Jun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-05 00:00:00.000000000 Z
+date: 2019-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -42,16 +42,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -169,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: RBPDF via TCPDF.
@@ -213,3 +213,4 @@ test_files:
 - test/rbpdf_viewerpreferences_test.rb
 - test/rbpdf_write_test.rb
 - test/test_helper.rb
+has_rdoc: