X-Git-Url: https://git.mdrn.pl/librarian.git/blobdiff_plain/bfdf1fb55d9a5ee7be5a16ef73e6237ad949ddcb..527b1f9a4cfd256107d1c8fb7fe2f208a5be9409:/librarian/pypdf.py?ds=sidebyside
diff --git a/librarian/pypdf.py b/librarian/pypdf.py
index adc414c..2bcd8d0 100644
--- a/librarian/pypdf.py
+++ b/librarian/pypdf.py
@@ -108,11 +108,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 +137,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 +155,7 @@ class EduModule(Xmill):
return u"""
- """, """"""
+ """, """"""
@escape(1)
def handle_texcommand(self, element):
@@ -198,6 +206,11 @@ class EduModule(Xmill):
handle_wyroznienie = \
handle_texcommand
+ def handle_uwaga(self, _e):
+ return None
+ def handle_extra(self, _e):
+ return None
+
_handle_strofa = cmd("strofa")
def handle_strofa(self, element):
@@ -231,7 +244,7 @@ class EduModule(Xmill):
counter = self.activity_counter
return u"""
-
+
%(counter)d.
%(czas)s
@@ -263,10 +276,13 @@ class EduModule(Xmill):
return None
ltype = element.attrib.get('typ', 'punkt')
if ltype == 'slowniczek':
- surl = element.attrib.get('href', None)
+ surl = element.attrib.get('src', None)
+ if surl is None:
+ # print '** missing src on , setting default'
+ surl = 'http://edukacjamedialna.edu.pl/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',
@@ -305,7 +321,7 @@ class EduModule(Xmill):
definiens_s = ''
# let's pull definiens from another document
- if self.options['slowniczek_xml'] and (not nxt or nxt.tag != 'definiens'):
+ if self.options['slowniczek_xml'] is not None and (nxt is None or nxt.tag != 'definiens'):
sxml = self.options['slowniczek_xml']
assert element.text != ''
defloc = sxml.xpath("//definiendum[text()='%s']" % element.text)
@@ -358,7 +374,7 @@ 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']
@@ -580,9 +596,12 @@ def fix_lists(tree):
class EduModulePDFFormat(PDFFormat):
+ style = get_resource('res/styles/edumed/pdf/edumed.sty')
+
def get_texml(self):
self.attachments = {}
edumod = EduModule({
+ "wldoc": self.wldoc,
"format": self,
"teacher": self.customization.get('teacher'),
})
@@ -593,6 +612,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