Module:Color - Revision history

Hike395: protect against junk value

2024-09-23T02:01:10Z

protect against junk value

← Previous revision		Revision as of 02:01, 23 September 2024
Line 360:		Line 360:
	return ""		return ""
	end		end
	local t = args[3]		local t = tonumber(args[3])
	if ~~(isempty(~~t)) then		if not t then
	t = 0.5		t = 0.5
	else		else
	t = tonumber(t)
	local min = tonumber(args.min) or 0		local min = tonumber(args.min) or 0
	local max = tonumber(args.max) or 100		local max = tonumber(args.max) or 100

HCerisu at 11:06, 15 July 2022

2022-07-15T11:06:10Z

← Previous revision		Revision as of 11:06, 15 July 2022
Line 219:		Line 219:
	function p.rgbTripletToHex(frame)		function p.rgbTripletToHex(frame)
	local args = frame.args or frame:getParent().args		local args = frame.args or frame:getParent().args
	local r = args[1]		local r = tonumber(args[1])
	local g = args[2]		local g = tonumber(args[2])
	local b = args [3]		local b = tonumber(args [3])
	if (isempty(r) or isempty(g) or isempty(b)) then		if (isempty(r) or isempty(g) or isempty(b)) then
	return ""		return ""

HCerisu: Fix silly mistake

2022-07-15T11:02:36Z

Fix silly mistake

← Previous revision		Revision as of 11:02, 15 July 2022
Line 218:		Line 218:

	function p.rgbTripletToHex(frame)		function p.rgbTripletToHex(frame)
			local args = frame.args or frame:getParent().args
	local r = args[1]		local r = args[1]
	local g = args[2]		local g = args[2]

HCerisu: Added function to convert RGB triplet to hex code

2022-07-15T10:50:41Z

Added function to convert RGB triplet to hex code

@@ Line 214: / Line 214: @@
 	else
 		return ""
 	end
 end

Ftrebien at 14:57, 26 January 2022

2022-01-26T14:57:44Z

← Previous revision		Revision as of 14:57, 26 January 2022
Line 1:		Line 1:
			-- Introduction: https://colorspace.r-forge.r-project.org/articles/color_spaces.html

	local p = {}		local p = {}

Ftrebien: Convenience range mapping

2022-01-17T14:21:51Z

Convenience range mapping

← Previous revision		Revision as of 14:21, 17 January 2022
Line 351:		Line 351:
	else		else
	t = tonumber(t)		t = tonumber(t)
			local min = tonumber(args.min) or 0
⚫	if (t < 0) then
			local max = tonumber(args.max) or 100
		⚫	if (min >= max) then
			error("Minimum proportion greater than or equal to maximum")
			elseif (t < min) then
	t = 0		t = 0
	elseif (t > ~~100~~) then		elseif (t > max) then
	t = 1		t = 1
	else		else
	t = t / ~~100~~		t = (t - min) / (max - min)
	end		end
	end		end

Ftrebien: Added color mixing

2022-01-17T13:39:35Z

Added color mixing

@@ Line 1: / Line 1: @@
 local p = {}
 local function hexToRgb(color)
@@ Line 17: / Line 21: @@
 	end
 	error("Invalid hexadecimal color " .. cleanColor, 1)
 end
@@ Line 99: / Line 115: @@
 -- c in [0, 255], condition tweaked for no discontinuity
 -- http://entropymine.com/imageworsener/srgbformula/
-local function inverseCompanding(c)
+local function toLinear(c)
 	if (c > 10.314300250662591) then
 		return math.pow((c + 14.025) / 269.025, 2.4)
 	else
 		return c / 3294.6
 	end
 end
@@ Line 111: / Line 135: @@
 		error("Color level out of bounds")
 	end
-	local R = inverseCompanding(r)
+	local R = toLinear(r)
-	local G = inverseCompanding(g)
+	local G = toLinear(g)
-	local B = inverseCompanding(b)
+	local B = toLinear(b)
 	-- https://github.com/w3c/csswg-drafts/issues/5922
 	local X = 0.1804807884018343 * B + 0.357584339383878 * G + 0.41239079926595934 * R
@@ Line 151: / Line 175: @@
 	end
 	return { L = L, C = C, h = h }
 end
@@ Line 298: / Line 337: @@
 		return ""
 	end
 end

Ftrebien: Corrections and optimization

2022-01-15T00:06:25Z

Corrections and optimization

