From ab227509e64961943ca374c09c08b63f59da014a Mon Sep 17 00:00:00 2001
From: Dan Miller <dmiller@etsy.com>
Date: Mon, 14 Apr 2014 18:18:30 +0000
Subject: Add template inheritance spec

---
 specs/inheritance.json |   1 +
 specs/inheritance.yml  | 192 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 193 insertions(+)
 create mode 100644 specs/inheritance.json
 create mode 100644 specs/inheritance.yml

diff --git a/specs/inheritance.json b/specs/inheritance.json
new file mode 100644
index 0000000..07b6311
--- /dev/null
+++ b/specs/inheritance.json
@@ -0,0 +1 @@
+{"overview":"Parent tags are used to expand an external template into the current template,\nwith optional parameters delimited by block tags.\n\nThese tags' content MUST be a non-whitespace character sequence NOT containing\nthe current closing delimiter; each Parent tag MUST be followed by an End\nSection tag with the same content within the matching parent tag.\n\nBlock tags are used inside of parent tags to assign data onto the context stack \nprior to rendering the parent template. Outside of parent tags, block tags are\nused to indicate where value set in the parent tag should be placed. If no value\nis set then the content in between the block tags, if any, is rendered.\n","tests":[{"name":"Default","desc":"Default content should be rendered if the block isn't overridden","data":{},"template":"{{$title}}Default title{{/title}}\n","expected":"Default title\n"},{"name":"Variable","desc":"Default content renders variables","data":{"bar":"baz"},"template":"{{$foo}}default {{bar}} content{{/foo}}\n","expected":"default baz content\n"},{"name":"Triple Mustache","desc":"Default content renders triple mustache variables","data":{"bar":"<baz>"},"template":"{{$foo}}default {{{bar}}} content{{/foo}}\n","expected":"default <baz> content\n"},{"name":"Sections","desc":"Default content renders sections","data":{"bar":{"baz":"qux"}},"template":"{{$foo}}default {{#bar}}{{baz}}{{/bar}} content{{/foo}}\n","expected":"default qux content\n"},{"name":"Negative Sections","desc":"Default content renders negative sections","data":{"baz":"three"},"template":"{{$foo}}default {{^bar}}{{baz}}{{/bar}} content{{/foo}}\n","expected":"default three content\n"},{"name":"Mustache Injection","desc":"Mustache injection in default content","data":{"bar":{"baz":"{{qux}}"}},"template":"{{$foo}}default {{#bar}}{{baz}}{{/bar}} content{{/foo}}\n","expected":"default {{qux}} content\n"},{"name":"Inherit","desc":"Default content rendered inside included templates","data":{},"template":"{{<include}}{{/include}}\n","partials":{"include":"{{$foo}}default content{{/foo}}"},"expected":"default content"},{"name":"Overridden content","desc":"Overridden content","data":{},"template":"{{<super}}{{$title}}sub template title{{/title}}{{/super}}","partials":{"super":"...{{$title}}Default title{{/title}}..."},"expected":"...sub template title..."},{"name":"Data does not override block","desc":"Provided data does not override data passed into parent","data":{"var":"var in data"},"template":"{{<include}}{{$var}}var in template{{/var}}{{/include}}","partials":{"include":"{{$var}}var in include{{/var}}"},"expected":"var in template"},{"name":"Data does not override block default","desc":"Provided data does not override default value of block","data":{"var":"var in data"},"template":"{{<include}}{{/include}}","partials":{"include":"{{$var}}var in include{{/var}}"},"expected":"var in include"},{"name":"Overridden partial","desc":"Overridden partial","data":{},"template":"test {{<partial}}{{$stuff}}override{{/stuff}}{{/partial}}","partials":{"partial":"{{$stuff}}...{{/stuff}}"},"expected":"test override"},{"name":"Two overridden partials","desc":"Two overridden partials with different content","data":{},"template":"test {{<partial}}{{$stuff}}override1{{/stuff}}{{/partial}} {{<partial}}{{$stuff}}override2{{/stuff}}{{/partial}}\n","partials":{"partial":"|{{$stuff}}...{{/stuff}}{{$default}} default{{/default}}|"},"expected":"test |override1 default| |override2 default|\n"},{"name":"Override partial with newlines","desc":"Override partial with newlines","data":{},"template":"{{<partial}}{{$ballmer}}\npeaked\n\n:(\n{{/ballmer}}{{/partial}}","partials":{"partial":"{{$ballmer}}peaking{{/ballmer}}"},"expected":"peaked\n\n:(\n"},{"name":"Inherit indentation","desc":"Override one substitution but not the other","data":{},"template":"{{<partial}}{{$stuff2}}override two{{/stuff2}}{{/partial}}","partials":{"partial":"{{$stuff}}new default one{{/stuff}}, {{$stuff2}}new default two{{/stuff2}}"},"expected":"new default one, override two"},{"name":"Super template","desc":"Super templates behave identically to partials when called with no parameters","data":{},"template":"{{>include}}|{{<include}}{{/include}}","partials":{"include":"{{$foo}}default content{{/foo}}"},"expected":"default content|default content"},{"name":"Recursion","desc":"Recursion in inherited templates","data":{},"template":"{{<include}}{{$foo}}override{{/foo}}{{/include}}","partials":{"include":"{{$foo}}default content{{/foo}} {{$bar}}{{<include2}}{{/include2}}{{/bar}}","include2":"{{$foo}}include2 default content{{/foo}} {{<include}}{{$bar}}don't recurse{{/bar}}{{/include}}"},"expected":"override override override don't recurse"},{"name":"Multi-level inheritance","desc":"Top-level substitutions take precedence in multi-level inheritance","data":{},"template":"{{<parent}}{{$a}}c{{/a}}{{/parent}}","partials":{"parent":"{{<older}}{{$a}}p{{/a}}{{/older}}","older":"{{<grandParent}}{{$a}}o{{/a}}{{/grandParent}}","grandParent":"{{$a}}g{{/a}}"},"expected":"c"},{"name":"Multi-level inheritance, no sub child","desc":"Top-level substitutions take precedence in multi-level inheritance","data":{},"template":"{{<parent}}{{/parent}}","partials":{"parent":"{{<older}}{{$a}}p{{/a}}{{/older}}","older":"{{<grandParent}}{{$a}}o{{/a}}{{/grandParent}}","grandParent":"{{$a}}g{{/a}}"},"expected":"p"},{"name":"Text inside super","desc":"Ignores text inside super templates, but does parse $ tags","data":{},"template":"{{<include}} asdfasd {{$foo}}hmm{{/foo}} asdfasdfasdf {{/include}}","partials":{"include":"{{$foo}}default content{{/foo}}"},"expected":"hmm"},{"name":"Text inside super","desc":"Allows text inside a super tag, but ignores it","data":{},"template":"{{<include}} asdfasd asdfasdfasdf {{/include}}","partials":{"include":"{{$foo}}default content{{/foo}}"},"expected":"default content"}],"__ATTN__":"Do not edit this file; changes belong in the appropriate YAML file."}
\ No newline at end of file
diff --git a/specs/inheritance.yml b/specs/inheritance.yml
new file mode 100644
index 0000000..479e834
--- /dev/null
+++ b/specs/inheritance.yml
@@ -0,0 +1,192 @@
+overview: |
+  Parent tags are used to expand an external template into the current template,
+  with optional parameters delimited by block tags.
+
+  These tags' content MUST be a non-whitespace character sequence NOT containing
+  the current closing delimiter; each Parent tag MUST be followed by an End
+  Section tag with the same content within the matching parent tag.
+
+  Block tags are used inside of parent tags to assign data onto the context stack 
+  prior to rendering the parent template. Outside of parent tags, block tags are
+  used to indicate where value set in the parent tag should be placed. If no value
+  is set then the content in between the block tags, if any, is rendered.
+tests:
+  - name: Default
+    desc: Default content should be rendered if the block isn't overridden
+    data: { }
+    template: |
+        {{$title}}Default title{{/title}}
+    expected: |
+        Default title
+
+  - name: Variable
+    desc: Default content renders variables
+    data: { bar: 'baz' }
+    template: |
+        {{$foo}}default {{bar}} content{{/foo}}
+    expected: |
+        default baz content
+
+  - name: Triple Mustache
+    desc: Default content renders triple mustache variables
+    data: { bar: '<baz>' } 
+    template: |
+      {{$foo}}default {{{bar}}} content{{/foo}}
+    expected: |
+      default <baz> content
+
+  - name: Sections
+    desc: Default content renders sections
+    data: { bar: {baz: 'qux'} }
+    template: |
+      {{$foo}}default {{#bar}}{{baz}}{{/bar}} content{{/foo}}
+    expected: |
+      default qux content
+
+  - name: Negative Sections
+    desc: Default content renders negative sections
+    data: { baz: 'three' }
+    template: |
+      {{$foo}}default {{^bar}}{{baz}}{{/bar}} content{{/foo}}
+    expected: |
+      default three content
+
+  - name: Mustache Injection
+    desc: Mustache injection in default content
+    data: {bar: {baz: '{{qux}}'} }
+    template: |
+      {{$foo}}default {{#bar}}{{baz}}{{/bar}} content{{/foo}}
+    expected: |
+      default {{qux}} content
+
+  - name: Inherit
+    desc: Default content rendered inside included templates
+    data: { }
+    template: |
+      {{<include}}{{/include}}
+    partials:
+      include: "{{$foo}}default content{{/foo}}"
+    expected: "default content"
+
+  - name: Overridden content
+    desc: Overridden content
+    data: { }
+    template: "{{<super}}{{$title}}sub template title{{/title}}{{/super}}"
+    partials:
+      super: "...{{$title}}Default title{{/title}}..."
+    expected: "...sub template title..."
+
+  - name: Data does not override block
+    desc: Provided data does not override data passed into parent
+    data: { var: 'var in data' }
+    template: "{{<include}}{{$var}}var in template{{/var}}{{/include}}"
+    partials:
+      include: "{{$var}}var in include{{/var}}"
+    expected: "var in template"
+
+  - name: Data does not override block default
+    desc: Provided data does not override default value of block
+    data: { var: 'var in data' }
+    template: "{{<include}}{{/include}}"
+    partials:
+      include: "{{$var}}var in include{{/var}}"
+    expected: "var in include"
+
+  - name: Overridden partial
+    desc: Overridden partial
+    data: { }
+    template: "test {{<partial}}{{$stuff}}override{{/stuff}}{{/partial}}"
+    partials:
+      partial: "{{$stuff}}...{{/stuff}}"
+    expected: "test override"
+
+  - name: Two overridden partials
+    desc: Two overridden partials with different content
+    data: { }
+    template: |
+      test {{<partial}}{{$stuff}}override1{{/stuff}}{{/partial}} {{<partial}}{{$stuff}}override2{{/stuff}}{{/partial}}
+    partials:
+      partial: "|{{$stuff}}...{{/stuff}}{{$default}} default{{/default}}|"
+    expected: |
+      test |override1 default| |override2 default|
+  - name: Override partial with newlines
+    desc: Override partial with newlines
+    data: { }
+    template: "{{<partial}}{{$ballmer}}\npeaked\n\n:(\n{{/ballmer}}{{/partial}}"
+    partials:
+      partial: "{{$ballmer}}peaking{{/ballmer}}"
+    expected: "peaked\n\n:(\n"
+    
+  - name: Inherit indentation
+    desc: Inherit indentation when overriding a partial
+    data: { }
+    template: "{{<partial}}{{$nineties}}hammer time{{/nineties}}{{/partial}}"
+    partials:
+      partial: |
+        stop:
+            {{$nineties}}collaborate and listen{{/nineties}}
+    expected: |
+      stop:
+          hammer time
+
+    - name: Only one override
+    desc: Override one substitution but not the other
+    data: { }
+    template: "{{<partial}}{{$stuff2}}override two{{/stuff2}}{{/partial}}"
+    partials:
+      partial: "{{$stuff}}new default one{{/stuff}}, {{$stuff2}}new default two{{/stuff2}}"
+    expected: "new default one, override two"
+
+  - name: Super template
+    desc: Super templates behave identically to partials when called with no parameters
+    data: { }
+    template: "{{>include}}|{{<include}}{{/include}}"
+    partials:
+      include: "{{$foo}}default content{{/foo}}"
+    expected: "default content|default content"
+
+  - name: Recursion
+    desc: Recursion in inherited templates
+    data: {}
+    template: "{{<include}}{{$foo}}override{{/foo}}{{/include}}"
+    partials:
+      include: "{{$foo}}default content{{/foo}} {{$bar}}{{<include2}}{{/include2}}{{/bar}}"
+      include2: "{{$foo}}include2 default content{{/foo}} {{<include}}{{$bar}}don't recurse{{/bar}}{{/include}}"
+    expected: "override override override don't recurse"
+
+  - name: Multi-level inheritance
+    desc: Top-level substitutions take precedence in multi-level inheritance
+    data: { }
+    template: "{{<parent}}{{$a}}c{{/a}}{{/parent}}"
+    partials:
+      parent: "{{<older}}{{$a}}p{{/a}}{{/older}}"
+      older: "{{<grandParent}}{{$a}}o{{/a}}{{/grandParent}}"
+      grandParent: "{{$a}}g{{/a}}"
+    expected: c
+
+  - name: Multi-level inheritance, no sub child
+    desc: Top-level substitutions take precedence in multi-level inheritance
+    data: { }
+    template: "{{<parent}}{{/parent}}"
+    partials:
+      parent: "{{<older}}{{$a}}p{{/a}}{{/older}}"
+      older: "{{<grandParent}}{{$a}}o{{/a}}{{/grandParent}}"
+      grandParent: "{{$a}}g{{/a}}"
+    expected: p
+
+  - name: Text inside super
+    desc: Ignores text inside super templates, but does parse $ tags
+    data: { }
+    template: "{{<include}} asdfasd {{$foo}}hmm{{/foo}} asdfasdfasdf {{/include}}"
+    partials:
+      include: "{{$foo}}default content{{/foo}}"
+    expected:
+      hmm
+
+  - name: Text inside super
+    desc: Allows text inside a super tag, but ignores it
+    data: {}
+    template: "{{<include}} asdfasd asdfasdfasdf {{/include}}"
+    partials:
+      include: "{{$foo}}default content{{/foo}}"
+    expected: default content
-- 
cgit v1.2.1


From b251d44a84ccd226a3262440545505eb94441fb8 Mon Sep 17 00:00:00 2001
From: Julian Gonggrijp <dev@juliangonggrijp.com>
Date: Mon, 19 Apr 2021 02:26:06 +0200
Subject: Fix inheritance spec whitespace

---
 specs/inheritance.yml | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/specs/inheritance.yml b/specs/inheritance.yml
index 479e834..8881ee5 100644
--- a/specs/inheritance.yml
+++ b/specs/inheritance.yml
@@ -6,30 +6,31 @@ overview: |
   the current closing delimiter; each Parent tag MUST be followed by an End
   Section tag with the same content within the matching parent tag.
 
-  Block tags are used inside of parent tags to assign data onto the context stack 
-  prior to rendering the parent template. Outside of parent tags, block tags are
-  used to indicate where value set in the parent tag should be placed. If no value
-  is set then the content in between the block tags, if any, is rendered.
+  Block tags are used inside of parent tags to assign data onto the context
+  stack prior to rendering the parent template. Outside of parent tags, block
+  tags are used to indicate where value set in the parent tag should be placed.
+  If no value is set then the content in between the block tags, if any, is
+  rendered.
 tests:
   - name: Default
     desc: Default content should be rendered if the block isn't overridden
     data: { }
     template: |
-        {{$title}}Default title{{/title}}
+      {{$title}}Default title{{/title}}
     expected: |
-        Default title
+      Default title
 
   - name: Variable
     desc: Default content renders variables
     data: { bar: 'baz' }
     template: |
-        {{$foo}}default {{bar}} content{{/foo}}
+      {{$foo}}default {{bar}} content{{/foo}}
     expected: |
-        default baz content
+      default baz content
 
   - name: Triple Mustache
     desc: Default content renders triple mustache variables
-    data: { bar: '<baz>' } 
+    data: { bar: '<baz>' }
     template: |
       {{$foo}}default {{{bar}}} content{{/foo}}
     expected: |
@@ -109,6 +110,7 @@ tests:
       partial: "|{{$stuff}}...{{/stuff}}{{$default}} default{{/default}}|"
     expected: |
       test |override1 default| |override2 default|
+
   - name: Override partial with newlines
     desc: Override partial with newlines
     data: { }
@@ -116,7 +118,7 @@ tests:
     partials:
       partial: "{{$ballmer}}peaking{{/ballmer}}"
     expected: "peaked\n\n:(\n"
-    
+
   - name: Inherit indentation
     desc: Inherit indentation when overriding a partial
     data: { }
@@ -124,12 +126,12 @@ tests:
     partials:
       partial: |
         stop:
-            {{$nineties}}collaborate and listen{{/nineties}}
+          {{$nineties}}collaborate and listen{{/nineties}}
     expected: |
       stop:
-          hammer time
+        hammer time
 
-    - name: Only one override
+  - name: Only one override
     desc: Override one substitution but not the other
     data: { }
     template: "{{<partial}}{{$stuff2}}override two{{/stuff2}}{{/partial}}"
-- 
cgit v1.2.1


From 7e59b725748931f7e0c721413076d045ff3c69c5 Mon Sep 17 00:00:00 2001
From: Julian Gonggrijp <dev@juliangonggrijp.com>
Date: Mon, 19 Apr 2021 02:27:30 +0200
Subject: Rebuild inheritance json

---
 specs/inheritance.json | 236 ++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 235 insertions(+), 1 deletion(-)

diff --git a/specs/inheritance.json b/specs/inheritance.json
index 07b6311..809b693 100644
--- a/specs/inheritance.json
+++ b/specs/inheritance.json
@@ -1 +1,235 @@
-{"overview":"Parent tags are used to expand an external template into the current template,\nwith optional parameters delimited by block tags.\n\nThese tags' content MUST be a non-whitespace character sequence NOT containing\nthe current closing delimiter; each Parent tag MUST be followed by an End\nSection tag with the same content within the matching parent tag.\n\nBlock tags are used inside of parent tags to assign data onto the context stack \nprior to rendering the parent template. Outside of parent tags, block tags are\nused to indicate where value set in the parent tag should be placed. If no value\nis set then the content in between the block tags, if any, is rendered.\n","tests":[{"name":"Default","desc":"Default content should be rendered if the block isn't overridden","data":{},"template":"{{$title}}Default title{{/title}}\n","expected":"Default title\n"},{"name":"Variable","desc":"Default content renders variables","data":{"bar":"baz"},"template":"{{$foo}}default {{bar}} content{{/foo}}\n","expected":"default baz content\n"},{"name":"Triple Mustache","desc":"Default content renders triple mustache variables","data":{"bar":"<baz>"},"template":"{{$foo}}default {{{bar}}} content{{/foo}}\n","expected":"default <baz> content\n"},{"name":"Sections","desc":"Default content renders sections","data":{"bar":{"baz":"qux"}},"template":"{{$foo}}default {{#bar}}{{baz}}{{/bar}} content{{/foo}}\n","expected":"default qux content\n"},{"name":"Negative Sections","desc":"Default content renders negative sections","data":{"baz":"three"},"template":"{{$foo}}default {{^bar}}{{baz}}{{/bar}} content{{/foo}}\n","expected":"default three content\n"},{"name":"Mustache Injection","desc":"Mustache injection in default content","data":{"bar":{"baz":"{{qux}}"}},"template":"{{$foo}}default {{#bar}}{{baz}}{{/bar}} content{{/foo}}\n","expected":"default {{qux}} content\n"},{"name":"Inherit","desc":"Default content rendered inside included templates","data":{},"template":"{{<include}}{{/include}}\n","partials":{"include":"{{$foo}}default content{{/foo}}"},"expected":"default content"},{"name":"Overridden content","desc":"Overridden content","data":{},"template":"{{<super}}{{$title}}sub template title{{/title}}{{/super}}","partials":{"super":"...{{$title}}Default title{{/title}}..."},"expected":"...sub template title..."},{"name":"Data does not override block","desc":"Provided data does not override data passed into parent","data":{"var":"var in data"},"template":"{{<include}}{{$var}}var in template{{/var}}{{/include}}","partials":{"include":"{{$var}}var in include{{/var}}"},"expected":"var in template"},{"name":"Data does not override block default","desc":"Provided data does not override default value of block","data":{"var":"var in data"},"template":"{{<include}}{{/include}}","partials":{"include":"{{$var}}var in include{{/var}}"},"expected":"var in include"},{"name":"Overridden partial","desc":"Overridden partial","data":{},"template":"test {{<partial}}{{$stuff}}override{{/stuff}}{{/partial}}","partials":{"partial":"{{$stuff}}...{{/stuff}}"},"expected":"test override"},{"name":"Two overridden partials","desc":"Two overridden partials with different content","data":{},"template":"test {{<partial}}{{$stuff}}override1{{/stuff}}{{/partial}} {{<partial}}{{$stuff}}override2{{/stuff}}{{/partial}}\n","partials":{"partial":"|{{$stuff}}...{{/stuff}}{{$default}} default{{/default}}|"},"expected":"test |override1 default| |override2 default|\n"},{"name":"Override partial with newlines","desc":"Override partial with newlines","data":{},"template":"{{<partial}}{{$ballmer}}\npeaked\n\n:(\n{{/ballmer}}{{/partial}}","partials":{"partial":"{{$ballmer}}peaking{{/ballmer}}"},"expected":"peaked\n\n:(\n"},{"name":"Inherit indentation","desc":"Override one substitution but not the other","data":{},"template":"{{<partial}}{{$stuff2}}override two{{/stuff2}}{{/partial}}","partials":{"partial":"{{$stuff}}new default one{{/stuff}}, {{$stuff2}}new default two{{/stuff2}}"},"expected":"new default one, override two"},{"name":"Super template","desc":"Super templates behave identically to partials when called with no parameters","data":{},"template":"{{>include}}|{{<include}}{{/include}}","partials":{"include":"{{$foo}}default content{{/foo}}"},"expected":"default content|default content"},{"name":"Recursion","desc":"Recursion in inherited templates","data":{},"template":"{{<include}}{{$foo}}override{{/foo}}{{/include}}","partials":{"include":"{{$foo}}default content{{/foo}} {{$bar}}{{<include2}}{{/include2}}{{/bar}}","include2":"{{$foo}}include2 default content{{/foo}} {{<include}}{{$bar}}don't recurse{{/bar}}{{/include}}"},"expected":"override override override don't recurse"},{"name":"Multi-level inheritance","desc":"Top-level substitutions take precedence in multi-level inheritance","data":{},"template":"{{<parent}}{{$a}}c{{/a}}{{/parent}}","partials":{"parent":"{{<older}}{{$a}}p{{/a}}{{/older}}","older":"{{<grandParent}}{{$a}}o{{/a}}{{/grandParent}}","grandParent":"{{$a}}g{{/a}}"},"expected":"c"},{"name":"Multi-level inheritance, no sub child","desc":"Top-level substitutions take precedence in multi-level inheritance","data":{},"template":"{{<parent}}{{/parent}}","partials":{"parent":"{{<older}}{{$a}}p{{/a}}{{/older}}","older":"{{<grandParent}}{{$a}}o{{/a}}{{/grandParent}}","grandParent":"{{$a}}g{{/a}}"},"expected":"p"},{"name":"Text inside super","desc":"Ignores text inside super templates, but does parse $ tags","data":{},"template":"{{<include}} asdfasd {{$foo}}hmm{{/foo}} asdfasdfasdf {{/include}}","partials":{"include":"{{$foo}}default content{{/foo}}"},"expected":"hmm"},{"name":"Text inside super","desc":"Allows text inside a super tag, but ignores it","data":{},"template":"{{<include}} asdfasd asdfasdfasdf {{/include}}","partials":{"include":"{{$foo}}default content{{/foo}}"},"expected":"default content"}],"__ATTN__":"Do not edit this file; changes belong in the appropriate YAML file."}
\ No newline at end of file
+{
+  "__ATTN__": "Do not edit this file; changes belong in the appropriate YAML file.",
+  "overview": "Parent tags are used to expand an external template into the current template,\nwith optional parameters delimited by block tags.\n\nThese tags' content MUST be a non-whitespace character sequence NOT containing\nthe current closing delimiter; each Parent tag MUST be followed by an End\nSection tag with the same content within the matching parent tag.\n\nBlock tags are used inside of parent tags to assign data onto the context\nstack prior to rendering the parent template. Outside of parent tags, block\ntags are used to indicate where value set in the parent tag should be placed.\nIf no value is set then the content in between the block tags, if any, is\nrendered.\n",
+  "tests": [
+    {
+      "name": "Default",
+      "desc": "Default content should be rendered if the block isn't overridden",
+      "data": {
+      },
+      "template": "{{$title}}Default title{{/title}}\n",
+      "expected": "Default title\n"
+    },
+    {
+      "name": "Variable",
+      "desc": "Default content renders variables",
+      "data": {
+        "bar": "baz"
+      },
+      "template": "{{$foo}}default {{bar}} content{{/foo}}\n",
+      "expected": "default baz content\n"
+    },
+    {
+      "name": "Triple Mustache",
+      "desc": "Default content renders triple mustache variables",
+      "data": {
+        "bar": "<baz>"
+      },
+      "template": "{{$foo}}default {{{bar}}} content{{/foo}}\n",
+      "expected": "default <baz> content\n"
+    },
+    {
+      "name": "Sections",
+      "desc": "Default content renders sections",
+      "data": {
+        "bar": {
+          "baz": "qux"
+        }
+      },
+      "template": "{{$foo}}default {{#bar}}{{baz}}{{/bar}} content{{/foo}}\n",
+      "expected": "default qux content\n"
+    },
+    {
+      "name": "Negative Sections",
+      "desc": "Default content renders negative sections",
+      "data": {
+        "baz": "three"
+      },
+      "template": "{{$foo}}default {{^bar}}{{baz}}{{/bar}} content{{/foo}}\n",
+      "expected": "default three content\n"
+    },
+    {
+      "name": "Mustache Injection",
+      "desc": "Mustache injection in default content",
+      "data": {
+        "bar": {
+          "baz": "{{qux}}"
+        }
+      },
+      "template": "{{$foo}}default {{#bar}}{{baz}}{{/bar}} content{{/foo}}\n",
+      "expected": "default {{qux}} content\n"
+    },
+    {
+      "name": "Inherit",
+      "desc": "Default content rendered inside included templates",
+      "data": {
+      },
+      "template": "{{<include}}{{/include}}\n",
+      "partials": {
+        "include": "{{$foo}}default content{{/foo}}"
+      },
+      "expected": "default content"
+    },
+    {
+      "name": "Overridden content",
+      "desc": "Overridden content",
+      "data": {
+      },
+      "template": "{{<super}}{{$title}}sub template title{{/title}}{{/super}}",
+      "partials": {
+        "super": "...{{$title}}Default title{{/title}}..."
+      },
+      "expected": "...sub template title..."
+    },
+    {
+      "name": "Data does not override block",
+      "desc": "Provided data does not override data passed into parent",
+      "data": {
+        "var": "var in data"
+      },
+      "template": "{{<include}}{{$var}}var in template{{/var}}{{/include}}",
+      "partials": {
+        "include": "{{$var}}var in include{{/var}}"
+      },
+      "expected": "var in template"
+    },
+    {
+      "name": "Data does not override block default",
+      "desc": "Provided data does not override default value of block",
+      "data": {
+        "var": "var in data"
+      },
+      "template": "{{<include}}{{/include}}",
+      "partials": {
+        "include": "{{$var}}var in include{{/var}}"
+      },
+      "expected": "var in include"
+    },
+    {
+      "name": "Overridden partial",
+      "desc": "Overridden partial",
+      "data": {
+      },
+      "template": "test {{<partial}}{{$stuff}}override{{/stuff}}{{/partial}}",
+      "partials": {
+        "partial": "{{$stuff}}...{{/stuff}}"
+      },
+      "expected": "test override"
+    },
+    {
+      "name": "Two overridden partials",
+      "desc": "Two overridden partials with different content",
+      "data": {
+      },
+      "template": "test {{<partial}}{{$stuff}}override1{{/stuff}}{{/partial}} {{<partial}}{{$stuff}}override2{{/stuff}}{{/partial}}\n",
+      "partials": {
+        "partial": "|{{$stuff}}...{{/stuff}}{{$default}} default{{/default}}|"
+      },
+      "expected": "test |override1 default| |override2 default|\n"
+    },
+    {
+      "name": "Override partial with newlines",
+      "desc": "Override partial with newlines",
+      "data": {
+      },
+      "template": "{{<partial}}{{$ballmer}}\npeaked\n\n:(\n{{/ballmer}}{{/partial}}",
+      "partials": {
+        "partial": "{{$ballmer}}peaking{{/ballmer}}"
+      },
+      "expected": "peaked\n\n:(\n"
+    },
+    {
+      "name": "Inherit indentation",
+      "desc": "Inherit indentation when overriding a partial",
+      "data": {
+      },
+      "template": "{{<partial}}{{$nineties}}hammer time{{/nineties}}{{/partial}}",
+      "partials": {
+        "partial": "stop:\n  {{$nineties}}collaborate and listen{{/nineties}}\n"
+      },
+      "expected": "stop:\n  hammer time\n"
+    },
+    {
+      "name": "Only one override",
+      "desc": "Override one substitution but not the other",
+      "data": {
+      },
+      "template": "{{<partial}}{{$stuff2}}override two{{/stuff2}}{{/partial}}",
+      "partials": {
+        "partial": "{{$stuff}}new default one{{/stuff}}, {{$stuff2}}new default two{{/stuff2}}"
+      },
+      "expected": "new default one, override two"
+    },
+    {
+      "name": "Super template",
+      "desc": "Super templates behave identically to partials when called with no parameters",
+      "data": {
+      },
+      "template": "{{>include}}|{{<include}}{{/include}}",
+      "partials": {
+        "include": "{{$foo}}default content{{/foo}}"
+      },
+      "expected": "default content|default content"
+    },
+    {
+      "name": "Recursion",
+      "desc": "Recursion in inherited templates",
+      "data": {
+      },
+      "template": "{{<include}}{{$foo}}override{{/foo}}{{/include}}",
+      "partials": {
+        "include": "{{$foo}}default content{{/foo}} {{$bar}}{{<include2}}{{/include2}}{{/bar}}",
+        "include2": "{{$foo}}include2 default content{{/foo}} {{<include}}{{$bar}}don't recurse{{/bar}}{{/include}}"
+      },
+      "expected": "override override override don't recurse"
+    },
+    {
+      "name": "Multi-level inheritance",
+      "desc": "Top-level substitutions take precedence in multi-level inheritance",
+      "data": {
+      },
+      "template": "{{<parent}}{{$a}}c{{/a}}{{/parent}}",
+      "partials": {
+        "parent": "{{<older}}{{$a}}p{{/a}}{{/older}}",
+        "older": "{{<grandParent}}{{$a}}o{{/a}}{{/grandParent}}",
+        "grandParent": "{{$a}}g{{/a}}"
+      },
+      "expected": "c"
+    },
+    {
+      "name": "Multi-level inheritance, no sub child",
+      "desc": "Top-level substitutions take precedence in multi-level inheritance",
+      "data": {
+      },
+      "template": "{{<parent}}{{/parent}}",
+      "partials": {
+        "parent": "{{<older}}{{$a}}p{{/a}}{{/older}}",
+        "older": "{{<grandParent}}{{$a}}o{{/a}}{{/grandParent}}",
+        "grandParent": "{{$a}}g{{/a}}"
+      },
+      "expected": "p"
+    },
+    {
+      "name": "Text inside super",
+      "desc": "Ignores text inside super templates, but does parse $ tags",
+      "data": {
+      },
+      "template": "{{<include}} asdfasd {{$foo}}hmm{{/foo}} asdfasdfasdf {{/include}}",
+      "partials": {
+        "include": "{{$foo}}default content{{/foo}}"
+      },
+      "expected": "hmm"
+    },
+    {
+      "name": "Text inside super",
+      "desc": "Allows text inside a super tag, but ignores it",
+      "data": {
+      },
+      "template": "{{<include}} asdfasd asdfasdfasdf {{/include}}",
+      "partials": {
+        "include": "{{$foo}}default content{{/foo}}"
+      },
+      "expected": "default content"
+    }
+  ]
+}
-- 
cgit v1.2.1


From c14dd55524260cdd6d399cbb8f851599c9f1796c Mon Sep 17 00:00:00 2001
From: Julian Gonggrijp <dev@juliangonggrijp.com>
Date: Mon, 19 Apr 2021 02:29:03 +0200
Subject: Mark inheritance spec as optional

---
 specs/inheritance.json  | 235 ------------------------------------------------
 specs/inheritance.yml   | 194 ---------------------------------------
 specs/~inheritance.json | 235 ++++++++++++++++++++++++++++++++++++++++++++++++
 specs/~inheritance.yml  | 194 +++++++++++++++++++++++++++++++++++++++
 4 files changed, 429 insertions(+), 429 deletions(-)
 delete mode 100644 specs/inheritance.json
 delete mode 100644 specs/inheritance.yml
 create mode 100644 specs/~inheritance.json
 create mode 100644 specs/~inheritance.yml

diff --git a/specs/inheritance.json b/specs/inheritance.json
deleted file mode 100644
index 809b693..0000000
--- a/specs/inheritance.json
+++ /dev/null
@@ -1,235 +0,0 @@
-{
-  "__ATTN__": "Do not edit this file; changes belong in the appropriate YAML file.",
-  "overview": "Parent tags are used to expand an external template into the current template,\nwith optional parameters delimited by block tags.\n\nThese tags' content MUST be a non-whitespace character sequence NOT containing\nthe current closing delimiter; each Parent tag MUST be followed by an End\nSection tag with the same content within the matching parent tag.\n\nBlock tags are used inside of parent tags to assign data onto the context\nstack prior to rendering the parent template. Outside of parent tags, block\ntags are used to indicate where value set in the parent tag should be placed.\nIf no value is set then the content in between the block tags, if any, is\nrendered.\n",
-  "tests": [
-    {
-      "name": "Default",
-      "desc": "Default content should be rendered if the block isn't overridden",
-      "data": {
-      },
-      "template": "{{$title}}Default title{{/title}}\n",
-      "expected": "Default title\n"
-    },
-    {
-      "name": "Variable",
-      "desc": "Default content renders variables",
-      "data": {
-        "bar": "baz"
-      },
-      "template": "{{$foo}}default {{bar}} content{{/foo}}\n",
-      "expected": "default baz content\n"
-    },
-    {
-      "name": "Triple Mustache",
-      "desc": "Default content renders triple mustache variables",
-      "data": {
-        "bar": "<baz>"
-      },
-      "template": "{{$foo}}default {{{bar}}} content{{/foo}}\n",
-      "expected": "default <baz> content\n"
-    },
-    {
-      "name": "Sections",
-      "desc": "Default content renders sections",
-      "data": {
-        "bar": {
-          "baz": "qux"
-        }
-      },
-      "template": "{{$foo}}default {{#bar}}{{baz}}{{/bar}} content{{/foo}}\n",
-      "expected": "default qux content\n"
-    },
-    {
-      "name": "Negative Sections",
-      "desc": "Default content renders negative sections",
-      "data": {
-        "baz": "three"
-      },
-      "template": "{{$foo}}default {{^bar}}{{baz}}{{/bar}} content{{/foo}}\n",
-      "expected": "default three content\n"
-    },
-    {
-      "name": "Mustache Injection",
-      "desc": "Mustache injection in default content",
-      "data": {
-        "bar": {
-          "baz": "{{qux}}"
-        }
-      },
-      "template": "{{$foo}}default {{#bar}}{{baz}}{{/bar}} content{{/foo}}\n",
-      "expected": "default {{qux}} content\n"
-    },
-    {
-      "name": "Inherit",
-      "desc": "Default content rendered inside included templates",
-      "data": {
-      },
-      "template": "{{<include}}{{/include}}\n",
-      "partials": {
-        "include": "{{$foo}}default content{{/foo}}"
-      },
-      "expected": "default content"
-    },
-    {
-      "name": "Overridden content",
-      "desc": "Overridden content",
-      "data": {
-      },
-      "template": "{{<super}}{{$title}}sub template title{{/title}}{{/super}}",
-      "partials": {
-        "super": "...{{$title}}Default title{{/title}}..."
-      },
-      "expected": "...sub template title..."
-    },
-    {
-      "name": "Data does not override block",
-      "desc": "Provided data does not override data passed into parent",
-      "data": {
-        "var": "var in data"
-      },
-      "template": "{{<include}}{{$var}}var in template{{/var}}{{/include}}",
-      "partials": {
-        "include": "{{$var}}var in include{{/var}}"
-      },
-      "expected": "var in template"
-    },
-    {
-      "name": "Data does not override block default",
-      "desc": "Provided data does not override default value of block",
-      "data": {
-        "var": "var in data"
-      },
-      "template": "{{<include}}{{/include}}",
-      "partials": {
-        "include": "{{$var}}var in include{{/var}}"
-      },
-      "expected": "var in include"
-    },
-    {
-      "name": "Overridden partial",
-      "desc": "Overridden partial",
-      "data": {
-      },
-      "template": "test {{<partial}}{{$stuff}}override{{/stuff}}{{/partial}}",
-      "partials": {
-        "partial": "{{$stuff}}...{{/stuff}}"
-      },
-      "expected": "test override"
-    },
-    {
-      "name": "Two overridden partials",
-      "desc": "Two overridden partials with different content",
-      "data": {
-      },
-      "template": "test {{<partial}}{{$stuff}}override1{{/stuff}}{{/partial}} {{<partial}}{{$stuff}}override2{{/stuff}}{{/partial}}\n",
-      "partials": {
-        "partial": "|{{$stuff}}...{{/stuff}}{{$default}} default{{/default}}|"
-      },
-      "expected": "test |override1 default| |override2 default|\n"
-    },
-    {
-      "name": "Override partial with newlines",
-      "desc": "Override partial with newlines",
-      "data": {
-      },
-      "template": "{{<partial}}{{$ballmer}}\npeaked\n\n:(\n{{/ballmer}}{{/partial}}",
-      "partials": {
-        "partial": "{{$ballmer}}peaking{{/ballmer}}"
-      },
-      "expected": "peaked\n\n:(\n"
-    },
-    {
-      "name": "Inherit indentation",
-      "desc": "Inherit indentation when overriding a partial",
-      "data": {
-      },
-      "template": "{{<partial}}{{$nineties}}hammer time{{/nineties}}{{/partial}}",
-      "partials": {
-        "partial": "stop:\n  {{$nineties}}collaborate and listen{{/nineties}}\n"
-      },
-      "expected": "stop:\n  hammer time\n"
-    },
-    {
-      "name": "Only one override",
-      "desc": "Override one substitution but not the other",
-      "data": {
-      },
-      "template": "{{<partial}}{{$stuff2}}override two{{/stuff2}}{{/partial}}",
-      "partials": {
-        "partial": "{{$stuff}}new default one{{/stuff}}, {{$stuff2}}new default two{{/stuff2}}"
-      },
-      "expected": "new default one, override two"
-    },
-    {
-      "name": "Super template",
-      "desc": "Super templates behave identically to partials when called with no parameters",
-      "data": {
-      },
-      "template": "{{>include}}|{{<include}}{{/include}}",
-      "partials": {
-        "include": "{{$foo}}default content{{/foo}}"
-      },
-      "expected": "default content|default content"
-    },
-    {
-      "name": "Recursion",
-      "desc": "Recursion in inherited templates",
-      "data": {
-      },
-      "template": "{{<include}}{{$foo}}override{{/foo}}{{/include}}",
-      "partials": {
-        "include": "{{$foo}}default content{{/foo}} {{$bar}}{{<include2}}{{/include2}}{{/bar}}",
-        "include2": "{{$foo}}include2 default content{{/foo}} {{<include}}{{$bar}}don't recurse{{/bar}}{{/include}}"
-      },
-      "expected": "override override override don't recurse"
-    },
-    {
-      "name": "Multi-level inheritance",
-      "desc": "Top-level substitutions take precedence in multi-level inheritance",
-      "data": {
-      },
-      "template": "{{<parent}}{{$a}}c{{/a}}{{/parent}}",
-      "partials": {
-        "parent": "{{<older}}{{$a}}p{{/a}}{{/older}}",
-        "older": "{{<grandParent}}{{$a}}o{{/a}}{{/grandParent}}",
-        "grandParent": "{{$a}}g{{/a}}"
-      },
-      "expected": "c"
-    },
-    {
-      "name": "Multi-level inheritance, no sub child",
-      "desc": "Top-level substitutions take precedence in multi-level inheritance",
-      "data": {
-      },
-      "template": "{{<parent}}{{/parent}}",
-      "partials": {
-        "parent": "{{<older}}{{$a}}p{{/a}}{{/older}}",
-        "older": "{{<grandParent}}{{$a}}o{{/a}}{{/grandParent}}",
-        "grandParent": "{{$a}}g{{/a}}"
-      },
-      "expected": "p"
-    },
-    {
-      "name": "Text inside super",
-      "desc": "Ignores text inside super templates, but does parse $ tags",
-      "data": {
-      },
-      "template": "{{<include}} asdfasd {{$foo}}hmm{{/foo}} asdfasdfasdf {{/include}}",
-      "partials": {
-        "include": "{{$foo}}default content{{/foo}}"
-      },
-      "expected": "hmm"
-    },
-    {
-      "name": "Text inside super",
-      "desc": "Allows text inside a super tag, but ignores it",
-      "data": {
-      },
-      "template": "{{<include}} asdfasd asdfasdfasdf {{/include}}",
-      "partials": {
-        "include": "{{$foo}}default content{{/foo}}"
-      },
-      "expected": "default content"
-    }
-  ]
-}
diff --git a/specs/inheritance.yml b/specs/inheritance.yml
deleted file mode 100644
index 8881ee5..0000000
--- a/specs/inheritance.yml
+++ /dev/null
@@ -1,194 +0,0 @@
-overview: |
-  Parent tags are used to expand an external template into the current template,
-  with optional parameters delimited by block tags.
-
-  These tags' content MUST be a non-whitespace character sequence NOT containing
-  the current closing delimiter; each Parent tag MUST be followed by an End
-  Section tag with the same content within the matching parent tag.
-
-  Block tags are used inside of parent tags to assign data onto the context
-  stack prior to rendering the parent template. Outside of parent tags, block
-  tags are used to indicate where value set in the parent tag should be placed.
-  If no value is set then the content in between the block tags, if any, is
-  rendered.
-tests:
-  - name: Default
-    desc: Default content should be rendered if the block isn't overridden
-    data: { }
-    template: |
-      {{$title}}Default title{{/title}}
-    expected: |
-      Default title
-
-  - name: Variable
-    desc: Default content renders variables
-    data: { bar: 'baz' }
-    template: |
-      {{$foo}}default {{bar}} content{{/foo}}
-    expected: |
-      default baz content
-
-  - name: Triple Mustache
-    desc: Default content renders triple mustache variables
-    data: { bar: '<baz>' }
-    template: |
-      {{$foo}}default {{{bar}}} content{{/foo}}
-    expected: |
-      default <baz> content
-
-  - name: Sections
-    desc: Default content renders sections
-    data: { bar: {baz: 'qux'} }
-    template: |
-      {{$foo}}default {{#bar}}{{baz}}{{/bar}} content{{/foo}}
-    expected: |
-      default qux content
-
-  - name: Negative Sections
-    desc: Default content renders negative sections
-    data: { baz: 'three' }
-    template: |
-      {{$foo}}default {{^bar}}{{baz}}{{/bar}} content{{/foo}}
-    expected: |
-      default three content
-
-  - name: Mustache Injection
-    desc: Mustache injection in default content
-    data: {bar: {baz: '{{qux}}'} }
-    template: |
-      {{$foo}}default {{#bar}}{{baz}}{{/bar}} content{{/foo}}
-    expected: |
-      default {{qux}} content
-
-  - name: Inherit
-    desc: Default content rendered inside included templates
-    data: { }
-    template: |
-      {{<include}}{{/include}}
-    partials:
-      include: "{{$foo}}default content{{/foo}}"
-    expected: "default content"
-
-  - name: Overridden content
-    desc: Overridden content
-    data: { }
-    template: "{{<super}}{{$title}}sub template title{{/title}}{{/super}}"
-    partials:
-      super: "...{{$title}}Default title{{/title}}..."
-    expected: "...sub template title..."
-
-  - name: Data does not override block
-    desc: Provided data does not override data passed into parent
-    data: { var: 'var in data' }
-    template: "{{<include}}{{$var}}var in template{{/var}}{{/include}}"
-    partials:
-      include: "{{$var}}var in include{{/var}}"
-    expected: "var in template"
-
-  - name: Data does not override block default
-    desc: Provided data does not override default value of block
-    data: { var: 'var in data' }
-    template: "{{<include}}{{/include}}"
-    partials:
-      include: "{{$var}}var in include{{/var}}"
-    expected: "var in include"
-
-  - name: Overridden partial
-    desc: Overridden partial
-    data: { }
-    template: "test {{<partial}}{{$stuff}}override{{/stuff}}{{/partial}}"
-    partials:
-      partial: "{{$stuff}}...{{/stuff}}"
-    expected: "test override"
-
-  - name: Two overridden partials
-    desc: Two overridden partials with different content
-    data: { }
-    template: |
-      test {{<partial}}{{$stuff}}override1{{/stuff}}{{/partial}} {{<partial}}{{$stuff}}override2{{/stuff}}{{/partial}}
-    partials:
-      partial: "|{{$stuff}}...{{/stuff}}{{$default}} default{{/default}}|"
-    expected: |
-      test |override1 default| |override2 default|
-
-  - name: Override partial with newlines
-    desc: Override partial with newlines
-    data: { }
-    template: "{{<partial}}{{$ballmer}}\npeaked\n\n:(\n{{/ballmer}}{{/partial}}"
-    partials:
-      partial: "{{$ballmer}}peaking{{/ballmer}}"
-    expected: "peaked\n\n:(\n"
-
-  - name: Inherit indentation
-    desc: Inherit indentation when overriding a partial
-    data: { }
-    template: "{{<partial}}{{$nineties}}hammer time{{/nineties}}{{/partial}}"
-    partials:
-      partial: |
-        stop:
-          {{$nineties}}collaborate and listen{{/nineties}}
-    expected: |
-      stop:
-        hammer time
-
-  - name: Only one override
-    desc: Override one substitution but not the other
-    data: { }
-    template: "{{<partial}}{{$stuff2}}override two{{/stuff2}}{{/partial}}"
-    partials:
-      partial: "{{$stuff}}new default one{{/stuff}}, {{$stuff2}}new default two{{/stuff2}}"
-    expected: "new default one, override two"
-
-  - name: Super template
-    desc: Super templates behave identically to partials when called with no parameters
-    data: { }
-    template: "{{>include}}|{{<include}}{{/include}}"
-    partials:
-      include: "{{$foo}}default content{{/foo}}"
-    expected: "default content|default content"
-
-  - name: Recursion
-    desc: Recursion in inherited templates
-    data: {}
-    template: "{{<include}}{{$foo}}override{{/foo}}{{/include}}"
-    partials:
-      include: "{{$foo}}default content{{/foo}} {{$bar}}{{<include2}}{{/include2}}{{/bar}}"
-      include2: "{{$foo}}include2 default content{{/foo}} {{<include}}{{$bar}}don't recurse{{/bar}}{{/include}}"
-    expected: "override override override don't recurse"
-
-  - name: Multi-level inheritance
-    desc: Top-level substitutions take precedence in multi-level inheritance
-    data: { }
-    template: "{{<parent}}{{$a}}c{{/a}}{{/parent}}"
-    partials:
-      parent: "{{<older}}{{$a}}p{{/a}}{{/older}}"
-      older: "{{<grandParent}}{{$a}}o{{/a}}{{/grandParent}}"
-      grandParent: "{{$a}}g{{/a}}"
-    expected: c
-
-  - name: Multi-level inheritance, no sub child
-    desc: Top-level substitutions take precedence in multi-level inheritance
-    data: { }
-    template: "{{<parent}}{{/parent}}"
-    partials:
-      parent: "{{<older}}{{$a}}p{{/a}}{{/older}}"
-      older: "{{<grandParent}}{{$a}}o{{/a}}{{/grandParent}}"
-      grandParent: "{{$a}}g{{/a}}"
-    expected: p
-
-  - name: Text inside super
-    desc: Ignores text inside super templates, but does parse $ tags
-    data: { }
-    template: "{{<include}} asdfasd {{$foo}}hmm{{/foo}} asdfasdfasdf {{/include}}"
-    partials:
-      include: "{{$foo}}default content{{/foo}}"
-    expected:
-      hmm
-
-  - name: Text inside super
-    desc: Allows text inside a super tag, but ignores it
-    data: {}
-    template: "{{<include}} asdfasd asdfasdfasdf {{/include}}"
-    partials:
-      include: "{{$foo}}default content{{/foo}}"
-    expected: default content
diff --git a/specs/~inheritance.json b/specs/~inheritance.json
new file mode 100644
index 0000000..809b693
--- /dev/null
+++ b/specs/~inheritance.json
@@ -0,0 +1,235 @@
+{
+  "__ATTN__": "Do not edit this file; changes belong in the appropriate YAML file.",
+  "overview": "Parent tags are used to expand an external template into the current template,\nwith optional parameters delimited by block tags.\n\nThese tags' content MUST be a non-whitespace character sequence NOT containing\nthe current closing delimiter; each Parent tag MUST be followed by an End\nSection tag with the same content within the matching parent tag.\n\nBlock tags are used inside of parent tags to assign data onto the context\nstack prior to rendering the parent template. Outside of parent tags, block\ntags are used to indicate where value set in the parent tag should be placed.\nIf no value is set then the content in between the block tags, if any, is\nrendered.\n",
+  "tests": [
+    {
+      "name": "Default",
+      "desc": "Default content should be rendered if the block isn't overridden",
+      "data": {
+      },
+      "template": "{{$title}}Default title{{/title}}\n",
+      "expected": "Default title\n"
+    },
+    {
+      "name": "Variable",
+      "desc": "Default content renders variables",
+      "data": {
+        "bar": "baz"
+      },
+      "template": "{{$foo}}default {{bar}} content{{/foo}}\n",
+      "expected": "default baz content\n"
+    },
+    {
+      "name": "Triple Mustache",
+      "desc": "Default content renders triple mustache variables",
+      "data": {
+        "bar": "<baz>"
+      },
+      "template": "{{$foo}}default {{{bar}}} content{{/foo}}\n",
+      "expected": "default <baz> content\n"
+    },
+    {
+      "name": "Sections",
+      "desc": "Default content renders sections",
+      "data": {
+        "bar": {
+          "baz": "qux"
+        }
+      },
+      "template": "{{$foo}}default {{#bar}}{{baz}}{{/bar}} content{{/foo}}\n",
+      "expected": "default qux content\n"
+    },
+    {
+      "name": "Negative Sections",
+      "desc": "Default content renders negative sections",
+      "data": {
+        "baz": "three"
+      },
+      "template": "{{$foo}}default {{^bar}}{{baz}}{{/bar}} content{{/foo}}\n",
+      "expected": "default three content\n"
+    },
+    {
+      "name": "Mustache Injection",
+      "desc": "Mustache injection in default content",
+      "data": {
+        "bar": {
+          "baz": "{{qux}}"
+        }
+      },
+      "template": "{{$foo}}default {{#bar}}{{baz}}{{/bar}} content{{/foo}}\n",
+      "expected": "default {{qux}} content\n"
+    },
+    {
+      "name": "Inherit",
+      "desc": "Default content rendered inside included templates",
+      "data": {
+      },
+      "template": "{{<include}}{{/include}}\n",
+      "partials": {
+        "include": "{{$foo}}default content{{/foo}}"
+      },
+      "expected": "default content"
+    },
+    {
+      "name": "Overridden content",
+      "desc": "Overridden content",
+      "data": {
+      },
+      "template": "{{<super}}{{$title}}sub template title{{/title}}{{/super}}",
+      "partials": {
+        "super": "...{{$title}}Default title{{/title}}..."
+      },
+      "expected": "...sub template title..."
+    },
+    {
+      "name": "Data does not override block",
+      "desc": "Provided data does not override data passed into parent",
+      "data": {
+        "var": "var in data"
+      },
+      "template": "{{<include}}{{$var}}var in template{{/var}}{{/include}}",
+      "partials": {
+        "include": "{{$var}}var in include{{/var}}"
+      },
+      "expected": "var in template"
+    },
+    {
+      "name": "Data does not override block default",
+      "desc": "Provided data does not override default value of block",
+      "data": {
+        "var": "var in data"
+      },
+      "template": "{{<include}}{{/include}}",
+      "partials": {
+        "include": "{{$var}}var in include{{/var}}"
+      },
+      "expected": "var in include"
+    },
+    {
+      "name": "Overridden partial",
+      "desc": "Overridden partial",
+      "data": {
+      },
+      "template": "test {{<partial}}{{$stuff}}override{{/stuff}}{{/partial}}",
+      "partials": {
+        "partial": "{{$stuff}}...{{/stuff}}"
+      },
+      "expected": "test override"
+    },
+    {
+      "name": "Two overridden partials",
+      "desc": "Two overridden partials with different content",
+      "data": {
+      },
+      "template": "test {{<partial}}{{$stuff}}override1{{/stuff}}{{/partial}} {{<partial}}{{$stuff}}override2{{/stuff}}{{/partial}}\n",
+      "partials": {
+        "partial": "|{{$stuff}}...{{/stuff}}{{$default}} default{{/default}}|"
+      },
+      "expected": "test |override1 default| |override2 default|\n"
+    },
+    {
+      "name": "Override partial with newlines",
+      "desc": "Override partial with newlines",
+      "data": {
+      },
+      "template": "{{<partial}}{{$ballmer}}\npeaked\n\n:(\n{{/ballmer}}{{/partial}}",
+      "partials": {
+        "partial": "{{$ballmer}}peaking{{/ballmer}}"
+      },
+      "expected": "peaked\n\n:(\n"
+    },
+    {
+      "name": "Inherit indentation",
+      "desc": "Inherit indentation when overriding a partial",
+      "data": {
+      },
+      "template": "{{<partial}}{{$nineties}}hammer time{{/nineties}}{{/partial}}",
+      "partials": {
+        "partial": "stop:\n  {{$nineties}}collaborate and listen{{/nineties}}\n"
+      },
+      "expected": "stop:\n  hammer time\n"
+    },
+    {
+      "name": "Only one override",
+      "desc": "Override one substitution but not the other",
+      "data": {
+      },
+      "template": "{{<partial}}{{$stuff2}}override two{{/stuff2}}{{/partial}}",
+      "partials": {
+        "partial": "{{$stuff}}new default one{{/stuff}}, {{$stuff2}}new default two{{/stuff2}}"
+      },
+      "expected": "new default one, override two"
+    },
+    {
+      "name": "Super template",
+      "desc": "Super templates behave identically to partials when called with no parameters",
+      "data": {
+      },
+      "template": "{{>include}}|{{<include}}{{/include}}",
+      "partials": {
+        "include": "{{$foo}}default content{{/foo}}"
+      },
+      "expected": "default content|default content"
+    },
+    {
+      "name": "Recursion",
+      "desc": "Recursion in inherited templates",
+      "data": {
+      },
+      "template": "{{<include}}{{$foo}}override{{/foo}}{{/include}}",
+      "partials": {
+        "include": "{{$foo}}default content{{/foo}} {{$bar}}{{<include2}}{{/include2}}{{/bar}}",
+        "include2": "{{$foo}}include2 default content{{/foo}} {{<include}}{{$bar}}don't recurse{{/bar}}{{/include}}"
+      },
+      "expected": "override override override don't recurse"
+    },
+    {
+      "name": "Multi-level inheritance",
+      "desc": "Top-level substitutions take precedence in multi-level inheritance",
+      "data": {
+      },
+      "template": "{{<parent}}{{$a}}c{{/a}}{{/parent}}",
+      "partials": {
+        "parent": "{{<older}}{{$a}}p{{/a}}{{/older}}",
+        "older": "{{<grandParent}}{{$a}}o{{/a}}{{/grandParent}}",
+        "grandParent": "{{$a}}g{{/a}}"
+      },
+      "expected": "c"
+    },
+    {
+      "name": "Multi-level inheritance, no sub child",
+      "desc": "Top-level substitutions take precedence in multi-level inheritance",
+      "data": {
+      },
+      "template": "{{<parent}}{{/parent}}",
+      "partials": {
+        "parent": "{{<older}}{{$a}}p{{/a}}{{/older}}",
+        "older": "{{<grandParent}}{{$a}}o{{/a}}{{/grandParent}}",
+        "grandParent": "{{$a}}g{{/a}}"
+      },
+      "expected": "p"
+    },
+    {
+      "name": "Text inside super",
+      "desc": "Ignores text inside super templates, but does parse $ tags",
+      "data": {
+      },
+      "template": "{{<include}} asdfasd {{$foo}}hmm{{/foo}} asdfasdfasdf {{/include}}",
+      "partials": {
+        "include": "{{$foo}}default content{{/foo}}"
+      },
+      "expected": "hmm"
+    },
+    {
+      "name": "Text inside super",
+      "desc": "Allows text inside a super tag, but ignores it",
+      "data": {
+      },
+      "template": "{{<include}} asdfasd asdfasdfasdf {{/include}}",
+      "partials": {
+        "include": "{{$foo}}default content{{/foo}}"
+      },
+      "expected": "default content"
+    }
+  ]
+}
diff --git a/specs/~inheritance.yml b/specs/~inheritance.yml
new file mode 100644
index 0000000..8881ee5
--- /dev/null
+++ b/specs/~inheritance.yml
@@ -0,0 +1,194 @@
+overview: |
+  Parent tags are used to expand an external template into the current template,
+  with optional parameters delimited by block tags.
+
+  These tags' content MUST be a non-whitespace character sequence NOT containing
+  the current closing delimiter; each Parent tag MUST be followed by an End
+  Section tag with the same content within the matching parent tag.
+
+  Block tags are used inside of parent tags to assign data onto the context
+  stack prior to rendering the parent template. Outside of parent tags, block
+  tags are used to indicate where value set in the parent tag should be placed.
+  If no value is set then the content in between the block tags, if any, is
+  rendered.
+tests:
+  - name: Default
+    desc: Default content should be rendered if the block isn't overridden
+    data: { }
+    template: |
+      {{$title}}Default title{{/title}}
+    expected: |
+      Default title
+
+  - name: Variable
+    desc: Default content renders variables
+    data: { bar: 'baz' }
+    template: |
+      {{$foo}}default {{bar}} content{{/foo}}
+    expected: |
+      default baz content
+
+  - name: Triple Mustache
+    desc: Default content renders triple mustache variables
+    data: { bar: '<baz>' }
+    template: |
+      {{$foo}}default {{{bar}}} content{{/foo}}
+    expected: |
+      default <baz> content
+
+  - name: Sections
+    desc: Default content renders sections
+    data: { bar: {baz: 'qux'} }
+    template: |
+      {{$foo}}default {{#bar}}{{baz}}{{/bar}} content{{/foo}}
+    expected: |
+      default qux content
+
+  - name: Negative Sections
+    desc: Default content renders negative sections
+    data: { baz: 'three' }
+    template: |
+      {{$foo}}default {{^bar}}{{baz}}{{/bar}} content{{/foo}}
+    expected: |
+      default three content
+
+  - name: Mustache Injection
+    desc: Mustache injection in default content
+    data: {bar: {baz: '{{qux}}'} }
+    template: |
+      {{$foo}}default {{#bar}}{{baz}}{{/bar}} content{{/foo}}
+    expected: |
+      default {{qux}} content
+
+  - name: Inherit
+    desc: Default content rendered inside included templates
+    data: { }
+    template: |
+      {{<include}}{{/include}}
+    partials:
+      include: "{{$foo}}default content{{/foo}}"
+    expected: "default content"
+
+  - name: Overridden content
+    desc: Overridden content
+    data: { }
+    template: "{{<super}}{{$title}}sub template title{{/title}}{{/super}}"
+    partials:
+      super: "...{{$title}}Default title{{/title}}..."
+    expected: "...sub template title..."
+
+  - name: Data does not override block
+    desc: Provided data does not override data passed into parent
+    data: { var: 'var in data' }
+    template: "{{<include}}{{$var}}var in template{{/var}}{{/include}}"
+    partials:
+      include: "{{$var}}var in include{{/var}}"
+    expected: "var in template"
+
+  - name: Data does not override block default
+    desc: Provided data does not override default value of block
+    data: { var: 'var in data' }
+    template: "{{<include}}{{/include}}"
+    partials:
+      include: "{{$var}}var in include{{/var}}"
+    expected: "var in include"
+
+  - name: Overridden partial
+    desc: Overridden partial
+    data: { }
+    template: "test {{<partial}}{{$stuff}}override{{/stuff}}{{/partial}}"
+    partials:
+      partial: "{{$stuff}}...{{/stuff}}"
+    expected: "test override"
+
+  - name: Two overridden partials
+    desc: Two overridden partials with different content
+    data: { }
+    template: |
+      test {{<partial}}{{$stuff}}override1{{/stuff}}{{/partial}} {{<partial}}{{$stuff}}override2{{/stuff}}{{/partial}}
+    partials:
+      partial: "|{{$stuff}}...{{/stuff}}{{$default}} default{{/default}}|"
+    expected: |
+      test |override1 default| |override2 default|
+
+  - name: Override partial with newlines
+    desc: Override partial with newlines
+    data: { }
+    template: "{{<partial}}{{$ballmer}}\npeaked\n\n:(\n{{/ballmer}}{{/partial}}"
+    partials:
+      partial: "{{$ballmer}}peaking{{/ballmer}}"
+    expected: "peaked\n\n:(\n"
+
+  - name: Inherit indentation
+    desc: Inherit indentation when overriding a partial
+    data: { }
+    template: "{{<partial}}{{$nineties}}hammer time{{/nineties}}{{/partial}}"
+    partials:
+      partial: |
+        stop:
+          {{$nineties}}collaborate and listen{{/nineties}}
+    expected: |
+      stop:
+        hammer time
+
+  - name: Only one override
+    desc: Override one substitution but not the other
+    data: { }
+    template: "{{<partial}}{{$stuff2}}override two{{/stuff2}}{{/partial}}"
+    partials:
+      partial: "{{$stuff}}new default one{{/stuff}}, {{$stuff2}}new default two{{/stuff2}}"
+    expected: "new default one, override two"
+
+  - name: Super template
+    desc: Super templates behave identically to partials when called with no parameters
+    data: { }
+    template: "{{>include}}|{{<include}}{{/include}}"
+    partials:
+      include: "{{$foo}}default content{{/foo}}"
+    expected: "default content|default content"
+
+  - name: Recursion
+    desc: Recursion in inherited templates
+    data: {}
+    template: "{{<include}}{{$foo}}override{{/foo}}{{/include}}"
+    partials:
+      include: "{{$foo}}default content{{/foo}} {{$bar}}{{<include2}}{{/include2}}{{/bar}}"
+      include2: "{{$foo}}include2 default content{{/foo}} {{<include}}{{$bar}}don't recurse{{/bar}}{{/include}}"
+    expected: "override override override don't recurse"
+
+  - name: Multi-level inheritance
+    desc: Top-level substitutions take precedence in multi-level inheritance
+    data: { }
+    template: "{{<parent}}{{$a}}c{{/a}}{{/parent}}"
+    partials:
+      parent: "{{<older}}{{$a}}p{{/a}}{{/older}}"
+      older: "{{<grandParent}}{{$a}}o{{/a}}{{/grandParent}}"
+      grandParent: "{{$a}}g{{/a}}"
+    expected: c
+
+  - name: Multi-level inheritance, no sub child
+    desc: Top-level substitutions take precedence in multi-level inheritance
+    data: { }
+    template: "{{<parent}}{{/parent}}"
+    partials:
+      parent: "{{<older}}{{$a}}p{{/a}}{{/older}}"
+      older: "{{<grandParent}}{{$a}}o{{/a}}{{/grandParent}}"
+      grandParent: "{{$a}}g{{/a}}"
+    expected: p
+
+  - name: Text inside super
+    desc: Ignores text inside super templates, but does parse $ tags
+    data: { }
+    template: "{{<include}} asdfasd {{$foo}}hmm{{/foo}} asdfasdfasdf {{/include}}"
+    partials:
+      include: "{{$foo}}default content{{/foo}}"
+    expected:
+      hmm
+
+  - name: Text inside super
+    desc: Allows text inside a super tag, but ignores it
+    data: {}
+    template: "{{<include}} asdfasd asdfasdfasdf {{/include}}"
+    partials:
+      include: "{{$foo}}default content{{/foo}}"
+    expected: default content
-- 
cgit v1.2.1


From e1f0fae32e428051e7a4fc6277c4a6448c6c5976 Mon Sep 17 00:00:00 2001
From: Julian Gonggrijp <dev@juliangonggrijp.com>
Date: Mon, 19 Apr 2021 03:07:08 +0200
Subject: Expand the inheritance overview

---
 specs/~inheritance.json |  2 +-
 specs/~inheritance.yml  | 50 +++++++++++++++++++++++++++++++++++++------------
 2 files changed, 39 insertions(+), 13 deletions(-)

diff --git a/specs/~inheritance.json b/specs/~inheritance.json
index 809b693..2d4539d 100644
--- a/specs/~inheritance.json
+++ b/specs/~inheritance.json
@@ -1,6 +1,6 @@
 {
   "__ATTN__": "Do not edit this file; changes belong in the appropriate YAML file.",
-  "overview": "Parent tags are used to expand an external template into the current template,\nwith optional parameters delimited by block tags.\n\nThese tags' content MUST be a non-whitespace character sequence NOT containing\nthe current closing delimiter; each Parent tag MUST be followed by an End\nSection tag with the same content within the matching parent tag.\n\nBlock tags are used inside of parent tags to assign data onto the context\nstack prior to rendering the parent template. Outside of parent tags, block\ntags are used to indicate where value set in the parent tag should be placed.\nIf no value is set then the content in between the block tags, if any, is\nrendered.\n",
+  "overview": "Like partials, Parent tags are used to expand an external template into the\ncurrent template. Contrary to partials, Parent tags may contain optional\narguments delimited by block tags. For this reason, Parent tags may also be\nreferred to as Parametric Partials.\n\nThe Parent tags' content MUST be a non-whitespace character sequence NOT\ncontaining the current closing delimiter; each Parent tag MUST be followed by\nan End Section tag with the same content within the matching Parent tag.\n\nThis tag's content names the Parent template to inject. Set Delimiter tags\nMUST NOT affect the parsing of a Parent template. The Parent MUST be rendered\nagainst the context stack local to the tag. If the named Parent cannot be\nfound, the empty string SHOULD be used instead, as in interpolations.\n\nParent tags SHOULD be treated as standalone when appropriate. If this tag is\nused standalone, any whitespace preceding the tag should be treated as\nindentation, and prepended to each line of the Parent before rendering.\n\nThe Block tags' content MUST be a non-whitespace character sequence NOT\ncontaining the current closing delimiter. Each Block tag MUST be followed by\nan End Section tag with the same content within the matching Block tag. This\ntag's content determines the parameter or argument name.\n\nBlock tags may appear both inside and outside of Parent tags. In both cases,\nthey specify a position within the template that can be overridden; it is a\nparameter of the containing template. The template text between the Block tag\nand its matching End Section tag defines the default content to render when\nthe parameter is not overridden from outside.\n\nIn addition, when used inside of a Parent tag, the template text between a\nBlock tag and its matching End Section tag defines content that replaces the\ndefault defined in the Parent template. This content is the argument passed\nto the Parent template.\n\nThe practice of injecting an external template using a Parent tag is referred\nto as inheritance. If the Parent tag includes a Block tag that overrides a\nparameter of the Parent template, this may also be referred to as\nsubstitution.\n",
   "tests": [
     {
       "name": "Default",
diff --git a/specs/~inheritance.yml b/specs/~inheritance.yml
index 8881ee5..46eb625 100644
--- a/specs/~inheritance.yml
+++ b/specs/~inheritance.yml
@@ -1,16 +1,42 @@
 overview: |
-  Parent tags are used to expand an external template into the current template,
-  with optional parameters delimited by block tags.
-
-  These tags' content MUST be a non-whitespace character sequence NOT containing
-  the current closing delimiter; each Parent tag MUST be followed by an End
-  Section tag with the same content within the matching parent tag.
-
-  Block tags are used inside of parent tags to assign data onto the context
-  stack prior to rendering the parent template. Outside of parent tags, block
-  tags are used to indicate where value set in the parent tag should be placed.
-  If no value is set then the content in between the block tags, if any, is
-  rendered.
+  Like partials, Parent tags are used to expand an external template into the
+  current template. Contrary to partials, Parent tags may contain optional
+  arguments delimited by block tags. For this reason, Parent tags may also be
+  referred to as Parametric Partials.
+
+  The Parent tags' content MUST be a non-whitespace character sequence NOT
+  containing the current closing delimiter; each Parent tag MUST be followed by
+  an End Section tag with the same content within the matching Parent tag.
+
+  This tag's content names the Parent template to inject. Set Delimiter tags
+  MUST NOT affect the parsing of a Parent template. The Parent MUST be rendered
+  against the context stack local to the tag. If the named Parent cannot be
+  found, the empty string SHOULD be used instead, as in interpolations.
+
+  Parent tags SHOULD be treated as standalone when appropriate. If this tag is
+  used standalone, any whitespace preceding the tag should be treated as
+  indentation, and prepended to each line of the Parent before rendering.
+
+  The Block tags' content MUST be a non-whitespace character sequence NOT
+  containing the current closing delimiter. Each Block tag MUST be followed by
+  an End Section tag with the same content within the matching Block tag. This
+  tag's content determines the parameter or argument name.
+
+  Block tags may appear both inside and outside of Parent tags. In both cases,
+  they specify a position within the template that can be overridden; it is a
+  parameter of the containing template. The template text between the Block tag
+  and its matching End Section tag defines the default content to render when
+  the parameter is not overridden from outside.
+
+  In addition, when used inside of a Parent tag, the template text between a
+  Block tag and its matching End Section tag defines content that replaces the
+  default defined in the Parent template. This content is the argument passed
+  to the Parent template.
+
+  The practice of injecting an external template using a Parent tag is referred
+  to as inheritance. If the Parent tag includes a Block tag that overrides a
+  parameter of the Parent template, this may also be referred to as
+  substitution.
 tests:
   - name: Default
     desc: Default content should be rendered if the block isn't overridden
-- 
cgit v1.2.1


From c8ad2318a81d0ac5757182d1f8c8617d08259fcc Mon Sep 17 00:00:00 2001
From: Julian Gonggrijp <dev@juliangonggrijp.com>
Date: Mon, 19 Apr 2021 03:22:15 +0200
Subject: Use more consistent terminology in the inheritance specs

---
 specs/~inheritance.json | 72 ++++++++++++++++++++++++-------------------------
 specs/~inheritance.yml  | 72 ++++++++++++++++++++++++-------------------------
 2 files changed, 72 insertions(+), 72 deletions(-)

diff --git a/specs/~inheritance.json b/specs/~inheritance.json
index 2d4539d..88ebd1e 100644
--- a/specs/~inheritance.json
+++ b/specs/~inheritance.json
@@ -61,7 +61,7 @@
     },
     {
       "name": "Inherit",
-      "desc": "Default content rendered inside included templates",
+      "desc": "Default content rendered inside inherited templates",
       "data": {
       },
       "template": "{{<include}}{{/include}}\n",
@@ -83,7 +83,7 @@
     },
     {
       "name": "Data does not override block",
-      "desc": "Provided data does not override data passed into parent",
+      "desc": "Context does not override argument passed into parent",
       "data": {
         "var": "var in data"
       },
@@ -95,7 +95,7 @@
     },
     {
       "name": "Data does not override block default",
-      "desc": "Provided data does not override default value of block",
+      "desc": "Context does not override default content of block",
       "data": {
         "var": "var in data"
       },
@@ -106,68 +106,68 @@
       "expected": "var in include"
     },
     {
-      "name": "Overridden partial",
-      "desc": "Overridden partial",
+      "name": "Overridden parent",
+      "desc": "Overridden parent",
       "data": {
       },
-      "template": "test {{<partial}}{{$stuff}}override{{/stuff}}{{/partial}}",
+      "template": "test {{<parent}}{{$stuff}}override{{/stuff}}{{/parent}}",
       "partials": {
-        "partial": "{{$stuff}}...{{/stuff}}"
+        "parent": "{{$stuff}}...{{/stuff}}"
       },
       "expected": "test override"
     },
     {
-      "name": "Two overridden partials",
-      "desc": "Two overridden partials with different content",
+      "name": "Two overridden parents",
+      "desc": "Two overridden parents with different content",
       "data": {
       },
-      "template": "test {{<partial}}{{$stuff}}override1{{/stuff}}{{/partial}} {{<partial}}{{$stuff}}override2{{/stuff}}{{/partial}}\n",
+      "template": "test {{<parent}}{{$stuff}}override1{{/stuff}}{{/parent}} {{<parent}}{{$stuff}}override2{{/stuff}}{{/parent}}\n",
       "partials": {
-        "partial": "|{{$stuff}}...{{/stuff}}{{$default}} default{{/default}}|"
+        "parent": "|{{$stuff}}...{{/stuff}}{{$default}} default{{/default}}|"
       },
       "expected": "test |override1 default| |override2 default|\n"
     },
     {
-      "name": "Override partial with newlines",
-      "desc": "Override partial with newlines",
+      "name": "Override parent with newlines",
+      "desc": "Override parent with newlines",
       "data": {
       },
-      "template": "{{<partial}}{{$ballmer}}\npeaked\n\n:(\n{{/ballmer}}{{/partial}}",
+      "template": "{{<parent}}{{$ballmer}}\npeaked\n\n:(\n{{/ballmer}}{{/parent}}",
       "partials": {
-        "partial": "{{$ballmer}}peaking{{/ballmer}}"
+        "parent": "{{$ballmer}}peaking{{/ballmer}}"
       },
       "expected": "peaked\n\n:(\n"
     },
     {
       "name": "Inherit indentation",
-      "desc": "Inherit indentation when overriding a partial",
+      "desc": "Inherit indentation when overriding a parent",
       "data": {
       },
-      "template": "{{<partial}}{{$nineties}}hammer time{{/nineties}}{{/partial}}",
+      "template": "{{<parent}}{{$nineties}}hammer time{{/nineties}}{{/parent}}",
       "partials": {
-        "partial": "stop:\n  {{$nineties}}collaborate and listen{{/nineties}}\n"
+        "parent": "stop:\n  {{$nineties}}collaborate and listen{{/nineties}}\n"
       },
       "expected": "stop:\n  hammer time\n"
     },
     {
       "name": "Only one override",
-      "desc": "Override one substitution but not the other",
+      "desc": "Override one parameter but not the other",
       "data": {
       },
-      "template": "{{<partial}}{{$stuff2}}override two{{/stuff2}}{{/partial}}",
+      "template": "{{<parent}}{{$stuff2}}override two{{/stuff2}}{{/parent}}",
       "partials": {
-        "partial": "{{$stuff}}new default one{{/stuff}}, {{$stuff2}}new default two{{/stuff2}}"
+        "parent": "{{$stuff}}new default one{{/stuff}}, {{$stuff2}}new default two{{/stuff2}}"
       },
       "expected": "new default one, override two"
     },
     {
-      "name": "Super template",
-      "desc": "Super templates behave identically to partials when called with no parameters",
+      "name": "Parent template",
+      "desc": "Parent templates behave identically to partials when called with no parameters",
       "data": {
       },
-      "template": "{{>include}}|{{<include}}{{/include}}",
+      "template": "{{>parent}}|{{<parent}}{{/parent}}",
       "partials": {
-        "include": "{{$foo}}default content{{/foo}}"
+        "parent": "{{$foo}}default content{{/foo}}"
       },
       "expected": "default content|default content"
     },
@@ -176,10 +176,10 @@
       "desc": "Recursion in inherited templates",
       "data": {
       },
-      "template": "{{<include}}{{$foo}}override{{/foo}}{{/include}}",
+      "template": "{{<parent}}{{$foo}}override{{/foo}}{{/parent}}",
       "partials": {
-        "include": "{{$foo}}default content{{/foo}} {{$bar}}{{<include2}}{{/include2}}{{/bar}}",
-        "include2": "{{$foo}}include2 default content{{/foo}} {{<include}}{{$bar}}don't recurse{{/bar}}{{/include}}"
+        "parent": "{{$foo}}default content{{/foo}} {{$bar}}{{<parent2}}{{/parent2}}{{/bar}}",
+        "parent2": "{{$foo}}parent2 default content{{/foo}} {{<parent}}{{$bar}}don't recurse{{/bar}}{{/parent}}"
       },
       "expected": "override override override don't recurse"
     },
@@ -210,24 +210,24 @@
       "expected": "p"
     },
     {
-      "name": "Text inside super",
-      "desc": "Ignores text inside super templates, but does parse $ tags",
+      "name": "Text inside parent",
+      "desc": "Ignores text inside parent templates, but does parse $ tags",
       "data": {
       },
-      "template": "{{<include}} asdfasd {{$foo}}hmm{{/foo}} asdfasdfasdf {{/include}}",
+      "template": "{{<parent}} asdfasd {{$foo}}hmm{{/foo}} asdfasdfasdf {{/parent}}",
       "partials": {
-        "include": "{{$foo}}default content{{/foo}}"
+        "parent": "{{$foo}}default content{{/foo}}"
       },
       "expected": "hmm"
     },
     {
-      "name": "Text inside super",
-      "desc": "Allows text inside a super tag, but ignores it",
+      "name": "Text inside parent",
+      "desc": "Allows text inside a parent tag, but ignores it",
       "data": {
       },
-      "template": "{{<include}} asdfasd asdfasdfasdf {{/include}}",
+      "template": "{{<parent}} asdfasd asdfasdfasdf {{/parent}}",
       "partials": {
-        "include": "{{$foo}}default content{{/foo}}"
+        "parent": "{{$foo}}default content{{/foo}}"
       },
       "expected": "default content"
     }
diff --git a/specs/~inheritance.yml b/specs/~inheritance.yml
index 46eb625..c4fb430 100644
--- a/specs/~inheritance.yml
+++ b/specs/~inheritance.yml
@@ -87,7 +87,7 @@ tests:
       default {{qux}} content
 
   - name: Inherit
-    desc: Default content rendered inside included templates
+    desc: Default content rendered inside inherited templates
     data: { }
     template: |
       {{<include}}{{/include}}
@@ -104,7 +104,7 @@ tests:
     expected: "...sub template title..."
 
   - name: Data does not override block
-    desc: Provided data does not override data passed into parent
+    desc: Context does not override argument passed into parent
     data: { var: 'var in data' }
     template: "{{<include}}{{$var}}var in template{{/var}}{{/include}}"
     partials:
@@ -112,45 +112,45 @@ tests:
     expected: "var in template"
 
   - name: Data does not override block default
-    desc: Provided data does not override default value of block
+    desc: Context does not override default content of block
     data: { var: 'var in data' }
     template: "{{<include}}{{/include}}"
     partials:
       include: "{{$var}}var in include{{/var}}"
     expected: "var in include"
 
-  - name: Overridden partial
-    desc: Overridden partial
+  - name: Overridden parent
+    desc: Overridden parent
     data: { }
-    template: "test {{<partial}}{{$stuff}}override{{/stuff}}{{/partial}}"
+    template: "test {{<parent}}{{$stuff}}override{{/stuff}}{{/parent}}"
     partials:
-      partial: "{{$stuff}}...{{/stuff}}"
+      parent: "{{$stuff}}...{{/stuff}}"
     expected: "test override"
 
-  - name: Two overridden partials
-    desc: Two overridden partials with different content
+  - name: Two overridden parents
+    desc: Two overridden parents with different content
     data: { }
     template: |
-      test {{<partial}}{{$stuff}}override1{{/stuff}}{{/partial}} {{<partial}}{{$stuff}}override2{{/stuff}}{{/partial}}
+      test {{<parent}}{{$stuff}}override1{{/stuff}}{{/parent}} {{<parent}}{{$stuff}}override2{{/stuff}}{{/parent}}
     partials:
-      partial: "|{{$stuff}}...{{/stuff}}{{$default}} default{{/default}}|"
+      parent: "|{{$stuff}}...{{/stuff}}{{$default}} default{{/default}}|"
     expected: |
       test |override1 default| |override2 default|
 
-  - name: Override partial with newlines
-    desc: Override partial with newlines
+  - name: Override parent with newlines
+    desc: Override parent with newlines
     data: { }
-    template: "{{<partial}}{{$ballmer}}\npeaked\n\n:(\n{{/ballmer}}{{/partial}}"
+    template: "{{<parent}}{{$ballmer}}\npeaked\n\n:(\n{{/ballmer}}{{/parent}}"
     partials:
-      partial: "{{$ballmer}}peaking{{/ballmer}}"
+      parent: "{{$ballmer}}peaking{{/ballmer}}"
     expected: "peaked\n\n:(\n"
 
   - name: Inherit indentation
-    desc: Inherit indentation when overriding a partial
+    desc: Inherit indentation when overriding a parent
     data: { }
-    template: "{{<partial}}{{$nineties}}hammer time{{/nineties}}{{/partial}}"
+    template: "{{<parent}}{{$nineties}}hammer time{{/nineties}}{{/parent}}"
     partials:
-      partial: |
+      parent: |
         stop:
           {{$nineties}}collaborate and listen{{/nineties}}
     expected: |
@@ -158,28 +158,28 @@ tests:
         hammer time
 
   - name: Only one override
-    desc: Override one substitution but not the other
+    desc: Override one parameter but not the other
     data: { }
-    template: "{{<partial}}{{$stuff2}}override two{{/stuff2}}{{/partial}}"
+    template: "{{<parent}}{{$stuff2}}override two{{/stuff2}}{{/parent}}"
     partials:
-      partial: "{{$stuff}}new default one{{/stuff}}, {{$stuff2}}new default two{{/stuff2}}"
+      parent: "{{$stuff}}new default one{{/stuff}}, {{$stuff2}}new default two{{/stuff2}}"
     expected: "new default one, override two"
 
-  - name: Super template
-    desc: Super templates behave identically to partials when called with no parameters
+  - name: Parent template
+    desc: Parent templates behave identically to partials when called with no parameters
     data: { }
-    template: "{{>include}}|{{<include}}{{/include}}"
+    template: "{{>parent}}|{{<parent}}{{/parent}}"
     partials:
-      include: "{{$foo}}default content{{/foo}}"
+      parent: "{{$foo}}default content{{/foo}}"
     expected: "default content|default content"
 
   - name: Recursion
     desc: Recursion in inherited templates
     data: {}
-    template: "{{<include}}{{$foo}}override{{/foo}}{{/include}}"
+    template: "{{<parent}}{{$foo}}override{{/foo}}{{/parent}}"
     partials:
-      include: "{{$foo}}default content{{/foo}} {{$bar}}{{<include2}}{{/include2}}{{/bar}}"
-      include2: "{{$foo}}include2 default content{{/foo}} {{<include}}{{$bar}}don't recurse{{/bar}}{{/include}}"
+      parent: "{{$foo}}default content{{/foo}} {{$bar}}{{<parent2}}{{/parent2}}{{/bar}}"
+      parent2: "{{$foo}}parent2 default content{{/foo}} {{<parent}}{{$bar}}don't recurse{{/bar}}{{/parent}}"
     expected: "override override override don't recurse"
 
   - name: Multi-level inheritance
@@ -202,19 +202,19 @@ tests:
       grandParent: "{{$a}}g{{/a}}"
     expected: p
 
-  - name: Text inside super
-    desc: Ignores text inside super templates, but does parse $ tags
+  - name: Text inside parent
+    desc: Ignores text inside parent templates, but does parse $ tags
     data: { }
-    template: "{{<include}} asdfasd {{$foo}}hmm{{/foo}} asdfasdfasdf {{/include}}"
+    template: "{{<parent}} asdfasd {{$foo}}hmm{{/foo}} asdfasdfasdf {{/parent}}"
     partials:
-      include: "{{$foo}}default content{{/foo}}"
+      parent: "{{$foo}}default content{{/foo}}"
     expected:
       hmm
 
-  - name: Text inside super
-    desc: Allows text inside a super tag, but ignores it
+  - name: Text inside parent
+    desc: Allows text inside a parent tag, but ignores it
     data: {}
-    template: "{{<include}} asdfasd asdfasdfasdf {{/include}}"
+    template: "{{<parent}} asdfasd asdfasdfasdf {{/parent}}"
     partials:
-      include: "{{$foo}}default content{{/foo}}"
+      parent: "{{$foo}}default content{{/foo}}"
     expected: default content
-- 
cgit v1.2.1


From 81c2f94e59b2b4e51cc39104d11b2ec1c4485f43 Mon Sep 17 00:00:00 2001
From: Julian Gonggrijp <dev@juliangonggrijp.com>
Date: Mon, 19 Apr 2021 03:26:03 +0200
Subject: Clarify the namespaces of Parents and Blocks

---
 specs/~inheritance.json | 2 +-
 specs/~inheritance.yml  | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/specs/~inheritance.json b/specs/~inheritance.json
index 88ebd1e..9453560 100644
--- a/specs/~inheritance.json
+++ b/specs/~inheritance.json
@@ -1,6 +1,6 @@
 {
   "__ATTN__": "Do not edit this file; changes belong in the appropriate YAML file.",
-  "overview": "Like partials, Parent tags are used to expand an external template into the\ncurrent template. Contrary to partials, Parent tags may contain optional\narguments delimited by block tags. For this reason, Parent tags may also be\nreferred to as Parametric Partials.\n\nThe Parent tags' content MUST be a non-whitespace character sequence NOT\ncontaining the current closing delimiter; each Parent tag MUST be followed by\nan End Section tag with the same content within the matching Parent tag.\n\nThis tag's content names the Parent template to inject. Set Delimiter tags\nMUST NOT affect the parsing of a Parent template. The Parent MUST be rendered\nagainst the context stack local to the tag. If the named Parent cannot be\nfound, the empty string SHOULD be used instead, as in interpolations.\n\nParent tags SHOULD be treated as standalone when appropriate. If this tag is\nused standalone, any whitespace preceding the tag should be treated as\nindentation, and prepended to each line of the Parent before rendering.\n\nThe Block tags' content MUST be a non-whitespace character sequence NOT\ncontaining the current closing delimiter. Each Block tag MUST be followed by\nan End Section tag with the same content within the matching Block tag. This\ntag's content determines the parameter or argument name.\n\nBlock tags may appear both inside and outside of Parent tags. In both cases,\nthey specify a position within the template that can be overridden; it is a\nparameter of the containing template. The template text between the Block tag\nand its matching End Section tag defines the default content to render when\nthe parameter is not overridden from outside.\n\nIn addition, when used inside of a Parent tag, the template text between a\nBlock tag and its matching End Section tag defines content that replaces the\ndefault defined in the Parent template. This content is the argument passed\nto the Parent template.\n\nThe practice of injecting an external template using a Parent tag is referred\nto as inheritance. If the Parent tag includes a Block tag that overrides a\nparameter of the Parent template, this may also be referred to as\nsubstitution.\n",
+  "overview": "Like partials, Parent tags are used to expand an external template into the\ncurrent template. Contrary to partials, Parent tags may contain optional\narguments delimited by block tags. For this reason, Parent tags may also be\nreferred to as Parametric Partials.\n\nThe Parent tags' content MUST be a non-whitespace character sequence NOT\ncontaining the current closing delimiter; each Parent tag MUST be followed by\nan End Section tag with the same content within the matching Parent tag.\n\nThis tag's content names the Parent template to inject. Set Delimiter tags\nMUST NOT affect the parsing of a Parent template. The Parent MUST be rendered\nagainst the context stack local to the tag. If the named Parent cannot be\nfound, the empty string SHOULD be used instead, as in interpolations.\n\nParent tags SHOULD be treated as standalone when appropriate. If this tag is\nused standalone, any whitespace preceding the tag should be treated as\nindentation, and prepended to each line of the Parent before rendering.\n\nThe Block tags' content MUST be a non-whitespace character sequence NOT\ncontaining the current closing delimiter. Each Block tag MUST be followed by\nan End Section tag with the same content within the matching Block tag. This\ntag's content determines the parameter or argument name.\n\nBlock tags may appear both inside and outside of Parent tags. In both cases,\nthey specify a position within the template that can be overridden; it is a\nparameter of the containing template. The template text between the Block tag\nand its matching End Section tag defines the default content to render when\nthe parameter is not overridden from outside.\n\nIn addition, when used inside of a Parent tag, the template text between a\nBlock tag and its matching End Section tag defines content that replaces the\ndefault defined in the Parent template. This content is the argument passed\nto the Parent template.\n\nThe practice of injecting an external template using a Parent tag is referred\nto as inheritance. If the Parent tag includes a Block tag that overrides a\nparameter of the Parent template, this may also be referred to as\nsubstitution.\n\nParent templates are taken from the same namespace as regular Partial\ntemplates and in fact, injecting a regular Partial is exactly equivalent to\ninjecting a Parent without making any substitutions. Parameter and arguments\nnames live in a namespace that is distinct from both Partials and the context.\n",
   "tests": [
     {
       "name": "Default",
diff --git a/specs/~inheritance.yml b/specs/~inheritance.yml
index c4fb430..4c60790 100644
--- a/specs/~inheritance.yml
+++ b/specs/~inheritance.yml
@@ -37,6 +37,11 @@ overview: |
   to as inheritance. If the Parent tag includes a Block tag that overrides a
   parameter of the Parent template, this may also be referred to as
   substitution.
+
+  Parent templates are taken from the same namespace as regular Partial
+  templates and in fact, injecting a regular Partial is exactly equivalent to
+  injecting a Parent without making any substitutions. Parameter and arguments
+  names live in a namespace that is distinct from both Partials and the context.
 tests:
   - name: Default
     desc: Default content should be rendered if the block isn't overridden
-- 
cgit v1.2.1


From 4945a323d2135e857bd38dfcce0fc1b800f59d33 Mon Sep 17 00:00:00 2001
From: Julian Gonggrijp <dev@juliangonggrijp.com>
Date: Wed, 21 Apr 2021 13:08:34 +0200
Subject: Process the first three review comments by @bobthecow (#125)

---
 specs/~inheritance.json |  2 +-
 specs/~inheritance.yml  | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/specs/~inheritance.json b/specs/~inheritance.json
index 9453560..fedb34b 100644
--- a/specs/~inheritance.json
+++ b/specs/~inheritance.json
@@ -1,6 +1,6 @@
 {
   "__ATTN__": "Do not edit this file; changes belong in the appropriate YAML file.",
-  "overview": "Like partials, Parent tags are used to expand an external template into the\ncurrent template. Contrary to partials, Parent tags may contain optional\narguments delimited by block tags. For this reason, Parent tags may also be\nreferred to as Parametric Partials.\n\nThe Parent tags' content MUST be a non-whitespace character sequence NOT\ncontaining the current closing delimiter; each Parent tag MUST be followed by\nan End Section tag with the same content within the matching Parent tag.\n\nThis tag's content names the Parent template to inject. Set Delimiter tags\nMUST NOT affect the parsing of a Parent template. The Parent MUST be rendered\nagainst the context stack local to the tag. If the named Parent cannot be\nfound, the empty string SHOULD be used instead, as in interpolations.\n\nParent tags SHOULD be treated as standalone when appropriate. If this tag is\nused standalone, any whitespace preceding the tag should be treated as\nindentation, and prepended to each line of the Parent before rendering.\n\nThe Block tags' content MUST be a non-whitespace character sequence NOT\ncontaining the current closing delimiter. Each Block tag MUST be followed by\nan End Section tag with the same content within the matching Block tag. This\ntag's content determines the parameter or argument name.\n\nBlock tags may appear both inside and outside of Parent tags. In both cases,\nthey specify a position within the template that can be overridden; it is a\nparameter of the containing template. The template text between the Block tag\nand its matching End Section tag defines the default content to render when\nthe parameter is not overridden from outside.\n\nIn addition, when used inside of a Parent tag, the template text between a\nBlock tag and its matching End Section tag defines content that replaces the\ndefault defined in the Parent template. This content is the argument passed\nto the Parent template.\n\nThe practice of injecting an external template using a Parent tag is referred\nto as inheritance. If the Parent tag includes a Block tag that overrides a\nparameter of the Parent template, this may also be referred to as\nsubstitution.\n\nParent templates are taken from the same namespace as regular Partial\ntemplates and in fact, injecting a regular Partial is exactly equivalent to\ninjecting a Parent without making any substitutions. Parameter and arguments\nnames live in a namespace that is distinct from both Partials and the context.\n",
+  "overview": "Like partials, Parent tags are used to expand an external template into the\ncurrent template. Unlike partials, Parent tags may contain optional\narguments delimited by Block tags. For this reason, Parent tags may also be\nreferred to as Parametric Partials.\n\nThe Parent tags' content MUST be a non-whitespace character sequence NOT\ncontaining the current closing delimiter; each Parent tag MUST be followed by\nan End Section tag with the same content within the matching Parent tag.\n\nThis tag's content names the Parent template to inject. Set Delimiter tags\nPreceding a Parent tag MUST NOT affect the parsing of the injected external\ntemplate. The Parent MUST be rendered against the context stack local to the\ntag. If the named Parent cannot be found, the empty string SHOULD be used\ninstead, as in interpolations.\n\nParent tags SHOULD be treated as standalone when appropriate. If this tag is\nused standalone, any whitespace preceding the tag should be treated as\nindentation, and prepended to each line of the Parent before rendering.\n\nThe Block tags' content MUST be a non-whitespace character sequence NOT\ncontaining the current closing delimiter. Each Block tag MUST be followed by\nan End Section tag with the same content within the matching Block tag. This\ntag's content determines the parameter or argument name.\n\nBlock tags may appear both inside and outside of Parent tags. In both cases,\nthey specify a position within the template that can be overridden; it is a\nparameter of the containing template. The template text between the Block tag\nand its matching End Section tag defines the default content to render when\nthe parameter is not overridden from outside.\n\nIn addition, when used inside of a Parent tag, the template text between a\nBlock tag and its matching End Section tag defines content that replaces the\ndefault defined in the Parent template. This content is the argument passed\nto the Parent template.\n\nThe practice of injecting an external template using a Parent tag is referred\nto as inheritance. If the Parent tag includes a Block tag that overrides a\nparameter of the Parent template, this may also be referred to as\nsubstitution.\n\nParent templates are taken from the same namespace as regular Partial\ntemplates and in fact, injecting a regular Partial is exactly equivalent to\ninjecting a Parent without making any substitutions. Parameter and arguments\nnames live in a namespace that is distinct from both Partials and the context.\n",
   "tests": [
     {
       "name": "Default",
diff --git a/specs/~inheritance.yml b/specs/~inheritance.yml
index 4c60790..07fa081 100644
--- a/specs/~inheritance.yml
+++ b/specs/~inheritance.yml
@@ -1,7 +1,7 @@
 overview: |
   Like partials, Parent tags are used to expand an external template into the
-  current template. Contrary to partials, Parent tags may contain optional
-  arguments delimited by block tags. For this reason, Parent tags may also be
+  current template. Unlike partials, Parent tags may contain optional
+  arguments delimited by Block tags. For this reason, Parent tags may also be
   referred to as Parametric Partials.
 
   The Parent tags' content MUST be a non-whitespace character sequence NOT
@@ -9,9 +9,10 @@ overview: |
   an End Section tag with the same content within the matching Parent tag.
 
   This tag's content names the Parent template to inject. Set Delimiter tags
-  MUST NOT affect the parsing of a Parent template. The Parent MUST be rendered
-  against the context stack local to the tag. If the named Parent cannot be
-  found, the empty string SHOULD be used instead, as in interpolations.
+  Preceding a Parent tag MUST NOT affect the parsing of the injected external
+  template. The Parent MUST be rendered against the context stack local to the
+  tag. If the named Parent cannot be found, the empty string SHOULD be used
+  instead, as in interpolations.
 
   Parent tags SHOULD be treated as standalone when appropriate. If this tag is
   used standalone, any whitespace preceding the tag should be treated as
-- 
cgit v1.2.1