Merge branch 'dev' into feature/implicit-iterator

Conflicts:
	Mustache.php

examples/comments/comments.mustache

@@ -1 +1 @@
-<h1>{{title}}{{! just something interesting... or not... }}</h1>
+<h1>{{title}}{{! just something interesting... #or ^not... }}</h1>

examples/inverted_double_section/InvertedDoubleSection.php

@@ -0,0 +1,6 @@
+<?php
+
+class InvertedDoubleSection extends Mustache {
+	public $t = false;
+	public $two = 'second';
+}

examples/inverted_double_section/inverted_double_section.mustache

@@ -0,0 +1,7 @@
+{{^t}}
+  * first
+{{/t}}
+* {{two}}
+{{^t}}
+  * third
+{{/t}}

examples/inverted_double_section/inverted_double_section.txt

@@ -0,0 +1,3 @@
+* first
+* second
+* third

examples/partials/Partials.php

@@ -0,0 +1,13 @@
+<?php
+
+class Partials extends Mustache {
+	public $name = 'ilmich';
+	public $data = array(
+		array('name' => 'federica', 'age' => 27, 'gender' => 'female'),
+		array('name' => 'marco', 'age' => 32, 'gender' => 'male'),
+	);
+
+	protected $_partials = array(
+		'children' => "{{#data}}{{name}} - {{age}} - {{gender}}\n{{/data}}",
+	);
+}

examples/partials/partials.mustache

@@ -0,0 +1,2 @@
+Children of {{name}}:
+{{>children}}

examples/partials/partials.txt

@@ -0,0 +1,3 @@
+Children of ilmich:
+federica - 27 - female
+marco - 32 - male

examples/pragma_unescaped/PragmaUnescaped.php

@@ -0,0 +1,5 @@
+<?php
+
+class PragmaUnescaped extends Mustache {
+	protected $vs = 'Bear > Shark';
+}

examples/pragma_unescaped/pragma_unescaped.mustache

@@ -0,0 +1,3 @@
+{{%UNESCAPED}}
+{{vs}}
+{{{vs}}}

examples/pragma_unescaped/pragma_unescaped.txt

@@ -0,0 +1,2 @@
+Bear > Shark
+Bear > Shark

examples/whitespace/Whitespace.php

@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * Whitespace test for tag names.
+ *
+ * Per http://github.com/janl/mustache.js/issues/issue/34/#comment_244396
+ * tags should strip leading and trailing whitespace in key names.
+ *
+ * `{{> tag }}` and `{{> tag}}` and `{{>tag}}` should all be equivalent.
+ *
+ * @extends Mustache
+ */
+class Whitespace extends Mustache {
+	public $foo = 'alpha';
+
+	public $bar = 'beta';
+
+	public function baz() {
+		return 'gamma';
+	}
+
+	public function qux() {
+		return array(
+			array('key with space' => 'A'),
+			array('key with space' => 'B'),
+			array('key with space' => 'C'),
+			array('key with space' => 'D'),
+			array('key with space' => 'E'),
+			array('key with space' => 'F'),
+			array('key with space' => 'G'),
+		);
+	}
+
+	protected $_partials = array(
+		'alphabet' => " * {{.}}\n",
+	);
+}

examples/whitespace/whitespace.mustache

@@ -0,0 +1,10 @@
+{{^ inverted section test }}
+These are some things:
+{{/inverted section test	}}
+* {{  foo  }}
+* {{ bar}}
+* {{    baz	}}
+{{#  qux		 }}
+* {{ key with space }}
+{{/ qux		}}
+{{#qux}}.{{/qux}}

examples/whitespace/whitespace.txt

@@ -0,0 +1,12 @@
+These are some things:
+* alpha
+* beta
+* gamma
+* A
+* B
+* C
+* D
+* E
+* F
+* G
+.......