X-Git-Url: https://git.mdrn.pl/librarian.git/blobdiff_plain/5ecf203ebb02e8b60616d210f81908bcf3da2634..f2d38866c775f83eb7d941345a1f4ac8a9133290:/librarian/epub.py?ds=sidebyside
diff --git a/librarian/epub.py b/librarian/epub.py
index 24579d9..9e30134 100644
--- a/librarian/epub.py
+++ b/librarian/epub.py
@@ -17,7 +17,7 @@ from tempfile import mkdtemp, NamedTemporaryFile
from shutil import rmtree
from librarian import RDFNS, WLNS, NCXNS, OPFNS, XHTMLNS, OutputFile
-from librarian.cover import WLCover
+from librarian.cover import DefaultEbookCover
from librarian import functions, get_resource
@@ -336,7 +336,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
+ flags: less-advertising, without-fonts, working-copy, with-full-fonts
"""
def transform_file(wldoc, chunk_counter=1, first=True, sample=None):
@@ -418,6 +418,8 @@ def transform(wldoc, verbose=False,
if document.book_info.funders:
document.edoc.getroot().set('funders', u', '.join(
document.book_info.funders))
+ if document.book_info.thanks:
+ document.edoc.getroot().set('thanks', document.book_info.thanks)
opf = xslt(document.book_info.to_etree(), get_resource('epub/xsltContent.xsl'))
manifest = opf.find('.//' + OPFNS('manifest'))
@@ -446,7 +448,7 @@ def transform(wldoc, verbose=False,
if cover:
if cover is True:
- cover = WLCover
+ cover = DefaultEbookCover
cover_file = StringIO()
bound_cover = cover(document.book_info)
@@ -509,7 +511,7 @@ def transform(wldoc, verbose=False,
zip.writestr('OPS/annotations.html', etree.tostring(
html_tree, method="html", pretty_print=True))
- toc.add("Weprzyj Wolne Lektury", "support.html")
+ toc.add("Wesprzyj Wolne Lektury", "support.html")
manifest.append(etree.fromstring(
' '))
spine.append(etree.fromstring(
@@ -538,16 +540,19 @@ 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':
- 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)
+ 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))
else:
- subprocess.check_call(optimizer_call, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
- zip.write(os.path.join(tmpdir, fname), os.path.join('OPS', fname))
+ zip.write(get_resource('fonts/' + fname), os.path.join('OPS', fname))
manifest.append(etree.fromstring(
- ' ' % (fname, fname)))
+ ' ' % (fname, fname)))
rmtree(tmpdir)
if cwd is not None:
os.chdir(cwd)