모듈:Color contrast - 편집 역사

imported>Johnuniq: fix unintended color2lum global error which is causing errors; clean whitespace

2019-01-06T22:38:25Z

fix unintended color2lum global error which is causing errors; clean whitespace

← 이전 판		2019년 1월 7일 (월) 07:38 판
1번째 줄:		1번째 줄:
	--		--
	-- This module implements		-- This module implements
	-- {{Color contrast ratio}}		-- {{Color contrast ratio}}
	-- {{Greater color contrast ratio}}		-- {{Greater color contrast ratio}}
9번째 줄:		9번째 줄:
	local HTMLcolor = mw.loadData( 'Module:Color contrast/colors' )		local HTMLcolor = mw.loadData( 'Module:Color contrast/colors' )

	local function sRGB (v)		local function sRGB (v)
	if (v <= 0.03928) then		if (v <= 0.03928) then
	v = v / 12.92		v = v / 12.92
	else		else
56번째 줄:		56번째 줄:
	return ''		return ''
	end		end
	~~end~~

	~~-- This exports the function for use in other modules.~~
	~~-- The colour is passed as a string.~~
	~~function p._lum(color)~~
	~~return color2lum(color)~~
	end		end

88번째 줄:		82번째 줄:
	end		end

	-- convert from hsl		-- convert from hsl
	if mw.ustring.match(c,'^hsl%([%s][0-9][0-9%.][%s],[%s][0-9][0-9%.]%%[%s],[%s][0-9][0-9%.]%%[%s]*%)$') then		if mw.ustring.match(c,'^hsl%([%s][0-9][0-9%.][%s],[%s][0-9][0-9%.]%%[%s],[%s][0-9][0-9%.]%%[%s]*%)$') then
	local h, s, l = mw.ustring.match(c,'^hsl%([%s]([0-9][0-9%.])[%s],[%s]([0-9][0-9%.])%%[%s],[%s]([0-9][0-9%.])%%[%s]*%)$')		local h, s, l = mw.ustring.match(c,'^hsl%([%s]([0-9][0-9%.])[%s],[%s]([0-9][0-9%.])%%[%s],[%s]([0-9][0-9%.])%%[%s]*%)$')
	return hsl2lum(tonumber(h), tonumber(s)/100, tonumber(l)/100)		return hsl2lum(tonumber(h), tonumber(s)/100, tonumber(l)/100)
	end		end

	-- convert from rgb		-- convert from rgb
	if mw.ustring.match(c,'^rgb%([%s][0-9][0-9][%s],[%s][0-9][0-9][%s],[%s][0-9][0-9][%s]*%)$') then		if mw.ustring.match(c,'^rgb%([%s][0-9][0-9][%s],[%s][0-9][0-9][%s],[%s][0-9][0-9][%s]*%)$') then
	local R, G, B = mw.ustring.match(c,'^rgb%([%s]([0-9][0-9])[%s],[%s]([0-9][0-9])[%s],[%s]([0-9][0-9])[%s]*%)$')		local R, G, B = mw.ustring.match(c,'^rgb%([%s]([0-9][0-9])[%s],[%s]([0-9][0-9])[%s],[%s]([0-9][0-9])[%s]*%)$')
	return rgbdec2lum(tonumber(R), tonumber(G), tonumber(B))		return rgbdec2lum(tonumber(R), tonumber(G), tonumber(B))
	end		end

	-- convert from rgb percent		-- convert from rgb percent
	if mw.ustring.match(c,'^rgb%([%s][0-9][0-9%.]%%[%s],[%s][0-9][0-9%.]%%[%s],[%s][0-9][0-9%.]%%[%s]*%)$') then		if mw.ustring.match(c,'^rgb%([%s][0-9][0-9%.]%%[%s],[%s][0-9][0-9%.]%%[%s],[%s][0-9][0-9%.]%%[%s]*%)$') then
	local R, G, B = mw.ustring.match(c,'^rgb%([%s]([0-9][0-9%.])%%[%s],[%s]([0-9][0-9%.])%%[%s],[%s]([0-9][0-9%.])%%[%s]*%)$')		local R, G, B = mw.ustring.match(c,'^rgb%([%s]([0-9][0-9%.])%%[%s],[%s]([0-9][0-9%.])%%[%s],[%s]([0-9][0-9%.])%%[%s]*%)$')
	return rgbdec2lum(255tonumber(R)/100, 255tonumber(G)/100, 255*tonumber(B)/100)		return rgbdec2lum(255tonumber(R)/100, 255tonumber(G)/100, 255*tonumber(B)/100)
	end		end

	-- remove leading # (if there is one) and whitespace		-- remove leading # (if there is one) and whitespace
