bugfix

[librarian.git] / src / librarian / builders / html.py

diff --git a/src/librarian/builders/html.py b/src/librarian/builders/html.py
index 165a265..0499d43 100644 (file)
--- a/src/librarian/builders/html.py
+++ b/src/librarian/builders/html.py
@@ -1,10 +1,7 @@
-# coding: utf-8
-from __future__ import unicode_literals
-
-try:
-    from urllib.request import urlopen
-except ImportError:
-    from urllib2 import urlopen
+# This file is part of Librarian, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Wolne Lektury. See NOTICE for more information.
+#
+from urllib.request import urlopen

 from lxml import etree
 from librarian.html import add_anchors, add_table_of_contents, add_table_of_themes
 from librarian import OutputFile
 from lxml import etree
 from librarian.html import add_anchors, add_table_of_contents, add_table_of_themes
 from librarian import OutputFile


@@ -18,12 +15,13 @@ class HtmlBuilder:
     with_footnotes = True
     with_nota_red = True
     no_externalities = False
     with_footnotes = True
     with_nota_red = True
     no_externalities = False

+    orphans = True

 
 

-    def __init__(self, image_location='https://wolnelektury.pl/media/book/pictures/marcos-historia-kolorow/'):
-        self.image_location = image_location
+    def __init__(self, base_url=None):
+        self._base_url = base_url

 
         self.tree = text = etree.Element('div', **{'id': 'book-text'})
 
         self.tree = text = etree.Element('div', **{'id': 'book-text'})

-        self.header = etree.SubElement(text, 'h1')
+        self.header = etree.Element('h1')

 
         self.footnotes = etree.Element('div', id='footnotes')
         self.footnote_counter = 0
 
         self.footnotes = etree.Element('div', id='footnotes')
         self.footnote_counter = 0


@@ -36,18 +34,22 @@ class HtmlBuilder:
             'footnotes': self.footnotes,
             'nota_red': self.nota_red,
         }
             'footnotes': self.footnotes,
             'nota_red': self.nota_red,
         }

-        self.current_cursors = [None]
+        self.current_cursors = [text]

 
     @property
 
     @property

-    def cursor(self):
-        return self.cursors[self.current_cursors[-1]]
+    def base_url(self):
+        if self._base_url is not None:
+            return self._base_url
+        else:
+            return 'https://wolnelektury.pl/media/book/pictures/{}/'.format(self.document.meta.url.slug)

 
 

-    @cursor.setter
-    def cursor(self, value):
-        self.cursors[self.current_cursors[-1]] = value
+    @property
+    def cursor(self):
+        return self.current_cursors[-1]

 
     def enter_fragment(self, fragment):
 
     def enter_fragment(self, fragment):

-        self.current_cursors.append(fragment)
+        cursor = self.cursors.get(fragment, self.cursor)
+        self.current_cursors.append(cursor)

 
     def exit_fragment(self):
         self.current_cursors.pop()
 
     def exit_fragment(self):
         self.current_cursors.pop()


@@ -63,7 +65,9 @@ class HtmlBuilder:
         document._compat_assign_ordered_ids()
         document._compat_assign_section_ids()
 
         document._compat_assign_ordered_ids()
         document._compat_assign_section_ids()
 

-    def build(self, document):
+    def build(self, document, **kwargs):
+        self.document = document
+

         self.preprocess(document)
         document.tree.getroot().html_build(self)
         self.postprocess(document)
         self.preprocess(document)
         document.tree.getroot().html_build(self)
         self.postprocess(document)


@@ -94,6 +98,9 @@ class HtmlBuilder:
             )
             self.exit_fragment()
 
             )
             self.exit_fragment()
 

+        if len(self.header):
+            self.tree.insert(0, self.header)
+            

         if self.with_anchors:
             add_anchors(self.tree)
         if self.with_nota_red and len(self.nota_red):
         if self.with_anchors:
             add_anchors(self.tree)
         if self.with_nota_red and len(self.nota_red):


@@ -110,19 +117,16 @@ class HtmlBuilder:
             self.tree.append(self.footnotes)
 
     def start_element(self, tag, attrib=None):
             self.tree.append(self.footnotes)
 
     def start_element(self, tag, attrib=None):

-        self.cursor = etree.SubElement(
+        self.current_cursors.append(etree.SubElement(

             self.cursor,
             tag,
             **(attrib or {})
             self.cursor,
             tag,
             **(attrib or {})

-        )
+        ))

 
     def end_element(self):
 
     def end_element(self):

-        self.cursor = self.cursor.getparent()
+        self.current_cursors.pop()

 
     def push_text(self, text):
 
     def push_text(self, text):

-        if text == 'Między nami nic nie było':
-            print(self.cursors)
-            print(self.current_cursors)

         cursor = self.cursor
         if len(cursor):
             cursor[-1].tail = (cursor[-1].tail or '') + text
         cursor = self.cursor
         if len(cursor):
             cursor[-1].tail = (cursor[-1].tail or '') + text


@@ -180,6 +184,15 @@ class StandaloneHtmlBuilder(HtmlBuilder):
             )
 
 
             )
 
 

+class SnippetHtmlBuilder(HtmlBuilder):
+    with_anchors = False
+    with_themes = False
+    with_toc = False
+    with_footnotes = False
+    with_nota_red = False
+    with_refs = False
+
+            

 class DaisyHtmlBuilder(StandaloneHtmlBuilder):
     file_extension = 'xhtml'
     with_anchors = False
 class DaisyHtmlBuilder(StandaloneHtmlBuilder):
     file_extension = 'xhtml'
     with_anchors = False