From cb6599bbc1ac4daccd5e4ed9100a5f9a06f51d24 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 5 Jan 2009 10:10:22 -0800
Subject: [PATCH] Fix #1550 (html table handling in v0.4.124)

---
 installer/linux/freeze.py                | 2 ++
 installer/osx/freeze.py                  | 2 +-
 installer/windows/freeze.py              | 1 +
 src/calibre/ebooks/lrf/fonts/__init__.py | 3 ++-
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/installer/linux/freeze.py b/installer/linux/freeze.py
index 32581abee2..1ff243a807 100644
--- a/installer/linux/freeze.py
+++ b/installer/linux/freeze.py
@@ -16,6 +16,7 @@ def freeze():
     from calibre.linux import entry_points
     from calibre import walk
     from calibre.web.feeds.recipes import recipe_modules
+    from calibre.ebooks.lrf.fonts import FONT_MAP
     import calibre
     
 
@@ -72,6 +73,7 @@ def freeze():
         os.makedirs(DIST_DIR)
     
     includes = [x[0] for x in executables.values()]
+    includes += ['calibre.ebooks.lrf.fonts.prs500.'+x for x in FONT_MAP.values()]
     
     excludes = ['matplotlib', "Tkconstants", "Tkinter", "tcl", "_imagingtk", 
                 "ImageTk", "FixTk", 'wx', 'PyQt4.QtAssistant', 'PyQt4.QtOpenGL.so', 
diff --git a/installer/osx/freeze.py b/installer/osx/freeze.py
index 2a74d15802..de93a344c2 100644
--- a/installer/osx/freeze.py
+++ b/installer/osx/freeze.py
@@ -326,7 +326,7 @@ def main():
                                        'genshi', 'calibre.web.feeds.recipes.*',
                                        'calibre.ebooks.lrf.any.*', 'calibre.ebooks.lrf.feeds.*',
                                        'keyword', 'codeop', 'pydoc', 'readline',
-                                       'BeautifulSoup'
+                                       'BeautifulSoup', 'calibre.ebooks.lrf.fonts.prs500.*',
                                        ],
                          'packages' : ['PIL', 'Authorization', 'lxml'],
                          'excludes' : ['IPython'],
diff --git a/installer/windows/freeze.py b/installer/windows/freeze.py
index 73bb9cae56..064615f422 100644
--- a/installer/windows/freeze.py
+++ b/installer/windows/freeze.py
@@ -176,6 +176,7 @@ def main(args=sys.argv):
                                              'BeautifulSoup', 'pyreadline',
                                              'pydoc', 'IPython.Extensions.*',
                                              'calibre.web.feeds.recipes.*',
+                                             'calibre.ebooks.lrf.fonts.prs500.*',
                                              'PyQt4.QtWebKit', 'PyQt4.QtNetwork',
                                              ],
                                   'packages'  : ['PIL', 'lxml', 'cherrypy'],
diff --git a/src/calibre/ebooks/lrf/fonts/__init__.py b/src/calibre/ebooks/lrf/fonts/__init__.py
index 25ef8433b5..462762af1e 100644
--- a/src/calibre/ebooks/lrf/fonts/__init__.py
+++ b/src/calibre/ebooks/lrf/fonts/__init__.py
@@ -50,7 +50,8 @@ def get_font_path(name):
         try:
             font_mod = __import__('calibre.ebooks.lrf.fonts.prs500', {}, {}, 
                                   [fname], -1)
-        except ImportError:
+            getattr(font_mod, fname)
+        except ImportError, AttributeError:
             font_mod = __import__('calibre.ebooks.lrf.fonts.liberation', {}, {}, 
                                   [LIBERATION_FONT_MAP[name]], -1)
         p = PersistentTemporaryFile('.ttf', 'font_')