From 1c7330d465892cbfa81737436e31ad43dee52ed8 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Tue, 2 Oct 2012 13:41:29 +0530 Subject: [PATCH] ... --- src/calibre/utils/fonts/__init__.py | 5 +++-- src/calibre/utils/fonts/fc.py | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/calibre/utils/fonts/__init__.py b/src/calibre/utils/fonts/__init__.py index c847718153..a5563acd4e 100644 --- a/src/calibre/utils/fonts/__init__.py +++ b/src/calibre/utils/fonts/__init__.py @@ -26,7 +26,8 @@ class Fonts(object): def files_for_family(self, family, normalize=True): ''' Find all the variants in the font family `family`. - Returns a dictionary of tuples. Each tuple is of the form (Full font name, path to font file). + Returns a dictionary of tuples. Each tuple is of the form (path to font + file, Full font name). The keys of the dictionary depend on `normalize`. If `normalize` is `False`, they are a tuple (slant, weight) otherwise they are strings from the set `('normal', 'bold', 'italic', 'bi', 'light', 'li')` @@ -40,7 +41,7 @@ class Fonts(object): pt = PersistentTemporaryFile('.'+ext) pt.write(data) pt.close() - ans[ft] = (name, pt.name) + ans[ft] = (pt.name, name) return ans return self.backend.files_for_family(family, normalize=normalize) diff --git a/src/calibre/utils/fonts/fc.py b/src/calibre/utils/fonts/fc.py index a79b0e1963..b6a4b1f906 100644 --- a/src/calibre/utils/fonts/fc.py +++ b/src/calibre/utils/fonts/fc.py @@ -75,7 +75,8 @@ class FontConfig(Thread): def files_for_family(self, family, normalize=True): ''' Find all the variants in the font family `family`. - Returns a dictionary of tuples. Each tuple is of the form (Full font name, path to font file). + Returns a dictionary of tuples. Each tuple is of the form (path to font + file, Full font name). The keys of the dictionary depend on `normalize`. If `normalize` is `False`, they are a tuple (slant, weight) otherwise they are strings from the set `('normal', 'bold', 'italic', 'bi', 'light', 'li')`