added gray() as an alias of lab(), note #csswg-drafts/635 about allowing percentages here

Author: ylafon

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

@@ -6114,6 +6114,9 @@ final public boolean prio() throws ParseException {
         } else if (funcname.equals("lab(")) {
             color.setLABColor(exp, ac);
             {if ("" != null) return color;}
+        } else if (funcname.equals("gray(")) {
+            color.setGrayColor(exp, ac);
+            {if ("" != null) return color;}
         } else if (funcname.equals("lch(")) {
             color.setLCHColor(exp, ac);
             {if ("" != null) return color;}
@@ -7029,26 +7032,26 @@ private boolean jj_3R_216()
     return false;
   }
 
-  private boolean jj_3R_197()
+  private boolean jj_3R_214()
  {
-    if (jj_scan_token(DIMEN)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(39)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(40)) return true;
+    }
     return false;
   }
 
-  private boolean jj_3R_196()
+  private boolean jj_3R_197()
  {
-    if (jj_scan_token(SPL)) return true;
+    if (jj_scan_token(DIMEN)) return true;
     return false;
   }
 
-  private boolean jj_3R_214()
+  private boolean jj_3R_196()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(39)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(40)) return true;
-    }
+    if (jj_scan_token(SPL)) return true;
     return false;
   }
 
@@ -7118,15 +7121,15 @@ private boolean jj_3R_185()
     return false;
   }
 
-  private boolean jj_3R_184()
+  private boolean jj_3R_217()
  {
-    if (jj_3R_165()) return true;
+    if (jj_scan_token(IDENT)) return true;
     return false;
   }
 
-  private boolean jj_3R_217()
+  private boolean jj_3R_184()
  {
-    if (jj_scan_token(IDENT)) return true;
+    if (jj_3R_165()) return true;
     return false;
   }
 

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

@@ -3054,6 +3054,9 @@ CssValue function() :
         } else if (funcname.equals("lab(")) {
             color.setLABColor(exp, ac);
             return color;
+        } else if (funcname.equals("gray(")) {
+            color.setGrayColor(exp, ac);
+            return color;
         } else if (funcname.equals("lch(")) {
             color.setLCHColor(exp, ac);
             return color;

org/w3c/css/values/CssColor.java

@@ -11,6 +11,7 @@
 import org.w3c.css.util.CssVersion;
 import org.w3c.css.util.InvalidParamException;
 
+import java.math.BigDecimal;
 import java.util.HashMap;
 
 import static org.w3c.css.values.CssOperator.COMMA;
@@ -913,6 +914,68 @@ public void setLABColor(CssExpression exp, ApplContext ac)
         }
     }
 
+    public void setGrayColor(CssExpression exp, ApplContext ac)
+            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("gray(").append(exp.toStringFromStart()).append(')');
+            throw new InvalidParamException("notversion", sb.toString(),
+                    ac.getCssVersionString(), ac);
+        }
+
+        color = null;
+        lab = new LAB();
+        lab.setGray(true);
+        CssValue val = exp.getValue();
+        char op = exp.getOperator();
+        // L
+        if (val == null) {
+            throw new InvalidParamException("invalid-color", ac);
+        }
+        switch (val.getType()) {
+            case CssTypes.CSS_NUMBER:
+                lab.setL(ac, val);
+                break;
+            default:
+                throw new InvalidParamException("rgb", val, ac); // FIXME gray
+        }
+
+        // A
+        CssNumber n = new CssNumber();
+        n.setValue(BigDecimal.ZERO);
+        lab.setA(ac, n);
+        // B
+        lab.setB(ac, n);
+
+        exp.next();
+        if (!exp.end()) {
+            if (op != COMMA) {
+                throw new InvalidParamException("operator", exp.toStringFromStart(), ac);
+            }
+            // Alpha
+            val = exp.getValue();
+            if (val == null) {
+                throw new InvalidParamException("invalid-color", exp.toStringFromStart(), ac);
+            }
+            switch (val.getType()) {
+                case CssTypes.CSS_NUMBER:
+                case CssTypes.CSS_PERCENTAGE:
+                    lab.setAlpha(ac, val);
+                    break;
+                default:
+                    exp.starts();
+                    throw new InvalidParamException("rgb", val, ac); // FIXME gray
+            }
+            exp.next();
+        }
+        // extra values?
+        if (!exp.end()) {
+            exp.starts();
+            throw new InvalidParamException("rgb", exp.toStringFromStart(), ac);
+        }
+    }
+
 
     public void setLCHColor(CssExpression exp, ApplContext ac)
             throws InvalidParamException {
@@ -997,5 +1060,6 @@ public void setLCHColor(CssExpression exp, ApplContext ac)
         }
     }
 
+
 }
 

org/w3c/css/values/LAB.java

@@ -13,6 +13,7 @@ public class LAB {
     String output = null;
     CssValue vl, va, vb, alpha;
     boolean faSet = false;
+    boolean isGray = false;
 
     /**
      * Create a new LAB
@@ -77,20 +78,35 @@ public final void setAlpha(ApplContext ac, CssValue val)
         alpha = RGBA.filterAlpha(ac, val);
     }
 
+    public final boolean setGray(boolean isGray) {
+        this.isGray = isGray;
+        return isGray;
+    }
+
 
     /**
      * Returns a string representation of the object.
      */
     public String toString() {
         if (output == null) {
-            StringBuilder sb = new StringBuilder("lab(");
-            sb.append(vl).append(" ");
-            sb.append(va).append(" ");
-            sb.append(vb);
-            if (faSet) {
-                sb.append(", ").append(alpha);
+            StringBuilder sb;
+            if (isGray) {
+                sb = new StringBuilder("gray(");
+                sb.append(vl);
+                if (faSet) {
+                    sb.append(", ").append(alpha);
+                }
+                sb.append(')');
+            } else {
+                sb = new StringBuilder("lab(");
+                sb.append(vl).append(' ');
+                sb.append(va).append(' ');
+                sb.append(vb);
+                if (faSet) {
+                    sb.append(", ").append(alpha);
+                }
+                sb.append(')');
             }
-            sb.append(")");
             output = sb.toString();
         }
         return output;