PDF: transplant r287 (#61).

Fix for #9.
Export feature(to csv/pdf) doesn't work in Japanese
csv and pdf encoding are know defined for each language
(general_csv_encoding and general_pdf_encoding keys in lang files)
added SJIS font for japanese pdf exports.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5249 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2011-03-30 03:26:24 +00:00
parent ad5dcaf179
commit aff157f0a0
1 changed files with 5 additions and 5 deletions

View File

@ -146,13 +146,13 @@ module PDF_Japanese
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
@ -163,7 +163,7 @@ module PDF_Japanese
while(i<nb)
#Get next character
c=s[i]
o=ord(c)
o=c #o=ord(c)
if(o==10)
#Explicit line break
Cell(w,h,s[j,i-j],b,2,align,fill)
@ -221,7 +221,7 @@ module PDF_Japanese
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)