[Zope-Checkins] CVS: Zope/lib/python/StructuredText - HTMLClass.py:1.20.50.1 HTMLWithImages.py:1.7.36.1

Wed, 29 May 2002 15:45:53 -0400

Update of /cvs-repository/Zope/lib/python/StructuredText
In directory cvs.zope.org:/tmp/cvs-serv18366/lib/python/StructuredText

Modified Files:
      Tag: zigg_unix-install-control-config-branch
	HTMLClass.py HTMLWithImages.py 
Log Message:
Merge in HEAD (except setup.py... gotta chat about that one) :-)


=== Zope/lib/python/StructuredText/HTMLClass.py 1.20 => 1.20.50.1 ===
         children=doc.getChildNodes()
 
-        if self.header==1:
+        if self.header:
             output('<html>\n')
             if (children and
                  children[0].getNodeName() == 'StructuredTextSection'):
@@ -67,7 +67,7 @@
         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')
 


=== Zope/lib/python/StructuredText/HTMLWithImages.py 1.7 => 1.7.36.1 ===
     element_types = ets
 
-    def document(self, doc, level, output):
-        output('<html>\n')
-        children=doc.getChildNodes()
-        if (children and
-            children[0].getNodeName() == 'StructuredTextSection'):
-           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')
 
     def image(self, doc, level, output):
        if hasattr(doc, 'key'):
@@ -41,6 +29,3 @@
        if doc.getNodeValue() and hasattr(doc, 'key'):
            output('<p><b>Figure %s</b> %s</p>\n' % (doc.key, doc.getNodeValue()))
 
-    def xref(self, doc, level, output):
-        val = doc.getNodeValue()
-        output('<a href="#ref%s">[%s]</a>' % (val, val) )




