From: Robert BÅ‚aut Date: Fri, 28 Mar 2014 21:47:37 +0000 (+0100) Subject: [epub] removed flag with-full-fonts as it is not required any more X-Git-Tag: 1.7~99^2~6 X-Git-Url: https://git.mdrn.pl/librarian.git/commitdiff_plain/6511b439dadc8201e81ae932f8a015daf7a81fb8?ds=sidebyside;hp=-c [epub] removed flag with-full-fonts as it is not required any more --- 6511b439dadc8201e81ae932f8a015daf7a81fb8 diff --git a/librarian/epub.py b/librarian/epub.py index dae841c..e52e524 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): @@ -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)