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 handling of Fixed property

Browse Source
This commit is contained in:
Kovid Goyal 2012-11-06 12:14:55 +05:30
parent f54843c547
commit d169599f63
2 changed files with 22 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/calibre/utils/fonts/sfnt/head.py
View File

@ -10,19 +10,21 @@ __docformat__ = 'restructuredtext en'
from itertools import izip from itertools import izip
from struct import unpack_from, pack from struct import unpack_from, pack
from calibre.utils.fonts.sfnt import UnknownTable, DateTimeProperty from calibre.utils.fonts.sfnt import UnknownTable, DateTimeProperty, FixedProperty
class HeadTable(UnknownTable): class HeadTable(UnknownTable):
created = DateTimeProperty('_created') created = DateTimeProperty('_created')
modified = DateTimeProperty('_modified') modified = DateTimeProperty('_modified')
version_number = FixedProperty('_version_number')
font_revision = FixedProperty('_font_revision')
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super(HeadTable, self).__init__(*args, **kwargs) super(HeadTable, self).__init__(*args, **kwargs)
field_types = ( field_types = (
'version_number' , 'L', '_version_number' , 'l',
'font_revision' , 'L', '_font_revision' , 'l',
'checksum_adjustment' , 'L', 'checksum_adjustment' , 'L',
'magic_number' , 'L', 'magic_number' , 'L',
'flags' , 'H', 'flags' , 'H',

43
src/calibre/utils/fonts/sfnt/maxp.py
View File

@ -10,47 +10,38 @@ __docformat__ = 'restructuredtext en'
from itertools import izip from itertools import izip
from struct import unpack_from, pack from struct import unpack_from, pack
from calibre.utils.fonts.sfnt import UnknownTable from calibre.utils.fonts.sfnt import UnknownTable, FixedProperty
from calibre.utils.fonts.sfnt.errors import UnsupportedFont from calibre.utils.fonts.sfnt.errors import UnsupportedFont
class MaxpTable(UnknownTable): class MaxpTable(UnknownTable):
version = FixedProperty('_version')
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super(MaxpTable, self).__init__(*args, **kwargs) super(MaxpTable, self).__init__(*args, **kwargs)
self._fmt = b'>LH' self._fmt = b'>lH'
self._version, self.num_glyphs = unpack_from(self._fmt, self.raw) self._version, self.num_glyphs = unpack_from(self._fmt, self.raw)
self.fields = ('_version', 'num_glyphs') self.fields = ('_version', 'num_glyphs')
if self._version >= 0x10000: if self.version > 1.0:
self.version = 0x10000 raise UnsupportedFont('This font has a maxp table with version: %s'
%self.version)
if self.version == 1.0:
self.fields = ('_version', 'num_glyphs', 'max_points',
'max_contours', 'max_composite_points',
'max_composite_contours', 'max_zones',
'max_twilight_points', 'max_storage', 'max_function_defs',
'max_instruction_defs', 'max_stack_elements',
'max_size_of_instructions', 'max_component_elements',
'max_component_depth')
self._fmt = b'>lH' + b'H'*(len(self.fields)-2)
vals = unpack_from(self._fmt, self.raw) vals = unpack_from(self._fmt, self.raw)
for f, val in izip(self.fields, vals): for f, val in izip(self.fields, vals):
setattr(self, f, val) setattr(self, f, val)
@dynamic_property
def version(self):
def fget(self):
return self._version
def fset(self, val):
if val == 0x5000:
self._fmt = b'>LH'
self._fields = ('_version', 'num_glyphs')
elif val == 0x10000:
self.fields = ('_version', 'num_glyphs', 'max_points',
'max_contours', 'max_composite_points',
'max_composite_contours', 'max_zones',
'max_twilight_points', 'max_storage', 'max_function_defs',
'max_instruction_defs', 'max_stack_elements',
'max_size_of_instructions', 'max_component_elements',
'max_component_depth')
self._fmt = b'>LH' + b'H'*(len(self.fields)-2)
self._version = val
return property(fget=fget, fset=fset)
def update(self): def update(self):
if self._version > 0x10000:
raise UnsupportedFont('maxp table with version > 0x10000 not modifiable')
vals = [getattr(self, f) for f in self._fields] vals = [getattr(self, f) for f in self._fields]
self.raw = pack(self._fmt, *vals) self.raw = pack(self._fmt, *vals)