shadowfacts/fonttools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

return None if no unicode cmap subtables were found

Browse Source
This commit is contained in:
justvanrossum 2017-11-03 16:19:48 +01:00
parent 113f9cc498
commit 4e8295920a
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Lib/fontTools/ttLib/__init__.py
View File

@ -703,7 +703,8 @@ class TTFont(object):
return glyphs
def getBestCmap(self, cmapPreferences=((3, 10), (0, 4), (3, 1), (0, 3))):
"""Return the 'best' unicode cmap dictionary available in the font.
"""Return the 'best' unicode cmap dictionary available in the font,
or None, if no unicode cmap subtable is available.
By default it will search for the following (platformID, platEncID)
pairs:

5
Lib/fontTools/ttLib/tables/_c_m_a_p.py
View File

@ -39,7 +39,8 @@ class table__c_m_a_p(DefaultTable.DefaultTable):
return None # not found
def getBestCmap(self, cmapPreferences=((3, 10), (0, 4), (3, 1), (0, 3))):
"""Return the 'best' unicode cmap dictionary available in the font.
"""Return the 'best' unicode cmap dictionary available in the font,
or None, if no unicode cmap subtable is available.
By default it will search for the following (platformID, platEncID)
pairs:
@ -50,7 +51,7 @@ class table__c_m_a_p(DefaultTable.DefaultTable):
cmapSubtable = self.getcmap(platformID, platEncID)
if cmapSubtable is not None:
return cmapSubtable.cmap
raise ValueError("None of the requested cmap subtables were found")
return None # None of the requested cmap subtables were found
def buildReversed(self):
"""Returns a reverse cmap such as {'one':{0x31}, 'A':{0x41,0x391}}.

2
Tests/ttLib/tables/_c_m_a_p_test.py
View File

@ -67,6 +67,7 @@ class CmapSubtableTest(unittest.TestCase):
cmap.tables = [c4, c12]
self.assertEqual(cmap.getBestCmap(), {0x10314: 'u10314'})
self.assertEqual(cmap.getBestCmap(cmapPreferences=[(3, 1)]), {0x0041:'A', 0x0391:'A'})
self.assertEqual(cmap.getBestCmap(cmapPreferences=[(0, 4)]), None)
def test_font_getBestCmap(self):
c4 = self.makeSubtable(4, 3, 1, 0)
@ -79,6 +80,7 @@ class CmapSubtableTest(unittest.TestCase):
font["cmap"] = cmap
self.assertEqual(font.getBestCmap(), {0x10314: 'u10314'})
self.assertEqual(font.getBestCmap(cmapPreferences=[(3, 1)]), {0x0041:'A', 0x0391:'A'})
self.assertEqual(font.getBestCmap(cmapPreferences=[(0, 4)]), None)
if __name__ == "__main__":