Czas: %(czas)s min
-Forma: %(forma)s
+X-Git-Url: https://git.mdrn.pl/librarian.git/blobdiff_plain/11d863057b43462248572daed7c8fc698d573b3d..b575a407e307dbf28f9f3347e9f130c31569cfe6:/librarian/pyhtml.py diff --git a/librarian/pyhtml.py b/librarian/pyhtml.py index f358178..c039ab8 100644 --- a/librarian/pyhtml.py +++ b/librarian/pyhtml.py @@ -16,7 +16,7 @@ class EduModule(Xmill): def __init__(self, options=None): super(EduModule, self).__init__(options) self.activity_counter = 0 - self.register_text_filter(lambda t: functions.substitute_entities(None, t)) + self.register_text_filter(functions.substitute_entities) def handle_powiesc(self, element): return u""" @@ -33,8 +33,8 @@ class EduModule(Xmill): handle_dzielo_nadrzedne = tag("span", "collection") handle_podtytul = tag("span", "subtitle") handle_naglowek_akt = handle_naglowek_czesc = handle_srodtytul = tag("h2") - handle_naglowek_scena = handle_naglowek_rozdzial = tag('h3') - handle_naglowek_osoba = handle_naglowek_podrozdzial = tag('h4') + handle_naglowek_scena = handle_naglowek_rozdzial = tag('h2') + handle_naglowek_osoba = handle_naglowek_podrozdzial = tag('h3') handle_akap = handle_akap_dialog = handle_akap_cd = tag('p', 'paragraph') handle_strofa = tag('div', 'stanza') @@ -42,9 +42,9 @@ class EduModule(Xmill): self.activity_counter += 1 self.options = { 'activity': True, - 'activity_counter': self.activity_counter + 'activity_counter': self.activity_counter, } - submill = EduModule(self.options) + submill = EduModule(dict(self.options.items() + {'sub_gen': True}.items())) opis = submill.generate(element.xpath('opis')[0]) @@ -65,26 +65,27 @@ class EduModule(Xmill): return u"""
Czas: %(czas)s min
-Forma: %(forma)s
+