Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

PDF Output: Do not error out when embedding a font that calibre cannot subset, instead embedthe full font

Browse Source
This commit is contained in:
Kovid Goyal 2013-02-25 16:09:00 +05:30
parent fef594c510
commit 6b074ffae6
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/calibre/ebooks/pdf/render/fonts.py
View File

@ -13,9 +13,10 @@ from operator import itemgetter
from collections import Counter, OrderedDict from collections import Counter, OrderedDict
from future_builtins import map from future_builtins import map
from calibre import as_unicode
from calibre.ebooks.pdf.render.common import (Array, String, Stream, from calibre.ebooks.pdf.render.common import (Array, String, Stream,
Dictionary, Name) Dictionary, Name)
from calibre.utils.fonts.sfnt.subset import pdf_subset from calibre.utils.fonts.sfnt.subset import pdf_subset, UnsupportedFont
STANDARD_FONTS = { STANDARD_FONTS = {
'Times-Roman', 'Helvetica', 'Courier', 'Symbol', 'Times-Bold', 'Times-Roman', 'Helvetica', 'Courier', 'Symbol', 'Times-Bold',
@ -150,12 +151,16 @@ class Font(object):
self.used_glyphs = set() self.used_glyphs = set()
def embed(self, objects): def embed(self, objects, debug):
self.font_descriptor['FontFile'+('3' if self.is_otf else '2') self.font_descriptor['FontFile'+('3' if self.is_otf else '2')
] = objects.add(self.font_stream) ] = objects.add(self.font_stream)
self.write_widths(objects) self.write_widths(objects)
self.write_to_unicode(objects) self.write_to_unicode(objects)
try:
pdf_subset(self.metrics.sfnt, self.used_glyphs) pdf_subset(self.metrics.sfnt, self.used_glyphs)
except UnsupportedFont as e:
debug('Subsetting of %s not supported, embedding full font. Error: %s'%(
self.metrics.names.get('full_name', 'Unknown'), as_unicode(e)))
if self.is_otf: if self.is_otf:
self.font_stream.write(self.metrics.sfnt['CFF '].raw) self.font_stream.write(self.metrics.sfnt['CFF '].raw)
else: else:
@ -221,7 +226,7 @@ class FontManager(object):
})) }))
return self.std_map[name] return self.std_map[name]
def embed_fonts(self): def embed_fonts(self, debug):
for font in self.fonts: for font in self.fonts:
font.embed(self.objects) font.embed(self.objects, debug)

2
src/calibre/ebooks/pdf/render/serialize.py
View File

@ -488,7 +488,7 @@ class PDFStream(object):
def end(self): def end(self):
if self.current_page.getvalue(): if self.current_page.getvalue():
self.end_page() self.end_page()
self.font_manager.embed_fonts() self.font_manager.embed_fonts(self.debug)
inforef = self.objects.add(self.info) inforef = self.objects.add(self.info)
self.links.add_links() self.links.add_links()
self.objects.pdf_serialize(self.stream) self.objects.pdf_serialize(self.stream)