Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-06-23 15:30:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Correct error message for fonts with no format 4 cmap tables

Browse Source
This commit is contained in:
Kovid Goyal 2012-10-30 23:50:16 +05:30
parent 5efd38eb4b
commit 3fd03f45d7
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/calibre/utils/fonts/sfntly.cpp
View File

@ -114,7 +114,7 @@ FontSourcedInfoBuilder::~FontSourcedInfoBuilder() { }
CALLER_ATTACH FontInfo* FontSourcedInfoBuilder::GetFontInfo() { CALLER_ATTACH FontInfo* FontSourcedInfoBuilder::GetFontInfo() {
if (!cmap_) { if (!cmap_) {
PyErr_SetString(Error, "This font has no cmap table!"); PyErr_SetString(UnsupportedFont, "This font has no format 4 cmap table (usually symbol or asian fonts), subsetting is not supported");
return NULL; return NULL;
} }
CharacterMap* chars_to_glyph_ids = new CharacterMap; CharacterMap* chars_to_glyph_ids = new CharacterMap;
@ -515,6 +515,11 @@ do_subset(const char *data, Py_ssize_t sz, Ptr<CharacterPredicate> &predicate) {
PyErr_SetString(Error, "Loaded font has 0 tables."); PyErr_SetString(Error, "Loaded font has 0 tables.");
return NULL; return NULL;
} }
Ptr<CMapTable> cmap_table = down_cast<CMapTable*>(font->GetTable(Tag::cmap));
if (!cmap_table) {
PyErr_SetString(Error, "Loaded font has no cmap table.");
return NULL;
}
Ptr<PredicateSubsetter> subsetter = new PredicateSubsetter(font, predicate); Ptr<PredicateSubsetter> subsetter = new PredicateSubsetter(font, predicate);
Ptr<Font> new_font; Ptr<Font> new_font;
new_font.Attach(subsetter->Subset()); new_font.Attach(subsetter->Subset());

14
src/calibre/utils/fonts/subset.py
View File

@ -110,13 +110,18 @@ def test():
def all(): def all():
from calibre.utils.fonts.scanner import font_scanner from calibre.utils.fonts.scanner import font_scanner
failed = [] failed = []
unsupported = []
for family in font_scanner.find_font_families(): for family in font_scanner.find_font_families():
for font in font_scanner.fonts_for_family(family): for font in font_scanner.fonts_for_family(family):
raw = font_scanner.get_font_data(font) raw = font_scanner.get_font_data(font)
print ('Subsetting', font['full_name']) print ('Subsetting', font['full_name'], end='\t')
try: try:
sf, old_stats, new_stats = subset(raw, set(('a', 'b', 'c')), ()) sf, old_stats, new_stats = subset(raw, set(('a', 'b', 'c')), ())
except (NoGlyphs, UnsupportedFont) as e: except NoGlyphs:
continue
except UnsupportedFont as e:
unsupported.append((font['full_name'], font['path'], unicode(e)))
print ('Unsupported!')
continue continue
except Exception as e: except Exception as e:
print ('Failed!') print ('Failed!')
@ -125,6 +130,11 @@ def all():
print ('Reduced to:', '%.1f'%( print ('Reduced to:', '%.1f'%(
sum(new_stats.itervalues())/sum(old_stats.itervalues()) sum(new_stats.itervalues())/sum(old_stats.itervalues())
* 100), '%') * 100), '%')
if unsupported:
print ('\n\nUnsupported:')
for name, path, err in unsupported:
print (name, path, err)
print()
if failed: if failed:
print ('\n\nFailures:') print ('\n\nFailures:')
for name, path, err in failed: for name, path, err in failed: