[Docutils-checkins] r5314 - trunk/docutils/docutils/writers/html4css1/__init__.py

[<wi...@us...>]

Author: wiemann
Date: 2007-07-05 14:45:43 +0200 (Thu, 05 Jul 2007)
New Revision: 5314

Modified:
   trunk/docutils/docutils/writers/html4css1/__init__.py
Log:
make sure invisible elements do not prevent paragraphs from being compacted

Modified: trunk/docutils/docutils/writers/html4css1/__init__.py
===================================================================
--- trunk/docutils/docutils/writers/html4css1/__init__.py	2007-07-05 10:09:36 UTC (rev 5313)
+++ trunk/docutils/docutils/writers/html4css1/__init__.py	2007-07-05 12:45:43 UTC (rev 5314)
@@ -1167,12 +1167,11 @@
             if child is node:
                 break
             return 0
+        parent_length = len([n for n in node.parent if not isinstance(
+            n, (nodes.Invisible, nodes.label))])
         if ( self.compact_simple
              or self.compact_field_list
-             or (self.compact_p
-                 and (len(node.parent) == 1
-                      or len(node.parent) == 2
-                      and isinstance(node.parent[0], nodes.label)))):
+             or self.compact_p and parent_length == 1):
             return 1
         return 0