Colour handling improvements

core/modules/filters/colour-ops.js

@@ -0,0 +1,50 @@
+/*\
+title: $:/core/modules/filters/colour-ops.js
+type: application/javascript
+module-type: filteroperator
+
+Filter operators for colour operations
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+var Color = require("$:/core/modules/utils/dom/color.js").Color;
+
+exports["colour-lighten"] = makeColourOperator(function (c, operator, options) {
+	return c.lighten($tw.utils.parseNumber(operator.operand));
+});
+
+exports["colour-darken"] = makeColourOperator(function (c, operator, options) {
+	return c.darken($tw.utils.parseNumber(operator.operand));
+});
+
+exports["colour-oklch"] = makeColourOperator(function (c, operator, options) {
+	var prop = ((operator.suffixes || [])[0] || ["l"])[0];
+console.log("Prop",prop,$tw.utils.parseNumber(operator.operand))
+	if(["l","c","h"].indexOf(prop) !== -1) {
+		c.oklch[prop] = $tw.utils.parseNumber(operator.operand);
+	}
+	return c;
+});
+
+function makeColourOperator(fn) {
+	return function (source, operator, options) {
+		var results = [];
+		source(function (tiddler, title) {
+			var c = $tw.utils.parseCSSColorObject(title);
+			if (c) {
+				c = fn(c, operator, options);
+				results.push(c.display().toString());
+			} else {
+				results.push("");
+			}
+		});
+		return results;
+	};
+}
+
+})();

core/modules/filters/wikify.js

@@ -0,0 +1,37 @@
+/*\
+title: $:/core/modules/filters/wikify.js
+type: application/javascript
+module-type: filteroperator
+
+Filter operator wikifying each string in the input list and returning the result as a list of strings
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+/*
+Export our filter function
+*/
+exports.wikify = function(source,operator,options) {
+	var output = operator.operands[0],
+		mode = operator.operands[1],
+		type = operator.operands[2],
+		results = [];
+	source(function(tiddler,title) {
+		var wikifier = new $tw.utils.Wikifier({
+			wiki: options.wiki,
+			widget: options.widget,
+			text: title,
+			type: type,
+			mode: mode,
+			output: output
+		});
+		results.push(wikifier.getResult());
+	});
+	return results;
+};
+
+})();

core/modules/utils/dom/color-utils.js

@@ -0,0 +1,45 @@
+/*\
+title: $:/core/modules/utils/color-utils.js
+type: application/javascript
+module-type: utils
+
+Color.js related utilities
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+var Color = require("$:/core/modules/utils/dom/color.js").Color;
+
+/*
+For backwards compatibility
+*/
+exports.parseCSSColor = function(colourString) {
+	var c = exports.parseCSSColorObject(colourString);
+	if(c) {
+		var rgb = c.srgb;
+		return [rgb[0],rgb[1],rgb[2],c.alpha];
+	} else {
+		return null;
+	}
+};
+
+
+/*
+Preferred way to parse a Color.js colour
+*/
+exports.parseCSSColorObject = function(colourString) {
+	var Color = require("$:/core/modules/utils/dom/color.js").Color,
+		c = null;
+	try {
+		c = new Color(colourString);
+	} catch(e) {
+		// Return null if there is an error
+	}
+	return c;
+};
+
+})();

core/modules/utils/dom/color.js/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2021 Lea Verou, Chris Lilley
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.