127번째 줄:		121번째 줄:
	-- failure, return blank		-- failure, return blank
	return ''		return ''
			end

			-- This exports the function for use in other modules.
			-- The colour is passed as a string.
			function p._lum(color)
			return color2lum(color)
	end		end

147번째 줄:		147번째 줄:
	ratio2 = (ratio2 < 1) and 1/ratio2 or ratio2		ratio2 = (ratio2 < 1) and 1/ratio2 or ratio2
	end		end

	if css then		if css then
	local c1 = args[1] or ''		local c1 = args[1] or ''
164번째 줄:		164번째 줄:
	return 'background-color:' .. c1 .. '; color:' .. ((ratio1 > 0) and (ratio2 > 0) and ((ratio1 + bias > ratio2) and c2 or c3) or '') .. ';'		return 'background-color:' .. c1 .. '; color:' .. ((ratio1 > 0) and (ratio2 > 0) and ((ratio1 + bias > ratio2) and c2 or c3) or '') .. ';'
	end		end

	return (ratio1 > 0) and (ratio2 > 0) and ((ratio1 + bias > ratio2) and c2 or c3) or ''		return (ratio1 > 0) and (ratio2 > 0) and ((ratio1 + bias > ratio2) and c2 or c3) or ''
	end		end
218번째 줄:		218번째 줄:

	--[[		--[[
	Use {{#invoke:Color contrast\|somecolor}} directly or		Use {{#invoke:Color contrast\|somecolor}} directly or
	{{#invoke:Color contrast}} from a wrapper template.		{{#invoke:Color contrast}} from a wrapper template.

imported>Gonnym: synced changes from sandbox - created an access point to lum available to other modules

2019-01-06T17:09:22Z

synced changes from sandbox - created an access point to lum available to other modules

← 이전 판		2019년 1월 7일 (월) 02:09 판
9번째 줄:		9번째 줄:
	local HTMLcolor = mw.loadData( 'Module:Color contrast/colors' )		local HTMLcolor = mw.loadData( 'Module:Color contrast/colors' )

	local function sRGB ( v )		local function sRGB (v)
	if (v <= 0.03928) then		if (v <= 0.03928) then
	v = v / 12.92		v = v / 12.92
18번째 줄:		18번째 줄:
	end		end

	local function rgbdec2lum( R, G, B )		local function rgbdec2lum(R, G, B)
	if ( 0 <= R and R < 256 and 0 <= G and G < 256 and 0 <= B and B < 256 ) then		if ( 0 <= R and R < 256 and 0 <= G and G < 256 and 0 <= B and B < 256 ) then
	return 0.2126 * sRGB(R/255) + 0.7152 * sRGB(G/255) + 0.0722 * sRGB(B/255)		return 0.2126 * sRGB(R/255) + 0.7152 * sRGB(G/255) + 0.0722 * sRGB(B/255)
26번째 줄:		26번째 줄:
	end		end

	local function hsl2lum( h, s, l )		local function hsl2lum(h, s, l)
	if ( 0 <= h and h < 360 and 0 <= s and s <= 1 and 0 <= l and l <= 1 ) then		if ( 0 <= h and h < 360 and 0 <= s and s <= 1 and 0 <= l and l <= 1 ) then
	local c = (1 - math.abs(2l - 1))s		local c = (1 - math.abs(2l - 1))s
58번째 줄:		58번째 줄:
	end		end

	local function color2lum( c )		-- This exports the function for use in other modules.
			-- The colour is passed as a string.
			function p._lum(color)
			return color2lum(color)
			end

			local function color2lum(c)

	if (c == nil) then		if (c == nil) then
211번째 줄:		217번째 줄:
	end		end

			--[[
			Use {{#invoke:Color contrast\|somecolor}} directly or
			{{#invoke:Color contrast}} from a wrapper template.

			Parameters:
			-- \|1= — required; A color to check.
			--]]
	function p.lum(frame)		function p.lum(frame)
	~~return color2lum(~~frame.args[1] or frame:getParent().args[1])		local color = frame.args[1] or frame:getParent().args[1]
			return p._lum(color)
	end		end

imported>RexxS: replace html entity with # symbol - tested in /sandbox1 so as not to disturb /sandbox

2018-07-07T23:04:30Z

replace html entity with # symbol - tested in /sandbox1 so as not to disturb /sandbox

← 이전 판		2018년 7월 8일 (일) 08:04 판
63번째 줄:		63번째 줄:
	return ''		return ''
	end		end

			-- html '#' entity
			c = c:gsub("#", "#")

	-- whitespace		-- whitespace
	c = c:match( '^%s(.-)[%s;]$' )		c = c:match( '^%s(.-)[%s;]$' )

imported>Frietjes: typo

2018-02-02T22:01:27Z

typo

← 이전 판		2018년 2월 3일 (토) 07:01 판
139번째 줄:		139번째 줄:

	if css then		if css then
	if mw.ustring.match(v1, '^[A-Fa-f0-9][A-Fa-f0-9][A-Fa-f0-9]$') or		local c1 = args[1] or ''
	mw.ustring.match(v1, '^[A-Fa-f0-9][A-Fa-f0-9][A-Fa-f0-9][A-Fa-f0-9][A-Fa-f0-9][A-Fa-f0-9]$') then		if mw.ustring.match(c1, '^[A-Fa-f0-9][A-Fa-f0-9][A-Fa-f0-9]$') or
	v1 = '#' .. v1		mw.ustring.match(c1, '^[A-Fa-f0-9][A-Fa-f0-9][A-Fa-f0-9][A-Fa-f0-9][A-Fa-f0-9][A-Fa-f0-9]$') then
			c1 = '#' .. c1
	end		end
	if mw.ustring.match(v2, '^[A-Fa-f0-9][A-Fa-f0-9][A-Fa-f0-9]$') or		if mw.ustring.match(c2, '^[A-Fa-f0-9][A-Fa-f0-9][A-Fa-f0-9]$') or
	mw.ustring.match(v2, '^[A-Fa-f0-9][A-Fa-f0-9][A-Fa-f0-9][A-Fa-f0-9][A-Fa-f0-9][A-Fa-f0-9]$') then		mw.ustring.match(c2, '^[A-Fa-f0-9][A-Fa-f0-9][A-Fa-f0-9][A-Fa-f0-9][A-Fa-f0-9][A-Fa-f0-9]$') then
	v2 = '#' .. v2		c2 = '#' .. c2
	end		end
	if mw.ustring.match(v3, '^[A-Fa-f0-9][A-Fa-f0-9][A-Fa-f0-9]$') or		if mw.ustring.match(v3, '^[A-Fa-f0-9][A-Fa-f0-9][A-Fa-f0-9]$') or
	mw.ustring.match(v3, '^[A-Fa-f0-9][A-Fa-f0-9][A-Fa-f0-9][A-Fa-f0-9][A-Fa-f0-9][A-Fa-f0-9]$') then		mw.ustring.match(v3, '^[A-Fa-f0-9][A-Fa-f0-9][A-Fa-f0-9][A-Fa-f0-9][A-Fa-f0-9][A-Fa-f0-9]$') then
	v3 = '#' .. v3		c3 = '#' .. c3
	end		end
	return 'background-color:' .. v1 .. '; color:'		return 'background-color:' .. c1 .. '; color:' .. ((ratio1 > 0) and (ratio2 > 0) and ((ratio1 + bias > ratio2) and c2 or c3) or '') .. ';'
	.. ((ratio1 > 0) and (ratio2 > 0) and ((ratio1 + bias > ratio2) and c2 or c3) or '') .. ';'
	end		end

imported>Frietjes: add option for greatercontrast to form inline css string

2018-02-02T21:57:30Z

add option for greatercontrast to form inline css string

@@ 121번째 줄: / 121번째 줄: @@
 function p._greatercontrast(args)
 	local bias = tonumber(args['bias'] or '0') or 0
 	local v1 = color2lum(args[1] or '')
 	local c2 = args[2] or '#FFFFFF'
@@ 136번째 줄: / 137번째 줄: @@
 		ratio2 = (ratio2 < 1) and 1/ratio2 or ratio2
 	end
 	return (ratio1 > 0) and (ratio2 > 0) and ((ratio1 + bias > ratio2) and c2 or c3) or ''
 end

imported>Frietjes: fix for garbage input

2018-02-02T18:46:53Z

fix for garbage input

← 이전 판		2018년 2월 3일 (토) 03:46 판
126번째 줄:		126번째 줄:
	local c3 = args[3] or '#000000'		local c3 = args[3] or '#000000'
	local v3 = color2lum(c3)		local v3 = color2lum(c3)
	local ratio1 = 0;		local ratio1 = -1;
	local ratio2 = 0;		local ratio2 = -1;
	if (type(v1) == 'number' and type(v2) == 'number') then		if (type(v1) == 'number' and type(v2) == 'number') then
	ratio1 = (v2 + 0.05)/(v1 + 0.05)		ratio1 = (v2 + 0.05)/(v1 + 0.05)
136번째 줄:		136번째 줄:
	ratio2 = (ratio2 < 1) and 1/ratio2 or ratio2		ratio2 = (ratio2 < 1) and 1/ratio2 or ratio2
	end		end
	return (ratio1 + bias > ratio2) and c2 or c3		return (ratio1 > 0) and (ratio2 > 0) and ((ratio1 + bias > ratio2) and c2 or c3) or ''
	end		end

imported>Ahecht: local

2018-01-03T20:31:13Z

local

← 이전 판		2018년 1월 4일 (목) 05:31 판
169번째 줄:		169번째 줄:
	local slist = mw.text.split(mw.ustring.gsub(mw.ustring.gsub(style or '', '&#[Xx]23;', '#'), '#', '#'), ';')		local slist = mw.text.split(mw.ustring.gsub(mw.ustring.gsub(style or '', '&#[Xx]23;', '#'), '#', '#'), ';')
	for k = 1,#slist do		for k = 1,#slist do
	s = slist[k]		local s = slist[k]
	local k,v = s:match( '^[%s]([^:]-):([^:]-)[%s;]$' )		local k,v = s:match( '^[%s]([^:]-):([^:]-)[%s;]$' )
	k = k or ''		k = k or ''

imported>Frietjes: fix for encoded # in hex or decimal (screws up assumption that we can split on ;)

2017-06-03T14:03:29Z

fix for encoded # in hex or decimal (screws up assumption that we can split on ;)

← 이전 판		2017년 6월 3일 (토) 23:03 판
167번째 줄:		167번째 줄:
	end		end

	local slist = mw.text.split(style or '', ';')		local slist = mw.text.split(mw.ustring.gsub(mw.ustring.gsub(style or '', '&#[Xx]23;', '#'), '#', '#'), ';')
	for k = 1,#slist do		for k = 1,#slist do
	s = slist[k]		s = slist[k]

imported>Frietjes: Undid revision 757931345 by Frietjes (talk)

2017-01-02T15:22:28Z

Undid revision 757931345 by Frietjes (talk)

← 이전 판		2017년 1월 3일 (화) 00:22 판
98번째 줄:		98번째 줄:
	-- remove leading # (if there is one) and whitespace		-- remove leading # (if there is one) and whitespace
	c = mw.ustring.match(c, '^[%s#]([a-f0-9])[%s]*$')		c = mw.ustring.match(c, '^[%s#]([a-f0-9])[%s]*$')
	~~c = mw.ustring.match(c, '^[%s]#([a-f0-9])[%s]*$')~~

	-- split into rgb		-- split into rgb

imported>Frietjes: html #

2017-01-02T15:13:52Z

html #

← 이전 판		2017년 1월 3일 (화) 00:13 판
98번째 줄:		98번째 줄:
	-- remove leading # (if there is one) and whitespace		-- remove leading # (if there is one) and whitespace
	c = mw.ustring.match(c, '^[%s#]([a-f0-9])[%s]*$')		c = mw.ustring.match(c, '^[%s#]([a-f0-9])[%s]*$')
			c = mw.ustring.match(c, '^[%s]#([a-f0-9])[%s]*$')

	-- split into rgb		-- split into rgb