From ef03a4a5df787fae5c83eb6eed0885ec23b1ec97 Mon Sep 17 00:00:00 2001
From: "jeremy@jermolene.com" <jeremy@jermolene.com>
Date: Fri, 24 Feb 2023 09:51:45 +0000
Subject: [PATCH 1/4] Markdown Plugin: Default to recognising TiddlyWiki-format
 links

Fixes #7275
---
 plugins/tiddlywiki/markdown/config.multids | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/tiddlywiki/markdown/config.multids b/plugins/tiddlywiki/markdown/config.multids
index bb666812f..6d592bec3 100644
--- a/plugins/tiddlywiki/markdown/config.multids
+++ b/plugins/tiddlywiki/markdown/config.multids
@@ -7,5 +7,5 @@ markdown/breaks: false
 markdown/linkify: false
 markdown/quotes: “”‘’
 markdown/renderWikiText: true
-markdown/renderWikiTextPragma: \rules only html entity syslink wikilink commentblock commentinline macrocallblock macrocallinline transcludeblock transcludeinline filteredtranscludeblock filteredtranscludeinline
+markdown/renderWikiTextPragma: \rules only html entity syslink prettylink image prettyextlink wikilink commentblock commentinline macrocallblock macrocallinline transcludeblock transcludeinline filteredtranscludeblock filteredtranscludeinline
 markdown/typographer: false
\ No newline at end of file

From eb8f4d66b957b4a3ef2633bd89f6cfdd442a1a19 Mon Sep 17 00:00:00 2001
From: cdruan <80615570+cdruan@users.noreply.github.com>
Date: Fri, 24 Feb 2023 07:41:29 -0800
Subject: [PATCH 2/4] Markdown Plugin: Handle non-string attr values in
 tw_image() (#7284)

---
 .../markdown/markdown-it-tiddlywiki.js        | 25 ++++++++++++++++---
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/plugins/tiddlywiki/markdown/markdown-it-tiddlywiki.js b/plugins/tiddlywiki/markdown/markdown-it-tiddlywiki.js
index 03518d850..7870cb8c4 100644
--- a/plugins/tiddlywiki/markdown/markdown-it-tiddlywiki.js
+++ b/plugins/tiddlywiki/markdown/markdown-it-tiddlywiki.js
@@ -103,8 +103,9 @@ function render_tw_expr(tokens,idx) {
 	return tokens[idx].content;
 }
 
-// Overwrite default: render attribute strings in e"..." format instead,
-// so HTML entities can be decoded. See parseStringLiteralExt() below.
+// Overwrite default: attribute values can be either a string or {type;, value:}.
+// 1) string attr val: render in e"..." format so HTML entities can be decoded.
+// 2) object attr val: render value as is.
 function render_token_attrs(token) {
 	var i, l, result;
 
@@ -113,7 +114,11 @@ function render_token_attrs(token) {
 	result = '';
 
 	for(i=0, l=token.attrs.length; i<l; i++) {
-		result += ' ' + md.utils.escapeHtml(token.attrs[i][0]) + '=e"' + md.utils.escapeHtml(token.attrs[i][1]) + '"';
+		if(typeof token.attrs[i][1] === "object" && token.attrs[i][1] !== null) {
+			result += ' ' + md.utils.escapeHtml(token.attrs[i][0]) + '=' + token.attrs[i][1].value;
+		} else {
+			result += ' ' + md.utils.escapeHtml(token.attrs[i][0]) + '=e"' + md.utils.escapeHtml(token.attrs[i][1]) + '"';
+		}
 	}
 
 	return result;
@@ -264,7 +269,19 @@ function tw_image(state,silent) {
 		var twNode = ruleinfo.rule.parse()[0];
 		var token = state.push('$image','$image',0);
 		$tw.utils.each(twNode.attributes,function(attr,id) {
-			token.attrSet(id,attr.value);
+			switch(attr.type) {
+				case "filtered":
+					token.attrSet(id,{ type: "filtered", value: "{{{" + attr.filter + "}}}" });
+					break;
+				case "indirect":
+					token.attrSet(id,{ type: "indirect", value: "{{" + attr.textReference + "}}" });
+					break;
+				case "macro":
+					token.attrSet(id,{ type: "macro", value: ruleinfo.rule.parser.source.substring(attr.value.start,attr.value.end) });
+					break;
+				default:
+					token.attrSet(id,attr.value);
+			}
 		});
 		token.markup = 'tw_image';
 	}

From 925ce2b505bdd20352eb53a14dfac7033617e70a Mon Sep 17 00:00:00 2001
From: andrigamerita <37557992+andrigamerita@users.noreply.github.com>
Date: Fri, 24 Feb 2023 17:51:30 +0100
Subject: [PATCH 3/4] Add meta viewport to StaticRiver (#6953)

StaticRiver HTML didn't feature a <meta name="viewport" line, which made single-page full wiki static exports look bad on mobile.
---
 core/templates/exporters/StaticRiver.tid | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/templates/exporters/StaticRiver.tid b/core/templates/exporters/StaticRiver.tid
index 4583bc1ce..a22cfb98a 100644
--- a/core/templates/exporters/StaticRiver.tid
+++ b/core/templates/exporters/StaticRiver.tid
@@ -14,6 +14,7 @@ extension: .html
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <meta name="generator" content="TiddlyWiki" />
 <meta name="tiddlywiki-version" content="{{$:/core/templates/version}}" />
+<meta name="viewport" content="width=device-width, initial-scale=1.0" />
 <meta name="format-detection" content="telephone=no">
 <link id="faviconLink" rel="shortcut icon" href="favicon.ico">
 <title>{{$:/core/wiki/title}}</title>

From 8c378e0d24e9f4b8986316bc17f077b894d1eb30 Mon Sep 17 00:00:00 2001
From: "jeremy@jermolene.com" <jeremy@jermolene.com>
Date: Sat, 25 Feb 2023 13:41:13 +0000
Subject: [PATCH 4/4] Let widget should specify a default value for variables

Fixes #7270
---
 core/modules/widgets/let.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/modules/widgets/let.js b/core/modules/widgets/let.js
index afd3a2f20..dd3aa137a 100644
--- a/core/modules/widgets/let.js
+++ b/core/modules/widgets/let.js
@@ -74,7 +74,9 @@ LetWidget.prototype.getVariableInfo = function(name,options) {
 			text: this.currentValueFor[name]
 		};
 	}
-	return Widget.prototype.getVariableInfo.call(this,name,options);
+	return Widget.prototype.getVariableInfo.call(this,name,$tw.utils.extend(Object.create(null),options,{
+		defaultValue: ""
+	}));
 };
 
 /*