From b6c9e97b27ea1997d884347799f8917120656b97 Mon Sep 17 00:00:00 2001
From: Werner Randelshofer <werner.randelshofer@fibermail.ch>
Date: Sun, 9 Feb 2025 10:06:39 +0100
Subject: [PATCH] Fix color spaces.

---
 .../org/jhotdraw8/color/CssColorSpaces.java            | 10 +++++-----
 .../org/jhotdraw8/color/OKHlsColorSpace.java           |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/org.jhotdraw8.color/src/main/java/org.jhotdraw8.color/org/jhotdraw8/color/CssColorSpaces.java b/org.jhotdraw8.color/src/main/java/org.jhotdraw8.color/org/jhotdraw8/color/CssColorSpaces.java
index e3cf15fbb..513e7cd47 100644
--- a/org.jhotdraw8.color/src/main/java/org.jhotdraw8.color/org/jhotdraw8/color/CssColorSpaces.java
+++ b/org.jhotdraw8.color/src/main/java/org.jhotdraw8.color/org/jhotdraw8/color/CssColorSpaces.java
@@ -11,7 +11,7 @@
  * References:
  * <dl>
  *     <dt>CSS Color Module Level 4. Chapter 4. Representing Colors: the &lt;color&gt; type.</dt>
- *     <dd><a href="https://www.w3.org/TR/2022/CRD-css-color-4-20221101/#color-type">w3.org</a></dd>
+ *     <dd><a href="https://www.w3.org/TR/2024/CRD-css-color-4-20240213/#typedef-colorspace-params">w3.org</a></dd>
  * </dl>
  */
 public class CssColorSpaces {
@@ -28,7 +28,7 @@ private CssColorSpaces() {
     public final static Map<String, NamedColorSpace> COLOR_SPACES;
 
     static {
-        D50XyzColorSpace cieXyzColorSpace = new D50XyzColorSpace();
+        D65XyzColorSpace d65XyzColorSpace = new D65XyzColorSpace();
         COLOR_SPACES = Map.of(
                 "srgb", new SrgbColorSpace(),
                 "srgb-linear", new LinearSrgbColorSpace(),
@@ -36,9 +36,9 @@ private CssColorSpaces() {
                 "a98-rgb", new A98RgbColorSpace(),
                 "prophoto-rgb", new ProPhotoRgbColorSpace(),
                 "rec2020", new Rec2020ColorSpace(),
-                "xyz", cieXyzColorSpace,
-                "xyz-d50", new D65XyzColorSpace(),
-                "xyz-d65", cieXyzColorSpace
+                "xyz", d65XyzColorSpace,
+                "xyz-d65", d65XyzColorSpace,
+                "xyz-d50", new D50XyzColorSpace()
         );
     }
 }
diff --git a/org.jhotdraw8.color/src/main/java/org.jhotdraw8.color/org/jhotdraw8/color/OKHlsColorSpace.java b/org.jhotdraw8.color/src/main/java/org.jhotdraw8.color/org/jhotdraw8/color/OKHlsColorSpace.java
index 0c4b4f1a5..b4e7869cd 100644
--- a/org.jhotdraw8.color/src/main/java/org.jhotdraw8.color/org/jhotdraw8/color/OKHlsColorSpace.java
+++ b/org.jhotdraw8.color/src/main/java/org.jhotdraw8.color/org/jhotdraw8/color/OKHlsColorSpace.java
@@ -224,7 +224,7 @@ private static double compute_max_saturation(double a, double b) {
         // Approximate max saturation using a polynomial:
         double S = k0 + k1 * a + k2 * b + k3 * a * a + k4 * a * b;
 
-        // Do one step Halley's method to get closer
+        // Do one-step Halley's method to get closer
         // this gives an error less than 10e6, except for some blue hues where the dS/dh is close to infinite
         // this should be sufficient for most applications, otherwise do two/three steps
 
@@ -327,7 +327,7 @@ private static double find_gamut_intersection(double a, double b, double L1, dou
             // First intersect with triangle
             t = cusp.C * (L0 - 1.0) / (C1 * (cusp.L - 1.0) + cusp.C * (L0 - L1));
 
-            // Then one step Halley's method
+            // Then one-step Halley's method
             {
                 double dL = L1 - L0;
                 double dC = C1;