From 985642cc7a7be94f81d394b0b83171001553426b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6nke=20Ludwig?= <sludwig@rejectedsoftware.com>
Date: Tue, 11 Jul 2017 21:13:12 +0200
Subject: [PATCH 1/3] Remove vibe-d:diet.

See also #1834.
---
 diet/dub.sdl                         |    7 -
 diet/vibe/templ/diet.d               | 1556 --------------------------
 diet/vibe/templ/parsertools.d        |  185 ---
 diet/vibe/templ/utils.d              |  169 ---
 dub.sdl                              |    2 -
 examples/app_skeleton/source/index.d |    1 -
 http/dub.sdl                         |    1 -
 http/vibe/http/server.d              |   17 +-
 source/vibe/vibe.d                   |    2 -
 web/dub.sdl                          |    1 -
 web/vibe/web/i18n.d                  |   29 +-
 11 files changed, 35 insertions(+), 1935 deletions(-)
 delete mode 100644 diet/dub.sdl
 delete mode 100644 diet/vibe/templ/diet.d
 delete mode 100644 diet/vibe/templ/parsertools.d
 delete mode 100644 diet/vibe/templ/utils.d

diff --git a/diet/dub.sdl b/diet/dub.sdl
deleted file mode 100644
index eddbb85eff..0000000000
--- a/diet/dub.sdl
+++ /dev/null
@@ -1,7 +0,0 @@
-name "diet"
-description "Diet HTML template system"
-dependency "vibe-d:stream" version=">=0.0.0"
-dependency "vibe-d:textfilter" version=">=0.0.0"
-targetType "library"
-sourcePaths "."
-importPaths "."
diff --git a/diet/vibe/templ/diet.d b/diet/vibe/templ/diet.d
deleted file mode 100644
index 4d05aacdc6..0000000000
--- a/diet/vibe/templ/diet.d
+++ /dev/null
@@ -1,1556 +0,0 @@
-/**
-	Implements a compile-time Diet template parser.
-
-	Diet templates are an more or less compatible incarnation of Jade templates but with
-	embedded D source instead of JavaScript. The Diet syntax reference is found at
-	$(LINK http://vibed.org/templates/diet).
-
-	Copyright: © 2012-2015 RejectedSoftware e.K.
-	License: Subject to the terms of the MIT license, as written in the included LICENSE.txt file.
-	Authors: Sönke Ludwig
-*/
-module vibe.templ.diet;
-
-public import vibe.core.stream;
-
-import vibe.core.file;
-import vibe.internal.meta.typetuple;
-import vibe.templ.parsertools;
-import vibe.templ.utils;
-import vibe.textfilter.html;
-static import vibe.textfilter.markdown;
-import vibe.utils.string;
-
-import core.vararg;
-import std.ascii : isAlpha;
-import std.array;
-import std.conv;
-import std.format;
-import std.typecons;
-import std.typetuple;
-import std.variant;
-
-/*
-	TODO:
-		support string interpolations in filter blocks
-		to!string and htmlEscape should not be used in conjunction with ~ at run time. instead,
-		use filterHtmlEncode().
-*/
-
-
-/**
-	Parses the given Diet template at compile time and writes the resulting
-	HTML code into `stream__`.
-*/
-void compileDietFile(string template_file, ALIASES...)(OutputStream stream__)
-{
-	compileDietFileIndent!(template_file, 0, ALIASES)(stream__);
-}
-/// ditto
-void compileDietFileIndent(string template_file, size_t indent, ALIASES...)(OutputStream stream__)
-{
-	// some imports to make available by default inside templates
-	import vibe.http.common;
-	import vibe.stream.wrapper;
-	import vibe.utils.string;
-
-	pragma(msg, "Compiling diet template '"~template_file~"'...");
-	//pragma(msg, localAliases!(0, ALIASES));
-	mixin(localAliases!(0, ALIASES));
-
-	static if (is(typeof(diet_translate__))) alias TRANSLATE = TypeTuple!(diet_translate__);
-	else alias TRANSLATE = TypeTuple!();
-
-	auto output__ = StreamOutputRange(stream__);
-
-	// Generate the D source code for the diet template
-	//pragma(msg, dietParser!template_file(indent));
-	static if (is(typeof(diet_translate__)))
-		mixin(dietParser!(template_file, diet_translate__)(indent));
-	else
-		mixin(dietParser!template_file(indent));
-}
-
-
-/**
-	Generates a diet template compiler to use as a mixin.
-
-	This can be used as an alternative to compileDietFile or compileDietFileCompat. It allows
-	the template to use all symbols visible in the enclosing scope. In situations where many
-	variables from the calling function's scope are used within the template, it can reduce the
-	amount of code required for invoking the template.
-
-	Note that even if this method of using diet templates can reduce the amount of source code. It
-	is generally recommended to use compileDietFile(Compat) instead, as those
-	facilitate a cleaner interface between D code and diet code by explicity documenting the
-	symbols usable inside of the template and thus avoiding unwanted, hidden dependencies. A
-	possible alternative for passing many variables is to pass a struct or class value to
-	compileDietFile(Compat).
-
-	Examples:
-	---
-	void handleRequest(HTTPServerRequest req, HTTPServerResponse res)
-	{
-		int this_variable_is_automatically_visible_to_the_template;
-		mixin(compileDietFileMixin!("index.dt", "res.bodyWriter"));
-	}
-	---
-*/
-template compileDietFileMixin(string template_file, string stream_variable, size_t base_indent = 0)
-{
-	enum compileDietFileMixin =
-		"import vibe.stream.wrapper;\n" ~
-		"OutputStream stream__ = "~stream_variable~";\n" ~
-		"auto output__ = StreamOutputRange(stream__);\n" ~
-		dietParser!template_file(base_indent);
-}
-
-
-/**
-	The same as compileDietFile, but taking a Diet source code string instead of a file name.
-*/
-void compileDietString(string diet_code, ALIASES...)(OutputStream stream__)
-{
-	// some imports to make available by default inside templates
-	import vibe.stream.wrapper;
-	import vibe.utils.string;
-	import std.typetuple;
-
-	//pragma(msg, localAliases!(0, ALIASES));
-	mixin(localAliases!(0, ALIASES));
-
-	// Generate the D source code for the diet template
-	static if (is(typeof(diet_translate__))) alias TRANSLATE = TypeTuple!(diet_translate__);
-	else alias TRANSLATE = TypeTuple!();
-
-	auto output__ = StreamOutputRange(stream__);
-
-	//pragma(msg, dietStringParser!(diet_code, "__diet_code__", TRANSLATE)(0));
-	mixin(dietStringParser!(Group!(diet_code, "__diet_code__"), TRANSLATE)(0));
-}
-
-
-/**
-	The same as $(D compileDietStrings), but taking multiple source codes as a $(D Group).
-*/
-private void compileDietStrings(SOURCE_AND_ALIASES...)(OutputStream stream__)
-	if (SOURCE_AND_ALIASES.length >= 1 && isGroup!(SOURCE_AND_ALIASES[0]))
-{
-	// some imports to make available by default inside templates
-	import vibe.stream.wrapper;
-	import vibe.utils.string;
-	import std.typetuple;
-
-	//pragma(msg, localAliases!(0, ALIASES));
-	mixin(localAliases!(0, SOURCE_AND_ALIASES[1 .. $]));
-
-	// Generate the D source code for the diet template
-	static if (is(typeof(diet_translate__))) alias TRANSLATE = TypeTuple!(diet_translate__);
-	else alias TRANSLATE = TypeTuple!();
-
-	auto output__ = StreamOutputRange(stream__);
-
-	//pragma(msg, dietStringParser!(diet_code, "__diet_code__", TRANSLATE)(0));
-	mixin(dietStringParser!(SOURCE_AND_ALIASES[0], TRANSLATE)(0));
-}
-
-/**
-	Registers a new text filter for use in Diet templates.
-
-	The filter will be available using :filtername inside of the template. The following filters are
-	predefined: css, javascript, markdown, htmlescape
-*/
-void registerDietTextFilter(string name, string function(string, size_t indent) filter)
-{
-	s_filters[name] = filter;
-}
-
-
-/**************************************************************************************************/
-/* private functions                                                                              */
-/**************************************************************************************************/
-
-private {
-	enum string OutputVariableName = "output__";
-	string function(string, size_t indent)[string] s_filters;
-}
-
-static this()
-{
-	registerDietTextFilter("css", &filterCSS);
-	registerDietTextFilter("javascript", &filterJavaScript);
-	registerDietTextFilter("markdown", &filterMarkdown);
-	registerDietTextFilter("htmlescape", &filterHtmlEscape);
-}
-
-
-private string dietParser(string template_file, TRANSLATE...)(size_t base_indent)
-{
-	TemplateBlock[] files;
-	readFileRec!(template_file)(files);
-	auto compiler = DietCompiler!TRANSLATE(&files[0], &files, new BlockStore);
-	return compiler.buildWriter(base_indent);
-}
-
-private string dietStringParser(TEXT_NAME_PAIRS_AND_TRANSLATE...)(size_t base_indent)
-	if (TEXT_NAME_PAIRS_AND_TRANSLATE.length >= 1 && isGroup!(TEXT_NAME_PAIRS_AND_TRANSLATE[0]))
-{
-	alias TEXT_NAME_PAIRS = TypeTuple!(TEXT_NAME_PAIRS_AND_TRANSLATE[0].expand);
-	static if (TEXT_NAME_PAIRS_AND_TRANSLATE.length >= 2)
-		alias TRANSLATE = TEXT_NAME_PAIRS_AND_TRANSLATE[1];
-	else alias TRANSLATE = TypeTuple!();
-
-	enum ROOT_LINES = removeEmptyLines(TEXT_NAME_PAIRS[0], TEXT_NAME_PAIRS[1]);
-
-	TemplateBlock[] files;
-	foreach (i, N; TEXT_NAME_PAIRS) {
-		static if (i % 2 == 1) {
-			TemplateBlock blk;
-			blk.name = N;
-			static if (i == 1) blk.lines = ROOT_LINES;
-			else blk.lines = removeEmptyLines(TEXT_NAME_PAIRS[i-1], N);
-			blk.indentStyle = detectIndentStyle(blk.lines);
-			files ~= blk;
-		}
-	}
-
-	readFilesRec!(extractDependencies(ROOT_LINES), extractNames!TEXT_NAME_PAIRS)(files);
-
-	auto compiler = DietCompiler!TRANSLATE(&files[0], &files, new BlockStore);
-	return compiler.buildWriter(base_indent);
-}
-
-private template extractNames(PAIRS...)
-{
-	static if (PAIRS.length >= 2) {
-		alias extractNames = TypeTuple!(PAIRS[1], extractNames!(PAIRS[2 .. $]));
-	} else {
-		alias extractNames = TypeTuple!();
-	}
-}
-
-
-/******************************************************************************/
-/* Reading of input files                                                     */
-/******************************************************************************/
-
-private struct TemplateBlock {
-	string name;
-	int mode = 0; // -1: prepend, 0: replace, 1: append
-	string indentStyle;
-	Line[] lines;
-}
-
-private class BlockStore {
-	TemplateBlock[] blocks;
-}
-
-
-/// private
-private void readFileRec(string FILE, ALREADY_READ...)(ref TemplateBlock[] dst)
-{
-	static if( !isPartOf!(FILE, ALREADY_READ)() ){
-		enum LINES = removeEmptyLines(import(FILE), FILE);
-
-		TemplateBlock ret;
-		ret.name = FILE;
-		ret.lines = LINES;
-		ret.indentStyle = detectIndentStyle(ret.lines);
-
-		enum DEPS = extractDependencies(LINES);
-		dst ~= ret;
-		readFilesRec!(DEPS, ALREADY_READ, FILE)(dst);
-	}
-}
-
-/// private
-private void readFilesRec(alias FILES, ALREADY_READ...)(ref TemplateBlock[] dst)
-{
-	static if( FILES.length > 0 ){
-		readFileRec!(FILES[0], ALREADY_READ)(dst);
-		readFilesRec!(FILES[1 .. $], ALREADY_READ, FILES[0])(dst);
-	}
-}
-
-/// private
-private bool isPartOf(string str, STRINGS...)()
-{
-	template impl(size_t i) {
-		static if (i >= STRINGS.length) enum impl = false;
-		else static if (STRINGS[i] == str) enum impl = true;
-		else enum impl = impl!(i+1);
-	}
-	return impl!0;
-}
-
-private string[] extractDependencies(in Line[] lines)
-{
-	string[] ret;
-	foreach (ref ln; lines) {
-		auto lnstr = ln.text.ctstrip();
-		if (lnstr.startsWith("extends ")) ret ~= lnstr[8 .. $].ctstrip() ~ ".dt";
-		if (lnstr.length) break;
-	}
-	return ret;
-}
-
-
-/******************************************************************************/
-/* The Diet compiler                                                          */
-/******************************************************************************/
-
-private class OutputContext {
-	enum State {
-		Code,
-		String
-	}
-	struct Node {
-		string tag;
-		bool inner;
-		bool outer;
-		alias tag this;
-	}
-
-	State m_state = State.Code;
-	Node[] m_nodeStack;
-	string m_result;
-	Line m_line = Line(null, -1, null);
-	size_t m_baseIndent;
-	bool m_isHTML5;
-	bool warnTranslationContext = false;
-
-	this(size_t base_indent = 0)
-	{
-		m_baseIndent = base_indent;
-	}
-
-	void markInputLine(in ref Line line)
-	{
-		if( m_state == State.Code ){
-			m_result ~= lineMarker(line);
-		} else {
-			m_line = Line(line.file, line.number, null);
-		}
-	}
-
-	@property size_t stackSize() const { return m_nodeStack.length; }
-
-	void pushNode(string str, bool inner = true, bool outer = true) { m_nodeStack ~= Node(str, inner, outer); }
-	void pushDummyNode() { pushNode("-"); }
-
-	void popNodes(int next_indent_level, ref bool prepend_whitespaces)
-	{
-		// close all tags/blocks until we reach the level of the next line
-		while( m_nodeStack.length > next_indent_level ){
-			auto top = m_nodeStack[$-1];
-			if( top[0] == '-' ){
-				if( top.length > 1 ){
-					writeCodeLine(top[1 .. $]);
-				}
-			} else if( top.length ){
-				if( top.inner && prepend_whitespaces && top != "</pre>" ){
-					writeString("\n");
-					writeIndent(m_nodeStack.length-1);
-				}
-
-				writeString(top);
-				prepend_whitespaces = top.outer;
-			}
-			m_nodeStack.length--;
-		}
-	}
-
-	// TODO: avoid runtime allocations by replacing htmlEscape/_toString calls with
-	//       filtering functions
-	void writeRawString(string str) { enterState(State.String); m_result ~= str; }
-	void writeString(string str) { writeRawString(dstringEscape(str)); }
-	void writeStringHtmlEscaped(string str) { writeString(htmlEscape(str)); }
-	void writeStringHtmlAttribEscaped(string str) { writeString(htmlAttribEscape(str)); }
-	void writeIndent(size_t stack_depth = size_t.max)
-	{
-		import std.algorithm : min;
-		string str;
-		foreach (i; 0 .. m_baseIndent) str ~= '\t';
-		foreach (j; 0 .. min(m_nodeStack.length, stack_depth)) if (m_nodeStack[j][0] != '-') str ~= '\t';
-		writeRawString(str);
-	}
-
-	void writeStringExpr(string str) { writeCodeLine(OutputVariableName~".put("~str~");"); }
-	void writeStringExprHtmlEscaped(string str) { writeCodeLine("filterHTMLEscape("~OutputVariableName~", "~str~")"); }
-	void writeStringExprHtmlAttribEscaped(string str) { writeCodeLine("filterHTMLAttribEscape("~OutputVariableName~", "~str~")"); }
-
-	void writeExpr(string str) { writeCodeLine("_toStringS!(s => "~OutputVariableName~".put(s))("~str~");"); }
-	void writeExprHtmlEscaped(string str) { writeCodeLine("_toStringS!(s => filterHTMLEscape("~OutputVariableName~", s))("~str~");"); }
-	void writeExprHtmlAttribEscaped(string str) { writeCodeLine("_toStringS!(s => filterHTMLAttribEscape("~OutputVariableName~", s))("~str~");"); }
-
-	void writeDebugString(string str) { /* ignore */ }
-
-	void writeCodeLine(string stmt)
-	{
-		if( !enterState(State.Code) )
-			m_result ~= lineMarker(m_line);
-		m_result ~= stmt ~ "\n";
-	}
-
-	private bool enterState(State state)
-	{
-		if( state == m_state ) return false;
-
-		if( state != m_state.Code ) enterState(State.Code);
-
-		final switch(state){
-			case State.Code:
-				if( m_state == State.String ) m_result ~= "\");\n";
-				else m_result ~= ");\n";
-				m_result ~= lineMarker(m_line);
-				break;
-			case State.String:
-				m_result ~= OutputVariableName ~ ".put(\"";
-				break;
-		}
-
-		m_state = state;
-		return true;
-	}
-}
-
-private struct DietCompiler(TRANSLATE...)
-	if(TRANSLATE.length <= 1)
-{
-	private {
-		size_t m_lineIndex = 0;
-		TemplateBlock* m_block;
-		TemplateBlock[]* m_files;
-		BlockStore m_blocks;
-	}
-
-	@property ref string indentStyle() { return m_block.indentStyle; }
-	@property size_t lineCount() { return m_block.lines.length; }
-	ref Line line(size_t ln) { return m_block.lines[ln]; }
-	ref Line currLine() { return m_block.lines[m_lineIndex]; }
-	ref string currLineText() { return m_block.lines[m_lineIndex].text; }
-	Line[] lineRange(size_t from, size_t to) { return m_block.lines[from .. to]; }
-
-	@disable this();
-
-	this(TemplateBlock* block, TemplateBlock[]* files, BlockStore blocks)
-	{
-		m_block = block;
-		m_files = files;
-		m_blocks = blocks;
-	}
-
-	string buildWriter(size_t base_indent)
-	{
-		auto output = new OutputContext(base_indent);
-		buildWriter(output, 0);
-		assert(output.m_nodeStack.length == 0, "Template writer did not consume all nodes!?");
-		if (output.warnTranslationContext)
-			output.writeCodeLine(`pragma(msg, "Warning: No translation context found, ignoring '&' suffixes. Note that you have to use @translationContext in conjunction with vibe.web.web.render() (vibe.http.server.render() does not work) to enable translation support.");`);
-		return output.m_result;
-	}
-
-	void buildWriter(OutputContext output, int base_level)
-	{
-		assert(m_blocks !is null, "Trying to compile template with no blocks specified.");
-
-		while(true){
-			if( lineCount == 0 ) return;
-			auto firstline = line(m_lineIndex);
-			auto firstlinetext = firstline.text;
-
-			if( firstlinetext.startsWith("extends ") ){
-				string layout_file = firstlinetext[8 .. $].ctstrip() ~ ".dt";
-				auto extfile = getFile(layout_file);
-				m_lineIndex++;
-
-				// extract all blocks
-				while( m_lineIndex < lineCount ){
-					TemplateBlock subblock;
-
-					// read block header
-					string blockheader = line(m_lineIndex).text;
-					size_t spidx = 0;
-					auto mode = skipIdent(line(m_lineIndex).text, spidx, "");
-					assertp(spidx > 0, "Expected block/append/prepend.");
-					subblock.name = blockheader[spidx .. $].ctstrip();
-					if( mode == "block" ) subblock.mode = 0;
-					else if( mode == "append" ) subblock.mode = 1;
-					else if( mode == "prepend" ) subblock.mode = -1;
-					else assertp(false, "Expected block/append/prepend.");
-					m_lineIndex++;
-
-					// skip to next block
-					auto block_start = m_lineIndex;
-					while( m_lineIndex < lineCount ){
-						auto lvl = indentLevel(line(m_lineIndex).text, indentStyle, false);
-						if( lvl == 0 ) break;
-						m_lineIndex++;
-					}
-
-					// append block to compiler
-					subblock.lines = lineRange(block_start, m_lineIndex);
-					subblock.indentStyle = indentStyle;
-					m_blocks.blocks ~= subblock;
-
-					//output.writeString("<!-- found block "~subblock.name~" in "~line(0).file ~ "-->\n");
-				}
-
-				// change to layout file and start over
-				m_block = extfile;
-				m_lineIndex = 0;
-			} else {
-				auto start_indent_level = indentLevel(firstlinetext, indentStyle);
-				//assertp(start_indent_level == 0, "Indentation must start at level zero.");
-				buildBodyWriter(output, base_level, start_indent_level);
-				break;
-			}
-		}
-
-		output.enterState(OutputContext.State.Code);
-	}
-
-	private void buildBodyWriter(OutputContext output, int base_level, int start_indent_level)
-	{
-		assert(m_blocks !is null, "Trying to compile template body with no blocks specified.");
-
-		assertp(output.stackSize >= base_level);
-
-		int computeNextIndentLevel(){
-			return (m_lineIndex+1 < lineCount ? indentLevel(line(m_lineIndex+1).text, indentStyle, false) - start_indent_level : 0) + base_level;
-		}
-
-		bool prepend_whitespaces = true;
-
-		for( ; m_lineIndex < lineCount; m_lineIndex++ ){
-			auto curline = line(m_lineIndex);
-			output.markInputLine(curline);
-			auto level = indentLevel(curline.text, indentStyle) - start_indent_level + base_level;
-			assertp(level <= output.stackSize+1);
-			auto ln = unindent(curline.text, indentStyle);
-			assertp(ln.length > 0);
-			int next_indent_level = computeNextIndentLevel();
-
-			assertp(output.stackSize >= level, cttostring(output.stackSize) ~ ">=" ~ cttostring(level));
-			assertp(next_indent_level <= level+1, "The next line is indented by more than one level deeper. Please unindent accordingly.");
-
-			if( ln[0] == '-' ){ // embedded D code
-				assertp(ln[$-1] != '{', "Use indentation to nest D statements instead of braces.");
-				output.writeCodeLine(ln[1 .. $] ~ "{");
-				output.pushNode("-}");
-			} else if( ln[0] == '|' ){ // plain text node
-				buildTextNodeWriter(output, ln[1 .. ln.length], level, prepend_whitespaces);
-			} else if( ln[0] == '<' ){ // plain text node starting with <
-				assertp(next_indent_level <= level, "Child elements for plain text starting with '<' are not supported.");
-				buildTextNodeWriter(output, ln, level, prepend_whitespaces);
-			} else if( ln[0] == ':' ){ // filter node (filtered raw text)
-				// find all child lines
-				size_t next_tag = m_lineIndex+1;
-				while( next_tag < lineCount &&
-					indentLevel(line(next_tag).text, indentStyle, false) - start_indent_level > level-base_level )
-				{
-					next_tag++;
-				}
-
-				buildFilterNodeWriter(output, ln, curline.number, level + start_indent_level - base_level,
-						lineRange(m_lineIndex+1, next_tag));
-
-				// skip to the next tag
-				//output.pushDummyNode();
-				m_lineIndex = next_tag-1;
-				next_indent_level = computeNextIndentLevel();
-			} else if( ln[0] == '/' && ln.length > 1 && ln[1] == '/' ){ // all sorts of comments
-				if( ln.length >= 5 && ln[2..5] == "if " ){ // IE conditional comment
-					size_t j = 5;
-					skipWhitespace(ln, j);
-					buildSpecialTag(output, "!--[if "~ln[j .. $]~"]", level);
-					output.pushNode("<![endif]-->");
-				} else { // HTML and non-output comment
-					auto output_comment = !(ln.length > 2 && ln[2] == '-');
-					if( output_comment ) {
-						size_t j = 2;
-						skipWhitespace(ln, j);
-						output.writeString("<!-- " ~ htmlEscape(ln[j .. $]));
-					}
-					size_t next_tag = m_lineIndex+1;
-					while( next_tag < lineCount &&
-						indentLevel(line(next_tag).text, indentStyle, false) - start_indent_level > level-base_level )
-					{
-						if( output_comment ) {
-							output.writeString("\n");
-							output.writeStringHtmlEscaped(line(next_tag).text);
-						}
-						next_tag++;
-					}
-					if( output_comment ) {
-						output.pushNode(" -->");
-					}
-
-					// skip to the next tag
-					m_lineIndex = next_tag-1;
-					next_indent_level = computeNextIndentLevel();
-				}
-			} else {
-				size_t j = 0;
-				auto tag = isAlpha(ln[0]) ? skipIdent(ln, j, ":-_") : "div";
-
-				if (ln.startsWith("!!! ")) {
-					//output.writeCodeLine(`pragma(msg, "\"!!!\" is deprecated, use \"doctype\" instead.");`);
-					tag = "doctype";
-					j += 4;
-				}
-
-				switch(tag){
-					default:
-						if (buildHtmlNodeWriter(output, tag, ln[j .. $], level, next_indent_level > level, prepend_whitespaces)) {
-							// tag had a '.' appended. treat child nodes as plain text
-							size_t next_tag = m_lineIndex + 1;
-							size_t unindent_count = level + start_indent_level - base_level + 1;
-							size_t last_line_number = curline.number;
-							while( next_tag < lineCount &&
-								  indentLevel(line(next_tag).text, indentStyle, false) - start_indent_level > level-base_level )
-							{
-								// TODO: output all empty lines between this and the previous one
-								foreach (i; last_line_number+1 .. line(next_tag).number) output.writeString("\n");
-								last_line_number = line(next_tag).number;
-								buildTextNodeWriter(output, unindent(line(next_tag++).text, indentStyle, unindent_count), level, prepend_whitespaces);
-							}
-							m_lineIndex = next_tag - 1;
-							next_indent_level = computeNextIndentLevel();
-						}
-						break;
-					case "doctype": // HTML Doctype header
-						assertp(level == 0, "'doctype' may only be used as a top level tag.");
-						buildDoctypeNodeWriter(output, ln, j, level);
-						assertp(next_indent_level <= level, "'doctype' may not have child tags.");
-						break;
-					case "block": // Block insertion place
-						output.pushDummyNode();
-						auto block = getBlock(ln[6 .. $].ctstrip());
-						if( block ){
-							output.writeDebugString("<!-- using block " ~ ln[6 .. $] ~ " in " ~ curline.file ~ "-->");
-							if( block.mode == 1 ){
-								// TODO: output defaults
-								assertp(next_indent_level <= level, "Append mode for blocks is currently not supported.");
-							}
-							auto blockcompiler = new DietCompiler(block, m_files, m_blocks);
-							/*blockcompiler.m_block = block;
-							blockcompiler.m_blocks = m_blocks;*/
-							blockcompiler.buildWriter(output, cast(int)output.m_nodeStack.length);
-
-							if( block.mode != -1 ){
-								// skip over the default block contents if the block mode is not prepend
-
-								// find all child lines
-								size_t next_tag = m_lineIndex+1;
-								while( next_tag < lineCount &&
-									indentLevel(line(next_tag).text, indentStyle, false) - start_indent_level > level-base_level )
-								{
-									next_tag++;
-								}
-
-								// skip to the next tag
-								m_lineIndex = next_tag-1;
-								next_indent_level = computeNextIndentLevel();
-							}
-						} else {
-							// output defaults
-							output.writeDebugString("<!-- Default block " ~ ln[6 .. $] ~ " in " ~ curline.file ~ "-->");
-						}
-						break;
-					case "include": // Diet file include
-						assertp(next_indent_level <= level, "Child elements for 'include' are not supported.");
-						auto content = ln[8 .. $].ctstrip();
-						if (content.startsWith("#{")) {
-							assertp(content.endsWith("}"), "Missing closing '}'.");
-							output.writeCodeLine("mixin(dietStringParser!(Group!("~content[2 .. $-1]~", \""~replace(content, `"`, `'`)~"\"), TRANSLATE)("~to!string(level)~"));");
-						} else {
-							output.writeCodeLine("mixin(dietParser!(\""~content~".dt\", TRANSLATE)("~to!string(level)~"));");
-						}
-						break;
-					case "script":
-					case "style":
-						// determine if this is a plain css/JS tag (without a trailing .) and output a warning
-						// for using deprecated behavior
-						auto tagline = ln[j .. $];
-						HTMLAttribute[] attribs;
-						size_t tli;
-						auto wst = parseHtmlTag(tagline, tli, attribs);
-						tagline = tagline[0 .. tli];
-						if (wst.block_tag) goto default;
-						enum legacy_types = [`"text/css"`, `"text/javascript"`, `"application/javascript"`, `'text/css'`, `'text/javascript'`, `'application/javascript'`];
-						bool is_legacy_type = true;
-						foreach (i, ref a; attribs)
-							if (a.key == "type") {
-								is_legacy_type = false;
-								foreach (t; legacy_types)
-									if (a.value == t) {
-										is_legacy_type = true;
-										break;
-									}
-								break;
-							}
-						if (!is_legacy_type) goto default;
-
-						if (next_indent_level <= level) {
-							buildHtmlNodeWriter(output, tag, ln[j .. $], level, false, prepend_whitespaces);
-						} else {
-							output.writeCodeLine(`pragma(msg, "`~dstringEscape(currLine.file)~`:`~currLine.number.to!string~
-								`: Warning: Use an explicit text block '`~tag~dstringEscape(tagline)~
-								`.' (with a trailing dot) for embedded css/javascript - old behavior will be removed soon.");`);
-
-							// pass all child lines to buildRawTag and continue with the next sibling
-							size_t next_tag = m_lineIndex+1;
-							while( next_tag < lineCount &&
-								indentLevel(line(next_tag).text, indentStyle, false) - start_indent_level > level-base_level )
-							{
-								next_tag++;
-							}
-							buildRawNodeWriter(output, tag, ln[j .. $], level, base_level,
-								lineRange(m_lineIndex+1, next_tag));
-							m_lineIndex = next_tag-1;
-							next_indent_level = computeNextIndentLevel();
-						}
-						break;
-					case "each":
-					case "for":
-					case "if":
-					case "unless":
-					case "mixin":
-						assertp(false, "'"~tag~"' is not supported.");
-						break;
-				}
-			}
-			output.popNodes(next_indent_level, prepend_whitespaces);
-		}
-	}
-
-	private void buildTextNodeWriter(OutputContext output, in string textline, int level, ref bool prepend_whitespaces)
-	{
-		if(prepend_whitespaces) output.writeString("\n");
-		if( textline.length >= 1 && textline[0] == '=' ){
-			output.writeExprHtmlEscaped(textline[1 .. $]);
-		} else if( textline.length >= 2 && textline[0 .. 2] == "!=" ){
-			output.writeExpr(textline[2 .. $]);
-		} else {
-			buildInterpolatedString(output, textline);
-		}
-		output.pushDummyNode();
-		prepend_whitespaces = true;
-	}
-
-	private void buildDoctypeNodeWriter(OutputContext output, string ln, size_t j, int level)
-	{
-		skipWhitespace(ln, j);
-		output.m_isHTML5 = false;
-
-		string doctype_str = "!DOCTYPE html";
-		switch (ln[j .. $]) {
-			case "5":
-			case "":
-			case "html":
-				output.m_isHTML5 = true;
-				break;
-			case "xml":
-				doctype_str = `?xml version="1.0" encoding="utf-8" ?`;
-				break;
-			case "transitional":
-				doctype_str = `!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" `
-					~ `"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd`;
-				break;
-			case "strict":
-				doctype_str = `!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" `
-					~ `"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"`;
-				break;
-			case "frameset":
-				doctype_str = `!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" `
-					~ `"http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd"`;
-				break;
-			case "1.1":
-				doctype_str = `!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" `
-					~ `"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"`;
-				break;
-			case "basic":
-				doctype_str = `!DOCTYPE html PUBLIC "-//W3C//DTD XHTML Basic 1.1//EN" `
-					~ `"http://www.w3.org/TR/xhtml-basic/xhtml-basic11.dtd"`;
-				break;
-			case "mobile":
-				doctype_str = `!DOCTYPE html PUBLIC "-//WAPFORUM//DTD XHTML Mobile 1.2//EN" `
-					~ `"http://www.openmobilealliance.org/tech/DTD/xhtml-mobile12.dtd"`;
-				break;
-			default:
-				doctype_str = "!DOCTYPE " ~ ln[j .. $];
-			break;
-		}
-		buildSpecialTag(output, doctype_str, level, false);
-	}
-
-	private bool buildHtmlNodeWriter(OutputContext output, in ref string tag, in string line, int level, bool has_child_nodes, ref bool prepend_whitespaces)
-	{
-		// parse the HTML tag, leaving any trailing text as line[i .. $]
-		size_t i;
-		HTMLAttribute[] attribs;
-		auto ws_type = parseHtmlTag(line, i, attribs);
-
-		// determine if we need a closing tag
-		bool is_singular_tag = false;
-		switch(tag){
-			case "area", "base", "basefont", "br", "col", "embed", "frame",	"hr", "img", "input",
-					"keygen", "link", "meta", "param", "source", "track", "wbr":
-				is_singular_tag = true;
-				break;
-			default:
-		}
-		assertp(!(is_singular_tag && has_child_nodes), "Singular HTML element '"~tag~"' may not have children.");
-
-		// opening tag
-		buildHtmlTag(output, tag, level, attribs, is_singular_tag, ws_type.outer && prepend_whitespaces);
-
-		// parse any text contents (either using "= code" or as plain text)
-		if( i < line.length && line[i] == '=' ){
-			output.writeExprHtmlEscaped(ctstrip(line[i+1 .. line.length]));
-		} else if( i+1 < line.length && line[i .. i+2] == "!=" ){
-			output.writeExpr(ctstrip(line[i+2 .. line.length]));
-		} else {
-			string rawtext = line[i .. line.length];
-			static if (TRANSLATE.length > 0) {
-				if (ws_type.isTranslated) rawtext = TRANSLATE[0](rawtext);
-			} else if (ws_type.isTranslated) output.warnTranslationContext = true;
-			if (hasInterpolations(rawtext)) {
-				buildInterpolatedString(output, rawtext);
-			} else {
-				output.writeRawString(sanitizeEscaping(rawtext));
-			}
-		}
-
-		// closing tag
-		if( has_child_nodes ) output.pushNode("</" ~ tag ~ ">", ws_type.inner, ws_type.outer);
-		else if( !is_singular_tag ) output.writeString("</" ~ tag ~ ">");
-		prepend_whitespaces = has_child_nodes ? ws_type.inner : ws_type.outer;
-
-		return ws_type.block_tag;
-	}
-
-	private void buildRawNodeWriter(OutputContext output, in ref string tag, in string tagline, int level,
-			int base_level, in Line[] lines)
-	{
-		// parse the HTML tag leaving any trailing text as tagline[i .. $]
-		size_t i;
-		HTMLAttribute[] attribs;
-		parseHtmlTag(tagline, i, attribs);
-
-		// write the tag
-		buildHtmlTag(output, tag, level, attribs, false);
-
-		string indent_string = "\t";
-		foreach (j; 0 .. output.m_baseIndent) indent_string ~= '\t';
-		foreach (j; 0 .. level ) if( output.m_nodeStack[j][0] != '-') indent_string ~= '\t';
-
-		// write the block contents wrapped in a CDATA for old browsers
-		if( tag == "script" ) output.writeString("\n"~indent_string~"//<![CDATA[\n");
-		else output.writeString("\n"~indent_string~"<!--\n");
-
-		// write out all lines
-		void writeLine(string str){
-			if( !hasInterpolations(str) ){
-				output.writeString(indent_string ~ str ~ "\n");
-			} else {
-				output.writeString(indent_string);
-				buildInterpolatedString(output, str);
-			}
-		}
-		if( i < tagline.length ) writeLine(tagline[i .. $]);
-		foreach( j; 0 .. lines.length ){
-			// remove indentation
-			string lnstr = lines[j].text[(level-base_level+1)*indentStyle.length .. $];
-			writeLine(lnstr);
-		}
-		if( tag == "script" ) output.writeString(indent_string~"//]]>\n");
-		else output.writeString(indent_string~"-->\n");
-		output.writeString(indent_string[0 .. $-1] ~ "</" ~ tag ~ ">");
-	}
-
-	private void buildFilterNodeWriter(OutputContext output, in ref string tagline, int tagline_number,
-		int indent, in Line[] lines)
-	{
-		// find all filters
-		size_t j = 0;
-		string[] filters;
-		do {
-			j++;
-			filters ~= skipIdent(tagline, j);
-			skipWhitespace(tagline, j);
-		} while( j < tagline.length && tagline[j] == ':' );
-
-		// assemble child lines to one string
-		string content = tagline[j .. $];
-		int lc = content.length ? tagline_number : tagline_number+1;
-		foreach( i; 0 .. lines.length ){
-			while( lc < lines[i].number ){ // DMDBUG: while(lc++ < lines[i].number) silently loops and only executes the last iteration
-				content ~= '\n';
-				lc++;
-			}
-			content ~= lines[i].text[(indent+1)*indentStyle.length .. $];
-		}
-
-		auto out_indent = output.m_baseIndent + indent;
-
-		// compile-time filter whats possible
-		filter_loop:
-		foreach_reverse( f; filters ){
-			bool found = true;
-			switch(f){
-				default: found = false; break;//break filter_loop;
-				case "css": content = filterCSS(content, out_indent); break;
-				case "javascript": content = filterJavaScript(content, out_indent); break;
-				case "markdown": content = filterMarkdown(content, out_indent); break;
-				case "htmlescape": content = filterHtmlEscape(content, out_indent); break;
-			}
-			if (found) filters.length = filters.length-1;
-			else break;
-		}
-
-		// the rest of the filtering will happen at run time
-		string filter_expr;
-		foreach_reverse( flt; filters ) filter_expr ~= "s_filters[\""~dstringEscape(flt)~"\"](";
-		filter_expr ~= "\"" ~ dstringEscape(content) ~ "\"";
-		foreach( i; 0 .. filters.length ) filter_expr ~= ", "~cttostring(out_indent)~")";
-
-		output.writeStringExpr(filter_expr);
-	}
-
-	private auto parseHtmlTag(in ref string line, out size_t i, out HTMLAttribute[] attribs)
-	{
-		struct WSType {
-			bool inner = true;
-			bool outer = true;
-			bool block_tag = false;
-			bool isTranslated;
-		}
-
-		i = 0;
-
-		string id;
-		string classes;
-
-		WSType ws_type;
-
-		// parse #id and .classes
-		while( i < line.length ){
-			if( line[i] == '#' ){
-				i++;
-				assertp(id.length == 0, "Id may only be set once.");
-				id = skipIdent(line, i, "-_");
-
-				// put #id and .classes into the attribs list
-				if( id.length ) attribs ~= HTMLAttribute("id", '"'~id~'"');
-			} else if (line[i] == '&') {
-				i++;
-				assertp(i >= line.length || line[i] == ' ' || line[i] == '.');
-				ws_type.isTranslated = true;
-			} else if( line[i] == '.' ){
-				i++;
-				// check if tag ends with dot
-				if (i == line.length || line[i] == ' ') {
-					i = line.length;
-					ws_type.block_tag = true;
-					break;
-				}
-				auto cls = skipIdent(line, i, "-_");
-				if( classes.length == 0 ) classes = cls;
-				else classes ~= " " ~ cls;
-			} else if (line[i] == '(') {
-				// parse other attributes
-				i++;
-				parseAttributes(line, i, attribs);
-				i++;
-			} else break;
-		}
-
-		// parse whitespaces removal tokens
-		for(; i < line.length; i++) {
-			if(line[i] == '<') ws_type.inner = false;
-			else if(line[i] == '>') ws_type.outer = false;
-			else break;
-		}
-
-		// check for multiple occurances of id
-		bool has_id = false;
-		foreach( a; attribs )
-			if( a.key == "id" ) {
-				assertp(!has_id, "Id may only be set once.");
-				has_id = true;
-			}
-
-		// add special attribute for extra classes that is handled by buildHtmlTag
-		if( classes.length ){
-			bool has_class = false;
-			foreach( a; attribs )
-				if( a.key == "class" ){
-					has_class = true;
-					break;
-				}
-
-			if( has_class ) attribs ~= HTMLAttribute("$class", classes);
-			else attribs ~= HTMLAttribute("class", "\"" ~ classes ~ "\"");
-		}
-
-		// skip until the optional tag text contents begin
-		skipWhitespace(line, i);
-
-		return ws_type;
-	}
-
-	private void buildHtmlTag(OutputContext output, in ref string tag, int level, ref HTMLAttribute[] attribs, bool is_singular_tag, bool outer_whitespaces = true)
-	{
-		if (outer_whitespaces) {
-			output.writeString("\n");
-			assertp(output.stackSize >= level);
-			output.writeIndent(level);
-		}
-		output.writeString("<" ~ tag);
-
-		string extra_class;
-		foreach (a; attribs)
-			if (a.key == "$class") {
-				extra_class = a.value;
-				break;
-			}
-
-
-		foreach( att; attribs ){
-			if( att.key[0] == '$' ) continue; // ignore special attributes
-
-			void handleExtraClasses()
-			{
-				// output extra classes given as .class
-				if (att.key == "class" && extra_class.length)
-					output.writeStringHtmlAttribEscaped(" " ~ extra_class);
-			}
-
-			if( isStringLiteral(att.value) ){
-				output.writeString(" "~att.key~"=\"");
-				if( !hasInterpolations(att.value) ) output.writeString(htmlAttribEscape(dstringUnescape(att.value[1 .. $-1])));
-				else buildInterpolatedString(output, att.value[1 .. $-1], true);
-
-				handleExtraClasses();
-				output.writeString("\"");
-			} else {
-				// Boolean value
-				output.writeCodeLine("static if(is(typeof("~att.value~") == bool)){ if("~att.value~"){");
-					if (!output.m_isHTML5)
-						output.writeString(` `~att.key~`="`~att.key~`"`);
-					else
-						output.writeString(` `~att.key);
-				// String array value
-				output.writeCodeLine("}} else static if(is(typeof("~att.value~") == string[])){\n");
-					output.writeString(` `~att.key~`="`);
-					output.writeExprHtmlAttribEscaped(`join(`~att.value~`, " ")`);
-					handleExtraClasses();
-					output.writeString(`"`);
-				// String value
-				output.writeCodeLine("} else static if(is(typeof("~att.value~") == string)) {");
-					output.writeCodeLine("if (("~att.value~") != \"\"){");
-					output.writeString(` `~att.key~`="`);
-					output.writeExprHtmlAttribEscaped(att.value);
-					handleExtraClasses();
-					output.writeString(`"`);
-					output.writeCodeLine("}");
-					if (att.key == "class" && extra_class.length) {
-						output.writeCodeLine("else {");
-						output.writeString(` `~att.key~`="`);
-						output.writeStringHtmlAttribEscaped(extra_class);
-						output.writeString(`"`);
-						output.writeCodeLine("}");
-					}
-				// Any other type of value
-				output.writeCodeLine("} else {");
-					output.writeString(` `~att.key~`="`);
-					output.writeExprHtmlAttribEscaped(att.value);
-					handleExtraClasses();
-					output.writeString(`"`);
-				output.writeCodeLine("}");
-			}
-		}
-
-		output.writeString(is_singular_tag ? "/>" : ">");
-	}
-
-	private void parseAttributes(in ref string str, ref size_t i, ref HTMLAttribute[] attribs)
-	{
-		skipWhitespace(str, i);
-		while (i < str.length && str[i] != ')') {
-			string name = skipIdent(str, i, "-:");
-			string value;
-			skipWhitespace(str, i);
-			if( i < str.length && str[i] == '=' ){
-				i++;
-				skipWhitespace(str, i);
-				assertp(i < str.length, "'=' must be followed by attribute string.");
-				value = skipExpression(str, i);
-				assert(i <= str.length);
-				if (isStringLiteral(value) && value[0] == '\'') {
-					auto tmp = dstringUnescape(value[1 .. $-1]);
-					value = '"' ~ dstringEscape(tmp) ~ '"';
-				}
-			} else value = "true";
-
-			assertp(i < str.length, "Unterminated attribute section.");
-			assertp(str[i] == ')' || str[i] == ',', "Unexpected text following attribute: '"~str[0..i]~"' ('"~str[i..$]~"')");
-			if (str[i] == ',') {
-				i++;
-				skipWhitespace(str, i);
-			}
-
-			if (name == "class" && value == `""`) continue;
-			attribs ~= HTMLAttribute(name, value);
-		}
-
-		assertp(i < str.length, "Missing closing clamp.");
-	}
-
-	private bool hasInterpolations(in char[] str)
-	{
-		size_t i = 0;
-		while( i < str.length ){
-			if( str[i] == '\\' ){
-				i += 2;
-				continue;
-			}
-			if( i+1 < str.length && (str[i] == '#' || str[i] == '!') ){
-				if( str[i+1] == str[i] ){
-					i += 2;
-					continue;
-				} else if( str[i+1] == '{' ){
-					return true;
-				}
-			}
-			i++;
-		}
-		return false;
-	}
-
-	private void buildInterpolatedString(OutputContext output, string str, bool attribute = false)
-	{
-		size_t start = 0, i = 0;
-		while( i < str.length ){
-			// check for escaped characters
-			if( str[i] == '\\' ){
-				if( i > start )
-				{
-					if (attribute) output.writeString(htmlAttribEscape(str[start .. i]));
-					else output.writeString(str[start .. i]);
-				}
-				if (attribute) output.writeString(htmlAttribEscape(
-							dstringUnescape(sanitizeEscaping(str[i .. i+2]))));
-				else output.writeRawString(sanitizeEscaping(str[i .. i+2]));
-				i += 2;
-				start = i;
-				continue;
-			}
-
-			if( (str[i] == '#' || str[i] == '!') && i+1 < str.length ){
-				bool escape = str[i] == '#';
-				if( i > start ){
-					if (attribute) output.writeString(htmlAttribEscape(str[start .. i]));
-					else output.writeString(str[start .. i]);
-					start = i;
-				}
-				assertp(str[i+1] != str[i], "Please use \\ to escape # or ! instead of ## or !!.");
-				if( str[i+1] == '{' ){
-					i += 2;
-					auto expr = dstringUnescape(skipUntilClosingBrace(str, i));
-					if( escape && !attribute ) output.writeExprHtmlEscaped(expr);
-					else if( escape ) output.writeExprHtmlAttribEscaped(expr);
-					else output.writeExpr(expr);
-					i++;
-					start = i;
-				} else i++;
-			} else i++;
-		}
-
-		if( i > start )
-		{
-			if (attribute) output.writeString(htmlAttribEscape(str[start .. i]));
-			else output.writeString(str[start .. i]);
-		}
-	}
-
-	private string skipIdent(in ref string s, ref size_t idx, string additional_chars = null)
-	{
-		size_t start = idx;
-		while( idx < s.length ){
-			if( isAlpha(s[idx]) ) idx++;
-			else if( start != idx && s[idx] >= '0' && s[idx] <= '9' ) idx++;
-			else {
-				bool found = false;
-				foreach( ch; additional_chars )
-					if( s[idx] == ch ){
-						found = true;
-						idx++;
-						break;
-					}
-				if( !found ){
-					assertp(start != idx, "Expected identifier but got '"~s[idx]~"'.");
-					return s[start .. idx];
-				}
-			}
-		}
-		assertp(start != idx, "Expected identifier but got nothing.");
-		return s[start .. idx];
-	}
-
-	private string skipWhitespace(in ref string s, ref size_t idx)
-	{
-		size_t start = idx;
-		while( idx < s.length ){
-			if( s[idx] == ' ' ) idx++;
-			else break;
-		}
-		return s[start .. idx];
-	}
-
-	private string skipUntilClosingBrace(in ref string s, ref size_t idx)
-	{
-		int level = 0;
-		auto start = idx;
-		while( idx < s.length ){
-			if( s[idx] == '{' ) level++;
-			else if( s[idx] == '}' ) level--;
-			if( level < 0 ) return s[start .. idx];
-			idx++;
-		}
-		assertp(false, "Missing closing brace");
-		assert(false);
-	}
-
-	private string skipAttribString(in ref string s, ref size_t idx, char delimiter)
-	{
-		size_t start = idx;
-		while( idx < s.length ){
-			if( s[idx] == '\\' ){
-				// pass escape character through - will be handled later by buildInterpolatedString
-				idx++;
-				assertp(idx < s.length, "'\\' must be followed by something (escaped character)!");
-			} else if( s[idx] == delimiter ) break;
-			idx++;
-		}
-		assertp(idx < s.length, "Unterminated attribute string: "~s[start-1 .. $]~"||");
-		return s[start .. idx];
-	}
-
-	private string skipExpression(in ref string s, ref size_t idx)
-	{
-		string clamp_stack;
-		size_t start = idx;
-		outer:
-		while (idx < s.length) {
-			switch (s[idx]) {
-				default: break;
-				case ',':
-					if (clamp_stack.length == 0)
-						break outer;
-					break;
-				case '"', '\'':
-					idx++;
-					skipAttribString(s, idx, s[idx-1]);
-					break;
-				case '(': clamp_stack ~= ')'; break;
-				case '[': clamp_stack ~= ']'; break;
-				case '{': clamp_stack ~= '}'; break;
-				case ')', ']', '}':
-					if (s[idx] == ')' && clamp_stack.length == 0)
-						break outer;
-					assertp(clamp_stack.length > 0 && clamp_stack[$-1] == s[idx],
-						"Unexpected '"~s[idx]~"'");
-					clamp_stack.length--;
-					break;
-			}
-			idx++;
-		}
-
-		assertp(clamp_stack.length == 0, "Expected '"~clamp_stack[$-1]~"' before end of attribute expression.");
-		return ctstrip(s[start .. idx]);
-	}
-
-	private string unindent(in ref string str, in ref string indent)
-	{
-		size_t lvl = indentLevel(str, indent);
-		return str[lvl*indent.length .. $];
-	}
-
-	private string unindent(in ref string str, in ref string indent, size_t level)
-	{
-		assert(level <= indentLevel(str, indent));
-		return str[level*indent.length .. $];
-	}
-
-	private int indentLevel(in ref string s, in ref string indent, bool strict = true)
-	{
-		if( indent.length == 0 ) return 0;
-		assertp(!strict || (s[0] != ' ' && s[0] != '\t') || s[0] == indent[0],
-			"Indentation style is inconsistent with previous lines.");
-		int l = 0;
-		while( l+indent.length <= s.length && s[l .. l+indent.length] == indent )
-			l += cast(int)indent.length;
-		assertp(!strict || s[l] != ' ', "Indent is not a multiple of '"~indent~"'");
-		return l / cast(int)indent.length;
-	}
-
-	private int indentLevel(in ref Line[] ln, string indent)
-	{
-		return ln.length == 0 ? 0 : indentLevel(ln[0].text, indent);
-	}
-
-	private void assertp(bool cond, lazy string text = null, string file = __FILE__, int cline = __LINE__)
-	{
-		Line ln;
-		if( m_lineIndex < lineCount ) ln = line(m_lineIndex);
-		assert(cond, "template "~ln.file~" line "~cttostring(ln.number)~": "~text~"("~file~":"~cttostring(cline)~")");
-	}
-
-	private TemplateBlock* getFile(string filename)
-	{
-		foreach( i; 0 .. m_files.length )
-			if( (*m_files)[i].name == filename )
-				return &(*m_files)[i];
-		assertp(false, "Bug: include input file "~filename~" not found in internal list!?");
-		assert(false);
-	}
-
-	private TemplateBlock* getBlock(string name)
-	{
-		foreach( i; 0 .. m_blocks.blocks.length )
-			if( m_blocks.blocks[i].name == name )
-				return &m_blocks.blocks[i];
-		return null;
-	}
-}
-
-private struct HTMLAttribute {
-	string key;
-	string value;
-}
-
-/// private
-private void buildSpecialTag(OutputContext output, string tag, int level, bool leading_newline = true)
-{
-	if (leading_newline) output.writeString("\n");
-	output.writeIndent(level);
-	output.writeString("<" ~ tag ~ ">");
-}
-
-private bool isStringLiteral(string str)
-{
-	size_t i = 0;
-
-	// skip leading white space
-	while (i < str.length && (str[i] == ' ' || str[i] == '\t')) i++;
-
-	// no string literal inside
-	if (i >= str.length) return false;
-
-	char delimiter = str[i++];
-	if (delimiter != '"' && delimiter != '\'') return false;
-
-	while (i < str.length && str[i] != delimiter) {
-		if (str[i] == '\\') i++;
-		i++;
-	}
-
-	// unterminated string literal
-	if (i >= str.length) return false;
-
-	i++; // skip delimiter
-
-	// skip trailing white space
-	while (i < str.length && (str[i] == ' ' || str[i] == '\t')) i++;
-
-	// check if the string has ended with the closing delimiter
-	return i == str.length;
-}
-
-unittest {
-	assert(isStringLiteral(`""`));
-	assert(isStringLiteral(`''`));
-	assert(isStringLiteral(`"hello"`));
-	assert(isStringLiteral(`'hello'`));
-	assert(isStringLiteral(` 	"hello"	 `));
-	assert(isStringLiteral(` 	'hello'	 `));
-	assert(isStringLiteral(`"hel\"lo"`));
-	assert(isStringLiteral(`"hel'lo"`));
-	assert(isStringLiteral(`'hel\'lo'`));
-	assert(isStringLiteral(`'hel"lo'`));
-	assert(isStringLiteral(`'#{"address_"~item}'`));
-	assert(!isStringLiteral(`"hello\`));
-	assert(!isStringLiteral(`"hello\"`));
-	assert(!isStringLiteral(`"hello\"`));
-	assert(!isStringLiteral(`"hello'`));
-	assert(!isStringLiteral(`'hello"`));
-	assert(!isStringLiteral(`"hello""world"`));
-	assert(!isStringLiteral(`"hello" "world"`));
-	assert(!isStringLiteral(`"hello" world`));
-	assert(!isStringLiteral(`'hello''world'`));
-	assert(!isStringLiteral(`'hello' 'world'`));
-	assert(!isStringLiteral(`'hello' world`));
-	assert(!isStringLiteral(`"name" value="#{name}"`));
-}
-
-/// Internal function used for converting an interpolation expression to string
-string _toString(T)(T v)
-{
-	// TODO: support sink based toString() and use an output range based interface
-	//       instead of allocating a string
-	static if (is(T == string)) return v;
-	else static if (__traits(compiles, v.toString())) return v.toString();
-	else static if (__traits(compiles, v.opCast!string())) return cast(string)v;
-	else return to!string(v);
-}
-
-private void _toStringS(alias SINK, T)(T v)
-{
-	// TODO: support sink based toString() and use an output range based interface
-	//       instead of allocating a string
-	static if (is(T == string)) SINK(v);
-	else static if (__traits(compiles, v.toString())) SINK(v.toString());
-	else static if (__traits(compiles, v.opCast!string())) SINK(cast(string)v);
-	else SINK(to!string(v));
-}
-
-unittest {
-	static string compile(string diet, ALIASES...)() {
-		import vibe.stream.memory;
-		auto dst = createMemoryOutputStream();
-		compileDietString!(diet, ALIASES)(dst);
-		return strip(cast(string)(dst.data));
-	}
-
-	assert(compile!(`!!! 5`) == `<!DOCTYPE html>`, `_`~compile!(`!!! 5`)~`_`);
-	assert(compile!(`!!! html`) == `<!DOCTYPE html>`);
-	assert(compile!(`doctype html`) == `<!DOCTYPE html>`);
-	assert(compile!(`p= 5`) == `<p>5</p>`);
-	assert(compile!(`script= 5`) == `<script>5</script>`);
-	assert(compile!(`style= 5`) == `<style>5</style>`);
-	assert(compile!(`include #{"p Hello"}`) == "<p>Hello</p>");
-	assert(compile!(`<p>Hello</p>`) == "<p>Hello</p>");
-	assert(compile!(`// I show up`) == "<!-- I show up\n -->");
-	assert(compile!(`//-I don't show up`) == "");
-	assert(compile!(`//- I don't show up`) == "");
-
-	// issue 372
-	assert(compile!(`div(class="")`) == `<div></div>`);
-	assert(compile!(`div.foo(class="")`) == `<div class="foo"></div>`);
-	assert(compile!(`div.foo(class="bar")`) == `<div class="bar foo"></div>`);
-	assert(compile!(`div(class="foo")`) == `<div class="foo"></div>`);
-	assert(compile!(`div#foo(class='')`) == `<div id="foo"></div>`);
-
-	// issue 1312
-	assert(compile!(`div.foo(class=true?"bar":"")`) == `<div class="bar foo"></div>`);
-	assert(compile!(`div.foo(class=true?12:13)`) == `<div class="12 foo"></div>`);
-	assert(compile!(`div.foo(class=true?["bar", "baz"]:[])`) == `<div class="bar baz foo"></div>`);
-	assert(compile!(`div.foo(class=false?"bar":"")`) == `<div class="foo"></div>`);
-	assert(compile!(`div(class="")`) == `<div></div>`);
-	assert(compile!(`div.foo(class="")`) == `<div class="foo"></div>`);
-
-	// issue 520
-	assert(compile!("- auto cond = true;\ndiv(someattr=cond ? \"foo\" : null)") == "<div someattr=\"foo\"></div>");
-	assert(compile!("- auto cond = false;\ndiv(someattr=cond ? \"foo\" : null)") == "<div></div>");
-	assert(compile!("- auto cond = false;\ndiv(someattr=cond ? true : false)") == "<div></div>");
-	assert(compile!("- auto cond = true;\ndiv(someattr=cond ? true : false)") == "<div someattr=\"someattr\"></div>");
-	assert(compile!("doctype html\n- auto cond = true;\ndiv(someattr=cond ? true : false)")
-		== "<!DOCTYPE html>\n<div someattr></div>");
-	assert(compile!("doctype html\n- auto cond = false;\ndiv(someattr=cond ? true : false)")
-		== "<!DOCTYPE html>\n<div></div>");
-
-	// issue 510
-	assert(compile!("pre.test\n\tfoo") == "<pre class=\"test\">\n\t<foo></foo></pre>");
-	assert(compile!("pre.test.\n\tfoo") == "<pre class=\"test\">\nfoo</pre>");
-	assert(compile!("pre.test. foo") == "<pre class=\"test\"></pre>");
-	assert(compile!("pre().\n\tfoo") == "<pre>\nfoo</pre>");
-	assert(compile!("pre#foo.test(data-img=\"sth\",class=\"meh\"). something\n\tmeh") ==
-		   "<pre id=\"foo\" data-img=\"sth\" class=\"meh test\">\nmeh</pre>");
-
-	assert(compile!("input(autofocus)").length);
-
-	assert(compile!("- auto s = \"\";\ninput(type=\"text\",value=\"&\\\"#{s}\")")
-			== `<input type="text" value="&amp;&quot;"/>`);
-	assert(compile!("- auto param = \"t=1&u=1\";\na(href=\"/?#{param}&v=1\") foo")
-			== `<a href="/?t=1&amp;u=1&amp;v=1">foo</a>`);
-
-	// issue #1021
-	assert(compile!("html( lang=\"en\" )")
-		== "<html lang=\"en\"></html>");
-
-	// issue #1033
-	assert(compile!("input(placeholder=')')")
-		== "<input placeholder=\")\"/>");
-	assert(compile!("input(placeholder='(')")
-		== "<input placeholder=\"(\"/>");
-}
-
-unittest { // blocks and extensions
-	static string compilePair(string extension, string base, ALIASES...)() {
-		import vibe.stream.memory;
-		auto dst = createMemoryOutputStream();
-		compileDietStrings!(Group!(extension, "extension.dt", base, "base.dt"), ALIASES)(dst);
-		return strip(cast(string)(dst.data));
-	}
-
-	assert(compilePair!("extends base\nblock test\n\tp Hello", "body\n\tblock test")
-		 == "<body>\n\t<p>Hello</p>\n</body>");
-	assert(compilePair!("extends base\nblock test\n\tp Hello", "body\n\tblock test\n\t\tp Default")
-		 == "<body>\n\t<p>Hello</p>\n</body>", compilePair!("extends base\nblock test\n\tp Hello", "body\n\tblock test\n\t\tp Default"));
-	assert(compilePair!("extends base", "body\n\tblock test\n\t\tp Default")
-		 == "<body>\n\t<p>Default</p>\n</body>");
-	assert(compilePair!("extends base\nprepend test\n\tp Hello", "body\n\tblock test\n\t\tp Default")
-		 == "<body>\n\t<p>Hello</p>\n\t<p>Default</p>\n</body>");
-}
-
-
-/**************************************************************************************************/
-/* Compile time filters                                                                           */
-/**************************************************************************************************/
-
-private string filterCSS(string text, size_t indent)
-{
-	auto lines = splitLines(text);
-
-	string indent_string = "\n";
-	while( indent-- > 0 ) indent_string ~= '\t';
-
-	string ret = indent_string~"<style type=\"text/css\"><!--";
-	indent_string = indent_string ~ '\t';
-	foreach( ln; lines ) ret ~= indent_string ~ ln;
-	indent_string = indent_string[0 .. $-1];
-	ret ~= indent_string ~ "--></style>";
-
-	return ret;
-}
-
-
-private string filterJavaScript(string text, size_t indent)
-{
-	auto lines = splitLines(text);
-
-	string indent_string = "\n";
-	while (indent-- > 0) indent_string ~= '\t';
-
-	string ret = indent_string~"<script type=\"application/javascript\">";
-	ret ~= indent_string~'\t' ~ "//<![CDATA[";
-	foreach (ln; lines) ret ~= indent_string ~ '\t' ~ ln;
-	ret ~= indent_string ~ '\t' ~ "//]]>" ~ indent_string ~ "</script>";
-
-	return ret;
-}
-
-private string filterMarkdown(string text, size_t)
-{
-	// TODO: indent
-	return vibe.textfilter.markdown.filterMarkdown(text);
-}
-
-private string filterHtmlEscape(string text, size_t)
-{
-	// TODO: indent
-	return htmlEscape(text);
-}
diff --git a/diet/vibe/templ/parsertools.d b/diet/vibe/templ/parsertools.d
deleted file mode 100644
index ed61ac95dc..0000000000
--- a/diet/vibe/templ/parsertools.d
+++ /dev/null
@@ -1,185 +0,0 @@
-/**
-	Contains useful functions for template the template parser implementations.
-
-	Copyright: © 2012 RejectedSoftware e.K.
-	License: Subject to the terms of the MIT license, as written in the included LICENSE.txt file.
-	Authors: Sönke Ludwig
-*/
-module vibe.templ.parsertools;
-
-import vibe.utils.string;
-
-import std.traits;
-
-
-struct Line {
-	string file;
-	int number;
-	string text;
-}
-
-
-void assert_ln(in ref Line ln, bool cond, string text = null, string file = __FILE__, int line = __LINE__)
-{
-	assert(cond, "Error in template "~ln.file~" line "~_toString(ln.number)
-		~": "~text~"("~file~":"~_toString(line)~")");
-}
-
-
-string unindent(in ref string str, in ref string indent)
-{
-	size_t lvl = indentLevel(str, indent);
-	return str[lvl*indent.length .. $];
-}
-
-int indentLevel(in ref string s, in ref string indent)
-{
-	if( indent.length == 0 ) return 0;
-	int l = 0;
-	while( l+indent.length <= s.length && s[l .. l+indent.length] == indent )
-		l += cast(int)indent.length;
-	return l / cast(int)indent.length;
-}
-
-
-string lineMarker(in ref Line ln)
-{
-	if( ln.number < 0 ) return null;
-	return "#line "~_toString(ln.number)~" \""~ln.file~"\"\n";
-}
-
-
-string dstringEscape(char ch)
-{
-	switch(ch){
-		default: return ""~ch;
-		case '\\': return "\\\\";
-		case '\r': return "\\r";
-		case '\n': return "\\n";
-		case '\t': return "\\t";
-		case '\"': return "\\\"";
-	}
-}
-
-string sanitizeEscaping(string str)
-{
-	str = dstringUnescape(str);
-	return dstringEscape(str);
-}
-
-string dstringEscape(in ref string str)
-{
-	string ret;
-	foreach( ch; str ) ret ~= dstringEscape(ch);
-	return ret;
-}
-
-string dstringUnescape(in string str)
-{
-	string ret;
-	size_t i, start = 0;
-	for( i = 0; i < str.length; i++ )
-		if( str[i] == '\\' ){
-			if( i > start ){
-				if( start > 0 ) ret ~= str[start .. i];
-				else ret = str[0 .. i];
-			}
-			assert(i+1 < str.length, "The string ends with the escape char: " ~ str);
-			switch(str[i+1]){
-				default: ret ~= str[i+1]; break;
-				case 'r': ret ~= '\r'; break;
-				case 'n': ret ~= '\n'; break;
-				case 't': ret ~= '\t'; break;
-			}
-			i++;
-			start = i+1;
-		}
-
-	if( i > start ){
-		if( start == 0 ) return str;
-		else ret ~= str[start .. i];
-	}
-	return ret;
-}
-
-
-string ctstrip(string s)
-{
-	size_t strt = 0, end = s.length;
-	while( strt < s.length && (s[strt] == ' ' || s[strt] == '\t') ) strt++;
-	while( end > 0 && (s[end-1] == ' ' || s[end-1] == '\t') ) end--;
-	return strt < end ? s[strt .. end] : null;
-}
-
-string detectIndentStyle(in ref Line[] lines)
-{
-	// search for the first indented line
-	foreach( i; 0 .. lines.length ){
-		// empty lines should have been removed
-		assert(lines[0].text.length > 0);
-
-		// tabs are used
-		if( lines[i].text[0] == '\t' ) return "\t";
-
-		// spaces are used -> count the number
-		if( lines[i].text[0] == ' ' ){
-			size_t cnt = 0;
-			while( lines[i].text[cnt] == ' ' ) cnt++;
-			return lines[i].text[0 .. cnt];
-		}
-	}
-
-	// default to tabs if there are no indented lines
-	return "\t";
-}
-
-Line[] removeEmptyLines(string text, string file)
-{
-	text = stripUTF8Bom(text);
-
-	Line[] ret;
-	int num = 1;
-	size_t idx = 0;
-
-	while(idx < text.length){
-		// start end end markers for the current line
-		size_t start_idx = idx;
-		size_t end_idx = text.length;
-
-		// search for EOL
-		while( idx < text.length ){
-			if( text[idx] == '\r' || text[idx] == '\n' ){
-				end_idx = idx;
-				if( idx+1 < text.length && text[idx .. idx+2] == "\r\n" ) idx++;
-				idx++;
-				break;
-			}
-			idx++;
-		}
-
-		// add the line if not empty
-		auto ln = text[start_idx .. end_idx];
-		if( ctstrip(ln).length > 0 )
-			ret ~= Line(file, num, ln);
-
-		num++;
-	}
-	return ret;
-}
-
-/// private
-private string _toString(T)(T x)
-{
-	static if( is(T == string) ) return x;
-	else static if( is(T : long) || is(T : ulong) ){
-		Unqual!T tmp = x;
-		string s;
-		do {
-			s = cast(char)('0' + (tmp%10)) ~ s;
-			tmp /= 10;
-		} while(tmp > 0);
-		return s;
-	} else {
-		static assert(false, "Invalid type for cttostring: "~T.stringof);
-	}
-}
diff --git a/diet/vibe/templ/utils.d b/diet/vibe/templ/utils.d
deleted file mode 100644
index 07f070a6c5..0000000000
--- a/diet/vibe/templ/utils.d
+++ /dev/null
@@ -1,169 +0,0 @@
-/**
-	Utility functions for dealing with templates.
-
-	Copyright: © 2012 RejectedSoftware e.K.
-	License: Subject to the terms of the MIT license, as written in the included LICENSE.txt file.
-	Authors: Sönke Ludwig
-*/
-module vibe.templ.utils;
-
-import std.traits;
-import std.typecons : Rebindable;
-
-
-/**
-	Allows to pass additional variables to a function that renders a templated page.
-
-	This function is useful if you need to support additional layers of functionality that should
-	be available to your views, such as authentication. This function allows to define variables
-	that should be usable from templates using so called "injectors". Each injector is a template
-	function that can add its own parameters.
-
-	If you should need explicit access to one of the parameters of an upstream injector, you can use
-	the InjectedParams!() template.
-
-	NOTE: this function requires at least DMD 2.064, as it suffers from DMD BUG 2962/10086/10857.
-
-	Examples:
-
-		The following example will render the template "home.dt" and make the variables 'userinfo',
-		'something_else' and 'message' available. Before the 'page' function is called,
-		'authInjector' and 'somethingInjector' can process the request and decide what to do.
-
-		---
-		void authInjector(alias Next, Aliases...)(HTTPServerRequest req, HTTPServerResponse res)
-		{
-			string userinfo;
-			// TODO: fill userinfo with content, throw an Unauthorized HTTP error etc.
-			Next!(Aliases, userinfo)(req, res);
-		}
-
-		void somethingInjector(alias Next, Aliases...)(HTTPServerRequest req, HTTPServerResponse res)
-		{
-			string something_else;
-			Next!(Aliases, something_else)(req, res);
-		}
-
-		void page(Aliases...)(HTTPServerRequest req, HTTPServerResponse res)
-		{
-			string message = "Welcome to the example page!"
-			res.render!("home.dt", Aliases, message);
-		}
-
-		static this()
-		{
-			auto router = new URLRouter;
-			router.get("/", inject!(page, authInjector, somethingInjector));
-		}
-		---
-*/
-@property auto inject(alias Page, Injectors...)()
-{
-	return &injectReverse!(Injectors, reqInjector!(ParameterTypeTuple!Page), Page);
-}
-
-/**
-	Makes the variable aliases passed to one of the injectors of the inject!() template accessible
-	to the local function.
-
-	Examples:
-		---
-		void authInjector(alias Next, Aliases...)(HTTPServerRequest req, HTTPServerResponse res)
-		{
-			string userinfo;
-			// TODO: fill userinfo with content, throw an Unauthorized HTTP error etc.
-			Next!(Aliases, userinfo)(req, res);
-		}
-
-		void somethingInjector(alias Next, Aliases...)(HTTPServerRequest req, HTTPServerResponse res)
-		{
-			// access the userinfo variable:
-			if( InjectedParams!Aliases.userinfo.length == 0 ) return;
-
-			// it's also possible to declare a pseudo-
-			// variable like this to access the parameters:
-			InjectedParams!Aliases params;
-			if( params.userinfo == "peter" )
-				throw Exception("Not allowed!")
-
-			Next!(Aliases)(req, res);
-		}
-		---
-*/
-struct InjectedParams(Aliases)
-{
-	mixin(localAliases(Aliases));
-}
-
-/// When mixed in, makes all ALIASES available in the local scope
-template localAliases(int i, ALIASES...)
-{
-	static if( i < ALIASES.length ){
-		enum string localAliases = "alias ALIASES["~cttostring(i)~"] "~__traits(identifier, ALIASES[i])~";\n"
-			~localAliases!(i+1, ALIASES);
-	} else {
-		enum string localAliases = "";
-	}
-}
-
-/// When mixed in, makes all ALIASES available in the local scope. Note that there must be a
-/// Variant[] args__ available that matches TYPES_AND_NAMES
-template localAliasesCompat(int i, TYPES_AND_NAMES...)
-{
-	import core.vararg;
-	static if( i+1 < TYPES_AND_NAMES.length ){
-		enum TYPE = "TYPES_AND_NAMES["~cttostring(i)~"]";
-		enum NAME = TYPES_AND_NAMES[i+1];
-		enum INDEX = cttostring(i/2);
-		enum string localAliasesCompat =
-			"Rebindable2!("~TYPE~") "~NAME~";\n"~
-			"if( _arguments["~INDEX~"] == typeid(Variant) )\n"~
-			"\t"~NAME~" = *va_arg!Variant(_argptr).peek!("~TYPE~")();\n"~
-			"else {\n"~
-			"\tassert(_arguments["~INDEX~"] == typeid("~TYPE~"), \"Actual type for parameter "~NAME~" does not match template type.\");\n"~
-			"\t"~NAME~" = va_arg!("~TYPE~")(_argptr);\n"~
-			"}\n"~
-			localAliasesCompat!(i+2, TYPES_AND_NAMES);
-	} else {
-		enum string localAliasesCompat = "";
-	}
-}
-
-template Rebindable2(T)
-{
-	static if (is(T == class) || is(T == interface) || isArray!T) alias Rebindable2 = Rebindable!T;
-	else alias Rebindable2 = Unqual!T;
-}
-
-/// private
-package string cttostring(T)(T x)
-{
-	static if( is(T == string) ) return x;
-	else static if( is(T : long) || is(T : ulong) ){
-		Unqual!T tmp = x;
-		string s;
-		do {
-			s = cast(char)('0' + (tmp%10)) ~ s;
-			tmp /= 10;
-		} while(tmp > 0);
-		return s;
-	} else {
-		static assert(false, "Invalid type for cttostring: "~T.stringof);
-	}
-}
-
-/// private
-private template injectReverse(Injectors...)
-{
-	alias First = Injectors[0];
-	alias Rest = Injectors[1 .. $];
-	alias injectReverse = First!(Rest);
-}
-
-/// private
-template reqInjector(HTTPServerRequest, HTTPServerResponse) {
-	void reqInjector(alias Next, Vars...)(HTTPServerRequest req, HTTPServerResponse res)
-	{
-		Next!(Vars, req)(req, res);
-	}
-}
diff --git a/dub.sdl b/dub.sdl
index 15c566dd62..464380d4d7 100644
--- a/dub.sdl
+++ b/dub.sdl
@@ -11,7 +11,6 @@ dependency ":redis" version="*"
 dependency ":data" version="*"
 dependency ":core" version="*"
 dependency ":mongodb" version="*"
-dependency ":diet" version="*"
 dependency ":web" version="*"
 dependency ":utils" version="*"
 dependency ":http" version="*"
@@ -63,7 +62,6 @@ subPackage "crypto"
 subPackage "textfilter"
 subPackage "inet"
 subPackage "mail"
-subPackage "diet"
 subPackage "http"
 subPackage "mongodb"
 subPackage "redis"
diff --git a/examples/app_skeleton/source/index.d b/examples/app_skeleton/source/index.d
index 1c7b05774a..ede4285b7e 100644
--- a/examples/app_skeleton/source/index.d
+++ b/examples/app_skeleton/source/index.d
@@ -1,7 +1,6 @@
 module index;
 
 import vibe.http.server;
-import vibe.templ.diet;
 
 
 void showHome(HTTPServerRequest req, HTTPServerResponse res)
diff --git a/http/dub.sdl b/http/dub.sdl
index 7834e0a36d..19fade64ab 100644
--- a/http/dub.sdl
+++ b/http/dub.sdl
@@ -4,7 +4,6 @@ dependency "vibe-d:crypto" version="*"
 dependency "vibe-d:inet" version="*"
 dependency "vibe-d:tls" version="*"
 dependency "vibe-d:textfilter" version="*"
-dependency "vibe-d:diet" version="*"
 dependency "diet-ng" version="~>1.2"
 targetType "library"
 sourcePaths "."
diff --git a/http/vibe/http/server.d b/http/vibe/http/server.d
index 0ed6377e2e..1c630b46ed 100644
--- a/http/vibe/http/server.d
+++ b/http/vibe/http/server.d
@@ -259,7 +259,7 @@ void setVibeDistHost(string host, ushort port)
 	You can call this function as a pseudo-member of `HTTPServerResponse` using
 	D's uniform function call syntax.
 
-	See_also: `vibe.templ.diet.compileDietFile`
+	See_also: `diet.html.compileHTMLDietFile`
 
 	Examples:
 		---
@@ -271,15 +271,12 @@ void setVibeDistHost(string host, ushort port)
 @property void render(string template_file, ALIASES...)(HTTPServerResponse res)
 {
 	res.contentType = "text/html; charset=UTF-8";
-	version (VibeUseOldDiet) {
-		import vibe.templ.diet;
-		compileDietFile!(template_file.asInterface!InputStream, ALIASES)(res.bodyWriter);
-	} else {
-		import vibe.stream.wrapper : streamOutputRange;
-		import diet.html : compileHTMLDietFile;
-		auto output = streamOutputRange!1024(res.bodyWriter);
-		compileHTMLDietFile!(template_file, ALIASES, DefaultFilters)(output);
-	}
+	version (VibeUseOldDiet)
+		pragma(msg, "VibeUseOldDiet is not supported anymore. Please undefine in the package recipe.");
+	import vibe.stream.wrapper : streamOutputRange;
+	import diet.html : compileHTMLDietFile;
+	auto output = streamOutputRange!1024(res.bodyWriter);
+	compileHTMLDietFile!(template_file, ALIASES, DefaultFilters)(output);
 }
 
 version (Have_diet_ng)
diff --git a/source/vibe/vibe.d b/source/vibe/vibe.d
index 576d02b34d..7e3b90083f 100644
--- a/source/vibe/vibe.d
+++ b/source/vibe/vibe.d
@@ -46,8 +46,6 @@ public import vibe.stream.operations;
 public import vibe.stream.tls;
 public import vibe.stream.wrapper;
 public import vibe.stream.zlib;
-public import vibe.templ.diet;
-public import vibe.templ.utils;
 public import vibe.textfilter.html;
 public import vibe.textfilter.markdown;
 public import vibe.textfilter.urlencode;
diff --git a/web/dub.sdl b/web/dub.sdl
index 9b76793315..d994fed0ae 100644
--- a/web/dub.sdl
+++ b/web/dub.sdl
@@ -1,7 +1,6 @@
 name "web"
 description "High level web and REST service framework"
 dependency "vibe-d:http" version=">=0.0.0"
-dependency "vibe-d:diet" version=">=0.0.0"
 targetType "library"
 sourcePaths "."
 importPaths "."
diff --git a/web/vibe/web/i18n.d b/web/vibe/web/i18n.d
index d2a88b4e8d..8393a6a8ed 100644
--- a/web/vibe/web/i18n.d
+++ b/web/vibe/web/i18n.d
@@ -8,7 +8,6 @@
 module vibe.web.i18n;
 
 import vibe.http.server : HTTPServerRequest;
-import vibe.templ.parsertools;
 
 import std.algorithm : canFind, min, startsWith;
 
@@ -740,3 +739,31 @@ unittest {
 	auto res = parse_plural_expression("Plural-Forms: nplurals=2; plural=n != 1;\n");
 	assert(res == "n != 1", "Failed to parse the plural expression for a language.");
 }
+
+private string dstringUnescape(in string str)
+{
+	string ret;
+	size_t i, start = 0;
+	for( i = 0; i < str.length; i++ )
+		if( str[i] == '\\' ){
+			if( i > start ){
+				if( start > 0 ) ret ~= str[start .. i];
+				else ret = str[0 .. i];
+			}
+			assert(i+1 < str.length, "The string ends with the escape char: " ~ str);
+			switch(str[i+1]){
+				default: ret ~= str[i+1]; break;
+				case 'r': ret ~= '\r'; break;
+				case 'n': ret ~= '\n'; break;
+				case 't': ret ~= '\t'; break;
+			}
+			i++;
+			start = i+1;
+		}
+
+	if( i > start ){
+		if( start == 0 ) return str;
+		else ret ~= str[start .. i];
+	}
+	return ret;
+}

From 1595e041c7ce3e3fbf7a8c296a664334258711cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6nke=20Ludwig?= <sludwig@rejectedsoftware.com>
Date: Tue, 11 Jul 2017 22:05:40 +0200
Subject: [PATCH 2/3] Update CI scripts.

---
 appveyor.yml | 2 +-
 travis-ci.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index f45ea182df..320681dc02 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -136,10 +136,10 @@ test_script:
  - dub test :core --arch=%Darch% --compiler=%DC% --config=%CONFIG%
  - dub test :stream --arch=%Darch% --compiler=%DC% --override-config=vibe-d:core/%CONFIG%
  - dub test :crypto --arch=%Darch% --compiler=%DC% --override-config=vibe-d:core/%CONFIG%
+ - dub test :tls --arch=%Darch% --compiler=%DC% --override-config=vibe-d:core/%CONFIG%
  - dub test :textfilter --arch=%Darch% --compiler=%DC% --override-config=vibe-d:core/%CONFIG%
  - dub test :inet --arch=%Darch% --compiler=%DC% --override-config=vibe-d:core/%CONFIG%
  - dub test :mail --arch=%Darch% --compiler=%DC% --override-config=vibe-d:core/%CONFIG%
- - dub test :diet --arch=%Darch% --compiler=%DC% --override-config=vibe-d:core/%CONFIG%
  - dub test :http --arch=%Darch% --compiler=%DC% --override-config=vibe-d:core/%CONFIG%
  - dub test :mongodb --arch=%Darch% --compiler=%DC% --override-config=vibe-d:core/%CONFIG%
  - dub test :redis --arch=%Darch% --compiler=%DC% --override-config=vibe-d:core/%CONFIG%
diff --git a/travis-ci.sh b/travis-ci.sh
index 1ef684907f..643b4987a8 100755
--- a/travis-ci.sh
+++ b/travis-ci.sh
@@ -25,13 +25,13 @@ dub test :data --compiler=$DC $DUB_ARGS
 dub test :core --compiler=$DC --config=${VIBED_DRIVER=libevent} $DUB_ARGS
 dub test :mongodb --compiler=$DC --override-config=vibe-d:core/${VIBED_DRIVER=libevent} $DUB_ARGS
 dub test :redis --compiler=$DC --override-config=vibe-d:core/${VIBED_DRIVER=libevent} $DUB_ARGS
-dub test :diet --compiler=$DC --override-config=vibe-d:core/${VIBED_DRIVER=libevent} $DUB_ARGS
 dub test :web --compiler=$DC --override-config=vibe-d:core/${VIBED_DRIVER=libevent} $DUB_ARGS
 dub test :utils --compiler=$DC $DUB_ARGS
 dub test :http --compiler=$DC --override-config=vibe-d:core/${VIBED_DRIVER=libevent} $DUB_ARGS
 dub test :mail --compiler=$DC --override-config=vibe-d:core/${VIBED_DRIVER=libevent} $DUB_ARGS
 dub test :stream --compiler=$DC --override-config=vibe-d:core/${VIBED_DRIVER=libevent} $DUB_ARGS
 dub test :crypto --compiler=$DC --override-config=vibe-d:core/${VIBED_DRIVER=libevent} $DUB_ARGS
+dub test :tls --compiler=$DC --override-config=vibe-d:core/${VIBED_DRIVER=libevent} $DUB_ARGS
 dub test :textfilter --compiler=$DC --override-config=vibe-d:core/${VIBED_DRIVER=libevent} $DUB_ARGS
 dub test :inet --compiler=$DC --override-config=vibe-d:core/${VIBED_DRIVER=libevent} $DUB_ARGS
 dub clean --all-packages

From 5fbe5ef2f79603e9ccb7d082b16d7f92647296e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6nke=20Ludwig?= <sludwig@rejectedsoftware.com>
Date: Tue, 11 Jul 2017 23:47:42 +0200
Subject: [PATCH 3/3] Remove superfluous dependency to :diet.

---
 examples/bench-http-server/dub.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/examples/bench-http-server/dub.json b/examples/bench-http-server/dub.json
index f2f09f5f76..8937d4820b 100644
--- a/examples/bench-http-server/dub.json
+++ b/examples/bench-http-server/dub.json
@@ -1,7 +1,6 @@
 {
 	"name": "bench-http-server",
 	"dependencies": {
-		"vibe-d:diet": {"path": "../../"},
 		"vibe-d:http": {"path": "../../"}
 	},
 	"versions": ["VibeDefaultMain", "VibeManualMemoryManagement"]