Изменения
Перейти к навигации
Перейти к поиску
мСтрока 1:
Строка 1: − + Строка 9:
Строка 9: − + − + Строка 18:
Строка 18: − + Строка 26:
Строка 26: − + Строка 58:
Строка 58: − + − − -- html '#' entity − c = c:gsub("#", "#") − − − -- unstrip nowiki strip markers − c = mw.text.unstripNoWiki(c) Строка 82:
Строка 75: − -- 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+ − end+ − -- 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+ − end+ − -- 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+ − end+ Строка 121:
Строка 114: − end − − -- This exports the function for use in other modules. − -- The colour is passed as a string. − function p._lum(color) − return color2lum(color) − local css = (args['css'] and args['css'] ~= '') and true or false Строка 137:
Строка 123: − + − + Строка 147:
Строка 133: − + − if css then − local c1 = args[1] or '' − if mw.ustring.match(c1, '^[A-Fa-f0-9][A-Fa-f0-9][A-Fa-f0-9]$') or − 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 − if mw.ustring.match(c2, '^[A-Fa-f0-9][A-Fa-f0-9][A-Fa-f0-9]$') or − 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 − c2 = '#' .. c2 − end − 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 − c3 = '#' .. c3 − end − return 'background-color:' .. c1 .. '; color:' .. ((ratio1 > 0) and (ratio2 > 0) and ((ratio1 + bias > ratio2) and c2 or c3) or '') .. ';' − end − − − + − + Строка 184:
Строка 152: − + − + Строка 196:
Строка 164: − + − local s = slist[k] + Строка 217:
Строка 185: − --[[ − Use {{#invoke:Color contrast|somecolor}} directly or − {{#invoke:Color contrast}} from a wrapper template. − − Parameters: − -- |1= — required; A color to check. − --]] − local color = frame.args[1] or frame:getParent().args[1] + − return p._lum(color)
Фикс per Putnik
--
--
-- This module implements
-- This module implements
-- {{Color contrast ratio}}
-- {{Color contrast ratio}}
-- {{Greater color contrast ratio}}
-- {{Greater color contrast ratio}}
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
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)
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(2*l - 1))*s
local c = (1 - math.abs(2*l - 1))*s
end
end
local function color2lum(c)
local function color2lum( c )
if (c == nil) then
if (c == nil) then
return ''
return ''
end
end
-- whitespace
-- whitespace
c = c:match( '^%s*(.-)[%s;]*$' )
c = c:match( '^%s*(.-)[%s;]*$' )
-- lowercase
-- lowercase
end
end
-- 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
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
-- 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
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
-- 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
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(255*tonumber(R)/100, 255*tonumber(G)/100, 255*tonumber(B)/100)
return rgbdec2lum(255*tonumber(R)/100, 255*tonumber(G)/100, 255*tonumber(B)/100)
end
-- remove leading # (if there is one) and whitespace
-- remove leading # (if there is one) and whitespace
-- failure, return blank
-- failure, return blank
return ''
return ''
end
end
function p._greatercontrast(args)
function p._greatercontrast(args)
local bias = tonumber(args['bias'] or '0') or 0
local bias = tonumber(args['bias'] or '0') or 0
local v1 = color2lum(args[1] or '')
local v1 = color2lum(args[1] or '')
local c2 = args[2] or '#FFFFFF'
local c2 = args[2] or '#FFFFFF'
local c3 = args[3] or '#000000'
local c3 = args[3] or '#000000'
local v3 = color2lum(c3)
local v3 = color2lum(c3)
local ratio1 = -1;
local ratio1 = 0;
local ratio2 = -1;
local ratio2 = 0;
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)
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
function p._ratio(args)
function p._ratio(args)
local v1 = color2lum(args[1])
local v1 = color2lum(mw.text.unstripNoWiki(args[1] or ''))
local v2 = color2lum(args[2])
local v2 = color2lum(mw.text.unstripNoWiki(args[2] or ''))
if (type(v1) == 'number' and type(v2) == 'number') then
if (type(v1) == 'number' and type(v2) == 'number') then
-- v1 should be the brighter of the two.
-- v1 should be the brighter of the two.
function p._styleratio(args)
function p._styleratio(args)
local style = (args[1] or ''):lower()
local style = (args[1] or ''):lower()
local bg, fg = 'white', 'black'
local bg, fg = 'white', '#222'
local lum_bg, lum_fg = 1, 0
local lum_bg, lum_fg = 1, 0.016
if args[2] then
if args[2] then
end
end
local slist = mw.text.split(mw.ustring.gsub(mw.ustring.gsub(style or '', '&#[Xx]23;', '#'), '#', '#'), ';')
local slist = mw.text.split(style or '', ';')
for k = 1,#slist do
for k = 1,#slist do
s = slist[k]
local k,v = s:match( '^[%s]*([^:]-):([^:]-)[%s;]*$' )
local k,v = s:match( '^[%s]*([^:]-):([^:]-)[%s;]*$' )
k = k or ''
k = k or ''
end
end
function p.lum(frame)
function p.lum(frame)
return color2lum(frame.args[1] or frame:getParent().args[1])
end
end