X-Git-Url: https://git.mdrn.pl/librarian.git/blobdiff_plain/f20435fd054f9176b8f867cd85322697d242b493..f3e3374103ee892540927b65acc2231a10e493b7:/librarian/pypdf.py?ds=sidebyside
diff --git a/librarian/pypdf.py b/librarian/pypdf.py
index b56d1a6..b261eb6 100644
--- a/librarian/pypdf.py
+++ b/librarian/pypdf.py
@@ -9,30 +9,20 @@ Creates one big XML from the book and its children, converts it to LaTeX
with TeXML, then runs it by XeLaTeX.
"""
-from __future__ import with_statement
from copy import deepcopy
-import os
import os.path
import shutil
-from StringIO import StringIO
-from tempfile import mkdtemp, NamedTemporaryFile
import re
import random
-from copy import deepcopy
-from subprocess import call, PIPE
from urllib2 import urlopen
-from Texml.processor import process
from lxml import etree
-from lxml.etree import XMLSyntaxError, XSLTApplyError
from xmlutils import Xmill, tag, tagged, ifoption, tag_open_close
from librarian.dcparser import Person
-from librarian.parser import WLDocument
-from librarian import ParseError, DCNS, get_resource, IOFile, Format
+from librarian import DCNS, get_resource, IOFile
from librarian import functions
-from pdf import PDFFormat
-
+from pdf import PDFFormat, substitute_hyphens, fix_hanging
def escape(really):
@@ -85,9 +75,9 @@ class EduModule(Xmill):
if self.options['strofa']:
txt = txt.replace("/\n", '')
return txt
+ self.register_text_filter(swap_endlines)
self.register_text_filter(functions.substitute_entities)
self.register_text_filter(mark_alien_characters)
- self.register_text_filter(swap_endlines)
def get_dc(self, element, dc_field, single=False):
values = map(lambda t: t.text, element.xpath("//dc:%s" % dc_field, namespaces={'dc': DCNS.uri}))
@@ -108,11 +98,15 @@ class EduModule(Xmill):
u''
@escape(True)
- def get_authors(self, element):
- authors = self.get_dc(element, 'creator.expert') + \
- self.get_dc(element, 'creator.scenario') + \
- self.get_dc(element, 'creator.textbook')
- return u', '.join(authors)
+ def get_authors(self, element, which=None):
+ dc = self.options['wldoc'].book_info
+ if which is None:
+ authors = dc.authors_textbook + \
+ dc.authors_scenario + \
+ dc.authors_expert
+ else:
+ authors = getattr(dc, "authors_%s" % which)
+ return u', '.join(author.readable() for author in authors)
@escape(1)
def get_title(self, element):
@@ -133,9 +127,13 @@ class EduModule(Xmill):
\\usepackage{morefloats}
}{}'''),
u'''\\def\\authors{%s}''' % self.get_authors(element),
+ u'''\\def\\authorsexpert{%s}''' % self.get_authors(element, 'expert'),
+ u'''\\def\\authorsscenario{%s}''' % self.get_authors(element, 'scenario'),
+ u'''\\def\\authorstextbook{%s}''' % self.get_authors(element, 'textbook'),
+
u'''\\author{\\authors}''',
u'''\\title{%s}''' % self.get_title(element),
- u'''\\def\\bookurl{%s}''' % self.get_dc(element, 'identifier.url', True),
+ u'''\\def\\bookurl{%s}''' % self.options['wldoc'].book_info.url.canonical(),
u'''\\def\\rightsinfo{%s}''' % self.get_rightsinfo(element),
u'']
@@ -147,7 +145,7 @@ class EduModule(Xmill):
return u"""
- """, """"""
+ """, """"""
@escape(1)
def handle_texcommand(self, element):
@@ -196,8 +194,17 @@ class EduModule(Xmill):
handle_srodtytul = \
handle_tytul_dziela = \
handle_wyroznienie = \
+ handle_dywiz = \
handle_texcommand
+ def handle_uwaga(self, _e):
+ return None
+ def handle_extra(self, _e):
+ return None
+
+ def handle_nbsp(self, _e):
+ return ''
+
_handle_strofa = cmd("strofa")
def handle_strofa(self, element):
@@ -213,7 +220,10 @@ class EduModule(Xmill):
}
submill = EduModule(self.options)
- opis = submill.generate(element.xpath('opis')[0])
+ if element.xpath('opis'):
+ opis = submill.generate(element.xpath('opis')[0])
+ else:
+ opis = ''
n = element.xpath('wskazowki')
if n: wskazowki = submill.generate(n[0])
@@ -231,7 +241,7 @@ class EduModule(Xmill):
counter = self.activity_counter
return u"""
-
+
%(counter)d.
%(czas)s
@@ -259,17 +269,20 @@ class EduModule(Xmill):
return
def handle_lista(self, element, attrs={}):
- if not element.findall("punkt"):
- return None
ltype = element.attrib.get('typ', 'punkt')
+ if not element.findall("punkt"):
+ if ltype == 'czytelnia':
+ return 'W przygotowaniu.'
+ else:
+ return None
if ltype == 'slowniczek':
surl = element.attrib.get('src', None)
if surl is None:
# print '** missing src on , setting default'
- surl = 'http://edukacjamedialna.edu.pl/slowniczek'
+ surl = 'http://edukacjamedialna.edu.pl/lekcje/slowniczek/'
sxml = None
if surl:
- sxml = etree.fromstring(self.options['provider'].by_uri(surl).get_string())
+ sxml = etree.fromstring(self.options['wldoc'].provider.by_uri(surl).get_string())
self.options = {'slowniczek': True, 'slowniczek_xml': sxml }
listcmd = {'num': 'enumerate',
@@ -361,11 +374,11 @@ class EduModule(Xmill):
else:
return cmd('href', parms=[element.attrib['url']])(self, element)
else:
- return cmd('em')(self, element)
+ return cmd('emph')(self, element)
def handle_obraz(self, element):
frmt = self.options['format']
- name = element.attrib['nazwa'].strip()
+ name = element.attrib.get('nazwa', '').strip()
image = frmt.get_image(name.strip())
img_path = "obraz/%s" % name.replace("_", "")
frmt.attachments[img_path] = image
@@ -459,13 +472,13 @@ class Wybor(Exercise):
if not pytania:
pytania = [element]
for p in pytania:
- solutions = re.split(r"[, ]+", p.attrib['rozw'])
+ solutions = re.split(r"[, ]+", p.attrib.get('rozw', ''))
if len(solutions) != 1:
is_single_choice = False
break
choices = p.xpath(".//*[@nazwa]")
uniq = set()
- for n in choices: uniq.add(n.attrib['nazwa'])
+ for n in choices: uniq.add(n.attrib.get('nazwa', ''))
if len(choices) != len(uniq):
is_single_choice = False
break
@@ -542,7 +555,7 @@ class Zastap(Luki):
return question.xpath(".//zastap")
def solution(self, piece):
- return piece.attrib['rozw']
+ return piece.attrib.get('rozw', '')
def list_header(self):
return u"Elementy do wstawienia"
@@ -583,10 +596,15 @@ def fix_lists(tree):
class EduModulePDFFormat(PDFFormat):
+ style = get_resource('res/styles/edumed/pdf/edumed.sty')
+
def get_texml(self):
+ substitute_hyphens(self.wldoc.edoc)
+ fix_hanging(self.wldoc.edoc)
+
self.attachments = {}
edumod = EduModule({
- 'provider': self.wldoc.provider,
+ "wldoc": self.wldoc,
"format": self,
"teacher": self.customization.get('teacher'),
})
@@ -597,6 +615,7 @@ class EduModulePDFFormat(PDFFormat):
def get_tex_dir(self):
temp = super(EduModulePDFFormat, self).get_tex_dir()
+ shutil.copy(get_resource('res/styles/edumed/logo.png'), temp)
for name, iofile in self.attachments.items():
iofile.save_as(os.path.join(temp, name))
return temp