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: Fix OpenType fonts with CFF font data not embeddable on windows

Browse Source 
Qt now uses DirectWrite on windows, which means CFF fonts work
This commit is contained in:
Kovid Goyal 2016-09-02 13:12:03 +05:30
parent 47319bdccb
commit be785b1143
1 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/calibre/ebooks/conversion/plugins/pdf_output.py
View File

@ -10,7 +10,7 @@ Convert OEB ebook format to PDF.
import glob, os import glob, os
from calibre.constants import iswindows, islinux from calibre.constants import islinux
from calibre.customize.conversion import (OutputFormatPlugin, from calibre.customize.conversion import (OutputFormatPlugin,
OptionRecommendation) OptionRecommendation)
from calibre.ptempfile import TemporaryDirectory from calibre.ptempfile import TemporaryDirectory
@ -157,21 +157,14 @@ class PDFOutput(OutputFormatPlugin):
self.cover_data = item.data self.cover_data = item.data
def handle_embedded_fonts(self): def handle_embedded_fonts(self):
''' On windows, Qt uses GDI which does not support OpenType ''' Make sure all fonts are embeddable. '''
(CFF) fonts, so we need to nuke references to OpenType
fonts. Qt's directwrite text backend is not mature.
Also make sure all fonts are embeddable. '''
from calibre.ebooks.oeb.base import urlnormalize from calibre.ebooks.oeb.base import urlnormalize
from calibre.utils.fonts.utils import remove_embed_restriction from calibre.utils.fonts.utils import remove_embed_restriction
from PyQt5.Qt import QByteArray, QRawFont
font_warnings = set()
processed = set() processed = set()
is_cff = {}
for item in list(self.oeb.manifest): for item in list(self.oeb.manifest):
if not hasattr(item.data, 'cssRules'): if not hasattr(item.data, 'cssRules'):
continue continue
remove = set()
for i, rule in enumerate(item.data.cssRules): for i, rule in enumerate(item.data.cssRules):
if rule.type == rule.FONT_FACE_RULE: if rule.type == rule.FONT_FACE_RULE:
try: try:
@ -195,18 +188,6 @@ class PDFOutput(OutputFormatPlugin):
ff.data = nraw ff.data = nraw
self.oeb.container.write(path, nraw) self.oeb.container.write(path, nraw)
if iswindows:
if path not in is_cff:
f = QRawFont(QByteArray(nraw), 12)
is_cff[path] = f.isValid() and len(f.fontTable('head')) == 0
if is_cff[path]:
if path not in font_warnings:
font_warnings.add(path)
self.log.warn('CFF OpenType fonts are not supported on windows, ignoring: %s' % path)
remove.add(i)
for i in sorted(remove, reverse=True):
item.data.cssRules.pop(i)
def convert_text(self, oeb_book): def convert_text(self, oeb_book):
from calibre.ebooks.metadata.opf2 import OPF from calibre.ebooks.metadata.opf2 import OPF
if self.opts.old_pdf_engine: if self.opts.old_pdf_engine: