Committed fix for raw testcase.

--HG--
branch : trunk

diff --git a/jinja2/lexer.py b/jinja2/lexer.py
index 98d85d9cb3329a8fe52c0767cc2e5c38d29a9e7a..0d3f69617159938700a52957ea339dde5378fb7a 100644 (file)
--- a/jinja2/lexer.py
+++ b/jinja2/lexer.py
@@ -432,9 +432,10 @@ class Lexer(object):
             'root': [
                 # directives
                 (c('(.*?)(?:%s)' % '|'.join(
-                    [r'(?P<raw_begin>(?:\s*%s\-|%s)\s*raw\s*%s)' % (
+                    [r'(?P<raw_begin>(?:\s*%s\-|%s)\s*raw\s*(?:\-%s\s*|%s))' % (
                         e(environment.block_start_string),
                         e(environment.block_start_string),
+                        e(environment.block_end_string),
                         e(environment.block_end_string)
                     )] + [
                         r'(?P<%s_begin>\s*%s\-|%s)' % (n, r, r)