Merged r13976 from trunk to 2.6-stable (#10681, #18586)

pdf: remove styles of Arabic/Persian Italic and Thai Bold.

Contributed by Jun NAITOH.

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13983 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA
2015-02-08 10:38:48 +00:00
parent 8fbd102d76
commit 18927905ba

View File

@@ -37,7 +37,6 @@ module Redmine
super(orientation, 'mm', 'A4')
set_print_header(false)
set_rtl(l(:direction) == 'rtl')
set_temp_rtl(l(:direction) == 'rtl' ? 'R' : 'L')
@font_for_content = l(:general_pdf_fontname)
@font_for_footer = l(:general_pdf_fontname)
@@ -50,10 +49,16 @@ module Redmine
end
def SetFontStyle(style, size)
style.delete!('B') if current_language.to_s.downcase == 'th' # FreeSerif Bold Thai font has problem.
set_font(@font_for_content, style, size)
end
def SetFont(family, style='', size=0, fontfile='')
style.delete!('B') if current_language.to_s.downcase == 'th' # FreeSerif Bold Thai font has problem.
style.delete!('I') if current_language.to_s.downcase =~ /^(fa|ar)$/ # DejaVuSans Italic Arabic and Persian font has problem.
super(family, style, size, fontfile)
end
alias_method :set_font, :SetFont
def fix_text_encoding(txt)
RDMPdfEncoding::rdm_from_utf8(txt, "UTF-8")
end