X-Git-Url: https://git.mdrn.pl/librarian.git/blobdiff_plain/1e438727014e352799b4dfb8d3dfb2f8e7a58251..f492e325efb42a3348b2479a0fd0ffc3c484657b:/librarian/pdf.py diff --git a/librarian/pdf.py b/librarian/pdf.py index 1989239..5f6f0a2 100644 --- a/librarian/pdf.py +++ b/librarian/pdf.py @@ -32,12 +32,12 @@ functions.reg_ends_white() functions.reg_texcommand() STYLESHEETS = { - 'wl2tex': 'xslt/wl2tex.xslt', + 'wl2tex': 'pdf/wl2tex.xslt', } def insert_tags(doc, split_re, tagname, exclude=None): - """ inserts for every occurence of `split_re' in text nodes in the `doc' tree + """ inserts for every occurence of `split_re' in text nodes in the `doc' tree >>> t = etree.fromstring('A-B-CX-Y-Z'); >>> insert_tags(t, re.compile('-'), 'd'); @@ -67,7 +67,7 @@ def insert_tags(doc, split_re, tagname, exclude=None): def substitute_hyphens(doc): - insert_tags(doc, + insert_tags(doc, re.compile("(?<=[^-\s])-(?=[^-\s])"), "dywiz", exclude=[DCNS("identifier.url"), DCNS("rights.license")] @@ -75,7 +75,7 @@ def substitute_hyphens(doc): def fix_hanging(doc): - insert_tags(doc, + insert_tags(doc, re.compile("(?<=\s\w)\s+"), "nbsp", exclude=[DCNS("identifier.url"), DCNS("rights.license")] @@ -128,13 +128,18 @@ def hack_motifs(doc): def parse_creator(doc): - """ find all dc:creator tags and add dc:creator_parsed with forenames first """ - for creator in doc.findall('//'+DCNS('creator')): - p = Person.from_text(creator.text) - creator_parsed = deepcopy(creator) - creator_parsed.tag = DCNS('creator_parsed') - creator_parsed.text = ' '.join(p.first_names + (p.last_name,)) - creator.getparent().insert(0, creator_parsed) + """ find all dc:creator and dc.contributor tags and add *_parsed versions with forenames first """ + for person in doc.xpath("|".join('//dc:'+(tag) for tag in ( + 'creator', 'contributor.translator', 'contributor.editor', 'contributor.technical_editor')), + namespaces = {'dc': str(DCNS)})[::-1]: + if not person.text: + continue + p = Person.from_text(person.text) + person_parsed = deepcopy(person) + person_parsed.tag = person.tag + '_parsed' + person_parsed.set('sortkey', person.text) + person_parsed.text = p.readable() + person.getparent().insert(0, person_parsed) def get_stylesheet(name): @@ -142,7 +147,7 @@ def get_stylesheet(name): def package_available(package, args='', verbose=False): - """ check if a verion of a latex package accepting given args is available """ + """ check if a verion of a latex package accepting given args is available """ tempdir = mkdtemp('-wl2pdf-test') fpath = os.path.join(tempdir, 'test.tex') f = open(fpath, 'w') @@ -161,7 +166,7 @@ def package_available(package, args='', verbose=False): return p == 0 -def transform(provider, slug=None, file_path=None, +def transform(provider, slug=None, file_path=None, output_file=None, output_dir=None, make_dir=False, verbose=False, save_tex=None, morefloats=None): """ produces a PDF file with XeLaTeX @@ -224,7 +229,7 @@ def transform(provider, slug=None, file_path=None, # 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) @@ -266,7 +271,7 @@ def transform(provider, slug=None, file_path=None, def load_including_children(provider, slug=None, uri=None, file_path=None): - """ makes one big xml file with children inserted at end + """ makes one big xml file with children inserted at end either slug or uri must be provided """ @@ -286,9 +291,8 @@ def load_including_children(provider, slug=None, uri=None, file_path=None): parse_dublincore=True) f.close() - for child_uri in document.book_info.parts: + print child_uri child = load_including_children(provider, uri=child_uri) document.edoc.getroot().append(child.edoc.getroot()) - return document