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

DOCX Output: Fix lengths specified in percentage of page size not being converted correctly. See #1688690 (links do not work when converted azw3 to docx; pictures too big)

Browse Source
This commit is contained in:
Kovid Goyal 2017-05-06 11:36:40 +05:30
parent f273fe407e
commit d68eb98518
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,7 +9,7 @@ __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
import re import re
from collections import Counter from collections import Counter
from calibre.ebooks.docx.writer.container import create_skeleton, page_size from calibre.ebooks.docx.writer.container import create_skeleton, page_size, page_effective_area
from calibre.ebooks.docx.writer.styles import StylesManager, FloatSpec from calibre.ebooks.docx.writer.styles import StylesManager, FloatSpec
from calibre.ebooks.docx.writer.links import LinksManager from calibre.ebooks.docx.writer.links import LinksManager
from calibre.ebooks.docx.writer.images import ImagesManager from calibre.ebooks.docx.writer.images import ImagesManager
@ -413,6 +413,8 @@ class Convert(object):
self.log, self.opts = docx.log, docx.opts self.log, self.opts = docx.log, docx.opts
self.mi = mi self.mi = mi
self.cover_img = None self.cover_img = None
p = self.opts.output_profile
p.width_pts, p.height_pts = page_effective_area(self.opts)
def __call__(self): def __call__(self):
from calibre.ebooks.oeb.transforms.rasterize import SVGRasterizer from calibre.ebooks.oeb.transforms.rasterize import SVGRasterizer
@ -464,7 +466,7 @@ class Convert(object):
self.current_item = item self.current_item = item
stylizer = self.svg_rasterizer.stylizer_cache.get(item) stylizer = self.svg_rasterizer.stylizer_cache.get(item)
if stylizer is None: if stylizer is None:
stylizer = Stylizer(item.data, item.href, self.oeb, self.opts, self.opts.output_profile, base_css=self.base_css) stylizer = Stylizer(item.data, item.href, self.oeb, self.opts, profile=self.opts.output_profile, base_css=self.base_css)
self.abshref = self.images_manager.abshref = item.abshref self.abshref = self.images_manager.abshref = item.abshref
self.current_lang = lang_for_tag(item.data) or self.styles_manager.document_lang self.current_lang = lang_for_tag(item.data) or self.styles_manager.document_lang