X-Git-Url: https://git.mdrn.pl/librarian.git/blobdiff_plain/6badff0808ac498cca8f405d047316940aac8a03..b0224a1763fd71c1c9ed19e7663d94106a513dc8:/librarian/html.py?ds=sidebyside diff --git a/librarian/html.py b/librarian/html.py index e04790f..985970a 100644 --- a/librarian/html.py +++ b/librarian/html.py @@ -8,7 +8,7 @@ import cStringIO import copy from lxml import etree -from librarian import XHTMLNS, ParseError, OutputFile +from librarian import XHTMLNS, ParseError, IOFile from librarian import functions from lxml.etree import XMLSyntaxError, XSLTApplyError @@ -59,7 +59,7 @@ def transform(wldoc, stylesheet='legacy', options=None, flags=None): add_anchors(result.getroot()) add_table_of_contents(result.getroot()) - return OutputFile.from_string(etree.tostring(result, method='html', + return IOFile.from_string(etree.tostring(result, method='html', xml_declaration=False, pretty_print=True, encoding='utf-8')) else: return None @@ -234,7 +234,7 @@ def add_table_of_contents(root): counter = 1 for element in root.iterdescendants(): if element.tag in ('h2', 'h3'): - if any_ancestor(element, lambda e: e.get('id') in ('footnotes',) or e.get('class') in ('person-list',)): + if any_ancestor(element, lambda e: e.get('id') in ('footnotes', 'nota_red') or e.get('class') in ('person-list',)): continue element_text = raw_printable_text(element)