Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-06-23 15:30:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

...

Browse Source
This commit is contained in:
Kovid Goyal 2013-05-09 18:58:55 +05:30
parent 4c58c6b0ef
commit 9c265f7dec
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/calibre/ebooks/docx/char_styles.py
View File

@ -126,7 +126,7 @@ class RunStyle(object):
} }
toggle_properties = { 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): def __init__(self, rPr=None):
@ -174,7 +174,6 @@ class RunStyle(object):
if self.strike: if self.strike:
td.add('line-through') td.add('line-through')
if self.dstrike: if self.dstrike:
td.add('overline')
td.add('line-through') td.add('line-through')
if td: if td:
c['text-decoration'] = ' '.join(td) c['text-decoration'] = ' '.join(td)

4
src/calibre/ebooks/docx/to_html.py
View File

@ -78,7 +78,7 @@ class Convert(object):
self.body[-1].tail = '\n' self.body[-1].tail = '\n'
self.styles.generate_classes() 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) style = self.styles.resolve(obj)
if style is not None: if style is not None:
css = style.css css = style.css
@ -154,7 +154,7 @@ class Convert(object):
wrapper = self.wrap_elems(spans, SPAN()) wrapper = self.wrap_elems(spans, SPAN())
wrapper.set('class', cls) wrapper.set('class', cls)
self.object_map[p] = dest self.object_map[dest] = p
return dest return dest
def wrap_elems(self, elems, wrapper): def wrap_elems(self, elems, wrapper):