# HG changeset patch # User Toshi MARUYAMA # Date 1320567166 -32400 # Node ID f5585cca1fca7b3212ef77306f3e9e54e47601cc # Parent 4267fa063041221c6bf6d476f8c161be28425099 (#3261) vendor/plugins/rfpdf/lib/tcpdf.rb * * * import pdf_export_image_support_jruby_test_fix.patch (#3261) diff --git a/vendor/plugins/rfpdf/lib/tcpdf.rb b/vendor/plugins/rfpdf/lib/tcpdf.rb --- a/vendor/plugins/rfpdf/lib/tcpdf.rb +++ b/vendor/plugins/rfpdf/lib/tcpdf.rb @@ -2049,17 +2049,27 @@ class TCPDF if (@images[file].nil?) #First use of image, get info if (type == '') - pos = file.rindex('.'); - if (pos == 0) + pos = File::basename(file).rindex('.'); + if (pos.nil? or pos == 0) Error('Image file has no extension and no type was specified: ' + file); end + pos = file.rindex('.'); type = file[pos+1..-1]; end type.downcase! if (type == 'jpg' or type == 'jpeg') info=parsejpg(file); - elsif (type == 'png') - info=parsepng(file); + elsif (type == 'png' or type == 'gif') + img = Magick::ImageList.new(file) + img.format = "PNG" # convert to PNG from gif + img.opacity = 0 # PNG alpha channel delete + File.open( @@k_path_cache + File::basename(file), 'w'){|f| + f.binmode + f.print img.to_blob + f.close + } + info=parsepng( @@k_path_cache + File::basename(file)); + File.delete( @@k_path_cache + File::basename(file)) else #Allow for additional formats mtd='parse' + type; @@ -2075,15 +2085,37 @@ class TCPDF end #Automatic width and height calculation if needed if ((w == 0) and (h == 0)) + rescale_x = (@w - @r_margin - x) / (info['w'] / (@img_scale * @k)) + rescale_x = 1 if rescale_x >= 1 + if (y + info['h'] * rescale_x / (@img_scale * @k) > @page_break_trigger and !@in_footer and AcceptPageBreak()) + #Automatic page break + if @pages[@page+1].nil? + ws = @ws; + if (ws > 0) + @ws = 0; + out('0 Tw'); + end + AddPage(@cur_orientation); + if (ws > 0) + @ws = ws; + out(sprintf('%.3f Tw', ws * @k)); + end + else + @page += 1; + end + y=@t_margin; + end + rescale_y = (@page_break_trigger - y) / (info['h'] / (@img_scale * @k)) + rescale_y = 1 if rescale_y >= 1 + rescale = rescale_y >= rescale_x ? rescale_x : rescale_y + #Put image at 72 dpi # 2004-06-14 :: Nicola Asuni, scale factor where added - w = info['w'] / (@img_scale * @k); - h = info['h'] / (@img_scale * @k); - end - if (w == 0) + w = info['w'] * rescale / (@img_scale * @k); + h = info['h'] * rescale / (@img_scale * @k); + elsif (w == 0) w = h * info['w'] / info['h']; - end - if (h == 0) + elsif (h == 0) h = w * info['h'] / info['w']; end out(sprintf('q %.2f 0 0 %.2f %.2f %.2f cm /I%d Do Q', w*@k, h*@k, x*@k, (@h-(y+h))*@k, info['i'])); @@ -2846,7 +2878,7 @@ class TCPDF if (a.empty?) Error('Missing or incorrect image file: ' + file); end - if (a[2]!='JPEG') + if (!a[2].nil? and a[2]!='JPEG') Error('Not a JPEG file: ' + file); end if (a['channels'].nil? or a['channels']==3) @@ -2859,9 +2891,12 @@ class TCPDF bpc=!a['bits'].nil? ? a['bits'] : 8; #Read whole file data=''; - open(file,'rb') do |f| + + open( @@k_path_cache + File::basename(file),'rb') do |f| data< a[0],'h' => a[1],'cs' => colspace,'bpc' => bpc,'f'=>'DCTDecode','data' => data} end @@ -2882,11 +2917,11 @@ class TCPDF end w=freadint(f); h=freadint(f); - bpc=f.read(1)[0]; + bpc=f.read(1).unpack('C')[0]; if (bpc>8) Error('16-bit depth not supported: ' + file); end - ct=f.read(1)[0]; + ct=f.read(1).unpack('C')[0]; if (ct==0) colspace='DeviceGray'; elsif (ct==2) @@ -2896,13 +2931,13 @@ class TCPDF else Error('Alpha channel not supported: ' + file); end - if (f.read(1)[0] != 0) + if (f.read(1).unpack('C')[0] != 0) Error('Unknown compression method: ' + file); end - if (f.read(1)[0]!=0) + if (f.read(1).unpack('C')[0] != 0) Error('Unknown filter method: ' + file); end - if (f.read(1)[0]!=0) + if (f.read(1).unpack('C')[0] != 0) Error('Interlacing not supported: ' + file); end f.read(4); @@ -2922,9 +2957,9 @@ class TCPDF #Read transparency info t=f.read( n); if (ct==0) - trns = t[1][0] + trns = t[1].unpack('C')[0] elsif (ct==2) - trns = t[[1][0], t[3][0], t[5][0]] + trns = t[[1].unpack('C')[0], t[3].unpack('C')[0], t[5].unpack('C')[0]] else pos=t.include?(0.chr); if (pos!=false) @@ -3766,6 +3801,20 @@ class TCPDF end # + # Convert to accessible file path + # @param string :attrname image file name + # @access private + # + def getImageFilename( attrname ) + # check of unsafe URI + if img.to_s =~ /[^-_.!~*'()a-zA-Z\d;\/?:@&=+$,\[\]%]/n + URI.encode(attrname) + else + attrname + end + end + + # # Process opening tags. # @param string :tag tag name (in upcase) # @param string :attr tag attribute (in upcase) @@ -3878,10 +3927,17 @@ class TCPDF when 'img' if (!attrs['src'].nil?) - Write(@lasth, '!' + attrs['src'] + '!', '', fill); -=begin Comment out. Because not implement image output yet. - # replace relative path with real server path - attrs['src'] = attrs['src'].gsub(@@k_path_url_cache, @@k_path_cache); + # Only generates image include a pdf if RMagick is avalaible + unless Object.const_defined?(:Magick) + Write(@lasth, attrs['src'], '', fill); + return + end + file = getImageFilename(attrs['src']) + if (file.nil?) + Write(@lasth, attrs['src'], '', fill); + return + end + if (attrs['width'].nil?) attrs['width'] = 0; end @@ -3889,10 +3945,17 @@ class TCPDF attrs['height'] = 0; end - Image(attrs['src'], GetX(),GetY(), pixelsToMillimeters(attrs['width']), pixelsToMillimeters(attrs['height'])); - #SetX(@img_rb_x); - SetY(@img_rb_y); -=end + begin + Image(file, GetX(),GetY(), pixelsToMillimeters(attrs['width']), pixelsToMillimeters(attrs['height'])); + #SetX(@img_rb_x); + SetY(@img_rb_y); + rescue => err + logger.error "pdf: Image: error: #{err.message}" + Write(@lasth, attrs['src'], '', fill); + if File.file?( @@k_path_cache + File::basename(file)) + File.delete( @@k_path_cache + File::basename(file)) + end + end end when 'ul', 'ol' # HG changeset patch # User Toshi MARUYAMA # Date 1320567166 -32400 # Node ID e46d219e9951f144829c582fbed06c819456c686 # Parent f5585cca1fca7b3212ef77306f3e9e54e47601cc (#3261) vendor/plugins/rfpdf/lib/core/rmagick.rb diff --git a/vendor/plugins/rfpdf/lib/core/rmagick.rb b/vendor/plugins/rfpdf/lib/core/rmagick.rb --- a/vendor/plugins/rfpdf/lib/core/rmagick.rb +++ b/vendor/plugins/rfpdf/lib/core/rmagick.rb @@ -57,6 +57,11 @@ module RFPDF end out['bits'] = image.channel_depth + File.open( TCPDF.k_path_cache + File::basename(filename), 'w'){|f| + f.binmode + f.print image.to_blob + f.close + } out end # HG changeset patch # User Toshi MARUYAMA # Date 1320567166 -32400 # Node ID 12ef7dea4f73b00a020758d967eca76c0e91d68e # Parent e46d219e9951f144829c582fbed06c819456c686 (#3261) lib/redmine/export/pdf.rb * * * PENDING: pdf: lib: add a method to export wiki Contributed by Jun NAITOH. diff --git a/lib/redmine/export/pdf.rb b/lib/redmine/export/pdf.rb --- a/lib/redmine/export/pdf.rb +++ b/lib/redmine/export/pdf.rb @@ -21,6 +21,7 @@ require 'iconv' require 'fpdf/chinese' require 'fpdf/japanese' require 'fpdf/korean' +require 'core/rmagick' module Redmine module Export @@ -34,10 +35,13 @@ module Redmine attr_accessor :footer_date def initialize(lang) + @@k_path_cache = Rails.root.join('tmp', 'pdf') + FileUtils.mkdir_p @@k_path_cache unless File::exist?(@@k_path_cache) set_language_if_valid lang pdf_encoding = l(:general_pdf_encoding).upcase if RUBY_VERSION < '1.9' - @ic = Iconv.new(pdf_encoding, 'UTF-8') + @ic_encode = Iconv.new(pdf_encoding, 'UTF-8') + @ic_decode = Iconv.new('UTF-8', pdf_encoding) end super('P', 'mm', 'A4', (pdf_encoding == 'UTF-8'), pdf_encoding) case current_language.to_s.downcase @@ -104,7 +108,11 @@ module Redmine end def fix_text_encoding(txt) - RDMPdfEncoding::rdm_pdf_iconv(@ic, txt) + RDMPdfEncoding::rdm_pdf_iconv(@ic_encode, txt) + end + + def fix_text_decoding(txt) + RDMPdfEncoding::rdm_pdf_iconv(@ic_decode, txt, true) end def RDMCell(w ,h=0, txt='', border=0, ln=0, align='', fill=0, link='') @@ -115,8 +123,35 @@ module Redmine MultiCell(w, h, fix_text_encoding(txt), border, align, fill, ln) end - def RDMwriteHTMLCell(w, h, x, y, html='', border=0, ln=1, fill=0) - writeHTMLCell(w, h, x, y, fix_text_encoding(html), border, ln, fill) + def RDMwriteHTMLCell(w, h, x, y, txt='', attachments=[], border=0, ln=1, fill=0) + @attachments = attachments.sort_by(&:created_on).reverse + + writeHTMLCell(w, h, x, y, + fix_text_encoding(Redmine::WikiFormatting.to_html(Setting.text_formatting, txt)), + border, ln, fill) + end + + def getImageFilename(attrname) + # attrname : general_pdf_encoding string file/uri name + if /^https?:\/\//i =~ attrname + uri = fix_text_decoding(attrname) # get original URI + + # check of unsafe URI + if uri =~ /[^-_.!~*'()a-zA-Z\d;\/?:@&=+$,\[\]%]/n + return URI.encode(uri) + else + return uri + end + else + for attachment in @attachments + # attachment.filename : UTF-8 string name + # attachment.diskfile : real server path file name + if fix_text_encoding(attachment.filename) == attrname && File.file?(attachment.diskfile) + return attachment.diskfile + end + end + end + return nil end def Footer @@ -357,9 +392,11 @@ module Redmine pdf.SetFontStyle('B',9) pdf.RDMCell(35+155, 5, l(:field_description), "LRT", 1) pdf.SetFontStyle('',9) + + # Set resize image scale + pdf.SetImageScale(1.6) pdf.RDMwriteHTMLCell(35+155, 5, 0, 0, - Redmine::WikiFormatting.to_html( - Setting.text_formatting, issue.description.to_s),"LRB") + issue.description.to_s, issue.attachments, "LRB") # for CJK truncate_length = ( l(:general_pdf_encoding).upcase == "UTF-8" ? 90 : 65 ) @@ -421,8 +458,7 @@ module Redmine unless changeset.comments.blank? pdf.SetFontStyle('',8) pdf.RDMwriteHTMLCell(190,5,0,0, - Redmine::WikiFormatting.to_html( - Setting.text_formatting, changeset.comments.to_s), "") + changeset.comments.to_s, issue.attachments, "") end pdf.Ln end @@ -446,8 +482,7 @@ module Redmine pdf.Ln unless journal.details.empty? pdf.SetFontStyle('',8) pdf.RDMwriteHTMLCell(190,5,0,0, - Redmine::WikiFormatting.to_html( - Setting.text_formatting, journal.notes.to_s), "") + journal.notes.to_s, issue.attachments, "") end pdf.Ln end @@ -483,8 +518,7 @@ module Redmine pdf.SetImageScale(1.6) pdf.SetFontStyle('',9) pdf.RDMwriteHTMLCell(190,5,0,0, - Redmine::WikiFormatting.to_html( - Setting.text_formatting, page.content.text.to_s), "TLRB") + page.content.text.to_s, page.attachments, "TLRB") if page.attachments.any? pdf.Ln pdf.SetFontStyle('B',9) @@ -504,26 +538,44 @@ module Redmine class RDMPdfEncoding include Redmine::I18n - def self.rdm_pdf_iconv(ic, txt) + def self.rdm_pdf_iconv(ic, txt, toUTF8 = false) txt ||= '' if txt.respond_to?(:force_encoding) - txt.force_encoding('UTF-8') if l(:general_pdf_encoding).upcase != 'UTF-8' - txt = txt.encode(l(:general_pdf_encoding), :invalid => :replace, - :undef => :replace, :replace => '?') + if toUTF8 == false + txt.force_encoding('UTF-8') + txtar = txt.encode(l(:general_pdf_encoding), :invalid => :replace, + :undef => :replace, :replace => '?') + txtar.force_encoding('ASCII-8BIT') + else + txt.force_encoding(l(:general_pdf_encoding)) + txtar = txt.encode('UTF-8', :invalid => :replace, + :undef => :replace, :replace => '?') + txt.force_encoding('ASCII-8BIT') + end else - txt = Redmine::CodesetUtil.replace_invalid_utf8(txt) + txt.force_encoding('UTF-8') + txtar = Redmine::CodesetUtil.replace_invalid_utf8(txt) + txtar.force_encoding('ASCII-8BIT') end - txt.force_encoding('ASCII-8BIT') + txt = txtar elsif RUBY_PLATFORM == 'java' begin - ic ||= Iconv.new(l(:general_pdf_encoding), 'UTF-8') + if toUTF8 == false + ic ||= Iconv.new(l(:general_pdf_encoding), 'UTF-8') + else + ic ||= Iconv.new('UTF-8', l(:general_pdf_encoding)) + end txt = ic.iconv(txt) rescue txt = txt.gsub(%r{[^\r\n\t\x20-\x7e]}, '?') end else - ic ||= Iconv.new(l(:general_pdf_encoding), 'UTF-8') + if toUTF8 == false + ic ||= Iconv.new(l(:general_pdf_encoding), 'UTF-8') + else + ic ||= Iconv.new('UTF-8', l(:general_pdf_encoding)) + end txtar = "" begin txtar += ic.iconv(txt) # HG changeset patch # User Toshi MARUYAMA # Date 1320567166 -32400 # Node ID c2140a529cdda72b4320a85100cd390a61e8bc0b # Parent 12ef7dea4f73b00a020758d967eca76c0e91d68e (#3261) test/unit/lib/redmine/export/pdf_test.rb diff --git a/test/unit/lib/redmine/export/pdf_test.rb b/test/unit/lib/redmine/export/pdf_test.rb --- a/test/unit/lib/redmine/export/pdf_test.rb +++ b/test/unit/lib/redmine/export/pdf_test.rb @@ -34,7 +34,20 @@ class PdfTest < ActiveSupport::TestCase assert_equal '', Redmine::Export::PDF::RDMPdfEncoding::rdm_pdf_iconv(ic, nil) end - def test_rdm_pdf_iconv_cannot_convert_ja_cp932 + def test_fix_text_decoding_nil + set_language_if_valid 'ja' + assert_equal 'CP932', l(:general_pdf_encoding) + if RUBY_VERSION < '1.9' + if RUBY_PLATFORM == 'java' + ic = Iconv.new("UTF-8", 'SJIS') + else + ic = Iconv.new('UTF-8', l(:general_pdf_encoding)) + end + end + assert_equal '', Redmine::Export::PDF::RDMPdfEncoding::rdm_pdf_iconv(ic, nil, true) + end + + def test_rdm_pdf_iconv_cannot_convert_ja_to_cp932 set_language_if_valid 'ja' assert_equal 'CP932', l(:general_pdf_encoding) if RUBY_VERSION < '1.9' @@ -44,6 +57,8 @@ class PdfTest < ActiveSupport::TestCase ic = Iconv.new(l(:general_pdf_encoding), 'UTF-8') end end + # \xe7\x8b\x80 : invalid UTF-8 character + # \xe6\x85\x8b : valid UTF-8 character => \x91\xd4 : valid CP932 character utf8_txt_1 = "\xe7\x8b\x80\xe6\x85\x8b" utf8_txt_2 = "\xe7\x8b\x80\xe6\x85\x8b\xe7\x8b\x80" utf8_txt_3 = "\xe7\x8b\x80\xe7\x8b\x80\xe6\x85\x8b\xe7\x8b\x80" @@ -54,6 +69,9 @@ class PdfTest < ActiveSupport::TestCase assert_equal "?\x91\xd4", txt_1 assert_equal "?\x91\xd4?", txt_2 assert_equal "??\x91\xd4?", txt_3 + assert_equal "UTF-8", utf8_txt_1.encoding.to_s + assert_equal "UTF-8", utf8_txt_2.encoding.to_s + assert_equal "UTF-8", utf8_txt_3.encoding.to_s assert_equal "ASCII-8BIT", txt_1.encoding.to_s assert_equal "ASCII-8BIT", txt_2.encoding.to_s assert_equal "ASCII-8BIT", txt_3.encoding.to_s @@ -74,6 +92,51 @@ class PdfTest < ActiveSupport::TestCase end end + def test_rdm_pdf_iconv_cannot_convert_from_cp932 + set_language_if_valid 'ja' + assert_equal 'CP932', l(:general_pdf_encoding) + if RUBY_VERSION < '1.9' + if RUBY_PLATFORM == 'java' + ic = Iconv.new("UTF-8", 'SJIS') + else + ic = Iconv.new('UTF-8', l(:general_pdf_encoding)) + end + end + # \x90\xff : invalid CP932 character + # \x91\xd4 : valid CP932 character => \xe6\x85\x8b : valid UTF-8 character + cp932_txt_1 = "\x90\xff\x91\xd4" + cp932_txt_2 = "\x90\xff\x91\xd4\x90\xff" + cp932_txt_3 = "\x90\xff\x90\xff\x91\xd4\x90\xff" + if cp932_txt_1.respond_to?(:force_encoding) + txt_1 = Redmine::Export::PDF::RDMPdfEncoding::rdm_pdf_iconv(ic, cp932_txt_1, true) + txt_2 = Redmine::Export::PDF::RDMPdfEncoding::rdm_pdf_iconv(ic, cp932_txt_2, true) + txt_3 = Redmine::Export::PDF::RDMPdfEncoding::rdm_pdf_iconv(ic, cp932_txt_3, true) + assert_equal "ASCII-8BIT", cp932_txt_1.encoding.to_s + assert_equal "ASCII-8BIT", cp932_txt_2.encoding.to_s + assert_equal "ASCII-8BIT", cp932_txt_3.encoding.to_s + assert_equal "UTF-8", txt_1.encoding.to_s + assert_equal "UTF-8", txt_2.encoding.to_s + assert_equal "UTF-8", txt_3.encoding.to_s + assert_equal "??\xe6\x85\x8b", txt_1.force_encoding('ASCII-8BIT') + assert_equal "??\xe6\x85\x8b??", txt_2.force_encoding('ASCII-8BIT') + assert_equal "????\xe6\x85\x8b??", txt_3.force_encoding('ASCII-8BIT') + elsif RUBY_PLATFORM == 'java' + assert_equal "????", + Redmine::Export::PDF::RDMPdfEncoding::rdm_pdf_iconv(ic, cp932_txt_1, true) + assert_equal "??????", + Redmine::Export::PDF::RDMPdfEncoding::rdm_pdf_iconv(ic, cp932_txt_2, true) + assert_equal "????????", + Redmine::Export::PDF::RDMPdfEncoding::rdm_pdf_iconv(ic, cp932_txt_3, true) + else + assert_equal "??\xe6\x85\x8b", + Redmine::Export::PDF::RDMPdfEncoding::rdm_pdf_iconv(ic, cp932_txt_1, true) + assert_equal "??\xe6\x85\x8b??", + Redmine::Export::PDF::RDMPdfEncoding::rdm_pdf_iconv(ic, cp932_txt_2, true) + assert_equal "????\xe6\x85\x8b??", + Redmine::Export::PDF::RDMPdfEncoding::rdm_pdf_iconv(ic, cp932_txt_3, true) + end + end + def test_rdm_pdf_iconv_invalid_utf8_should_be_replaced_en set_language_if_valid 'en' assert_equal 'UTF-8', l(:general_pdf_encoding) @@ -86,12 +149,20 @@ class PdfTest < ActiveSupport::TestCase end txt_1 = Redmine::Export::PDF::RDMPdfEncoding::rdm_pdf_iconv(ic, str1) txt_2 = Redmine::Export::PDF::RDMPdfEncoding::rdm_pdf_iconv(ic, str2) + txt_3 = Redmine::Export::PDF::RDMPdfEncoding::rdm_pdf_iconv(ic, str1, true) + txt_4 = Redmine::Export::PDF::RDMPdfEncoding::rdm_pdf_iconv(ic, str2, true) if txt_1.respond_to?(:force_encoding) + assert_equal "UTF-8", str1.encoding.to_s + assert_equal "UTF-8", str2.encoding.to_s assert_equal "ASCII-8BIT", txt_1.encoding.to_s assert_equal "ASCII-8BIT", txt_2.encoding.to_s + assert_equal "ASCII-8BIT", txt_3.encoding.to_s + assert_equal "ASCII-8BIT", txt_4.encoding.to_s end assert_equal "Texte encod? en ISO-8859-1", txt_1 assert_equal "?a?b?c?d?e test", txt_2 + assert_equal "Texte encod? en ISO-8859-1", txt_3 + assert_equal "?a?b?c?d?e test", txt_4 end def test_rdm_pdf_iconv_invalid_utf8_should_be_replaced_ja @@ -111,6 +182,8 @@ class PdfTest < ActiveSupport::TestCase txt_1 = Redmine::Export::PDF::RDMPdfEncoding::rdm_pdf_iconv(ic, str1) txt_2 = Redmine::Export::PDF::RDMPdfEncoding::rdm_pdf_iconv(ic, str2) if txt_1.respond_to?(:force_encoding) + assert_equal "UTF-8", str1.encoding.to_s + assert_equal "UTF-8", str2.encoding.to_s assert_equal "ASCII-8BIT", txt_1.encoding.to_s assert_equal "ASCII-8BIT", txt_2.encoding.to_s end # HG changeset patch # User Toshi MARUYAMA # Date 1321004739 -32400 # Node ID 63d48d9b8b606ffa8054d2cd734fe613bd3fa8bb # Parent c2140a529cdda72b4320a85100cd390a61e8bc0b import pdf_export_image_support_jruby_test_fix.patch (#3261) diff --git a/test/unit/lib/redmine/export/pdf_test.rb b/test/unit/lib/redmine/export/pdf_test.rb --- a/test/unit/lib/redmine/export/pdf_test.rb +++ b/test/unit/lib/redmine/export/pdf_test.rb @@ -103,10 +103,11 @@ class PdfTest < ActiveSupport::TestCase end end # \x90\xff : invalid CP932 character - # \x91\xd4 : valid CP932 character => \xe6\x85\x8b : valid UTF-8 character - cp932_txt_1 = "\x90\xff\x91\xd4" - cp932_txt_2 = "\x90\xff\x91\xd4\x90\xff" - cp932_txt_3 = "\x90\xff\x90\xff\x91\xd4\x90\xff" + # \x91\xe4 : valid CP932 character => \xe5\x8f\xb0 : valid UTF-8 character + + cp932_txt_1 = "\x90\xff\x91\xe4" + cp932_txt_2 = "\x90\xff\x91\xe4\x90\xff" + cp932_txt_3 = "\x90\xff\x90\xff\x91\xe4\x90\xff" if cp932_txt_1.respond_to?(:force_encoding) txt_1 = Redmine::Export::PDF::RDMPdfEncoding::rdm_pdf_iconv(ic, cp932_txt_1, true) txt_2 = Redmine::Export::PDF::RDMPdfEncoding::rdm_pdf_iconv(ic, cp932_txt_2, true) @@ -117,9 +118,9 @@ class PdfTest < ActiveSupport::TestCase assert_equal "UTF-8", txt_1.encoding.to_s assert_equal "UTF-8", txt_2.encoding.to_s assert_equal "UTF-8", txt_3.encoding.to_s - assert_equal "??\xe6\x85\x8b", txt_1.force_encoding('ASCII-8BIT') - assert_equal "??\xe6\x85\x8b??", txt_2.force_encoding('ASCII-8BIT') - assert_equal "????\xe6\x85\x8b??", txt_3.force_encoding('ASCII-8BIT') + assert_equal "??\xe5\x8f\xb0", txt_1.force_encoding('ASCII-8BIT') + assert_equal "??\xe5\x8f\xb0??", txt_2.force_encoding('ASCII-8BIT') + assert_equal "????\xe5\x8f\xb0??", txt_3.force_encoding('ASCII-8BIT') elsif RUBY_PLATFORM == 'java' assert_equal "????", Redmine::Export::PDF::RDMPdfEncoding::rdm_pdf_iconv(ic, cp932_txt_1, true) @@ -128,11 +129,11 @@ class PdfTest < ActiveSupport::TestCase assert_equal "????????", Redmine::Export::PDF::RDMPdfEncoding::rdm_pdf_iconv(ic, cp932_txt_3, true) else - assert_equal "??\xe6\x85\x8b", + assert_equal "??\xe5\x8f\xb0", Redmine::Export::PDF::RDMPdfEncoding::rdm_pdf_iconv(ic, cp932_txt_1, true) - assert_equal "??\xe6\x85\x8b??", + assert_equal "??\xe5\x8f\xb0??", Redmine::Export::PDF::RDMPdfEncoding::rdm_pdf_iconv(ic, cp932_txt_2, true) - assert_equal "????\xe6\x85\x8b??", + assert_equal "????\xe5\x8f\xb0??", Redmine::Export::PDF::RDMPdfEncoding::rdm_pdf_iconv(ic, cp932_txt_3, true) end end