X-Git-Url: https://git.mdrn.pl/librarian.git/blobdiff_plain/9117859d83d3df438864bc2d18d961bb82194b74..076474d2a928649c934b4bb12031d39cdea2c77d:/librarian/pyhtml.py?ds=inline
diff --git a/librarian/pyhtml.py b/librarian/pyhtml.py
index 9fd0d97..6db1701 100644
--- a/librarian/pyhtml.py
+++ b/librarian/pyhtml.py
@@ -52,11 +52,14 @@ class EduModule(Xmill):
handle_tytul_dziela = tag('em', 'title')
handle_slowo_obce = tag('em', 'foreign')
+ def naglowek_to_anchor(self, naglowek):
+ return re.sub(r" +", " ", naglowek.text.strip())
+
def handle_nazwa_utworu(self, element):
toc = []
for naglowek in element.getparent().findall('.//naglowek_rozdzial'):
a = etree.Element("a")
- a.attrib["href"] = "#" + naglowek.text
+ a.attrib["href"] = "#" + self.naglowek_to_anchor(naglowek)
a.text = naglowek.text
atxt = etree.tostring(a, encoding=unicode)
toc.append("
%s" % atxt)
@@ -66,7 +69,7 @@ class EduModule(Xmill):
@tagged("h2")
def handle_naglowek_rozdzial(self, element):
- return "", "".join(tag_open_close("a", name=element.text))
+ return "", "".join(tag_open_close("a", name=self.naglowek_to_anchor(element)))
def handle_uwaga(self, _e):
return None
@@ -79,7 +82,10 @@ class EduModule(Xmill):
}
submill = EduModule(dict(self.options.items() + {'sub_gen': True}.items()))
- 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])
@@ -138,7 +144,6 @@ u"""%(wskazowki)s
typ = element.attrib['typ']
self.exercise_counter += 1
- print self.exercise_counter
self.options = {'exercise_counter': self.exercise_counter}
handler = exercise_handlers[typ](self.options)
return handler.generate(element)