From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Wed, 30 Mar 2011 03:27:09 +0000 (+0000)
Subject: PDF: transplant r3389 (#61).
X-Git-Tag: 1.2.0~594
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=000cf8fa9e5be11063fd8b87dae19ff4bb4d00f9;p=redmine.git

PDF: transplant r3389 (#61).

Korean support for PDF export (#4639).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5251 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/vendor/plugins/rfpdf/lib/fpdf/korean.rb b/vendor/plugins/rfpdf/lib/fpdf/korean.rb
index 64131405e..2b1f6de6c 100644
--- a/vendor/plugins/rfpdf/lib/fpdf/korean.rb
+++ b/vendor/plugins/rfpdf/lib/fpdf/korean.rb
@@ -139,13 +139,13 @@ UHC_widths={' ' => 333, '!' => 416, '"' => 416, '#' => 833, '$' => 625, '%' => 9
   			b2='LR'
   		else
   			b2=''
-  			if(border.index('L').nil?)
+  			if(border.to_s.index('L').nil?)
   				b2+='L'
         end
-  			if(border.index('R').nil?)
+  			if(border.to_s.index('R').nil?)
   				b2+='R'
         end
-  			b=border.index('T').nil? ? b2+'T' : b2
+  			b=border.to_s.index('T').nil? ? b2+'T' : b2
   		end
   	end
   	sep=-1
@@ -178,7 +178,7 @@ UHC_widths={' ' => 333, '!' => 416, '"' => 416, '#' => 833, '$' => 625, '%' => 9
   			sep=i
   			ls=l
   		end
-  		l+=ascii ? cw[c.chr] : 1000
+  		l+=(ascii ? cw[c.chr] : 1000) || 0
   		if(l>wmax)
   			#Automatic line break
   			if(sep==-1 or i==j)
@@ -202,7 +202,7 @@ UHC_widths={' ' => 333, '!' => 416, '"' => 416, '#' => 833, '$' => 625, '%' => 9
       end
   	end
   	#Last chunk
-  	if(border and not border.index('B').nil?)
+  	if(border and not border.to_s.index('B').nil?)
   		b+='B'
     end
   	Cell(w,h,s[j,i-j],b,2,align,fill)