#964: avoid self-closed tags in html

diff --git a/librarian/epub.py b/librarian/epub.py
index ef07c3f..e25ce8f 100644 (file)
--- a/librarian/epub.py
+++ b/librarian/epub.py
@@ -258,7 +258,7 @@ def transform_chunk(chunk_xml, chunk_no, annotations):
     replace_by_verse(chunk_xml)
     html_tree = xslt(chunk_xml, res('xsltScheme.xsl'))
     chars = used_chars(html_tree.getroot())
     replace_by_verse(chunk_xml)
     html_tree = xslt(chunk_xml, res('xsltScheme.xsl'))
     chars = used_chars(html_tree.getroot())

-    output_html = etree.tostring(html_tree, pretty_print=True)
+    output_html = etree.tostring(html_tree, method="html", pretty_print=True)

     return output_html, toc, chars
 
 
     return output_html, toc, chars
 
 


@@ -286,13 +286,13 @@ def transform(provider, slug=None, file_path=None, output_file=None, output_dir=
             html_tree = xslt(input_xml, res('xsltTitle.xsl'))
             chars = used_chars(html_tree.getroot())
             zip.writestr('OPS/title.html',
             html_tree = xslt(input_xml, res('xsltTitle.xsl'))
             chars = used_chars(html_tree.getroot())
             zip.writestr('OPS/title.html',

-                 etree.tostring(html_tree, pretty_print=True))
+                 etree.tostring(html_tree, method="html", pretty_print=True))

         elif children:
             # write title page for every parent
             html_tree = xslt(input_xml, res('xsltChunkTitle.xsl'))
             chars = used_chars(html_tree.getroot())
             zip.writestr('OPS/part%d.html' % chunk_counter, 
         elif children:
             # write title page for every parent
             html_tree = xslt(input_xml, res('xsltChunkTitle.xsl'))
             chars = used_chars(html_tree.getroot())
             zip.writestr('OPS/part%d.html' % chunk_counter, 

-                etree.tostring(html_tree, pretty_print=True))
+                etree.tostring(html_tree, method="html", pretty_print=True))

             add_to_manifest(manifest, chunk_counter)
             add_to_spine(spine, chunk_counter)
             chunk_counter += 1
             add_to_manifest(manifest, chunk_counter)
             add_to_spine(spine, chunk_counter)
             chunk_counter += 1


@@ -409,7 +409,7 @@ def transform(provider, slug=None, file_path=None, output_file=None, output_dir=
         html_tree = xslt(annotations, res("xsltAnnotations.xsl"))
         chars = chars.union(used_chars(html_tree.getroot()))
         zip.writestr('OPS/annotations.html', etree.tostring(
         html_tree = xslt(annotations, res("xsltAnnotations.xsl"))
         chars = chars.union(used_chars(html_tree.getroot()))
         zip.writestr('OPS/annotations.html', etree.tostring(

-                            html_tree, pretty_print=True))
+                            html_tree, method="html", pretty_print=True))

 
     # strip fonts
     tmpdir = mkdtemp('-librarian-epub')
 
     # strip fonts
     tmpdir = mkdtemp('-librarian-epub')

diff --git a/librarian/html.py b/librarian/html.py
index f7bd618..9401a01 100644 (file)
--- a/librarian/html.py
+++ b/librarian/html.py
@@ -59,7 +59,7 @@ def transform(input, output_filename=None, is_file=True, \
             add_table_of_contents(result.getroot())
 
             if output_filename is not None:
             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
             else:
                 return result
             return True