Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-08 18:54:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

DOCX Output: Add a n option to preserve the cover aspect ratio in the output document. Fixes #1715800 [Conversion to DOCX Results in Stretched Cover Page](https://bugs.launchpad.net/calibre/+bug/1715800)

Browse Source
This commit is contained in:
Kovid Goyal 2017-09-20 19:18:26 +05:30
parent f19fbaf61c
commit ae098550e9
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/calibre/ebooks/conversion/plugins/docx_output.py
View File

@ -33,6 +33,10 @@ class DOCXOutput(OutputFormatPlugin):
help=_('Do not insert the book cover as an image at the start of the document.' help=_('Do not insert the book cover as an image at the start of the document.'
' If you use this option, the book cover will be discarded.')), ' If you use this option, the book cover will be discarded.')),
OptionRecommendation(name='preserve_cover_aspect_ratio', recommended_value=False,
help=_('Preserve the aspect ratio of the cover image instead of stretching'
' it out to cover the entire page.')),
OptionRecommendation(name='docx_no_toc', recommended_value=False, OptionRecommendation(name='docx_no_toc', recommended_value=False,
help=_('Do not insert the table of contents as a page at the start of the document.')), help=_('Do not insert the table of contents as a page at the start of the document.')),

2
src/calibre/ebooks/docx/writer/from_html.py
View File

@ -457,7 +457,7 @@ class Convert(object):
self.blocks.resolve_language() self.blocks.resolve_language()
if self.cover_img is not None: if self.cover_img is not None:
self.cover_img = self.images_manager.create_cover_markup(self.cover_img, *page_size(self.opts)) self.cover_img = self.images_manager.create_cover_markup(self.cover_img, self.opts.preserve_cover_aspect_ratio, *page_size(self.opts))
self.lists_manager.finalize(all_blocks) self.lists_manager.finalize(all_blocks)
self.styles_manager.finalize(all_blocks) self.styles_manager.finalize(all_blocks)
self.write() self.write()

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

@ -184,9 +184,14 @@ class ImagesManager(object):
finally: finally:
item.unload_data_from_memory(False) item.unload_data_from_memory(False)
def create_cover_markup(self, img, width, height): def create_cover_markup(self, img, preserve_aspect_ratio, width, height):
self.count += 1 self.count += 1
makeelement, namespaces = self.document_relationships.namespace.makeelement, self.document_relationships.namespace.namespaces makeelement, namespaces = self.document_relationships.namespace.makeelement, self.document_relationships.namespace.namespaces
if preserve_aspect_ratio:
if img.width >= img.height:
height *= img.height / img.width
else:
width *= img.width / img.height
root = etree.Element('root', nsmap=namespaces) root = etree.Element('root', nsmap=namespaces)
ans = makeelement(root, 'w:drawing', append=False) ans = makeelement(root, 'w:drawing', append=False)