Merge branch 'master' into colour-improvements

boot/boot.js

@@ -2467,9 +2467,10 @@ $tw.boot.initStartup = function(options) {
 	$tw.utils.registerFileType("image/vnd.microsoft.icon","base64",".ico",{flags:["image"]});
 	$tw.utils.registerFileType("image/x-icon","base64",".ico",{flags:["image"]});
 	$tw.utils.registerFileType("application/wasm","base64",".wasm");
-	$tw.utils.registerFileType("application/font-woff","base64",".woff");
-	$tw.utils.registerFileType("application/x-font-ttf","base64",".woff");
-	$tw.utils.registerFileType("application/font-woff2","base64",".woff2");
+	$tw.utils.registerFileType("font/woff","base64",".woff");
+	$tw.utils.registerFileType("font/woff2","base64",".woff2");
+	$tw.utils.registerFileType("font/ttf","base64",".ttf");
+	$tw.utils.registerFileType("font/otf","base64",".otf");
 	$tw.utils.registerFileType("audio/ogg","base64",".ogg");
 	$tw.utils.registerFileType("audio/mp4","base64",[".mp4",".m4a"]);
 	$tw.utils.registerFileType("video/ogg","base64",[".ogm",".ogv",".ogg"]);

core/modules/saver-handler.js

@@ -46,8 +46,10 @@ function SaverHandler(options) {
 			// Filter the changes so that we only count changes to tiddlers that we care about
 			var filteredChanges = self.filterFn.call(self.wiki,function(iterator) {
 				$tw.utils.each(changes,function(change,title) {
-					var tiddler = self.wiki.getTiddler(title);
-					iterator(tiddler,title);
+					if(change.normal) {
+						var tiddler = self.wiki.getTiddler(title);
+						iterator(tiddler,title);
+					}
 				});
 			});
 			// Adjust the number of changes

core/modules/startup/plugins.js

@@ -75,7 +75,7 @@ exports.startup = function() {
 				$tw.wiki.unpackPluginTiddlers();
 				// Queue change events for the changed shadow tiddlers
 				$tw.utils.each(Object.keys(changedShadowTiddlers),function(title) {
-					$tw.wiki.enqueueTiddlerEvent(title,changedShadowTiddlers[title]);
+					$tw.wiki.enqueueTiddlerEvent(title,changedShadowTiddlers[title], true);
 				});
 			}
 		}

core/modules/wiki.js

@@ -141,12 +141,15 @@ This method should be called after the changes it describes have been made to th
 	title: Title of tiddler
 	isDeleted: defaults to false (meaning the tiddler has been created or modified),
 		true if the tiddler has been deleted
+	isShadow: defaults to false (meaning the change applies to the normal tiddler),
+		true if the tiddler being changed is a shadow tiddler
 */
-exports.enqueueTiddlerEvent = function(title,isDeleted) {
+exports.enqueueTiddlerEvent = function(title,isDeleted,isShadow) {
 	// Record the touch in the list of changed tiddlers
 	this.changedTiddlers = this.changedTiddlers || Object.create(null);
 	this.changedTiddlers[title] = this.changedTiddlers[title] || Object.create(null);
 	this.changedTiddlers[title][isDeleted ? "deleted" : "modified"] = true;
+	this.changedTiddlers[title][isShadow ? "shadow" : "normal"] = true;
 	// Increment the change count
 	this.changeCount = this.changeCount || Object.create(null);
 	if($tw.utils.hop(this.changeCount,title)) {

licenses/cla-individual.md

@@ -605,3 +605,5 @@ Thomas E Tuoti, @well-noted, 2024/12/16
 @opn, 2025/01/04
 
 J. Ryan Stinnett, @jryans, 2025/01/04
+
+Galen Huntington, @galenhuntington, 2025/01/19

plugins/tiddlywiki/katex/files/tiddlywiki.files

@@ -6,7 +6,7 @@
 			"isTiddlerFile": false,
 			"fields": {
 				"title": {"source": "filename", "prefix": "$:/plugins/tiddlywiki/katex/fonts/"},
-				"type": "application/font-woff"
+				"type": "font/woff"
 			}
 		}
 	],
@@ -37,4 +37,4 @@
 			"suffix": "})(require);\n"
 		}
 	]
-}
+}

themes/tiddlywiki/starlight/arvo.woff.meta

@@ -1,2 +1,2 @@
 title: $:/themes/tiddlywiki/starlight/arvo.woff
-type: application/font-woff
+type: font/woff