string as numbers because that makes so much sense to not use something clearer

Author: ylafon

org/w3c/css/values/CssNumber.java

@@ -73,24 +73,51 @@ public void set(String s, ApplContext ac)
             val = s;
         }
 
-        if (val.equalsIgnoreCase("pi")) {
-            value = BigDecimal.valueOf(Math.PI);
-            isInt = false;
-            _strval = "pi";
-        } else if (val.equalsIgnoreCase("e")) {
-            value = BigDecimal.valueOf(Math.E);
-            isInt = false;
-            _strval = "e";
-        } else {
-            value = new BigDecimal(val);
-            isInt = (val.indexOf('.') < 0);
-/*		CSS integers are not value-based integers.
-        try {
-			value.toBigIntegerExact();
-			isInt = true;
-		} catch (ArithmeticException e) {
-			isInt = false;
-		} */
+        switch (val.toLowerCase()) {
+            case "pi":
+                value = BigDecimal.valueOf(Math.PI);
+                isInt = false;
+                _strval = "pi";
+                break;
+            case "e":
+                value = BigDecimal.valueOf(Math.E);
+                isInt = false;
+                _strval = "e";
+                break;
+            case "infinity":
+                value = BigDecimal.valueOf(Double.POSITIVE_INFINITY);
+                isInt = true;
+                _strval = "infinity";
+                break;
+            // special case for relative colors treated as numbers
+            // h, s, l, alpha, r, g, b,  h, w, b,  l, a, b,  l, c, h
+            // so a, alpha, b, c, g, h, l, r, s, w
+            case "a":
+            case "alpha":
+            case "b":
+            case "c":
+            case "g":
+            case "h":
+            case "l":
+            case "r":
+            case "s":
+            case "w":
+                // Fake value as it is relative to the "from" color
+                value = BigDecimal.ONE;
+                isInt = true;
+                _strval = "infinity";
+                break;
+            default:
+                value = new BigDecimal(val);
+                isInt = (val.indexOf('.') < 0);
+                /*		CSS integers are not value-based integers.
+                try {
+                    value.toBigIntegerExact();
+                    isInt = true;
+                } catch (ArithmeticException ex) {
+                    isInt = false;
+                }
+                */
         }
         if (negate) {
             value = value.negate();

org/w3c/css/values/color/LCH.java

@@ -13,6 +13,7 @@
 import org.w3c.css.values.CssCheckableValue;
 import org.w3c.css.values.CssColor;
 import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssIdent;
 import org.w3c.css.values.CssNumber;
 import org.w3c.css.values.CssTypes;
 import org.w3c.css.values.CssValue;
@@ -23,6 +24,15 @@
 import static org.w3c.css.values.CssOperator.SPACE;
 
 public class LCH {
+    public static final CssIdent l, c, h, a;
+
+    static {
+        l = CssIdent.getIdent("l");
+        c = CssIdent.getIdent("c");
+        h = CssIdent.getIdent("h");
+        a = CssIdent.getIdent("alpha");
+    }
+
     String output = null;
     CssValue vl, vc, vh, alpha;
     boolean faSet = false;
@@ -99,7 +109,8 @@ public static final LCH parseLCHColor(ApplContext ac, CssExpression exp, CssColo
                 lch.setL(ac, val);
                 break;
             case CssTypes.CSS_IDENT:
-                if (CssColor.none.equals(val.getIdent())) {
+                if (CssColor.none.equals(val.getIdent()) ||
+                        (lch.isRelative && l.equals(val.getIdent()))) {
                     lch.setL(ac, val);
                     break;
                 }
@@ -127,7 +138,8 @@ public static final LCH parseLCHColor(ApplContext ac, CssExpression exp, CssColo
                 lch.setC(ac, val);
                 break;
             case CssTypes.CSS_IDENT:
-                if (CssColor.none.equals(val.getIdent())) {
+                if (CssColor.none.equals(val.getIdent()) ||
+                        (lch.isRelative && c.equals(val.getIdent()))) {
                     lch.setC(ac, val);
                     break;
                 }
@@ -155,7 +167,8 @@ public static final LCH parseLCHColor(ApplContext ac, CssExpression exp, CssColo
                 lch.setH(ac, val);
                 break;
             case CssTypes.CSS_IDENT:
-                if (CssColor.none.equals(val.getIdent())) {
+                if (CssColor.none.equals(val.getIdent()) ||
+                        (lch.isRelative && h.equals(val.getIdent()))) {
                     lch.setH(ac, val);
                     break;
                 }
@@ -194,7 +207,8 @@ public static final LCH parseLCHColor(ApplContext ac, CssExpression exp, CssColo
                     lch.setAlpha(ac, val);
                     break;
                 case CssTypes.CSS_IDENT:
-                    if (CssColor.none.equals(val.getIdent())) {
+                    if (CssColor.none.equals(val.getIdent()) ||
+                            (lch.isRelative && a.equals(val.getIdent()))) {
                         lch.setAlpha(ac, val);
                         break;
                     }