tiddlywiki 5.3.5 → 5.3.6

package/core/language/en-GB/Snippets/ProcedureDefinition.tid

@@ -0,0 +1,7 @@
+title: $:/language/Snippets/ProcedureDefinition
+tags: $:/tags/TextEditor/Snippet
+caption: Procedure definition
+
+\procedure procName(param1:"default value",param2)
+Your text comes here.
+\end

package/core/language/en-GB/Types/text_vnd.tiddlywiki_multiple.tid

@@ -0,0 +1,5 @@
+title: $:/language/Docs/Types/text/vnd.tiddlywiki-multiple
+description: Compound tiddler
+name: text/vnd.tiddlywiki-multiple
+group: Developer
+group-sort: 2

package/core/modules/commands/build.js

@@ -24,7 +24,7 @@ var Command = function(params,commander) {
 
 Command.prototype.execute = function() {
 	// Get the build targets defined in the wiki
-	var buildTargets = $tw.boot.wikiInfo.build;
+	var buildTargets = $tw.boot.wikiInfo && $tw.boot.wikiInfo.build;
 	if(!buildTargets) {
 		return "No build targets defined";
 	}

package/core/modules/commands/render.js

@@ -45,17 +45,22 @@ Render individual tiddlers and save the results to the specified files
 				variableList = variableList.slice(2);
 			}
 		$tw.utils.each(tiddlers,function(title) {
-			var filepath = path.resolve(self.commander.outputPath,wiki.filterTiddlers(filenameFilter,$tw.rootWidget,wiki.makeTiddlerIterator([title]))[0]);
-			if(self.commander.verbose) {
-				console.log("Rendering \"" + title + "\" to \"" + filepath + "\"");
+			var filenameResults = wiki.filterTiddlers(filenameFilter,$tw.rootWidget,wiki.makeTiddlerIterator([title]));
+			if(filenameResults.length > 0) {
+				var filepath = path.resolve(self.commander.outputPath,filenameResults[0]);
+				if(self.commander.verbose) {
+					console.log("Rendering \"" + title + "\" to \"" + filepath + "\"");
+				}
+				var parser = wiki.parseTiddler(template || title),
+					widgetNode = wiki.makeWidget(parser,{variables: $tw.utils.extend({},variables,{currentTiddler: title,storyTiddler: title})}),
+					container = $tw.fakeDocument.createElement("div");
+				widgetNode.render(container,null);
+				var text = type === "text/html" ? container.innerHTML : container.textContent;
+				$tw.utils.createFileDirectories(filepath);
+				fs.writeFileSync(filepath,text,"utf8");
+			} else {
+				console.log("Not rendering \"" + title + "\" because the filename filter returned an empty result");
 			}
-			var parser = wiki.parseTiddler(template || title),
-				widgetNode = wiki.makeWidget(parser,{variables: $tw.utils.extend({},variables,{currentTiddler: title,storyTiddler: title})}),
-				container = $tw.fakeDocument.createElement("div");
-			widgetNode.render(container,null);
-			var text = type === "text/html" ? container.innerHTML : container.textContent;
-			$tw.utils.createFileDirectories(filepath);
-			fs.writeFileSync(filepath,text,"utf8");
 		});
 		return null;
 	};

package/core/modules/config.js

@@ -30,7 +30,7 @@ exports.textPrimitives.wikiLink = exports.textPrimitives.upperLetter + "+" +
 	exports.textPrimitives.upperLetter +
 	exports.textPrimitives.anyLetter + "*";
 
-exports.htmlEntities = {quot:34, dollar:36, amp:38, apos:39, lt:60, gt:62, nbsp:160, iexcl:161, cent:162, pound:163, curren:164, yen:165, brvbar:166, sect:167, uml:168, copy:169, ordf:170, laquo:171, not:172, shy:173, reg:174, macr:175, deg:176, plusmn:177, sup2:178, sup3:179, acute:180, micro:181, para:182, middot:183, cedil:184, sup1:185, ordm:186, raquo:187, frac14:188, frac12:189, frac34:190, iquest:191, Agrave:192, Aacute:193, Acirc:194, Atilde:195, Auml:196, Aring:197, AElig:198, Ccedil:199, Egrave:200, Eacute:201, Ecirc:202, Euml:203, Igrave:204, Iacute:205, Icirc:206, Iuml:207, ETH:208, Ntilde:209, Ograve:210, Oacute:211, Ocirc:212, Otilde:213, Ouml:214, times:215, Oslash:216, Ugrave:217, Uacute:218, Ucirc:219, Uuml:220, Yacute:221, THORN:222, szlig:223, agrave:224, aacute:225, acirc:226, atilde:227, auml:228, aring:229, aelig:230, ccedil:231, egrave:232, eacute:233, ecirc:234, euml:235, igrave:236, iacute:237, icirc:238, iuml:239, eth:240, ntilde:241, ograve:242, oacute:243, ocirc:244, otilde:245, ouml:246, divide:247, oslash:248, ugrave:249, uacute:250, ucirc:251, uuml:252, yacute:253, thorn:254, yuml:255, OElig:338, oelig:339, Scaron:352, scaron:353, Yuml:376, fnof:402, circ:710, tilde:732, Alpha:913, Beta:914, Gamma:915, Delta:916, Epsilon:917, Zeta:918, Eta:919, Theta:920, Iota:921, Kappa:922, Lambda:923, Mu:924, Nu:925, Xi:926, Omicron:927, Pi:928, Rho:929, Sigma:931, Tau:932, Upsilon:933, Phi:934, Chi:935, Psi:936, Omega:937, alpha:945, beta:946, gamma:947, delta:948, epsilon:949, zeta:950, eta:951, theta:952, iota:953, kappa:954, lambda:955, mu:956, nu:957, xi:958, omicron:959, pi:960, rho:961, sigmaf:962, sigma:963, tau:964, upsilon:965, phi:966, chi:967, psi:968, omega:969, thetasym:977, upsih:978, piv:982, ensp:8194, emsp:8195, thinsp:8201, zwnj:8204, zwj:8205, lrm:8206, rlm:8207, ndash:8211, mdash:8212, lsquo:8216, rsquo:8217, sbquo:8218, ldquo:8220, rdquo:8221, bdquo:8222, dagger:8224, Dagger:8225, bull:8226, hellip:8230, permil:8240, prime:8242, Prime:8243, lsaquo:8249, rsaquo:8250, oline:8254, frasl:8260, euro:8364, image:8465, weierp:8472, real:8476, trade:8482, alefsym:8501, larr:8592, uarr:8593, rarr:8594, darr:8595, harr:8596, crarr:8629, lArr:8656, uArr:8657, rArr:8658, dArr:8659, hArr:8660, forall:8704, part:8706, exist:8707, empty:8709, nabla:8711, isin:8712, notin:8713, ni:8715, prod:8719, sum:8721, minus:8722, lowast:8727, radic:8730, prop:8733, infin:8734, ang:8736, and:8743, or:8744, cap:8745, cup:8746, int:8747, there4:8756, sim:8764, cong:8773, asymp:8776, ne:8800, equiv:8801, le:8804, ge:8805, sub:8834, sup:8835, nsub:8836, sube:8838, supe:8839, oplus:8853, otimes:8855, perp:8869, sdot:8901, lceil:8968, rceil:8969, lfloor:8970, rfloor:8971, lang:9001, rang:9002, loz:9674, spades:9824, clubs:9827, hearts:9829, diams:9830 };
+exports.htmlEntities = {quot:34, dollar:36, amp:38, apos:39, lt:60, gt:62, nbsp:160, iexcl:161, cent:162, pound:163, curren:164, yen:165, brvbar:166, sect:167, uml:168, copy:169, ordf:170, laquo:171, not:172, shy:173, reg:174, macr:175, deg:176, plusmn:177, sup2:178, sup3:179, acute:180, micro:181, para:182, middot:183, cedil:184, sup1:185, ordm:186, raquo:187, frac14:188, frac12:189, frac34:190, iquest:191, Agrave:192, Aacute:193, Acirc:194, Atilde:195, Auml:196, Aring:197, AElig:198, Ccedil:199, Egrave:200, Eacute:201, Ecirc:202, Euml:203, Igrave:204, Iacute:205, Icirc:206, Iuml:207, ETH:208, Ntilde:209, Ograve:210, Oacute:211, Ocirc:212, Otilde:213, Ouml:214, times:215, Oslash:216, Ugrave:217, Uacute:218, Ucirc:219, Uuml:220, Yacute:221, THORN:222, szlig:223, agrave:224, aacute:225, acirc:226, atilde:227, auml:228, aring:229, aelig:230, ccedil:231, egrave:232, eacute:233, ecirc:234, euml:235, igrave:236, iacute:237, icirc:238, iuml:239, eth:240, ntilde:241, ograve:242, oacute:243, ocirc:244, otilde:245, ouml:246, divide:247, oslash:248, ugrave:249, uacute:250, ucirc:251, uuml:252, yacute:253, thorn:254, yuml:255, OElig:338, oelig:339, Scaron:352, scaron:353, Yuml:376, fnof:402, circ:710, tilde:732, Alpha:913, Beta:914, Gamma:915, Delta:916, Epsilon:917, Zeta:918, Eta:919, Theta:920, Iota:921, Kappa:922, Lambda:923, Mu:924, Nu:925, Xi:926, Omicron:927, Pi:928, Rho:929, Sigma:931, Tau:932, Upsilon:933, Phi:934, Chi:935, Psi:936, Omega:937, alpha:945, beta:946, gamma:947, delta:948, epsilon:949, zeta:950, eta:951, theta:952, iota:953, kappa:954, lambda:955, mu:956, nu:957, xi:958, omicron:959, pi:960, rho:961, sigmaf:962, sigma:963, tau:964, upsilon:965, phi:966, chi:967, psi:968, omega:969, thetasym:977, upsih:978, piv:982, ensp:8194, emsp:8195, thinsp:8201, zwnj:8204, zwj:8205, lrm:8206, rlm:8207, ndash:8211, mdash:8212, lsquo:8216, rsquo:8217, sbquo:8218, ldquo:8220, rdquo:8221, bdquo:8222, dagger:8224, Dagger:8225, bull:8226, hellip:8230, permil:8240, prime:8242, Prime:8243, lsaquo:8249, rsaquo:8250, oline:8254, frasl:8260, nobreak:8288, NoBreak:8288, euro:8364, image:8465, weierp:8472, real:8476, trade:8482, alefsym:8501, larr:8592, uarr:8593, rarr:8594, darr:8595, harr:8596, crarr:8629, lArr:8656, uArr:8657, rArr:8658, dArr:8659, hArr:8660, forall:8704, part:8706, exist:8707, empty:8709, nabla:8711, isin:8712, notin:8713, ni:8715, prod:8719, sum:8721, minus:8722, lowast:8727, radic:8730, prop:8733, infin:8734, ang:8736, and:8743, or:8744, cap:8745, cup:8746, int:8747, there4:8756, sim:8764, cong:8773, asymp:8776, ne:8800, equiv:8801, le:8804, ge:8805, sub:8834, sup:8835, nsub:8836, sube:8838, supe:8839, oplus:8853, otimes:8855, perp:8869, sdot:8901, lceil:8968, rceil:8969, lfloor:8970, rfloor:8971, lang:9001, rang:9002, loz:9674, spades:9824, clubs:9827, hearts:9829, diams:9830 };
 
 exports.htmlVoidElements = "area,base,br,col,command,embed,hr,img,input,keygen,link,meta,param,source,track,wbr".split(",");
 

package/core/modules/editor/operations/text/excise.js

@@ -12,20 +12,27 @@ Text editor operation to excise the selection to a new tiddler
 /*global $tw: false */
 "use strict";
 
+function isMarkdown(mediaType) {
+	return mediaType === 'text/markdown' || mediaType === 'text/x-markdown';
+}
+
 exports["excise"] = function(event,operation) {
 	var editTiddler = this.wiki.getTiddler(this.editTitle),
-		editTiddlerTitle = this.editTitle;
+		editTiddlerTitle = this.editTitle,
+		wikiLinks = !isMarkdown(editTiddler.fields.type),
+		excisionBaseTitle = $tw.language.getString("Buttons/Excise/DefaultTitle");
 	if(editTiddler && editTiddler.fields["draft.of"]) {
 		editTiddlerTitle = editTiddler.fields["draft.of"];
 	}
-	var excisionTitle = event.paramObject.title || this.wiki.generateNewTitle("New Excision");
+	var excisionTitle = event.paramObject.title || this.wiki.generateNewTitle(excisionBaseTitle);
 	this.wiki.addTiddler(new $tw.Tiddler(
 		this.wiki.getCreationFields(),
 		this.wiki.getModificationFields(),
 		{
 			title: excisionTitle,
 			text: operation.selection,
-			tags: event.paramObject.tagnew === "yes" ?  [editTiddlerTitle] : []
+			tags: event.paramObject.tagnew === "yes" ?  [editTiddlerTitle] : [],
+			type: editTiddler.fields.type
 		}
 	));
 	operation.replacement = excisionTitle;
@@ -34,7 +41,8 @@ exports["excise"] = function(event,operation) {
 			operation.replacement = "{{" + operation.replacement+ "}}";
 			break;
 		case "link":
-			operation.replacement = "[[" + operation.replacement+ "]]";
+			operation.replacement = wikiLinks ? "[[" + operation.replacement+ "]]"
+				: ("[" + operation.replacement + "](<#" + operation.replacement + ">)");
 			break;
 		case "macro":
 			operation.replacement = "<<" + (event.paramObject.macro || "translink") + " \"\"\"" + operation.replacement + "\"\"\">>";

package/core/modules/editor/operations/text/wrap-selection.js

@@ -13,37 +13,125 @@ Text editor operation to wrap the selection with the specified prefix and suffix
 "use strict";
 
 exports["wrap-selection"] = function(event,operation) {
-	if(operation.selStart === operation.selEnd) {
-		// No selection; check if we're within the prefix/suffix
-		if(operation.text.substring(operation.selStart - event.paramObject.prefix.length,operation.selStart + event.paramObject.suffix.length) === event.paramObject.prefix + event.paramObject.suffix) {
+	var o = operation,
+		prefix = event.paramObject.prefix,
+		suffix = event.paramObject.suffix,
+		trimSelection = event.paramObject.trimSelection || "no",
+		selLength = o.selEnd - o.selStart;
+
+	// This function detects, if trailing spaces are part of the selection __and__ if the user wants to handle them
+	// Returns "yes", "start", "end", "no" (default)
+	//	yes .. there are trailing spaces at both ends
+	//	start .. there are trailing spaces at the start
+	//	end .. there are trailing spaces at the end
+	//	no .. no trailing spaces are taken into account
+	var trailingSpaceAt = function(sel) {
+		var _start,
+			_end,
+			result;
+		// trimSelection is a user parameter, which this evaluations takes into account
+		switch(trimSelection) {
+			case "end":
+				result = (sel.trimEnd().length !== selLength) ? "end" : "no";
+				break;
+			case "yes":
+				_start = sel.trimStart().length !== selLength;
+				_end = sel.trimEnd().length !== selLength;
+				result = (_start && _end) ? "yes" : (_start) ? "start" : (_end) ? "end" : "no";
+				break;
+			case "start":
+				result = (sel.trimStart().length !== selLength) ? "start" : "no";
+				break;
+			default:
+				result = "no";
+				break;
+		}
+		return result;
+	}
+
+	function togglePrefixSuffix() {
+		if(o.text.substring(o.selStart - prefix.length, o.selStart + suffix.length) === prefix + suffix) {
 			// Remove the prefix and suffix
-			operation.cutStart = operation.selStart - event.paramObject.prefix.length;
-			operation.cutEnd = operation.selEnd + event.paramObject.suffix.length;
-			operation.replacement = "";
-			operation.newSelStart = operation.cutStart;
-			operation.newSelEnd = operation.newSelStart;
+			o.cutStart = o.selStart - prefix.length;
+			o.cutEnd = o.selEnd + suffix.length;
+			o.replacement = "";
+			o.newSelStart = o.cutStart;
+			o.newSelEnd = o.newSelStart;
 		} else {
 			// Wrap the cursor instead
-			operation.cutStart = operation.selStart;
-			operation.cutEnd = operation.selEnd;
-			operation.replacement = event.paramObject.prefix + event.paramObject.suffix;
-			operation.newSelStart = operation.selStart + event.paramObject.prefix.length;
-			operation.newSelEnd = operation.newSelStart;
+			o.cutStart = o.selStart;
+			o.cutEnd = o.selEnd;
+			o.replacement = prefix + suffix;
+			o.newSelStart = o.selStart + prefix.length;
+			o.newSelEnd = o.newSelStart;
+		}
+	}
+
+	// options: lenPrefix, lenSuffix
+	function removePrefixSuffix(options) {
+		options = options || {};
+		var _lenPrefix = options.lenPrefix || 0;
+		var _lenSuffix = options.lenSuffix || 0;
+
+		o.cutStart = o.selStart - _lenPrefix;
+		o.cutEnd = o.selEnd + _lenSuffix;
+		o.replacement = (_lenPrefix || _lenSuffix) ? o.selection : o.selection.substring(prefix.length, o.selection.length - suffix.length);
+		o.newSelStart = o.cutStart;
+		o.newSelEnd = o.cutStart + o.replacement.length;
+	}
+
+	function addPrefixSuffix() {
+		// remove trailing space if requested
+		switch(trailingSpaceAt(o.selection)) {
+			case "no":
+				// has no trailing spaces
+				o.cutStart = o.selStart;
+				o.cutEnd = o.selEnd;
+				o.replacement = prefix + o.selection + suffix;
+				o.newSelStart = o.selStart;
+				o.newSelEnd = o.selStart + o.replacement.length;
+				break;
+			case "yes":
+				// handle both ends
+				o.cutStart = o.selEnd - (o.selection.trimStart().length);
+				o.cutEnd = o.selection.trimEnd().length + o.selStart;
+				o.replacement = prefix + o.selection.trim() + suffix;
+				o.newSelStart = o.cutStart;
+				o.newSelEnd = o.cutStart + o.replacement.length;
+				break;
+			case "start":
+				// handle leading
+				o.cutStart = o.selEnd - (o.selection.trimStart().length);
+				o.cutEnd = o.selEnd;
+				o.replacement = prefix + o.selection.trimStart() + suffix;
+				o.newSelStart = o.cutStart;
+				o.newSelEnd = o.cutStart + o.replacement.length;
+				break;
+			case "end":
+				// handle trailing
+				o.cutStart = o.selStart;
+				o.cutEnd = o.selection.trimEnd().length + o.selStart;
+				o.replacement = prefix + o.selection.trimEnd() + suffix;
+				o.newSelStart = o.selStart;
+				o.newSelEnd = o.selStart + o.replacement.length;
+				break;
 		}
-	} else if(operation.text.substring(operation.selStart,operation.selStart + event.paramObject.prefix.length) === event.paramObject.prefix && operation.text.substring(operation.selEnd - event.paramObject.suffix.length,operation.selEnd) === event.paramObject.suffix) {
+	}
+
+	if(o.selStart === o.selEnd) {
+		// No selection; Create prefix and suffix. Set cursor in between them: ""|""
+		togglePrefixSuffix();
+	} else if(o.text.substring(o.selStart, o.selStart + prefix.length) === prefix &&
+				o.text.substring(o.selEnd - suffix.length,o.selEnd) === suffix) {
 		// Prefix and suffix are already present, so remove them
-		operation.cutStart = operation.selStart;
-		operation.cutEnd = operation.selEnd;
-		operation.replacement = operation.selection.substring(event.paramObject.prefix.length,operation.selection.length - event.paramObject.suffix.length);
-		operation.newSelStart = operation.selStart;
-		operation.newSelEnd = operation.selStart + operation.replacement.length;
+		removePrefixSuffix();
+	} else if(o.text.substring(o.selStart - prefix.length, o.selStart) === prefix &&
+				o.text.substring(o.selEnd, o.selEnd + suffix.length) === suffix) {
+		// Prefix and suffix are present BUT not selected -> remove them
+		removePrefixSuffix({"lenPrefix": prefix.length, "lenSuffix": suffix.length});
 	} else {
 		// Add the prefix and suffix
-		operation.cutStart = operation.selStart;
-		operation.cutEnd = operation.selEnd;
-		operation.replacement = event.paramObject.prefix + operation.selection + event.paramObject.suffix;
-		operation.newSelStart = operation.selStart;
-		operation.newSelEnd = operation.selStart + operation.replacement.length;
+		addPrefixSuffix();
 	}
 };
 

package/core/modules/filters/encodings.js

@@ -18,8 +18,8 @@ Export our filter functions
 
 exports.decodebase64 = function(source,operator,options) {
 	var results = [];
-	var binary = operator.suffixes && operator.suffixes.indexOf("binary") !== -1;
-	var urlsafe = operator.suffixes && operator.suffixes.indexOf("urlsafe") !== -1;
+	var binary = operator.suffixes && operator.suffixes[0].indexOf("binary") !== -1;
+	var urlsafe = operator.suffixes && operator.suffixes[0].indexOf("urlsafe") !== -1;
 	source(function(tiddler,title) {
 		results.push($tw.utils.base64Decode(title,binary,urlsafe));
 	});
@@ -28,8 +28,8 @@ exports.decodebase64 = function(source,operator,options) {
 
 exports.encodebase64 = function(source,operator,options) {
 	var results = [];
-	var binary = operator.suffixes && operator.suffixes.indexOf("binary") !== -1;
-	var urlsafe = operator.suffixes && operator.suffixes.indexOf("urlsafe") !== -1;
+	var binary = operator.suffixes && operator.suffixes[0].indexOf("binary") !== -1;
+	var urlsafe = operator.suffixes && operator.suffixes[0].indexOf("urlsafe") !== -1;
 	source(function(tiddler,title) {
 		results.push($tw.utils.base64Encode(title,binary,urlsafe));
 	});

package/core/modules/macros/unusedtitle.js

@@ -16,20 +16,22 @@ exports.name = "unusedtitle";
 exports.params = [
 	{name: "baseName"},
 	{name: "separator"},
-	{name: "template"}
+	{name: "template"},
+	{name: "startCount"}
 ];
 
 /*
 Run the macro
 */
-exports.run = function(baseName,separator,template) {
+exports.run = function(baseName,separator,template,startCount) {
 	separator = separator || " ";
+	startCount = startCount || 0;
 	if(!baseName) {
 		baseName = $tw.language.getString("DefaultNewTiddlerTitle");
 	}
 	// $tw.wiki.generateNewTitle = function(baseTitle,options)
-	// options.prefix must be a string! 
-	return this.wiki.generateNewTitle(baseName, {"prefix": separator, "template": template});
+	// options.prefix must be a string!
+	return this.wiki.generateNewTitle(baseName, {"prefix": separator, "template": template, "startCount": startCount});
 };
 
 })();

package/core/modules/parsers/wikiparser/rules/conditional.js

@@ -6,7 +6,7 @@ module-type: wikirule
 Conditional shortcut syntax
 
 ```
-This is a <% if [{something}] %>Elephant<% elseif [{else}] %>Pelican<% else %>Crocodile<% endif %>
+This is a <%if [{something}] %>Elephant<%elseif [{else}] %>Pelican<%else%>Crocodile<%endif%>
 ```
 
 \*/
@@ -27,7 +27,7 @@ exports.init = function(parser) {
 };
 
 exports.findNextMatch = function(startPos) {
-	// Look for the next <% if shortcut
+	// Look for the next <%if shortcut
 	this.matchRegExp.lastIndex = startPos;
 	this.match = this.matchRegExp.exec(this.parser.source);
 	// If not found then return no match

package/core/modules/parsers/wikiparser/rules/table.js

@@ -93,11 +93,12 @@ var processRow = function(prevColumns) {
 			}
 			// Check whether this is a heading cell
 			var cell;
+			var start = this.parser.pos;
 			if(chr === "!") {
 				this.parser.pos++;
-				cell = {type: "element", tag: "th", children: []};
+				cell = {type: "element", tag: "th", start: start, children: []};
 			} else {
-				cell = {type: "element", tag: "td", children: []};
+				cell = {type: "element", tag: "td", start: start, children: []};
 			}
 			tree.push(cell);
 			// Record information about this cell
@@ -121,6 +122,7 @@ var processRow = function(prevColumns) {
 			}
 			// Move back to the closing `|`
 			this.parser.pos--;
+			cell.end = this.parser.pos;
 		}
 		col++;
 		cellRegExp.lastIndex = this.parser.pos;
@@ -169,12 +171,13 @@ exports.parse = function() {
 				rowContainer.children = this.parser.parseInlineRun(rowTermRegExp,{eatTerminator: true});
 			} else {
 				// Create the row
-				var theRow = {type: "element", tag: "tr", children: []};
+				var theRow = {type: "element", tag: "tr", children: [], start: rowMatch.index};
 				$tw.utils.addClassToParseTreeNode(theRow,rowCount%2 ? "oddRow" : "evenRow");
 				rowContainer.children.push(theRow);
 				// Process the row
 				theRow.children = processRow.call(this,prevColumns);
 				this.parser.pos = rowMatch.index + rowMatch[0].length;
+				theRow.end = this.parser.pos;
 				// Increment the row count
 				rowCount++;
 			}

package/core/modules/savers/put.js

@@ -20,7 +20,7 @@ Retrieve ETag if available
 */
 var retrieveETag = function(self) {
 	var headers = {
-		Accept: "*/*;charset=UTF-8"
+		Accept: "*/*"
 	};
 	$tw.utils.httpRequest({
 		url: self.uri(),
@@ -48,14 +48,14 @@ var PutSaver = function(wiki) {
 	var self = this;
 	var uri = this.uri();
 	// Async server probe. Until probe finishes, save will fail fast
-	// See also https://github.com/Jermolene/TiddlyWiki5/issues/2276
+	// See also https://github.com/TiddlyWiki/TiddlyWiki5/issues/2276
 	$tw.utils.httpRequest({
 		url: uri,
 		type: "OPTIONS",
 		callback: function(err,data,xhr) {
 			// Check DAV header http://www.webdav.org/specs/rfc2518.html#rfc.section.9.1
 			if(!err) {
-				self.serverAcceptsPuts = xhr.status === 200 && !!xhr.getResponseHeader("dav");
+				self.serverAcceptsPuts = xhr.status >= 200 && xhr.status < 300 && !!xhr.getResponseHeader("dav");
 			}
 		}
 	});

package/core/modules/startup/rootwidget.js

@@ -52,7 +52,9 @@ exports.startup = function() {
 			basicAuthUsername: params["basic-auth-username"],
 			basicAuthUsernameFromStore: params["basic-auth-username-from-store"],
 			basicAuthPassword: params["basic-auth-password"],
-			basicAuthPasswordFromStore: params["basic-auth-password-from-store"]
+			basicAuthPasswordFromStore: params["basic-auth-password-from-store"],
+			bearerAuthToken: params["bearer-auth-token"],
+			bearerAuthTokenFromStore: params["bearer-auth-token-from-store"]
 		});
 	});
 	$tw.rootWidget.addEventListener("tm-http-cancel-all-requests",function(event) {

package/core/modules/storyviews/classic.js

@@ -30,12 +30,8 @@ ClassicStoryView.prototype.navigateTo = function(historyInfo) {
 	if(!targetElement || targetElement.nodeType === Node.TEXT_NODE) {
 		return;
 	}
-	if(duration) {
-		// Scroll the node into view
-		this.listWidget.dispatchEvent({type: "tm-scroll", target: targetElement});
-	} else {
-		targetElement.scrollIntoView();
-	}
+	// Scroll the node into view
+	this.listWidget.dispatchEvent({type: "tm-scroll", target: targetElement});
 };
 
 ClassicStoryView.prototype.insert = function(widget) {
@@ -82,6 +78,10 @@ ClassicStoryView.prototype.remove = function(widget) {
 			removeElement = function() {
 				widget.removeChildDomNodes();
 			};
+		// Blur the focus if it is within the descendents of the node we are removing
+		if($tw.utils.domContains(targetElement,targetElement.ownerDocument.activeElement)) {
+			targetElement.ownerDocument.activeElement.blur();
+		}
 		// Abandon if the list entry isn't a DOM element (it might be a text node)
 		if(!targetElement || targetElement.nodeType === Node.TEXT_NODE) {
 			removeElement();

package/core/modules/upgraders/system.js

@@ -12,7 +12,7 @@ Upgrader module that suppresses certain system tiddlers that shouldn't be import
 /*global $tw: false */
 "use strict";
 
-var DONT_IMPORT_LIST = ["$:/Import"],
+var DONT_IMPORT_LIST = ["$:/Import", "$:/build"],
 	UNSELECT_PREFIX_LIST = ["$:/temp/","$:/state/","$:/StoryList","$:/HistoryList"],
 	WARN_IMPORT_PREFIX_LIST = ["$:/core/modules/"];
 

package/core/modules/utils/dom/dom.js

@@ -270,6 +270,7 @@ Copy plain text to the clipboard on browsers that support it
 */
 exports.copyToClipboard = function(text,options) {
 	options = options || {};
+	text = text || "";
 	var textArea = document.createElement("textarea");
 	textArea.style.position = "fixed";
 	textArea.style.top = 0;
@@ -289,7 +290,7 @@ exports.copyToClipboard = function(text,options) {
 	var succeeded = false;
 	try {
 		succeeded = document.execCommand("copy");
-	} catch (err) {
+	} catch(err) {
 	}
 	if(!options.doNotNotify) {
 		var successNotification = options.successNotification || "$:/language/Notifications/CopiedToClipboard/Succeeded",
@@ -326,7 +327,7 @@ exports.collectDOMVariables = function(selectedNode,domNode,event) {
 			variables["tv-popup-coords"] = Popup.buildCoordinates(Popup.coordinatePrefix.csOffsetParent,nodeRect);
 
 			var absRect = $tw.utils.extend({}, nodeRect);
-			for (var currentNode = selectedNode.offsetParent; currentNode; currentNode = currentNode.offsetParent) {
+			for(var currentNode = selectedNode.offsetParent; currentNode; currentNode = currentNode.offsetParent) {
 				absRect.left += currentNode.offsetLeft;
 				absRect.top += currentNode.offsetTop;
 			}

package/core/modules/utils/dom/http.js

@@ -104,6 +104,8 @@ basicAuthUsername: plain username for basic authentication
 basicAuthUsernameFromStore: name of password store entry containing username
 basicAuthPassword: plain password for basic authentication
 basicAuthPasswordFromStore: name of password store entry containing password
+bearerAuthToken: plain text token for bearer authentication
+bearerAuthTokenFromStore: name of password store entry contain bear authorization token
 */
 function HttpClientRequest(options) {
 	var self = this;
@@ -135,8 +137,11 @@ function HttpClientRequest(options) {
 	});
 	this.basicAuthUsername = options.basicAuthUsername || (options.basicAuthUsernameFromStore && $tw.utils.getPassword(options.basicAuthUsernameFromStore)) || "";
 	this.basicAuthPassword = options.basicAuthPassword || (options.basicAuthPasswordFromStore && $tw.utils.getPassword(options.basicAuthPasswordFromStore)) || "";
+	this.bearerAuthToken = options.bearerAuthToken || (options.bearerAuthTokenFromStore && $tw.utils.getPassword(options.bearerAuthTokenFromStore)) || "";
 	if(this.basicAuthUsername && this.basicAuthPassword) {
 		this.requestHeaders.Authorization = "Basic " + $tw.utils.base64Encode(this.basicAuthUsername + ":" + this.basicAuthPassword);
+	} else if(this.bearerAuthToken) {
+		this.requestHeaders.Authorization = "Bearer " + this.bearerAuthToken;
 	}
 }
 

package/core/modules/utils/edition-info.js

@@ -29,10 +29,14 @@ exports.getEditionInfo = function() {
 			for(var entryIndex=0; entryIndex<entries.length; entryIndex++) {
 				var entry = entries[entryIndex];
 				// Check if directories have a valid tiddlywiki.info
-				if(!editionInfo[entry] && $tw.utils.isDirectory(path.resolve(editionPath,entry))) {
-					var info = $tw.utils.parseJSONSafe(fs.readFileSync(path.resolve(editionPath,entry,"tiddlywiki.info"),"utf8"),null);
-					if(info) {
-						editionInfo[entry] = info;
+				// Check if the entry is a hidden directory
+				if((entry.charAt(0) !== ".") && !editionInfo[entry] && $tw.utils.isDirectory(path.resolve(editionPath,entry))) {
+					var file=path.resolve(editionPath,entry,"tiddlywiki.info");
+					if(fs.existsSync(file)) {
+						var info = $tw.utils.parseJSONSafe(fs.readFileSync(file,"utf8"),null);
+						if(info) {
+							editionInfo[entry] = info;
+						}
 					}
 				}
 			}
@@ -41,4 +45,4 @@ exports.getEditionInfo = function() {
 	return editionInfo;
 };
 
-})();
+})();

package/core/modules/utils/fakedom.js

@@ -56,36 +56,64 @@ Object.defineProperty(TW_TextNode.prototype, "formattedTextContent", {
 	}
 });
 
-var TW_Element = function(tag,namespace) {
+var TW_Style = function(el) {
+	// Define the internal style object
+	var styleObject = {
+		// Method to get the entire style object
+		get: function() {
+			return el._style;
+		},
+		// Method to set styles using a string (e.g. "color:red; background-color:blue;")
+		set: function(str) {
+			var self = this;
+			str = str || "";
+			$tw.utils.each(str.split(";"),function(declaration) {
+				var parts = declaration.split(":"),
+					name = $tw.utils.trim(parts[0]),
+					value = $tw.utils.trim(parts[1]);
+				if(name && value) {
+					el._style[$tw.utils.convertStyleNameToPropertyName(name)] = value;
+				}
+			});
+		},
+		// Method to set a specific property without transforming the property name, such as a custom property
+		setProperty: function(name, value) {
+			el._style[name] = value;
+		}
+	};
+
+	// Return a Proxy to handle direct access to individual style properties
+	return new Proxy(styleObject, {
+		get: function(target, property) {
+			// If the property exists on styleObject, return it (get, set, setProperty methods)
+			if (property in target) {
+				return target[property];
+			}
+			// Otherwise, return the corresponding property from _style
+			return el._style[$tw.utils.convertStyleNameToPropertyName(property)] || "";
+		},
+		set: function(target, property, value) {
+			// Set the property in _style
+			el._style[$tw.utils.convertStyleNameToPropertyName(property)] = value;
+			return true;
+		}
+	});
+};
+
+var TW_Element = function(tag, namespace) {
 	bumpSequenceNumber(this);
 	this.isTiddlyWikiFakeDom = true;
 	this.tag = tag;
 	this.attributes = {};
 	this.isRaw = false;
 	this.children = [];
-	this._style = {};
+	this._style = {}; // Internal style object
+	this.style = new TW_Style(this); // Proxy for style management
 	this.namespaceURI = namespace || "http://www.w3.org/1999/xhtml";
 };
 
-Object.setPrototypeOf(TW_Element.prototype,TW_Node.prototype);
 
-Object.defineProperty(TW_Element.prototype, "style", {
-	get: function() {
-		return this._style;
-	},
-	set: function(str) {
-		var self = this;
-		str = str || "";
-		$tw.utils.each(str.split(";"),function(declaration) {
-			var parts = declaration.split(":"),
-				name = $tw.utils.trim(parts[0]),
-				value = $tw.utils.trim(parts[1]);
-			if(name && value) {
-				self._style[$tw.utils.convertStyleNameToPropertyName(name)] = value;
-			}
-		});
-	}
-});
+Object.setPrototypeOf(TW_Element.prototype,TW_Node.prototype);
 
 Object.defineProperty(TW_Element.prototype, "nodeType", {
 	get: function() {
@@ -105,7 +133,7 @@ TW_Element.prototype.setAttribute = function(name,value) {
 		throw "Cannot setAttribute on a raw TW_Element";
 	}
 	if(name === "style") {
-		this.style = value;
+		this.style.set(value);
 	} else {
 		this.attributes[name] = value + "";
 	}

package/core/modules/utils/filesystem.js

@@ -238,7 +238,7 @@ exports.generateTiddlerFileInfo = function(tiddler,options) {
 	} else {
 		// Save as a .tid or a text/binary file plus a .meta file
 		var tiddlerType = tiddler.fields.type || "text/vnd.tiddlywiki";
-		if(tiddlerType === "text/vnd.tiddlywiki" || tiddler.hasField("_canonical_uri")) {
+		if(tiddlerType === "text/vnd.tiddlywiki" || tiddlerType === "text/vnd.tiddlywiki-multiple" || tiddler.hasField("_canonical_uri")) {
 			// Save as a .tid file
 			fileInfo.type = "application/x-tiddler";
 			fileInfo.hasMetaFile = false;

package/core/modules/utils/transliterate.js

@@ -924,7 +924,7 @@ exports.transliterate = function(str) {
 };
 
 exports.transliterateToSafeASCII = function(str) {
-	return str.replace(/[^\x00-\x7F]/g,function(ch) {
+	return str.replace(/[^\x20-\x7F]/g,function(ch) {
 		return exports.transliterationPairs[ch] || ""
 	});
 };