relative colors (wip)

Author: rbri

src/main/java/org/htmlunit/cssparser/dom/AbstractColor.java

@@ -29,6 +29,7 @@
 public class AbstractColor implements Serializable {
 
     private CSSValueImpl alpha_;
+    private CSSValueImpl relative_;
 
     protected void getNumberPercentagePart(final LexicalUnit next, final Consumer<CSSValueImpl> setter) {
         if (LexicalUnitType.PERCENTAGE == next.getLexicalUnitType()
@@ -44,14 +45,14 @@ protected void getNumberPercentagePart(final LexicalUnit next, final Consumer<CS
         throw new DOMException(DOMException.SYNTAX_ERR, "Color part has to be numeric or percentage.");
     }
 
-    protected void getAlphaPart(final LexicalUnit next) {
-        if (LexicalUnitType.PERCENTAGE == next.getLexicalUnitType()
+    protected void getAlphaPart(final LexicalUnit lu) {
+        if (LexicalUnitType.PERCENTAGE == lu.getLexicalUnitType()
 
-                || LexicalUnitType.INTEGER == next.getLexicalUnitType()
-                || LexicalUnitType.REAL == next.getLexicalUnitType()
+                || LexicalUnitType.INTEGER == lu.getLexicalUnitType()
+                || LexicalUnitType.REAL == lu.getLexicalUnitType()
 
-                || LexicalUnitType.NONE == next.getLexicalUnitType()) {
-            setAlpha(new CSSValueImpl(next, true));
+                || LexicalUnitType.NONE == lu.getLexicalUnitType()) {
+            setAlpha(new CSSValueImpl(lu, true));
             return;
         }
 
@@ -72,4 +73,19 @@ public CSSValueImpl getAlpha() {
     public void setAlpha(final CSSValueImpl alpha) {
         alpha_ = alpha;
     }
+
+    /**
+     * @return the relative value or null.
+     */
+    public CSSValueImpl getRelative() {
+        return relative_;
+    }
+
+    public boolean handleRelativeColors(final LexicalUnit lu) {
+        if (LexicalUnitType.FROM == lu.getLexicalUnitType()) {
+            relative_ = new CSSValueImpl(lu.getNextLexicalUnit());
+            return true;
+        }
+        return false;
+    }
 }

src/main/java/org/htmlunit/cssparser/dom/HSLColorImpl.java

@@ -50,10 +50,16 @@ public HSLColorImpl(final String function, final LexicalUnit lu) throws DOMExcep
         }
         function_ = functionLC;
 
-        LexicalUnit next = lu;
-        if (next == null) {
+        if (lu == null) {
             throw new DOMException(DOMException.SYNTAX_ERR, "'" + function_ + "' requires at least three values.");
         }
+
+        if (handleRelativeColors(lu)) {
+            commaSeparated_ = false;
+            return;
+        }
+
+        LexicalUnit next = lu;
         hue_ = getHuePart(next);
 
         next = next.getNextLexicalUnit();
@@ -248,26 +254,36 @@ public String toString() {
 
         sb
             .append(function_)
-            .append("(")
-            .append(hue_);
-        if (commaSeparated_) {
+            .append("(");
+
+        final CSSValueImpl rel = getRelative();
+        if (rel != null) {
             sb
-                .append(", ")
-                .append(saturation_)
-                .append(", ")
-                .append(lightness_);
-            if (null != getAlpha()) {
-                sb.append(", ").append(getAlpha());
-            }
+                .append("from ")
+                .append(rel);
         }
         else {
-            sb
-                .append(" ")
-                .append(saturation_)
-                .append(" ")
-                .append(lightness_);
-            if (null != getAlpha()) {
-                sb.append(" / ").append(getAlpha());
+            if (commaSeparated_) {
+                sb
+                    .append(hue_)
+                    .append(", ")
+                    .append(saturation_)
+                    .append(", ")
+                    .append(lightness_);
+                if (null != getAlpha()) {
+                    sb.append(", ").append(getAlpha());
+                }
+            }
+            else {
+                sb
+                    .append(hue_)
+                    .append(" ")
+                    .append(saturation_)
+                    .append(" ")
+                    .append(lightness_);
+                if (null != getAlpha()) {
+                    sb.append(" / ").append(getAlpha());
+                }
             }
         }
 

src/main/java/org/htmlunit/cssparser/parser/LexicalUnit.java

@@ -106,6 +106,8 @@ enum LexicalUnitType {
         LCHCOLOR,
         /** NONE. */
         NONE,
+        /** FROM. */
+        FROM,
 
         /** DEGREE. */
         DEGREE,

src/main/java/org/htmlunit/cssparser/parser/LexicalUnitImpl.java

@@ -427,6 +427,9 @@ public String getCssText() {
             case NONE:
                 sb.append("none");
                 break;
+            case FROM:
+                sb.append("from");
+                break;
             case IDENT:
                 sb.append(getStringValue());
                 break;
@@ -1148,6 +1151,14 @@ public static LexicalUnit createNone(final LexicalUnit prev) {
         return new LexicalUnitImpl(prev, LexicalUnitType.NONE);
     }
 
+    /**
+     * @param prev the previous LexicalUnit
+     * @return lexical unit with type rgb color
+     */
+    public static LexicalUnit createFrom(final LexicalUnit prev) {
+        return new LexicalUnitImpl(prev, LexicalUnitType.FROM);
+    }
+
     /**
      * @param prev the previous LexicalUnit
      * @param params the params