support for light-dark() per https://www.w3.org/TR/2024/WD-css-color-5-20240229/#light-dark

Author: ylafon

org/w3c/css/parser/analyzer/CssParser.java

@@ -8650,6 +8650,14 @@ final public boolean prio() throws ParseException {
         } else if (funcname.equals("device-cmyk(")) {
             color.setDeviceCMYKColor(ac, exp);
             {if ("" != null) return color;}
+        } else if (funcname.equals("light-dark(")) {
+            color.setLightDark(ac, exp);
+            {if ("" != null) return color;}
+/*
+        } else if (funcname.equals("color-mix(")) {
+	    color.setColorMix(ac, exp);
+	    return color;
+*/
         } else if (funcname.equals("image(")) {
             CssImage img = new CssImage();
             img.setImageList(exp, ac);

org/w3c/css/parser/analyzer/CssParser.jj

@@ -3465,7 +3465,7 @@ CssCheckableValue mathsum() :
 			  nb_pre_sp = 0;
     }
 	// special case for "-" as it can't match like <PLUS> (<PLUS> is <_W>* "+")
-	( LOOKAHEAD(2) ( o=<PLUS> | ( ( <S> { nb_pre_sp++; }  )* o=<MINUS> ) ) { 
+	( LOOKAHEAD(2) ( o=<PLUS> | ( ( <S> { nb_pre_sp++; }  )* o=<MINUS> ) ) {
 	    if (o.image.length() < 2 && nb_pre_sp == 0) {
 		throw new ParseException(ac.getMsg().getString("parser.calcwhitespace"));
 	    }
@@ -3722,6 +3722,14 @@ CssValue function() :
         } else if (funcname.equals("device-cmyk(")) {
             color.setDeviceCMYKColor(ac, exp);
             return color;
+        } else if (funcname.equals("light-dark(")) {
+	    color.setLightDark(ac, exp);
+	    return color;
+/*
+        } else if (funcname.equals("color-mix(")) {
+	    color.setColorMix(ac, exp);
+	    return color;
+*/
 	} else if (funcname.equals("image(")) {
 	    CssImage img = new CssImage();
 	    img.setImageList(exp, ac);

org/w3c/css/properties/css3/CssColor.java

@@ -69,7 +69,7 @@ public CssColor(ApplContext ac, CssExpression expression, boolean check)
                 color = val;
                 break;
             case CssTypes.CSS_FUNCTION:
-                CssFunction attr = val.getFunction();
+                 CssFunction attr = val.getFunction();
                 CssExpression params = attr.getParameters();
                 String fname = attr.getName();
 

org/w3c/css/values/CssColor.java

@@ -36,6 +36,7 @@ public final int getType() {
     LAB lab = null;
     LCH lch = null;
     DeviceCMYK cmyk = null;
+    LightDark lightdark = null;
 
     boolean contains_variable = false;
 
@@ -114,6 +115,24 @@ public String toString() {
         return "*invalid*";
     }
 
+    public void setLightDark(ApplContext ac, CssExpression exp)
+            throws InvalidParamException {
+        if ((exp == null) || (exp.getCount() != 2)) {
+              throw new InvalidParamException("invalid-color", ac);
+        }
+        LightDark ld = new LightDark();
+        CssValue l = exp.getValue();
+        char op = exp.getOperator();
+        if (l == null || op != COMMA) {
+            throw new InvalidParamException("invalid-color", ac);
+        }
+        exp.next();
+        CssValue d = exp.getValue();
+        ld.setLight(ac, l);
+        ld.setDark(ac, d);
+        this.lightdark = ld;
+        exp.next();
+    }
 
     public void setRGBColor(ApplContext ac, CssExpression exp)
             throws InvalidParamException {
@@ -1379,5 +1398,20 @@ public void setDeviceCMYKColor(ApplContext ac, CssExpression exp)
         }
     }
 
+    /**
+     * Parse a LightDark color.
+     * format: light-dark( <color>, <color>) [ / <alpha-value> ]? ) |
+     */
+    public void setLightDarkColor(ApplContext ac, CssExpression exp)
+            throws InvalidParamException {
+        // light-dark defined in CSS3 and onward
+        if (ac.getCssVersion().compareTo(CssVersion.CSS3) < 0) {
+            StringBuilder sb = new StringBuilder();
+            sb.append("light-dark(").append(exp.toStringFromStart()).append(')');
+            throw new InvalidParamException("notversion", sb.toString(),
+                    ac.getCssVersionString(), ac);
+        }
+        lightdark = new LightDark();
+    }
 }
 

org/w3c/css/values/LightDark.java

@@ -0,0 +1,61 @@
+//
+// Author: Yves Lafon <ylafon@w3.org>
+//
+// (c) COPYRIGHT MIT, ERCIM, Keio University, Beihang University 2018.
+// Please first read the full copyright statement in file COPYRIGHT.html
+//
+package org.w3c.css.values;
+
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+
+public class LightDark {
+    String output = null;
+    CssColor light, dark;
+    boolean has_css_variable = false;
+
+    /**
+     * Create a new LightDark
+     */
+    public LightDark() {
+    }
+
+    public final void setLight(ApplContext ac, CssValue val) throws InvalidParamException {
+        if (val.getType() == CssTypes.CSS_COLOR) {
+            light = (CssColor) val;
+            if (light.hasCssVariable()) {
+                has_css_variable = true;
+            }
+            output = null;
+        }
+    }
+
+    public final void setDark(ApplContext ac, CssValue val) throws InvalidParamException {
+        if (val.getType() == CssTypes.CSS_COLOR) {
+            dark = (CssColor) val;
+            if (dark.hasCssVariable()) {
+                has_css_variable = true;
+            }
+            output = null;
+        }
+    }
+
+    public boolean equals(LightDark other) {
+        if (other != null) {
+            return (light.equals(other.light) && dark.equals(other.dark));
+        }
+        return false;
+    }
+
+    /**
+     * Returns a string representation of the object.
+     */
+    public String toString() {
+        if (output == null) {
+            StringBuilder sb = new StringBuilder("light-dark(");
+            sb.append(light).append(", ").append(dark).append(')');
+            output = sb.toString();
+        }
+        return output;
+    }
+}