diff options
| author | Behdad Esfahbod <behdad@behdad.org> | 2014-03-28 14:48:09 -0700 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@behdad.org> | 2014-03-28 14:48:09 -0700 |
| commit | 7765421ab76c79a38a565d7c8b631b2d1a13781c (patch) | |
| tree | c218bc26749d1fc1bf9f7215412a9dd0e15831c4 | |
| parent | 82c54638e32a5b7c0f7ad3ac3dafacf7fa27dad4 (diff) | |
| download | fonttools-7765421ab76c79a38a565d7c8b631b2d1a13781c.tar.gz | |
[merge] Allow merging OS/2 tables of different versions
| -rw-r--r-- | Lib/fontTools/merge.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Lib/fontTools/merge.py b/Lib/fontTools/merge.py index 8e212ec1..fe61f94d 100644 --- a/Lib/fontTools/merge.py +++ b/Lib/fontTools/merge.py @@ -260,9 +260,9 @@ ttLib.getTableClass('OS/2').mergeMap = { 'sTypoLineGap': max, 'usWinAscent': max, 'usWinDescent': max, - 'ulCodePageRange1': bitwise_or, - 'ulCodePageRange2': bitwise_or, - 'usMaxContex': max, + 'ulCodePageRange1': onlyExisting(bitwise_or), + 'ulCodePageRange2': onlyExisting(bitwise_or), + 'usMaxContex': onlyExisting(max), # TODO version 5 } |