Several regular expressions were using ".*" without "DOTALL" mode, and

hence were unable to cope with the newlines that may occur in HTML
attributes.  This caused sustitution of "str:foo\nbar" to insert
"foo", omitting "\nbar".

lib/python/TAL/DummyEngine.py

@@ -121,7 +121,7 @@ class DummyEngine:
         self.globals[name] = value
 
     def evaluate(self, expression):
-        m = re.match(r"(%s):(.*)" % NAME_RE, expression)
+        m = re.match(r"(?s)(%s):(.*)\Z" % NAME_RE, expression)
         if m:
             type, expr = m.group(1, 2)
         else:

lib/python/TAL/TALDefs.py

@@ -129,8 +129,8 @@ class METALError(TALError):
     pass
 
 import re
-_attr_re = re.compile(r"\s*([^\s]+)\s*(.*)")
-_subst_re = re.compile(r"\s*(?:(text|structure)\s+)?(.*)")
+_attr_re = re.compile(r"\s*([^\s]+)\s*(.*)\Z", re.S)
+_subst_re = re.compile(r"\s*(?:(text|structure)\s+)?(.*)\Z", re.S)
 del re
 
 def parseAttributeReplacements(arg):

lib/python/TAL/test/output/test1.html

@@ -12,7 +12,11 @@
 Is
 The
 Replaced
-Title">This</h1>
+Title">This
+Is
+The
+Replaced
+Title</h1>
 
   <!-- test entity references -->
   &nbsp;&HarryPotter;

lib/python/TAL/tests/output/test1.html

@@ -12,7 +12,11 @@
 Is
 The
 Replaced
-Title">This</h1>
+Title">This
+Is
+The
+Replaced
+Title</h1>
 
   <!-- test entity references -->
   &nbsp;&HarryPotter;