diff --git a/doc/compress.html b/doc/compress.html
index abcb207ac1a60effebef6595a4e0bb4a8f28d685..19639903a3f619128234d9620b2986d4b98d2d3c 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -167,6 +167,7 @@
<option value="http://codemirror.net/mode/tiddlywiki/tiddlywiki.js">tiddlywiki.js</option>
<option value="http://codemirror.net/mode/tiki/tiki.js">tiki.js</option>
<option value="http://codemirror.net/mode/toml/toml.js">toml.js</option>
+ <option value="http://codemirror.net/mode/tornado/tornado.js">tornado.js</option>
<option value="http://codemirror.net/mode/turtle/turtle.js">turtle.js</option>
<option value="http://codemirror.net/mode/vb/vb.js">vb.js</option>
<option value="http://codemirror.net/mode/vbscript/vbscript.js">vbscript.js</option>
diff --git a/mode/index.html b/mode/index.html
index f8dc20ec3e11753ff6202d86b57b710a4cc23bcf..bfbe44700528ac859530fbad424cb3ce6a7701b6 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -109,6 +109,7 @@ option.</p>
<li><a href="tiddlywiki/index.html">Tiddlywiki</a></li>
<li><a href="tiki/index.html">Tiki wiki</a></li>
<li><a href="toml/index.html">TOML</a></li>
+ <li><a href="tornado/index.html">Tornado</a> (templating language)</li>
<li><a href="turtle/index.html">Turtle</a></li>
<li><a href="vb/index.html">VB.NET</a></li>
<li><a href="vbscript/index.html">VBScript</a></li>
diff --git a/mode/meta.js b/mode/meta.js
index 81efdcf433efb7b0757edfc07ff629160881e6f2..cee33e542203956d746433c754257a58ba1ecd1b 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -107,6 +107,7 @@
{name: "TiddlyWiki ", mime: "text/x-tiddlywiki", mode: "tiddlywiki"},
{name: "Tiki wiki", mime: "text/tiki", mode: "tiki"},
{name: "TOML", mime: "text/x-toml", mode: "toml"},
+ {name: "Tornado", mime: "text/x-tornado", mode: "tornado"},
{name: "Turtle", mime: "text/turtle", mode: "turtle", ext: ["ttl"]},
{name: "TypeScript", mime: "application/typescript", mode: "javascript", ext: ["ts"]},
{name: "VB.NET", mime: "text/x-vb", mode: "vb", ext: ["vb"]},
diff --git a/mode/tornado/index.html b/mode/tornado/index.html
new file mode 100644
index 0000000000000000000000000000000000000000..1599fca553555bb3ba3c58233961646945723f14
--- /dev/null
+++ b/mode/tornado/index.html
@@ -0,0 +1,63 @@
+<!doctype html>
+
+<title>CodeMirror: Tornado template mode</title>
+<meta charset="utf-8"/>
+<link rel=stylesheet href="../../doc/docs.css">
+
+<link rel="stylesheet" href="../../lib/codemirror.css">
+<script src="../../lib/codemirror.js"></script>
+<script src="../../addon/mode/overlay.js"></script>
+<script src="../xml/xml.js"></script>
+<script src="../htmlmixed/htmlmixed.js"></script>
+<script src="tornado.js"></script>
+<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
+<div id=nav>
+ <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+
+ <ul>
+ <li><a href="../../index.html">Home</a>
+ <li><a href="../../doc/manual.html">Manual</a>
+ <li><a href="https://github.com/marijnh/codemirror">Code</a>
+ </ul>
+ <ul>
+ <li><a href="../index.html">Language modes</a>
+ <li><a class=active href="#">Tornado</a>
+ </ul>
+</div>
+
+<article>
+<h2>Tornado template mode</h2>
+<form><textarea id="code" name="code">
+<!doctype html>
+<html>
+ <head>
+ <title>My Tornado web application</title>
+ </head>
+ <body>
+ <h1>
+ {{ title }}
+ </h1>
+ <ul class="my-list">
+ {% for item in items %}
+ <li>{% item.name %}</li>
+ {% empty %}
+ <li>You have no items in your list.</li>
+ {% endfor %}
+ </ul>
+ </body>
+</html>
+</textarea></form>
+
+ <script>
+ var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+ lineNumbers: true,
+ mode: "tornado",
+ indentUnit: 4,
+ indentWithTabs: true
+ });
+ </script>
+
+ <p>Mode for HTML with embedded Tornado template markup.</p>
+
+ <p><strong>MIME types defined:</strong> <code>text/x-tornado</code></p>
+ </article>
diff --git a/mode/tornado/tornado.js b/mode/tornado/tornado.js
new file mode 100644
index 0000000000000000000000000000000000000000..ed878cfabde6c1bf04832f0928ea058b11a7319c
--- /dev/null
+++ b/mode/tornado/tornado.js
@@ -0,0 +1,70 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+ if (typeof exports == "object" && typeof module == "object") // CommonJS
+ mod(require("../../lib/codemirror"), require("../htmlmixed/htmlmixed"),
+ require("../../addon/mode/overlay"));
+ else if (typeof define == "function" && define.amd) // AMD
+ define(["../../lib/codemirror", "../htmlmixed/htmlmixed",
+ "../../addon/mode/overlay"], mod);
+ else // Plain browser env
+ mod(CodeMirror);
+})(function(CodeMirror) {
+ "use strict";
+
+ CodeMirror.defineMode("tornado:inner", function() {
+ var keywords = ["block", "for", "in", "true", "false",
+ "none", "self", "super", "if", "end", "as", "not", "and",
+ "else", "import", "with", "without", "context",
+ "try", "except", "put", "escape", "xhtml_escape", "url_escape",
+ "json_encode", "squeeze", "linkify", "datetime",
+ "extends", "include", "load", "length", "comment",
+ "pass", "while", "set", "import", "from",
+ "autoescape", "raw", "module"];
+ keywords = new RegExp("^((" + keywords.join(")|(") + "))\\b");
+
+ function tokenBase (stream, state) {
+ stream.eatWhile(/[^\{]/);
+ var ch = stream.next();
+ if (ch == "{") {
+ if (ch = stream.eat(/\{|%|#/)) {
+ state.tokenize = inTag(ch);
+ return "tag";
+ }
+ }
+ }
+ function inTag (close) {
+ if (close == "{") {
+ close = "}";
+ }
+ return function (stream, state) {
+ var ch = stream.next();
+ if ((ch == close) && stream.eat("}")) {
+ state.tokenize = tokenBase;
+ return "tag";
+ }
+ if (stream.match(keywords)) {
+ return "keyword";
+ }
+ return close == "#" ? "comment" : "string";
+ };
+ }
+ return {
+ startState: function () {
+ return {tokenize: tokenBase};
+ },
+ token: function (stream, state) {
+ return state.tokenize(stream, state);
+ }
+ };
+ });
+
+ CodeMirror.defineMode("tornado", function(config) {
+ var htmlBase = CodeMirror.getMode(config, "text/html");
+ var tornadoInner = CodeMirror.getMode(config, "tornado:inner");
+ return CodeMirror.overlayMode(htmlBase, tornadoInner);
+ });
+
+ CodeMirror.defineMIME("text/x-tornado", "tornado");
+});