[Docutils-checkins] docutils/docutils/writers html4css1.py,1.141,1.142

[Felix W. <fel...@us...>]

Update of /cvsroot/docutils/docutils/docutils/writers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25421

Modified Files:
	html4css1.py 
Log Message:
do not surround block-level `raw`s with <span> tags; use <div> instead

Index: html4css1.py
===================================================================
RCS file: /cvsroot/docutils/docutils/docutils/writers/html4css1.py,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -d -r1.141 -r1.142
--- html4css1.py	15 Nov 2004 16:31:46 -0000	1.141
+++ html4css1.py	26 Nov 2004 16:49:56 -0000	1.142
@@ -1027,12 +1027,13 @@
 
     def visit_raw(self, node):
         if 'html' in node.get('format', '').split():
-            add_span = node.attributes.get('class') is not None
-            if add_span:
-                self.body.append(self.starttag(node, 'span', suffix=''))
+            add_class = node.attributes.get('class') is not None
+            t = isinstance(node.parent, nodes.TextElement) and 'span' or 'div'
+            if add_class:
+                self.body.append(self.starttag(node, t, suffix=''))
             self.body.append(node.astext())
-            if add_span:
-                self.body.append('</span>')
+            if add_class:
+                self.body.append('</%s>' % t)
         # Keep non-HTML raw text out of output:
         raise nodes.SkipNode