culori - npm Package Compare versions

Comparing version 0.2.66 to 0.2.67

build/culori.js

@@ -971,5 +971,10 @@ (function (global, factory) {
 	// D65 white 
-	var Xn = 0.95047;
+	// export const Xn = 0.95047;
+	// export const Yn = 1.00000; 
+	// export const Zn = 1.08883;
+
+	// D50 white
+	var Xn = 0.96422;
 	var Yn = 1.00000;
-	var Zn = 1.08883;
+	var Zn = 0.82521;
 
@@ -1001,3 +1006,3 @@ var k = Math.pow(29, 3) / Math.pow(3, 3);
 	/*
-		CIE XYZ D65 values to sRGB.
+		CIE XYZ D50 values to sRGB.
 
@@ -1014,5 +1019,5 @@ References:
 		return convertLrgbToRgb({
-			r: x * 3.2404542 - y * 1.5371385 - 0.4985314 * z,
-			g: x * -0.9692660 + y * 1.8760108 + 0.0415560 * z,
-			b: x * 0.0556434 - y * 0.2040259 + 1.0572252 * z
+			r: x * 3.1338561 - y * 1.6168667 - 0.4906146 * z,
+			g: x * -0.9787684 + y * 1.9161415 + 0.0334540 * z,
+			b: x * 0.0719453 - y * 0.2289914 + 1.4052427 * z
 		});
@@ -1029,3 +1034,3 @@ });
 	/*
-		Convert sRGB values to CIE XYZ D65
+		Convert sRGB values to CIE XYZ D50
 
@@ -1035,2 +1040,3 @@ References:
 			* http://www.brucelindbloom.com/index.html?Eqn_RGB_XYZ_Matrix.html
+		
 	*/
@@ -1045,5 +1051,5 @@
 		return {
-			x: 0.4124564 * r + 0.3575761 * g + 0.1804375 * b,
-			y: 0.2126729 * r + 0.7151522 * g + 0.0721750 * b,
-			z: 0.0193339 * r + 0.1191920 * g + 0.9503041 * b
+			x: 0.4360747 * r + 0.3850649 * g + 0.1430804 * b,
+			y: 0.2225045 * r + 0.7168786 * g + 0.0606169 * b,
+			z: 0.0139322 * r + 0.0971045 * g + 0.7141733 * b
 		};
@@ -1067,2 +1073,3 @@ });
 		return {
+			mode: 'lab',
 			l: 116 * f1 - 16,
@@ -1076,3 +1083,9 @@ a: 500 * (f0 - f1),
 		var res = convertXyzToLab(convertRgbToXyz(rgb));
-		res.mode = 'lab';
+
+		// Fixes achromatic RGB colors having a _slight_ chroma due to floating-point errors
+		// and approximated computations in sRGB <-> CIELab.
+		// See: https://github.com/d3/d3-color/pull/46
+		if (rgb.r === rgb.b === rgb.g) {
+			res.a = res.b = 0;
+		}
 		if (rgb.alpha !== undefined) res.alpha = rgb.alpha;
@@ -1131,4 +1144,2 @@ return res;
 
-	var round_chroma = round(4);
-
 	/* 
@@ -1145,5 +1156,3 @@ References:
 
-		// Fixes achromatic colors having a _slight_ chroma due to floating-point errors
-		// and approximated computations in sRGB <-> CIELab.
-		var c = round_chroma(Math.sqrt(a * a + b * b));
+		var c = Math.sqrt(a * a + b * b);
 		var res = {
@@ -1150,0 +1159,0 @@ mode: 'lch',

build/culori.min.js

@@ -1,1 +0,1 @@
-!function(r,a){"object"==typeof exports&&"undefined"!=typeof module?module.exports=a():"function"==typeof define&&define.amd?define(a):r.culori=a()}(this,function(){"use strict";var r={},a={},e=[],n=function(n){r[n.mode]=Object.assign(r[n.mode]||{},n.output),Object.keys(n.input||{}).forEach(function(a){r[a]||(r[a]={}),r[a][n.mode]=n.input[a]}),a[n.mode]=n,(n.parsers||[]).forEach(function(r){return e.push(r)})},t=function(r){return a[r]},o=function(r){for(var a=void 0,n=0,t=e.length;n<t&&void 0===(a=e[n++](r)););return a},i="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(r){return typeof r}:function(r){return r&&"function"==typeof Symbol&&r.constructor===Symbol&&r!==Symbol.prototype?"symbol":typeof r},l=Object.assign||function(r){for(var a=1;a<arguments.length;a++){var e=arguments[a];for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&(r[n]=e[n])}return r},h=function(){var a=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"rgb";return function(e){return void 0!==(e=function(r,a){return"object"!==(void 0===r?"undefined":i(r))?o(r):void 0===r.mode?l({},r,{mode:a}):r}(e,a))?e.mode===a?e:r[e.mode][a]?r[e.mode][a](e):"rgb"===a?r[e.mode].rgb(e):r.rgb[a](r[e.mode].rgb(e)):void 0}},u=function(){var r=arguments.length>0&&void 0!==arguments[0]?arguments[0]:4;return function(a){return"number"==typeof a?function(r,a){return Math.round(r*(a=Math.pow(10,a)))/a}(a,r):a}},s=h("rgb"),d=u(2),b=function(r){return Math.round(255*Math.max(0,Math.min(r,1)))},g={aliceblue:15792383,antiquewhite:16444375,aqua:65535,aquamarine:8388564,azure:15794175,beige:16119260,bisque:16770244,black:0,blanchedalmond:16772045,blue:255,blueviolet:9055202,brown:10824234,burlywood:14596231,cadetblue:6266528,chartreuse:8388352,chocolate:13789470,coral:16744272,cornflowerblue:6591981,cornsilk:16775388,crimson:14423100,cyan:65535,darkblue:139,darkcyan:35723,darkgoldenrod:12092939,darkgray:11119017,darkgreen:25600,darkgrey:11119017,darkkhaki:12433259,darkmagenta:9109643,darkolivegreen:5597999,darkorange:16747520,darkorchid:10040012,darkred:9109504,darksalmon:15308410,darkseagreen:9419919,darkslateblue:4734347,darkslategray:3100495,darkslategrey:3100495,darkturquoise:52945,darkviolet:9699539,deeppink:16716947,deepskyblue:49151,dimgray:6908265,dimgrey:6908265,dodgerblue:2003199,firebrick:11674146,floralwhite:16775920,forestgreen:2263842,fuchsia:16711935,gainsboro:14474460,ghostwhite:16316671,gold:16766720,goldenrod:14329120,gray:8421504,green:32768,greenyellow:11403055,grey:8421504,honeydew:15794160,hotpink:16738740,indianred:13458524,indigo:4915330,ivory:16777200,khaki:15787660,lavender:15132410,lavenderblush:16773365,lawngreen:8190976,lemonchiffon:16775885,lightblue:11393254,lightcoral:15761536,lightcyan:14745599,lightgoldenrodyellow:16448210,lightgray:13882323,lightgreen:9498256,lightgrey:13882323,lightpink:16758465,lightsalmon:16752762,lightseagreen:2142890,lightskyblue:8900346,lightslategray:7833753,lightslategrey:7833753,lightsteelblue:11584734,lightyellow:16777184,lime:65280,limegreen:3329330,linen:16445670,magenta:16711935,maroon:8388608,mediumaquamarine:6737322,mediumblue:205,mediumorchid:12211667,mediumpurple:9662683,mediumseagreen:3978097,mediumslateblue:8087790,mediumspringgreen:64154,mediumturquoise:4772300,mediumvioletred:13047173,midnightblue:1644912,mintcream:16121850,mistyrose:16770273,moccasin:16770229,navajowhite:16768685,navy:128,oldlace:16643558,olive:8421376,olivedrab:7048739,orange:16753920,orangered:16729344,orchid:14315734,palegoldenrod:15657130,palegreen:10025880,paleturquoise:11529966,palevioletred:14381203,papayawhip:16773077,peachpuff:16767673,peru:13468991,pink:16761035,plum:14524637,powderblue:11591910,purple:8388736,rebeccapurple:6697881,red:16711680,rosybrown:12357519,royalblue:4286945,saddlebrown:9127187,salmon:16416882,sandybrown:16032864,seagreen:3050327,seashell:16774638,sienna:10506797,silver:12632256,skyblue:8900331,slateblue:6970061,slategray:7372944,slategrey:7372944,snow:16775930,springgreen:65407,steelblue:4620980,tan:13808780,teal:32896,thistle:14204888,tomato:16737095,turquoise:4251856,violet:15631086,wheat:16113331,white:16777215,whitesmoke:16119285,yellow:16776960,yellowgreen:10145074},c=function(r){return(r%=360)<0?r+360:r},p=function(r,a,e){return r+e*(a-r)},v=function(r){return function(a){var e=a*(r.length-1),n=Math.floor(e),t=r[n],o=r[n+1];return void 0!==t&&void 0!==o?p(t,o,e-n):void 0===t?o:t}},f=function(r){return function(a){var e=a*(r.length-1),n=Math.floor(e),t=r[n],o=r[n+1],i=e-n;return void 0!==t&&void 0!==o?(t=c(t),o=c(o),Math.abs(o-t)>180?c(p(t,o-360*Math.sign(o-t),i)):p(t,o,i)):void 0===t?o:t}},m=function(r){return function(a){var e=a*(r.length-1),n=Math.floor(e),t=r[n],o=r[n+1],i=e-n;if(!(void 0===t&&void 0===o||void 0===t&&0===i||void 0===o&&1===i))return p(void 0===t?1:t,void 0===o?1:o,i)}},y=function(r,a){if("number"==typeof r)return 3===a?{mode:"rgb",r:(r>>8&15|r>>4&240)/255,g:(r>>4&15|240&r)/255,b:(15&r|r<<4&240)/255}:4===a?{mode:"rgb",r:(r>>12&15|r>>8&240)/255,g:(r>>8&15|r>>4&240)/255,b:(r>>4&15|240&r)/255,alpha:(15&r|r<<4&240)/255}:6===a?{mode:"rgb",r:(r>>16&255)/255,g:(r>>8&255)/255,b:(255&r)/255}:8===a?{mode:"rgb",r:(r>>24&255)/255,g:(r>>16&255)/255,b:(r>>8&255)/255,alpha:(255&r)/255}:void 0},w=(/([+-]?\d*\.?\d+(?:[eE][+-]?\d+)?)/+"").replace(/^\/|\/$/g,""),k=w+"%",M="(?:"+w+"%|"+w+")",x="(?:"+w+"(deg|grad|rad|turn)|"+w+")",E="\\s*,\\s*",$="\\s+",j=new RegExp("^rgba?\\(\\s*"+w+E+w+E+w+"\\s*(?:,\\s*"+M+"\\s*)?\\)$"),q=new RegExp("^rgba?\\(\\s*"+k+E+k+E+k+"\\s*(?:,\\s*"+M+"\\s*)?\\)$"),R=new RegExp("^rgba?\\(\\s*"+w+$+w+$+w+"\\s*(?:\\/\\s*"+M+"\\s*)?\\)$"),O=new RegExp("^rgba?\\(\\s*"+k+$+k+$+k+"\\s*(?:\\/\\s*"+M+"\\s*)?\\)$"),z=new RegExp("^hsla?\\(\\s*"+x+E+k+E+k+"\\s*(?:,\\s*"+M+"\\s*)?\\)$"),S=new RegExp("^hsla?\\(\\s*"+x+$+k+$+k+"\\s*(?:\\/\\s*"+M+"\\s*)?\\)$"),I=/^#?([0-9a-f]{8}|[0-9a-f]{6}|[0-9a-f]{4}|[0-9a-f]{3})$/i,P=new RegExp("^hwb\\(\\s*"+x+$+k+$+k+"\\s*(?:\\/\\s*"+M+"\\s*)?\\)$"),L=new RegExp("^lab\\(\\s*"+w+$+w+$+w+"\\s*(?:\\/\\s*"+M+"\\s*)?\\)$"),A=new RegExp("^lch\\(\\s*"+w+$+w+$+x+"\\s*(?:\\/\\s*"+M+"\\s*)?\\)$"),C=new RegExp("^gray\\(\\s*"+w+"()()\\s*(?:\\/\\s*"+M+"\\s*)?\\)$"),D={mode:"rgb",channels:["r","g","b","alpha"],parsers:[function(r){var a;return(a=r.match(I))?y(parseInt(a[1],16),a[1].length):void 0},function(r){var a=void 0,e=void 0;if(a=r.match(j)||r.match(R))e={mode:"rgb",r:a[1]/255,g:a[2]/255,b:a[3]/255};else{if(!(a=r.match(q)||r.match(O)))return;e={mode:"rgb",r:a[1]/100,g:a[2]/100,b:a[3]/100}}return void 0!==a[4]?e.alpha=a[4]/100:void 0!==a[5]&&(e.alpha=+a[5]),e},function(r){return"string"==typeof r&&y(g[r.toLowerCase()],6)||void 0},function(r){return"transparent"===r?y(0,8):void 0}],interpolate:{r:v,g:v,b:v,alpha:m}},H=function(r){return r<.04045?r/12.92:Math.pow((r+.055)/1.055,2.4)},B=function(r){var a=r.r,e=r.g,n=r.b,t=r.alpha,o={mode:"lrgb",r:H(a),g:H(e),b:H(n)};return void 0!==t&&(o.alpha=t),o},F=function(r){return r>.0031308?1.055*Math.pow(r,1/2.4)-.055:12.92*r},G=function(r){var a=r.r,e=r.g,n=r.b,t=r.alpha,o={mode:"rgb",r:F(a),g:F(e),b:F(n)};return void 0!==t&&(o.alpha=t),o},J={mode:"lrgb",output:{rgb:G},input:{rgb:B},channels:["r","g","b","alpha"],interpolate:{r:v,g:v,b:v,alpha:m}};var K=function(r,a){switch(a){case"deg":return+r;case"rad":return r/Math.PI*180;case"grad":return r/10*9;case"turn":return 360*r}},N={mode:"hsl",output:{rgb:function(r){var a=r.h,e=r.s,n=r.l,t=r.alpha;a=c(a);var o=n+e*(n<.5?n:1-n),i=o-2*(o-n)*Math.abs(a/60%2-1),l=void 0;switch(Math.floor(a/60)){case 0:l={r:o,g:i,b:2*n-o};break;case 1:l={r:i,g:o,b:2*n-o};break;case 2:l={r:2*n-o,g:o,b:i};break;case 3:l={r:2*n-o,g:i,b:o};break;case 4:l={r:i,g:2*n-o,b:o};break;case 5:l={r:o,g:2*n-o,b:i};break;default:l={r:2*n-o,g:2*n-o,b:2*n-o}}return l.mode="rgb",void 0!==t&&(l.alpha=t),l}},input:{rgb:function(r){var a=r.r,e=r.g,n=r.b,t=r.alpha,o=Math.max(a,e,n),i=Math.min(a,e,n),l={mode:"hsl",s:o===i?0:(o-i)/(1-Math.abs(o+i-1)),l:.5*(o+i)};return o-i!=0&&(l.h=60*(o===a?(e-n)/(o-i)+6*(e<n):o===e?(n-a)/(o-i)+2:(a-e)/(o-i)+4)),void 0!==t&&(l.alpha=t),l}},channels:["h","s","l","alpha"],parsers:[function(r){if("string"==typeof r){var a=r.match(z)||r.match(S);if(a){var e={mode:"hsl",h:void 0===a[3]?K(a[1],a[2]):+a[3],s:Math.min(Math.max(0,a[4]/100),1),l:Math.min(Math.max(0,a[5]/100),1)};return void 0!==a[6]?e.alpha=a[6]/100:void 0!==a[7]&&(e.alpha=a[7]/255),e}}}],interpolate:{h:f,s:v,l:v,alpha:m}};function Q(r){var a=r.h,e=r.s,n=r.v,t=r.alpha;a=c(a);var o=Math.abs(a/60%2-1),i=void 0;switch(Math.floor(a/60)){case 0:i={r:n,g:n*(1-e*o),b:n*(1-e)};break;case 1:i={r:n*(1-e*o),g:n,b:n*(1-e)};break;case 2:i={r:n*(1-e),g:n,b:n*(1-e*o)};break;case 3:i={r:n*(1-e),g:n*(1-e*o),b:n};break;case 4:i={r:n*(1-e*o),g:n*(1-e),b:n};break;case 5:i={r:n,g:n*(1-e),b:n*(1-e*o)};break;default:i={r:n*(1-e),g:n*(1-e),b:n*(1-e)}}return i.mode="rgb",void 0!==t&&(i.alpha=t),i}function T(r){var a=r.r,e=r.g,n=r.b,t=r.alpha,o=Math.max(a,e,n),i=Math.min(a,e,n),l={mode:"hsv",s:0===o?0:1-i/o,v:o};return o-i!=0&&(l.h=60*(o===a?(e-n)/(o-i)+6*(e<n):o===e?(n-a)/(o-i)+2:(a-e)/(o-i)+4)),void 0!==t&&(l.alpha=t),l}var U={mode:"hsv",output:{rgb:Q},input:{rgb:T},channels:["h","s","v","alpha"],interpolate:{h:f,s:v,v:v,alpha:m}};var V={mode:"hsi",output:{rgb:function(r){var a=r.h,e=r.s,n=r.i,t=r.alpha;a=c(a);var o=Math.abs(a/60%2-1),i=void 0;switch(Math.floor(a/60)){case 0:i={r:n*(1+e*(3/(2-o)-1)),g:n*(1+e*(3*(1-o)/(2-o)-1)),b:n*(1-e)};break;case 1:i={r:n*(1+e*(3*(1-o)/(2-o)-1)),g:n*(1+e*(3/(2-o)-1)),b:n*(1-e)};break;case 2:i={r:n*(1-e),g:n*(1+e*(3/(2-o)-1)),b:n*(1+e*(3*(1-o)/(2-o)-1))};break;case 3:i={r:n*(1-e),g:n*(1+e*(3*(1-o)/(2-o)-1)),b:n*(1+e*(3/(2-o)-1))};break;case 4:i={r:n*(1+e*(3*(1-o)/(2-o)-1)),g:n*(1-e),b:n*(1+e*(3/(2-o)-1))};break;case 5:i={r:n*(1+e*(3/(2-o)-1)),g:n*(1-e),b:n*(1+e*(3*(1-o)/(2-o)-1))};break;default:i={r:n*(1-e),g:n*(1-e),b:n*(1-e)}}return i.mode="rgb",void 0!==t&&(i.alpha=t),i}},input:{rgb:function(r){var a=r.r,e=r.g,n=r.b,t=r.alpha,o=Math.max(a,e,n),i=Math.min(a,e,n),l={mode:"hsi",s:a+e+n===0?0:1-3*i/(a+e+n),i:(a+e+n)/3};return o-i!=0&&(l.h=60*(o===a?(e-n)/(o-i)+6*(e<n):o===e?(n-a)/(o-i)+2:(a-e)/(o-i)+4)),void 0!==t&&(l.alpha=t),l}},channels:["h","s","i","alpha"],interpolate:{h:f,s:v,i:v,alpha:m}};var W={mode:"hwb",output:{rgb:function(r){var a=r.h,e=r.w,n=r.b,t=r.alpha;if(e+n>1){var o=e+n;e/=o,n/=o}return Q({h:a,s:1===n?1:1-e/(1-n),v:1-n,alpha:t})}},input:{rgb:function(r){var a=T(r);if(void 0!==a){var e={mode:"hwb",w:(1-a.s)*a.v,b:1-a.v};return void 0!==a.h&&(e.h=a.h),void 0!==a.alpha&&(e.alpha=a.alpha),e}}},channels:["h","w","b","alpha"],parsers:[function(r){if("string"==typeof r){var a=r.match(P);if(a){var e={mode:"hwb",h:void 0===a[3]?K(a[1],a[2]):+a[3],w:a[4]/100,b:a[5]/100};if(e.w+e.b>1){var n=e.w+e.b;e.w/=n,e.b/=n}return void 0!==a[6]?e.alpha=a[6]/100:void 0!==a[7]&&(e.alpha=a[7]/255),e}}}],interpolate:{h:f,w:v,b:v,alpha:m}},X=Math.pow(29,3)/Math.pow(3,3),Y=Math.pow(6,3)/Math.pow(29,3),Z=function(r){return Math.pow(r,3)>Y?Math.pow(r,3):(116*r-16)/X},_=function(r){var a,e,n,t,o,i=function(r){var a=r.x,e=r.y,n=r.z;return G({r:3.2404542*a-1.5371385*e-.4985314*n,g:-.969266*a+1.8760108*e+.041556*n,b:.0556434*a-.2040259*e+1.0572252*n})}((e=(a=r).l,n=a.a,o=(t=(e+16)/116)-a.b/200,{x:.95047*Z(n/500+t),y:1*Z(t),z:1.08883*Z(o)}));return i.mode="rgb",void 0!==r.alpha&&(i.alpha=r.alpha),i},rr=function(r){return r>Y?Math.cbrt(r):(X*r+16)/116},ar=function(r){var a,e,n,t,o,i,l=(a=function(r){var a=B(r),e=a.r,n=a.g,t=a.b;return{x:.4124564*e+.3575761*n+.1804375*t,y:.2126729*e+.7151522*n+.072175*t,z:.0193339*e+.119192*n+.9503041*t}}(r),e=a.x,n=a.y,t=a.z,o=rr(e/.95047),{l:116*(i=rr(n/1))-16,a:500*(o-i),b:200*(i-rr(t/1.08883))});return l.mode="lab",void 0!==r.alpha&&(l.alpha=r.alpha),l},er={mode:"lab",output:{rgb:_},input:{rgb:ar},channels:["l","a","b","alpha"],parsers:[function(r){var a=void 0,e=void 0;if(a=r.match(L))e={mode:"lab",l:+a[1],a:+a[2],b:+a[3]};else{if(!(a=r.match(C)))return;e={mode:"lab",l:+a[1],a:0,b:0}}return void 0!==a[4]?e.alpha=a[4]/100:void 0!==a[5]&&(e.alpha=+a[5]),e}],interpolate:{l:v,a:v,b:v,alpha:m}},nr=u(4),tr=function(r){var a=r.l,e=r.a,n=r.b,t=r.alpha,o=nr(Math.sqrt(e*e+n*n)),i={mode:"lch",l:a,c:o};return o&&(i.h=c(180*Math.atan2(n,e)/Math.PI)),void 0!==t&&(i.alpha=t),i},or=function(r){var a=r.l,e=r.c,n=r.h,t=r.alpha,o={mode:"lab",l:a,a:0===e?0:e*Math.cos(n/180*Math.PI),b:0===e?0:e*Math.sin(n/180*Math.PI)};return void 0!==t&&(o.alpha=t),o},ir={mode:"lch",output:{lab:or,rgb:function(r){return _(or(r))}},input:{rgb:function(r){return tr(ar(r))},lch:tr},channels:["l","c","h","alpha"],parsers:[function(r){var a=r.match(A);if(a){var e={mode:"lch",l:+a[1],c:Math.max(0,+a[2]),h:void 0===a[5]?K(a[3],a[4]):+a[5]};return void 0!==a[6]?e.alpha=a[6]/100:void 0!==a[7]&&(e.alpha=+a[7]),e}}],interpolate:{h:f,c:v,l:v,alpha:m}};n(D),n(J),n(N),n(U),n(V),n(W),n(er),n(ir);var lr=h("rgb"),hr=h("lrgb"),ur=h("hsl"),sr=h("hsv"),dr=h("hsi"),br=h("hwb"),gr=h("lab"),cr=h("lch"),pr=lr,vr=Object.freeze({hsl:ur,hsv:sr,hsi:dr,hwb:br,rgb:lr,lab:gr,lch:cr,lrgb:hr,css:function(){var r=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"rgb";return function(a){var e=s(a);return e.r=b(e.r),e.b=b(e.b),e.g=b(e.g),"hex"===r?"#"+(1<<24|e.r<<16|e.g<<8|e.b).toString(16).slice(1):"rgb"===r?void 0===a.alpha||1===a.alpha?"rgb("+e.r+", "+e.g+", "+e.b+")":"rgba("+e.r+", "+e.g+", "+e.b+", "+d(e.alpha)+")":void 0}},converter:h,round:u,parse:o,named:g,interpolate:function(r){var a=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"rgb",e=arguments[2],n=function(r){var a=t(r).channels;return function(e){var n={mode:r};return a.forEach(function(r){n[r]=e.map(function(a){return a[r]})}),n}}(a)(r.map(h(a)));e=e||t(a).interpolate;var o={};return Object.keys(e).forEach(function(r){o[r]=e[r](n[r])}),function(r){r=Math.min(Math.max(0,r),1);var e={mode:a},n=void 0;return Object.keys(o).forEach(function(a){void 0!==(n=o[a](r))&&(e[a]=n)}),e}},interpolateLinear:v,interpolateAlpha:m,interpolateHue:f,samples:function(){var r=arguments.length>0&&void 0!==arguments[0]?arguments[0]:2;if(r<2)return r<1?[]:[.5];for(var a=[],e=0;e<r;e++)a.push(e/(r-1));return a},defineMode:n,getModeDefinition:t,default:pr});return Object.assign(pr,vr),pr});
+!function(r,a){"object"==typeof exports&&"undefined"!=typeof module?module.exports=a():"function"==typeof define&&define.amd?define(a):r.culori=a()}(this,function(){"use strict";var r={},a={},e=[],n=function(n){r[n.mode]=Object.assign(r[n.mode]||{},n.output),Object.keys(n.input||{}).forEach(function(a){r[a]||(r[a]={}),r[a][n.mode]=n.input[a]}),a[n.mode]=n,(n.parsers||[]).forEach(function(r){return e.push(r)})},t=function(r){return a[r]},o=function(r){for(var a=void 0,n=0,t=e.length;n<t&&void 0===(a=e[n++](r)););return a},i="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(r){return typeof r}:function(r){return r&&"function"==typeof Symbol&&r.constructor===Symbol&&r!==Symbol.prototype?"symbol":typeof r},l=Object.assign||function(r){for(var a=1;a<arguments.length;a++){var e=arguments[a];for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&(r[n]=e[n])}return r},h=function(){var a=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"rgb";return function(e){return void 0!==(e=function(r,a){return"object"!==(void 0===r?"undefined":i(r))?o(r):void 0===r.mode?l({},r,{mode:a}):r}(e,a))?e.mode===a?e:r[e.mode][a]?r[e.mode][a](e):"rgb"===a?r[e.mode].rgb(e):r.rgb[a](r[e.mode].rgb(e)):void 0}},u=function(){var r=arguments.length>0&&void 0!==arguments[0]?arguments[0]:4;return function(a){return"number"==typeof a?function(r,a){return Math.round(r*(a=Math.pow(10,a)))/a}(a,r):a}},s=h("rgb"),d=u(2),b=function(r){return Math.round(255*Math.max(0,Math.min(r,1)))},g={aliceblue:15792383,antiquewhite:16444375,aqua:65535,aquamarine:8388564,azure:15794175,beige:16119260,bisque:16770244,black:0,blanchedalmond:16772045,blue:255,blueviolet:9055202,brown:10824234,burlywood:14596231,cadetblue:6266528,chartreuse:8388352,chocolate:13789470,coral:16744272,cornflowerblue:6591981,cornsilk:16775388,crimson:14423100,cyan:65535,darkblue:139,darkcyan:35723,darkgoldenrod:12092939,darkgray:11119017,darkgreen:25600,darkgrey:11119017,darkkhaki:12433259,darkmagenta:9109643,darkolivegreen:5597999,darkorange:16747520,darkorchid:10040012,darkred:9109504,darksalmon:15308410,darkseagreen:9419919,darkslateblue:4734347,darkslategray:3100495,darkslategrey:3100495,darkturquoise:52945,darkviolet:9699539,deeppink:16716947,deepskyblue:49151,dimgray:6908265,dimgrey:6908265,dodgerblue:2003199,firebrick:11674146,floralwhite:16775920,forestgreen:2263842,fuchsia:16711935,gainsboro:14474460,ghostwhite:16316671,gold:16766720,goldenrod:14329120,gray:8421504,green:32768,greenyellow:11403055,grey:8421504,honeydew:15794160,hotpink:16738740,indianred:13458524,indigo:4915330,ivory:16777200,khaki:15787660,lavender:15132410,lavenderblush:16773365,lawngreen:8190976,lemonchiffon:16775885,lightblue:11393254,lightcoral:15761536,lightcyan:14745599,lightgoldenrodyellow:16448210,lightgray:13882323,lightgreen:9498256,lightgrey:13882323,lightpink:16758465,lightsalmon:16752762,lightseagreen:2142890,lightskyblue:8900346,lightslategray:7833753,lightslategrey:7833753,lightsteelblue:11584734,lightyellow:16777184,lime:65280,limegreen:3329330,linen:16445670,magenta:16711935,maroon:8388608,mediumaquamarine:6737322,mediumblue:205,mediumorchid:12211667,mediumpurple:9662683,mediumseagreen:3978097,mediumslateblue:8087790,mediumspringgreen:64154,mediumturquoise:4772300,mediumvioletred:13047173,midnightblue:1644912,mintcream:16121850,mistyrose:16770273,moccasin:16770229,navajowhite:16768685,navy:128,oldlace:16643558,olive:8421376,olivedrab:7048739,orange:16753920,orangered:16729344,orchid:14315734,palegoldenrod:15657130,palegreen:10025880,paleturquoise:11529966,palevioletred:14381203,papayawhip:16773077,peachpuff:16767673,peru:13468991,pink:16761035,plum:14524637,powderblue:11591910,purple:8388736,rebeccapurple:6697881,red:16711680,rosybrown:12357519,royalblue:4286945,saddlebrown:9127187,salmon:16416882,sandybrown:16032864,seagreen:3050327,seashell:16774638,sienna:10506797,silver:12632256,skyblue:8900331,slateblue:6970061,slategray:7372944,slategrey:7372944,snow:16775930,springgreen:65407,steelblue:4620980,tan:13808780,teal:32896,thistle:14204888,tomato:16737095,turquoise:4251856,violet:15631086,wheat:16113331,white:16777215,whitesmoke:16119285,yellow:16776960,yellowgreen:10145074},c=function(r){return(r%=360)<0?r+360:r},p=function(r,a,e){return r+e*(a-r)},v=function(r){return function(a){var e=a*(r.length-1),n=Math.floor(e),t=r[n],o=r[n+1];return void 0!==t&&void 0!==o?p(t,o,e-n):void 0===t?o:t}},f=function(r){return function(a){var e=a*(r.length-1),n=Math.floor(e),t=r[n],o=r[n+1],i=e-n;return void 0!==t&&void 0!==o?(t=c(t),o=c(o),Math.abs(o-t)>180?c(p(t,o-360*Math.sign(o-t),i)):p(t,o,i)):void 0===t?o:t}},m=function(r){return function(a){var e=a*(r.length-1),n=Math.floor(e),t=r[n],o=r[n+1],i=e-n;if(!(void 0===t&&void 0===o||void 0===t&&0===i||void 0===o&&1===i))return p(void 0===t?1:t,void 0===o?1:o,i)}},y=function(r,a){if("number"==typeof r)return 3===a?{mode:"rgb",r:(r>>8&15|r>>4&240)/255,g:(r>>4&15|240&r)/255,b:(15&r|r<<4&240)/255}:4===a?{mode:"rgb",r:(r>>12&15|r>>8&240)/255,g:(r>>8&15|r>>4&240)/255,b:(r>>4&15|240&r)/255,alpha:(15&r|r<<4&240)/255}:6===a?{mode:"rgb",r:(r>>16&255)/255,g:(r>>8&255)/255,b:(255&r)/255}:8===a?{mode:"rgb",r:(r>>24&255)/255,g:(r>>16&255)/255,b:(r>>8&255)/255,alpha:(255&r)/255}:void 0},w=(/([+-]?\d*\.?\d+(?:[eE][+-]?\d+)?)/+"").replace(/^\/|\/$/g,""),k=w+"%",M="(?:"+w+"%|"+w+")",x="(?:"+w+"(deg|grad|rad|turn)|"+w+")",E="\\s*,\\s*",$="\\s+",j=new RegExp("^rgba?\\(\\s*"+w+E+w+E+w+"\\s*(?:,\\s*"+M+"\\s*)?\\)$"),q=new RegExp("^rgba?\\(\\s*"+k+E+k+E+k+"\\s*(?:,\\s*"+M+"\\s*)?\\)$"),R=new RegExp("^rgba?\\(\\s*"+w+$+w+$+w+"\\s*(?:\\/\\s*"+M+"\\s*)?\\)$"),O=new RegExp("^rgba?\\(\\s*"+k+$+k+$+k+"\\s*(?:\\/\\s*"+M+"\\s*)?\\)$"),z=new RegExp("^hsla?\\(\\s*"+x+E+k+E+k+"\\s*(?:,\\s*"+M+"\\s*)?\\)$"),S=new RegExp("^hsla?\\(\\s*"+x+$+k+$+k+"\\s*(?:\\/\\s*"+M+"\\s*)?\\)$"),I=/^#?([0-9a-f]{8}|[0-9a-f]{6}|[0-9a-f]{4}|[0-9a-f]{3})$/i,P=new RegExp("^hwb\\(\\s*"+x+$+k+$+k+"\\s*(?:\\/\\s*"+M+"\\s*)?\\)$"),L=new RegExp("^lab\\(\\s*"+w+$+w+$+w+"\\s*(?:\\/\\s*"+M+"\\s*)?\\)$"),A=new RegExp("^lch\\(\\s*"+w+$+w+$+x+"\\s*(?:\\/\\s*"+M+"\\s*)?\\)$"),C=new RegExp("^gray\\(\\s*"+w+"()()\\s*(?:\\/\\s*"+M+"\\s*)?\\)$"),D={mode:"rgb",channels:["r","g","b","alpha"],parsers:[function(r){var a;return(a=r.match(I))?y(parseInt(a[1],16),a[1].length):void 0},function(r){var a=void 0,e=void 0;if(a=r.match(j)||r.match(R))e={mode:"rgb",r:a[1]/255,g:a[2]/255,b:a[3]/255};else{if(!(a=r.match(q)||r.match(O)))return;e={mode:"rgb",r:a[1]/100,g:a[2]/100,b:a[3]/100}}return void 0!==a[4]?e.alpha=a[4]/100:void 0!==a[5]&&(e.alpha=+a[5]),e},function(r){return"string"==typeof r&&y(g[r.toLowerCase()],6)||void 0},function(r){return"transparent"===r?y(0,8):void 0}],interpolate:{r:v,g:v,b:v,alpha:m}},H=function(r){return r<.04045?r/12.92:Math.pow((r+.055)/1.055,2.4)},B=function(r){var a=r.r,e=r.g,n=r.b,t=r.alpha,o={mode:"lrgb",r:H(a),g:H(e),b:H(n)};return void 0!==t&&(o.alpha=t),o},F=function(r){return r>.0031308?1.055*Math.pow(r,1/2.4)-.055:12.92*r},G=function(r){var a=r.r,e=r.g,n=r.b,t=r.alpha,o={mode:"rgb",r:F(a),g:F(e),b:F(n)};return void 0!==t&&(o.alpha=t),o},J={mode:"lrgb",output:{rgb:G},input:{rgb:B},channels:["r","g","b","alpha"],interpolate:{r:v,g:v,b:v,alpha:m}};var K=function(r,a){switch(a){case"deg":return+r;case"rad":return r/Math.PI*180;case"grad":return r/10*9;case"turn":return 360*r}},N={mode:"hsl",output:{rgb:function(r){var a=r.h,e=r.s,n=r.l,t=r.alpha;a=c(a);var o=n+e*(n<.5?n:1-n),i=o-2*(o-n)*Math.abs(a/60%2-1),l=void 0;switch(Math.floor(a/60)){case 0:l={r:o,g:i,b:2*n-o};break;case 1:l={r:i,g:o,b:2*n-o};break;case 2:l={r:2*n-o,g:o,b:i};break;case 3:l={r:2*n-o,g:i,b:o};break;case 4:l={r:i,g:2*n-o,b:o};break;case 5:l={r:o,g:2*n-o,b:i};break;default:l={r:2*n-o,g:2*n-o,b:2*n-o}}return l.mode="rgb",void 0!==t&&(l.alpha=t),l}},input:{rgb:function(r){var a=r.r,e=r.g,n=r.b,t=r.alpha,o=Math.max(a,e,n),i=Math.min(a,e,n),l={mode:"hsl",s:o===i?0:(o-i)/(1-Math.abs(o+i-1)),l:.5*(o+i)};return o-i!=0&&(l.h=60*(o===a?(e-n)/(o-i)+6*(e<n):o===e?(n-a)/(o-i)+2:(a-e)/(o-i)+4)),void 0!==t&&(l.alpha=t),l}},channels:["h","s","l","alpha"],parsers:[function(r){if("string"==typeof r){var a=r.match(z)||r.match(S);if(a){var e={mode:"hsl",h:void 0===a[3]?K(a[1],a[2]):+a[3],s:Math.min(Math.max(0,a[4]/100),1),l:Math.min(Math.max(0,a[5]/100),1)};return void 0!==a[6]?e.alpha=a[6]/100:void 0!==a[7]&&(e.alpha=a[7]/255),e}}}],interpolate:{h:f,s:v,l:v,alpha:m}};function Q(r){var a=r.h,e=r.s,n=r.v,t=r.alpha;a=c(a);var o=Math.abs(a/60%2-1),i=void 0;switch(Math.floor(a/60)){case 0:i={r:n,g:n*(1-e*o),b:n*(1-e)};break;case 1:i={r:n*(1-e*o),g:n,b:n*(1-e)};break;case 2:i={r:n*(1-e),g:n,b:n*(1-e*o)};break;case 3:i={r:n*(1-e),g:n*(1-e*o),b:n};break;case 4:i={r:n*(1-e*o),g:n*(1-e),b:n};break;case 5:i={r:n,g:n*(1-e),b:n*(1-e*o)};break;default:i={r:n*(1-e),g:n*(1-e),b:n*(1-e)}}return i.mode="rgb",void 0!==t&&(i.alpha=t),i}function T(r){var a=r.r,e=r.g,n=r.b,t=r.alpha,o=Math.max(a,e,n),i=Math.min(a,e,n),l={mode:"hsv",s:0===o?0:1-i/o,v:o};return o-i!=0&&(l.h=60*(o===a?(e-n)/(o-i)+6*(e<n):o===e?(n-a)/(o-i)+2:(a-e)/(o-i)+4)),void 0!==t&&(l.alpha=t),l}var U={mode:"hsv",output:{rgb:Q},input:{rgb:T},channels:["h","s","v","alpha"],interpolate:{h:f,s:v,v:v,alpha:m}};var V={mode:"hsi",output:{rgb:function(r){var a=r.h,e=r.s,n=r.i,t=r.alpha;a=c(a);var o=Math.abs(a/60%2-1),i=void 0;switch(Math.floor(a/60)){case 0:i={r:n*(1+e*(3/(2-o)-1)),g:n*(1+e*(3*(1-o)/(2-o)-1)),b:n*(1-e)};break;case 1:i={r:n*(1+e*(3*(1-o)/(2-o)-1)),g:n*(1+e*(3/(2-o)-1)),b:n*(1-e)};break;case 2:i={r:n*(1-e),g:n*(1+e*(3/(2-o)-1)),b:n*(1+e*(3*(1-o)/(2-o)-1))};break;case 3:i={r:n*(1-e),g:n*(1+e*(3*(1-o)/(2-o)-1)),b:n*(1+e*(3/(2-o)-1))};break;case 4:i={r:n*(1+e*(3*(1-o)/(2-o)-1)),g:n*(1-e),b:n*(1+e*(3/(2-o)-1))};break;case 5:i={r:n*(1+e*(3/(2-o)-1)),g:n*(1-e),b:n*(1+e*(3*(1-o)/(2-o)-1))};break;default:i={r:n*(1-e),g:n*(1-e),b:n*(1-e)}}return i.mode="rgb",void 0!==t&&(i.alpha=t),i}},input:{rgb:function(r){var a=r.r,e=r.g,n=r.b,t=r.alpha,o=Math.max(a,e,n),i=Math.min(a,e,n),l={mode:"hsi",s:a+e+n===0?0:1-3*i/(a+e+n),i:(a+e+n)/3};return o-i!=0&&(l.h=60*(o===a?(e-n)/(o-i)+6*(e<n):o===e?(n-a)/(o-i)+2:(a-e)/(o-i)+4)),void 0!==t&&(l.alpha=t),l}},channels:["h","s","i","alpha"],interpolate:{h:f,s:v,i:v,alpha:m}};var W={mode:"hwb",output:{rgb:function(r){var a=r.h,e=r.w,n=r.b,t=r.alpha;if(e+n>1){var o=e+n;e/=o,n/=o}return Q({h:a,s:1===n?1:1-e/(1-n),v:1-n,alpha:t})}},input:{rgb:function(r){var a=T(r);if(void 0!==a){var e={mode:"hwb",w:(1-a.s)*a.v,b:1-a.v};return void 0!==a.h&&(e.h=a.h),void 0!==a.alpha&&(e.alpha=a.alpha),e}}},channels:["h","w","b","alpha"],parsers:[function(r){if("string"==typeof r){var a=r.match(P);if(a){var e={mode:"hwb",h:void 0===a[3]?K(a[1],a[2]):+a[3],w:a[4]/100,b:a[5]/100};if(e.w+e.b>1){var n=e.w+e.b;e.w/=n,e.b/=n}return void 0!==a[6]?e.alpha=a[6]/100:void 0!==a[7]&&(e.alpha=a[7]/255),e}}}],interpolate:{h:f,w:v,b:v,alpha:m}},X=Math.pow(29,3)/Math.pow(3,3),Y=Math.pow(6,3)/Math.pow(29,3),Z=function(r){return Math.pow(r,3)>Y?Math.pow(r,3):(116*r-16)/X},_=function(r){var a,e,n,t,o,i=function(r){var a=r.x,e=r.y,n=r.z;return G({r:3.1338561*a-1.6168667*e-.4906146*n,g:-.9787684*a+1.9161415*e+.033454*n,b:.0719453*a-.2289914*e+1.4052427*n})}((e=(a=r).l,n=a.a,o=(t=(e+16)/116)-a.b/200,{x:.96422*Z(n/500+t),y:1*Z(t),z:.82521*Z(o)}));return i.mode="rgb",void 0!==r.alpha&&(i.alpha=r.alpha),i},rr=function(r){return r>Y?Math.cbrt(r):(X*r+16)/116},ar=function(r){var a,e,n,t,o,i,l=(a=function(r){var a=B(r),e=a.r,n=a.g,t=a.b;return{x:.4360747*e+.3850649*n+.1430804*t,y:.2225045*e+.7168786*n+.0606169*t,z:.0139322*e+.0971045*n+.7141733*t}}(r),e=a.x,n=a.y,t=a.z,o=rr(e/.96422),{mode:"lab",l:116*(i=rr(n/1))-16,a:500*(o-i),b:200*(i-rr(t/.82521))});return r.r===r.b===r.g&&(l.a=l.b=0),void 0!==r.alpha&&(l.alpha=r.alpha),l},er={mode:"lab",output:{rgb:_},input:{rgb:ar},channels:["l","a","b","alpha"],parsers:[function(r){var a=void 0,e=void 0;if(a=r.match(L))e={mode:"lab",l:+a[1],a:+a[2],b:+a[3]};else{if(!(a=r.match(C)))return;e={mode:"lab",l:+a[1],a:0,b:0}}return void 0!==a[4]?e.alpha=a[4]/100:void 0!==a[5]&&(e.alpha=+a[5]),e}],interpolate:{l:v,a:v,b:v,alpha:m}},nr=function(r){var a=r.l,e=r.a,n=r.b,t=r.alpha,o=Math.sqrt(e*e+n*n),i={mode:"lch",l:a,c:o};return o&&(i.h=c(180*Math.atan2(n,e)/Math.PI)),void 0!==t&&(i.alpha=t),i},tr=function(r){var a=r.l,e=r.c,n=r.h,t=r.alpha,o={mode:"lab",l:a,a:0===e?0:e*Math.cos(n/180*Math.PI),b:0===e?0:e*Math.sin(n/180*Math.PI)};return void 0!==t&&(o.alpha=t),o},or={mode:"lch",output:{lab:tr,rgb:function(r){return _(tr(r))}},input:{rgb:function(r){return nr(ar(r))},lch:nr},channels:["l","c","h","alpha"],parsers:[function(r){var a=r.match(A);if(a){var e={mode:"lch",l:+a[1],c:Math.max(0,+a[2]),h:void 0===a[5]?K(a[3],a[4]):+a[5]};return void 0!==a[6]?e.alpha=a[6]/100:void 0!==a[7]&&(e.alpha=+a[7]),e}}],interpolate:{h:f,c:v,l:v,alpha:m}};n(D),n(J),n(N),n(U),n(V),n(W),n(er),n(or);var ir=h("rgb"),lr=h("lrgb"),hr=h("hsl"),ur=h("hsv"),sr=h("hsi"),dr=h("hwb"),br=h("lab"),gr=h("lch"),cr=ir,pr=Object.freeze({hsl:hr,hsv:ur,hsi:sr,hwb:dr,rgb:ir,lab:br,lch:gr,lrgb:lr,css:function(){var r=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"rgb";return function(a){var e=s(a);return e.r=b(e.r),e.b=b(e.b),e.g=b(e.g),"hex"===r?"#"+(1<<24|e.r<<16|e.g<<8|e.b).toString(16).slice(1):"rgb"===r?void 0===a.alpha||1===a.alpha?"rgb("+e.r+", "+e.g+", "+e.b+")":"rgba("+e.r+", "+e.g+", "+e.b+", "+d(e.alpha)+")":void 0}},converter:h,round:u,parse:o,named:g,interpolate:function(r){var a=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"rgb",e=arguments[2],n=function(r){var a=t(r).channels;return function(e){var n={mode:r};return a.forEach(function(r){n[r]=e.map(function(a){return a[r]})}),n}}(a)(r.map(h(a)));e=e||t(a).interpolate;var o={};return Object.keys(e).forEach(function(r){o[r]=e[r](n[r])}),function(r){r=Math.min(Math.max(0,r),1);var e={mode:a},n=void 0;return Object.keys(o).forEach(function(a){void 0!==(n=o[a](r))&&(e[a]=n)}),e}},interpolateLinear:v,interpolateAlpha:m,interpolateHue:f,samples:function(){var r=arguments.length>0&&void 0!==arguments[0]?arguments[0]:2;if(r<2)return r<1?[]:[.5];for(var a=[],e=0;e<r;e++)a.push(e/(r-1));return a},defineMode:n,getModeDefinition:t,default:cr});return Object.assign(cr,pr),cr});

build/index.js

@@ -965,5 +965,10 @@ var converters = {};
 // D65 white 
-var Xn = 0.95047;
+// export const Xn = 0.95047;
+// export const Yn = 1.00000; 
+// export const Zn = 1.08883;
+
+// D50 white
+var Xn = 0.96422;
 var Yn = 1.00000;
-var Zn = 1.08883;
+var Zn = 0.82521;
 
@@ -995,3 +1000,3 @@ var k = Math.pow(29, 3) / Math.pow(3, 3);
 /*
-	CIE XYZ D65 values to sRGB.
+	CIE XYZ D50 values to sRGB.
 
@@ -1008,5 +1013,5 @@ References:
 	return convertLrgbToRgb({
-		r: x * 3.2404542 - y * 1.5371385 - 0.4985314 * z,
-		g: x * -0.9692660 + y * 1.8760108 + 0.0415560 * z,
-		b: x * 0.0556434 - y * 0.2040259 + 1.0572252 * z
+		r: x * 3.1338561 - y * 1.6168667 - 0.4906146 * z,
+		g: x * -0.9787684 + y * 1.9161415 + 0.0334540 * z,
+		b: x * 0.0719453 - y * 0.2289914 + 1.4052427 * z
 	});
@@ -1023,3 +1028,3 @@ });
 /*
-	Convert sRGB values to CIE XYZ D65
+	Convert sRGB values to CIE XYZ D50
 
@@ -1029,2 +1034,3 @@ References:
 		* http://www.brucelindbloom.com/index.html?Eqn_RGB_XYZ_Matrix.html
+	
 */
@@ -1039,5 +1045,5 @@
 	return {
-		x: 0.4124564 * r + 0.3575761 * g + 0.1804375 * b,
-		y: 0.2126729 * r + 0.7151522 * g + 0.0721750 * b,
-		z: 0.0193339 * r + 0.1191920 * g + 0.9503041 * b
+		x: 0.4360747 * r + 0.3850649 * g + 0.1430804 * b,
+		y: 0.2225045 * r + 0.7168786 * g + 0.0606169 * b,
+		z: 0.0139322 * r + 0.0971045 * g + 0.7141733 * b
 	};
@@ -1061,2 +1067,3 @@ });
 	return {
+		mode: 'lab',
 		l: 116 * f1 - 16,
@@ -1070,3 +1077,9 @@ a: 500 * (f0 - f1),
 	var res = convertXyzToLab(convertRgbToXyz(rgb));
-	res.mode = 'lab';
+
+	// Fixes achromatic RGB colors having a _slight_ chroma due to floating-point errors
+	// and approximated computations in sRGB <-> CIELab.
+	// See: https://github.com/d3/d3-color/pull/46
+	if (rgb.r === rgb.b === rgb.g) {
+		res.a = res.b = 0;
+	}
 	if (rgb.alpha !== undefined) res.alpha = rgb.alpha;
@@ -1125,4 +1138,2 @@ return res;
 
-var round_chroma = round(4);
-
 /* 
@@ -1139,5 +1150,3 @@ References:
 
-	// Fixes achromatic colors having a _slight_ chroma due to floating-point errors
-	// and approximated computations in sRGB <-> CIELab.
-	var c = round_chroma(Math.sqrt(a * a + b * b));
+	var c = Math.sqrt(a * a + b * b);
 	var res = {
@@ -1144,0 +1153,0 @@ mode: 'lch',

package.json

 {
   "name": "culori",
-  "version": "0.2.66",
+  "version": "0.2.67",
   "main": "build/culori.js",
@@ -5,0 +5,0 @@ "module": "build/index.js",

README.md

@@ -58,3 +58,3 @@ # Culori
 
-It builds upon the ideas of two thoroughly documented and time-tested projects: [chroma.js](https://github.com/gka/chroma.js) by [Gregor Aisch](https://driven-by-data.net/) and [d3-color](https://github.com/d3/d3-color) by [Mike Bostock](https://bost.ocks.org/mike/). 
+It builds upon the ideas of two thoroughly documented and time-tested projects: [d3-color](https://github.com/d3/d3-color) and [d3-interpolate](https://github.com/d3/d3-interpolate) by [Mike Bostock](https://bost.ocks.org/mike/), and [chroma.js](https://github.com/gka/chroma.js) by [Gregor Aisch](https://driven-by-data.net/). 
 
@@ -61,0 +61,0 @@ You may also want to look at [TinyColor](https://github.com/bgrins/TinyColor) by [Brian Grinstead](http://briangrinstead.com), [color](https://github.com/Qix-/color) by [Heather Arthur](https://github.com/Qix-/), and [color.js](https://github.com/brehaut/color-js) by Andrew Brehaut et al.

src/lab/constants.js

 // D65 white 
-export const Xn = 0.95047;
-export const Yn = 1.00000; 
-export const Zn = 1.08883;
+// export const Xn = 0.95047;
+// export const Yn = 1.00000; 
+// export const Zn = 1.08883;
+
+// D50 white
+export const Xn = 0.96422;
+export const Yn = 1.00000;
+export const Zn = 0.82521;
 	
 export const k = Math.pow(29, 3) / Math.pow(3, 3);
 export const e = Math.pow(6, 3) / Math.pow(29, 3);

src/lab/convertRgbToLab.js

@@ -6,5 +6,11 @@ import convertRgbToXyz from './convertRgbToXyz';
 	let res = convertXyzToLab(convertRgbToXyz(rgb));
-	res.mode = 'lab';
+	
+	// Fixes achromatic RGB colors having a _slight_ chroma due to floating-point errors
+	// and approximated computations in sRGB <-> CIELab.
+	// See: https://github.com/d3/d3-color/pull/46
+	if (rgb.r === rgb.b === rgb.g) {
+		res.a = res.b = 0;
+	}
 	if (rgb.alpha !== undefined) res.alpha = rgb.alpha;
 	return res;
 };

src/lab/convertRgbToXyz.js

 /*
-	Convert sRGB values to CIE XYZ D65
+	Convert sRGB values to CIE XYZ D50
 
@@ -7,2 +7,3 @@ References:
 		* http://www.brucelindbloom.com/index.html?Eqn_RGB_XYZ_Matrix.html
+	
 */
@@ -15,6 +16,6 @@
 	return {
-		x: 0.4124564 * r + 0.3575761 * g + 0.1804375 * b,
-		y: 0.2126729 * r + 0.7151522 * g + 0.0721750 * b,
-		z: 0.0193339 * r + 0.1191920 * g + 0.9503041 * b
+		x: 0.4360747 * r + 0.3850649 * g + 0.1430804 * b,
+		y: 0.2225045 * r + 0.7168786 * g + 0.0606169 * b,
+		z: 0.0139322 * r + 0.0971045 * g + 0.7141733 * b
 	};
 }

src/lab/convertXyzToLab.js

@@ -12,6 +12,7 @@ import { Xn, Yn, Zn, k, e } from './constants';
 	return {
+		mode: 'lab',
 		l: (116 * f1) - 16,
 		a: 500 * (f0 - f1),
 		b: 200 * (f1 - f2)
-	}
+	};
 };

src/lab/convertXyzToRgb.js

 /*
-	CIE XYZ D65 values to sRGB.
+	CIE XYZ D50 values to sRGB.
 
@@ -12,5 +12,5 @@ References:
 export default ({ x, y, z }) => convertLrgbToRgb({
-	r: x * 3.2404542 - y * 1.5371385 - 0.4985314 * z,
-	g: x * -0.9692660 + y * 1.8760108 + 0.0415560 * z,
-	b: x * 0.0556434 - y * 0.2040259 + 1.0572252 * z
+	r: x * 3.1338561 - y * 1.6168667 - 0.4906146 * z,
+	g: x * -0.9787684 + y * 1.9161415 + 0.0334540 * z,
+	b: x * 0.0719453 - y * 0.2289914 + 1.4052427 * z
 });

src/lch/convertLabToLch.js

 import normalizeHue from '../util/normalizeHue';
-import round from '../round';
 
-let round_chroma = round(4);
-
 /* 
@@ -12,5 +9,3 @@ References:
 export default ({ l, a, b, alpha }) => {
-	// Fixes achromatic colors having a _slight_ chroma due to floating-point errors
-	// and approximated computations in sRGB <-> CIELab.
-	let c = round_chroma(Math.sqrt(a * a + b * b));
+	let c = Math.sqrt(a * a + b * b);
 	let res = {
@@ -17,0 +12,0 @@ mode: 'lch',

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

115529

increased by0.49%

Lines of code

3562

increased by0.56%

No dependency changes