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

HTMLZ Output: Fix a regression in calibre 5 that broke creating HTMLZ documents when using the option to place CSS inline

Browse Source
This commit is contained in:
Kovid Goyal 2021-01-26 10:37:26 +05:30
parent 40afe08d17
commit 7e9f2b9094
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/ebooks/conversion/plugins/htmlz_output.py
View File

@ -89,7 +89,7 @@ class HTMLZOutput(OutputFormatPlugin):
# CSS # CSS
if opts.htmlz_css_type == 'class' and opts.htmlz_class_style == 'external': if opts.htmlz_css_type == 'class' and opts.htmlz_class_style == 'external':
with open(os.path.join(tdir, u'style.css'), 'wb') as tf: with open(os.path.join(tdir, u'style.css'), 'wb') as tf:
tf.write(htmlizer.get_css(oeb_book)) tf.write(htmlizer.get_css(oeb_book).encode('utf-8'))
# Images # Images
images = htmlizer.images images = htmlizer.images

10
src/calibre/ebooks/htmlz/oeb2html.py
View File

@ -20,7 +20,7 @@ from calibre.ebooks.oeb.base import (
XHTML, XHTML_NS, SVG_NS, barename, namespace, OEB_IMAGES, XLINK, rewrite_links, urlnormalize) XHTML, XHTML_NS, SVG_NS, barename, namespace, OEB_IMAGES, XLINK, rewrite_links, urlnormalize)
from calibre.ebooks.oeb.stylizer import Stylizer from calibre.ebooks.oeb.stylizer import Stylizer
from calibre.utils.logging import default_log from calibre.utils.logging import default_log
from polyglot.builtins import unicode_type, string_or_bytes, as_bytes from polyglot.builtins import unicode_type, string_or_bytes, as_unicode
from polyglot.urllib import urldefrag from polyglot.urllib import urldefrag
SELF_CLOSING_TAGS = {'area', 'base', 'basefont', 'br', 'hr', 'input', 'img', 'link', 'meta'} SELF_CLOSING_TAGS = {'area', 'base', 'basefont', 'br', 'hr', 'input', 'img', 'link', 'meta'}
@ -131,10 +131,10 @@ class OEB2HTML(object):
el.attrib['id'] = self.get_link_id(page.href, el.attrib['id'])[1:] el.attrib['id'] = self.get_link_id(page.href, el.attrib['id'])[1:]
def get_css(self, oeb_book): def get_css(self, oeb_book):
css = b'' css = ''
for item in oeb_book.manifest: for item in oeb_book.manifest:
if item.media_type == 'text/css': if item.media_type == 'text/css':
css += as_bytes(item.data.cssText) + b'\n\n' css += as_unicode(item.data.cssText) + '\n\n'
return css return css
def prepare_string_for_html(self, raw): def prepare_string_for_html(self, raw):
@ -337,9 +337,9 @@ class OEB2HTMLClassCSSizer(OEB2HTML):
output += self.dump_text(item.data.find(XHTML('body')), stylizer, item) output += self.dump_text(item.data.find(XHTML('body')), stylizer, item)
output.append('\n\n') output.append('\n\n')
if self.opts.htmlz_class_style == 'external': if self.opts.htmlz_class_style == 'external':
css = u'<link href="style.css" rel="stylesheet" type="text/css" />' css = '<link href="style.css" rel="stylesheet" type="text/css" />'
else: else:
css = u'<style type="text/css">' + self.get_css(oeb_book) + u'</style>' css = '<style type="text/css">' + self.get_css(oeb_book) + '</style>'
title = u'<title>%s</title>' % prepare_string_for_xml(self.book_title) title = u'<title>%s</title>' % prepare_string_for_xml(self.book_title)
output = [u'<html><head><meta http-equiv="Content-Type" content="text/html;charset=utf-8" />'] + \ output = [u'<html><head><meta http-equiv="Content-Type" content="text/html;charset=utf-8" />'] + \
[css] + [title, u'</head><body>'] + output + [u'</body></html>'] [css] + [title, u'</head><body>'] + output + [u'</body></html>']