fix a few issues with HWB

Author: ylafon

org/w3c/css/values/CssColor.java

@@ -631,7 +631,7 @@ public void setHSLAColor(CssExpression exp, ApplContext ac)
     public void setHWBColor(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.CSS) < 0) {
+        if (ac.getCssVersion().compareTo(CssVersion.CSS3) < 0) {
             StringBuilder sb = new StringBuilder();
             sb.append("hwb(").append(exp.toStringFromStart()).append(')');
             throw new InvalidParamException("notversion", sb.toString(),
@@ -675,7 +675,7 @@ public void setHWBColor(CssExpression exp, ApplContext ac)
         exp.next();
         val = exp.getValue();
         op = exp.getOperator();
-        if (val == null || op != COMMA) {
+        if (val == null || (op != COMMA && exp.getRemainingCount() > 1)) {
             exp.starts();
             throw new InvalidParamException("invalid-color", ac);
         }

org/w3c/css/values/HWB.java

@@ -75,7 +75,7 @@ public final void setAlpha(ApplContext ac, CssValue val)
             throws InvalidParamException {
         output = null;
         faSet = true;
-        vb = RGBA.filterAlpha(ac, val);
+        va = RGBA.filterAlpha(ac, val);
     }
 
     public void normalize() {
@@ -110,7 +110,7 @@ public String toString() {
             sb.append(vh).append(", ");
             sb.append(vw).append(", ");
             sb.append(vb);
-            if (faSet) {
+            if (!faSet) {
                 sb.append(")");
             } else {
                 sb.append(", ").append(va).append(')');