tiddlywiki 5.1.23 → 5.2.2

package/editions/test/tiddlers/tests/test-wikitext-parser.js

@@ -25,82 +25,88 @@ describe("WikiText parser tests", function() {
 	it("should parse tags", function() {
 		expect(parse("<br>")).toEqual(
 
-			[ { type : 'element', tag : 'p', children : [ { type : 'element', tag : 'br', isBlock : false, attributes : {  }, start : 0, end : 4 } ] } ]
+			[ { type : 'element', tag : 'p', start : 0, end : 4, children : [ { type : 'element', tag : 'br', start : 0, end : 4, isBlock : false, attributes : {  }, orderedAttributes: [ ] } ] } ]
 
 		);
 		expect(parse("</br>")).toEqual(
 
-			[ { type : 'element', tag : 'p', children : [ { type : 'text', text : '</br>' } ] } ]
+			[ { type : 'element', tag : 'p', start : 0, end : 5, children : [ { type : 'text', text : '</br>', start : 0, end : 5 } ] } ]
 
 		);
 		expect(parse("<div>")).toEqual(
 
-			[ { type : 'element', tag : 'p', children : [ { type : 'element', tag : 'div', isBlock : false, attributes : {  }, children : [  ], start : 0, end : 5 } ] } ]
+			[ { type : 'element', tag : 'p', start : 0, end : 5, children : [ { type : 'element', tag : 'div', start : 0, end : 5, isBlock : false, attributes : {  }, orderedAttributes: [ ], children : [  ] } ] } ]
 
 		);
 		expect(parse("<div/>")).toEqual(
 
-			[ { type : 'element', tag : 'p', children : [ { type : 'element', tag : 'div', isSelfClosing : true, isBlock : false, attributes : {  }, start : 0, end : 6 } ] } ]
+			[ { type : 'element', tag : 'p', start : 0, end : 6, children : [ { type : 'element', tag : 'div', isSelfClosing : true, isBlock : false, attributes : {  }, orderedAttributes: [ ], start : 0, end : 6 } ] } ]
 
 		);
 		expect(parse("<div></div>")).toEqual(
 
-			[ { type : 'element', tag : 'p', children : [ { type : 'element', tag : 'div', isBlock : false, attributes : {  }, children : [ ], start : 0, end : 5 } ] } ]
+			[ { type : 'element', tag : 'p', start : 0, end : 11, children : [ { type : 'element', tag : 'div', isBlock : false, attributes : {  }, orderedAttributes: [ ], children : [ ], start : 0, end : 5 } ] } ]
 
 		);
 		expect(parse("<div>some text</div>")).toEqual(
 
-			[ { type : 'element', tag : 'p', children : [ { type : 'element', tag : 'div', isBlock : false, attributes : {  }, children : [ { type : 'text', text : 'some text' } ], start : 0, end : 5 } ] } ]
+			[ { type : 'element', tag : 'p', start : 0, end : 20, children : [ { type : 'element', tag : 'div', start : 0, end : 20, isBlock : false, attributes : {  }, orderedAttributes: [ ], children : [ { type : 'text', text : 'some text', start : 5, end : 14 } ], start : 0, end : 5 } ] } ]
 
 		);
 		expect(parse("<div attribute>some text</div>")).toEqual(
 
-			[ { type : 'element', tag : 'p', children : [ { type : 'element', tag : 'div', isBlock : false, attributes : { attribute : { type : 'string', value : 'true', start : 4, end : 14, name: 'attribute' } }, children : [ { type : 'text', text : 'some text' } ], start : 0, end : 15 } ] } ]
+			[ { type : 'element', tag : 'p', start : 0, end : 30, children : [ { type : 'element', tag : 'div', isBlock : false, attributes : { attribute : { type : 'string', value : 'true', start : 4, end : 14, name: 'attribute' } }, orderedAttributes: [ { type : 'string', value : 'true', start : 4, end : 14, name: 'attribute' } ], children : [ { type : 'text', text : 'some text', start : 15, end : 24 } ], start : 0, end : 15 } ] } ]
 
 		);
 		expect(parse("<div attribute='value'>some text</div>")).toEqual(
 
-			[ { type : 'element', tag : 'p', children : [ { type : 'element', tag : 'div', isBlock : false, attributes : { attribute : { type : 'string', name: 'attribute', value : 'value', start: 4, end: 22 } }, children : [ { type : 'text', text : 'some text' } ], start: 0, end: 23 } ] } ]
+			[ { type : 'element', tag : 'p', start : 0, end : 38, children : [ { type : 'element', tag : 'div', start: 0, end: 38, isBlock : false, attributes : { attribute : { type : 'string', name: 'attribute', value : 'value', start: 4, end: 22 } }, orderedAttributes: [ { type: 'string', name: 'attribute', value : 'value', start: 4, end: 22 } ], children : [ { type : 'text', text : 'some text', start : 23, end : 32 } ], start : 0, end : 23 } ] } ]
 
 		);
 		expect(parse("<div attribute={{TiddlerTitle}}>some text</div>")).toEqual(
 
-			[ { type : 'element', tag : 'p', children : [ { type : 'element', tag : 'div', isBlock : false, attributes : { attribute : { type : 'indirect', name: 'attribute', textReference : 'TiddlerTitle', start : 4, end : 31 } }, children : [ { type : 'text', text : 'some text' } ], start : 0, end : 32 } ] } ]
+			[ { type : 'element', tag : 'p', start: 0, end: 47, children : [ { type : 'element', tag : 'div', isBlock : false, attributes : { attribute : { type : 'indirect', name: 'attribute', textReference : 'TiddlerTitle', start : 4, end : 31 } }, orderedAttributes: [ { type : 'indirect', name: 'attribute', textReference : 'TiddlerTitle', start : 4, end : 31 } ], children : [ { type : 'text', text : 'some text', start : 32, end : 41 } ], start : 0, end : 32 } ] } ]
 
 		);
 		expect(parse("<$reveal state='$:/temp/search' type='nomatch' text=''>")).toEqual(
 
-			[ { type : 'element', tag : 'p', children : [ { type : 'reveal', tag: '$reveal', start : 0, attributes : { state : { start : 8, name : 'state', type : 'string', value : '$:/temp/search', end : 31 }, type : { start : 31, name : 'type', type : 'string', value : 'nomatch', end : 46 }, text : { start : 46, name : 'text', type : 'string', value : '', end : 54 } }, end : 55, isBlock : false, children : [  ] } ] } ]
+			[ { type : 'element', tag : 'p', start: 0, end: 55, children : [ { type : 'reveal', tag: '$reveal', start : 0, attributes : { state : { start : 8, name : 'state', type : 'string', value : '$:/temp/search', end : 31 }, type : { start : 31, name : 'type', type : 'string', value : 'nomatch', end : 46 }, text : { start : 46, name : 'text', type : 'string', value : '', end : 54 } }, orderedAttributes: [ { start : 8, name : 'state', type : 'string', value : '$:/temp/search', end : 31 }, { start : 31, name : 'type', type : 'string', value : 'nomatch', end : 46 }, { start : 46, name : 'text', type : 'string', value : '', end : 54 } ], end : 55, isBlock : false, children : [  ] } ] } ]
 
 		);
 		expect(parse("<div attribute={{TiddlerTitle!!field}}>some text</div>")).toEqual(
 
-			[ { type : 'element', tag : 'p', children : [ { type : 'element', tag : 'div', isBlock : false, attributes : { attribute : { type : 'indirect', name : 'attribute', textReference : 'TiddlerTitle!!field', start : 4, end : 38 } }, children : [ { type : 'text', text : 'some text' } ], start : 0, end : 39 } ] } ]
+			[ { type : 'element', tag : 'p', start: 0, end: 54, children : [ { type : 'element', tag : 'div', isBlock : false, attributes : { attribute : { type : 'indirect', name : 'attribute', textReference : 'TiddlerTitle!!field', start : 4, end : 38 } }, orderedAttributes: [ { type : 'indirect', name : 'attribute', textReference : 'TiddlerTitle!!field', start : 4, end : 38 } ], children : [ { type : 'text', text : 'some text', start : 39, end : 48 } ], start : 0, end : 39 } ] } ]
 
 		);
 		expect(parse("<div attribute={{Tiddler Title!!field}}>some text</div>")).toEqual(
 
-			[ { type : 'element', tag : 'p', children : [ { type : 'element', tag : 'div', isBlock : false, attributes : { attribute : { type : 'indirect', name : 'attribute', textReference : 'Tiddler Title!!field', start : 4, end : 39 } }, children : [ { type : 'text', text : 'some text' } ], start : 0, end : 40 } ] } ]
+			[ { type : 'element', tag : 'p', start: 0, end: 55, children : [ { type : 'element', tag : 'div', isBlock : false, attributes : { attribute : { type : 'indirect', name : 'attribute', textReference : 'Tiddler Title!!field', start : 4, end : 39 } }, orderedAttributes: [ { type : 'indirect', name : 'attribute', textReference : 'Tiddler Title!!field', start : 4, end : 39 } ], children : [ { type : 'text', text : 'some text', start : 40, end : 49 } ], start : 0, end : 40 } ] } ]
 
 		);
 		expect(parse("<div attribute={{TiddlerTitle!!field}}>\n\nsome text</div>")).toEqual(
 
-			[ { type : 'element', start : 0, attributes : { attribute : { start : 4, name : 'attribute', type : 'indirect', textReference : 'TiddlerTitle!!field', end : 38 } }, tag : 'div', end : 39, isBlock : true, children : [ { type : 'element', tag : 'p', children : [ { type : 'text', text : 'some text' } ] } ] } ]
+			[ { type : 'element', start : 0, attributes : { attribute : { start : 4, name : 'attribute', type : 'indirect', textReference : 'TiddlerTitle!!field', end : 38 } }, orderedAttributes: [ { start : 4, name : 'attribute', type : 'indirect', textReference : 'TiddlerTitle!!field', end : 38 } ], tag : 'div', end : 39, isBlock : true, children : [ { type : 'element', tag : 'p', start : 41, end : 50, children : [ { type : 'text', text : 'some text', start : 41, end : 50 } ] } ] } ]
 
 		);
 		expect(parse("<div><div attribute={{TiddlerTitle!!field}}>\n\nsome text</div></div>")).toEqual(
 
-			[ { type : 'element', tag : 'p', children : [ { type : 'element', start : 0, attributes : {  }, tag : 'div', end : 5, isBlock : false, children : [ { type : 'element', start : 5, attributes : { attribute : { start : 9, name : 'attribute', type : 'indirect', textReference : 'TiddlerTitle!!field', end : 43 } }, tag : 'div', end : 44, isBlock : true, children : [ { type : 'element', tag : 'p', children : [ { type : 'text', text : 'some text' } ] } ] } ] } ] } ]
+			[ { type : 'element', tag : 'p', start: 0, end: 67, children : [ { type : 'element', start : 0, attributes : {  }, orderedAttributes: [ ], tag : 'div', end : 5, isBlock : false, children : [ { type : 'element', start : 5, attributes : { attribute : { start : 9, name : 'attribute', type : 'indirect', textReference : 'TiddlerTitle!!field', end : 43 } }, orderedAttributes: [ { start : 9, name : 'attribute', type : 'indirect', textReference : 'TiddlerTitle!!field', end : 43 } ], tag : 'div', end : 44, isBlock : true, children : [ { type : 'element', tag : 'p', start : 46, end : 55, children : [ { type : 'text', text : 'some text', start : 46, end : 55 } ] } ] } ] } ] } ]
 
 		);
 		expect(parse("<div><div attribute={{TiddlerTitle!!field}}>\n\n!some heading</div></div>")).toEqual(
 
-			[ { type : 'element', tag : 'p', children : [ { type : 'element', start : 0, attributes : {  }, tag : 'div', end : 5, isBlock : false, children : [ { type : 'element', start : 5, attributes : { attribute : { start : 9, name : 'attribute', type : 'indirect', textReference : 'TiddlerTitle!!field', end : 43 } }, tag : 'div', end : 44, isBlock : true, children : [ { type : 'element', tag : 'h1', attributes : { class : { type : 'string', value : '' } }, children : [ { type : 'text', text : 'some heading</div></div>' } ] } ] } ] } ] } ]
+			[ { type : 'element', tag : 'p', start: 0, end: 71, children : [ { type : 'element', start : 0, attributes : {  }, orderedAttributes: [ ], tag : 'div', end : 5, isBlock : false, children : [ { type : 'element', start : 5, attributes : { attribute : { start : 9, name : 'attribute', type : 'indirect', textReference : 'TiddlerTitle!!field', end : 43 } }, orderedAttributes: [ { start : 9, name : 'attribute', type : 'indirect', textReference : 'TiddlerTitle!!field', end : 43 } ], tag : 'div', end : 44, isBlock : true, children : [ { type : 'element', tag : 'h1', attributes : { class : { type : 'string', value : '' } }, children : [ { type : 'text', text : 'some heading</div></div>', start : 47, end : 71 } ] } ] } ] } ] } ]
 
 		);
 		expect(parse("<div><div attribute={{TiddlerTitle!!field}}>\n!some heading</div></div>")).toEqual(
 
-			[ { type : 'element', tag : 'p', children : [ { type : 'element', start : 0, attributes : {  }, tag : 'div', end : 5, isBlock : false, children : [ { type : 'element', start : 5, attributes : { attribute : { start : 9, name : 'attribute', type : 'indirect', textReference : 'TiddlerTitle!!field', end : 43 } }, tag : 'div', end : 44, isBlock : false, children : [ { type : 'text', text : '\n!some heading' } ] } ] } ] } ]
+			[ { type : 'element', tag : 'p', start: 0, end: 70, children : [ { type : 'element', start : 0, attributes : {  }, orderedAttributes: [ ], tag : 'div', end : 5, isBlock : false, children : [ { type : 'element', start : 5, attributes : { attribute : { start : 9, name : 'attribute', type : 'indirect', textReference : 'TiddlerTitle!!field', end : 43 } }, orderedAttributes: [ { start : 9, name : 'attribute', type : 'indirect', textReference : 'TiddlerTitle!!field', end : 43 } ], tag : 'div', end : 44, isBlock : false, children : [ { type : 'text', text : '\n!some heading', start : 44, end : 58 } ] } ] } ] } ]
+
+		);
+		// Regression test for issue (#3306)
+		expect(parse("<div><span><span>\n\nSome text</span></span></div>")).toEqual(
+
+			[ { type : 'element', tag : 'p', start: 0, end: 48, children : [ { type : 'element', start : 0, attributes : {  }, orderedAttributes: [ ], tag : 'div', end : 5, isBlock : false, children : [ { type : 'element', start : 5, attributes : {  }, orderedAttributes: [ ], tag : 'span', end : 11, isBlock : false, children : [ { type : 'element', start : 11, attributes : {  }, orderedAttributes: [ ], tag : 'span', end : 17, isBlock : true, children : [ { type : 'element', tag : 'p', start : 19, end : 28, children : [ { type : 'text', text : 'Some text', start : 19, end : 28 } ] } ] } ] } ] } ] } ]
 
 		);
 	});
@@ -111,13 +117,127 @@ describe("WikiText parser tests", function() {
 			[ { type : 'set', attributes : { name : { type : 'string', value : 'myMacro' }, value : { type : 'string', value : 'nothing' } }, children : [  ], params : [  ], isMacroDefinition : true } ]
 
 		);
+	});
+
+	it("should parse comment in pragma area. Comment will be invisible", function() {
+		expect(parse("<!-- comment in pragma area -->\n\\define aMacro()\nnothing\n\\end\n")).toEqual(
+
+			[ { type : 'set', attributes : { name : { type : 'string', value : 'aMacro' }, value : { type : 'string', value : 'nothing' } }, children : [  ], params : [  ], isMacroDefinition : true } ]
+
+		);
+	});
+
+	it("should block mode filtered transclusions", function() {
+		expect(parse("{{{ filter }}}")).toEqual(
+
+			[ { type: 'list', attributes: { filter: { type: 'string', value: ' filter ' } }, isBlock: true } ]
+
+		);
+		expect(parse("{{{ fil\nter }}}")).toEqual(
+
+			[ { type: 'list', attributes: { filter: { type: 'string', value: ' fil\nter ' } }, isBlock: true } ]
 
+		);
 	});
 
-	it("should parse macro calls", function() {
+	it("should parse inline macro calls", function() {
 		expect(parse("<<john>><<paul>><<george>><<ringo>>")).toEqual(
 
-			[ { type : 'element', tag : 'p', children : [ { type : 'macrocall', name : 'john', params : [  ] }, { type : 'macrocall', name : 'paul', params : [  ] }, { type : 'macrocall', name : 'george', params : [  ] }, { type : 'macrocall', name : 'ringo', params : [  ] } ] } ]
+			[ { type: 'element', tag: 'p', start: 0, end: 35, children: [ { type: 'macrocall', start: 0, params: [  ], name: 'john', end: 8 }, { type: 'macrocall', start: 8, params: [  ], name: 'paul', end: 16 }, { type: 'macrocall', start: 16, params: [  ], name: 'george', end: 26 }, { type: 'macrocall', start: 26, params: [  ], name: 'ringo', end: 35 } ] } ]
+
+		);
+		expect(parse("text <<john one:val1 two: 'val \"2\"' three: \"val '3'\" four: \"\"\"val 4\"5'\"\"\" five: [[val 5]] >>")).toEqual(
+
+			[{ type: 'element', tag: 'p', start: 0, end: 92, children: [ { type: 'text', text: 'text ', start: 0, end: 5 }, { type: 'macrocall', name: 'john', start: 5, params: [ { type: 'macro-parameter', start: 11, value: 'val1', name: 'one', end: 20 }, { type: 'macro-parameter', start: 20, value: 'val "2"', name: 'two', end: 35 }, { type: 'macro-parameter', start: 35, value: 'val \'3\'', name: 'three', end: 52 }, { type: 'macro-parameter', start: 52, value: 'val 4"5\'', name: 'four', end: 73 }, { type: 'macro-parameter', start: 73, value: 'val 5', name: 'five', end: 89 } ], end: 92 } ] } ]
+
+		);
+		expect(parse("ignored << carrots <<john>>")).toEqual(
+
+			[ { type: 'element', tag: 'p', start: 0, end: 27, children: [ { type: 'text', text: 'ignored << carrots ', start: 0, end: 19 }, { type: 'macrocall', name: 'john', start: 19, params: [  ], end: 27 } ] } ]
+
+		);
+		expect(parse("text <<<john>>")).toEqual(
+
+			[ { type: 'element', tag: 'p', start: 0, end: 14, children: [ { type: 'text', text: 'text ', start: 0, end: 5 }, { type: 'macrocall', name: '<john', start: 5, params: [  ], end: 14 } ] } ]
+
+		);
+		expect(parse("before\n<<john>>")).toEqual(
+
+			[ { type: 'element', tag: 'p', start: 0, end: 15, children: [ { type: 'text', text: 'before\n', start: 0, end: 7 }, { type: 'macrocall', start: 7, params: [  ], name: 'john', end: 15 } ] } ]
+
+		);
+		// A single space will cause it to be inline
+		expect(parse("<<john>> ")).toEqual(
+
+			[ { type: 'element', tag: 'p', start: 0, end: 9, children: [ { type: 'macrocall', start: 0, params: [  ], name: 'john', end: 8 }, { type: 'text', text: ' ', start: 8, end: 9 } ] } ]
+
+		);
+		expect(parse("text <<outie one:'my <<innie>>' >>")).toEqual(
+
+			[ { type: 'element', tag: 'p', start: 0, end: 34, children: [ { type: 'text', text: 'text ', start: 0, end: 5 }, { type: 'macrocall', start: 5, params: [ { type: 'macro-parameter', start: 12, value: 'my <<innie>>', name: 'one', end: 31 } ], name: 'outie', end: 34 } ] } ]
+
+		);
+
+	});
+
+	it("should parse block macro calls", function() {
+		expect(parse("<<john>>\n<<paul>>\r\n<<george>>\n<<ringo>>")).toEqual(
+
+			[ { type: 'macrocall', start: 0, name: 'john', params: [  ], end: 8, isBlock: true }, { type: 'macrocall', start: 9, name: 'paul', params: [  ], end: 17, isBlock: true }, { type: 'macrocall', start: 19, name: 'george', params: [  ], end: 29, isBlock: true }, { type: 'macrocall', start: 30, name: 'ringo', params: [  ], end: 39, isBlock: true } ]
+
+		);
+		expect(parse("<<john one:val1 two: 'val \"2\"' three: \"val '3'\" four: \"\"\"val 4\"5'\"\"\" five: [[val 5]] >>")).toEqual(
+
+			[ { type: 'macrocall', start: 0, name: 'john', params: [ { type: 'macro-parameter', start: 6, value: 'val1', name: 'one', end: 15 }, { type: 'macro-parameter', start: 15, value: 'val "2"', name: 'two', end: 30 }, { type: 'macro-parameter', start: 30, value: 'val \'3\'', name: 'three', end: 47 }, { type: 'macro-parameter', start: 47, value: 'val 4"5\'', name: 'four', end: 68 }, { type: 'macro-parameter', start: 68, value: 'val 5', name: 'five', end: 84 }], end: 87, isBlock: true } ]
+
+		);
+		expect(parse("<< carrots\n\n<<john>>")).toEqual(
+
+			[ { type: 'element', tag: 'p', start : 0, end : 10, children: [ { type: 'text', text: '<< carrots', start : 0, end : 10 } ] }, { type: 'macrocall', start: 12, params: [  ], name: 'john', end: 20, isBlock: true } ]
+
+		);
+		expect(parse("before\n\n<<john>>")).toEqual(
+
+			[ { type: 'element', tag: 'p', start : 0, end : 6, children: [ { type: 'text', text: 'before', start : 0, end : 6 } ] }, { type: 'macrocall', start: 8, name: 'john', params: [  ], end: 16, isBlock: true } ]
+
+		);
+		expect(parse("<<john>>\nafter")).toEqual(
+
+			[ { type: 'macrocall', start: 0, name: 'john', params: [  ], end: 8, isBlock: true }, { type: 'element', tag: 'p', start: 9, end: 14, children: [ { type: 'text', text: 'after', start: 9, end: 14 } ] } ]
+
+		);
+		expect(parse("<<multiline arg:\"\"\"\n\nwikitext\n\"\"\" >>")).toEqual(
+
+			[ { type: 'macrocall', start: 0, params: [ { type: 'macro-parameter', start: 11, value: '\n\nwikitext\n', name: 'arg', end: 33 } ], name: 'multiline', end: 36, isBlock: true }]
+
+		);
+		expect(parse("<<outie one:'my <<innie>>' >>")).toEqual(
+
+			[ { type: 'macrocall', start: 0, params: [ { type: 'macro-parameter', start: 7, value: 'my <<innie>>', name: 'one', end: 26 } ], name: 'outie', end: 29, isBlock: true } ]
+
+		);
+	});
+
+	it("should parse tricky macrocall parameters", function() {
+		expect(parse("<<john pa>am>>")).toEqual(
+
+			[ { type: 'macrocall', start: 0, params: [ { type: 'macro-parameter', start: 6, value: 'pa>am', end: 12 } ], name: 'john', end: 14, isBlock: true } ]
+
+		);
+		expect(parse("<<john param> >>")).toEqual(
+
+			[ { type: 'macrocall', start: 0, params: [ { type: 'macro-parameter', start: 6, value: 'param>', end: 13 } ], name: 'john', end: 16, isBlock: true } ]
+
+		);
+		expect(parse("<<john param>>>")).toEqual(
+
+			[ { type: 'element', tag: 'p', start: 0, end: 15, children: [ { type: 'macrocall', start: 0, params: [ { type: 'macro-parameter', start: 6, value: 'param', end: 12 } ], name: 'john', end: 14 }, { type: 'text', text: '>', start: 14, end: 15 } ] } ]
+
+		);
+		// equals signs should be allowed
+		expect(parse("<<john var>=4 >>")).toEqual(
+
+			[ { type: 'macrocall', start: 0, params: [ { type: 'macro-parameter', start: 6, value: 'var>=4', end: 13 } ], name: 'john', end: 16, isBlock: true } ]
 
 		);
 
@@ -126,7 +246,7 @@ describe("WikiText parser tests", function() {
 	it("should parse horizontal rules", function() {
 		expect(parse("---Not a rule\n\n----\n\nBetween\n\n---")).toEqual(
 
-			[ { type : 'element', tag : 'p', children : [ { type : 'entity', entity : '&mdash;' }, { type : 'text', text : 'Not a rule' } ] }, { type : 'element', tag : 'hr' }, { type : 'element', tag : 'p', children : [ { type : 'text', text : 'Between' } ] }, { type : 'element', tag : 'hr' } ]
+			[ { type : 'element', tag : 'p', start : 0, end : 13, children : [ { type : 'entity', entity : '&mdash;' }, { type : 'text', text : 'Not a rule', start : 3, end : 13 } ] }, { type : 'element', tag : 'hr' }, { type : 'element', tag : 'p', start : 21, end : 28, children : [ { type : 'text', text : 'Between', start : 21, end : 28 } ] }, { type : 'element', tag : 'hr' } ]
 
 		);
 
@@ -135,7 +255,7 @@ describe("WikiText parser tests", function() {
 	it("should parse hard linebreak areas", function() {
 		expect(parse("\"\"\"Something\nin the\nway she moves\n\"\"\"\n\n")).toEqual(
 
-			[ { type : 'element', tag : 'p', children : [ { type : 'text', text : 'Something' }, { type : 'element', tag : 'br' }, { type : 'text', text : 'in the' }, { type : 'element', tag : 'br' }, { type : 'text', text : 'way she moves' }, { type : 'element', tag : 'br' } ] } ]
+			[ { type : 'element', tag : 'p', children : [ { type : 'text', text : 'Something', start : 3, end : 12 }, { type : 'element', tag : 'br' }, { type : 'text', text : 'in the', start : 13, end : 19 }, { type : 'element', tag : 'br' }, { type : 'text', text : 'way she moves', start : 20, end : 33 }, { type : 'element', tag : 'br' } ], start : 0, end : 37 } ]
 
 		);
 

package/editions/test/tiddlers/tests/test-wikitext-tabs-macro.js

@@ -0,0 +1,86 @@
+/*\
+title: test-wikitext-tabs-macro.js
+type: application/javascript
+tags: [[$:/tags/test-spec]]
+
+Tests the core tabs macro by comparing the HTML output with a stored template.
+Intended to permit future readability improvements.
+
+Adding new functionality will probably change the "expected" html structure.
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+describe("Tabs-macro HTML tests", function() {
+
+	var expected     = $tw.wiki.getTiddler("expected-html-tabs-horizontal"),
+		expectedAll  = $tw.wiki.getTiddler("expected-html-tabs-horizontal-all"),
+		expectedVert = $tw.wiki.getTiddler("expected-html-tabs-vertical"),
+		coreTabsTiddler = $tw.wiki.getTiddler("$:/core/macros/tabs");
+
+	// Create a wiki
+	var wiki = new $tw.Wiki();
+
+	// Add a couple of tiddlers
+	wiki.addTiddler({title: "TabOne",   text: "Text tab 1", caption:"t 1"});
+	wiki.addTiddler({title: "TabTwo",   text: "Text tab 2", caption:"t 2"});
+	// TabThree shows description used in button-template instead of caption
+	wiki.addTiddler({title: "TabThree", text: "Text tab 3", caption:"t 3", description:"desc"});
+	// Tab Four has no caption field, so title will be used
+	wiki.addTiddler({title: "TabFour",  text: "Text tab 4"}); 
+
+	// Template tiddlers
+	wiki.addTiddler({	title: "body-template",
+						text: '!! <<currentTab>>\n\n<$transclude tiddler=<<currentTab>> mode="block"/>'});
+	wiki.addTiddler({	title: "button-template",
+						text: '<$transclude tiddler=<<currentTab>> field="description"><$transclude tiddler=<<currentTab>> field="caption"><$macrocall $name="currentTab" $type="text/plain" $output="text/plain"/></$transclude></$transclude>'});
+	// tabs macro cloned, to be used with \\import
+	wiki.addTiddler({title: "tabs-macro-definition",  text: coreTabsTiddler.fields.text});
+
+	// horizontal tabs test uses `tabsList`, `default` and `state` -- unnamed params
+	wiki.addTiddler({title: "test-tabs-macro-horizontal",  text: '\\import [[tabs-macro-definition]]\n<<tabs "TabOne TabTwo TabThree TabFour" "TabTwo" "$:/state/test-tab-01">>'});
+
+	// horizontal tabs test adds `template`, `buttonTemplate` and `explicitState` as named params
+	wiki.addTiddler({title: "test-tabs-macro-horizontal-all",  text: '\\import [[tabs-macro-definition]]\n<<tabs "TabOne TabTwo TabThree TabFour" "TabTwo" "$:/state/test-tab-01" template:"body-template" buttonTemplate:"button-template" explicitState:"$:/state/explicit">>'});
+
+	// vertical tabs test. Same params as test 1
+	wiki.addTiddler({title: "test-tabs-macro-vertical",  text: '\\import [[tabs-macro-definition]]\n<<tabs "TabOne TabTwo TabThree TabFour" "TabTwo" "$:/state/test-tab-02" "tc-vertical">>'});
+
+	/* -----------------
+	/ Run the tests
+	--------------------*/
+	// horizontal
+	it("should render horizontal tabs v5.2.1", function() {
+		expect(wiki.renderTiddler("text/html","test-tabs-macro-horizontal")).toBe(expected.fields.text);
+	});
+
+	it("should render horizontal tabs macro with all parameters modified V5.2.1", function() {
+		expect(wiki.renderTiddler("text/html","test-tabs-macro-horizontal-all")).toBe(expectedAll.fields.text);
+	});
+
+	// vertical
+	it("should render tabs vertical tabs v5.2.1", function() {
+		expect(wiki.renderTiddler("text/html","test-tabs-macro-vertical")).toBe(expectedVert.fields.text);
+	});
+
+	// Future tests
+	// horizontal
+	xit("should render 'horizontal' tabs from v5.2.2 and up with whitespace trim", function() {
+		expect(wiki.renderTiddler("text/html","test-tabs-macro-horizontal")).toBe(expected.fields.text.replace(/\n/g,""));
+	});
+
+	xit("should render 'horizontal' tabs from v5.2.2 and up with whitespace trim", function() {
+		expect(wiki.renderTiddler("text/html","test-tabs-macro-horizontal-all")).toBe(expectedAll.fields.text.replace(/\n/g,""));
+	});
+
+	// vertical
+	xit("should render 'vertical' tabs from v5.2.2 and up with whitespace trim", function() {
+		expect(wiki.renderTiddler("text/html","test-tabs-macro-vertical")).toBe(expectedVert.fields.text.replace(/\n/g,""));
+	});
+});
+
+})();

package/editions/tw.org/tiddlers/$__DefaultTiddlers.tid

@@ -0,0 +1,6 @@
+created: 20220318102404333
+modified: 20220318102424312
+title: $:/DefaultTiddlers
+type: text/vnd.tiddlywiki
+
+HelloThere

package/editions/tw.org/tiddlers/$__SiteSubtitle.tid

@@ -0,0 +1,6 @@
+created: 20220318102354724
+modified: 20220318102400979
+title: $:/SiteSubtitle
+type: text/vnd.tiddlywiki
+
+community matters for ~TiddlyWiki

package/editions/tw.org/tiddlers/$__SiteTitle.tid

@@ -0,0 +1,6 @@
+created: 20220318102331011
+modified: 20220318104654044
+title: $:/SiteTitle
+type: text/vnd.tiddlywiki
+
+[[tiddlywiki.org|HelloThere]]

package/editions/tw.org/tiddlers/$__StoryList.tid

@@ -0,0 +1,3 @@
+list: HelloThere
+title: $:/StoryList
+type: text/vnd.tiddlywiki

package/editions/tw.org/tiddlers/$__favicon.ico.png.meta

@@ -0,0 +1,4 @@
+created: 20220318165448102
+modified: 20220318165455332
+title: $:/favicon.ico
+type: image/png

package/editions/tw.org/tiddlers/$__palette.tid

@@ -0,0 +1,6 @@
+created: 20220318102711329
+modified: 20220318103746799
+title: $:/palette
+type: text/vnd.tiddlywiki
+
+$:/palettes/FlowingSun

package/editions/tw.org/tiddlers/$__palettes_BlueFlavour

@@ -0,0 +1,165 @@
+: Background Tones
+
+base03: #362b00
+base02: #423607
+
+: Content Tones
+
+base01: #756e58
+base00: #837b65
+base0: #969483
+base1: #a1a193
+
+: Background Tones
+
+base2: #d5e8ee
+base3: #e3f6fd
+
+: Accent Colors
+
+yellow: #b58900
+orange: #cb4b16
+red: #dc322f
+magenta: #d33682
+violet: #6c71c4
+blue: #268bd2
+cyan: #2aa198
+green: #859900
+
+: Additional Tones (RA)
+
+base10: #bbc0c4
+violet-muted: #7c81b0
+blue-muted: #4e7baa
+
+yellow-hot: #ffcc44
+orange-hot: #eb6d20
+red-hot: #ff2222
+blue-hot: #2298ee
+green-hot: #98ee22
+
+: Palette
+
+: Do not use colour macro for background and foreground
+background: #e3f6fd
+    download-foreground: <<colour background>>
+    dragger-foreground: <<colour background>>
+    dropdown-background: <<colour background>>
+    modal-background: <<colour background>>
+    sidebar-foreground-shadow: <<colour background>>
+    tiddler-background: <<colour background>>
+    tiddler-border: <<colour background>>
+    tiddler-link-background: <<colour background>>
+    tab-background-selected: <<colour background>>
+        dropdown-tab-background-selected: <<colour tab-background-selected>>
+foreground: #837b65
+    dragger-background: <<colour foreground>>
+    tab-foreground: <<colour foreground>>
+        tab-foreground-selected: <<colour tab-foreground>>
+            sidebar-tab-foreground-selected: <<colour tab-foreground-selected>>
+        sidebar-tab-foreground: <<colour tab-foreground>>
+    sidebar-button-foreground: <<colour foreground>>
+    sidebar-controls-foreground: <<colour foreground>>
+    sidebar-foreground: <<colour foreground>>
+: base03
+: base02
+: base01
+    alert-muted-foreground: <<colour base01>>
+: base00
+    code-foreground: <<colour base00>>
+    message-foreground: <<colour base00>>
+    tag-foreground: <<colour base00>>
+: base0
+    sidebar-tiddler-link-foreground: <<colour base0>>
+: base1
+    muted-foreground: <<colour base1>>
+        blockquote-bar: <<colour muted-foreground>>
+        dropdown-border: <<colour muted-foreground>>
+        sidebar-muted-foreground: <<colour muted-foreground>>
+        tiddler-title-foreground: <<colour muted-foreground>>
+            site-title-foreground: <<colour tiddler-title-foreground>>
+: base2
+    modal-footer-background: <<colour base2>>
+    page-background: <<colour base2>>
+        modal-backdrop: <<colour page-background>>
+        notification-background: <<colour page-background>>
+        code-background: <<colour page-background>>
+            code-border: <<colour code-background>>
+        pre-background: <<colour page-background>>
+            pre-border: <<colour pre-background>>
+        sidebar-tab-background-selected: <<colour page-background>>
+    table-header-background: <<colour base2>>
+    tag-background: <<colour base2>>
+    tiddler-editor-background: <<colour base2>>
+    tiddler-info-background: <<colour base2>>
+    tiddler-info-tab-background: <<colour base2>>
+    tab-background: <<colour base2>>
+        dropdown-tab-background: <<colour tab-background>>
+: base3
+    alert-background: <<colour base3>>
+    message-background: <<colour base3>>
+: yellow
+: orange
+: red
+: magenta
+    alert-highlight: <<colour magenta>>
+: violet
+    external-link-foreground: <<colour violet>>
+: blue
+: cyan
+: green
+: base10
+    tiddler-controls-foreground: <<colour base10>>
+: violet-muted
+    external-link-foreground-visited: <<colour violet-muted>>
+: blue-muted
+    primary: <<colour blue-muted>>
+        download-background: <<colour primary>>
+        tiddler-link-foreground: <<colour primary>>
+
+alert-border: #b99e2f
+dirty-indicator: #ff0000
+dropzone-background: rgba(0,200,0,0.7)
+external-link-background-hover: inherit
+external-link-background-visited: inherit
+external-link-background: inherit
+external-link-foreground-hover: inherit
+message-border: #cfd6e6
+modal-border: #999999
+select-tag-background:
+select-tag-foreground:
+sidebar-controls-foreground-hover:
+sidebar-muted-foreground-hover:
+sidebar-tab-background: #c5d8de
+sidebar-tiddler-link-foreground-hover:
+static-alert-foreground: #aaaaaa
+tab-border: #cccccc
+    modal-footer-border: <<colour tab-border>>
+    modal-header-border: <<colour tab-border>>
+    notification-border: <<colour tab-border>>
+    sidebar-tab-border: <<colour tab-border>>
+    tab-border-selected: <<colour tab-border>>
+        sidebar-tab-border-selected: <<colour tab-border-selected>>
+tab-divider: #d8d8d8
+    sidebar-tab-divider: <<colour tab-divider>>
+table-border: #dddddd
+table-footer-background: #a8a8a8
+tiddler-controls-foreground-hover: #888888
+tiddler-controls-foreground-selected: #444444
+tiddler-editor-border-image: #ffffff
+tiddler-editor-border: #cccccc
+tiddler-editor-fields-even: #e0e8e0
+tiddler-editor-fields-odd: #f0f4f0
+tiddler-info-border: #dddddd
+tiddler-subtitle-foreground: #c0c0c0
+toolbar-new-button:
+toolbar-options-button:
+toolbar-save-button:
+toolbar-info-button:
+toolbar-edit-button:
+toolbar-close-button:
+toolbar-delete-button:
+toolbar-cancel-button:
+toolbar-done-button:
+untagged-background: #999999
+very-muted-foreground: #888888

package/editions/tw.org/tiddlers/$__palettes_BlueFlavour.meta

@@ -0,0 +1,8 @@
+color-scheme: light
+created: 20220318103222838
+description: Simple colours
+modified: 20220318103723059
+name: Blue Flavour
+tags: $:/tags/Palette
+title: $:/palettes/BlueFlavour
+type: application/x-tiddler-dictionary