proper check for css-wide idents (cont.)

ylafon · ylafon · commit a8b4de5c67a2 · 2021-10-08T18:53:18.000+02:00
diff --git a/org/w3c/css/properties/css3/CssScrollPadding.java b/org/w3c/css/properties/css3/CssScrollPadding.java
@@ -79,20 +79,20 @@ public CssScrollPadding(ApplContext ac, CssExpression expression, boolean check)
                     setValue(i, val);
                     break;
                 case CssTypes.CSS_IDENT:
-                    if (inherit.equals(val)) {
+                    if (CssIdent.isCssWide(val.getIdent())) {
                         if (expression.getCount() > 1) {
                             throw new InvalidParamException("value",
                                     expression.getValue(),
                                     getPropertyName(), ac);
                         }
                         values.add(val);
-                        _longhand_top.value = inherit;
-                        _longhand_right.value = inherit;
-                        _longhand_bottom.value = inherit;
-                        _longhand_left.value = inherit;
+                        _longhand_top.value = val;
+                        _longhand_right.value = val;
+                        _longhand_bottom.value = val;
+                        _longhand_left.value = val;
                         break;
                     }
-                    if (auto.equals(val)) {
+                    if (auto.equals(val.getIdent())) {
                         values.add(val);
                         setValue(i, val);
                         break;
@@ -162,13 +162,13 @@ protected static CssValue checkPaddingValue(ApplContext ac, CssExpression expres
                 expression.next();
                 return val;
             case CssTypes.CSS_IDENT:
-                if (inherit.equals(val)) {
+                if (CssIdent.isCssWide(val.getIdent())) {
                     expression.next();
-                    return inherit;
+                    return val;
                 }
                 if (auto.equals(val)) {
                     expression.next();
-                    return auto;
+                    return val;
                 }
             default:
                 throw new InvalidParamException("value",
diff --git a/org/w3c/css/properties/css3/CssScrollPaddingBlock.java b/org/w3c/css/properties/css3/CssScrollPaddingBlock.java
@@ -42,8 +42,7 @@ public CssScrollPaddingBlock() {
      * Creates a new CssScrollPaddingBlock
      *
      * @param expression The expression for this property
-     * @throws org.w3c.css.util.InvalidParamException
-     *          Expressions are incorrect
+     * @throws org.w3c.css.util.InvalidParamException Expressions are incorrect
      */
     public CssScrollPaddingBlock(ApplContext ac, CssExpression expression, boolean check)
             throws InvalidParamException {
@@ -68,20 +67,20 @@ public CssScrollPaddingBlock(ApplContext ac, CssExpression expression, boolean c
                 _longhand_start.value = val;
                 break;
             case CssTypes.CSS_IDENT:
-                if (inherit.equals(val)) {
+                if (CssIdent.isCssWide(val.getIdent())) {
                     if (expression.getCount() > 1) {
                         throw new InvalidParamException("value",
                                 expression.getValue(),
                                 getPropertyName(), ac);
                     }
                     values.add(val);
-                    _longhand_start.value = inherit;
-                    _longhand_end.value = inherit;
+                    _longhand_start.value = val;
+                    _longhand_end.value = val;
                     break;
                 }
-                if (auto.equals(val)) {
-                    values.add(auto);
-                    _longhand_start.value = auto;
+                if (auto.equals(val.getIdent())) {
+                    values.add(val);
+                    _longhand_start.value = val;
                     break;
                 }
             default:
@@ -107,8 +106,8 @@ public CssScrollPaddingBlock(ApplContext ac, CssExpression expression, boolean c
                     break;
                 case CssTypes.CSS_IDENT:
                     if (auto.equals(val)) {
-                        values.add(auto);
-                        _longhand_end.value = auto;
+                        values.add(val);
+                        _longhand_end.value = val;
                         break;
                     }
                 default:
diff --git a/org/w3c/css/properties/css3/CssScrollPaddingInline.java b/org/w3c/css/properties/css3/CssScrollPaddingInline.java
@@ -67,20 +67,20 @@ public CssScrollPaddingInline(ApplContext ac, CssExpression expression, boolean
                 _longhand_start.value = val;
                 break;
             case CssTypes.CSS_IDENT:
-                if (inherit.equals(val)) {
+                if (CssIdent.isCssWide(val.getIdent())) {
                     if (expression.getCount() > 1) {
                         throw new InvalidParamException("value",
                                 expression.getValue(),
                                 getPropertyName(), ac);
                     }
-                    values.add(inherit);
-                    _longhand_start.value = inherit;
-                    _longhand_end.value = inherit;
+                    values.add(val);
+                    _longhand_start.value = val;
+                    _longhand_end.value = val;
                     break;
                 }
-                if (auto.equals(val)) {
-                    values.add(auto);
-                    _longhand_start.value = auto;
+                if (auto.equals(val.getIdent())) {
+                    values.add(val);
+                    _longhand_start.value = val;
                     break;
                 }
             default:
diff --git a/org/w3c/css/properties/css3/CssSpeak.java b/org/w3c/css/properties/css3/CssSpeak.java
@@ -66,7 +66,7 @@ public CssSpeak(ApplContext ac, CssExpression expression, boolean check)
         switch (val.getType()) {
             case CssTypes.CSS_IDENT:
                 CssIdent id = val.getIdent();
-                if (inherit.equals(id)) {
+                if (CssIdent.isCssWide(id)) {
                     value = val;
                     break;
                 }
diff --git a/org/w3c/css/properties/css3/CssSpeakAs.java b/org/w3c/css/properties/css3/CssSpeakAs.java
@@ -81,7 +81,7 @@ public CssSpeakAs(ApplContext ac, CssExpression expression, boolean check)
             switch (val.getType()) {
                 case CssTypes.CSS_IDENT:
                     CssIdent id = val.getIdent();
-                    if (inherit.equals(id)) {
+                    if (CssIdent.isCssWide(id)) {
                         if (expression.getCount() > 1) {
                             throw new InvalidParamException("unrecognize", ac);
                         }
diff --git a/org/w3c/css/properties/css3/CssSpeechRate.java b/org/w3c/css/properties/css3/CssSpeechRate.java
@@ -78,12 +78,12 @@ public CssSpeechRate(ApplContext ac, CssExpression expression, boolean check)
                 break;
             case CssTypes.CSS_IDENT:
                 CssIdent id = val.getIdent();
-                if (inherit.equals(id)) {
-                    value = inherit;
+                if (CssIdent.isCssWide(id)) {
+                    value = val;
                     break;
                 } else {
-                    value = getAllowedIdent(id);
-                    if (value != null) {
+                    if (getAllowedIdent(id) != null) {
+                        value = val;
                         break;
                     }
                 }
diff --git a/org/w3c/css/properties/css3/CssStress.java b/org/w3c/css/properties/css3/CssStress.java
@@ -8,6 +8,7 @@
 import org.w3c.css.util.ApplContext;
 import org.w3c.css.util.InvalidParamException;
 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;
@@ -57,8 +58,8 @@ public CssStress(ApplContext ac, CssExpression expression, boolean check)
                 value = val;
                 break;
             case CssTypes.CSS_IDENT:
-                if (inherit.equals(val.getIdent())) {
-                    value = inherit;
+                if (CssIdent.isCssWide(val.getIdent())) {
+                    value = val;
                     break;
                 }
             default:
diff --git a/org/w3c/css/properties/css3/CssTextDecoration.java b/org/w3c/css/properties/css3/CssTextDecoration.java
@@ -56,6 +56,7 @@ public CssTextDecoration(ApplContext ac, CssExpression expression, boolean check
         CssValue thiValue = null;
         CssExpression linExp = null;
         CssExpression thiExp = null;
+        boolean gotCssWide = false;
 
         int state = 0;
 
@@ -101,6 +102,7 @@ public CssTextDecoration(ApplContext ac, CssExpression expression, boolean check
                 CssIdent ident = val.getIdent();
                 if (CssIdent.isCssWide(ident)) {
                     value = val;
+                    gotCssWide = true;
                     if (check && expression.getCount() != 1) {
                         throw new InvalidParamException("value",
                                 val.toString(),
@@ -202,7 +204,7 @@ public CssTextDecoration(ApplContext ac, CssExpression expression, boolean check
             got++;
         }
         // and generate the value;
-        if (value != inherit && got > 1) {
+        if (!gotCssWide && got > 1) {
             ArrayList<CssValue> v = new ArrayList<CssValue>(4);
             if (lineValue != null) {
                 v.add(lineValue.value);
diff --git a/org/w3c/css/properties/css3/CssTextDecorationSkipBox.java b/org/w3c/css/properties/css3/CssTextDecorationSkipBox.java
@@ -62,7 +62,7 @@ public CssTextDecorationSkipBox(ApplContext ac, CssExpression expression, boolea
         switch (val.getType()) {
             case CssTypes.CSS_IDENT:
                 if (CssIdent.isCssWide(val.getIdent())) {
-                    value = inherit;
+                    value = val;
                     break;
                 }
                 if (getMatchingIdent(val.getIdent()) != null) {

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ public CssSpeak(ApplContext ac, CssExpression expression, boolean check)`
`66`	`66`	`switch (val.getType()) {`
`67`	`67`	`case CssTypes.CSS_IDENT:`
`68`	`68`	`CssIdent id = val.getIdent();`
`69`		`- if (inherit.equals(id)) {`
	`69`	`+ if (CssIdent.isCssWide(id)) {`
`70`	`70`	`value = val;`
`71`	`71`	`break;`
`72`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ public CssSpeakAs(ApplContext ac, CssExpression expression, boolean check)`
`81`	`81`	`switch (val.getType()) {`
`82`	`82`	`case CssTypes.CSS_IDENT:`
`83`	`83`	`CssIdent id = val.getIdent();`
`84`		`- if (inherit.equals(id)) {`
	`84`	`+ if (CssIdent.isCssWide(id)) {`
`85`	`85`	`if (expression.getCount() > 1) {`
`86`	`86`	`throw new InvalidParamException("unrecognize", ac);`
`87`	`87`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public CssTextDecorationSkipBox(ApplContext ac, CssExpression expression, boolea`
`62`	`62`	`switch (val.getType()) {`
`63`	`63`	`case CssTypes.CSS_IDENT:`
`64`	`64`	`if (CssIdent.isCssWide(val.getIdent())) {`
`65`		`- value = inherit;`
	`65`	`+ value = val;`
`66`	`66`	`break;`
`67`	`67`	`}`
`68`	`68`	`if (getMatchingIdent(val.getIdent()) != null) {`