X-Git-Url: https://git.mdrn.pl/librarian.git/blobdiff_plain/c220cf2765a0c7bef4094b2628a20f45d99f6068..e1874b83cbc052de4c83aaf31c4091a31280b2fb:/librarian/epub.py diff --git a/librarian/epub.py b/librarian/epub.py index 8d4e73f..7fd6daf 100644 --- a/librarian/epub.py +++ b/librarian/epub.py @@ -462,6 +462,7 @@ def transform(wldoc, verbose=False, style=None, html_toc=False, doctype='' ) + html_string = re.sub(ur'([^\r])\n', ur'\1\r\n', html_string) zip.writestr('OPS/part%d.html' % chunk_counter, html_string) add_to_manifest(manifest, chunk_counter) add_to_spine(spine, chunk_counter) @@ -675,12 +676,13 @@ def transform(wldoc, verbose=False, style=None, html_toc=False, ''.join(chars).encode('utf-8'), get_resource('fonts/' + fname), os.path.join(tmpdir, fname)] + env = {"PERL_USE_UNSAFE_INC": "1"} if verbose: print "Running font-optimizer" - subprocess.check_call(optimizer_call) + subprocess.check_call(optimizer_call, env=env) else: dev_null = open(os.devnull, 'w') - subprocess.check_call(optimizer_call, stdout=dev_null, stderr=dev_null) + subprocess.check_call(optimizer_call, stdout=dev_null, stderr=dev_null, env=env) zip.write(os.path.join(tmpdir, fname), os.path.join('OPS', fname)) manifest.append(etree.fromstring( '' % (fname, fname)))