mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-06-23 15:30:45 -04:00
...
This commit is contained in:
parent
4c58c6b0ef
commit
9c265f7dec
@ -126,7 +126,7 @@ class RunStyle(object):
|
||||
}
|
||||
|
||||
toggle_properties = {
|
||||
'b', 'bCs', 'caps', 'emboss', 'i', 'iCs', 'imprint', 'shadow', 'smallCaps', 'strike', 'vanish',
|
||||
'b', 'bCs', 'caps', 'emboss', 'i', 'iCs', 'imprint', 'shadow', 'smallCaps', 'strike', 'dstrike', 'vanish',
|
||||
}
|
||||
|
||||
def __init__(self, rPr=None):
|
||||
@ -174,7 +174,6 @@ class RunStyle(object):
|
||||
if self.strike:
|
||||
td.add('line-through')
|
||||
if self.dstrike:
|
||||
td.add('overline')
|
||||
td.add('line-through')
|
||||
if td:
|
||||
c['text-decoration'] = ' '.join(td)
|
||||
|
@ -78,7 +78,7 @@ class Convert(object):
|
||||
self.body[-1].tail = '\n'
|
||||
|
||||
self.styles.generate_classes()
|
||||
for obj, html_obj in self.object_map.iteritems():
|
||||
for html_obj, obj in self.object_map.iteritems():
|
||||
style = self.styles.resolve(obj)
|
||||
if style is not None:
|
||||
css = style.css
|
||||
@ -154,7 +154,7 @@ class Convert(object):
|
||||
wrapper = self.wrap_elems(spans, SPAN())
|
||||
wrapper.set('class', cls)
|
||||
|
||||
self.object_map[p] = dest
|
||||
self.object_map[dest] = p
|
||||
return dest
|
||||
|
||||
def wrap_elems(self, elems, wrapper):
|
||||
|
Loading…
x
Reference in New Issue
Block a user