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

Font subsetting: Fix :first-line and :first-letter pseudo classes not being handled correctly. Fixes #1990766 [Font subsetting problem with CSS pseudo classes](https://bugs.launchpad.net/calibre/+bug/1990766)

Browse Source
This commit is contained in:
Kovid Goyal 2022-09-27 12:40:33 +05:30
parent 497b8e4803
commit 0d4674f1b2
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/calibre/ebooks/oeb/polish/stats.py
View File

@ -184,7 +184,7 @@ class StatsCollector:
def __init__(self, container, do_embed=False): def __init__(self, container, do_embed=False):
if self.first_letter_pat is None: if self.first_letter_pat is None:
StatsCollector.first_letter_pat = self.first_letter_pat = regex.compile( StatsCollector.first_letter_pat = self.first_letter_pat = regex.compile(
r'^[\p{Ps}\p{Ps}\p{Pe}\p{Pi}\p{Pf}\p{Po}]+', regex.VERSION1 | regex.UNICODE) r'^[\p{P}]*[\p{L}\p{N}]', regex.VERSION1 | regex.UNICODE)
StatsCollector.capitalize_pat = self.capitalize_pat = regex.compile( StatsCollector.capitalize_pat = self.capitalize_pat = regex.compile(
r'[\p{L}\p{N}]', regex.VERSION1 | regex.UNICODE) r'[\p{L}\p{N}]', regex.VERSION1 | regex.UNICODE)
@ -261,7 +261,7 @@ class StatsCollector:
self.font_stats[rule['src']] |= chars self.font_stats[rule['src']] |= chars
q = resolve_pseudo_property(elem, 'first-line', 'font-family', abort_on_missing=True) q = resolve_pseudo_property(elem, 'first-line', 'font-family', abort_on_missing=True)
if q is not None: if q is not None:
font = get_font_dict(elem, resolve_pseudo_property, pseudo='first-letter') font = get_font_dict(elem, resolve_pseudo_property, pseudo='first-line')
text = get_element_text(elem, resolve_property, resolve_pseudo_property, self.capitalize_pat, for_pseudo='first-line') text = get_element_text(elem, resolve_property, resolve_pseudo_property, self.capitalize_pat, for_pseudo='first-line')
chars = frozenset(ord_string(text)) - exclude_chars chars = frozenset(ord_string(text)) - exclude_chars
update_usage_for_embed(font, chars) update_usage_for_embed(font, chars)