tiddlywiki 5.3.4 → 5.3.6

package/plugins/tiddlywiki/geospatial/widgets/geomap.js

@@ -48,8 +48,7 @@ GeomapWidget.prototype.render = function(parent,nextSibling) {
 	this.contentRoot.render(this.contentContainer,null);
 	// Render a wrapper for the map
 	this.domNode = this.document.createElement("div");
-	this.domNode.style.width = "100%";
-	this.domNode.style.height = "600px";
+	this.setMapSize();
 	// Insert it into the DOM
 	parent.insertBefore(this.domNode,nextSibling);
 	this.domNodes.push(this.domNode);
@@ -63,7 +62,13 @@ GeomapWidget.prototype.render = function(parent,nextSibling) {
 GeomapWidget.prototype.renderMap = function() {
 	var self = this;
 	// Create the map
-	this.map = $tw.Leaflet.map(this.domNode);
+	var options = {
+		
+	};
+	if(this.geomapMaxZoom) {
+		options.maxZoom = $tw.utils.parseInt(this.geomapMaxZoom);
+	}
+	this.map = $tw.Leaflet.map(this.domNode,options);
 	// No layers rendered
 	this.renderedLayers = [];
 	this.baseLayers = [];
@@ -73,16 +78,17 @@ GeomapWidget.prototype.renderMap = function() {
 	$tw.Leaflet.control.scale().addTo(this.map);
 	// Listen for pan and zoom events and update the state tiddler
 	this.map.on("moveend zoomend",function(event) {
-		if(self.geomapStateTitle) {
-			var c = self.map.getCenter(),
+		if(self.hasAttribute("state")) {
+			var stateTitle = self.getAttribute("state"),
+				c = self.map.getCenter(),
 				lat = "" + c.lat,
 				long = "" + c.lng,
 				zoom = "" + self.map.getZoom(),
-				tiddler = self.wiki.getTiddler(self.geomapStateTitle);
+				tiddler = self.wiki.getTiddler(stateTitle);
 			// Only write the tiddler if the values have changed
 			if(!tiddler || tiddler.fields.lat !== lat || tiddler.fields.long !== long || tiddler.fields.zoom !== zoom) {
 				self.wiki.addTiddler(new $tw.Tiddler({
-					title: self.geomapStateTitle,
+					title: stateTitle,
 					lat: lat,
 					long: long,
 					zoom: zoom
@@ -161,9 +167,12 @@ GeomapWidget.prototype.refreshMap = function() {
 	});
 	this.map.addLayer(markers);
 	// Process embedded geolayer widgets
+	var defaultPopupTemplateTitle = self.getAttribute("popupTemplate");
 	this.findChildrenDataWidgets(this.contentRoot.children,"geolayer",function(widget) {
 		var jsonText = widget.getAttribute("json"),
+			popupTemplateTitle = widget.getAttribute("popupTemplate",defaultPopupTemplateTitle),
 			geoJson = [];
+		// Build up the geojson of the layer
 		if(jsonText) {
 			// Layer is defined by JSON blob
 			geoJson = $tw.utils.parseJSONSafe(jsonText,[]);
@@ -171,7 +180,8 @@ GeomapWidget.prototype.refreshMap = function() {
 			// Layer is defined by lat long fields
 			var lat = $tw.utils.parseNumber(widget.getAttribute("lat","0")),
 				long = $tw.utils.parseNumber(widget.getAttribute("long","0")),
-				alt = $tw.utils.parseNumber(widget.getAttribute("alt","0"));
+				alt = $tw.utils.parseNumber(widget.getAttribute("alt","0")),
+				properties = widget.getAttribute("properties");
 			geoJson = {
 				"type": "FeatureCollection",
 				"features": [
@@ -184,7 +194,11 @@ GeomapWidget.prototype.refreshMap = function() {
 					}
 				]
 			};
+			if(properties) {
+				geoJson.features[0].properties = $tw.utils.parseJSONSafe(properties);
+			}
 		}
+		// Create and add layer for the geojson
 		var draggable = widget.getAttribute("draggable","no") === "yes",
 			layer = $tw.Leaflet.geoJSON(geoJson,{
 				style: function(geoJsonFeature) {
@@ -199,17 +213,46 @@ GeomapWidget.prototype.refreshMap = function() {
 						var latlng = event.sourceTarget.getLatLng();
 						self.invokeActionString(widget.getAttribute("updateActions"),null,event,{
 							lat: latlng.lat,
-							long: latlng.lng
+							long: latlng.lng,
+							alt: latlng.alt
 						});
 					});
 					return marker;
 				},
 				onEachFeature: function(feature,layer) {
-					if(feature.properties) {
-						layer.bindPopup(JSON.stringify(feature.properties,null,4));
+					if(popupTemplateTitle) {
+						layer.bindPopup(function() {
+							var widget = self.wiki.makeTranscludeWidget(popupTemplateTitle, {
+									document: self.document,
+									parentWidget: self,
+									parseAsInline: false,
+									importPageMacros: true,
+									variables: {
+										feature: JSON.stringify(feature)
+									}
+							});
+							var container = self.document.createElement("div");
+							widget.render(container,null);
+							self.wiki.addEventListener("change",function(changes) {
+								widget.refresh(changes,container,null);
+							});
+							return container;
+						});
+					}
+					// Add event handlers
+					if(widget.hasAttribute("clickActions")) {
+						layer.on("click",function(event) {
+							self.invokeActionString(widget.getAttribute("clickActions"),null,event.originalEvent,{
+								lat: event.latlng.lat,
+								long: event.latlng.lng,
+								alt: event.latlng.alt,
+								properties: JSON.stringify(feature.properties)
+							});
+						});
 					}
 				}
 			}).addTo(self.map);
+		// Create a name for this layer
 		var name = widget.getAttribute("name") || ("Untitled " + untitledCount++);
 		self.renderedLayers.push({name: name, layer: layer});
 	});
@@ -226,20 +269,22 @@ GeomapWidget.prototype.refreshMap = function() {
 		overlayLayers[layer.name] = layer.layer;
 	});
 	this.layerControl = $tw.Leaflet.control.layers(baseLayers,overlayLayers,{
-		collapsed: this.geomapLayersPanel !== "open"
+		collapsed: this.getAttribute("layersPanel") !== "open"
 	}).addTo(this.map);
 	// Restore the saved map position and zoom level
 	if(!this.setMapView()) {
 		// If there was no saved position then look at the startPosition attribute
-		switch(this.geomapStartPosition) {
+		switch(this.getAttribute("startPosition")) {
 			case "bounds":
 				var bounds = null;
 				$tw.utils.each(this.renderedLayers,function(layer) {
 					var featureBounds = layer.layer.getBounds();
-					if(bounds) {
-						bounds.extend(featureBounds);
-					} else {
-						bounds = featureBounds;
+					if(featureBounds.isValid()) {
+						if(bounds) {
+							bounds.extend(featureBounds);
+						} else {
+							bounds = featureBounds;
+						}
 					}
 				});
 				if(bounds) {
@@ -259,7 +304,12 @@ GeomapWidget.prototype.refreshMap = function() {
 Set the map center and zoom level from the values in the state tiddler. Returns true if the map view was successfully set
 */
 GeomapWidget.prototype.setMapView = function() {
-	var stateTiddler = this.geomapStateTitle && this.wiki.getTiddler(this.geomapStateTitle);
+	// Set the maximum zoom level
+	if(this.hasAttribute("maxZoom")) {
+		this.map.setMaxZoom($tw.utils.parseInt(this.getAttribute("maxZoom")));
+	}
+	// Set the view to the content of the state tiddler
+	var stateTiddler = this.getAttribute("state") && this.wiki.getTiddler(this.getAttribute("state"));
 	if(stateTiddler) {
 		this.map.setView([$tw.utils.parseNumber(stateTiddler.fields.lat,0),$tw.utils.parseNumber(stateTiddler.fields.long,0)], $tw.utils.parseNumber(stateTiddler.fields.zoom,0));
 		return true;
@@ -267,13 +317,15 @@ GeomapWidget.prototype.setMapView = function() {
 	return false;
 };
 
+GeomapWidget.prototype.setMapSize = function() {
+	this.domNode.style.width = this.getAttribute("width","100%");
+	this.domNode.style.height = this.getAttribute("height","600px");
+};
+
 /*
 Compute the internal state of the widget
 */
 GeomapWidget.prototype.execute = function() {
-	this.geomapStateTitle = this.getAttribute("state");
-	this.geomapStartPosition = this.getAttribute("startPosition");
-	this.geomapLayersPanel = this.getAttribute("layersPanel");
 };
 
 /*
@@ -286,9 +338,12 @@ GeomapWidget.prototype.refresh = function(changedTiddlers) {
 	if(result) {
 		this.refreshMap();
 	} else {
+		// Reset the width and height and max zoom if they have changed
+		if(changedAttributes.width || changedAttributes.height) {
+			this.setMapSize();
+		}
 		// If we're not doing a full refresh, reset the position if the state tiddler has changed
-		if(changedAttributes.state || changedTiddlers[this.geomapStateTitle]) {
-			this.geomapStateTitle = this.getAttribute("state");
+		if(changedAttributes.state || (this.hasAttribute("state") && changedTiddlers[this.getAttribute("state")]) || changedAttributes.maxZoom) {
 			this.setMapView();
 		}
 	}

package/plugins/tiddlywiki/github-fork-ribbon/plugin.info

@@ -4,5 +4,5 @@
 	"description": "GitHub-inspired corner ribbon",
 	"author": "Simon Whitaker",
 	"list": "readme usage",
-	"stability": "STABILITY_0_DEPRECATED"
+	"stability": "STABILITY_2_STABLE"
 }

package/plugins/tiddlywiki/github-fork-ribbon/readme.tid

@@ -6,4 +6,4 @@ The ribbon can be positioned over any corner, and can incorporate user defined t
 
 The CSS stylesheet is adapted from work by [[Simon Whitaker|https://github.com/simonwhitaker/github-fork-ribbon-css/]]
 
-[[Plugin source code|https://github.com/Jermolene/TiddlyWiki5/blob/master/plugins/tiddlywiki/github-fork-ribbon]]
+[[Plugin source code|https://github.com/TiddlyWiki/TiddlyWiki5/blob/master/plugins/tiddlywiki/github-fork-ribbon]]

package/plugins/tiddlywiki/github-fork-ribbon/template.tid

@@ -11,7 +11,7 @@ left: offset from left in px - No ;
 right: offset from right in px - No ;
 fixed: "fixed" .. If ribbon is at the top, it can be "fixed". Bottom is always fixed
 -->
-\parameters (position:"right", url:"https://github.com/Jermolene/TiddlyWiki5", text:"Fork me on ~GitHub" color:"#aa0000" top:"0" bottom:"0" left:"0" right:"0" fixed:"")
+\parameters (position:"right", url:"https://github.com/TiddlyWiki/TiddlyWiki5", text:"Fork me on ~GitHub" color:"#aa0000" top:"0" bottom:"0" left:"0" right:"0" fixed:"")
 
 <style>
 {{$:/plugins/tiddlywiki/github-fork-ribbon/styles}}

package/plugins/tiddlywiki/github-fork-ribbon/usage.tid

@@ -6,11 +6,11 @@ title: $:/plugins/tiddlywiki/github-fork-ribbon/usage
 \end
 
 \procedure ribbonCreateActions()
-<% if [[$:/github-ribbon]!is[tiddler]] %>
+<%if [[$:/github-ribbon]!is[tiddler]] %>
 	<$action-setfield $tiddler="$:/github-ribbon" $field="text" $value=<<ribbonCode>>
 		tags="$:/tags/PageTemplate" 
 		code-body="yes" />
-<% endif %>
+<%endif%>
 <$action-navigate $to="$:/github-ribbon" />
 \end
 
@@ -18,9 +18,9 @@ title: $:/plugins/tiddlywiki/github-fork-ribbon/usage
 <$button actions=<<ribbonCreateActions>> >
 <%if [[$:/github-ribbon]!is[tiddler]] %>
 Create
-<% else %>
+<%else%>
 Show
-<% endif %> ~$:/github-ribbon
+<%endif%> ~$:/github-ribbon
 </$button>
 \end
 
@@ -49,7 +49,7 @@ Show
 : "right" (default), "left", "right-bottom" and "left-bottom"
 
 ; url
-: Target URL, default: https://github.com/Jermolene/TiddlyWiki5
+: Target URL, default: https://github.com/TiddlyWiki/TiddlyWiki5
 
 ; text
 : Ribbon text. default: `Fork me on ~GitHub`

package/plugins/tiddlywiki/googleanalytics/readme.tid

@@ -4,4 +4,4 @@ This plugin enables you to use Google Analytics to track access to your online T
 
 By default, the user is not asked for permission before initialising Google Analytics. This plugin also optionally integrates with the "Consent Banner" plugin (also found in the official plugin library) so that Google Analytics is not initialised until the user grants explicit permission.
 
-[[Source code|https://github.com/Jermolene/TiddlyWiki5/blob/master/plugins/tiddlywiki/googleanalytics]]
+[[Source code|https://github.com/TiddlyWiki/TiddlyWiki5/blob/master/plugins/tiddlywiki/googleanalytics]]

package/plugins/tiddlywiki/googleanalytics/settings.tid

@@ -1,4 +1,6 @@
 title: $:/plugins/tiddlywiki/googleanalytics/settings
+caption: Google Analytics
+tags: $:/tags/ControlPanel/SettingsTab
 
 ''[[Google Analytics Measurement ID|$:/GoogleAnalyticsMeasurementID]]'': (mandatory) a code of the form `G-XXXXXXXXXX` where X are digits or uppercase letters<br/><$edit-text tiddler="$:/GoogleAnalyticsMeasurementID" default="" tag="input"/>
 

package/plugins/tiddlywiki/help/help.tid

@@ -8,22 +8,22 @@ description: {{$:/language/Buttons/Help/Hint}}
 \whitespace trim
 <$list filter="[[$:/config/ShowHelp]get[text]] +[else[no]match[yes]]" variable="ignore">
 <$button set="$:/config/ShowHelp" setTo="no" tooltip={{$:/language/Buttons/Help/Hint}} aria-label={{$:/language/Buttons/Help/Caption}} class="""$(tv-config-toolbar-class)$ tc-selected""">
-<$list filter="[<tv-config-toolbar-icons>match[yes]]">
+<%if [<tv-config-toolbar-icons>match[yes]] %>
 {{$:/core/images/help}}
-</$list>
-<$list filter="[<tv-config-toolbar-text>match[yes]]">
+<%endif%>
+<%if [<tv-config-toolbar-text>match[yes]] %>
 <span class="tc-btn-text"><$text text={{$:/language/Buttons/Help/Caption}}/></span>
-</$list>
+<%endif%>
 </$button>
 </$list>
 <$list filter="[[$:/config/ShowHelp]get[text]] +[else[no]!match[yes]]" variable="ignore">
 <$button set="$:/config/ShowHelp" setTo="yes" tooltip={{$:/language/Buttons/Help/Hint}} aria-label={{$:/language/Buttons/Help/Caption}} class=<<tv-config-toolbar-class>>>
-<$list filter="[<tv-config-toolbar-icons>match[yes]]">
+<%if [<tv-config-toolbar-icons>match[yes]] %>
 {{$:/core/images/help}}
-</$list>
-<$list filter="[<tv-config-toolbar-text>match[yes]]">
+<%endif%>
+<%if [<tv-config-toolbar-text>match[yes]] %>
 <span class="tc-btn-text"><$text text={{$:/language/Buttons/Help/Caption}}/></span>
-</$list>
+<%endif%>
 </$button>
 </$list>
 \end

package/plugins/tiddlywiki/help/readme.tid

@@ -2,4 +2,4 @@ title: $:/plugins/tiddlywiki/help/readme
 
 This plugin provides an overlay help panel at the bottom right of the window.
 
-[[Source code|https://github.com/Jermolene/TiddlyWiki5/blob/master/plugins/tiddlywiki/help]]
+[[Source code|https://github.com/TiddlyWiki/TiddlyWiki5/blob/master/plugins/tiddlywiki/help]]

package/plugins/tiddlywiki/help/tabs/Support.tid

@@ -14,4 +14,4 @@ https://groups.google.com/group/TiddlyWiki
 
 Post bug reports to the ~TiddlyWiki ~GitHub repository:
 
-https://github.com/Jermolene/TiddlyWiki5
+https://github.com/TiddlyWiki/TiddlyWiki5

package/plugins/tiddlywiki/highlight/usage.tid

@@ -31,8 +31,8 @@ You can import language definitions into <$text text="JavaScript"/> tiddlers, wi
 
 First, locate the language file(s) you need. You can fetch the files from the following CDNs:
 
-* <a href=<<jsDelivrLink>>>jsDelivr</a>
-* <a href=<<unpkgLink>>>unpkg</a>
+* <a href=<<jsDelivrLink>> class="tc-tiddlylink-external" target="_blank">jsDelivr</a>
+* <a href=<<unpkgLink>> class="tc-tiddlylink-external" target="_blank">unpkg</a>
 
 Then, click the button below to create a "highlight" module. Copy and paste the content of a language file into the the text area. Give your tiddler a meaningful title so you can keep track of the languages you've installed. You may choose to either create one tiddler per language or lump all language definitions into one tiddler. Save and reload your wiki.
 

package/plugins/tiddlywiki/jasmine/readme.tid

@@ -2,7 +2,7 @@ title: $:/plugins/tiddlywiki/jasmine/readme
 
 This plugin provides a framework for running tests in the browser and under Node.js. It is based on [[Jasmine|https://jasmine.github.io/]] test framework. On Tiddlywiki, it runs tests in all javascript tiddlers tagged with <<tag $:/tags/test-spec>>.
 
-[[Source code|https://github.com/Jermolene/TiddlyWiki5/blob/master/plugins/tiddlywiki/jasmine]]
+[[Source code|https://github.com/TiddlyWiki/TiddlyWiki5/blob/master/plugins/tiddlywiki/jasmine]]
 
 !! Usage on Node.js
 

package/plugins/tiddlywiki/katex/config.tid

@@ -1,4 +1,6 @@
 title: $:/plugins/tiddlywiki/katex/config
+caption: KaTeX
+tags: $:/tags/ControlPanel/SettingsTab
 
 <div class="tc-control-panel">
 

package/plugins/tiddlywiki/katex/readme.tid

@@ -4,4 +4,4 @@ This is a TiddlyWiki plugin for mathematical and chemical typesetting based on [
 
 It is completely self-contained, and doesn't need an Internet connection in order to work. It works both in the browser and under Node.js.
 
-[[Source code|https://github.com/Jermolene/TiddlyWiki5/blob/master/plugins/tiddlywiki/katex]]
+[[Source code|https://github.com/TiddlyWiki/TiddlyWiki5/blob/master/plugins/tiddlywiki/katex]]

package/plugins/tiddlywiki/katex/styles.tid

@@ -7,7 +7,7 @@ tags: [[$:/tags/Stylesheet]]
 
 {{$:/plugins/tiddlywiki/katex/katex.min.css}}
 
-/* Force text-rendering  (see https://github.com/Jermolene/TiddlyWiki5/issues/2500) */
+/* Force text-rendering  (see https://github.com/TiddlyWiki/TiddlyWiki5/issues/2500) */
 
 .katex {
     text-rendering: auto;

package/plugins/tiddlywiki/katex/wrapper.js

@@ -21,7 +21,7 @@ katex.updateMacros = function() {
 	var tiddlers = $tw.wiki.getTiddlersWithTag("$:/tags/KaTeX/Macro"),
 		regex = /#\d/g, // Remove the arguments like #1#2
 		tid, macro, cmd;
-	for (var i=0; i < tiddlers.length; i++) {
+	for(var i=0; i < tiddlers.length; i++) {
 		tid = $tw.wiki.getTiddler(tiddlers[i]);
 		try {
 			macro = tid.fields["caption"];

package/plugins/tiddlywiki/markdown/EditorToolbar/picture-dropdown.tid

@@ -0,0 +1,24 @@
+title: $:/plugins/tiddlywiki/markdown/EditorToolbar/picture-dropdown
+
+\define replacement-text()
+![](<#$(escaped-text)$>)
+\end
+
+\define escapetitle() [()<>\\]
+
+''{{$:/language/Buttons/Picture/Hint}}''
+
+<$macrocall $name="image-picker" actions="""
+
+<$let escaped-text={{{ [<imageTitle>search-replace:g:regexp<escapetitle>,[\$&]] }}}>
+<$action-sendmessage
+	$message="tm-edit-text-operation"
+	$param="replace-selection"
+	text=<<replacement-text>>
+/>
+
+<$action-deletetiddler
+	$tiddler=<<dropdown-state>>
+/>
+</$let>
+"""/>

package/plugins/tiddlywiki/markdown/EditorToolbar/picture.tid

@@ -0,0 +1,10 @@
+title: $:/plugins/tiddlywiki/markdown/EditorToolbar/picture
+list-after: $:/core/ui/EditorToolbar/picture
+tags: $:/tags/EditorToolbar
+icon: $:/core/images/picture
+caption: {{$:/language/Buttons/Picture/Caption}} (Markdown)
+description: {{$:/language/Buttons/Picture/Hint}}
+condition: [<targetTiddler>type[text/x-markdown]] [<targetTiddler>type[text/markdown]]
+shortcuts: ((picture))
+dropdown: $:/plugins/tiddlywiki/markdown/EditorToolbar/picture-dropdown
+

package/plugins/tiddlywiki/markdown/EditorToolbar/strikethrough.tid

@@ -0,0 +1,15 @@
+title: $:/plugins/tiddlywiki/markdown/EditorToolbar/strikethrough
+list-after: $:/core/ui/EditorToolbar/strikethrough
+tags: $:/tags/EditorToolbar
+icon: $:/core/images/strikethrough
+caption: {{$:/language/Buttons/Strikethrough/Caption}} (Markdown)
+description: {{$:/language/Buttons/Strikethrough/Hint}}
+condition: [<targetTiddler>type[text/x-markdown]] [<targetTiddler>type[text/markdown]]
+shortcuts: ((strikethrough))
+
+<$action-sendmessage
+	$message="tm-edit-text-operation"
+	$param="wrap-selection"
+	prefix="~~"
+	suffix="~~"
+/>

package/plugins/tiddlywiki/markdown/EditorToolbar/subscript.tid

@@ -0,0 +1,15 @@
+title: $:/plugins/tiddlywiki/markdown/EditorToolbar/subscript
+list-after: $:/core/ui/EditorToolbar/subscript
+tags: $:/tags/EditorToolbar
+icon: $:/core/images/subscript
+caption: {{$:/language/Buttons/Subscript/Caption}} (Markdown)
+description: {{$:/language/Buttons/Subscript/Hint}}
+condition: [<targetTiddler>type[text/x-markdown]] [<targetTiddler>type[text/markdown]]
+shortcuts: ((subscript))
+
+<$action-sendmessage
+	$message="tm-edit-text-operation"
+	$param="wrap-selection"
+	prefix="~"
+	suffix="~"
+/>

package/plugins/tiddlywiki/markdown/EditorToolbar/superscript.tid

@@ -0,0 +1,15 @@
+title: $:/plugins/tiddlywiki/markdown/EditorToolbar/superscript
+list-after: $:/core/ui/EditorToolbar/superscript
+tags: $:/tags/EditorToolbar
+icon: $:/core/images/superscript
+caption: {{$:/language/Buttons/Superscript/Caption}} (Markdown)
+description: {{$:/language/Buttons/Superscript/Hint}}
+condition: [<targetTiddler>type[text/x-markdown]] [<targetTiddler>type[text/markdown]]
+shortcuts: ((superscript))
+
+<$action-sendmessage
+	$message="tm-edit-text-operation"
+	$param="wrap-selection"
+	prefix="^"
+	suffix="^"
+/>

package/plugins/tiddlywiki/markdown/editor-operations/make-markdown-link.js

@@ -13,15 +13,15 @@ Text editor operation to make a markdown link
 "use strict";
 
 exports["make-markdown-link"] = function(event,operation) {
-	var rx = /[()\\]/g, rs = '\\$&';
+	var rx = /[()<>\\]/g, rs = '\\$&';
 
 	if(operation.selection) {
 		var desc = operation.selection.replace(/[\[\]\\]/g, rs);
 
 		if(event.paramObject.text.indexOf("://") !== -1) {
-			operation.replacement = "[" + desc + "](" + event.paramObject.text.replace(rx, rs) + ")";
+			operation.replacement = "[" + desc + "](" + event.paramObject.text.replace(/[()\\]/g, rs) + ")";
 		} else {
-			operation.replacement = "[" + desc + "](#" + encodeURIComponent(event.paramObject.text).replace(rx, rs) + ")";
+			operation.replacement = "[" + desc + "](<#" + event.paramObject.text.replace(rx, rs) + ">)";
 		}
 		operation.cutStart = operation.selStart;
 		operation.cutEnd = operation.selEnd;
@@ -31,7 +31,7 @@ exports["make-markdown-link"] = function(event,operation) {
 				return encodeURI(m);
 			}) + ">";
 		} else {
-			operation.replacement = "[](#" + encodeURIComponent(event.paramObject.text).replace(rx, rs) + ")";
+			operation.replacement = "[](<#" + event.paramObject.text.replace(rx, rs) + ">)";
 		}
 		operation.cutStart = operation.selStart;
 		operation.cutEnd = operation.selEnd;

package/plugins/tiddlywiki/markdown/markdown-it-katex.js

@@ -31,17 +31,17 @@ function isValidDelim(state, pos) {
 
     // Check non-whitespace conditions for opening and closing, and
     // check that closing delimeter isn't followed by a number
-    if (prevChar === 0x20/* " "  */ || prevChar === 0x09/* \t */ ||
+    if(prevChar === 0x20/* " "  */ || prevChar === 0x09/* \t */ ||
         prevChar === 0x0d/* "\r" */ || prevChar === 0x0a/* \n */ ||
         (nextChar >= 0x30/* "0"  */ && nextChar <=  0x39/* "9" */)) {
         can_close = false;
     }
-    if (nextChar === 0x20/* " "  */ || nextChar === 0x09/* \t */ ||
+    if(nextChar === 0x20/* " "  */ || nextChar === 0x09/* \t */ ||
         nextChar === 0x0d/* "\r" */ || nextChar === 0x0a/* \ns */) {
         can_open = false;
     }
 
-    if (state.src.substring(pos,pos+3) === "$:/") {
+    if(state.src.substring(pos,pos+3) === "$:/") {
         can_open = false;
         can_close = false;
     }
@@ -55,11 +55,11 @@ function isValidDelim(state, pos) {
 function math_inline(state, silent) {
     var start, match, token, res, pos, esc_count;
 
-    if (state.src[state.pos] !== "$") { return false; }
+    if(state.src[state.pos] !== "$") { return false; }
 
     res = isValidDelim(state, state.pos);
-    if (!res.can_open) {
-        if (!silent) { state.pending += "$"; }
+    if(!res.can_open) {
+        if(!silent) { state.pending += "$"; }
         state.pos += 1;
         return true;
     }
@@ -70,40 +70,40 @@ function math_inline(state, silent) {
     // we have found an opening delimieter already.
     start = state.pos + 1;
     match = start;
-    while ( (match = state.src.indexOf("$", match)) !== -1) {
+    while( (match = state.src.indexOf("$", match)) !== -1) {
         // Found potential $, look for escapes, pos will point to
         // first non escape when complete
         pos = match - 1;
-        while (state.src[pos] === "\\") { pos -= 1; }
+        while(state.src[pos] === "\\") { pos -= 1; }
 
         // Even number of escapes, potential closing delimiter found
-        if ( ((match - pos) % 2) == 1 ) { break; }
+        if( ((match - pos) % 2) == 1 ) { break; }
         match += 1;
     }
 
     // No closing delimter found.  Consume $ and continue.
-    if (match === -1) {
-        if (!silent) { state.pending += "$"; }
+    if(match === -1) {
+        if(!silent) { state.pending += "$"; }
         state.pos = start;
         return true;
     }
 
     // Check if we have empty content, ie: $$.  Do not parse.
-    if (match - start === 0) {
-        if (!silent) { state.pending += "$$"; }
+    if(match - start === 0) {
+        if(!silent) { state.pending += "$$"; }
         state.pos = start + 1;
         return true;
     }
 
     // Check for valid closing delimiter
     res = isValidDelim(state, match);
-    if (!res.can_close) {
-        if (!silent) { state.pending += "$"; }
+    if(!res.can_close) {
+        if(!silent) { state.pending += "$"; }
         state.pos = start;
         return true;
     }
 
-    if (!silent) {
+    if(!silent) {
         token         = state.push('math_inline', '$latex', 0);
         token.markup  = "$";
         token.content = state.src.slice(start, match);
@@ -126,32 +126,32 @@ function math_inline_block(state, silent) {
     // we have found an opening delimieter already.
     start = state.pos + 2;
     match = start;
-    while ( (match = state.src.indexOf("$$", match)) !== -1) {
+    while( (match = state.src.indexOf("$$", match)) !== -1) {
         // Found potential $$, look for escapes, pos will point to
         // first non escape when complete
         pos = match - 1;
-        while (state.src[pos] === "\\") { pos -= 1; }
+        while(state.src[pos] === "\\") { pos -= 1; }
 
         // Even number of escapes, potential closing delimiter found
-        if ( ((match - pos) % 2) == 1 ) { break; }
+        if( ((match - pos) % 2) == 1 ) { break; }
         match += 2;
     }
 
     // No closing delimter found.  Consume $$ and continue.
-    if (match === -1) {
-        if (!silent) { state.pending += "$$"; }
+    if(match === -1) {
+        if(!silent) { state.pending += "$$"; }
         state.pos = start;
         return true;
     }
 
     // Check if we have empty content, ie: $$$$.  Do not parse.
-    if (match - start === 0) {
-        if (!silent) { state.pending += "$$$$"; }
+    if(match - start === 0) {
+        if(!silent) { state.pending += "$$$$"; }
         state.pos = start + 2;
         return true;
     }
 
-    if (!silent) {
+    if(!silent) {
         token         = state.push('math_inline_block', '$latex', 0);
         token.block   = true;
         token.markup  = "$$";

package/plugins/tiddlywiki/markdown/new-markdown.tid

@@ -7,10 +7,10 @@ list-after: $:/core/ui/Buttons/new-tiddler
 \whitespace trim
 <$button tooltip={{$:/language/Buttons/NewMarkdown/Hint}} aria-label={{$:/language/Buttons/NewMarkdown/Caption}} class=<<tv-config-toolbar-class>>>
 <$action-sendmessage $message="tm-new-tiddler" type="text/markdown"/>
-<$list filter="[<tv-config-toolbar-icons>match[yes]]">
+<%if [<tv-config-toolbar-icons>match[yes]] %>
 {{$:/plugins/tiddlywiki/markdown/images/new-markdown-button}}
-</$list>
-<$list filter="[<tv-config-toolbar-text>match[yes]]">
+<%endif%>
+<%if [<tv-config-toolbar-text>match[yes]] %>
 <span class="tc-btn-text"><$text text={{$:/language/Buttons/NewMarkdown/Caption}}/></span>
-</$list>
+<%endif%>
 </$button>