proper check for css-wide idents (cont.)

ylafon · ylafon · commit 957861ac125f · 2021-10-08T15:51:57.000+02:00
diff --git a/org/w3c/css/properties/css3/CssVoiceBalance.java b/org/w3c/css/properties/css3/CssVoiceBalance.java
@@ -73,7 +73,7 @@ public CssVoiceBalance(ApplContext ac, CssExpression expression, boolean check)
                 break;
             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/CssVoiceDuration.java b/org/w3c/css/properties/css3/CssVoiceDuration.java
@@ -58,11 +58,7 @@ public CssVoiceDuration(ApplContext ac, CssExpression expression, boolean check)
                 value = val;
                 break;
             case CssTypes.CSS_IDENT:
-                if (inherit.equals(val.getIdent())) {
-                    value = val;
-                    break;
-                }
-                if (auto.equals(val.getIdent())) {
+                if (CssIdent.isCssWide(val.getIdent()) || auto.equals(val.getIdent())) {
                     value = val;
                     break;
                 }
diff --git a/org/w3c/css/properties/css3/CssVoiceFamily.java b/org/w3c/css/properties/css3/CssVoiceFamily.java
@@ -156,12 +156,8 @@ private void checkExpression(ApplContext ac, ArrayList<CssValue> curval,
                         break;
                     case CssTypes.CSS_IDENT:
                         CssIdent id = val.getIdent();
-                        if (inherit.equals(id)) {
+                        if (CssIdent.isCssWide(id) || preserve.equals(id)) {
                             // FIXME need to do better here
-                            val = inherit;
-                        } else if (preserve.equals(id)) {
-                            // FIXME need to do better here
-                            val = preserve;
                         }
                         if (nameVal == null) {
                             nameVal = val;
@@ -172,7 +168,7 @@ private void checkExpression(ApplContext ac, ArrayList<CssValue> curval,
                             throw new InvalidParamException("value", val,
                                     getPropertyName(), ac);
                         }
-                        identl.add(val.getIdent());
+                        identl.add(val);
                         break;
                     case CssTypes.CSS_NUMBER:
                         CssCheckableValue n = val.getCheckableValue();
@@ -222,7 +218,7 @@ private void checkExpression(ApplContext ac, ArrayList<CssValue> curval,
                     }
                 }
             }
-            // now addthe value...
+            // now add the value...
             curval.add(new CssValueList(values));
 
         }
diff --git a/org/w3c/css/properties/css3/CssVoicePitch.java b/org/w3c/css/properties/css3/CssVoicePitch.java
@@ -56,8 +56,7 @@ public CssVoicePitch() {
      * Creates a new CssVoicePitch
      *
      * @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 CssVoicePitch(ApplContext ac, CssExpression expression, boolean check)
             throws InvalidParamException {
@@ -86,19 +85,19 @@ public CssVoicePitch(ApplContext ac, CssExpression expression, boolean check)
                     value = val;
                     break;
                 case CssTypes.CSS_IDENT:
-                    if (inherit.equals(val.getIdent())) {
+                    if (CssIdent.isCssWide(val.getIdent())) {
                         if (expression.getCount() > 1) {
                             throw new InvalidParamException("value", inherit,
                                     getPropertyName(), ac);
                         }
-                        value = inherit;
+                        value = val;
                         break;
                     }
                     if (identVal == null) {
                         CssIdent id = val.getIdent();
                         if (absolute.equals(id)) {
-                            identVal = absolute;
-                            value = absolute;
+                            identVal = val;
+                            value = val;
                             break;
                         }
                         identVal = getAllowedIdent(id);
diff --git a/org/w3c/css/properties/css3/CssVoiceRange.java b/org/w3c/css/properties/css3/CssVoiceRange.java
@@ -86,19 +86,19 @@ public CssVoiceRange(ApplContext ac, CssExpression expression, boolean check)
                     value = val;
                     break;
                 case CssTypes.CSS_IDENT:
-                    if (inherit.equals(val.getIdent())) {
+                    if (CssIdent.isCssWide(val.getIdent())) {
                         if (expression.getCount() > 1) {
                             throw new InvalidParamException("value", inherit,
                                     getPropertyName(), ac);
                         }
-                        value = inherit;
+                        value = val;
                         break;
                     }
                     if (identVal == null) {
                         CssIdent id = val.getIdent();
                         if (absolute.equals(id)) {
-                            identVal = absolute;
-                            value = absolute;
+                            identVal = val;
+                            value = val;
                             break;
                         }
                         identVal = getAllowedIdent(id);
diff --git a/org/w3c/css/properties/css3/CssVoiceRate.java b/org/w3c/css/properties/css3/CssVoiceRate.java
@@ -85,13 +85,13 @@ public CssVoiceRate(ApplContext ac, CssExpression expression, boolean check)
                     break;
                 case CssTypes.CSS_IDENT:
                     CssIdent id = val.getIdent();
-                    if (inherit.equals(id)) {
+                    if (CssIdent.isCssWide(id)) {
                         if (expression.getCount() > 1) {
                             throw new InvalidParamException("value",
-                                    inherit,
+                                    val.toString(),
                                     getPropertyName(), ac);
                         }
-                        ideValue = inherit;
+                        ideValue = val;
                         break;
                     } else {
                         if ((ideValue == null) && (getAllowedIdent(id) != null)) {
diff --git a/org/w3c/css/properties/css3/CssVoiceStress.java b/org/w3c/css/properties/css3/CssVoiceStress.java
@@ -65,7 +65,7 @@ public CssVoiceStress(ApplContext ac, CssExpression expression, boolean check)
 
         if (val.getType() == CssTypes.CSS_IDENT) {
             CssIdent id = val.getIdent();
-            if (inherit.equals(id)) {
+            if (CssIdent.isCssWide(id)) {
                 value = val;
             } else {
                 if (getAllowedIdent(id) == null) {
diff --git a/org/w3c/css/properties/css3/CssVoiceVolume.java b/org/w3c/css/properties/css3/CssVoiceVolume.java
@@ -88,18 +88,18 @@ public CssVoiceVolume(ApplContext ac, CssExpression expression, boolean check)
                     break;
                 case CssTypes.CSS_IDENT:
                     CssIdent id = val.getIdent();
-                    if (inherit.equals(id)) {
+                    if (CssIdent.isCssWide(id)) {
                         if (expression.getCount() > 1) {
                             throw new InvalidParamException("value",
-                                    inherit,
+                                    val,
                                     getPropertyName(), ac);
                         }
                         value = val;
                         break;
                     } else if (silent.equals(id)) {
                         if (expression.getCount() > 1) {
                             throw new InvalidParamException("value",
-                                    silent,
+                                    val,
                                     getPropertyName(), ac);
                         }
                         value = val;
diff --git a/org/w3c/css/properties/css3/CssVolume.java b/org/w3c/css/properties/css3/CssVolume.java
@@ -51,8 +51,7 @@ public CssVolume() {
      * Creates a new CssVolume
      *
      * @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 CssVolume(ApplContext ac, CssExpression expression, boolean check)
             throws InvalidParamException {
@@ -86,12 +85,12 @@ public CssVolume(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;
                     }
                 }

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ public CssVoiceBalance(ApplContext ac, CssExpression expression, boolean check)`
`73`	`73`	`break;`
`74`	`74`	`case CssTypes.CSS_IDENT:`
`75`	`75`	`CssIdent id = val.getIdent();`
`76`		`- if (inherit.equals(id)) {`
	`76`	`+ if (CssIdent.isCssWide(id)) {`
`77`	`77`	`value = val;`
`78`	`78`	`break;`
`79`	`79`	`}`
Original file line number	Diff line number	Diff line change
`@@ -156,12 +156,8 @@ private void checkExpression(ApplContext ac, ArrayList<CssValue> curval,`
`156`	`156`	`break;`
`157`	`157`	`case CssTypes.CSS_IDENT:`
`158`	`158`	`CssIdent id = val.getIdent();`
`159`		`- if (inherit.equals(id)) {`
	`159`	`+ if (CssIdent.isCssWide(id) \|\| preserve.equals(id)) {`
`160`	`160`	`// FIXME need to do better here`
`161`		`- val = inherit;`
`162`		`- } else if (preserve.equals(id)) {`
`163`		`- // FIXME need to do better here`
`164`		`- val = preserve;`
`165`	`161`	`}`
`166`	`162`	`if (nameVal == null) {`
`167`	`163`	`nameVal = val;`
`@@ -172,7 +168,7 @@ private void checkExpression(ApplContext ac, ArrayList<CssValue> curval,`
`172`	`168`	`throw new InvalidParamException("value", val,`
`173`	`169`	`getPropertyName(), ac);`
`174`	`170`	`}`
`175`		`- identl.add(val.getIdent());`
	`171`	`+ identl.add(val);`
`176`	`172`	`break;`
`177`	`173`	`case CssTypes.CSS_NUMBER:`
`178`	`174`	`CssCheckableValue n = val.getCheckableValue();`
`@@ -222,7 +218,7 @@ private void checkExpression(ApplContext ac, ArrayList<CssValue> curval,`
`222`	`218`	`}`
`223`	`219`	`}`
`224`	`220`	`}`
`225`		`- // now addthe value...`
	`221`	`+ // now add the value...`
`226`	`222`	`curval.add(new CssValueList(values));`
`227`	`223`
`228`	`224`	`}`