X-Git-Url: https://git.mdrn.pl/librarian.git/blobdiff_plain/99a1bdfd5e55168b52fea0695ce9dbcee3b6b832..a10487d4ba6917735432fcbda98faf8fd35a77e3:/librarian/epub.py diff --git a/librarian/epub.py b/librarian/epub.py index dae841c..e8b972a 100644 --- a/librarian/epub.py +++ b/librarian/epub.py @@ -405,7 +405,7 @@ def transform(wldoc, verbose=False, sample=n: generate sample e-book (with at least n paragraphs) cover: a cover.Cover factory or True for default - flags: less-advertising, without-fonts, working-copy, with-full-fonts + flags: less-advertising, without-fonts, working-copy """ def transform_file(wldoc, chunk_counter=1, first=True, sample=None): @@ -427,7 +427,7 @@ def transform(wldoc, verbose=False, chars = used_chars(html_tree.getroot()) zip.writestr('OPS/title.html', etree.tostring(html_tree, pretty_print = True, - xml_declaration = True, + xml_declaration = True, encoding = "utf-8", doctype='')) @@ -442,7 +442,7 @@ def transform(wldoc, verbose=False, html_tree = xslt(wldoc.edoc, get_resource('epub/xsltChunkTitle.xsl')) chars = used_chars(html_tree.getroot()) html_string = etree.tostring(html_tree, - pretty_print = True, + pretty_print = True, xml_declaration = True, encoding = "utf-8", doctype='')) if bound_cover.uses_dc_cover: @@ -594,9 +594,9 @@ def transform(wldoc, verbose=False, chars = chars.union(used_chars(html_tree.getroot())) zip.writestr('OPS/annotations.html', etree.tostring( html_tree, pretty_print = True, - xml_declaration = True, - encoding = "utf-8", - doctype='')) toc.add("Wesprzyj Wolne Lektury", "support.html") @@ -617,9 +617,9 @@ def transform(wldoc, verbose=False, chars.update(used_chars(html_tree.getroot())) zip.writestr('OPS/last.html', etree.tostring( html_tree, pretty_print = True, - xml_declaration = True, - encoding = "utf-8", - doctype='')) if not flags or not 'without-fonts' in flags: @@ -632,17 +632,14 @@ def transform(wldoc, verbose=False, os.chdir(os.path.join(os.path.dirname(os.path.realpath(__file__)), 'font-optimizer')) for fname in 'DejaVuSerif.ttf', 'DejaVuSerif-Bold.ttf', 'DejaVuSerif-Italic.ttf', 'DejaVuSerif-BoldItalic.ttf': - if not flags or not 'with-full-fonts' in flags: - optimizer_call = ['perl', 'subset.pl', '--chars', ''.join(chars).encode('utf-8'), - get_resource('fonts/' + fname), os.path.join(tmpdir, fname)] - if verbose: - print "Running font-optimizer" - subprocess.check_call(optimizer_call) - else: - subprocess.check_call(optimizer_call, stdout=subprocess.PIPE, stderr=subprocess.PIPE) - zip.write(os.path.join(tmpdir, fname), os.path.join('OPS', fname)) + optimizer_call = ['perl', 'subset.pl', '--chars', ''.join(chars).encode('utf-8'), + get_resource('fonts/' + fname), os.path.join(tmpdir, fname)] + if verbose: + print "Running font-optimizer" + subprocess.check_call(optimizer_call) else: - zip.write(get_resource('fonts/' + fname), os.path.join('OPS', fname)) + subprocess.check_call(optimizer_call, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + zip.write(os.path.join(tmpdir, fname), os.path.join('OPS', fname)) manifest.append(etree.fromstring( '' % (fname, fname))) rmtree(tmpdir)