← Previous revision		Revision as of 00:06, 15 January 2022
Line 2:		Line 2:

	local function hexToRgb(color)		local function hexToRgb(color)
	cleanColor = color:gsub("#", "#"):match('^[%s#](.-)[%s;]$')		local cleanColor = color:gsub("#", "#"):match('^[%s#](.-)[%s;]$')
	if (#cleanColor == 6) then		if (#cleanColor == 6) then
	return {		return {
Line 44:		Line 44:
	error("Color level out of bounds")		error("Color level out of bounds")
	end		end
	channelMax = math.max(r, g, b)		local channelMax = math.max(r, g, b)
	channelMin = math.min(r, g, b)		local channelMin = math.min(r, g, b)
	range = channelMax - channelMin		local range = channelMax - channelMin
			local h, s
	if (range == 0) then		if (range == 0) then
	h = 0		h = 0
Line 59:		Line 60:
	h = 60 * (4 + (r - g) / range)		h = 60 * (4 + (r - g) / range)
	end		end
	L = channelMax + channelMin		local L = channelMax + channelMin
	if (L == 0 or L == 510) then		if (L == 0 or L == 510) then
	s = 0		s = 0
Line 72:		Line 73:
	error("Color level out of bounds")		error("Color level out of bounds")
	end		end
	channelMax = math.max(r, g, b)		local channelMax = math.max(r, g, b)
	channelMin = math.min(r, g, b)		local channelMin = math.min(r, g, b)
	range = channelMax - channelMin		local range = channelMax - channelMin
			local h, s
	if (range == 0) then		if (range == 0) then
	h = 0		h = 0
Line 109:		Line 111:
	error("Color level out of bounds")		error("Color level out of bounds")
	end		end
	R = inverseCompanding(r)		local R = inverseCompanding(r)
	G = inverseCompanding(g)		local G = inverseCompanding(g)
	B = inverseCompanding(b)		local B = inverseCompanding(b)
	-- https://github.com/w3c/csswg-drafts/issues/5922		-- https://github.com/w3c/csswg-drafts/issues/5922
	X = 0.1804807884018343 * B + 0.357584339383878 * G + 0.41239079926595934 * R		local X = 0.1804807884018343 * B + 0.357584339383878 * G + 0.41239079926595934 * R
	Y = 0.07219231536073371 * B + 0.21263900587151027 * R + 0.715168678767756 * G		local Y = 0.07219231536073371 * B + 0.21263900587151027 * R + 0.715168678767756 * G
	Z = 0.01933081871559182 * R + 0.11919477979462598 * G + 0.9505321522496607 * B		local Z = 0.01933081871559182 * R + 0.11919477979462598 * G + 0.9505321522496607 * B
			local L, C, h
	if (Y > 0.00885645167903563082) then		if (Y > 0.00885645167903563082) then
	L = 116 * math.pow(Y, 1/3) - 16		L = 116 * math.pow(Y, 1/3) - 16
Line 121:		Line 124:
	L = Y * 903.2962962962962962963		L = Y * 903.2962962962962962963
	end		end
	if (r == g and g == b) then		if ((r == g and g == b) or L == 0) then
	C = 0		C = 0
	h = 0		h = 0
Line 132:		Line 135:
	-- 0.19783... and 0.4631... computed with extra precision from (X,Y,Z) when (R,G,B) = (1,1,1),		-- 0.19783... and 0.4631... computed with extra precision from (X,Y,Z) when (R,G,B) = (1,1,1),
	-- in which case (u,v) ≈ (0,0)		-- in which case (u,v) ≈ (0,0)
	u = ~~13 * L * (~~4 * X / d - 0.19783000664283678994)		local us = 4 * X / d - 0.19783000664283678994
	v = ~~13 * L * (~~9 * Y / d - 0.46831999493879099801)		local vs = 9 * Y / d - 0.46831999493879099801
	h = math.atan2(v, u) * 57.2957795130823208768		h = math.atan2(vs, us) * 57.2957795130823208768
	if (h < 0) then		if (h < 0) then
	h = h + 360		h = h + 360
Line 140:		Line 143:
	h = 0 -- ensure zero is positive		h = 0 -- ensure zero is positive
	end		end
	C = math.sqrt(u * u + v * v)		C = math.sqrt(us * us + vs * vs) * 13 * L
	if (C == 0) then		if (C == 0) then
	C = 0		C = 0

Ftrebien: Optimization

2022-01-14T23:46:03Z

Optimization

← Previous revision		Revision as of 23:46, 14 January 2022
Line 183:		Line 183:
	local fk = formatToPrecision(cmyk.k, p)		local fk = formatToPrecision(cmyk.k, p)
	local fc, fm, fy		local fc, fm, fy
	if ~~(fk~~ == ~~100 ..~~ getFractionalZeros(p)~~) then~~		local fracZeros = getFractionalZeros(p)
	~~local~~ ~~fZero~~ = 0 .. ~~getFractionalZeros(p~~)		if (fk == 100 .. fracZeros) then
			local fZero = 0 .. fracZeros
	fc = fZero		fc = fZero
	fm = fZero		fm = fZero

Ftrebien: Handle rounding in corner cases

2022-01-14T23:39:43Z

Handle rounding in corner cases

Show changes