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

Fix non-regular fonts being embedded multiple times by the embed fonts tool

Browse Source
This commit is contained in:
Kovid Goyal 2016-11-15 17:07:27 +05:30
parent 8f6f6fe4a0
commit 72471d6430
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/calibre/ebooks/oeb/polish/embed.py
View File

@ -8,12 +8,12 @@ __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
__docformat__ = 'restructuredtext en' __docformat__ = 'restructuredtext en'
import sys import sys
from future_builtins import map
from lxml import etree from lxml import etree
from calibre import prints from calibre import prints
from calibre.ebooks.oeb.base import XHTML from calibre.ebooks.oeb.base import XHTML
from calibre.ebooks.oeb.polish.stats import normalize_font_properties
from calibre.utils.filenames import ascii_filename from calibre.utils.filenames import ascii_filename
props = {'font-family':None, 'font-weight':'normal', 'font-style':'normal', 'font-stretch':'normal'} props = {'font-family':None, 'font-weight':'normal', 'font-style':'normal', 'font-stretch':'normal'}
@ -196,10 +196,14 @@ def embed_font(container, font, all_font_rules, report, warned):
return rule return rule
def font_key(font):
return tuple(map(font.get, 'font-family font-weight font-style font-stretch'.split()))
def embed_all_fonts(container, stats, report): def embed_all_fonts(container, stats, report):
all_font_rules = tuple(stats.all_font_rules.itervalues()) all_font_rules = tuple(stats.all_font_rules.itervalues())
warned = set() warned = set()
rules, nrules = [], [] rules, nrules = [], {}
modified = set() modified = set()
for path in container.spine_items: for path in container.spine_items:
@ -217,12 +221,13 @@ def embed_all_fonts(container, stats, report):
if rule is None: if rule is None:
# This font was not already embedded in this HTML file, before # This font was not already embedded in this HTML file, before
# processing started # processing started
rule = matching_rule(font, nrules) key = font_key(font)
rule = nrules.get(key)
if rule is None: if rule is None:
rule = embed_font(container, font, all_font_rules, report, warned) rule = embed_font(container, font, all_font_rules, report, warned)
if rule is not None: if rule is not None:
rules.append(rule) rules.append(rule)
nrules.append(normalize_font_properties(rule.copy())) nrules[key] = rule
modified.add(name) modified.add(name)
stats.font_stats[rule['name']] = font['text'] stats.font_stats[rule['name']] = font['text']
else: else: