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

MOBI Output: Fix regression that broke conversion of <svg> elements in the input document when the <svg> element was followed by non-whitespace text. Fixes #7083 (Problem to convert epub->mobi)

Browse Source
This commit is contained in:
Kovid Goyal 2010-10-17 09:24:45 -06:00
parent 30b3d2a564
commit 30296b3426
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/calibre/ebooks/oeb/base.py
View File

@ -282,9 +282,9 @@ def XPath(expr):
def xpath(elem, expr): def xpath(elem, expr):
return elem.xpath(expr, namespaces=XPNSMAP) return elem.xpath(expr, namespaces=XPNSMAP)
def xml2str(root, pretty_print=False, strip_comments=False): def xml2str(root, pretty_print=False, strip_comments=False, with_tail=True):
ans = etree.tostring(root, encoding='utf-8', xml_declaration=True, ans = etree.tostring(root, encoding='utf-8', xml_declaration=True,
pretty_print=pretty_print) pretty_print=pretty_print, with_tail=with_tail)
if strip_comments: if strip_comments:
ans = re.compile(r'<!--.*?-->', re.DOTALL).sub('', ans) ans = re.compile(r'<!--.*?-->', re.DOTALL).sub('', ans)

2
src/calibre/ebooks/oeb/transforms/rasterize.py
View File

@ -55,7 +55,7 @@ class SVGRasterizer(object):
self.rasterize_cover() self.rasterize_cover()
def rasterize_svg(self, elem, width=0, height=0, format='PNG'): def rasterize_svg(self, elem, width=0, height=0, format='PNG'):
data = QByteArray(xml2str(elem)) data = QByteArray(xml2str(elem, with_tail=False))
svg = QSvgRenderer(data) svg = QSvgRenderer(data)
size = svg.defaultSize() size = svg.defaultSize()
view_box = elem.get('viewBox', elem.get('viewbox', None)) view_box = elem.get('viewBox', elem.get('viewbox', None))