tiddlywiki 5.3.6 → 5.3.7

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

@@ -6,10 +6,7 @@ tags: [[$:/tags/test-spec]]
 Tests for wikitext parser
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 describe("WikiText parser tests", function() {
@@ -119,6 +116,22 @@ describe("WikiText parser tests", function() {
 		);
 	});
 
+	it("should parse macro definitions with end statements followed by spaces", function() {
+		expect(parse("\\define myMacro()\nnothing\n\\end   \n")).toEqual(
+
+			[{"type":"set","attributes":{"name":{"name":"name","type":"string","value":"myMacro"},"value":{"name":"value","type":"string","value":"nothing"}},"children":[],"params":[],"isMacroDefinition":true,"orderedAttributes":[{"name":"name","type":"string","value":"myMacro"},{"name":"value","type":"string","value":"nothing"}],"start":0,"end":33,"rule":"macrodef"}]
+
+		);
+	});
+
+	it("should parse macro definitions with named end statements followed by spaces", function() {
+		expect(parse("\\define myMacro()\nnothing\n\\end myMacro  \n")).toEqual(
+
+			[{"type":"set","attributes":{"name":{"name":"name","type":"string","value":"myMacro"},"value":{"name":"value","type":"string","value":"nothing"}},"children":[],"params":[],"isMacroDefinition":true,"orderedAttributes":[{"name":"name","type":"string","value":"myMacro"},{"name":"value","type":"string","value":"nothing"}],"start":0,"end":40,"rule":"macrodef"}]
+
+		);
+	});
+
 	it("should parse procedure definitions with no parameters", function() {
 		expect(parse("\\procedure myMacro()\nnothing\n\\end\n")).toEqual(
 
@@ -135,6 +148,22 @@ describe("WikiText parser tests", function() {
 		);
 	});
 
+	it("should parse procedure definitions with end statements followed by spaces", function() {
+		expect(parse("\\procedure myMacro()\nnothing\n\\end   \n")).toEqual(
+
+			[{"type":"set","attributes":{"name":{"name":"name","type":"string","value":"myMacro"},"value":{"name":"value","type":"string","value":"nothing"}},"children":[],"params":[],"orderedAttributes":[{"name":"name","type":"string","value":"myMacro"},{"name":"value","type":"string","value":"nothing"}],"isProcedureDefinition":true,"start":0,"end":36,"rule":"fnprocdef"}]
+
+		);
+	});
+
+	it("should parse procedure definitions with named end statements followed by spaces", function() {
+		expect(parse("\\procedure myMacro()\nnothing\n\\end myMacro  \n")).toEqual(
+
+			[{"type":"set","attributes":{"name":{"name":"name","type":"string","value":"myMacro"},"value":{"name":"value","type":"string","value":"nothing"}},"children":[],"params":[],"orderedAttributes":[{"name":"name","type":"string","value":"myMacro"},{"name":"value","type":"string","value":"nothing"}],"isProcedureDefinition":true,"start":0,"end":43,"rule":"fnprocdef"}]
+
+		);
+	});
+
 	it("should parse procedure definitions with parameters", function() {
 		expect(parse("\\procedure myMacro(one,two,three,four:elephant)\nnothing\n\\end\n")).toEqual(
 
@@ -158,6 +187,22 @@ describe("WikiText parser tests", function() {
 		);
 	});
 
+	it("should parse function definitions with end statements followed by spaces", function() {
+		expect(parse("\\function myMacro()\nnothing\n\\end   \n")).toEqual(
+
+			[{"type":"set","attributes":{"name":{"name":"name","type":"string","value":"myMacro"},"value":{"name":"value","type":"string","value":"nothing"}},"children":[],"params":[],"orderedAttributes":[{"name":"name","type":"string","value":"myMacro"},{"name":"value","type":"string","value":"nothing"}],"isFunctionDefinition":true,"start":0,"end":35,"rule":"fnprocdef"}]
+
+		);
+	});
+
+	it("should parse function definitions with named end statements followed by spaces", function() {
+		expect(parse("\\function myMacro()\nnothing\n\\end myMacro  \n")).toEqual(
+
+			[{"type":"set","attributes":{"name":{"name":"name","type":"string","value":"myMacro"},"value":{"name":"value","type":"string","value":"nothing"}},"children":[],"params":[],"orderedAttributes":[{"name":"name","type":"string","value":"myMacro"},{"name":"value","type":"string","value":"nothing"}],"isFunctionDefinition":true,"start":0,"end":42,"rule":"fnprocdef"}]
+
+		);
+	});
+
 	it("should parse single line function definitions with no parameters", function() {
 		expect(parse("\\function myMacro() nothing\n")).toEqual(
 
@@ -420,4 +465,3 @@ describe("WikiText parser tests", function() {
         });
 });
 
-})();

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

@@ -9,10 +9,7 @@ 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() {
@@ -81,4 +78,3 @@ describe("Tabs-macro HTML tests", function() {
 	});
 });
 
-})();

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

@@ -6,10 +6,7 @@ tags: [[$:/tags/test-spec]]
 Tests the wikitext rendering pipeline end-to-end. We also need tests that individually test parsers, rendertreenodes etc., but this gets us started.
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 describe("WikiText tests", function() {
@@ -71,4 +68,3 @@ describe("WikiText tests", function() {
 	});
 });
 
-})();

package/editions/text-slicer/tiddlers/system/$__coreURL.tid

@@ -0,0 +1,4 @@
+title: $:/coreURL
+tags: $:/tags/Global
+
+\function coreURL() [[../../tiddlywikicore-$(version)$.js]substitute[]]

package/editions/text-slicer/tiddlywiki.info

@@ -13,6 +13,9 @@
 	"build": {
 		"index": [
 			"--rendertiddler","$:/core/save/all","index.html","text/plain"
+		],
+		"external": [
+			"--render","$:/core/save/all-external-js","index.html","text/plain"
 		]
 	}
 }