diff --git a/resources/fonts/prs500/tt0003m_.ttf b/resources/fonts/prs500/tt0003m_.ttf deleted file mode 100644 index a83d81d2cb..0000000000 Binary files a/resources/fonts/prs500/tt0003m_.ttf and /dev/null differ diff --git a/resources/fonts/prs500/tt0011m_.ttf b/resources/fonts/prs500/tt0011m_.ttf deleted file mode 100644 index e1b4563473..0000000000 Binary files a/resources/fonts/prs500/tt0011m_.ttf and /dev/null differ diff --git a/resources/fonts/prs500/tt0419m_.ttf b/resources/fonts/prs500/tt0419m_.ttf deleted file mode 100644 index 8d9968e736..0000000000 Binary files a/resources/fonts/prs500/tt0419m_.ttf and /dev/null differ diff --git a/src/calibre/ebooks/lrf/fonts.py b/src/calibre/ebooks/lrf/fonts.py new file mode 100644 index 0000000000..6729dfb5b2 --- /dev/null +++ b/src/calibre/ebooks/lrf/fonts.py @@ -0,0 +1,35 @@ +__license__ = 'GPL v3' +__copyright__ = '2008, Kovid Goyal ' + +try: + from PIL import ImageFont + ImageFont +except ImportError: + import ImageFont + +''' +Default fonts used in the PRS500 +''' + + +LIBERATION_FONT_MAP = { + 'Swis721 BT Roman' : 'LiberationSans-Regular', + 'Dutch801 Rm BT Roman' : 'LiberationSerif-Regular', + 'Courier10 BT Roman' : 'LiberationMono-Regular', + } + +FONT_FILE_MAP = {} + + +def get_font(name, size, encoding='unic'): + ''' + Get an ImageFont object by name. + @param size: Font height in pixels. To convert from pts: + sz in pixels = (dpi/72) * size in pts + @param encoding: Font encoding to use. E.g. 'unic', 'symbol', 'ADOB', 'ADBE', 'aprm' + @param manager: A dict that will store the PersistentTemporary + ''' + if name in LIBERATION_FONT_MAP: + return ImageFont.truetype(P('fonts/liberation/%s.ttf' % LIBERATION_FONT_MAP[name]), size, encoding=encoding) + elif name in FONT_FILE_MAP: + return ImageFont.truetype(FONT_FILE_MAP[name], size, encoding=encoding) diff --git a/src/calibre/ebooks/lrf/fonts/__init__.py b/src/calibre/ebooks/lrf/fonts/__init__.py deleted file mode 100644 index 3f169360cb..0000000000 --- a/src/calibre/ebooks/lrf/fonts/__init__.py +++ /dev/null @@ -1,71 +0,0 @@ -__license__ = 'GPL v3' -__copyright__ = '2008, Kovid Goyal ' -import os - -try: - from PIL import ImageFont - ImageFont -except ImportError: - import ImageFont - -''' -Default fonts used in the PRS500 -''' - -SYSTEM_FONT_PATH = '/usr/share/fonts/truetype/ttf-liberation/' - -FONT_MAP = { - 'Swis721 BT Roman' : 'tt0003m_', - 'Dutch801 Rm BT Roman' : 'tt0011m_', - 'Courier10 BT Roman' : 'tt0419m_', - } - -LIBERATION_FONT_MAP = { - 'Swis721 BT Roman' : 'LiberationSans-Regular', - 'Dutch801 Rm BT Roman' : 'LiberationSerif-Regular', - 'Courier10 BT Roman' : 'LiberationMono-Regular', - } - -FONT_FILE_MAP = {} - -SYSTEM_FONT_MAP = {} -for key, val in LIBERATION_FONT_MAP.items(): - SYSTEM_FONT_MAP[key] = SYSTEM_FONT_PATH + val + '.ttf' - -def get_font_path(name): - if FONT_FILE_MAP.has_key(name) and os.access(FONT_FILE_MAP[name], os.R_OK): - return FONT_FILE_MAP[name] - # translate font into file name - for m, s in ((FONT_MAP, 'prs500'), (LIBERATION_FONT_MAP, 'liberation')): - fname = m[name]+'.ttf' - - # first, check configuration in /etc/ - etc_file = os.path.join(os.path.sep, 'etc', 'calibre', 'fonts', fname) - if os.access(etc_file, os.R_OK): - return etc_file - - # then, try calibre shipped ones - f = P('fonts/%s/%s'%(s,fname)) - if os.path.exists(f): - return f - - # finally, try system default ones - if SYSTEM_FONT_MAP.has_key(name) and os.access(SYSTEM_FONT_MAP[name], os.R_OK): - return SYSTEM_FONT_MAP[name] - - # not found - raise SystemError('font %s (in file %s) not installed' % (name, fname)) - -def get_font(name, size, encoding='unic'): - ''' - Get an ImageFont object by name. - @param size: Font height in pixels. To convert from pts: - sz in pixels = (dpi/72) * size in pts - @param encoding: Font encoding to use. E.g. 'unic', 'symbol', 'ADOB', 'ADBE', 'aprm' - @param manager: A dict that will store the PersistentTemporary - ''' - if name in FONT_MAP.keys(): - path = get_font_path(name) - return ImageFont.truetype(path, size, encoding=encoding) - elif name in FONT_FILE_MAP.keys(): - return ImageFont.truetype(FONT_FILE_MAP[name], size, encoding=encoding)