From 6511b439dadc8201e81ae932f8a015daf7a81fb8 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Robert=20B=C5=82aut?= <listy@blaut.biz>
Date: Fri, 28 Mar 2014 22:47:37 +0100
Subject: [PATCH] [epub] removed flag with-full-fonts as it is not required any
more
---
librarian/epub.py | 19 ++++++++-----------
1 file changed, 8 insertions(+), 11 deletions(-)
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(
'<item id="%s" href="%s" media-type="application/x-font-truetype" />' % (fname, fname)))
rmtree(tmpdir)
--
2.20.1