Changeset 121:90c6fb00ea5a

Timestamp:

03/24/09 09:56:11 (16 months ago)

Author:

Nicolas ?vrard <nicoe@…>

Parents:

120:e103a74a8d84 (diff), 119:5c2412920bff (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Branch:

default

Message:

Merge with openhex-branch

Location:

relatorio/templates/opendocument.py

Files:

• . (modified) (1 diff)
• . (modified) (1 diff)

relatorio/templates/opendocument.py

@@ -333 +333 @@
 
                 # - we create a <py:xxx> node
-                if attr is not None:
-                    attribs = {attr: a_val}
-                else:
-                    attribs = {}
+                attribs = {attr: a_val} if attr is not None else {}
                 genshi_node = EtreeElement('{%s}%s' % (py_namespace,
                                                        directive),

relatorio/templates/opendocument.py

@@ -127 +127 @@
     """
     old_parent = first.getparent()
+
+    # Any text after the opening tag (and not within a tag) need to be handled
+    # explicitly. For example in <if>xxx<span>yyy</span>zzz</if>, zzz is
+    # copied along the span tag, but not xxx, which corresponds to the tail
+    # attribute of the opening tag.
+    if first.tail:
+        new_parent.text = first.tail
     for node in first.itersiblings():
         if node is last: