Merge pull request #483 from w3c/color-5-values

Color 5 values

Author: ylafon

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

@@ -8636,7 +8636,7 @@ final public boolean prio() throws ParseException {
             color.setHSLColor(ac, exp);
             {if ("" != null) return color;}
         } else if (funcname.equals("hsla(")) {
-            color.setHSLColor(ac, exp);
+            color.setHSLAColor(ac, exp);
             {if ("" != null) return color;}
         } else if (funcname.equals("hwb(")) {
             color.setHWBColor(ac, exp);
@@ -8647,6 +8647,12 @@ final public boolean prio() throws ParseException {
         } else if (funcname.equals("lch(")) {
             color.setLCHColor(ac, exp);
             {if ("" != null) return color;}
+        } else if (funcname.equals("oklab(")) {
+            color.setOKLABColor(ac, exp);
+            {if ("" != null) return color;}
+        } else if (funcname.equals("oklch(")) {
+            color.setOKLCHColor(ac, exp);
+            {if ("" != null) return color;}
         } else if (funcname.equals("device-cmyk(")) {
             color.setDeviceCMYKColor(ac, exp);
             {if ("" != null) return color;}

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

@@ -3708,7 +3708,7 @@ CssValue function() :
 	    color.setHSLColor(ac, exp);
 	    return color;
 	} else if (funcname.equals("hsla(")) {
-	    color.setHSLColor(ac, exp);
+	    color.setHSLAColor(ac, exp);
 	    return color;
         } else if (funcname.equals("hwb(")) {
             color.setHWBColor(ac, exp);
@@ -3719,6 +3719,12 @@ CssValue function() :
         } else if (funcname.equals("lch(")) {
             color.setLCHColor(ac, exp);
             return color;
+        } else if (funcname.equals("oklab(")) {
+            color.setOKLABColor(ac, exp);
+            return color;
+        } else if (funcname.equals("oklch(")) {
+            color.setOKLCHColor(ac, exp);
+            return color;
         } else if (funcname.equals("device-cmyk(")) {
             color.setDeviceCMYKColor(ac, exp);
             return color;

org/w3c/css/values/CssAngle.java

@@ -39,14 +39,14 @@ public final int getType() {
         return type;
     }
 
-    protected static final BigDecimal deg360;
+    public static final BigDecimal deg360;
 
     static {
         deg360 = BigDecimal.valueOf(360);
     }
 
     private BigDecimal value;
-    protected BigDecimal factor = BigDecimal.ONE;
+    public BigDecimal factor = BigDecimal.ONE;
     String unit;
 
     /**