Version 2.2

[librarian.git] / src / librarian / elements / base.py

diff --git a/src/librarian/elements/base.py b/src/librarian/elements/base.py
index 5317268..3e0f898 100644 (file)
--- a/src/librarian/elements/base.py
+++ b/src/librarian/elements/base.py
@@ -62,11 +62,27 @@ class WLElement(etree.ElementBase):
     def gettext(self):
         return get_translation(self.meta.language).gettext
 
     def gettext(self):
         return get_translation(self.meta.language).gettext
 

+    def in_context_of(self, setting):
+        parent = self.getparent()
+        if parent is None:
+            return False
+        try:
+            return getattr(parent, setting)
+        except AttributeError:
+            return parent.in_context_of(setting)
+
+    def signal(self, signal):
+        parent = self.getparent()
+        if parent is not None:
+            parent.signal(signal)
+    

     def raw_printable_text(self):
         # TODO: podtagi, wyroznienia, etc
         t = ''
         t += self.normalize_text(self.text)
         for c in self:
     def raw_printable_text(self):
         # TODO: podtagi, wyroznienia, etc
         t = ''
         t += self.normalize_text(self.text)
         for c in self:

+            if not isinstance(c, WLElement):
+                continue

             if c.tag not in ('pe', 'pa', 'pt', 'pr', 'motyw'):
                 t += c.raw_printable_text()
             t += self.normalize_text(c.tail)
             if c.tag not in ('pe', 'pa', 'pt', 'pr', 'motyw'):
                 t += c.raw_printable_text()
             t += self.normalize_text(c.tail)


@@ -152,16 +168,20 @@ class WLElement(etree.ElementBase):
         return attr
 
     def epub_build(self, builder):
         return attr
 
     def epub_build(self, builder):

+        from librarian.elements.masters import Master
+

         # TEMPORARY
         self.CAN_HAVE_TEXT = True
         self.STRIP = False
         # TEMPORARY
         self.CAN_HAVE_TEXT = True
         self.STRIP = False

-        
-        if self.EPUB_START_CHUNK:
+       
+        start_chunk = self.EPUB_START_CHUNK and isinstance(self.getparent(), Master)
+
+        if start_chunk:

             builder.start_chunk()
 
         fragment = None
             builder.start_chunk()
 
         fragment = None

-        if self.SECTION_PRECEDENCE:
-            if not self.EPUB_START_CHUNK:
+        if self.SECTION_PRECEDENCE and not self.in_context_of('NO_TOC'):
+            if not start_chunk:

                 fragment = 'sub%d' % builder.assign_section_number()
                 self.attrib['id'] = fragment
 
                 fragment = 'sub%d' % builder.assign_section_number()
                 self.attrib['id'] = fragment
 


@@ -183,7 +203,22 @@ class WLElement(etree.ElementBase):
         self._epub_build_inner(builder)
         if self.EPUB_TAG:
             builder.end_element()
         self._epub_build_inner(builder)
         if self.EPUB_TAG:
             builder.end_element()

-            
+
+    def validate(self):
+        from librarian.elements.masters import Master
+        from librarian.elements.blocks import DlugiCytat, PoezjaCyt
+        from librarian.elements.footnotes import Footnote
+
+        if self.SECTION_PRECEDENCE:
+            assert isinstance(self.getparent(), (Master, DlugiCytat, PoezjaCyt, Footnote)), \
+                    'Header {} inside a <{}> instead of a master.'.format(
+                            etree.tostring(self), self.getparent().tag)
+
+        for c in self:
+            if isinstance(c, WLElement):
+                c.validate()
+
+

     def sanitize(self):
         # TODO: Remove insanity here.
         for e in self:
     def sanitize(self):
         # TODO: Remove insanity here.
         for e in self: