Basic PDF support.

[librarian.git] / librarian / html.py

diff --git a/librarian/html.py b/librarian/html.py
index e04790f..985970a 100644 (file)
--- a/librarian/html.py
+++ b/librarian/html.py
@@ -8,7 +8,7 @@ import cStringIO
 import copy
 
 from lxml import etree
 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
 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())
 
             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
                 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'):
     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)
                 continue
 
             element_text = raw_printable_text(element)