X-Git-Url: https://git.mdrn.pl/librarian.git/blobdiff_plain/68b03397a0872d10d3627cea2b92ae36bd59183c..a67b6e3ad2751083a433228454665c212c9a5a1e:/librarian/epub.py?ds=sidebyside diff --git a/librarian/epub.py b/librarian/epub.py index 2584029..e992f40 100644 --- a/librarian/epub.py +++ b/librarian/epub.py @@ -20,6 +20,10 @@ sys.path.append('..') # for running from working copy from librarian import XMLNamespace, RDFNS, DCNS, WLNS, NCXNS, OPFNS, NoDublinCore from librarian.dcparser import BookInfo +from librarian import functions + +functions.reg_person_name() + def inner_xml(node): """ returns node's text and children as a string @@ -211,7 +215,6 @@ class TOC(object): def used_chars(element): """ Lists characters used in an ETree Element """ - print (element.text or '') + (element.tail or '') chars = set((element.text or '') + (element.tail or '')) for child in element: chars = chars.union(used_chars(child)) @@ -400,7 +403,7 @@ def transform(provider, slug, output_file=None, output_dir=None): 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': - subprocess.check_call(['./subset.pl', '--chars', ''.join(chars), res('../fonts/' + fname), os.path.join(tmpdir, fname)]) + subprocess.check_call(['./subset.pl', '--chars', ''.join(chars).encode('utf-8'), res('../fonts/' + fname), os.path.join(tmpdir, fname)]) zip.write(os.path.join(tmpdir, fname), os.path.join('OPS', fname)) rmtree(tmpdir) os.chdir(cwd)