diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2015-02-08 10:39:00 +0000 |
|---|---|---|
| committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2015-02-08 10:39:00 +0000 |
| commit | bdaf2c27a17fad491feadaaec2092845ac89e5db (patch) | |
| tree | 15be5aa9ccc7a2fb88528038abfb567a03fe935a | |
| parent | 18927905ba1d0ff938cb2bfd8d61ee9755bc7048 (diff) | |
| download | redmine-bdaf2c27a17fad491feadaaec2092845ac89e5db.tar.gz redmine-bdaf2c27a17fad491feadaaec2092845ac89e5db.zip | |
Merged r13977 from trunk to 2.6-stable (#10681, #18586)
pdf: remove styles by fontname instated of Arabic/Persian/Thai locale.
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13984 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | lib/redmine/export/pdf.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/redmine/export/pdf.rb b/lib/redmine/export/pdf.rb index 7dbe85ccd..d8c949cfa 100644 --- a/lib/redmine/export/pdf.rb +++ b/lib/redmine/export/pdf.rb @@ -53,8 +53,10 @@ module Redmine 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. + # FreeSerif Bold Thai font has problem. + style.delete!('B') if l(:general_pdf_fontname) == 'freeserif' + # DejaVuSans Italic Arabic and Persian font has problem. + style.delete!('I') if l(:general_pdf_fontname) == 'DejaVuSans' super(family, style, size, fontfile) end alias_method :set_font, :SetFont |