# HG changeset patch
# User cmlenz
# Date 1156252569 0
# Node ID 181d292eafa2ed62e7fe5a9dbf3040abbb9e97b9
# Parent  1f6ca50287700742adfe5c672d334c0584d0f91a
Interpolate multiline expressions in templates. Thanks to Christian Boos for reporting the problem and providing the fix.

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
 Version 0.2
 http://svn.edgewall.org/repos/markup/tags/0.2.0/
-(?, from branches/stable/0.2.x)
+(Aug 22 2006, from branches/stable/0.2.x)
 
  * XPath syntax errors now contain position info (ticket #20).
  * Errors in expression evaluation now contain the correct line number in the
@@ -31,6 +31,8 @@
    literals before).
  * XPath expressions in now support XPath variables ($var) in predicates
    (ticket #31).
+ * Expressions in templates can now span multiple lines if they are enclosed
+   in curly braces.
 
 
 Version 0.1
diff --git a/markup/template.py b/markup/template.py
--- a/markup/template.py
+++ b/markup/template.py
@@ -825,7 +825,7 @@
 
         self.stream = stream
 
-    _FULL_EXPR_RE = re.compile(r'(?<!\$)\$\{(.+?)\}')
+    _FULL_EXPR_RE = re.compile(r'(?<!\$)\$\{(.+?)\}', re.DOTALL)
     _SHORT_EXPR_RE = re.compile(r'(?<!\$)\$([a-zA-Z][a-zA-Z0-9_\.]*)')
 
     def _interpolate(cls, text, filename=None, lineno=-1, offset=-1):
diff --git a/markup/tests/template.py b/markup/tests/template.py
--- a/markup/tests/template.py
+++ b/markup/tests/template.py
@@ -498,6 +498,20 @@
           <greeting name="Dude"/>
         </div>""", str(tmpl.generate(tagname='sayhello')))
 
+    # FIXME
+    #def test_match_after_step(self):
+    #    tmpl = Template("""<div xmlns:py="http://markup.edgewall.org/">
+    #      <span py:match="div/greeting">
+    #        Hello ${select('@name')}
+    #      </span>
+    #      <greeting name="Dude" />
+    #    </div>""")
+    #    self.assertEqual("""<div>
+    #      <span>
+    #        Hello Dude
+    #      </span>
+    #    </div>""", str(tmpl.generate()))
+
 
 class StripDirectiveTestCase(unittest.TestCase):
     """Tests for the `py:strip` template directive."""
@@ -596,6 +610,12 @@
         tmpl = Template('<root> ${var} $var</root>')
         self.assertEqual('<root> 42 42</root>', str(tmpl.generate(var=42)))
 
+    def test_interpolate_multiline(self):
+        tmpl = Template("""<root>${dict(
+          bar = 'baz'
+        )[foo]}</root>""")
+        self.assertEqual('<root>baz</root>', str(tmpl.generate(foo='bar')))
+
     def test_interpolate_non_string_attrs(self):
         tmpl = Template('<root attr="${1}"/>')
         self.assertEqual('<root attr="1"/>', str(tmpl.generate()))