[css-color-4][mq] fix w3c#4535

Author: svgeesus

css-color-4/Overview.bs

@@ -1954,7 +1954,7 @@ Profiled, Device-dependent Colors</h2>
 	including ''display-p3''' [[!DCI-P3]],
 	which is a wide gamut space typical of current wide-gamut monitors,
 	''prophoto-rgb''', widely used by photographers
-	and ''rec-2020''' [[!Rec.2020]],
+	and ''rec2020''' [[!Rec.2020]],
 	which is a broadcast industry standard,
 	ultra-wide gamut space capable of representing almost all visible real-world colors.
 
@@ -2058,7 +2058,7 @@ Profiled, Device-dependent Colors</h2>
 	''color()'' represents <a>opaque black</a>.
 
 <h3 id="predefined">
-Predefined colorspaces: ''srgb'', ''display-p3'', ''a98-rgb'', ''prophoto-rgb'' and ''rec-2020''.</h3>
+Predefined colorspaces: ''srgb'', ''display-p3'', ''a98-rgb'', ''prophoto-rgb'' and ''rec2020''.</h3>
 
 	The following colorspaces are predefined for use in the ''color()'' function.
 	They can be used without any ''@color-profile'' rule.
@@ -2188,9 +2188,9 @@ Predefined colorspaces: ''srgb'', ''display-p3'', ''a98-rgb'', ''prophoto-rgb''
 					<tr><th>Black luminance</th><td colspan="2">See text</td></tr>
 				</table>
 
-		<dt><dfn>rec-2020</dfn>
+		<dt><dfn>rec2020</dfn>
 		<dd>
-			The ''rec-2020'' [[!Rec.2020]] colorspace accepts three numeric parameters,
+			The ''rec2020'' [[!Rec.2020]] colorspace accepts three numeric parameters,
 			representing the red, green, and blue channels of the color,
 			with each having a valid range of [0, 1]. ITU Reference 2020 is used for High Definition, 4k and 8k television.
 
@@ -2205,7 +2205,7 @@ Predefined colorspaces: ''srgb'', ''display-p3'', ''a98-rgb'', ''prophoto-rgb''
 				<tr><th>Transfer function</th><td colspan="2">1/2.4 (see note)</td></tr>
 			</table>
 
-			Note: rec-2020 references a different transfer curve for cameras. However
+			Note: rec2020 references a different transfer curve for cameras. However
 			this curve is never used in production cameras or 2020 displays.<br/>
 			"In typical production practice the encoding function of image sources is adjusted so that the final picture has the desired look, as viewed on a reference monitor having the reference decoding function of Recommendation ITU-R BT.1886, in the reference viewing environment defined in Recommendation ITU-R BT.2035."<br/>
 			The transfer function (1886) for reference Rec.2020 displays is gamma 2.4 [[!Rec.2020]]
@@ -2223,7 +2223,7 @@ Converting predefined colorspaces to Lab</h4>
 	<ol>
 		<li>Convert from gamma-corrected RGB to linear-light RGB (undo gamma encoding)
 		<li>Convert from linear RGB to CIE XYZ
-		<li>Convert from a D65 whitepoint (used by both display-p3 and rec-2020) to the D50 whitepoint used in Lab,
+		<li>Convert from a D65 whitepoint (used by both display-p3 and rec2020) to the D50 whitepoint used in Lab,
 			with the Bradford transform
 		<li>Convert D50-adapted XYZ to Lab
 	</ol>
@@ -2232,7 +2232,7 @@ Converting predefined colorspaces to Lab</h4>
 <h4 id="lab-to-predefined">
 Converting Lab to predefined colorspaces</h4>
 
-	Conversion from Lab to display-p3 or rec-2020 also requires multiple steps,
+	Conversion from Lab to display-p3 or rec2020 also requires multiple steps,
 	and again in practice all but the last step are linear calculations and can be combined.
 
 	<ol>
@@ -2261,7 +2261,7 @@ Specifying a color profile: the ''@color-profile'' at-rule</h3>
 
 	The <<custom-ident>> gives the <a>color profile's</a> name.
 	All of the predefined colorspace keywords
-	(''srgb'', ''display-p3'', ''a98-rgb'', ''prophoto-rgb'', ''rec-2020'')
+	(''srgb'', ''display-p3'', ''a98-rgb'', ''prophoto-rgb'', ''rec2020'')
 	are excluded from this <<custom-ident>>,
 	as they're predefined by this specification and always available.
 

css-color-4/conversions.js

@@ -54,25 +54,25 @@ function XYZ_to_lin_sRGB(XYZ) {
 	return math.multiply(M, XYZ).valueOf();
 }
 
-//  image-3-related functions
+//  display-p3-related functions
 
 
 function lin_P3(RGB) {
-	// convert an array of image-p3 RGB values in the range 0.0 - 1.0
+	// convert an array of display-p3 RGB values in the range 0.0 - 1.0
 	// to linear light (un-companded) form.
 
 	return lin_sRGB(RGB);	// same as sRGB
 }
 
 function gam_P3(RGB) {
-	// convert an array of linear-light image-p3 RGB  in the range 0.0-1.0
+	// convert an array of linear-light display-p3 RGB  in the range 0.0-1.0
 	// to gamma corrected form
 
 	return gam_sRGB(RGB);	// same as sRGB
 }
 
 function lin_P3_to_XYZ(rgb) {
-	// convert an array of linear-light image-p3 values to CIE XYZ
+	// convert an array of linear-light display-p3 values to CIE XYZ
 	// using  D65 (no chromatic adaptation)
 	// http://www.brucelindbloom.com/index.html?Eqn_RGB_XYZ_Matrix.html
 	var M = math.matrix([
@@ -195,7 +195,7 @@ function XYZ_to_lin_a98rgb(XYZ) {
 //Rec. 2020-related functions
 
 function lin_2020(RGB) {
-	// convert an array of rec-2020 RGB values in the range 0.0 - 1.0
+	// convert an array of rec2020 RGB values in the range 0.0 - 1.0
 	// to linear light (un-companded) form.
 	const α = 1.09929682680944 ;
 	const β = 0.018053968510807;
@@ -211,7 +211,7 @@ function lin_2020(RGB) {
 //check with standard this really is 2.4 and 1/2.4, not 0.45 was wikipedia claims
 
 function gam_2020(RGB) {
-	// convert an array of linear-light rec-2020 RGB  in the range 0.0-1.0
+	// convert an array of linear-light rec2020 RGB  in the range 0.0-1.0
 	// to gamma corrected form
 	const α = 1.09929682680944 ;
 	const β = 0.018053968510807;
@@ -226,7 +226,7 @@ function gam_2020(RGB) {
 }
 
 function lin_2020_to_XYZ(rgb) {
-	// convert an array of linear-light rec-2020 values to CIE XYZ
+	// convert an array of linear-light rec2020 values to CIE XYZ
 	// using  D65 (no chromatic adaptation)
 	// http://www.brucelindbloom.com/index.html?Eqn_RGB_XYZ_Matrix.html
 	var M = math.matrix([
@@ -240,7 +240,7 @@ function lin_2020_to_XYZ(rgb) {
 }
 
 function XYZ_to_lin_2020(XYZ) {
-	// convert XYZ to linear-light rec-2020
+	// convert XYZ to linear-light rec2020
 	var M = math.matrix([
 		[1.7166511879712674,   -0.35567078377639233, -0.25336628137365974],
 		[-0.6666843518324892,   1.6164812366349395,   0.01576854581391113],