summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormitsuhiko <devnull@localhost>2009-09-13 00:51:07 -0700
committermitsuhiko <devnull@localhost>2009-09-13 00:51:07 -0700
commiteb0e7b5ab8cdba6867a44d9c7a8020c5c880a774 (patch)
treeb63526e1eaa82b2389c04cfc7943f9e9dbd36504
parent2d2c6f99dd8b489f774acc49e674d007f5d0f28f (diff)
downloadpygments-eb0e7b5ab8cdba6867a44d9c7a8020c5c880a774.tar.gz
Added support for new Jinja2 keywords.
-rw-r--r--CHANGES6
-rw-r--r--pygments/lexers/templates.py3
2 files changed, 8 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index 287cb467..8b40145a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,12 @@ Pygments changelog
Issue numbers refer to the tracker at http://dev.pocoo.org/projects/pygments/.
+Version 1.2
+-----------
+(codename to be selected, release date unknown)
+
+- Added support for new Jinja2 keywords.
+
Version 1.1
-----------
(codename Brillouin, released Sep 11, 2009)
diff --git a/pygments/lexers/templates.py b/pygments/lexers/templates.py
index e81a0c5d..9ae0c3aa 100644
--- a/pygments/lexers/templates.py
+++ b/pygments/lexers/templates.py
@@ -239,7 +239,8 @@ class DjangoLexer(RegexLexer):
bygroups(Keyword, Text, Keyword, Text, Name.Function)),
(r'(_|true|false|none|True|False|None)\b', Keyword.Pseudo),
(r'(in|as|reversed|recursive|not|and|or|is|if|else|import|'
- r'with(?:(?:out)?\s*context)?)\b', Keyword),
+ r'with(?:(?:out)?\s*context)?|scoped|ignore\s+missing)\b',
+ Keyword),
(r'(loop|block|super|forloop)\b', Name.Builtin),
(r'[a-zA-Z][a-zA-Z0-9_]*', Name.Variable),
(r'\.[a-zA-Z0-9_]+', Name.Variable),