PDF: fix \\(double backslashes) handling of FPDF ANSI (#61, #117).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5341 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2011-04-06 04:27:38 +00:00
parent 7f923cdc66
commit 73a248530a
1 changed files with 3 additions and 5 deletions

View File

@ -145,14 +145,12 @@ module Redmine
def fix_text_encoding(txt) def fix_text_encoding(txt)
@ic ||= Iconv.new(l(:general_pdf_encoding), 'UTF-8') @ic ||= Iconv.new(l(:general_pdf_encoding), 'UTF-8')
txt = begin txt = begin
# 0x5c char handling @ic.iconv(txt)
txtar = txt.split('\\')
txtar << '' if txt[-1] == ?\\
txtar.collect {|x| @ic.iconv(x)}.join('\\').gsub(/\\/, "\\\\\\\\")
rescue rescue
txt txt
end || '' end || ''
return txt # 0x5c char handling
txt.gsub(/\\/, "\\\\\\\\")
end end
def RDMCell(w,h=0,txt='',border=0,ln=0,align='',fill=0,link='') def RDMCell(w,h=0,txt='',border=0,ln=0,align='',fill=0,link='')