strip BOM

[librarian.git] / librarian / html.py

diff --git a/librarian/html.py b/librarian/html.py
index 92fc134..9401a01 100644 (file)
--- a/librarian/html.py
+++ b/librarian/html.py
@@ -11,16 +11,11 @@ import copy
 from lxml import etree
 from librarian.parser import WLDocument
 from librarian import XHTMLNS, ParseError
+from librarian import functions
 
 from lxml.etree import XMLSyntaxError, XSLTApplyError
 
-ENTITY_SUBSTITUTIONS = [
-    (u'---', u'—'),
-    (u'--', u'–'),
-    (u'...', u'…'),
-    (u',,', u'„'),
-    (u'"', u'”'),
-]
+functions.reg_substitute_entities()
 
 STYLESHEETS = {
     'legacy': 'xslt/book2html.xslt',
@@ -31,18 +26,6 @@ STYLESHEETS = {
 def get_stylesheet(name):
     return os.path.join(os.path.dirname(__file__), STYLESHEETS[name])
 
-def substitute_entities(context, text):
-    """XPath extension function converting all entites in passed text."""
-    if isinstance(text, list):
-        text = ''.join(text)
-    for entity, substitutution in ENTITY_SUBSTITUTIONS:
-        text = text.replace(entity, substitutution)
-    return text
-
-# Register substitute_entities function with lxml
-ns = etree.FunctionNamespace('http://wolnelektury.pl/functions')
-ns['substitute_entities'] = substitute_entities
-
 def html_has_content(text):
     return etree.ETXPath('//p|//{%(ns)s}p|//h1|//{%(ns)s}h1' % {'ns': str(XHTMLNS)})(text)
 
@@ -66,6 +49,8 @@ def transform(input, output_filename=None, is_file=True, \
             document = WLDocument.from_string(input, True, \
                 parse_dublincore=parse_dublincore)
 
+        document.clean_ed_note()
+
         result = document.transform(style, **options)
         del document # no longer needed large object :)
 
@@ -74,7 +59,7 @@ def transform(input, output_filename=None, is_file=True, \
             add_table_of_contents(result.getroot())
 
             if output_filename is not None:
-                result.write(output_filename, xml_declaration=False, pretty_print=True, encoding='utf-8')
+                result.write(output_filename, method='html', xml_declaration=False, pretty_print=True, encoding='utf-8')
             else:
                 return result
             return True
@@ -221,6 +206,7 @@ def add_anchors(root):
     counter = 1
     for element in root.iterdescendants():
         if any_ancestor(element, lambda e: e.get('class') in ('note', 'motto', 'motto_podpis', 'dedication')
+        or e.get('id') == 'nota_red'
         or e.tag == 'blockquote'):
             continue