fnp / librarian.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
[epub] pep8 tabs removed
[librarian.git] / librarian / epub.py
diff --git a/librarian/epub.py b/librarian/epub.py
index dae841c..e8b972a 100644 (file)
--- 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='<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" ' +
                             '"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">'))
@@ -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='<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" ' +
@@ -543,7 +543,7 @@ def transform(wldoc, verbose=False,
         cover_tree.find('//' + XHTMLNS('img')).set('src', cover_name)
         zip.writestr('OPS/cover.html', etree.tostring(
                         cover_tree, pretty_print = True, xml_declaration = True, encoding = "utf-8",
-                       doctype='<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" ' +
+                        doctype='<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" ' +
                             '"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">'))
 
         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='<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" ' +
+                            xml_declaration = True,
+                            encoding = "utf-8",
+                            doctype='<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" ' +
                             '"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">'))
 
     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='<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" ' +
+                        xml_declaration = True,
+                        encoding = "utf-8",
+                        doctype='<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" ' +
                             '"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">'))
 
     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(
                 '<item id="%s" href="%s" media-type="application/x-font-truetype" />' % (fname, fname)))
         rmtree(tmpdir)