added TextMate bundle and vim syntax files

--HG--
branch : trunk

diff --git a/docs/_static/style.css b/docs/_static/style.css
index 097b229355ac0a53e293d0354a498384b560162b..8bfa23e240f0764a6f191eb2efbc82167287ac35 100644 (file)
--- a/docs/_static/style.css
+++ b/docs/_static/style.css
@@ -134,7 +134,6 @@ p {
     line-height: 20px;
     margin-bottom: 0;
     margin-top: 10px;
-    text-align: justify;
 }
 
 hr {
@@ -254,7 +253,7 @@ div.admonition p {
 }
 
 a.headerlink {
-    color: #B4B4B4;
+    color: #B4B4B4!important;
     font-size: 0.8em;
     margin-left: 8px;
     padding: 0 4px 0 4px;

diff --git a/docs/integration.rst b/docs/integration.rst
index e5c2cb757d4fbe6de3133ef3eb57521aab2da213..02dacef9773481b319bf424a466c9afeae2a4459 100644 (file)
--- a/docs/integration.rst
+++ b/docs/integration.rst
@@ -58,11 +58,20 @@ TODO
 TextMate
 --------
 
-TODO
+Inside the `ext` folder of Jinja2 there is a bundle for TextMate that supports
+syntax highlighting for Jinja1 and Jinja2 for text based templates as well as
+HTML.  It also contains a few often used snippets.
 
 Vim
 ---
 
-TODO
+A syntax plugin for `Vim`_ exists in the Vim-scripts directory as well as the
+ext folder of Jinja2.  `The script <http://www.vim.org/scripts/script.php?script_id=1856>`_
+supports Jinja1 and Jinja2.  Once installed two file types are available `jinja`
+and `htmljinja`.  The first one for text based templates, the latter for HTML
+templates.
+
+Copy the files into your `syntax` folder.
 
 .. _Babel: http://babel.edgewall.org/
+.. _Vim: http://www.vim.org/

diff --git a/ext/Jinja.tmbundle/Commands/Help.tmCommand b/ext/Jinja Templates.tmbundle/Commands/Help.tmCommand
similarity index 74%
rename from ext/Jinja.tmbundle/Commands/Help.tmCommand
rename to ext/Jinja Templates.tmbundle/Commands/Help.tmCommand
index d106dec585056c43a757aebfd5abe260d40dd040..e11951521bc05c9e84cb959f6979250b7a497265 100644 (file)
--- a/ext/Jinja.tmbundle/Commands/Help.tmCommand
+++ b/ext/Jinja Templates.tmbundle/Commands/Help.tmCommand
@@ -10,10 +10,9 @@ html_header "Jinja Help" "Jinja Templates"
 
 Markdown.pl <<'EOF'
 
-This document describes the commands of the TextMate Jinja Templates bundle and how you can use it. For general Jinja help you should read the [Jinja Documentation](http:/jinja.pocoo.org/documentation/ "Jinja Documentation Overview").
+This document describes the commands of the TextMate Jinja Templates bundle and how you can use it. For general Jinja help you should read the documentation on the [Jinja website](http:/jinja.pocoo.org/ "Jinja Webpage").
 
-## Requirements
-The Jinja support requires Jinja to be installed in the default python interpreter the system uses. If Jinja is not installed you cannot use the syntax validator.
+This bundle supports Jinja1 and Jinja2.
 
 EOF
 

diff --git a/ext/Jinja.tmbundle/Commands/Validate Syntax.tmCommand b/ext/Jinja Templates.tmbundle/Commands/Validate Syntax.tmCommand
similarity index 100%
rename from ext/Jinja.tmbundle/Commands/Validate Syntax.tmCommand
rename to ext/Jinja Templates.tmbundle/Commands/Validate Syntax.tmCommand

diff --git a/ext/Jinja.tmbundle/Commands/Wrap in Tag.tmCommand b/ext/Jinja Templates.tmbundle/Commands/Wrap in Tag.tmCommand
similarity index 100%
rename from ext/Jinja.tmbundle/Commands/Wrap in Tag.tmCommand
rename to ext/Jinja Templates.tmbundle/Commands/Wrap in Tag.tmCommand

diff --git a/ext/Jinja.tmbundle/Commands/Wrap in Variable Tag.tmCommand b/ext/Jinja Templates.tmbundle/Commands/Wrap in Variable Tag.tmCommand
similarity index 100%
rename from ext/Jinja.tmbundle/Commands/Wrap in Variable Tag.tmCommand
rename to ext/Jinja Templates.tmbundle/Commands/Wrap in Variable Tag.tmCommand

diff --git a/ext/Jinja Templates.tmbundle/Macros/No automatic Completion for {.tmMacro b/ext/Jinja Templates.tmbundle/Macros/No automatic Completion for {.tmMacro
new file mode 100644 (file)
index 0000000..571bf38
--- /dev/null
+++ b/ext/Jinja Templates.tmbundle/Macros/No automatic Completion for {.tmMacro
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+       <key>commands</key>
+       <array>
+               <dict>
+                       <key>argument</key>
+                       <string>{</string>
+                       <key>command</key>
+                       <string>insertText:</string>
+               </dict>
+               <dict>
+                       <key>command</key>
+                       <string>deleteForward:</string>
+               </dict>
+       </array>
+       <key>keyEquivalent</key>
+       <string>{</string>
+       <key>name</key>
+       <string>No automatic Completion for {</string>
+       <key>scope</key>
+       <string>source.jinja, text.html.jinja</string>
+       <key>uuid</key>
+       <string>31E30D4A-5CA5-4E4A-9C13-AB8ED6C1EB94</string>
+</dict>
+</plist>

diff --git a/ext/Jinja.tmbundle/Preferences/Symbol List: Blocks.tmPreferences b/ext/Jinja Templates.tmbundle/Preferences/Symbol List: Blocks.tmPreferences
similarity index 100%
rename from ext/Jinja.tmbundle/Preferences/Symbol List: Blocks.tmPreferences
rename to ext/Jinja Templates.tmbundle/Preferences/Symbol List: Blocks.tmPreferences

diff --git a/ext/Jinja.tmbundle/Snippets/block.tmSnippet b/ext/Jinja Templates.tmbundle/Snippets/Block.tmSnippet
similarity index 78%
rename from ext/Jinja.tmbundle/Snippets/block.tmSnippet
rename to ext/Jinja Templates.tmbundle/Snippets/Block.tmSnippet
index 5d6396c580425947d978f83a85a49ef761fc68eb..c5943dd0e4e292dcd5b884e95858ad159af104d2 100644 (file)
--- a/ext/Jinja.tmbundle/Snippets/block.tmSnippet
+++ b/ext/Jinja Templates.tmbundle/Snippets/Block.tmSnippet
@@ -3,16 +3,16 @@
 <plist version="1.0">
 <dict>
        <key>content</key>
-       <string>{% block $1 %}
+       <string>{% block ${1:name} %}
        $2
 {% endblock %}</string>
        <key>name</key>
-       <string>block</string>
+       <string>Block</string>
        <key>scope</key>
        <string>source.jinja, text.html.jinja</string>
        <key>tabTrigger</key>
        <string>block</string>
        <key>uuid</key>
-       <string>24C0F9CE-D3F1-4677-8A2E-EFFE776098F0</string>
+       <string>152FEFB6-EE41-47D1-B9AD-4E30AF64406C</string>
 </dict>
 </plist>

diff --git a/ext/Jinja.tmbundle/Snippets/capitalize.tmSnippet b/ext/Jinja Templates.tmbundle/Snippets/Complete Block.tmSnippet
similarity index 71%
rename from ext/Jinja.tmbundle/Snippets/capitalize.tmSnippet
rename to ext/Jinja Templates.tmbundle/Snippets/Complete Block.tmSnippet
index 48d924ef637cbf7a28d1c6afe1f4e70e579ecd5a..5be982317bbf90944f2b15fe98e8c8c2b903a1c6 100644 (file)
--- a/ext/Jinja.tmbundle/Snippets/capitalize.tmSnippet
+++ b/ext/Jinja Templates.tmbundle/Snippets/Complete Block.tmSnippet
@@ -3,14 +3,14 @@
 <plist version="1.0">
 <dict>
        <key>content</key>
-       <string>|capitalize</string>
+       <string>{% $0 %}</string>
        <key>name</key>
-       <string>capitalize</string>
+       <string>Complete Block</string>
        <key>scope</key>
        <string>source.jinja, text.html.jinja</string>
        <key>tabTrigger</key>
-       <string>|</string>
+       <string>{%</string>
        <key>uuid</key>
-       <string>4CCD42F3-8E6E-4B96-9D5D-BFB81E714948</string>
+       <string>08A0C481-0E5A-425E-9486-EC7D681DA01D</string>
 </dict>
 </plist>

diff --git a/ext/Jinja.tmbundle/Snippets/abs.tmSnippet b/ext/Jinja Templates.tmbundle/Snippets/Complete Variable.tmSnippet
similarity index 70%
rename from ext/Jinja.tmbundle/Snippets/abs.tmSnippet
rename to ext/Jinja Templates.tmbundle/Snippets/Complete Variable.tmSnippet
index c6acdf8c3588e461e64ebb005f9e047e4a4325bb..1ee6e2758a297bbe5fb026258299ef9980c2970f 100644 (file)
--- a/ext/Jinja.tmbundle/Snippets/abs.tmSnippet
+++ b/ext/Jinja Templates.tmbundle/Snippets/Complete Variable.tmSnippet
@@ -3,14 +3,14 @@
 <plist version="1.0">
 <dict>
        <key>content</key>
-       <string>|abs</string>
+       <string>{{ $0 }}</string>
        <key>name</key>
-       <string>abs</string>
+       <string>Complete Variable</string>
        <key>scope</key>
        <string>source.jinja, text.html.jinja</string>
        <key>tabTrigger</key>
-       <string>|</string>
+       <string>{{</string>
        <key>uuid</key>
-       <string>7E9487F0-B012-4735-96DA-124EF3C87B15</string>
+       <string>502E364B-D4D5-45F0-A996-5E71B3E5B7B6</string>
 </dict>
 </plist>

diff --git a/ext/Jinja.tmbundle/Snippets/extends.tmSnippet b/ext/Jinja Templates.tmbundle/Snippets/Extends.tmSnippet
similarity index 73%
rename from ext/Jinja.tmbundle/Snippets/extends.tmSnippet
rename to ext/Jinja Templates.tmbundle/Snippets/Extends.tmSnippet
index 7af79ca2de8b99cd8b2e02f1e11d6c09b256cbcd..f3981f09dab5fbb825ebbf606b7ac6aa31f673e0 100644 (file)
--- a/ext/Jinja.tmbundle/Snippets/extends.tmSnippet
+++ b/ext/Jinja Templates.tmbundle/Snippets/Extends.tmSnippet
@@ -3,14 +3,14 @@
 <plist version="1.0">
 <dict>
        <key>content</key>
-       <string>{% extends $1 %}</string>
+       <string>{% extends ${1:"${2:template}"} %}</string>
        <key>name</key>
-       <string>extends</string>
+       <string>Extends</string>
        <key>scope</key>
        <string>source.jinja, text.html.jinja</string>
        <key>tabTrigger</key>
        <string>extends</string>
        <key>uuid</key>
-       <string>CE75CB61-2FDA-4139-B21E-7DE143FAFA1B</string>
+       <string>9BE0D536-28D2-4BAB-ACDA-2DEFD0CF291A</string>
 </dict>
 </plist>

diff --git a/ext/Jinja.tmbundle/Snippets/filter.tmSnippet b/ext/Jinja Templates.tmbundle/Snippets/Filter.tmSnippet
similarity index 76%
rename from ext/Jinja.tmbundle/Snippets/filter.tmSnippet
rename to ext/Jinja Templates.tmbundle/Snippets/Filter.tmSnippet
index 973e4bb6008427e81e54dedf9e926ec80124353b..6e9b3f730792dc732be3bddc9aa052025e0f17f7 100644 (file)
--- a/ext/Jinja.tmbundle/Snippets/filter.tmSnippet
+++ b/ext/Jinja Templates.tmbundle/Snippets/Filter.tmSnippet
@@ -3,16 +3,16 @@
 <plist version="1.0">
 <dict>
        <key>content</key>
-       <string>{% filter ${1:filter_name} %}
+       <string>{% filter ${1:filter} %}
        $2
 {% endfilter %}</string>
        <key>name</key>
-       <string>filter</string>
+       <string>Filter</string>
        <key>scope</key>
        <string>source.jinja, text.html.jinja</string>
        <key>tabTrigger</key>
        <string>filter</string>
        <key>uuid</key>
-       <string>85C07823-2B9D-4631-88E7-AEF4E1BE9482</string>
+       <string>1437E81D-2EB6-412E-8D6E-48B4D3B0685E</string>
 </dict>
 </plist>

diff --git a/ext/Jinja.tmbundle/Snippets/for ___ in ___.tmSnippet b/ext/Jinja Templates.tmbundle/Snippets/For.tmSnippet
similarity index 75%
rename from ext/Jinja.tmbundle/Snippets/for ___ in ___.tmSnippet
rename to ext/Jinja Templates.tmbundle/Snippets/For.tmSnippet
index 25989e7c3891f9ff6c9d0f3bf0a0bc0cfc0d312f..019d804f3d4c7f3e4e945feb4d83b883de43bab3 100644 (file)
--- a/ext/Jinja.tmbundle/Snippets/for ___ in ___.tmSnippet
+++ b/ext/Jinja Templates.tmbundle/Snippets/For.tmSnippet
@@ -3,16 +3,16 @@
 <plist version="1.0">
 <dict>
        <key>content</key>
-       <string>{% for ${1:item} in ${2:$1s} %}
+       <string>{% for ${1:item} in ${2:sequence} %}
        $3
 {% endfor %}</string>
        <key>name</key>
-       <string>for</string>
+       <string>For</string>
        <key>scope</key>
        <string>source.jinja, text.html.jinja</string>
        <key>tabTrigger</key>
        <string>for</string>
        <key>uuid</key>
-       <string>C0C77C85-3A4E-4DAE-AEE3-533FA0DEA0C0</string>
+       <string>2B7AD6C9-0811-43B9-8E12-BE30772C7453</string>
 </dict>
 </plist>

diff --git a/ext/Jinja.tmbundle/Snippets/if.tmSnippet b/ext/Jinja Templates.tmbundle/Snippets/If.tmSnippet
similarity index 77%
rename from ext/Jinja.tmbundle/Snippets/if.tmSnippet
rename to ext/Jinja Templates.tmbundle/Snippets/If.tmSnippet
index 23910833c8a4b0487c997c2228a94bd4aab22e1f..620bb43256ef9c6a1599ba5588a98be5d0f81859 100644 (file)
--- a/ext/Jinja.tmbundle/Snippets/if.tmSnippet
+++ b/ext/Jinja Templates.tmbundle/Snippets/If.tmSnippet
@@ -3,16 +3,16 @@
 <plist version="1.0">
 <dict>
        <key>content</key>
-       <string>{% if $1 %}
-       $1
+       <string>{% if ${1:expr} %}
+       $2
 {% endif %}</string>
        <key>name</key>
-       <string>if</string>
+       <string>If</string>
        <key>scope</key>
        <string>source.jinja, text.html.jinja</string>
        <key>tabTrigger</key>
        <string>if</string>
        <key>uuid</key>
-       <string>5B95AA2C-B0E7-4886-9A55-90C1939D39C8</string>
+       <string>56CCF05B-99DA-4899-AFF2-438C61BFE6B7</string>
 </dict>
 </plist>

diff --git a/ext/Jinja.tmbundle/Snippets/macro.tmSnippet b/ext/Jinja Templates.tmbundle/Snippets/Macro.tmSnippet
similarity index 76%
rename from ext/Jinja.tmbundle/Snippets/macro.tmSnippet
rename to ext/Jinja Templates.tmbundle/Snippets/Macro.tmSnippet
index d064eeb4ddc3b3b6e9c9310ee502ff50ecc77196..311ffb267a0839ccfab87b27ad816672ca864505 100644 (file)
--- a/ext/Jinja.tmbundle/Snippets/macro.tmSnippet
+++ b/ext/Jinja Templates.tmbundle/Snippets/Macro.tmSnippet
@@ -3,16 +3,16 @@
 <plist version="1.0">
 <dict>
        <key>content</key>
-       <string>{% macro ${1:macro_name}($2) %}
+       <string>{% macro ${1:name}(${2:args}) %}
        $3
 {% endmacro %}</string>
        <key>name</key>
-       <string>macro</string>
+       <string>Macro</string>
        <key>scope</key>
        <string>source.jinja, text.html.jinja</string>
        <key>tabTrigger</key>
        <string>macro</string>
        <key>uuid</key>
-       <string>D3BE8551-A17F-47A4-A47D-02F00124F984</string>
+       <string>2ECE58B8-7AB7-43DA-B00F-51C2533284AD</string>
 </dict>
 </plist>

diff --git a/ext/Jinja.tmbundle/Syntaxes/HTML (Jinja Templates).tmLanguage b/ext/Jinja Templates.tmbundle/Syntaxes/HTML (Jinja Templates).tmLanguage
similarity index 100%
rename from ext/Jinja.tmbundle/Syntaxes/HTML (Jinja Templates).tmLanguage
rename to ext/Jinja Templates.tmbundle/Syntaxes/HTML (Jinja Templates).tmLanguage

diff --git a/ext/Jinja.tmbundle/Syntaxes/Jinja Templates.tmLanguage b/ext/Jinja Templates.tmbundle/Syntaxes/Jinja Templates.tmLanguage
similarity index 94%
rename from ext/Jinja.tmbundle/Syntaxes/Jinja Templates.tmLanguage
rename to ext/Jinja Templates.tmbundle/Syntaxes/Jinja Templates.tmLanguage
index 57e20aca797e899c2d838d7a7e864ce584a5aeed..7c81eaba5d550b9bb7534a1ca1440ea0d7fdff9d 100644 (file)
--- a/ext/Jinja.tmbundle/Syntaxes/Jinja Templates.tmLanguage
+++ b/ext/Jinja Templates.tmbundle/Syntaxes/Jinja Templates.tmLanguage
@@ -152,7 +152,7 @@
                                                </dict>
                                        </dict>
                                        <key>match</key>
-                                       <string>\b(block)\s+([a-zA-Z_][a-zA-Z0-9_]*)</string>
+                                       <string>\s*\b(block)\s+([a-zA-Z_][a-zA-Z0-9_]*)\b</string>
                                </dict>
                                <dict>
                                        <key>captures</key>
@@ -169,7 +169,7 @@
                                                </dict>
                                        </dict>
                                        <key>match</key>
-                                       <string>\b(filter)\s+([a-zA-Z_][a-zA-Z0-9_]*)</string>
+                                       <string>\s*\b(filter)\s+([a-zA-Z_][a-zA-Z0-9_]*)\b</string>
                                </dict>
                                <dict>
                                        <key>captures</key>
@@ -186,23 +186,35 @@
                                                </dict>
                                        </dict>
                                        <key>match</key>
-                                       <string>\b(is)\s+([a-zA-Z_][a-zA-Z0-9_]*)</string>
+                                       <string>\s*\b(is)\s+([a-zA-Z_][a-zA-Z0-9_]*)\b</string>
+                               </dict>
+                               <dict>
+                                       <key>captures</key>
+                                       <dict>
+                                               <key>1</key>
+                                               <dict>
+                                                       <key>name</key>
+                                                       <string>keyword.control.jinja</string>
+                                               </dict>
+                                       </dict>
+                                       <key>match</key>
+                                       <string>(?&lt;=\{\%-|\{\%)\s*\b([a-zA-Z_][a-zA-Z0-9_]*)\b(?!\s*[,=])</string>
                                </dict>
                                <dict>
                                        <key>match</key>
-                                       <string>\b(and|block|call|cycle|elif|else|endblock|endcall|endfilter|endfor|endif|endmacro|endraw|endtrans|extends|filter|for|if|in|include|is|macro|not|or|pluralize|print|raw|recursive|set|trans)\b</string>
+                                       <string>\b(and|else|if|in|import|not|or|recursive|with(out)?\s+context)\b</string>
                                        <key>name</key>
                                        <string>keyword.control.jinja</string>
                                </dict>
                                <dict>
                                        <key>match</key>
-                                       <string>\b(true|false|undefined|none|_)\b</string>
+                                       <string>\b(true|false|none)\b</string>
                                        <key>name</key>
                                        <string>constant.language.jinja</string>
                                </dict>
                                <dict>
                                        <key>match</key>
-                                       <string>\b(loop|super)\b</string>
+                                       <string>\b(loop|super|self|varargs|kwargs)\b</string>
                                        <key>name</key>
                                        <string>variable.language.jinja</string>
                                </dict>

diff --git a/ext/Jinja.tmbundle/info.plist b/ext/Jinja Templates.tmbundle/info.plist
similarity index 61%
rename from ext/Jinja.tmbundle/info.plist
rename to ext/Jinja Templates.tmbundle/info.plist
index 196f5f012c8ecabdd75161c6d112da31516ecc92..247007834a08672de65d7a3c91c871bd56da7bc3 100644 (file)
--- a/ext/Jinja.tmbundle/info.plist
+++ b/ext/Jinja Templates.tmbundle/info.plist
@@ -87,60 +87,20 @@
        <array>
                <string>CB0F3F8E-6062-4610-85B3-8905C61AD85A</string>
                <string>488399C0-5D29-4704-BE85-E03A461C34E7</string>
-               <string>C0C77C85-3A4E-4DAE-AEE3-533FA0DEA0C0</string>
-               <string>5B95AA2C-B0E7-4886-9A55-90C1939D39C8</string>
-               <string>24C0F9CE-D3F1-4677-8A2E-EFFE776098F0</string>
-               <string>D3BE8551-A17F-47A4-A47D-02F00124F984</string>
-               <string>85C07823-2B9D-4631-88E7-AEF4E1BE9482</string>
-               <string>73F00DE1-17B0-4C8C-B495-82A3689EB6F1</string>
-               <string>CE75CB61-2FDA-4139-B21E-7DE143FAFA1B</string>
-               <string>7E9487F0-B012-4735-96DA-124EF3C87B15</string>
-               <string>13A0482A-4EA3-406C-A74B-90131C529E25</string>
-               <string>4CCD42F3-8E6E-4B96-9D5D-BFB81E714948</string>
-               <string>21EA80D9-967D-4681-BD17-765F1688EE5A</string>
-               <string>65CCCA35-3231-4B63-B67D-5FB596D833C7</string>
-               <string>3D708572-4CD6-40D6-9F3B-CC96784CC069</string>
-               <string>3416F5A3-C0A2-4B4B-ABBA-9EA40207E2B4</string>
-               <string>6721CF2A-9DA7-4A7E-85C2-FE609E100DE8</string>
-               <string>FDE05A63-E81C-474C-A1A9-47FD862F39EE</string>
-               <string>9B7F35A9-3A98-4736-9AB3-21BD9BFB5069</string>
-               <string>FDFF242A-F3FB-4A4C-BE1A-F1311158B32B</string>
-               <string>4BA654F6-F412-4AF9-9CEA-72BD1A709AF4</string>
-               <string>93EEDABE-BC52-4883-AF3D-DE4A44C3C246</string>
-               <string>307C3853-AA0B-441C-A3D4-DE5CAE2C1673</string>
-               <string>0A6ECEB6-410E-4CF5-823E-139E8769BA16</string>
-               <string>FBD6F4B2-3206-4CA9-AE99-B2C78149A357</string>
-               <string>93E22AC4-B2B8-426D-89C9-FB416F24F975</string>
-               <string>6B7CA02D-D6CF-4F16-9A1E-7610DAEBB43F</string>
-               <string>7F5037F1-CCC2-4179-98CA-66D001144AC2</string>
-               <string>6F1D6BEF-3D53-4EC8-9C42-DF0D1D2E68C5</string>
-               <string>78EEA703-C74E-4D71-9DDA-5674E3AB50D7</string>
-               <string>1B45C5DE-21D2-4E2A-B7C6-794C9D7ECB99</string>
-               <string>B964A222-F305-44C9-B23C-0D2A55112C43</string>
-               <string>C2DF4AC6-C586-4F6C-9A97-916558C248D7</string>
-               <string>7DE5D7CF-81BB-4AB3-A9B8-938D47918237</string>
-               <string>95E641E1-CAA4-4984-B406-54FEC11D5F1B</string>
-               <string>E0F620DA-1CDA-4913-AD04-CAC8C63089D8</string>
-               <string>E527CC83-06C6-4B54-8FDC-61FB4554B251</string>
-               <string>27647146-46AC-4F2A-9069-178E359E55DF</string>
-               <string>D64E1E71-A89E-4349-8178-97BC06A5B35F</string>
-               <string>866F74E0-D58C-4BCB-A256-3D94CFB612D9</string>
-               <string>AE1A2C7A-2D10-466F-9EB0-E8B540E7BA6E</string>
-               <string>2EB9BB55-E38C-4FA9-81B7-73B1A73F65C7</string>
-               <string>B99D5C37-BE6D-4397-9F32-90BD1A02E016</string>
-               <string>A199B66F-5B1A-4210-9B22-1FC6738EAD76</string>
-               <string>3F749711-C818-41C2-8FB0-844CD2839617</string>
-               <string>823ABA67-7CA7-4F4F-ACC1-7D84AAC56469</string>
-               <string>1C0A622E-7F37-437F-95A3-5342DEA80B4E</string>
-               <string>DEDD7EB3-FFD2-4BFD-8D59-5DA8ED0F567F</string>
-               <string>40423A4E-9ED4-402C-A5BB-193797A73101</string>
-               <string>6000AFC3-4398-4500-B055-296D17DDAB48</string>
-               <string>CA8BCFEA-2BDB-4CB8-8E31-6388ECEF05BB</string>
                <string>889E682B-196A-4424-8A87-EBFDC86BAAFC</string>
                <string>44B1526F-5825-40A5-AB42-6433F1DD02D9</string>
                <string>07198D95-F344-47EB-B1F2-69F2DC10BA1F</string>
                <string>BD126F84-B849-407F-BE62-EF984946EB82</string>
                <string>04309583-742D-4470-8FA7-A12EF5536215</string>
+               <string>31E30D4A-5CA5-4E4A-9C13-AB8ED6C1EB94</string>
+               <string>08A0C481-0E5A-425E-9486-EC7D681DA01D</string>
+               <string>502E364B-D4D5-45F0-A996-5E71B3E5B7B6</string>
+               <string>2B7AD6C9-0811-43B9-8E12-BE30772C7453</string>
+               <string>56CCF05B-99DA-4899-AFF2-438C61BFE6B7</string>
+               <string>1437E81D-2EB6-412E-8D6E-48B4D3B0685E</string>
+               <string>152FEFB6-EE41-47D1-B9AD-4E30AF64406C</string>
+               <string>2ECE58B8-7AB7-43DA-B00F-51C2533284AD</string>
+               <string>9BE0D536-28D2-4BAB-ACDA-2DEFD0CF291A</string>
        </array>
        <key>uuid</key>
        <string>B4E6C4DD-43DB-473D-8E0F-662C5E64C31D</string>

diff --git a/ext/Jinja.tmbundle/Snippets/batch.tmSnippet b/ext/Jinja.tmbundle/Snippets/batch.tmSnippet
deleted file mode 100644 (file)
index 0702e87..0000000
--- a/ext/Jinja.tmbundle/Snippets/batch.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-       <key>content</key>
-       <string>|batch(${1:rows})$2</string>
-       <key>name</key>
-       <string>batch</string>
-       <key>scope</key>
-       <string>source.jinja, text.html.jinja</string>
-       <key>tabTrigger</key>
-       <string>|</string>
-       <key>uuid</key>
-       <string>13A0482A-4EA3-406C-A74B-90131C529E25</string>
-</dict>
-</plist>

diff --git a/ext/Jinja.tmbundle/Snippets/capture.tmSnippet b/ext/Jinja.tmbundle/Snippets/capture.tmSnippet
deleted file mode 100644 (file)
index a117d6b..0000000
--- a/ext/Jinja.tmbundle/Snippets/capture.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-       <key>content</key>
-       <string>|capture(${1:captured})$2</string>
-       <key>name</key>
-       <string>capture</string>
-       <key>scope</key>
-       <string>source.jinja, text.html.jinja</string>
-       <key>tabTrigger</key>
-       <string>|</string>
-       <key>uuid</key>
-       <string>21EA80D9-967D-4681-BD17-765F1688EE5A</string>
-</dict>
-</plist>

diff --git a/ext/Jinja.tmbundle/Snippets/center.tmSnippet b/ext/Jinja.tmbundle/Snippets/center.tmSnippet
deleted file mode 100644 (file)
index f6d057d..0000000
--- a/ext/Jinja.tmbundle/Snippets/center.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-       <key>content</key>
-       <string>|center(${1:width})$2</string>
-       <key>name</key>
-       <string>center</string>
-       <key>scope</key>
-       <string>source.jinja, text.html.jinja</string>
-       <key>tabTrigger</key>
-       <string>|</string>
-       <key>uuid</key>
-       <string>65CCCA35-3231-4B63-B67D-5FB596D833C7</string>
-</dict>
-</plist>

diff --git a/ext/Jinja.tmbundle/Snippets/default.tmSnippet b/ext/Jinja.tmbundle/Snippets/default.tmSnippet
deleted file mode 100644 (file)
index 6dd704c..0000000
--- a/ext/Jinja.tmbundle/Snippets/default.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-       <key>content</key>
-       <string>|default(${1:value})$2</string>
-       <key>name</key>
-       <string>default</string>
-       <key>scope</key>
-       <string>source.jinja, text.html.jinja</string>
-       <key>tabTrigger</key>
-       <string>|</string>
-       <key>uuid</key>
-       <string>3D708572-4CD6-40D6-9F3B-CC96784CC069</string>
-</dict>
-</plist>

diff --git a/ext/Jinja.tmbundle/Snippets/dformat.tmSnippet b/ext/Jinja.tmbundle/Snippets/dformat.tmSnippet
deleted file mode 100644 (file)
index 53f8965..0000000
--- a/ext/Jinja.tmbundle/Snippets/dformat.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-       <key>content</key>
-       <string>|dformat(${2:{$1\}})$3</string>
-       <key>name</key>
-       <string>dformat</string>
-       <key>scope</key>
-       <string>source.jinja, text.html.jinja</string>
-       <key>tabTrigger</key>
-       <string>|</string>
-       <key>uuid</key>
-       <string>3416F5A3-C0A2-4B4B-ABBA-9EA40207E2B4</string>
-</dict>
-</plist>

diff --git a/ext/Jinja.tmbundle/Snippets/dictsort.tmSnippet b/ext/Jinja.tmbundle/Snippets/dictsort.tmSnippet
deleted file mode 100644 (file)
index a3e9f7c..0000000
--- a/ext/Jinja.tmbundle/Snippets/dictsort.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-       <key>content</key>
-       <string>|dictsort</string>
-       <key>name</key>
-       <string>dictsort</string>
-       <key>scope</key>
-       <string>source.jinja, text.html.jinja</string>
-       <key>tabTrigger</key>
-       <string>|</string>
-       <key>uuid</key>
-       <string>6721CF2A-9DA7-4A7E-85C2-FE609E100DE8</string>
-</dict>
-</plist>

diff --git a/ext/Jinja.tmbundle/Snippets/escape.tmSnippet b/ext/Jinja.tmbundle/Snippets/escape.tmSnippet
deleted file mode 100644 (file)
index 5d026e4..0000000
--- a/ext/Jinja.tmbundle/Snippets/escape.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-       <key>content</key>
-       <string>|e</string>
-       <key>name</key>
-       <string>escape</string>
-       <key>scope</key>
-       <string>source.jinja, text.html.jinja</string>
-       <key>tabTrigger</key>
-       <string>|</string>
-       <key>uuid</key>
-       <string>FDE05A63-E81C-474C-A1A9-47FD862F39EE</string>
-</dict>
-</plist>

diff --git a/ext/Jinja.tmbundle/Snippets/filesizeformat.tmSnippet b/ext/Jinja.tmbundle/Snippets/filesizeformat.tmSnippet
deleted file mode 100644 (file)
index cd47158..0000000
--- a/ext/Jinja.tmbundle/Snippets/filesizeformat.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-       <key>content</key>
-       <string>|filesizeformat</string>
-       <key>name</key>
-       <string>filesizeformat</string>
-       <key>scope</key>
-       <string>source.jinja, text.html.jinja</string>
-       <key>tabTrigger</key>
-       <string>|</string>
-       <key>uuid</key>
-       <string>9B7F35A9-3A98-4736-9AB3-21BD9BFB5069</string>
-</dict>
-</plist>

diff --git a/ext/Jinja.tmbundle/Snippets/first.tmSnippet b/ext/Jinja.tmbundle/Snippets/first.tmSnippet
deleted file mode 100644 (file)
index 81f4fb9..0000000
--- a/ext/Jinja.tmbundle/Snippets/first.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-       <key>content</key>
-       <string>|first</string>
-       <key>name</key>
-       <string>first</string>
-       <key>scope</key>
-       <string>source.jinja, text.html.jinja</string>
-       <key>tabTrigger</key>
-       <string>|</string>
-       <key>uuid</key>
-       <string>FDFF242A-F3FB-4A4C-BE1A-F1311158B32B</string>
-</dict>
-</plist>

diff --git a/ext/Jinja.tmbundle/Snippets/float.tmSnippet b/ext/Jinja.tmbundle/Snippets/float.tmSnippet
deleted file mode 100644 (file)
index d310ecb..0000000
--- a/ext/Jinja.tmbundle/Snippets/float.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-       <key>content</key>
-       <string>|float</string>
-       <key>name</key>
-       <string>float</string>
-       <key>scope</key>
-       <string>source.jinja, text.html.jinja</string>
-       <key>tabTrigger</key>
-       <string>|</string>
-       <key>uuid</key>
-       <string>4BA654F6-F412-4AF9-9CEA-72BD1A709AF4</string>
-</dict>
-</plist>

diff --git a/ext/Jinja.tmbundle/Snippets/format.tmSnippet b/ext/Jinja.tmbundle/Snippets/format.tmSnippet
deleted file mode 100644 (file)
index 6be669d..0000000
--- a/ext/Jinja.tmbundle/Snippets/format.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-       <key>content</key>
-       <string>|format(${1:args})$2</string>
-       <key>name</key>
-       <string>format</string>
-       <key>scope</key>
-       <string>source.jinja, text.html.jinja</string>
-       <key>tabTrigger</key>
-       <string>|</string>
-       <key>uuid</key>
-       <string>93EEDABE-BC52-4883-AF3D-DE4A44C3C246</string>
-</dict>
-</plist>

diff --git a/ext/Jinja.tmbundle/Snippets/indent.tmSnippet b/ext/Jinja.tmbundle/Snippets/indent.tmSnippet
deleted file mode 100644 (file)
index 2aa765c..0000000
--- a/ext/Jinja.tmbundle/Snippets/indent.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-       <key>content</key>
-       <string>|indent(${1:width})$2</string>
-       <key>name</key>
-       <string>indent</string>
-       <key>scope</key>
-       <string>source.jinja, text.html.jinja</string>
-       <key>tabTrigger</key>
-       <string>|</string>
-       <key>uuid</key>
-       <string>307C3853-AA0B-441C-A3D4-DE5CAE2C1673</string>
-</dict>
-</plist>

diff --git a/ext/Jinja.tmbundle/Snippets/int.tmSnippet b/ext/Jinja.tmbundle/Snippets/int.tmSnippet
deleted file mode 100644 (file)
index 79455af..0000000
--- a/ext/Jinja.tmbundle/Snippets/int.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-       <key>content</key>
-       <string>|int</string>
-       <key>name</key>
-       <string>int</string>
-       <key>scope</key>
-       <string>source.jinja, text.html.jinja</string>
-       <key>tabTrigger</key>
-       <string>|</string>
-       <key>uuid</key>
-       <string>0A6ECEB6-410E-4CF5-823E-139E8769BA16</string>
-</dict>
-</plist>

diff --git a/ext/Jinja.tmbundle/Snippets/join.tmSnippet b/ext/Jinja.tmbundle/Snippets/join.tmSnippet
deleted file mode 100644 (file)
index 85f54a1..0000000
--- a/ext/Jinja.tmbundle/Snippets/join.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-       <key>content</key>
-       <string>|join(${1:''})$2</string>
-       <key>name</key>
-       <string>join</string>
-       <key>scope</key>
-       <string>source.jinja, text.html.jinja</string>
-       <key>tabTrigger</key>
-       <string>|</string>
-       <key>uuid</key>
-       <string>FBD6F4B2-3206-4CA9-AE99-B2C78149A357</string>
-</dict>
-</plist>

diff --git a/ext/Jinja.tmbundle/Snippets/jsonencode.tmSnippet b/ext/Jinja.tmbundle/Snippets/jsonencode.tmSnippet
deleted file mode 100644 (file)
index 25c2c65..0000000
--- a/ext/Jinja.tmbundle/Snippets/jsonencode.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-       <key>content</key>
-       <string>|jsonencode</string>
-       <key>name</key>
-       <string>jsonencode</string>
-       <key>scope</key>
-       <string>source.jinja, text.html.jinja</string>
-       <key>tabTrigger</key>
-       <string>|</string>
-       <key>uuid</key>
-       <string>93E22AC4-B2B8-426D-89C9-FB416F24F975</string>
-</dict>
-</plist>

diff --git a/ext/Jinja.tmbundle/Snippets/last.tmSnippet b/ext/Jinja.tmbundle/Snippets/last.tmSnippet
deleted file mode 100644 (file)
index 29bd222..0000000
--- a/ext/Jinja.tmbundle/Snippets/last.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-       <key>content</key>
-       <string>|last</string>
-       <key>name</key>
-       <string>last</string>
-       <key>scope</key>
-       <string>source.jinja, text.html.jinja</string>
-       <key>tabTrigger</key>
-       <string>|</string>
-       <key>uuid</key>
-       <string>6B7CA02D-D6CF-4F16-9A1E-7610DAEBB43F</string>
-</dict>
-</plist>

diff --git a/ext/Jinja.tmbundle/Snippets/length.tmSnippet b/ext/Jinja.tmbundle/Snippets/length.tmSnippet
deleted file mode 100644 (file)
index 104ddeb..0000000
--- a/ext/Jinja.tmbundle/Snippets/length.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-       <key>content</key>
-       <string>|length</string>
-       <key>name</key>
-       <string>length</string>
-       <key>scope</key>
-       <string>source.jinja, text.html.jinja</string>
-       <key>tabTrigger</key>
-       <string>|</string>
-       <key>uuid</key>
-       <string>7F5037F1-CCC2-4179-98CA-66D001144AC2</string>
-</dict>
-</plist>

diff --git a/ext/Jinja.tmbundle/Snippets/lower.tmSnippet b/ext/Jinja.tmbundle/Snippets/lower.tmSnippet
deleted file mode 100644 (file)
index b720579..0000000
--- a/ext/Jinja.tmbundle/Snippets/lower.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-       <key>content</key>
-       <string>|lower</string>
-       <key>name</key>
-       <string>lower</string>
-       <key>scope</key>
-       <string>source.jinja, text.html.jinja</string>
-       <key>tabTrigger</key>
-       <string>|</string>
-       <key>uuid</key>
-       <string>6F1D6BEF-3D53-4EC8-9C42-DF0D1D2E68C5</string>
-</dict>
-</plist>

diff --git a/ext/Jinja.tmbundle/Snippets/markdown.tmSnippet b/ext/Jinja.tmbundle/Snippets/markdown.tmSnippet
deleted file mode 100644 (file)
index adba556..0000000
--- a/ext/Jinja.tmbundle/Snippets/markdown.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-       <key>content</key>
-       <string>|markdown</string>
-       <key>name</key>
-       <string>markdown</string>
-       <key>scope</key>
-       <string>source.jinja, text.html.jinja</string>
-       <key>tabTrigger</key>
-       <string>|</string>
-       <key>uuid</key>
-       <string>78EEA703-C74E-4D71-9DDA-5674E3AB50D7</string>
-</dict>
-</plist>

diff --git a/ext/Jinja.tmbundle/Snippets/pprint.tmSnippet b/ext/Jinja.tmbundle/Snippets/pprint.tmSnippet
deleted file mode 100644 (file)
index 6adfe95..0000000
--- a/ext/Jinja.tmbundle/Snippets/pprint.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-       <key>content</key>
-       <string>|pprint</string>
-       <key>name</key>
-       <string>pprint</string>
-       <key>scope</key>
-       <string>source.jinja, text.html.jinja</string>
-       <key>tabTrigger</key>
-       <string>|</string>
-       <key>uuid</key>
-       <string>1B45C5DE-21D2-4E2A-B7C6-794C9D7ECB99</string>
-</dict>
-</plist>

diff --git a/ext/Jinja.tmbundle/Snippets/random.tmSnippet b/ext/Jinja.tmbundle/Snippets/random.tmSnippet
deleted file mode 100644 (file)
index 4a769c5..0000000
--- a/ext/Jinja.tmbundle/Snippets/random.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-       <key>content</key>
-       <string>|random</string>
-       <key>name</key>
-       <string>random</string>
-       <key>scope</key>
-       <string>source.jinja, text.html.jinja</string>
-       <key>tabTrigger</key>
-       <string>|</string>
-       <key>uuid</key>
-       <string>B964A222-F305-44C9-B23C-0D2A55112C43</string>
-</dict>
-</plist>

diff --git a/ext/Jinja.tmbundle/Snippets/raw.tmSnippet b/ext/Jinja.tmbundle/Snippets/raw.tmSnippet
deleted file mode 100644 (file)
index 45e5e53..0000000
--- a/ext/Jinja.tmbundle/Snippets/raw.tmSnippet
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-       <key>content</key>
-       <string>{% raw %}
-       $1
-{% endraw %}</string>
-       <key>name</key>
-       <string>raw</string>
-       <key>scope</key>
-       <string>source.jinja, text.html.jinja</string>
-       <key>tabTrigger</key>
-       <string>raw</string>
-       <key>uuid</key>
-       <string>73F00DE1-17B0-4C8C-B495-82A3689EB6F1</string>
-</dict>
-</plist>

diff --git a/ext/Jinja.tmbundle/Snippets/replace.tmSnippet b/ext/Jinja.tmbundle/Snippets/replace.tmSnippet
deleted file mode 100644 (file)
index b06b40f..0000000
--- a/ext/Jinja.tmbundle/Snippets/replace.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-       <key>content</key>
-       <string>|replace</string>
-       <key>name</key>
-       <string>replace</string>
-       <key>scope</key>
-       <string>source.jinja, text.html.jinja</string>
-       <key>tabTrigger</key>
-       <string>|</string>
-       <key>uuid</key>
-       <string>C2DF4AC6-C586-4F6C-9A97-916558C248D7</string>
-</dict>
-</plist>

diff --git a/ext/Jinja.tmbundle/Snippets/reverse.tmSnippet b/ext/Jinja.tmbundle/Snippets/reverse.tmSnippet
deleted file mode 100644 (file)
index 51913c6..0000000
--- a/ext/Jinja.tmbundle/Snippets/reverse.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-       <key>content</key>
-       <string>|reverse</string>
-       <key>name</key>
-       <string>reverse</string>
-       <key>scope</key>
-       <string>source.jinja, text.html.jinja</string>
-       <key>tabTrigger</key>
-       <string>|</string>
-       <key>uuid</key>
-       <string>7DE5D7CF-81BB-4AB3-A9B8-938D47918237</string>
-</dict>
-</plist>

diff --git a/ext/Jinja.tmbundle/Snippets/round.tmSnippet b/ext/Jinja.tmbundle/Snippets/round.tmSnippet
deleted file mode 100644 (file)
index d5ae782..0000000
--- a/ext/Jinja.tmbundle/Snippets/round.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-       <key>content</key>
-       <string>|round(${1:places})$2</string>
-       <key>name</key>
-       <string>round</string>
-       <key>scope</key>
-       <string>source.jinja, text.html.jinja</string>
-       <key>tabTrigger</key>
-       <string>|</string>
-       <key>uuid</key>
-       <string>95E641E1-CAA4-4984-B406-54FEC11D5F1B</string>
-</dict>
-</plist>

diff --git a/ext/Jinja.tmbundle/Snippets/rst.tmSnippet b/ext/Jinja.tmbundle/Snippets/rst.tmSnippet
deleted file mode 100644 (file)
index ad07034..0000000
--- a/ext/Jinja.tmbundle/Snippets/rst.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-       <key>content</key>
-       <string>|rst</string>
-       <key>name</key>
-       <string>rst</string>
-       <key>scope</key>
-       <string>source.jinja, text.html.jinja</string>
-       <key>tabTrigger</key>
-       <string>|</string>
-       <key>uuid</key>
-       <string>E0F620DA-1CDA-4913-AD04-CAC8C63089D8</string>
-</dict>
-</plist>

diff --git a/ext/Jinja.tmbundle/Snippets/slice.tmSnippet b/ext/Jinja.tmbundle/Snippets/slice.tmSnippet
deleted file mode 100644 (file)
index 4550ac0..0000000
--- a/ext/Jinja.tmbundle/Snippets/slice.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-       <key>content</key>
-       <string>|slice(${1:columns})</string>
-       <key>name</key>
-       <string>slice</string>
-       <key>scope</key>
-       <string>source.jinja, text.html.jinja</string>
-       <key>tabTrigger</key>
-       <string>|</string>
-       <key>uuid</key>
-       <string>E527CC83-06C6-4B54-8FDC-61FB4554B251</string>
-</dict>
-</plist>

diff --git a/ext/Jinja.tmbundle/Snippets/sort.tmSnippet b/ext/Jinja.tmbundle/Snippets/sort.tmSnippet
deleted file mode 100644 (file)
index f6e2dcd..0000000
--- a/ext/Jinja.tmbundle/Snippets/sort.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-       <key>content</key>
-       <string>|sort</string>
-       <key>name</key>
-       <string>sort</string>
-       <key>scope</key>
-       <string>source.jinja, text.html.jinja</string>
-       <key>tabTrigger</key>
-       <string>|</string>
-       <key>uuid</key>
-       <string>27647146-46AC-4F2A-9069-178E359E55DF</string>
-</dict>
-</plist>

diff --git a/ext/Jinja.tmbundle/Snippets/string.tmSnippet b/ext/Jinja.tmbundle/Snippets/string.tmSnippet
deleted file mode 100644 (file)
index 8593ffb..0000000
--- a/ext/Jinja.tmbundle/Snippets/string.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-       <key>content</key>
-       <string>|string</string>
-       <key>name</key>
-       <string>string</string>
-       <key>scope</key>
-       <string>source.jinja, text.html.jinja</string>
-       <key>tabTrigger</key>
-       <string>|</string>
-       <key>uuid</key>
-       <string>D64E1E71-A89E-4349-8178-97BC06A5B35F</string>
-</dict>
-</plist>

diff --git a/ext/Jinja.tmbundle/Snippets/striptags.tmSnippet b/ext/Jinja.tmbundle/Snippets/striptags.tmSnippet
deleted file mode 100644 (file)
index 665fa3c..0000000
--- a/ext/Jinja.tmbundle/Snippets/striptags.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-       <key>content</key>
-       <string>|striptags</string>
-       <key>name</key>
-       <string>striptags</string>
-       <key>scope</key>
-       <string>source.jinja, text.html.jinja</string>
-       <key>tabTrigger</key>
-       <string>|</string>
-       <key>uuid</key>
-       <string>866F74E0-D58C-4BCB-A256-3D94CFB612D9</string>
-</dict>
-</plist>

diff --git a/ext/Jinja.tmbundle/Snippets/sum.tmSnippet b/ext/Jinja.tmbundle/Snippets/sum.tmSnippet
deleted file mode 100644 (file)
index c937a63..0000000
--- a/ext/Jinja.tmbundle/Snippets/sum.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-       <key>content</key>
-       <string>|sum</string>
-       <key>name</key>
-       <string>sum</string>
-       <key>scope</key>
-       <string>source.jinja, text.html.jinja</string>
-       <key>tabTrigger</key>
-       <string>|</string>
-       <key>uuid</key>
-       <string>AE1A2C7A-2D10-466F-9EB0-E8B540E7BA6E</string>
-</dict>
-</plist>

diff --git a/ext/Jinja.tmbundle/Snippets/textile.tmSnippet b/ext/Jinja.tmbundle/Snippets/textile.tmSnippet
deleted file mode 100644 (file)
index 64be825..0000000
--- a/ext/Jinja.tmbundle/Snippets/textile.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-       <key>content</key>
-       <string>|textile</string>
-       <key>name</key>
-       <string>textile</string>
-       <key>scope</key>
-       <string>source.jinja, text.html.jinja</string>
-       <key>tabTrigger</key>
-       <string>|</string>
-       <key>uuid</key>
-       <string>2EB9BB55-E38C-4FA9-81B7-73B1A73F65C7</string>
-</dict>
-</plist>

diff --git a/ext/Jinja.tmbundle/Snippets/title.tmSnippet b/ext/Jinja.tmbundle/Snippets/title.tmSnippet
deleted file mode 100644 (file)
index 319f08f..0000000
--- a/ext/Jinja.tmbundle/Snippets/title.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-       <key>content</key>
-       <string>|title</string>
-       <key>name</key>
-       <string>title</string>
-       <key>scope</key>
-       <string>source.jinja, text.html.jinja</string>
-       <key>tabTrigger</key>
-       <string>|</string>
-       <key>uuid</key>
-       <string>B99D5C37-BE6D-4397-9F32-90BD1A02E016</string>
-</dict>
-</plist>

diff --git a/ext/Jinja.tmbundle/Snippets/trim.tmSnippet b/ext/Jinja.tmbundle/Snippets/trim.tmSnippet
deleted file mode 100644 (file)
index fed7c1c..0000000
--- a/ext/Jinja.tmbundle/Snippets/trim.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-       <key>content</key>
-       <string>|trim</string>
-       <key>name</key>
-       <string>trim</string>
-       <key>scope</key>
-       <string>source.jinja, text.html.jinja</string>
-       <key>tabTrigger</key>
-       <string>|</string>
-       <key>uuid</key>
-       <string>A199B66F-5B1A-4210-9B22-1FC6738EAD76</string>
-</dict>
-</plist>

diff --git a/ext/Jinja.tmbundle/Snippets/truncate.tmSnippet b/ext/Jinja.tmbundle/Snippets/truncate.tmSnippet
deleted file mode 100644 (file)
index 29dfe28..0000000
--- a/ext/Jinja.tmbundle/Snippets/truncate.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-       <key>content</key>
-       <string>|truncate</string>
-       <key>name</key>
-       <string>truncate</string>
-       <key>scope</key>
-       <string>source.jinja, text.html.jinja</string>
-       <key>tabTrigger</key>
-       <string>|</string>
-       <key>uuid</key>
-       <string>3F749711-C818-41C2-8FB0-844CD2839617</string>
-</dict>
-</plist>

diff --git a/ext/Jinja.tmbundle/Snippets/upper.tmSnippet b/ext/Jinja.tmbundle/Snippets/upper.tmSnippet
deleted file mode 100644 (file)
index dd0dfab..0000000
--- a/ext/Jinja.tmbundle/Snippets/upper.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-       <key>content</key>
-       <string>|upper</string>
-       <key>name</key>
-       <string>upper</string>
-       <key>scope</key>
-       <string>source.jinja, text.html.jinja</string>
-       <key>tabTrigger</key>
-       <string>|</string>
-       <key>uuid</key>
-       <string>823ABA67-7CA7-4F4F-ACC1-7D84AAC56469</string>
-</dict>
-</plist>

diff --git a/ext/Jinja.tmbundle/Snippets/urlencode.tmSnippet b/ext/Jinja.tmbundle/Snippets/urlencode.tmSnippet
deleted file mode 100644 (file)
index b09b40c..0000000
--- a/ext/Jinja.tmbundle/Snippets/urlencode.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-       <key>content</key>
-       <string>|urlencode</string>
-       <key>name</key>
-       <string>urlencode</string>
-       <key>scope</key>
-       <string>source.jinja, text.html.jinja</string>
-       <key>tabTrigger</key>
-       <string>|</string>
-       <key>uuid</key>
-       <string>1C0A622E-7F37-437F-95A3-5342DEA80B4E</string>
-</dict>
-</plist>

diff --git a/ext/Jinja.tmbundle/Snippets/urlize.tmSnippet b/ext/Jinja.tmbundle/Snippets/urlize.tmSnippet
deleted file mode 100644 (file)
index f1524b0..0000000
--- a/ext/Jinja.tmbundle/Snippets/urlize.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-       <key>content</key>
-       <string>|urlize(${1:40}, ${2:true})$3</string>
-       <key>name</key>
-       <string>urlize</string>
-       <key>scope</key>
-       <string>source.jinja, text.html.jinja</string>
-       <key>tabTrigger</key>
-       <string>|</string>
-       <key>uuid</key>
-       <string>DEDD7EB3-FFD2-4BFD-8D59-5DA8ED0F567F</string>
-</dict>
-</plist>

diff --git a/ext/Jinja.tmbundle/Snippets/wordcount.tmSnippet b/ext/Jinja.tmbundle/Snippets/wordcount.tmSnippet
deleted file mode 100644 (file)
index fe86aec..0000000
--- a/ext/Jinja.tmbundle/Snippets/wordcount.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-       <key>content</key>
-       <string>|wordcount</string>
-       <key>name</key>
-       <string>wordcount</string>
-       <key>scope</key>
-       <string>source.jinja, text.html.jinja</string>
-       <key>tabTrigger</key>
-       <string>|</string>
-       <key>uuid</key>
-       <string>40423A4E-9ED4-402C-A5BB-193797A73101</string>
-</dict>
-</plist>

diff --git a/ext/Jinja.tmbundle/Snippets/wordwrap.tmSnippet b/ext/Jinja.tmbundle/Snippets/wordwrap.tmSnippet
deleted file mode 100644 (file)
index 0065f25..0000000
--- a/ext/Jinja.tmbundle/Snippets/wordwrap.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-       <key>content</key>
-       <string>|wordwrap</string>
-       <key>name</key>
-       <string>wordwrap</string>
-       <key>scope</key>
-       <string>source.jinja, text.html.jinja</string>
-       <key>tabTrigger</key>
-       <string>|</string>
-       <key>uuid</key>
-       <string>6000AFC3-4398-4500-B055-296D17DDAB48</string>
-</dict>
-</plist>

diff --git a/ext/Jinja.tmbundle/Snippets/xmlattr.tmSnippet b/ext/Jinja.tmbundle/Snippets/xmlattr.tmSnippet
deleted file mode 100644 (file)
index 5e8fbeb..0000000
--- a/ext/Jinja.tmbundle/Snippets/xmlattr.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-       <key>content</key>
-       <string>|xmlattr</string>
-       <key>name</key>
-       <string>xmlattr</string>
-       <key>scope</key>
-       <string>source.jinja, text.html.jinja</string>
-       <key>tabTrigger</key>
-       <string>|</string>
-       <key>uuid</key>
-       <string>CA8BCFEA-2BDB-4CB8-8E31-6388ECEF05BB</string>
-</dict>
-</plist>

diff --git a/ext/Vim/htmljinja.vim b/ext/Vim/htmljinja.vim
new file mode 100644 (file)
index 0000000..3f9cba4
--- /dev/null
+++ b/ext/Vim/htmljinja.vim
@@ -0,0 +1,27 @@
+" Vim syntax file
+" Language:    Jinja HTML template
+" Maintainer:  Armin Ronacher <armin.ronacher@active-4.com>
+" Last Change: 2007 Apr 8
+
+" For version 5.x: Clear all syntax items
+" For version 6.x: Quit when a syntax file was already loaded
+if version < 600
+  syntax clear
+elseif exists("b:current_syntax")
+  finish
+endif
+
+if !exists("main_syntax")
+  let main_syntax = 'html'
+endif
+
+if version < 600
+  so <sfile>:p:h/jinja.vim
+  so <sfile>:p:h/html.vim
+else
+  runtime! syntax/jinja.vim
+  runtime! syntax/html.vim
+  unlet b:current_syntax
+endif
+
+let b:current_syntax = "htmljinja"

diff --git a/ext/Vim/jinja.vim b/ext/Vim/jinja.vim
new file mode 100644 (file)
index 0000000..b961653
--- /dev/null
+++ b/ext/Vim/jinja.vim
@@ -0,0 +1,112 @@
+" Vim syntax file
+" Language:    Jinja template
+" Maintainer:  Armin Ronacher <armin.ronacher@active-4.com>
+" Last Change: 2008 May 9
+"
+" Known Bugs:
+"   because of odd limitations dicts and the modulo operator
+"   appear wrong in the template.
+"
+" Changes:
+"
+"     2008 May 9:     Added support for Jinja2 changes (new keyword rules)
+
+" For version 5.x: Clear all syntax items
+" For version 6.x: Quit when a syntax file was already loaded
+if version < 600
+  syntax clear
+elseif exists("b:current_syntax")
+  finish
+endif
+
+syntax case match
+
+" Jinja template built-in tags and parameters (without filter, macro, is and raw, they
+" have special threatment)
+syn keyword jinjaStatement containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained and if else in not or recursive as import
+
+syn keyword jinjaStatement containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained is filter skipwhite nextgroup=jinjaFilter
+syn keyword jinjaStatement containedin=jinjaTagBlock contained macro skipwhite nextgroup=jinjaFunction
+syn keyword jinjaStatement containedin=jinjaTagBlock contained block skipwhite nextgroup=jinjaBlockName
+
+" Variable Names
+syn match jinjaVariable containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained skipwhite /[a-zA-Z_][a-zA-Z0-9_]*/
+syn keyword jinjaSpecial containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained false true none loop super caller varargs kwargs
+
+" Filters
+syn match jinjaOperator "|" containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained nextgroup=jinjaFilter
+syn match jinjaFilter contained skipwhite /[a-zA-Z_][a-zA-Z0-9_]*/
+syn match jinjaFunction contained skipwhite /[a-zA-Z_][a-zA-Z0-9_]*/
+syn match jinjaBlockName contained skipwhite /[a-zA-Z_][a-zA-Z0-9_]*/
+
+" Jinja template constants
+syn region jinjaString containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained start=/"/ skip=/\\"/ end=/"/
+syn region jinjaString containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained start=/'/ skip=/\\'/ end=/'/
+syn match jinjaNumber containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained /[0-9]\+\(\.[0-9]\+\)\?/
+
+" Operators
+syn match jinjaOperator containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained /[+\-*\/<>=!,:]/
+syn match jinjaPunctuation containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained /[()\[\]]/
+syn match jinjaOperator containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained /\./ nextgroup=jinjaAttribute
+syn match jinjaAttribute contained /[a-zA-Z_][a-zA-Z0-9_]*/
+
+" Jinja template tag and variable blocks
+syn region jinjaNested matchgroup=jinjaOperator start="(" end=")" transparent display containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained
+syn region jinjaNested matchgroup=jinjaOperator start="\[" end="\]" transparent display containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained
+syn region jinjaNested matchgroup=jinjaOperator start="{" end="}" transparent display containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained
+syn region jinjaTagBlock matchgroup=jinjaTagDelim start=/{%-\?/ end=/-\?%}/ skipwhite containedin=ALLBUT,jinjaTagBlock,jinjaVarBlock,jinjaRaw,jinjaString,jinjaNested,jinjaComment
+
+syn region jinjaVarBlock matchgroup=jinjaVarDelim start=/{{-\?/ end=/-\?}}/ containedin=ALLBUT,jinjaTagBlock,jinjaVarBlock,jinjaRaw,jinjaString,jinjaNested,jinjaComment
+
+" Jinja template 'raw' tag
+syn region jinjaRaw matchgroup=jinjaRawDelim start="{%\s*raw\s*%}" end="{%\s*endraw\s*%}" containedin=ALLBUT,jinjaTagBlock,jinjaVarBlock,jinjaString,jinjaComment
+
+" Jinja comments
+syn region jinjaComment matchgroup=jinjaCommentDelim start="{#" end="#}" containedin=ALLBUT,jinjaTagBlock,jinjaVarBlock,jinjaString
+
+" Block start keywords.  A bit tricker.  We only highlight at the start of a
+" tag block and only if the name is not followed by a comma or equals sign
+" which usually means that we have to deal with an assignment.
+syn match jinjaStatement containedin=jinjaTagBlock contained skipwhite /\({%-\?\s*\)\@<=\<[a-zA-Z_][a-zA-Z0-9_]*\>\(\s*[,=]\)\@!/
+
+" and context modifiers
+syn match jinjaStatement containedin=jinjaTagBlock contained /\<with\(out\)\?\s\+context\>/ skipwhite
+
+
+" Define the default highlighting.
+" For version 5.7 and earlier: only when not done already
+" For version 5.8 and later: only when an item doesn't have highlighting yet
+if version >= 508 || !exists("did_jinja_syn_inits")
+  if version < 508
+    let did_jinja_syn_inits = 1
+    command -nargs=+ HiLink hi link <args>
+  else
+    command -nargs=+ HiLink hi def link <args>
+  endif
+
+  HiLink jinjaPunctuation jinjaOperator
+  HiLink jinjaAttribute jinjaVariable
+  HiLink jinjaFunction jinjaFilter
+
+  HiLink jinjaTagDelim jinjaTagBlock
+  HiLink jinjaVarDelim jinjaVarBlock
+  HiLink jinjaCommentDelim jinjaComment
+  HiLink jinjaRawDelim jinja
+
+  HiLink jinjaSpecial Special
+  HiLink jinjaOperator Normal
+  HiLink jinjaRaw Normal
+  HiLink jinjaTagBlock PreProc
+  HiLink jinjaVarBlock PreProc
+  HiLink jinjaStatement Statement
+  HiLink jinjaFilter Function
+  HiLink jinjaBlockName Function
+  HiLink jinjaVariable Identifier
+  HiLink jinjaString Constant
+  HiLink jinjaNumber Constant
+  HiLink jinjaComment Comment
+
+  delcommand HiLink
+endif
+
+let b:current_syntax = "jinja"