moved and fixed device-cmyk per https://www.w3.org/TR/2025/WD-css-color-5-20250318/#funcdef-device-cmyk

Author: ylafon

org/w3c/css/values/CssColor.java

@@ -11,6 +11,7 @@
 import org.w3c.css.util.CssVersion;
 import org.w3c.css.util.InvalidParamException;
 import org.w3c.css.values.color.ColorMix;
+import org.w3c.css.values.color.DeviceCMYK;
 import org.w3c.css.values.color.HSL;
 import org.w3c.css.values.color.HWB;
 import org.w3c.css.values.color.LAB;
@@ -778,149 +779,8 @@ public void setOKLCHColor(ApplContext ac, CssExpression exp)
 
     public void setDeviceCMYKColor(ApplContext ac, CssExpression exp)
             throws InvalidParamException {
-        // HWB defined in CSSColor Level 4 and onward, currently used in the CSS level
-        if (ac.getCssVersion().compareTo(CssVersion.CSS3) < 0) {
-            StringBuilder sb = new StringBuilder();
-            sb.append("device-cmyk(").append(exp.toStringFromStart()).append(')');
-            throw new InvalidParamException("notversion", sb.toString(),
-                    ac.getCssVersionString(), ac);
-        }
-
-        color = null;
-        cmyk = new DeviceCMYK();
-        CssValue val = exp.getValue();
-        char op = exp.getOperator();
-        boolean gotFallback = false;
-
-        if (exp.hasCssVariable()) {
-            markCssVariable();
-        }
-        // C
-        if ((val == null || op != SPACE) && !hasCssVariable()) {
-            throw new InvalidParamException("invalid-color", ac);
-        }
-        switch (val.getType()) {
-            case CssTypes.CSS_NUMBER:
-            case CssTypes.CSS_PERCENTAGE:
-            case CssTypes.CSS_VARIABLE:
-                cmyk.setC(ac, val);
-                break;
-            default:
-                if (!hasCssVariable()) {
-                    throw new InvalidParamException("colorfunc", val, "device-cmyk", ac);
-                }
-        }
-
-        // M
-        exp.next();
-        val = exp.getValue();
-        op = exp.getOperator();
-        if ((val == null || op != SPACE) && !hasCssVariable()) {
-            exp.starts();
-            throw new InvalidParamException("invalid-color", ac);
-        }
-        switch (val.getType()) {
-            case CssTypes.CSS_NUMBER:
-            case CssTypes.CSS_PERCENTAGE:
-            case CssTypes.CSS_VARIABLE:
-                cmyk.setM(ac, val);
-                break;
-            default:
-                if (!hasCssVariable()) {
-                    exp.starts();
-                    throw new InvalidParamException("colorfunc", val, "device-cmyk", ac);
-                }
-        }
-
-        // Y
-        exp.next();
-        val = exp.getValue();
-        op = exp.getOperator();
-        if ((val == null) && !hasCssVariable()) {
-            throw new InvalidParamException("colorfunc", exp.toStringFromStart(), "device-cmyk", ac);
-        }
-        switch (val.getType()) {
-            case CssTypes.CSS_NUMBER:
-            case CssTypes.CSS_PERCENTAGE:
-            case CssTypes.CSS_VARIABLE:
-                cmyk.setY(ac, val);
-                break;
-            default:
-                if (!hasCssVariable()) {
-                    exp.starts();
-                    throw new InvalidParamException("colorfunc", val, "device-cmyk", ac);
-                }
-        }
-        // K
-        exp.next();
-        val = exp.getValue();
-        op = exp.getOperator();
-        if ((val == null) && !hasCssVariable()) {
-            throw new InvalidParamException("colorfunc", exp.toStringFromStart(), "device-cmyk", ac);
-        }
-        switch (val.getType()) {
-            case CssTypes.CSS_NUMBER:
-            case CssTypes.CSS_PERCENTAGE:
-            case CssTypes.CSS_VARIABLE:
-                cmyk.setK(ac, val);
-                break;
-            default:
-                if (!hasCssVariable()) {
-                    exp.starts();
-                    throw new InvalidParamException("colorfunc", val, "device-cmyk", ac);
-                }
-        }
-
-        exp.next();
-        if (!exp.end()) {
-            if ((op == SPACE) && !hasCssVariable()) {
-                // now we need an alpha.
-                val = exp.getValue();
-                op = exp.getOperator();
-
-                if ((val.getType() != CssTypes.CSS_SWITCH) && !hasCssVariable()) {
-                    throw new InvalidParamException("rgb", val, ac);
-                }
-                if ((op != SPACE) && !hasCssVariable()) {
-                    throw new InvalidParamException("invalid-color", ac);
-                }
-                exp.next();
-                // now we get the alpha value
-                val = exp.getValue();
-                if ((val == null) && !hasCssVariable()) {
-                    throw new InvalidParamException("invalid-color", exp.toStringFromStart(), ac);
-                }
-                switch (val.getType()) {
-                    case CssTypes.CSS_NUMBER:
-                    case CssTypes.CSS_PERCENTAGE:
-                    case CssTypes.CSS_VARIABLE:
-                        cmyk.setAlpha(ac, val);
-                        break;
-                    default:
-                        if (!hasCssVariable()) {
-                            exp.starts();
-                            throw new InvalidParamException("colorfunc", val, "device-cmyk", ac);
-                        }
-                }
-                // need to check if we get a comma after this.
-                op = exp.getOperator();
-                exp.next();
-            }
-            if (op == COMMA) {
-                //the optional fallback
-                if (exp.end() && !hasCssVariable()) {
-                    throw new InvalidParamException("colorfunc", exp.toStringFromStart(), "device-cmyk", ac);
-                }
-                val = exp.getValue();
-                cmyk.setFallbackColor(ac, val);
-                exp.next();
-            }
-        }
-        // extra values?
-        if (!exp.end() && !hasCssVariable()) {
-            exp.starts();
-            throw new InvalidParamException("colorfunc", exp.toStringFromStart(), "device-cmyk", ac);
-        }
+        // HWB defined in CSSColor Level 5 and onward, currently used in the CSS level
+        cmyk = DeviceCMYK.parseDeviceCMYK(ac, exp, this);
     }
 
     public void setColorMix(ApplContext ac, CssExpression exp)