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 various small bugs that could cause conversion to DOCX to error out

Browse Source
This commit is contained in:
Kovid Goyal 2015-05-14 14:05:31 +05:30
parent 5ceb650f2a
commit 389d433d51
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/calibre/ebooks/docx/writer/images.py
View File

@ -61,7 +61,10 @@ class ImagesManager(object):
if not src: if not src:
return return
href = self.abshref(src) href = self.abshref(src)
try:
rid = self.read_image(href).rid rid = self.read_image(href).rid
except AttributeError:
return
drawing = self.create_image_markup(img, stylizer, href, as_block=as_block) drawing = self.create_image_markup(img, stylizer, href, as_block=as_block)
block.add_image(drawing, bookmark=bookmark) block.add_image(drawing, bookmark=bookmark)
return rid return rid

3
src/calibre/ebooks/docx/writer/styles.py
View File

@ -400,7 +400,10 @@ class BlockStyle(DOCXStyle):
else: else:
self.text_indent = int(css['text-indent'] * 20) self.text_indent = int(css['text-indent'] * 20)
self.css_text_indent = css._get('text-indent') self.css_text_indent = css._get('text-indent')
try:
self.line_height = max(0, int(css.lineHeight * 20)) self.line_height = max(0, int(css.lineHeight * 20))
except (TypeError, ValueError):
self.line_height = max(0, int(1.2 * css.fontSize * 20))
self.background_color = None if is_table_cell else convert_color(css['background-color']) self.background_color = None if is_table_cell else convert_color(css['background-color'])
self.text_align = {'start':'left', 'left':'left', 'end':'right', 'right':'right', 'center':'center', 'justify':'both', 'centre':'center'}.get( self.text_align = {'start':'left', 'left':'left', 'end':'right', 'right':'right', 'center':'center', 'justify':'both', 'centre':'center'}.get(
css['text-align'].lower(), 'left') css['text-align'].lower(), 'left')