summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2015-02-08 04:04:24 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2015-02-08 04:04:24 +0000
commit15e5d01b30104286ce29143b45191c793436ac68 (patch)
tree5090f31906b5b95b9fc6704debff026d648b6593 /lib
parent6aaefb8ba10a7d67a810571e6f731d6be59efa2f (diff)
downloadredmine-15e5d01b30104286ce29143b45191c793436ac68.tar.gz
redmine-15e5d01b30104286ce29143b45191c793436ac68.zip
pdf: remove styles of Arabic/Persian Italic and Thai Bold (#10681, #18586)
Contributed by Jun NAITOH. git-svn-id: http://svn.redmine.org/redmine/trunk@13976 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib')
-rw-r--r--lib/redmine/export/pdf.rb9
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/redmine/export/pdf.rb b/lib/redmine/export/pdf.rb
index c29fa909d..dd1616f9c 100644
--- a/lib/redmine/export/pdf.rb
+++ b/lib/redmine/export/pdf.rb
@@ -33,7 +33,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)
@@ -46,10 +45,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