formatting changes

[wxWidgets.git] / wxPython / samples / stxview / StructuredText / HTMLWithImages.py

diff --git a/wxPython/samples/stxview/StructuredText/HTMLWithImages.py b/wxPython/samples/stxview/StructuredText/HTMLWithImages.py
index 4d1e2f2b052bf5a04d08e716986e6953462bf2fb..2b25a8891cd2108870f426fd8eb51700b93093b1 100644 (file)
--- a/wxPython/samples/stxview/StructuredText/HTMLWithImages.py
+++ b/wxPython/samples/stxview/StructuredText/HTMLWithImages.py
@@ -109,21 +109,16 @@ class HTMLWithImages(HTMLClass):
         output('</body>\n')
         output('</html>\n')
 
-
-    def image(self, doc, level, output):
-        output('<img src="%s" alt="%s">' % (doc.href, doc.getNodeValue()))
-
-
     def image(self, doc, level, output):
        if hasattr(doc, 'key'):
-          output('<a name="%s"></a>\n<img src="%s" alt="%s">' % (doc.key, doc.href, doc.getNodeValue()))
-       else:
-          output('<img src="%s" alt="%s">' % (doc.href, doc.getNodeValue()))
-
+          output('<a name="%s"></a>\n' % doc.key)
+       output('<img src="%s" alt="%s">\n' % (doc.href, doc.getNodeValue()))
+       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="#%s">%s</a>' % (val, val) )
+        output('<a href="#%s">Figure %s</a>' % (val, val) )