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 #4418 (epub: calibre overwrites list-style: none with list-style-type: disc)

Browse Source
This commit is contained in:
Kovid Goyal 2010-01-10 12:35:12 -07:00
parent 3e96fde80b
commit ffc70580f3
1 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/calibre/ebooks/oeb/stylizer.py
View File

@ -237,6 +237,8 @@ class Stylizer(object):
style.update(self._normalize_edge(prop.cssValue, name)) style.update(self._normalize_edge(prop.cssValue, name))
elif name == 'font': elif name == 'font':
style.update(self._normalize_font(prop.cssValue)) style.update(self._normalize_font(prop.cssValue))
elif name == 'list-style':
style.update(self._normalize_list_style(prop.cssValue))
else: else:
style[name] = prop.value style[name] = prop.value
if 'font-size' in style: if 'font-size' in style:
@ -269,6 +271,31 @@ class Stylizer(object):
style["%s-%s" % (name, edge)] = value style["%s-%s" % (name, edge)] = value
return style return style
def _normalize_list_style(self, cssvalue):
composition = ('list-style-type', 'list-style-position',
'list-style-image')
style = {}
if cssvalue.cssText == 'inherit':
for key in composition:
style[key] = 'inherit'
else:
try:
primitives = [v.cssText for v in cssvalue]
except TypeError:
primitives = [cssvalue.cssText]
primitives.reverse()
value = primitives.pop()
for key in composition:
if cssprofiles.validate(key, value):
style[key] = value
if not primitives: break
value = primitives.pop()
for key in composition:
if key not in style:
style[key] = DEFAULTS[key]
return style
def _normalize_font(self, cssvalue): def _normalize_font(self, cssvalue):
composition = ('font-style', 'font-variant', 'font-weight', composition = ('font-style', 'font-variant', 'font-weight',
'font-size', 'line-height', 'font-family') 'font-size', 'line-height', 'font-family')