From: Robert Błaut Date: Thu, 27 Mar 2014 22:03:14 +0000 (+0100) Subject: [epub] output improvements - clean xhtml instead of html tag soup X-Git-Tag: 1.7~99^2~11 X-Git-Url: https://git.mdrn.pl/librarian.git/commitdiff_plain/99a1bdfd5e55168b52fea0695ce9dbcee3b6b832 [epub] output improvements - clean xhtml instead of html tag soup --- diff --git a/librarian/epub.py b/librarian/epub.py index 08e181e..dae841c 100644 --- a/librarian/epub.py +++ b/librarian/epub.py @@ -390,7 +390,11 @@ def transform_chunk(chunk_xml, chunk_no, annotations, empty=False, _empty_html_s replace_by_verse(chunk_xml) html_tree = xslt(chunk_xml, get_resource('epub/xsltScheme.xsl')) chars = used_chars(html_tree.getroot()) - output_html = etree.tostring(html_tree, method="html", encoding='UTF-8', pretty_print=True) + output_html = etree.tostring(html_tree, pretty_print = True, + xml_declaration = True, + encoding = "utf-8", + doctype='') return output_html, toc, chars @@ -422,7 +426,11 @@ def transform(wldoc, verbose=False, html_tree = xslt(wldoc.edoc, get_resource('epub/xsltTitle.xsl')) chars = used_chars(html_tree.getroot()) zip.writestr('OPS/title.html', - etree.tostring(html_tree, method="html", encoding='UTF-8', pretty_print=True)) + etree.tostring(html_tree, pretty_print = True, + xml_declaration = True, + encoding = "utf-8", + doctype='')) # add a title page TOC entry toc.add(u"Strona tytułowa", "title.html") elif wldoc.book_info.parts: @@ -433,7 +441,12 @@ def transform(wldoc, verbose=False, else: html_tree = xslt(wldoc.edoc, get_resource('epub/xsltChunkTitle.xsl')) chars = used_chars(html_tree.getroot()) - html_string = etree.tostring(html_tree, method="html", encoding='UTF-8', pretty_print=True) + html_string = etree.tostring(html_tree, + pretty_print = True, + xml_declaration = True, + encoding = "utf-8", + doctype='') zip.writestr('OPS/part%d.html' % chunk_counter, html_string) add_to_manifest(manifest, chunk_counter) add_to_spine(spine, chunk_counter) @@ -529,7 +542,9 @@ def transform(wldoc, verbose=False, cover_tree = etree.parse(get_resource('epub/cover.html')) cover_tree.find('//' + XHTMLNS('img')).set('src', cover_name) zip.writestr('OPS/cover.html', etree.tostring( - cover_tree, method="html", encoding='UTF-8', pretty_print=True)) + cover_tree, pretty_print = True, xml_declaration = True, encoding = "utf-8", + doctype='')) if bound_cover.uses_dc_cover: if document.book_info.cover_by: @@ -578,7 +593,11 @@ def transform(wldoc, verbose=False, html_tree = xslt(annotations, get_resource('epub/xsltAnnotations.xsl')) chars = chars.union(used_chars(html_tree.getroot())) zip.writestr('OPS/annotations.html', etree.tostring( - html_tree, method="html", encoding='UTF-8', pretty_print=True)) + html_tree, pretty_print = True, + xml_declaration = True, + encoding = "utf-8", + doctype='')) toc.add("Wesprzyj Wolne Lektury", "support.html") manifest.append(etree.fromstring( @@ -597,7 +616,11 @@ def transform(wldoc, verbose=False, html_tree = xslt(document.edoc, get_resource('epub/xsltLast.xsl')) chars.update(used_chars(html_tree.getroot())) zip.writestr('OPS/last.html', etree.tostring( - html_tree, method="html", encoding='UTF-8', pretty_print=True)) + html_tree, pretty_print = True, + xml_declaration = True, + encoding = "utf-8", + doctype='')) if not flags or not 'without-fonts' in flags: # strip fonts @@ -625,7 +648,9 @@ def transform(wldoc, verbose=False, rmtree(tmpdir) if cwd is not None: os.chdir(cwd) - zip.writestr('OPS/content.opf', etree.tostring(opf, pretty_print=True, xml_declaration = True, encoding='UTF-8')) + zip.writestr('OPS/content.opf', etree.tostring(opf, pretty_print = True, + xml_declaration = True, + encoding = "utf-8")) title = document.book_info.title attributes = "dtb:uid", "dtb:depth", "dtb:totalPageCount", "dtb:maxPageNumber" for st in attributes: @@ -642,7 +667,9 @@ def transform(wldoc, verbose=False, toc.add(u"Spis treści", "toc.html", index=1) zip.writestr('OPS/toc.html', toc.html().encode('utf-8')) toc.write_to_xml(nav_map) - zip.writestr('OPS/toc.ncx', etree.tostring(toc_file, pretty_print=True, xml_declaration = True, encoding='UTF-8')) + zip.writestr('OPS/toc.ncx', etree.tostring(toc_file, pretty_print = True, + xml_declaration = True, + encoding = "utf-8")) zip.close() return OutputFile.from_filename(output_file.name)