X-Git-Url: https://git.mdrn.pl/librarian.git/blobdiff_plain/c6d792e73002970964923c0105b1f0c366d744fc..d2cdfb1fd7968f92b9e98cf8f19c7ccf7835d10f:/librarian/pdf.py diff --git a/librarian/pdf.py b/librarian/pdf.py index c8af03b..652d4bf 100644 --- a/librarian/pdf.py +++ b/librarian/pdf.py @@ -18,6 +18,7 @@ from tempfile import mkdtemp, NamedTemporaryFile import re from copy import deepcopy from subprocess import call, PIPE +from itertools import chain from Texml.processor import process from lxml import etree @@ -27,7 +28,7 @@ from librarian.dcparser import Person from librarian.parser import WLDocument from librarian import ParseError, DCNS, get_resource, OutputFile from librarian import functions -from librarian.cover import DefaultEbookCover +from librarian.cover import make_cover from .sponsor import sponsor_logo @@ -85,7 +86,7 @@ def substitute_hyphens(doc): insert_tags(doc, re.compile("(?<=[^-\s])-(?=[^-\s])"), "dywiz", - exclude=[DCNS("identifier.url"), DCNS("rights.license")] + exclude=[DCNS("identifier.url"), DCNS("rights.license"), "meta"] ) @@ -102,7 +103,7 @@ def fix_tables(doc): if kol.tail is not None: if not kol.tail.strip(): kol.tail = None - for table in doc.iter(tag='tabela'): + for table in chain(doc.iter(tag='tabela'), doc.iter(tag='tabelka')): if table.get('ramka') == '1' or table.get('ramki') == '1': table.set('_format', '|' + 'X|' * len(table[0])) else: @@ -199,7 +200,7 @@ def package_available(package, args='', verbose=False): def transform(wldoc, verbose=False, save_tex=None, morefloats=None, - cover=None, flags=None, customizations=None, ilustr_path=''): + cover=None, flags=None, customizations=None, ilustr_path='', latex_dir=False): """ produces a PDF file with XeLaTeX wldoc: a WLDocument @@ -219,7 +220,7 @@ def transform(wldoc, verbose=False, save_tex=None, morefloats=None, if cover: if cover is True: - cover = DefaultEbookCover + cover = make_cover bound_cover = cover(book_info, width=1200) root.set('data-cover-width', str(bound_cover.width)) root.set('data-cover-height', str(bound_cover.height)) @@ -304,6 +305,9 @@ def transform(wldoc, verbose=False, save_tex=None, morefloats=None, shutil.copy(get_resource('pdf/wl.cls'), temp) shutil.copy(get_resource('res/wl-logo.png'), temp) + if latex_dir: + return temp + try: cwd = os.getcwd() except OSError: @@ -311,7 +315,8 @@ def transform(wldoc, verbose=False, save_tex=None, morefloats=None, os.chdir(temp) # some things work better when compiled twice - for run in xrange(2): + # but they are not enabled now (line numbers) + for run in xrange(1): if verbose: p = call(['xelatex', tex_path]) else: