epub: subtitle fix

[librarian.git] / librarian / pdf.py

diff --git a/librarian/pdf.py b/librarian/pdf.py
index af68a1b..baf7be4 100644 (file)
--- a/librarian/pdf.py
+++ b/librarian/pdf.py
@@ -21,7 +21,7 @@ from lxml.etree import XMLSyntaxError, XSLTApplyError
 
 from librarian.dcparser import Person
 from librarian.parser import WLDocument
 
 from librarian.dcparser import Person
 from librarian.parser import WLDocument

-from librarian import ParseError, DCNS
+from librarian import ParseError, DCNS, get_resource

 from librarian import functions
 
 
 from librarian import functions
 
 


@@ -32,7 +32,7 @@ functions.reg_ends_white()
 functions.reg_texcommand()
 
 STYLESHEETS = {
 functions.reg_texcommand()
 
 STYLESHEETS = {

-    'wl2tex': 'xslt/wl2tex.xslt',
+    'wl2tex': 'pdf/wl2tex.xslt',

 }
 
 
 }
 
 


@@ -137,9 +137,6 @@ def parse_creator(doc):
         creator.getparent().insert(0, creator_parsed)
 
 
         creator.getparent().insert(0, creator_parsed)
 
 

-def get_resource(path):
-    return os.path.join(os.path.dirname(__file__), path)
-

 def get_stylesheet(name):
     return get_resource(STYLESHEETS[name])
 
 def get_stylesheet(name):
     return get_resource(STYLESHEETS[name])
 


@@ -227,7 +224,7 @@ def transform(provider, slug=None, file_path=None,
 
         # LaTeX -> PDF
         shutil.copy(get_resource('pdf/wl.sty'), temp)
 
         # LaTeX -> PDF
         shutil.copy(get_resource('pdf/wl.sty'), temp)

-        shutil.copy(get_resource('pdf/wl-logo.png'), temp)
+        shutil.copy(get_resource('res/wl-logo.png'), temp)

 
         cwd = os.getcwd()
         os.chdir(temp)
 
         cwd = os.getcwd()
         os.chdir(temp)


@@ -282,9 +279,11 @@ def load_including_children(provider, slug=None, uri=None, file_path=None):
     else:
         raise ValueError('Neither slug, URI nor file path provided for a book.')
 
     else:
         raise ValueError('Neither slug, URI nor file path provided for a book.')
 

-    document = WLDocument.from_file(f, True,
-        parse_dublincore=True,
-        preserve_lines=False)
+    text = f.read().decode('utf-8')
+    text = re.sub(ur"([\u0400-\u04ff]+)", ur"<alien>\1</alien>", text)
+
+    document = WLDocument.from_string(text, True,
+        parse_dublincore=True)

 
     f.close()
 
 
     f.close()