document() function of HTMLWithImages now behaves like in HTMLClass

and recognizes the header attribute

document() function of HTMLWithImages now behaves like in HTMLClass
and recognizes the header attribute
6b3c9211 · Andreas Jung · f6a8b104 · 6b3c9211 · 6b3c9211
Commit 6b3c9211 authored May 22, 2002 by Andreas Jung
Showing with 16 additions and 11 deletions

lib/python/StructuredText/HTMLClass.py lib/python/StructuredText/HTMLClass.py +2 -2

lib/python/StructuredText/HTMLWithImages.py lib/python/StructuredText/HTMLWithImages.py +14 -9

No files found.
--- a/lib/python/StructuredText/HTMLClass.py
+++ b/lib/python/StructuredText/HTMLClass.py
@@ -56,7 +56,7 @@ class HTMLClass:
    def document(self, doc, level, output):
        children=doc.getChildNodes()
-        if self.header==1:
+        if self.header:
            output('<html>\n')
            if (children and
                 children[0].getNodeName() == 'StructuredTextSection'):
@@ -67,7 +67,7 @@ class HTMLClass:
        for c in children:
            getattr(self, self.element_types[c.getNodeName()])(c, level, output)
-        if self.header==1:
+        if self.header:
            output('</body>\n')
            output('</html>\n')

--- a/lib/python/StructuredText/HTMLWithImages.py
+++ b/lib/python/StructuredText/HTMLWithImages.py
@@ -22,17 +22,22 @@ class HTMLWithImages(HTMLClass):
    element_types = ets
    def document(self, doc, level, output):
-        output('<html>\n')
-        children=doc.getChildNodes()
+        if self.header:
-        if (children and
+            output('<html>\n')
-            children[0].getNodeName() == 'StructuredTextSection'):
+            children=doc.getChildNodes()
-           output('<head>\n<title>%s</title>\n</head>\n' %
+            if (children and
-                  children[0].getChildNodes()[0].getNodeValue())
+                children[0].getNodeName() == 'StructuredTextSection'):
-        output('<body>\n')
+               output('<head>\n<title>%s</title>\n</head>\n' %
+                      children[0].getChildNodes()[0].getNodeValue())
+            output('<body>\n')
        for c in children:
           getattr(self, self.element_types[c.getNodeName()])(c, level, output)
-        output('</body>\n')
-        output('</html>\n')
+        if self.header:
+            output('</body>\n')
+            output('</html>\n')
    def image(self, doc, level, output):
       if hasattr(doc, 'key'):