From ada54ee992a986b6001b5fee5c1980b44458bbcd Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Thu, 3 Oct 2013 13:21:10 +0200 Subject: [PATCH] [IMP] report: cleaning and add one more repository bzr revid: mat@openerp.com-20131003112110-zp9icv0umfbf311j --- openerp/report/render/rml2pdf/customfonts.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/openerp/report/render/rml2pdf/customfonts.py b/openerp/report/render/rml2pdf/customfonts.py index 1ba7cbe60db..337c7cf2f64 100644 --- a/openerp/report/render/rml2pdf/customfonts.py +++ b/openerp/report/render/rml2pdf/customfonts.py @@ -49,6 +49,7 @@ TTFSearchPath = [ '/usr/share/fonts/TTF', # Arch Linux '/usr/lib/openoffice/share/fonts/truetype/', '~/.fonts', + '~/.local/share/fonts', # mac os X - from # http://developer.apple.com/technotes/tn/tn2024.html @@ -112,12 +113,13 @@ def RegisterCustomFonts(): #Prepare font list for mapping.Each font family requires four type of modes(regular,bold,italic,bolditalic). #If all modes are not found, dummy entries are made for remaining modes. - for i,(familyName, name, font_dir, mode) in enumerate(sorted(registered_font_list)): + for familyName, name, font_dir, mode in sorted(registered_font_list): if not last_family or not font_modes: last_family = familyName font_modes = init_new_font(familyName, name, font_dir) if last_family != familyName: + # new font familly, sorting if not font_modes['italic']: font_modes['italic'] = font_modes['regular'][:3]+('italic',) if not font_modes['bolditalic']: