Merge remote-tracking branch 'origin/main' into css-variable

Author: ylafon

org/w3c/css/parser/CssPropertyFactory.java

@@ -21,6 +21,7 @@
 import org.w3c.css.util.WarningParamException;
 import org.w3c.css.values.CssExpression;
 import org.w3c.css.values.CssIdent;
+import org.w3c.css.values.CssTypes;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
@@ -261,18 +262,22 @@ public synchronized CssProperty createProperty(ApplContext ac, AtRule atRule, St
             throw new WarningParamException("css-hack", expression.toStringFromStart());
         }
 
-        CssIdent initial = CssIdent.getIdent("initial");
-        CssIdent unset = CssIdent.getIdent("unset");
-
         try {
-            if ((ac.getCssVersion().compareTo(CssVersion.CSS3) >= 0) && (expression.getCount() == 1)
-                    && (expression.getValue().equals(initial) || expression.getValue().equals(unset))) {
+            boolean isCssWide = false;
+            CssIdent cssIdent = null;
+            if ((expression.getCount() == 1) && (expression.getValue().getRawType() == CssTypes.CSS_IDENT)) {
+                cssIdent = expression.getValue().getIdent();
+                isCssWide = CssIdent.isCssWide(cssIdent);
+            }
+            if ((ac.getCssVersion().compareTo(CssVersion.CSS3) >= 0) && isCssWide) {
                 // create an instance of your property class
                 Class[] parametersType = {};
                 Constructor constructor = Class.forName(classname).getConstructor(parametersType);
                 Object[] parameters = {};
                 // invoke the constructor
-                return (CssProperty) constructor.newInstance(parameters);
+                CssProperty p = (CssProperty) constructor.newInstance(parameters);
+                p.value = cssIdent;
+                return p;
             } else {
                 // create an instance of your property class
                 Class[] parametersType = {ac.getClass(), expression.getClass(), boolean.class};

org/w3c/css/properties/css/CssAccentColor.java

@@ -10,15 +10,12 @@
 import org.w3c.css.util.ApplContext;
 import org.w3c.css.util.InvalidParamException;
 import org.w3c.css.values.CssExpression;
-import org.w3c.css.values.CssValue;
 
 /**
  * @since CSS3
  */
 public class CssAccentColor extends CssProperty {
 
-    public CssValue value;
-
     /**
      * Create a new CssAccentColor
      */

org/w3c/css/properties/css/CssAlignContent.java

@@ -10,15 +10,12 @@
 import org.w3c.css.util.ApplContext;
 import org.w3c.css.util.InvalidParamException;
 import org.w3c.css.values.CssExpression;
-import org.w3c.css.values.CssValue;
 
 /**
  * @since CSS3
  */
 public class CssAlignContent extends CssProperty {
 
-    public CssValue value;
-
     /**
      * Create a new CssAlignContent
      */

org/w3c/css/properties/css/CssAlignItems.java

@@ -10,15 +10,12 @@
 import org.w3c.css.util.ApplContext;
 import org.w3c.css.util.InvalidParamException;
 import org.w3c.css.values.CssExpression;
-import org.w3c.css.values.CssValue;
 
 /**
  * @since CSS3
  */
 public class CssAlignItems extends CssProperty {
 
-    public CssValue value;
-
     /**
      * Create a new CssAlignItems
      */

org/w3c/css/properties/css/CssAlignSelf.java

@@ -10,15 +10,12 @@
 import org.w3c.css.util.ApplContext;
 import org.w3c.css.util.InvalidParamException;
 import org.w3c.css.values.CssExpression;
-import org.w3c.css.values.CssValue;
 
 /**
  * @since CSS3
  */
 public class CssAlignSelf extends CssProperty {
 
-    public CssValue value;
-
     /**
      * Create a new CssAlignSelf
      */

org/w3c/css/properties/css/CssAlignmentBaseline.java

@@ -10,15 +10,12 @@
 import org.w3c.css.util.ApplContext;
 import org.w3c.css.util.InvalidParamException;
 import org.w3c.css.values.CssExpression;
-import org.w3c.css.values.CssValue;
 
 /**
  * @since CSS3
  */
 public class CssAlignmentBaseline extends CssProperty {
 
-    public CssValue value;
-
     /**
      * Create a new CssAlignmentBaseline
      */

org/w3c/css/properties/css/CssAnimation.java

@@ -10,15 +10,12 @@
 import org.w3c.css.util.ApplContext;
 import org.w3c.css.util.InvalidParamException;
 import org.w3c.css.values.CssExpression;
-import org.w3c.css.values.CssValue;
 
 /**
  * @since CSS3
  */
 public class CssAnimation extends CssProperty {
 
-    public CssValue value;
-
     /**
      * Create a new CssAnimation
      */

org/w3c/css/properties/css/CssAnimationDelay.java

@@ -10,15 +10,12 @@
 import org.w3c.css.util.ApplContext;
 import org.w3c.css.util.InvalidParamException;
 import org.w3c.css.values.CssExpression;
-import org.w3c.css.values.CssValue;
 
 /**
  * @since CSS3
  */
 public class CssAnimationDelay extends CssProperty {
 
-    public CssValue value;
-
     /**
      * Create a new CssAnimationDelay
      */

org/w3c/css/properties/css/CssAnimationDirection.java

@@ -10,15 +10,12 @@
 import org.w3c.css.util.ApplContext;
 import org.w3c.css.util.InvalidParamException;
 import org.w3c.css.values.CssExpression;
-import org.w3c.css.values.CssValue;
 
 /**
  * @since CSS3
  */
 public class CssAnimationDirection extends CssProperty {
 
-    public CssValue value;
-
     /**
      * Create a new CssAnimationDirection
      */

org/w3c/css/properties/css/CssAnimationDuration.java

@@ -10,15 +10,12 @@
 import org.w3c.css.util.ApplContext;
 import org.w3c.css.util.InvalidParamException;
 import org.w3c.css.values.CssExpression;
-import org.w3c.css.values.CssValue;
 
 /**
  * @since CSS3
  */
 public class CssAnimationDuration extends CssProperty {
 
-    public CssValue value;
-
     /**
      * Create a new CssAnimationDuration
      */