PDF: transplant r393 (#61).

Added chinese simplified translation (Andy Wu)
Fixed rfpdf chinese.rb

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

diff --git a/vendor/plugins/rfpdf/lib/fpdf/chinese.rb b/vendor/plugins/rfpdf/lib/fpdf/chinese.rb
index 731d582a2ab15bac647cea319625437d39fef0da..6fe3eee8aba09d32885003bdc1d3a9762fbd05b8 100644 (file)
--- a/vendor/plugins/rfpdf/lib/fpdf/chinese.rb
+++ b/vendor/plugins/rfpdf/lib/fpdf/chinese.rb
@@ -132,7 +132,7 @@ module PDF_Chinese
        while(i<nb)
                c=s[i]
                if(c<128)
-                       l+=cw[c.chr]
+                       l+=cw[c.chr] if cw[c.chr]
                        i+=1
                else
                        l+=1000
@@ -170,13 +170,13 @@ module PDF_Chinese
                        b2='LR'
                else
                        b2=''
-                       if(border.index('L').nil?)
+                       if(border.to_s.index('L'))
                                b2+='L'
                                end
-                       if(border.index('R').nil?)
+                       if(border.to_s.index('R'))
                                b2+='R'
                                end
-                       b=border.index('T').nil? ? b2+'T' : b2
+                       b=border.to_s.index('T') ? b2+'T' : b2
                end
        end
        sep=-1
@@ -209,7 +209,7 @@ module PDF_Chinese
                        sep=i
                        ls=l
                end
-               l+=ascii ? cw[c.chr] : 1000
+               l+=ascii ? (cw[c.chr] || 0) : 1000
                if(l>wmax)
                        #Automatic line break
                        if(sep==-1 or i==j)
@@ -233,7 +233,7 @@ module PDF_Chinese
                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)