Skip to content

O
OHR Support
Commit 7deb78ca authored by Toshi MARUYAMA's avatar Toshi MARUYAMA Committed by Eric Davis
Browse files
Options

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
parent 9b3b0770
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
vendor/plugins/rfpdf/lib/fpdf/japanese.rb
View file @ 7deb78ca
...@@ -146,13 +146,13 @@ module PDF_Japanese ...@@ -146,13 +146,13 @@ module PDF_Japanese
b2='LR' b2='LR'
else else
b2='' b2=''
if(border.index('L').nil?) if(border.to_s.index('L'))
b2+='L' b2+='L'
end end
if(border.index('R').nil?) if(border.to_s.index('R'))
b2+='R' b2+='R'
end end
b=border.index('T').nil? ? b2+'T' : b2 b=border.to_s.index('T') ? b2+'T' : b2
end end
end end
sep=-1 sep=-1
...@@ -163,7 +163,7 @@ module PDF_Japanese ...@@ -163,7 +163,7 @@ module PDF_Japanese
while(i<nb) while(i<nb)
#Get next character #Get next character
c=s[i] c=s[i]
o=ord(c) o=c #o=ord(c)
if(o==10) if(o==10)
#Explicit line break #Explicit line break
Cell(w,h,s[j,i-j],b,2,align,fill) Cell(w,h,s[j,i-j],b,2,align,fill)
...@@ -221,7 +221,7 @@ module PDF_Japanese ...@@ -221,7 +221,7 @@ module PDF_Japanese
end end
end end
#Last chunk #Last chunk
if(border and not border.index('B').nil?) if(border and not border.to_s.index('B').nil?)
b+='B' b+='B'
end end
Cell(w,h,s[j,i-j],b,2,align,fill) Cell(w,h,s[j,i-j],b,2,align,fill)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment