[css-color-4] Fix #4056 hyphens in colorspaces

Author: svgeesus

css-color-4/Overview.bs

@@ -2015,7 +2015,7 @@ Profiled, Device-dependent Colors</h2>
 	''color()'' represents <a>opaque black</a>.
 
 <h3 id="predefined">
-Predefined colorspaces: ''srgb'', ''display-p3'', ''a98rgb'', ''prophotorgb'' and ''rec2020''.</h3>
+Predefined colorspaces: ''srgb'', ''display-p3'', ''a98-rgb'', ''prophoto-rgb'' and ''rec-2020''.</h3>
 
 	The following colorspaces are predefined for use in the ''color()'' function.
 	They can be used without any ''@color-profile'' rule.
@@ -2080,21 +2080,21 @@ Predefined colorspaces: ''srgb'', ''display-p3'', ''a98rgb'', ''prophotorgb'' an
 				<tr><th>Black luminance</th><td colspan="2">0.80 cd/m<sup>2</sup></td></tr>
 			</table>
 
-		<dt><dfn>a98rgb</dfn>
+		<dt><dfn>a98-rgb</dfn>
 		<dd>
-			The ''a98rgb'' colorspace accepts three numeric parameters,
+			The ''a98-rgb'' colorspace accepts three numeric parameters,
 			representing the red, green, and blue channels of the color,
 			with each having a valid range of [0, 1]. The transfer curve is
 			a gamma function, close to but not exactly 1/2.2.
 
-			''a98rgb'' is compatible with Adobe® RGB (1998) [[!AdobeRGB]].
+			''a98-rgb'' is compatible with Adobe® RGB (1998) [[!AdobeRGB]].
 
 			Adobe® RGB (1998) uses primaries originally derived
 			from the SMPTE 240M standard;
 			errors in the original conversion turned out
 			to produce a colorspace that was useful for digital photography,
 			so Adobe® RGB (1998) is a common wider-gamut colorspace for
-			photographic images. The ''a98rgb'' colorspace allows CSS to
+			photographic images. The ''a98-rgb'' colorspace allows CSS to
 			specify colors that will match colors in such images
 			having the same RGB values.
 
@@ -2111,9 +2111,9 @@ Predefined colorspaces: ''srgb'', ''display-p3'', ''a98rgb'', ''prophotorgb'' an
 				<tr><th>Black luminance</th><td colspan="2">0.5557 cd/m<sup>2</sup></td></tr>
 			</table>
 
-		<dt><dfn>prophotorgb</dfn>
+		<dt><dfn>prophoto-rgb</dfn>
 			<dd>
-				The ''prophotorgb'' colorspace accepts three numeric parameters,
+				The ''prophoto-rgb'' colorspace accepts three numeric parameters,
 				representing the red, green, and blue channels of the color,
 				with each having a valid range of [0, 1]. The transfer curve is
 				a gamma function with a value of 1/1.8.
@@ -2124,7 +2124,7 @@ Predefined colorspaces: ''srgb'', ''display-p3'', ''a98rgb'', ''prophotorgb'' an
 				a wide color gamut and to minimise hue shifts under tonal manipulation.
 				It is often used in digital photography as a wide gamut
 				colorspace for the master version of
-				photographic images. The ''prophotorgb'' colorspace allows CSS to
+				photographic images. The ''prophoto-rgb'' colorspace allows CSS to
 				specify colors that will match colors in such images
 				having the same RGB values.
 
@@ -2145,9 +2145,9 @@ Predefined colorspaces: ''srgb'', ''display-p3'', ''a98rgb'', ''prophotorgb'' an
 					<tr><th>Black luminance</th><td colspan="2">See text</td></tr>
 				</table>
 
-		<dt><dfn>rec2020</dfn>
+		<dt><dfn>rec-2020</dfn>
 		<dd>
-			The ''rec2020'' [[!Rec.2020]] colorspace accepts three numeric parameters,
+			The ''rec-2020'' [[!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.
 
@@ -2162,7 +2162,7 @@ Predefined colorspaces: ''srgb'', ''display-p3'', ''a98rgb'', ''prophotorgb'' an
 				<tr><th>Transfer function</th><td colspan="2">1/2.4 (see note)</td></tr>
 			</table>
 
-			Note: Rec2020 references a different transfer curve for cameras. However
+			Note: rec-2020 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]]
@@ -2180,7 +2180,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 rec2020) to the D50 whitepoint used in Lab,
+		<li>Convert from a D65 whitepoint (used by both display-p3 and rec-2020) to the D50 whitepoint used in Lab,
 			with the Bradford transform
 		<li>Convert D50-adapted XYZ to Lab
 	</ol>
@@ -2189,7 +2189,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 rec2020 also requires multiple steps,
+	Conversion from Lab to display-p3 or rec-2020 also requires multiple steps,
 	and again in practice all but the last step are linear calculations and can be combined.
 
 	<ol>
@@ -2218,7 +2218,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'', ''a98rgb'', ''prophotorgb'', ''rec2020'')
+	(''srgb'', ''display-p3'', ''a98-rgb'', ''prophoto-rgb'', ''rec-2020'')
 	are excluded from this <<custom-ident>>,
 	as they're predefined by this specification and always available.
 
@@ -2621,10 +2621,10 @@ Default Style Rules</h2>
 		return math.multiply(M, XYZ).valueOf();
 	}
 
-	// ProPhotoRGB functions
+	// prophoto-rgb functions
 
 	function lin_ProPhoto(RGB) {
-		// convert an array of ProPhotoRGB values in the range 0.0 - 1.0
+		// convert an array of prophoto-rgb values in the range 0.0 - 1.0
 		// to linear light (un-companded) form.
 		// Transfer curve is gamma 1.0 with a small linear portion
 		return RGB.map(function (val) {
@@ -2637,7 +2637,7 @@ Default Style Rules</h2>
 	}
 
 	function gam_ProPhoto(RGB) {
-		// convert an array of linear-light ProPhotoRGB  in the range 0.0-1.0
+		// convert an array of linear-light prophoto-rgb  in the range 0.0-1.0
 		// to gamma corrected form
 		// Transfer curve is gamma 1.0 with a small linear portion
 		return RGB.map(function (val) {
@@ -2650,7 +2650,7 @@ Default Style Rules</h2>
 	}
 
 	function lin_ProPhoto_to_XYZ(rgb) {
-		// convert an array of linear-light ProPhotoRGB values to CIE XYZ
+		// convert an array of linear-light prophoto-rgb values to CIE XYZ
 		// using  D50 (so no chromatic adaptation needed afterwards)
 		// http://www.brucelindbloom.com/index.html?Eqn_RGB_XYZ_Matrix.html
 		var M = Math.matrix([
@@ -2663,7 +2663,7 @@ Default Style Rules</h2>
 	}
 
 	function XYZ_to_lin_ProPhoto(XYZ) {
-		// convert XYZ to linear-light ProPhotoRGB
+		// convert XYZ to linear-light prophoto-rgb
 		var M = Math.matrix([
 			[  1.3457989731028281,  -0.25558010007997534,  -0.05110628506753401 ],
 			[ -0.5446224939028347,   1.5082327413132781,    0.02053603239147973 ],
@@ -2673,26 +2673,26 @@ Default Style Rules</h2>
 		return Math.multiply(M, XYZ).valueOf();
 	}
 
-	// a98rgb functions
+	// a98-rgb functions
 
-	function lin_a98rgb(RGB) {
-		// convert an array of a98rgb values in the range 0.0 - 1.0
+	function lin_a98-rgb(RGB) {
+		// convert an array of a98-rgb values in the range 0.0 - 1.0
 		// to linear light (un-companded) form.
 		return RGB.map(function (val) {
 			return Math.pow(val, 563/256);
 		});
 	}
 
-	function gam_a98rgb(RGB) {
-		// convert an array of linear-light a98rgb  in the range 0.0-1.0
+	function gam_a98-rgb(RGB) {
+		// convert an array of linear-light a98-rgb  in the range 0.0-1.0
 		// to gamma corrected form
 		return RGB.map(function (val) {
 			return Math.pow(val, 256/563);
 		});
 	}
 
-	function lin_a98rgb_to_XYZ(rgb) {
-		// convert an array of linear-light ProPhotoRGB values to CIE XYZ
+	function lin_a98-rgb_to_XYZ(rgb) {
+		// convert an array of linear-light prophoto-rgb values to CIE XYZ
 		// using  D50 (so no chromatic adaptation needed afterwards)
 		// http://www.brucelindbloom.com/index.html?Eqn_RGB_XYZ_Matrix.html
 		var M = Math.matrix([
@@ -2704,8 +2704,8 @@ Default Style Rules</h2>
 		return Math.multiply(M, rgb).valueOf();
 	}
 
-	function XYZ_to_lin_a98rgb(XYZ) {
-		// convert XYZ to linear-light ProPhotoRGB
+	function XYZ_to_lin_a98-rgb(XYZ) {
+		// convert XYZ to linear-light prophoto-rgb
 		var M = Math.matrix([
 		[  2.0415879038107465,    -0.5650069742788596,   -0.34473135077832956 ],
 		[ -0.9692436362808795,     1.8759675015077202,    0.04155505740717557 ],
@@ -2994,10 +2994,10 @@ Changes</h2>
 	<li>Clarify hue in LCH is modulo 360deg</li>
 	<li>Clarify allowed range of L in LCH and Lab, and meaning of L=100</li>
 	<li>Update references for colorspaces used in video</li>
-	<li>Add ProPhotoRGB predefined colorspace</li>
+	<li>Add prophoto-rgb predefined colorspace</li>
 	<li>Correct black and white luminance levels for display-p3</li>
 	<li>Clarify display-p3 transfer function</li>
-	<li>Add a98rgb colorspace</li>
+	<li>Add a98-rgb colorspace</li>
 	<li>Clarify that currentColor's computed value is not the resolved color</li>
 	<li>Update syntax is examples to conform to latest specification</li>
 	<li>Remove the color-mod() function</li>

css-color-4/conversions.js

@@ -96,12 +96,12 @@ function XYZ_to_lin_P3(XYZ) {
 	return math.multiply(M, XYZ).valueOf();
 }
 
-// ProPhotoRGB functions
+// prophoto-rgb functions
 
 function lin_ProPhoto(RGB) {
-	// convert an array of ProPhotoRGB values in the range 0.0 - 1.0
+	// convert an array of prophoto-rgb values in the range 0.0 - 1.0
 	// to linear light (un-companded) form.
-	// Transfer curve is gamma 1.0 with a small linear portion
+	// Transfer curve is gamma 1.8 with a small linear portion
 	return RGB.map(function (val) {
 		if (val < 0.031248) {
 			return val / 16;
@@ -112,9 +112,9 @@ function lin_ProPhoto(RGB) {
 }
 
 function gam_ProPhoto(RGB) {
-	// convert an array of linear-light ProPhotoRGB  in the range 0.0-1.0
+	// convert an array of linear-light prophoto-rgb  in the range 0.0-1.0
 	// to gamma corrected form
-	// Transfer curve is gamma 1.0 with a small linear portion
+	// Transfer curve is gamma 1.8 with a small linear portion
 	return RGB.map(function (val) {
 		if (val > 0.001953) {
 			return Math.pow(val, 1/1.8);
@@ -125,7 +125,7 @@ function gam_ProPhoto(RGB) {
 }
 
 function lin_ProPhoto_to_XYZ(rgb) {
-	// convert an array of linear-light ProPhotoRGB values to CIE XYZ
+	// convert an array of linear-light prophoto-rgb values to CIE XYZ
 	// using  D50 (so no chromatic adaptation needed afterwards)
 	// http://www.brucelindbloom.com/index.html?Eqn_RGB_XYZ_Matrix.html
 	var M = Math.matrix([
@@ -138,7 +138,7 @@ function lin_ProPhoto_to_XYZ(rgb) {
 }
 
 function XYZ_to_lin_ProPhoto(XYZ) {
-	// convert XYZ to linear-light ProPhotoRGB
+	// convert XYZ to linear-light prophoto-rgb
 	var M = Math.matrix([
   	[  1.3457989731028281,  -0.25558010007997534,  -0.05110628506753401 ],
   	[ -0.5446224939028347,   1.5082327413132781,    0.02053603239147973 ],
@@ -148,26 +148,26 @@ function XYZ_to_lin_ProPhoto(XYZ) {
 	return Math.multiply(M, XYZ).valueOf();
 }
 
-// a98rgb functions
+// a98-rgb functions
 
 function lin_a98rgb(RGB) {
-	// convert an array of a98rgb values in the range 0.0 - 1.0
+	// convert an array of a98-rgb values in the range 0.0 - 1.0
 	// to linear light (un-companded) form.
 	return RGB.map(function (val) {
 	  return Math.pow(val, 563/256);
 	});
 }
 
 function gam_a98rgb(RGB) {
-	// convert an array of linear-light a98rgb  in the range 0.0-1.0
+	// convert an array of linear-light a98-rgb  in the range 0.0-1.0
 	// to gamma corrected form
 	return RGB.map(function (val) {
 		return Math.pow(val, 256/563);
 	});
 }
 
-function lin_a98rgb_to_XYZ(rgb) {
-	// convert an array of linear-light a98rgb values to CIE XYZ
+function lin_a98-rgb_to_XYZ(rgb) {
+	// convert an array of linear-light a98-rgb values to CIE XYZ
 	// using  D50 (so no chromatic adaptation needed afterwards)
 	// http://www.brucelindbloom.com/index.html?Eqn_RGB_XYZ_Matrix.html
 	// which has greater numerical precsion than section 4.3.5.3 of
@@ -181,8 +181,8 @@ function lin_a98rgb_to_XYZ(rgb) {
 	return Math.multiply(M, rgb).valueOf();
 }
 
-function XYZ_to_lin_a98rgb(XYZ) {
-	// convert XYZ to linear-light a98rgb
+function XYZ_to_lin_a98-rgb(XYZ) {
+	// convert XYZ to linear-light a98-rgb
 	var M = Math.matrix([
 	[  2.0415879038107465,    -0.5650069742788596,   -0.34473135077832956 ],
 	[ -0.9692436362808795,     1.8759675015077202,    0.04155505740717557 ],
@@ -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 rec-2020 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 rec-2020 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 rec-2020 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 rec-2020
 	var M = math.matrix([
 		[1.7166511879712674,   -0.35567078377639233, -0.25336628137365974],
 		[-0.6666843518324892,   1.6164812366349395,   0.01576854581391113],