- From: Yves Lafon via cvs-syncmail <cvsmail@w3.org>
- Date: Mon, 08 Aug 2005 13:18:06 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2002/css-validator/org/w3c/css/aural
In directory hutz:/tmp/cvs-serv27412/org/w3c/css/aural
Modified Files:
ACssAzimuth.java ACssCue.java ACssCueAfter.java
ACssCueBefore.java ACssElevation.java ACssInterpretAs.java
ACssPause.java ACssPauseAfter.java ACssPauseBefore.java
ACssPhonemes.java ACssPitch.java ACssPitchRange.java
ACssPlayDuring.java ACssProperties.java ACssRichness.java
ACssSpeak.java ACssSpeakCSS3.java ACssSpeakDate.java
ACssSpeakNumeral.java ACssSpeakPunctuation.java
ACssSpeakTime.java ACssSpeechRate.java ACssStress.java
ACssStyle.java ACssVoiceBalance.java ACssVoiceDuration.java
ACssVoiceFamily.java ACssVoiceFamilyCSS3.java
ACssVoicePitchRange.java ACssVoiceRate.java
ACssVoiceStress.java ACssVoiceVolume.java ACssVolume.java
Log Message:
All those changed made by Jean-Guilhem Rouel:
Huge patch, imports fixed (automatic)
Bug fixed: 372, 920, 778, 287, 696, 764, 233
Partial bug fix for 289
Issue with "inherit" in CSS2.
The validator now checks the number of values (extraneous values were previously ignored)
Index: ACssRichness.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/aural/ACssRichness.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ACssRichness.java 8 Apr 2002 21:16:56 -0000 1.2
+++ ACssRichness.java 8 Aug 2005 13:18:03 -0000 1.3
@@ -6,6 +6,16 @@
// Please first read the full copyright statement in file COPYRIGHT.html
/*
* $Log$
+ * Revision 1.3 2005/08/08 13:18:03 ylafon
+ * All those changed made by Jean-Guilhem Rouel:
+ *
+ * Huge patch, imports fixed (automatic)
+ * Bug fixed: 372, 920, 778, 287, 696, 764, 233
+ * Partial bug fix for 289
+ *
+ * Issue with "inherit" in CSS2.
+ * The validator now checks the number of values (extraneous values were previously ignored)
+ *
* Revision 1.2 2002/04/08 21:16:56 plehegar
* New
*
@@ -13,13 +23,12 @@
package org.w3c.css.aural;
import org.w3c.css.parser.CssStyle;
-import org.w3c.css.values.CssExpression;
-import org.w3c.css.values.CssValue;
-import org.w3c.css.values.CssNumber;
-import org.w3c.css.values.CssIdent;
import org.w3c.css.properties.CssProperty;
-import org.w3c.css.util.InvalidParamException;
import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssNumber;
+import org.w3c.css.values.CssValue;
/**
@@ -56,8 +65,14 @@
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
*/
- public ACssRichness(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public ACssRichness(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
this();
+
+ if(check && expression.getCount() > 1) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
+
CssValue val = expression.getValue();
int index;
@@ -81,6 +96,11 @@
getPropertyName(), ac);
}
+ public ACssRichness(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the value of this property
*/
Index: ACssProperties.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/aural/ACssProperties.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ACssProperties.java 12 Jul 2005 14:47:55 -0000 1.3
+++ ACssProperties.java 8 Aug 2005 13:18:03 -0000 1.4
@@ -15,61 +15,61 @@
* @version $Revision$
*/
public class ACssProperties {
- public static Utf8Properties properties;
-
- public static Utf8Properties UAproperties;
-
- public static Float getValue(CssProperty property, String prop) {
- String value = UAproperties.getProperty(property.getPropertyName()
- + "." + prop);
- if (value == null) {
- System.err.println("Can't find value for "
- + property.getPropertyName() + "." + prop);
- return null;
- } else {
- try {
- return Float.valueOf(value);
- } catch (NumberFormatException e) {
- System.err.println(e);
- System.err.println("Only float value are valid in properties");
- return null;
- }
+ public static Utf8Properties properties;
+
+ public static Utf8Properties UAproperties;
+
+ public static Float getValue(CssProperty property, String prop) {
+ String value = UAproperties.getProperty(property.getPropertyName()
+ + "." + prop);
+ if (value == null) {
+ System.err.println("Can't find value for "
+ + property.getPropertyName() + "." + prop);
+ return null;
+ } else {
+ try {
+ return Float.valueOf(value);
+ } catch (NumberFormatException e) {
+ System.err.println(e);
+ System.err.println("Only float value are valid in properties");
+ return null;
+ }
+ }
}
- }
-
- public static String getString(CssProperty property, String prop) {
- return properties.getProperty(property.getPropertyName() + "." + prop);
- }
-
- public static boolean getInheritance(CssProperty property) {
- return getString(property, "inherited").equals("true");
- }
-
- static {
- UAproperties = new Utf8Properties();
- try {
- URL url = ACssProperties.class
- .getResource("AuralDefault.properties");
- java.io.InputStream f = url.openStream();
- UAproperties.load(f);
- f.close();
- } catch (Exception e) {
- System.err
- .println("CSS.ACSSProperties.ACssProperties: couldn't load UA properties ");
- System.err.println(" " + e.toString());
+
+ public static String getString(CssProperty property, String prop) {
+ return properties.getProperty(property.getPropertyName() + "." + prop);
}
-
- properties = new Utf8Properties();
- try {
- URL url = ACssProperties.class
- .getResource("ACSSDefault.properties");
- java.io.InputStream f = url.openStream();
- properties.load(f);
- f.close();
- } catch (Exception e) {
- System.err
- .println("CSS.ACSSProperties.ACssProperties: couldn't load properties ");
- System.err.println(" " + e.toString());
+
+ public static boolean getInheritance(CssProperty property) {
+ return getString(property, "inherited").equals("true");
+ }
+
+ static {
+ UAproperties = new Utf8Properties();
+ try {
+ URL url = ACssProperties.class
+ .getResource("AuralDefault.properties");
+ java.io.InputStream f = url.openStream();
+ UAproperties.load(f);
+ f.close();
+ } catch (Exception e) {
+ System.err
+ .println("CSS.ACSSProperties.ACssProperties: couldn't load UA properties ");
+ System.err.println(" " + e.toString());
+ }
+
+ properties = new Utf8Properties();
+ try {
+ URL url = ACssProperties.class
+ .getResource("ACSSDefault.properties");
+ java.io.InputStream f = url.openStream();
+ properties.load(f);
+ f.close();
+ } catch (Exception e) {
+ System.err
+ .println("CSS.ACSSProperties.ACssProperties: couldn't load properties ");
+ System.err.println(" " + e.toString());
+ }
}
- }
}
Index: ACssPauseAfter.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/aural/ACssPauseAfter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ACssPauseAfter.java 8 Apr 2002 21:16:56 -0000 1.2
+++ ACssPauseAfter.java 8 Aug 2005 13:18:03 -0000 1.3
@@ -6,6 +6,16 @@
// Please first read the full copyright statement in file COPYRIGHT.html
/*
* $Log$
+ * Revision 1.3 2005/08/08 13:18:03 ylafon
+ * All those changed made by Jean-Guilhem Rouel:
+ *
+ * Huge patch, imports fixed (automatic)
+ * Bug fixed: 372, 920, 778, 287, 696, 764, 233
+ * Partial bug fix for 289
+ *
+ * Issue with "inherit" in CSS2.
+ * The validator now checks the number of values (extraneous values were previously ignored)
+ *
* Revision 1.2 2002/04/08 21:16:56 plehegar
* New
*
@@ -38,14 +48,14 @@
package org.w3c.css.aural;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.CssProperty;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
-import org.w3c.css.values.CssValue;
-import org.w3c.css.values.CssTime;
import org.w3c.css.values.CssNumber;
import org.w3c.css.values.CssPercentage;
-import org.w3c.css.properties.CssProperty;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
+import org.w3c.css.values.CssTime;
+import org.w3c.css.values.CssValue;
/**
* 'pause-after'
@@ -90,7 +100,13 @@
* @param expression the expression of the size
* @exception InvalidParamException The expression is incorrect
*/
- public ACssPauseAfter(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public ACssPauseAfter(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
+
+ if(check && expression.getCount() > 1) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
+
CssValue val = expression.getValue();
setByUser();
@@ -124,6 +140,11 @@
ac);
}
+ public ACssPauseAfter(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the current value
*/
Index: ACssVoiceDuration.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/aural/ACssVoiceDuration.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ACssVoiceDuration.java 30 Jul 2003 06:34:52 -0000 1.1
+++ ACssVoiceDuration.java 8 Aug 2005 13:18:03 -0000 1.2
@@ -6,6 +6,16 @@
// Please first read the full copyright statement in file COPYRIGHT.html
/*
* $Log$
+ * Revision 1.2 2005/08/08 13:18:03 ylafon
+ * All those changed made by Jean-Guilhem Rouel:
+ *
+ * Huge patch, imports fixed (automatic)
+ * Bug fixed: 372, 920, 778, 287, 696, 764, 233
+ * Partial bug fix for 289
+ *
+ * Issue with "inherit" in CSS2.
+ * The validator now checks the number of values (extraneous values were previously ignored)
+ *
* Revision 1.1 2003/07/30 06:34:52 sijtsche
* new speech property
*
@@ -38,14 +48,12 @@
package org.w3c.css.aural;
import org.w3c.css.parser.CssStyle;
-import org.w3c.css.values.CssExpression;
-import org.w3c.css.values.CssValue;
-import org.w3c.css.values.CssNumber;
-import org.w3c.css.values.CssTime;
-import org.w3c.css.values.CssPercentage;
import org.w3c.css.properties.CssProperty;
-import org.w3c.css.util.InvalidParamException;
import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssTime;
+import org.w3c.css.values.CssValue;
/**
* 'pause-before'
@@ -92,8 +100,13 @@
* @param expression the expression of the size
* @exception InvalidParamException The expression is incorrect
*/
- public ACssVoiceDuration(ApplContext ac, CssExpression expression)
- throws InvalidParamException {
+ public ACssVoiceDuration(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
+
+ if(check && expression.getCount() > 1) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
+
CssValue val = expression.getValue();
setByUser();
@@ -117,6 +130,11 @@
getPropertyName(), ac);
}
+ public ACssVoiceDuration(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the current value
*/
Index: ACssPauseBefore.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/aural/ACssPauseBefore.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ACssPauseBefore.java 8 Apr 2002 21:16:56 -0000 1.2
+++ ACssPauseBefore.java 8 Aug 2005 13:18:03 -0000 1.3
@@ -6,6 +6,16 @@
// Please first read the full copyright statement in file COPYRIGHT.html
/*
* $Log$
+ * Revision 1.3 2005/08/08 13:18:03 ylafon
+ * All those changed made by Jean-Guilhem Rouel:
+ *
+ * Huge patch, imports fixed (automatic)
+ * Bug fixed: 372, 920, 778, 287, 696, 764, 233
+ * Partial bug fix for 289
+ *
+ * Issue with "inherit" in CSS2.
+ * The validator now checks the number of values (extraneous values were previously ignored)
+ *
* Revision 1.2 2002/04/08 21:16:56 plehegar
* New
*
@@ -35,14 +45,14 @@
package org.w3c.css.aural;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.CssProperty;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
-import org.w3c.css.values.CssValue;
import org.w3c.css.values.CssNumber;
-import org.w3c.css.values.CssTime;
import org.w3c.css.values.CssPercentage;
-import org.w3c.css.properties.CssProperty;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
+import org.w3c.css.values.CssTime;
+import org.w3c.css.values.CssValue;
/**
* 'pause-before'
@@ -89,8 +99,13 @@
* @param expression the expression of the size
* @exception InvalidParamException The expression is incorrect
*/
- public ACssPauseBefore(ApplContext ac, CssExpression expression)
- throws InvalidParamException {
+ public ACssPauseBefore(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
+
+ if(check && expression.getCount() > 1) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
+
CssValue val = expression.getValue();
setByUser();
@@ -126,6 +141,11 @@
getPropertyName(), ac);
}
+ public ACssPauseBefore(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the current value
*/
Index: ACssPhonemes.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/aural/ACssPhonemes.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ACssPhonemes.java 30 Jul 2003 06:34:52 -0000 1.1
+++ ACssPhonemes.java 8 Aug 2005 13:18:03 -0000 1.2
@@ -6,6 +6,16 @@
// Please first read the full copyright statement in file COPYRIGHT.html
/*
* $Log$
+ * Revision 1.2 2005/08/08 13:18:03 ylafon
+ * All those changed made by Jean-Guilhem Rouel:
+ *
+ * Huge patch, imports fixed (automatic)
+ * Bug fixed: 372, 920, 778, 287, 696, 764, 233
+ * Partial bug fix for 289
+ *
+ * Issue with "inherit" in CSS2.
+ * The validator now checks the number of values (extraneous values were previously ignored)
+ *
* Revision 1.1 2003/07/30 06:34:52 sijtsche
* new speech property
*
@@ -38,12 +48,12 @@
package org.w3c.css.aural;
import org.w3c.css.parser.CssStyle;
-import org.w3c.css.values.CssExpression;
-import org.w3c.css.values.CssValue;
-import org.w3c.css.values.CssString;
import org.w3c.css.properties.CssProperty;
-import org.w3c.css.util.InvalidParamException;
import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssString;
+import org.w3c.css.values.CssValue;
/**
@@ -67,8 +77,13 @@
* @param expression the expression of the size
* @exception InvalidParamException The expression is incorrect
*/
- public ACssPhonemes(ApplContext ac, CssExpression expression)
- throws InvalidParamException {
+ public ACssPhonemes(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
+
+ if(check && expression.getCount() > 1) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
+
CssValue val = expression.getValue();
setByUser();
@@ -87,6 +102,11 @@
getPropertyName(), ac);
}
+ public ACssPhonemes(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the current value
*/
Index: ACssPause.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/aural/ACssPause.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ACssPause.java 8 Apr 2002 21:16:56 -0000 1.2
+++ ACssPause.java 8 Aug 2005 13:18:03 -0000 1.3
@@ -6,6 +6,16 @@
// Please first read the full copyright statement in file COPYRIGHT.html
/*
* $Log$
+ * Revision 1.3 2005/08/08 13:18:03 ylafon
+ * All those changed made by Jean-Guilhem Rouel:
+ *
+ * Huge patch, imports fixed (automatic)
+ * Bug fixed: 372, 920, 778, 287, 696, 764, 233
+ * Partial bug fix for 289
+ *
+ * Issue with "inherit" in CSS2.
+ * The validator now checks the number of values (extraneous values were previously ignored)
+ *
* Revision 1.2 2002/04/08 21:16:56 plehegar
* New
*
@@ -37,15 +47,15 @@
*/
package org.w3c.css.aural;
-import org.w3c.css.parser.CssStyle;
-import org.w3c.css.parser.CssSelectors;
import org.w3c.css.parser.CssPrinterStyle;
+import org.w3c.css.parser.CssSelectors;
+import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.CssProperty;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
import org.w3c.css.values.CssOperator;
import org.w3c.css.values.CssValue;
-import org.w3c.css.properties.CssProperty;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
/**
@@ -94,10 +104,14 @@
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
*/
- public ACssPause(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public ACssPause(ApplContext ac, CssExpression expression, boolean check)
+ throws InvalidParamException {
CssValue val = expression.getValue();
if (val.equals(inherit)) {
+ if(expression.getCount() > 1) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
this.same = true;
pauseBefore = new ACssPauseBefore(ac, expression);
pauseAfter = new ACssPauseAfter(pauseBefore);
@@ -120,9 +134,17 @@
pauseAfter = new ACssPauseAfter(ac, expression);
break;
default:
+ if(check) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
}
}
+ public ACssPause(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the value of this property
*/
Index: ACssVoiceFamily.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/aural/ACssVoiceFamily.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ACssVoiceFamily.java 8 Apr 2002 21:16:56 -0000 1.2
+++ ACssVoiceFamily.java 8 Aug 2005 13:18:03 -0000 1.3
@@ -6,6 +6,16 @@
// Please first read the full copyright statement in file COPYRIGHT.html
/*
* $Log$
+ * Revision 1.3 2005/08/08 13:18:03 ylafon
+ * All those changed made by Jean-Guilhem Rouel:
+ *
+ * Huge patch, imports fixed (automatic)
+ * Bug fixed: 372, 920, 778, 287, 696, 764, 233
+ * Partial bug fix for 289
+ *
+ * Issue with "inherit" in CSS2.
+ * The validator now checks the number of values (extraneous values were previously ignored)
+ *
* Revision 1.2 2002/04/08 21:16:56 plehegar
* New
*
@@ -19,19 +29,19 @@
package org.w3c.css.aural;
-import java.util.Vector;
import java.util.Enumeration;
+import java.util.Vector;
import org.w3c.css.parser.CssStyle;
import org.w3c.css.properties.CssProperty;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.util.Util;
import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssIdent;
import org.w3c.css.values.CssOperator;
-import org.w3c.css.values.CssValue;
import org.w3c.css.values.CssString;
-import org.w3c.css.values.CssIdent;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
-import org.w3c.css.util.Util;
+import org.w3c.css.values.CssValue;
/**
* <H3>5.2 'voice-family'</H3>
@@ -88,7 +98,8 @@
* @param value the voice name
* @exception InvalidParamException The expression is incorrect
*/
- public ACssVoiceFamily(ApplContext ac, CssExpression value) throws InvalidParamException {
+ public ACssVoiceFamily(ApplContext ac, CssExpression value, boolean check)
+ throws InvalidParamException {
boolean family = true;
CssValue val = value.getValue();
char op;
@@ -96,7 +107,11 @@
setByUser();
if (val.equals(inherit)) {
+ if(value.getCount() > 1) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
inheritValue = true;
+ return;
}
while (family) {
@@ -108,6 +123,10 @@
(new Character(op)).toString(), ac);
}
+ if(val != null && val.equals(inherit)) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
+
if (val instanceof CssString) {
String familyName = null;
if (op == COMMA) { // "helvetica", "roman"
@@ -123,9 +142,9 @@
for (int i = 0; i < genericFamily.length; i++) {
if (genericFamily[i].equals(tmp)) {
throw new InvalidParamException("generic-family.quote",
- genericFamily[i],
- getPropertyName(),
- ac);
+ genericFamily[i],
+ getPropertyName(),
+ ac);
}
}
}
@@ -161,6 +180,11 @@
}
+ public ACssVoiceFamily(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns all voices name
*/
Index: ACssSpeechRate.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/aural/ACssSpeechRate.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ACssSpeechRate.java 8 Apr 2002 21:16:56 -0000 1.2
+++ ACssSpeechRate.java 8 Aug 2005 13:18:03 -0000 1.3
@@ -6,6 +6,16 @@
// Please first read the full copyright statement in file COPYRIGHT.html
/*
* $Log$
+ * Revision 1.3 2005/08/08 13:18:03 ylafon
+ * All those changed made by Jean-Guilhem Rouel:
+ *
+ * Huge patch, imports fixed (automatic)
+ * Bug fixed: 372, 920, 778, 287, 696, 764, 233
+ * Partial bug fix for 289
+ *
+ * Issue with "inherit" in CSS2.
+ * The validator now checks the number of values (extraneous values were previously ignored)
+ *
* Revision 1.2 2002/04/08 21:16:56 plehegar
* New
*
@@ -28,13 +38,13 @@
package org.w3c.css.aural;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.CssProperty;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
-import org.w3c.css.values.CssValue;
import org.w3c.css.values.CssIdent;
import org.w3c.css.values.CssNumber;
-import org.w3c.css.properties.CssProperty;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
+import org.w3c.css.values.CssValue;
/**
* 'speech-rate'
@@ -78,9 +88,14 @@
* @param expression The expression for this property
* @exception InvalidParamException Expressions are incorrect
*/
- public ACssSpeechRate(ApplContext ac, CssExpression expression)
- throws InvalidParamException {
+ public ACssSpeechRate(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
this();
+
+ if(check && expression.getCount() > 1) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
+
CssValue val = expression.getValue();
int index;
@@ -99,6 +114,11 @@
expression.next();
}
+ public ACssSpeechRate(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the value of this property
*/
Index: ACssVoiceVolume.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/aural/ACssVoiceVolume.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ACssVoiceVolume.java 25 Jul 2003 13:20:38 -0000 1.1
+++ ACssVoiceVolume.java 8 Aug 2005 13:18:04 -0000 1.2
@@ -6,6 +6,16 @@
// Please first read the full copyright statement in file COPYRIGHT.html
/*
* $Log$
+ * Revision 1.2 2005/08/08 13:18:04 ylafon
+ * All those changed made by Jean-Guilhem Rouel:
+ *
+ * Huge patch, imports fixed (automatic)
+ * Bug fixed: 372, 920, 778, 287, 696, 764, 233
+ * Partial bug fix for 289
+ *
+ * Issue with "inherit" in CSS2.
+ * The validator now checks the number of values (extraneous values were previously ignored)
+ *
* Revision 1.1 2003/07/25 13:20:38 sijtsche
* new CSS3 speech property
*
@@ -34,14 +44,14 @@
package org.w3c.css.aural;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.CssProperty;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
-import org.w3c.css.values.CssValue;
import org.w3c.css.values.CssIdent;
import org.w3c.css.values.CssNumber;
import org.w3c.css.values.CssPercentage;
-import org.w3c.css.properties.CssProperty;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
+import org.w3c.css.values.CssValue;
/**
@@ -149,8 +159,14 @@
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
*/
- public ACssVoiceVolume(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public ACssVoiceVolume(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
this();
+
+ if(check && expression.getCount() > 1) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
+
CssValue val = expression.getValue();
int index;
@@ -181,6 +197,11 @@
expression.next();
}
+
+ public ACssVoiceVolume(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
/**
* Returns the value of this property
Index: ACssStress.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/aural/ACssStress.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ACssStress.java 8 Apr 2002 21:16:56 -0000 1.2
+++ ACssStress.java 8 Aug 2005 13:18:03 -0000 1.3
@@ -6,6 +6,16 @@
// Please first read the full copyright statement in file COPYRIGHT.html
/*
* $Log$
+ * Revision 1.3 2005/08/08 13:18:03 ylafon
+ * All those changed made by Jean-Guilhem Rouel:
+ *
+ * Huge patch, imports fixed (automatic)
+ * Bug fixed: 372, 920, 778, 287, 696, 764, 233
+ * Partial bug fix for 289
+ *
+ * Issue with "inherit" in CSS2.
+ * The validator now checks the number of values (extraneous values were previously ignored)
+ *
* Revision 1.2 2002/04/08 21:16:56 plehegar
* New
*
@@ -13,13 +23,12 @@
package org.w3c.css.aural;
import org.w3c.css.parser.CssStyle;
-import org.w3c.css.values.CssExpression;
-import org.w3c.css.values.CssValue;
-import org.w3c.css.values.CssNumber;
-import org.w3c.css.values.CssIdent;
import org.w3c.css.properties.CssProperty;
-import org.w3c.css.util.InvalidParamException;
import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssNumber;
+import org.w3c.css.values.CssValue;
/**
@@ -68,8 +77,14 @@
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
*/
- public ACssStress(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public ACssStress(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
this();
+
+ if(check && expression.getCount() > 1) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
+
CssValue val = expression.getValue();
int index;
setByUser();
@@ -93,6 +108,11 @@
getPropertyName(), ac);
}
+ public ACssStress(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the value of this property
*/
Index: ACssVoiceRate.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/aural/ACssVoiceRate.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ACssVoiceRate.java 28 Jul 2003 14:56:30 -0000 1.1
+++ ACssVoiceRate.java 8 Aug 2005 13:18:04 -0000 1.2
@@ -6,6 +6,16 @@
// Please first read the full copyright statement in file COPYRIGHT.html
/*
* $Log$
+ * Revision 1.2 2005/08/08 13:18:04 ylafon
+ * All those changed made by Jean-Guilhem Rouel:
+ *
+ * Huge patch, imports fixed (automatic)
+ * Bug fixed: 372, 920, 778, 287, 696, 764, 233
+ * Partial bug fix for 289
+ *
+ * Issue with "inherit" in CSS2.
+ * The validator now checks the number of values (extraneous values were previously ignored)
+ *
* Revision 1.1 2003/07/28 14:56:30 sijtsche
* new CSS3 speech property
*
@@ -31,13 +41,13 @@
package org.w3c.css.aural;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.CssProperty;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
-import org.w3c.css.values.CssValue;
import org.w3c.css.values.CssIdent;
import org.w3c.css.values.CssNumber;
-import org.w3c.css.properties.CssProperty;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
+import org.w3c.css.values.CssValue;
/**
* 'voice-rate'
@@ -79,9 +89,14 @@
* @param expression The expression for this property
* @exception InvalidParamException Expressions are incorrect
*/
- public ACssVoiceRate(ApplContext ac, CssExpression expression)
+ public ACssVoiceRate(ApplContext ac, CssExpression expression, boolean check)
throws InvalidParamException {
this();
+
+ if(check && expression.getCount() > 1) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
+
CssValue val = expression.getValue();
int index;
@@ -100,6 +115,11 @@
expression.next();
}
+ public ACssVoiceRate(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the value of this property
*/
Index: ACssAzimuth.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/aural/ACssAzimuth.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ACssAzimuth.java 8 Apr 2002 21:16:56 -0000 1.2
+++ ACssAzimuth.java 8 Aug 2005 13:18:03 -0000 1.3
@@ -6,6 +6,16 @@
// Please first read the full copyright statement in file COPYRIGHT.html
/*
* $Log$
+ * Revision 1.3 2005/08/08 13:18:03 ylafon
+ * All those changed made by Jean-Guilhem Rouel:
+ *
+ * Huge patch, imports fixed (automatic)
+ * Bug fixed: 372, 920, 778, 287, 696, 764, 233
+ * Partial bug fix for 289
+ *
+ * Issue with "inherit" in CSS2.
+ * The validator now checks the number of values (extraneous values were previously ignored)
+ *
* Revision 1.2 2002/04/08 21:16:56 plehegar
* New
*
@@ -14,14 +24,14 @@
package org.w3c.css.aural;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.CssProperty;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssAngle;
import org.w3c.css.values.CssExpression;
-import org.w3c.css.values.CssValue;
import org.w3c.css.values.CssIdent;
import org.w3c.css.values.CssNumber;
-import org.w3c.css.values.CssAngle;
-import org.w3c.css.properties.CssProperty;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
+import org.w3c.css.values.CssValue;
/**
*
@@ -57,26 +67,42 @@
* @param expression The expression for this property
* @exception InvalidParamException Expressions are incorrect
*/
- public ACssAzimuth(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public ACssAzimuth(ApplContext ac, CssExpression expression, boolean check)
+ throws InvalidParamException {
+
this();
+
+ if(check && expression.getCount() > 2) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
+
CssValue val = expression.getValue();
int index;
setByUser();
if (val.equals(leftwards)) {
+ if(check && expression.getCount() > 1) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
value = leftwards;
expression.next();
return;
} if (val.equals(inherit)) {
+ if(expression.getCount() > 1) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
value = inherit;
expression.next();
return;
} else if (val.equals(rightwards)) {
+ if(check && expression.getCount() > 1) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
value = rightwards;
expression.next();
return;
- } else if (val.equals(behind)) {
+ } else if (val.equals(behind)) {
isBehind = true;
expression.next();
CssValue valnext = expression.getValue();
@@ -104,6 +130,9 @@
return;
}
} else if (val instanceof CssAngle) {
+ if(check && expression.getCount() > 1) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
CssAngle angle = (CssAngle) val;
if (!angle.isDegree()) {
throw new InvalidParamException("degree", null, ac);
@@ -112,6 +141,9 @@
expression.next();
return;
} else if (val instanceof CssNumber) {
+ if(check && expression.getCount() > 1) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
value = ((CssNumber) val).getAngle();
expression.next();
return;
@@ -122,6 +154,11 @@
getPropertyName(), ac);
}
+ public ACssAzimuth(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the value of this property
*/
Index: ACssVoiceStress.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/aural/ACssVoiceStress.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ACssVoiceStress.java 28 Jul 2003 14:56:30 -0000 1.1
+++ ACssVoiceStress.java 8 Aug 2005 13:18:04 -0000 1.2
@@ -6,6 +6,16 @@
// Please first read the full copyright statement in file COPYRIGHT.html
/*
* $Log$
+ * Revision 1.2 2005/08/08 13:18:04 ylafon
+ * All those changed made by Jean-Guilhem Rouel:
+ *
+ * Huge patch, imports fixed (automatic)
+ * Bug fixed: 372, 920, 778, 287, 696, 764, 233
+ * Partial bug fix for 289
+ *
+ * Issue with "inherit" in CSS2.
+ * The validator now checks the number of values (extraneous values were previously ignored)
+ *
* Revision 1.1 2003/07/28 14:56:30 sijtsche
* new CSS3 speech property
*
@@ -31,13 +41,13 @@
package org.w3c.css.aural;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.CssProperty;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
-import org.w3c.css.values.CssValue;
import org.w3c.css.values.CssIdent;
import org.w3c.css.values.CssNumber;
-import org.w3c.css.properties.CssProperty;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
+import org.w3c.css.values.CssValue;
/**
* @version $Revision$
@@ -64,9 +74,14 @@
* @param expression The expression for this property
* @exception InvalidParamException Expressions are incorrect
*/
- public ACssVoiceStress(ApplContext ac, CssExpression expression)
- throws InvalidParamException {
+ public ACssVoiceStress(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
this();
+
+ if(check && expression.getCount() > 1) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
+
CssValue val = expression.getValue();
int index;
@@ -85,6 +100,11 @@
expression.next();
}
+ public ACssVoiceStress(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the value of this property
*/
Index: ACssSpeakCSS3.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/aural/ACssSpeakCSS3.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ACssSpeakCSS3.java 25 Jul 2003 13:22:55 -0000 1.1
+++ ACssSpeakCSS3.java 8 Aug 2005 13:18:03 -0000 1.2
@@ -6,6 +6,16 @@
// Please first read the full copyright statement in file COPYRIGHT.html
/*
* $Log$
+ * Revision 1.2 2005/08/08 13:18:03 ylafon
+ * All those changed made by Jean-Guilhem Rouel:
+ *
+ * Huge patch, imports fixed (automatic)
+ * Bug fixed: 372, 920, 778, 287, 696, 764, 233
+ * Partial bug fix for 289
+ *
+ * Issue with "inherit" in CSS2.
+ * The validator now checks the number of values (extraneous values were previously ignored)
+ *
* Revision 1.1 2003/07/25 13:22:55 sijtsche
* extra values for property in CSS3
*
@@ -34,15 +44,12 @@
package org.w3c.css.aural;
import org.w3c.css.parser.CssStyle;
-import org.w3c.css.values.CssExpression;
-import org.w3c.css.values.CssValue;
-import org.w3c.css.values.CssIdent;
-import org.w3c.css.values.CssNumber;
-import org.w3c.css.values.CssPercentage;
import org.w3c.css.properties.CssProperty;
-import org.w3c.css.util.InvalidParamException;
import org.w3c.css.util.ApplContext;
-import org.w3c.css.properties.CssProperty;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssIdent;
+import org.w3c.css.values.CssValue;
/**
* 'speak'
@@ -71,8 +78,14 @@
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
*/
- public ACssSpeakCSS3(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public ACssSpeakCSS3(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
this();
+
+ if(check && expression.getCount() > 1) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
+
CssValue val = expression.getValue();
int index;
@@ -91,6 +104,11 @@
expression.next();
}
+ public ACssSpeakCSS3(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the value of this property
*/
Index: ACssPitch.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/aural/ACssPitch.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ACssPitch.java 8 Apr 2002 21:16:56 -0000 1.2
+++ ACssPitch.java 8 Aug 2005 13:18:03 -0000 1.3
@@ -6,6 +6,16 @@
// Please first read the full copyright statement in file COPYRIGHT.html
/*
* $Log$
+ * Revision 1.3 2005/08/08 13:18:03 ylafon
+ * All those changed made by Jean-Guilhem Rouel:
+ *
+ * Huge patch, imports fixed (automatic)
+ * Bug fixed: 372, 920, 778, 287, 696, 764, 233
+ * Partial bug fix for 289
+ *
+ * Issue with "inherit" in CSS2.
+ * The validator now checks the number of values (extraneous values were previously ignored)
+ *
* Revision 1.2 2002/04/08 21:16:56 plehegar
* New
*
@@ -19,13 +29,13 @@
package org.w3c.css.aural;
import org.w3c.css.parser.CssStyle;
-import org.w3c.css.values.CssExpression;
-import org.w3c.css.values.CssValue;
-import org.w3c.css.values.CssIdent;
-import org.w3c.css.values.CssFrequency;
import org.w3c.css.properties.CssProperty;
-import org.w3c.css.util.InvalidParamException;
import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssFrequency;
+import org.w3c.css.values.CssIdent;
+import org.w3c.css.values.CssValue;
/**
* 'pitch' <span>(or 'average pitch'
@@ -67,8 +77,14 @@
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
*/
- public ACssPitch(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public ACssPitch(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
this();
+
+ if(check && expression.getCount() > 1) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
+
CssValue val = expression.getValue();
setByUser();
@@ -88,6 +104,11 @@
expression.next();
}
+ public ACssPitch(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the value of this property
*/
Index: ACssVoiceBalance.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/aural/ACssVoiceBalance.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ACssVoiceBalance.java 25 Jul 2003 13:20:38 -0000 1.1
+++ ACssVoiceBalance.java 8 Aug 2005 13:18:03 -0000 1.2
@@ -6,6 +6,16 @@
// Please first read the full copyright statement in file COPYRIGHT.html
/*
* $Log$
+ * Revision 1.2 2005/08/08 13:18:03 ylafon
+ * All those changed made by Jean-Guilhem Rouel:
+ *
+ * Huge patch, imports fixed (automatic)
+ * Bug fixed: 372, 920, 778, 287, 696, 764, 233
+ * Partial bug fix for 289
+ *
+ * Issue with "inherit" in CSS2.
+ * The validator now checks the number of values (extraneous values were previously ignored)
+ *
* Revision 1.1 2003/07/25 13:20:38 sijtsche
* new CSS3 speech property
*
@@ -34,14 +44,14 @@
package org.w3c.css.aural;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.CssProperty;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
-import org.w3c.css.values.CssValue;
import org.w3c.css.values.CssIdent;
import org.w3c.css.values.CssNumber;
import org.w3c.css.values.CssPercentage;
-import org.w3c.css.properties.CssProperty;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
+import org.w3c.css.values.CssValue;
/**
@@ -70,8 +80,14 @@
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
*/
- public ACssVoiceBalance(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public ACssVoiceBalance(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
this();
+
+ if(check && expression.getCount() > 1) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
+
CssValue val = expression.getValue();
int index;
@@ -101,6 +117,11 @@
expression.next();
}
+ public ACssVoiceBalance(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the value of this property
*/
Index: ACssSpeakDate.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/aural/ACssSpeakDate.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ACssSpeakDate.java 8 Apr 2002 21:16:56 -0000 1.2
+++ ACssSpeakDate.java 8 Aug 2005 13:18:03 -0000 1.3
@@ -6,6 +6,16 @@
// Please first read the full copyright statement in file COPYRIGHT.html
/*
* $Log$
+ * Revision 1.3 2005/08/08 13:18:03 ylafon
+ * All those changed made by Jean-Guilhem Rouel:
+ *
+ * Huge patch, imports fixed (automatic)
+ * Bug fixed: 372, 920, 778, 287, 696, 764, 233
+ * Partial bug fix for 289
+ *
+ * Issue with "inherit" in CSS2.
+ * The validator now checks the number of values (extraneous values were previously ignored)
+ *
* Revision 1.2 2002/04/08 21:16:56 plehegar
* New
*
@@ -14,12 +24,12 @@
package org.w3c.css.aural;
import org.w3c.css.parser.CssStyle;
-import org.w3c.css.values.CssExpression;
-import org.w3c.css.values.CssValue;
-import org.w3c.css.values.CssIdent;
import org.w3c.css.properties.CssProperty;
-import org.w3c.css.util.InvalidParamException;
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.CssValue;
/**
* <H3>   'speak-date'</H3>
@@ -47,103 +57,112 @@
* @version $Revision$
*/
public class ACssSpeakDate extends ACssProperty {
-
- CssValue value;
-
- /**
- * Create a new ACssSpeakDate
- */
- public ACssSpeakDate() {
- value = myd; // browser specific
- }
-
- /**
- * Creates a new ACssSpeakDate
- *
- * @param expression the expression of the size
- * @exception InvalidParamException The expression is incorrect
- */
- public ACssSpeakDate(ApplContext ac, CssExpression expression)
+
+ CssValue value;
+
+ /**
+ * Create a new ACssSpeakDate
+ */
+ public ACssSpeakDate() {
+ value = myd; // browser specific
+ }
+
+ /**
+ * Creates a new ACssSpeakDate
+ *
+ * @param expression the expression of the size
+ * @exception InvalidParamException The expression is incorrect
+ */
+ public ACssSpeakDate(ApplContext ac, CssExpression expression, boolean check)
throws InvalidParamException {
-
- CssValue val = expression.getValue();
+
+ if(check && expression.getCount() > 1) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
+
+ CssValue val = expression.getValue();
+
+ if (val.equals(dmy)) {
+ value = dmy;
+ expression.next();
+ return;
+ } else if (val.equals(ymd)) {
+ value = ymd;
+ expression.next();
+ return;
+ } else if (val.equals(myd)) {
+ value = myd;
+ expression.next();
+ return;
+ }
+
+ throw new InvalidParamException("value", val.toString(), getPropertyName(), ac);
+ }
- if (val.equals(dmy)) {
- value = dmy;
- expression.next();
- return;
- } else if (val.equals(ymd)) {
- value = ymd;
- expression.next();
- return;
- } else if (val.equals(myd)) {
- value = myd;
- expression.next();
- return;
+ public ACssSpeakDate(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
}
- throw new InvalidParamException("value", val.toString(), getPropertyName(), ac);
- }
-
- /**
- * Returns the current value
- */
- public Object get() {
- return value;
- }
-
- /**
- * Returns a string representation of the object.
- */
- public String toString() {
- return value.toString();
- }
-
-
- /**
- * Returns the name of this property
- */
- public String getPropertyName() {
- return "speak-date";
- }
-
- /**
- * Add this property to the CssStyle.
- *
- * @param style The CssStyle
- */
- public void addToStyle(ApplContext ac, CssStyle style) {
- if (((ACssStyle) style).acssSpeakDate != null)
- ((ACssStyle) style).addRedefinitionWarning(ac, this);
- ((ACssStyle) style).acssSpeakDate = this;
- }
-
- /**
- * Compares two properties for equality.
- *
- * @param value The other property.
- */
- public boolean equals(CssProperty property) {
- return (property instanceof ACssSpeakDate &&
- value.equals(((ACssSpeakDate) property).value));
- }
-
-
- /**
- * Get this property in the style.
- *
- * @param style The style where the property is
- * @param resolve if true, resolve the style to find this property
- */
- public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
- if (resolve) {
- return ((ACssStyle) style).getSpeakDate();
- } else {
- return ((ACssStyle) style).acssSpeakDate;
+ /**
+ * Returns the current value
+ */
+ public Object get() {
+ return value;
}
- }
-
- private static CssIdent myd = new CssIdent("myd");
- private static CssIdent dmy = new CssIdent("dmy");
- private static CssIdent ymd = new CssIdent("ymd");
+
+ /**
+ * Returns a string representation of the object.
+ */
+ public String toString() {
+ return value.toString();
+ }
+
+
+ /**
+ * Returns the name of this property
+ */
+ public String getPropertyName() {
+ return "speak-date";
+ }
+
+ /**
+ * Add this property to the CssStyle.
+ *
+ * @param style The CssStyle
+ */
+ public void addToStyle(ApplContext ac, CssStyle style) {
+ if (((ACssStyle) style).acssSpeakDate != null)
+ ((ACssStyle) style).addRedefinitionWarning(ac, this);
+ ((ACssStyle) style).acssSpeakDate = this;
+ }
+
+ /**
+ * Compares two properties for equality.
+ *
+ * @param value The other property.
+ */
+ public boolean equals(CssProperty property) {
+ return (property instanceof ACssSpeakDate &&
+ value.equals(((ACssSpeakDate) property).value));
+ }
+
+
+ /**
+ * Get this property in the style.
+ *
+ * @param style The style where the property is
+ * @param resolve if true, resolve the style to find this property
+ */
+ public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
+ if (resolve) {
+ return ((ACssStyle) style).getSpeakDate();
+ } else {
+ return ((ACssStyle) style).acssSpeakDate;
+ }
+ }
+
+ private static CssIdent myd = new CssIdent("myd");
+ private static CssIdent dmy = new CssIdent("dmy");
+ private static CssIdent ymd = new CssIdent("ymd");
}
Index: ACssSpeakNumeral.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/aural/ACssSpeakNumeral.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ACssSpeakNumeral.java 8 Apr 2002 21:16:56 -0000 1.2
+++ ACssSpeakNumeral.java 8 Aug 2005 13:18:03 -0000 1.3
@@ -6,6 +6,16 @@
// Please first read the full copyright statement in file COPYRIGHT.html
/*
* $Log$
+ * Revision 1.3 2005/08/08 13:18:03 ylafon
+ * All those changed made by Jean-Guilhem Rouel:
+ *
+ * Huge patch, imports fixed (automatic)
+ * Bug fixed: 372, 920, 778, 287, 696, 764, 233
+ * Partial bug fix for 289
+ *
+ * Issue with "inherit" in CSS2.
+ * The validator now checks the number of values (extraneous values were previously ignored)
+ *
* Revision 1.2 2002/04/08 21:16:56 plehegar
* New
*
@@ -14,12 +24,12 @@
package org.w3c.css.aural;
import org.w3c.css.parser.CssStyle;
-import org.w3c.css.values.CssExpression;
-import org.w3c.css.values.CssValue;
-import org.w3c.css.values.CssIdent;
import org.w3c.css.properties.CssProperty;
-import org.w3c.css.util.InvalidParamException;
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.CssValue;
/**
* <H3>   'speak-numeral'</H3>
@@ -54,8 +64,12 @@
* @param expression the expression of the size
* @exception InvalidParamException The expression is incorrect
*/
- public ACssSpeakNumeral(ApplContext ac, CssExpression expression)
- throws InvalidParamException {
+ public ACssSpeakNumeral(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
+
+ if(check && expression.getCount() > 1) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
CssValue val = expression.getValue();
@@ -80,6 +94,11 @@
throw new InvalidParamException("value", val.toString(), getPropertyName(), ac);
}
+ public ACssSpeakNumeral(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the current value
*/
Index: ACssVoiceFamilyCSS3.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/aural/ACssVoiceFamilyCSS3.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ACssVoiceFamilyCSS3.java 28 Jul 2003 14:20:12 -0000 1.1
+++ ACssVoiceFamilyCSS3.java 8 Aug 2005 13:18:04 -0000 1.2
@@ -6,6 +6,16 @@
// Please first read the full copyright statement in file COPYRIGHT.html
/*
* $Log$
+ * Revision 1.2 2005/08/08 13:18:04 ylafon
+ * All those changed made by Jean-Guilhem Rouel:
+ *
+ * Huge patch, imports fixed (automatic)
+ * Bug fixed: 372, 920, 778, 287, 696, 764, 233
+ * Partial bug fix for 289
+ *
+ * Issue with "inherit" in CSS2.
+ * The validator now checks the number of values (extraneous values were previously ignored)
+ *
* Revision 1.1 2003/07/28 14:20:12 sijtsche
* new CSS3 speech property
*
@@ -22,20 +32,19 @@
package org.w3c.css.aural;
-import java.util.Vector;
import java.util.Enumeration;
+import java.util.Vector;
import org.w3c.css.parser.CssStyle;
import org.w3c.css.properties.CssProperty;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.util.Util;
import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssIdent;
import org.w3c.css.values.CssOperator;
-import org.w3c.css.values.CssValue;
import org.w3c.css.values.CssString;
-import org.w3c.css.values.CssIdent;
-import org.w3c.css.values.CssNumber;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
-import org.w3c.css.util.Util;
+import org.w3c.css.values.CssValue;
/**
* <H3>5.2 'voice-family'</H3>
@@ -93,7 +102,8 @@
* @param value the voice name
* @exception InvalidParamException The expression is incorrect
*/
- public ACssVoiceFamilyCSS3(ApplContext ac, CssExpression value) throws InvalidParamException {
+ public ACssVoiceFamilyCSS3(ApplContext ac, CssExpression value,
+ boolean check) throws InvalidParamException {
boolean family = true;
CssValue val = value.getValue();
char op;
@@ -101,7 +111,11 @@
setByUser();
if (val.equals(inherit)) {
+ if(check && value.getCount() > 1) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
inheritValue = true;
+ return;
}
while (family) {
@@ -113,6 +127,10 @@
(new Character(op)).toString(), ac);
}
+ if(val != null && val.equals(inherit)) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
+
if (val instanceof CssString) { //specific voice
String familyName = null;
if (op == COMMA) { // "helvetica", "roman"
@@ -227,6 +245,11 @@
}
+ public ACssVoiceFamilyCSS3(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns all voices name
*/
Index: ACssInterpretAs.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/aural/ACssInterpretAs.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ACssInterpretAs.java 30 Jul 2003 06:34:52 -0000 1.1
+++ ACssInterpretAs.java 8 Aug 2005 13:18:03 -0000 1.2
@@ -6,6 +6,16 @@
// Please first read the full copyright statement in file COPYRIGHT.html
/*
* $Log$
+ * Revision 1.2 2005/08/08 13:18:03 ylafon
+ * All those changed made by Jean-Guilhem Rouel:
+ *
+ * Huge patch, imports fixed (automatic)
+ * Bug fixed: 372, 920, 778, 287, 696, 764, 233
+ * Partial bug fix for 289
+ *
+ * Issue with "inherit" in CSS2.
+ * The validator now checks the number of values (extraneous values were previously ignored)
+ *
* Revision 1.1 2003/07/30 06:34:52 sijtsche
* new speech property
*
@@ -38,15 +48,14 @@
package org.w3c.css.aural;
import org.w3c.css.parser.CssStyle;
-import org.w3c.css.values.CssExpression;
-import org.w3c.css.values.CssValue;
-import org.w3c.css.values.CssNumber;
-import org.w3c.css.values.CssTime;
-import org.w3c.css.values.CssIdent;
-import org.w3c.css.values.CssDate;
import org.w3c.css.properties.CssProperty;
-import org.w3c.css.util.InvalidParamException;
import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssDate;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssIdent;
+import org.w3c.css.values.CssTime;
+import org.w3c.css.values.CssValue;
/**
@@ -78,12 +87,17 @@
* @param expression the expression of the size
* @exception InvalidParamException The expression is incorrect
*/
- public ACssInterpretAs(ApplContext ac, CssExpression expression)
- throws InvalidParamException {
+ public ACssInterpretAs(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
+
+ if(check && expression.getCount() > 1) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
+
CssValue val = expression.getValue();
-
+
setByUser();
-
+
if (val.equals(inherit)) {
value = inherit;
expression.next();
@@ -92,7 +106,7 @@
float num = ((Float) val.get()).floatValue();
if (num < 0) {
throw new InvalidParamException("negative-value",
- val.toString(), ac);
+ val.toString(), ac);
}
value = val;
expression.next();
@@ -102,19 +116,24 @@
expression.next();
return;
} else if (val instanceof CssIdent) {
- for (int i=0; i < interpretas.length; i++) {
- if (val.toString().equals(interpretas[i])) {
- value = val;
- expression.next();
- return;
- }
+ for (int i=0; i < interpretas.length; i++) {
+ if (val.toString().equals(interpretas[i])) {
+ value = val;
+ expression.next();
+ return;
}
+ }
}
-
+
throw new InvalidParamException("value", val.toString(),
- getPropertyName(), ac);
+ getPropertyName(), ac);
}
-
+
+ public ACssInterpretAs(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the current value
*/
@@ -165,7 +184,7 @@
style.addRedefinitionWarning(ac, this);
((ACssStyle) style).acssInterpretAs = this;
}
-
+
/**
* Compares two properties for equality.
*
@@ -179,8 +198,8 @@
return false;
}
}
-
-
+
+
/**
* Get this property in the style.
*
Index: ACssPlayDuring.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/aural/ACssPlayDuring.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ACssPlayDuring.java 8 Apr 2002 21:16:56 -0000 1.2
+++ ACssPlayDuring.java 8 Aug 2005 13:18:03 -0000 1.3
@@ -6,6 +6,16 @@
// Please first read the full copyright statement in file COPYRIGHT.html
/*
* $Log$
+ * Revision 1.3 2005/08/08 13:18:03 ylafon
+ * All those changed made by Jean-Guilhem Rouel:
+ *
+ * Huge patch, imports fixed (automatic)
+ * Bug fixed: 372, 920, 778, 287, 696, 764, 233
+ * Partial bug fix for 289
+ *
+ * Issue with "inherit" in CSS2.
+ * The validator now checks the number of values (extraneous values were previously ignored)
+ *
* Revision 1.2 2002/04/08 21:16:56 plehegar
* New
*
@@ -37,19 +47,18 @@
package org.w3c.css.aural;
+import java.io.IOException;
+import java.net.URL;
+
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.CssProperty;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
-import org.w3c.css.values.CssValue;
import org.w3c.css.values.CssIdent;
-import org.w3c.css.values.CssURL;
import org.w3c.css.values.CssOperator;
-import org.w3c.css.properties.CssProperty;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
-import org.w3c.css.util.HTTPURL;
-
-import java.net.URL;
-import java.io.IOException;
+import org.w3c.css.values.CssURL;
+import org.w3c.css.values.CssValue;
/**
* 'play-during'
@@ -130,42 +139,58 @@
* @param expression the expression of the size
* @exception InvalidParamException The expression is incorrect
*/
- public ACssPlayDuring(ApplContext ac, CssExpression expression)
- throws InvalidParamException {
- CssValue val = expression.getValue();
+ public ACssPlayDuring(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
+
+ int valuesNb = expression.getCount();
+
+ if(check && valuesNb > 3) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
+
+ CssValue val = expression.getValue();
if (val instanceof CssURL) {
- this.value = val;
- if (expression.getCount() == 3) {
+ this.value = val;
+ if (valuesNb == 3) {
if (expression.getOperator() != SPACE) {
throw new InvalidParamException("operator",
- (new Character(expression.getOperator()).toString()),
- ac);
+ (new Character(expression.getOperator()).toString()),
+ ac);
}
expression.next();
if (expression.getOperator() != SPACE) {
throw new InvalidParamException("operator",
- (new Character(expression.getOperator()).toString()),
- ac);
+ (new Character(expression.getOperator()).toString()),
+ ac);
}
val = expression.getValue();
- if (!val.equals(MIX)) {
+ if (!val.equals(MIX) && !val.equals(REPEAT)) {
throw new InvalidParamException("few-value",
- getPropertyName(), ac);
+ getPropertyName(), ac);
+ }
+ else if(!val.equals(MIX)) {
+ mix = true;
+ }
+ else { // val = REPEAT
+ repeat = true;
}
- mix = true;
expression.next();
val = expression.getValue();
- if (!val.equals(REPEAT)) {
- throw new InvalidParamException("few-value"
- + getPropertyName(), ac);
+ if (mix && val.equals(REPEAT)) {
+ repeat = true;
}
- repeat = true;
- } else if (expression.getCount() == 2) {
+ else if(repeat && val.equals(MIX)) {
+ mix = true;
+ }
+ else {
+ throw new InvalidParamException("unrecognize", ac);
+ }
+ } else if (valuesNb == 2) {
if (expression.getOperator() != SPACE) {
throw new InvalidParamException("operator",
- (new Character(expression.getOperator()).toString()),
- ac);
+ (new Character(expression.getOperator()).toString()),
+ ac);
}
expression.next();
val = expression.getValue();
@@ -174,21 +199,29 @@
} else if (val.equals(REPEAT)) {
repeat = true;
} else {
- throw new InvalidParamException("few-value",
- getPropertyName(), ac);
+ throw new InvalidParamException("unrecognize", ac);
}
}
expression.next();
return;
} else if (val.equals(inherit)) {
+ if(check && valuesNb > 1) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
this.value = inherit;
expression.next();
return;
} else if (val.equals(NONE)) {
+ if(check && valuesNb > 1) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
this.value = NONE;
expression.next();
return;
} else if (val.equals(AUTO)) {
+ if(check && valuesNb > 1) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
this.value = AUTO;
expression.next();
return;
@@ -197,6 +230,11 @@
throw new InvalidParamException("value", val.toString(), getPropertyName(), ac);
}
+ public ACssPlayDuring(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the current value
*/
Index: ACssCueAfter.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/aural/ACssCueAfter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ACssCueAfter.java 8 Apr 2002 21:16:56 -0000 1.2
+++ ACssCueAfter.java 8 Aug 2005 13:18:03 -0000 1.3
@@ -6,6 +6,16 @@
// Please first read the full copyright statement in file COPYRIGHT.html
/*
* $Log$
+ * Revision 1.3 2005/08/08 13:18:03 ylafon
+ * All those changed made by Jean-Guilhem Rouel:
+ *
+ * Huge patch, imports fixed (automatic)
+ * Bug fixed: 372, 920, 778, 287, 696, 764, 233
+ * Partial bug fix for 289
+ *
+ * Issue with "inherit" in CSS2.
+ * The validator now checks the number of values (extraneous values were previously ignored)
+ *
* Revision 1.2 2002/04/08 21:16:56 plehegar
* New
*
@@ -43,15 +53,15 @@
import java.io.IOException;
import java.net.URL;
-import org.w3c.css.values.CssValue;
-import org.w3c.css.values.CssExpression;
-import org.w3c.css.values.CssURL;
-import org.w3c.css.values.CssIdent;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
-import org.w3c.css.util.HTTPURL;
import org.w3c.css.parser.CssStyle;
import org.w3c.css.properties.CssProperty;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.HTTPURL;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssIdent;
+import org.w3c.css.values.CssURL;
+import org.w3c.css.values.CssValue;
/**
* 'cue-after'
@@ -108,7 +118,13 @@
* @param value the value of the size
* @exception InvalidParamException The value is incorrect
*/
- public ACssCueAfter(ApplContext ac, CssExpression value) throws InvalidParamException {
+ public ACssCueAfter(ApplContext ac, CssExpression value, boolean check)
+ throws InvalidParamException {
+
+ if(check && value.getCount() > 1) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
+
CssValue val = value.getValue();
if (val instanceof CssURL) {
@@ -129,6 +145,11 @@
getPropertyName(), ac);
}
+ public ACssCueAfter(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the current value
*/
Index: ACssCue.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/aural/ACssCue.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ACssCue.java 8 Apr 2002 21:16:56 -0000 1.2
+++ ACssCue.java 8 Aug 2005 13:18:03 -0000 1.3
@@ -6,6 +6,16 @@
// Please first read the full copyright statement in file COPYRIGHT.html
/*
* $Log$
+ * Revision 1.3 2005/08/08 13:18:03 ylafon
+ * All those changed made by Jean-Guilhem Rouel:
+ *
+ * Huge patch, imports fixed (automatic)
+ * Bug fixed: 372, 920, 778, 287, 696, 764, 233
+ * Partial bug fix for 289
+ *
+ * Issue with "inherit" in CSS2.
+ * The validator now checks the number of values (extraneous values were previously ignored)
+ *
* Revision 1.2 2002/04/08 21:16:56 plehegar
* New
*
@@ -26,14 +36,14 @@
*/
package org.w3c.css.aural;
+import org.w3c.css.parser.CssPrinterStyle;
import org.w3c.css.parser.CssSelectors;
import org.w3c.css.parser.CssStyle;
-import org.w3c.css.parser.CssPrinterStyle;
-import org.w3c.css.values.CssExpression;
-import org.w3c.css.values.CssOperator;
import org.w3c.css.properties.CssProperty;
-import org.w3c.css.util.InvalidParamException;
import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssOperator;
/**
@@ -83,7 +93,8 @@
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
*/
- public ACssCue(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public ACssCue(ApplContext ac, CssExpression expression, boolean check)
+ throws InvalidParamException {
switch (expression.getCount()) {
case 1:
same = true;
@@ -93,16 +104,30 @@
case 2:
if (expression.getOperator() != SPACE) {
throw new InvalidParamException("operator",
- (new Character(expression.getOperator()).toString()),
- ac);
+ (new Character(expression.getOperator()).toString()),
+ ac);
+ }
+ if(check && expression.getValue().equals(inherit)) {
+ throw new InvalidParamException("unrecognize", ac);
}
cueBefore = new ACssCueBefore(ac, expression);
+ if(check && expression.getValue().equals(inherit)) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
cueAfter = new ACssCueAfter(ac, expression);
break;
default:
+ if(check) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
}
}
+ public ACssCue(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the value of this property
*/
Index: ACssVoicePitchRange.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/aural/ACssVoicePitchRange.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ACssVoicePitchRange.java 28 Jul 2003 14:56:30 -0000 1.1
+++ ACssVoicePitchRange.java 8 Aug 2005 13:18:04 -0000 1.2
@@ -6,6 +6,16 @@
// Please first read the full copyright statement in file COPYRIGHT.html
/*
* $Log$
+ * Revision 1.2 2005/08/08 13:18:04 ylafon
+ * All those changed made by Jean-Guilhem Rouel:
+ *
+ * Huge patch, imports fixed (automatic)
+ * Bug fixed: 372, 920, 778, 287, 696, 764, 233
+ * Partial bug fix for 289
+ *
+ * Issue with "inherit" in CSS2.
+ * The validator now checks the number of values (extraneous values were previously ignored)
+ *
* Revision 1.1 2003/07/28 14:56:30 sijtsche
* new CSS3 speech property
*
@@ -22,13 +32,13 @@
package org.w3c.css.aural;
import org.w3c.css.parser.CssStyle;
-import org.w3c.css.values.CssExpression;
-import org.w3c.css.values.CssValue;
-import org.w3c.css.values.CssIdent;
-import org.w3c.css.values.CssFrequency;
import org.w3c.css.properties.CssProperty;
-import org.w3c.css.util.InvalidParamException;
import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssFrequency;
+import org.w3c.css.values.CssIdent;
+import org.w3c.css.values.CssValue;
/**
* 'pitch' <span>(or 'average pitch'
@@ -69,8 +79,14 @@
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
*/
- public ACssVoicePitchRange(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public ACssVoicePitchRange(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
this();
+
+ if(check && expression.getCount() > 1) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
+
CssValue val = expression.getValue();
setByUser();
@@ -90,6 +106,11 @@
expression.next();
}
+ public ACssVoicePitchRange(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the value of this property
*/
Index: ACssPitchRange.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/aural/ACssPitchRange.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ACssPitchRange.java 8 Apr 2002 21:16:56 -0000 1.2
+++ ACssPitchRange.java 8 Aug 2005 13:18:03 -0000 1.3
@@ -6,6 +6,16 @@
// Please first read the full copyright statement in file COPYRIGHT.html
/*
* $Log$
+ * Revision 1.3 2005/08/08 13:18:03 ylafon
+ * All those changed made by Jean-Guilhem Rouel:
+ *
+ * Huge patch, imports fixed (automatic)
+ * Bug fixed: 372, 920, 778, 287, 696, 764, 233
+ * Partial bug fix for 289
+ *
+ * Issue with "inherit" in CSS2.
+ * The validator now checks the number of values (extraneous values were previously ignored)
+ *
* Revision 1.2 2002/04/08 21:16:56 plehegar
* New
*
@@ -13,13 +23,12 @@
package org.w3c.css.aural;
import org.w3c.css.parser.CssStyle;
-import org.w3c.css.values.CssExpression;
-import org.w3c.css.values.CssValue;
-import org.w3c.css.values.CssNumber;
-import org.w3c.css.values.CssIdent;
import org.w3c.css.properties.CssProperty;
-import org.w3c.css.util.InvalidParamException;
import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssNumber;
+import org.w3c.css.values.CssValue;
/**
@@ -58,9 +67,14 @@
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
*/
- public ACssPitchRange(ApplContext ac, CssExpression expression)
- throws InvalidParamException {
+ public ACssPitchRange(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
this();
+
+ if(check && expression.getCount() > 1) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
+
CssValue val = expression.getValue();
int index;
@@ -84,6 +98,11 @@
getPropertyName(), ac);
}
+ public ACssPitchRange(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the value of this property
*/
Index: ACssSpeakTime.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/aural/ACssSpeakTime.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ACssSpeakTime.java 8 Apr 2002 21:16:56 -0000 1.2
+++ ACssSpeakTime.java 8 Aug 2005 13:18:03 -0000 1.3
@@ -6,6 +6,16 @@
// Please first read the full copyright statement in file COPYRIGHT.html
/*
* $Log$
+ * Revision 1.3 2005/08/08 13:18:03 ylafon
+ * All those changed made by Jean-Guilhem Rouel:
+ *
+ * Huge patch, imports fixed (automatic)
+ * Bug fixed: 372, 920, 778, 287, 696, 764, 233
+ * Partial bug fix for 289
+ *
+ * Issue with "inherit" in CSS2.
+ * The validator now checks the number of values (extraneous values were previously ignored)
+ *
* Revision 1.2 2002/04/08 21:16:56 plehegar
* New
*
@@ -14,13 +24,13 @@
package org.w3c.css.aural;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.CssProperty;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
-import org.w3c.css.values.CssValue;
import org.w3c.css.values.CssIdent;
import org.w3c.css.values.CssNumber;
-import org.w3c.css.properties.CssProperty;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
+import org.w3c.css.values.CssValue;
/**
* <H3>   'speak-time'</H3>
@@ -34,100 +44,109 @@
* @version $Revision$
*/
public class ACssSpeakTime extends ACssProperty {
-
- CssValue value;
-
- /**
- * Create a new ACssSpeakTime
- */
- public ACssSpeakTime() {
- value = none;
- }
-
- /**
- * Creates a new ACssSpeakTime
- *
- * @param expression the expression of the size
- * @exception InvalidParamException The expression is incorrect
- */
- public ACssSpeakTime(ApplContext ac, CssExpression expression)
+
+ CssValue value;
+
+ /**
+ * Create a new ACssSpeakTime
+ */
+ public ACssSpeakTime() {
+ value = none;
+ }
+
+ /**
+ * Creates a new ACssSpeakTime
+ *
+ * @param expression the expression of the size
+ * @exception InvalidParamException The expression is incorrect
+ */
+ public ACssSpeakTime(ApplContext ac, CssExpression expression, boolean check)
throws InvalidParamException {
-
- CssValue val = expression.getValue();
+
+ if(check && expression.getCount() > 1) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
+
+ CssValue val = expression.getValue();
+
+ if (val.equals(none)) {
+ value = none;
+ expression.next();
+ return;
+ } else if (val instanceof CssNumber) {
+ float v = ((Float) val.get()).floatValue();
+ if (v == 12 || v == 24) {
+ value = val;
+ expression.next();
+ return;
+ }
+ }
+
+ throw new InvalidParamException("value", val.toString(), getPropertyName(), ac);
+ }
- if (val.equals(none)) {
- value = none;
- expression.next();
- return;
- } else if (val instanceof CssNumber) {
- float v = ((Float) val.get()).floatValue();
- if (v == 12 || v == 24) {
- value = val;
- expression.next();
- return;
- }
+ public ACssSpeakTime(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
}
- throw new InvalidParamException("value", val.toString(), getPropertyName(), ac);
- }
-
- /**
- * Returns the current value
- */
- public Object get() {
- return value;
- }
-
- /**
- * Returns a string representation of the object.
- */
- public String toString() {
- return value.toString();
- }
-
-
- /**
- * Returns the name of this property
- */
- public String getPropertyName() {
- return "speak-time";
- }
-
- /**
- * Add this property to the CssStyle.
- *
- * @param style The CssStyle
- */
- public void addToStyle(ApplContext ac, CssStyle style) {
- if (((ACssStyle) style).acssSpeakTime != null)
- ((ACssStyle) style).addRedefinitionWarning(ac, this);
- ((ACssStyle) style).acssSpeakTime = this;
- }
-
- /**
- * Compares two properties for equality.
- *
- * @param value The other property.
- */
- public boolean equals(CssProperty property) {
- return (property instanceof ACssSpeakTime &&
- value.equals(((ACssSpeakTime) property).value));
- }
-
-
- /**
- * Get this property in the style.
- *
- * @param style The style where the property is
- * @param resolve if true, resolve the style to find this property
- */
- public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
- if (resolve) {
- return ((ACssStyle) style).getSpeakTime();
- } else {
- return ((ACssStyle) style).acssSpeakTime;
+ /**
+ * Returns the current value
+ */
+ public Object get() {
+ return value;
}
- }
-
- private static CssIdent none = new CssIdent("none");
+
+ /**
+ * Returns a string representation of the object.
+ */
+ public String toString() {
+ return value.toString();
+ }
+
+
+ /**
+ * Returns the name of this property
+ */
+ public String getPropertyName() {
+ return "speak-time";
+ }
+
+ /**
+ * Add this property to the CssStyle.
+ *
+ * @param style The CssStyle
+ */
+ public void addToStyle(ApplContext ac, CssStyle style) {
+ if (((ACssStyle) style).acssSpeakTime != null)
+ ((ACssStyle) style).addRedefinitionWarning(ac, this);
+ ((ACssStyle) style).acssSpeakTime = this;
+ }
+
+ /**
+ * Compares two properties for equality.
+ *
+ * @param value The other property.
+ */
+ public boolean equals(CssProperty property) {
+ return (property instanceof ACssSpeakTime &&
+ value.equals(((ACssSpeakTime) property).value));
+ }
+
+
+ /**
+ * Get this property in the style.
+ *
+ * @param style The style where the property is
+ * @param resolve if true, resolve the style to find this property
+ */
+ public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
+ if (resolve) {
+ return ((ACssStyle) style).getSpeakTime();
+ } else {
+ return ((ACssStyle) style).acssSpeakTime;
+ }
+ }
+
+ private static CssIdent none = new CssIdent("none");
}
Index: ACssVolume.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/aural/ACssVolume.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ACssVolume.java 8 Apr 2002 21:16:56 -0000 1.2
+++ ACssVolume.java 8 Aug 2005 13:18:04 -0000 1.3
@@ -6,6 +6,16 @@
// Please first read the full copyright statement in file COPYRIGHT.html
/*
* $Log$
+ * Revision 1.3 2005/08/08 13:18:04 ylafon
+ * All those changed made by Jean-Guilhem Rouel:
+ *
+ * Huge patch, imports fixed (automatic)
+ * Bug fixed: 372, 920, 778, 287, 696, 764, 233
+ * Partial bug fix for 289
+ *
+ * Issue with "inherit" in CSS2.
+ * The validator now checks the number of values (extraneous values were previously ignored)
+ *
* Revision 1.2 2002/04/08 21:16:56 plehegar
* New
*
@@ -31,14 +41,14 @@
package org.w3c.css.aural;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.CssProperty;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
-import org.w3c.css.values.CssValue;
import org.w3c.css.values.CssIdent;
import org.w3c.css.values.CssNumber;
import org.w3c.css.values.CssPercentage;
-import org.w3c.css.properties.CssProperty;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
+import org.w3c.css.values.CssValue;
/**
@@ -146,10 +156,16 @@
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
*/
- public ACssVolume(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public ACssVolume(ApplContext ac, CssExpression expression, boolean check)
+ throws InvalidParamException {
this();
+
+ if(check && expression.getCount() > 1) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
+
CssValue val = expression.getValue();
- int index;
+ //int index;
setByUser();
@@ -191,6 +207,11 @@
expression.next();
}
+ public ACssVolume(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the value of this property
*/
Index: ACssStyle.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/aural/ACssStyle.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ACssStyle.java 30 Jul 2003 06:54:50 -0000 1.5
+++ ACssStyle.java 8 Aug 2005 13:18:03 -0000 1.6
@@ -6,6 +6,16 @@
// Please first read the full copyright statement in file COPYRIGHT.html
/*
* $Log$
+ * Revision 1.6 2005/08/08 13:18:03 ylafon
+ * All those changed made by Jean-Guilhem Rouel:
+ *
+ * Huge patch, imports fixed (automatic)
+ * Bug fixed: 372, 920, 778, 287, 696, 764, 233
+ * Partial bug fix for 289
+ *
+ * Issue with "inherit" in CSS2.
+ * The validator now checks the number of values (extraneous values were previously ignored)
+ *
* Revision 1.5 2003/07/30 06:54:50 sijtsche
* new properties added
*
@@ -44,11 +54,11 @@
import java.util.Enumeration;
-import org.w3c.css.util.Warnings;
-import org.w3c.css.util.Warning;
-import org.w3c.css.util.ApplContext;
import org.w3c.css.parser.CssPrinterStyle;
import org.w3c.css.properties.Css1Style;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.Warning;
+import org.w3c.css.util.Warnings;
import org.w3c.css.values.CssPercentage;
/**
Index: ACssCueBefore.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/aural/ACssCueBefore.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ACssCueBefore.java 8 Apr 2002 21:16:56 -0000 1.2
+++ ACssCueBefore.java 8 Aug 2005 13:18:03 -0000 1.3
@@ -6,6 +6,16 @@
// Please first read the full copyright statement in file COPYRIGHT.html
/*
* $Log$
+ * Revision 1.3 2005/08/08 13:18:03 ylafon
+ * All those changed made by Jean-Guilhem Rouel:
+ *
+ * Huge patch, imports fixed (automatic)
+ * Bug fixed: 372, 920, 778, 287, 696, 764, 233
+ * Partial bug fix for 289
+ *
+ * Issue with "inherit" in CSS2.
+ * The validator now checks the number of values (extraneous values were previously ignored)
+ *
* Revision 1.2 2002/04/08 21:16:56 plehegar
* New
*
@@ -22,15 +32,15 @@
import java.io.IOException;
import java.net.URL;
-import org.w3c.css.values.CssValue;
-import org.w3c.css.values.CssExpression;
-import org.w3c.css.values.CssURL;
-import org.w3c.css.values.CssIdent;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
-import org.w3c.css.util.HTTPURL;
import org.w3c.css.parser.CssStyle;
import org.w3c.css.properties.CssProperty;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.HTTPURL;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssIdent;
+import org.w3c.css.values.CssURL;
+import org.w3c.css.values.CssValue;
/**
* 'cue-before'
@@ -88,7 +98,13 @@
* @param value the value of the size
* @exception InvalidParamException The value is incorrect
*/
- public ACssCueBefore(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public ACssCueBefore(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
+
+ if(check && expression.getCount() > 1) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
+
CssValue val = expression.getValue();
if (val instanceof CssURL) {
@@ -108,6 +124,11 @@
throw new InvalidParamException("value", val.toString(), getPropertyName(), ac);
}
+ public ACssCueBefore(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the current value
*/
Index: ACssSpeak.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/aural/ACssSpeak.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ACssSpeak.java 8 Apr 2002 21:16:56 -0000 1.2
+++ ACssSpeak.java 8 Aug 2005 13:18:03 -0000 1.3
@@ -6,6 +6,16 @@
// Please first read the full copyright statement in file COPYRIGHT.html
/*
* $Log$
+ * Revision 1.3 2005/08/08 13:18:03 ylafon
+ * All those changed made by Jean-Guilhem Rouel:
+ *
+ * Huge patch, imports fixed (automatic)
+ * Bug fixed: 372, 920, 778, 287, 696, 764, 233
+ * Partial bug fix for 289
+ *
+ * Issue with "inherit" in CSS2.
+ * The validator now checks the number of values (extraneous values were previously ignored)
+ *
* Revision 1.2 2002/04/08 21:16:56 plehegar
* New
*
@@ -31,14 +41,12 @@
package org.w3c.css.aural;
import org.w3c.css.parser.CssStyle;
-import org.w3c.css.values.CssExpression;
-import org.w3c.css.values.CssValue;
-import org.w3c.css.values.CssIdent;
-import org.w3c.css.values.CssNumber;
-import org.w3c.css.values.CssPercentage;
import org.w3c.css.properties.CssProperty;
-import org.w3c.css.util.InvalidParamException;
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.CssValue;
/**
@@ -68,8 +76,14 @@
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
*/
- public ACssSpeak(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public ACssSpeak(ApplContext ac, CssExpression expression, boolean check)
+ throws InvalidParamException {
this();
+
+ if(check && expression.getCount() > 1) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
+
CssValue val = expression.getValue();
int index;
@@ -88,6 +102,11 @@
expression.next();
}
+ public ACssSpeak(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the value of this property
*/
Index: ACssElevation.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/aural/ACssElevation.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ACssElevation.java 8 Apr 2002 21:16:56 -0000 1.2
+++ ACssElevation.java 8 Aug 2005 13:18:03 -0000 1.3
@@ -6,6 +6,16 @@
// Please first read the full copyright statement in file COPYRIGHT.html
/*
* $Log$
+ * Revision 1.3 2005/08/08 13:18:03 ylafon
+ * All those changed made by Jean-Guilhem Rouel:
+ *
+ * Huge patch, imports fixed (automatic)
+ * Bug fixed: 372, 920, 778, 287, 696, 764, 233
+ * Partial bug fix for 289
+ *
+ * Issue with "inherit" in CSS2.
+ * The validator now checks the number of values (extraneous values were previously ignored)
+ *
* Revision 1.2 2002/04/08 21:16:56 plehegar
* New
*
@@ -13,14 +23,13 @@
package org.w3c.css.aural;
import org.w3c.css.parser.CssStyle;
-import org.w3c.css.values.CssExpression;
-import org.w3c.css.values.CssValue;
-import org.w3c.css.values.CssIdent;
-import org.w3c.css.values.CssNumber;
-import org.w3c.css.values.CssAngle;
import org.w3c.css.properties.CssProperty;
-import org.w3c.css.util.InvalidParamException;
import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssAngle;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssIdent;
+import org.w3c.css.values.CssValue;
/**
@@ -51,12 +60,18 @@
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
*/
- public ACssElevation(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public ACssElevation(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
this();
+
+ if(check && expression.getCount() > 1) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
+
CssValue val = expression.getValue();
- int index;
+ //int index;
setByUser();
-
+
if (val.equals(inherit)) {
value = inherit;
expression.next();
@@ -84,6 +99,11 @@
getPropertyName(), ac);
}
+ public ACssElevation(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the value of this property
*/
Index: ACssSpeakPunctuation.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/aural/ACssSpeakPunctuation.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ACssSpeakPunctuation.java 8 Apr 2002 21:16:56 -0000 1.2
+++ ACssSpeakPunctuation.java 8 Aug 2005 13:18:03 -0000 1.3
@@ -6,6 +6,16 @@
// Please first read the full copyright statement in file COPYRIGHT.html
/*
* $Log$
+ * Revision 1.3 2005/08/08 13:18:03 ylafon
+ * All those changed made by Jean-Guilhem Rouel:
+ *
+ * Huge patch, imports fixed (automatic)
+ * Bug fixed: 372, 920, 778, 287, 696, 764, 233
+ * Partial bug fix for 289
+ *
+ * Issue with "inherit" in CSS2.
+ * The validator now checks the number of values (extraneous values were previously ignored)
+ *
* Revision 1.2 2002/04/08 21:16:56 plehegar
* New
*
@@ -14,12 +24,12 @@
package org.w3c.css.aural;
import org.w3c.css.parser.CssStyle;
-import org.w3c.css.values.CssExpression;
-import org.w3c.css.values.CssValue;
-import org.w3c.css.values.CssIdent;
import org.w3c.css.properties.CssProperty;
-import org.w3c.css.util.InvalidParamException;
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.CssValue;
/**
* <H3>   'speak-punctuation'</H3>
@@ -58,8 +68,12 @@
* @param expression the expression of the size
* @exception InvalidParamException The expression is incorrect
*/
- public ACssSpeakPunctuation(ApplContext ac, CssExpression expression)
- throws InvalidParamException {
+ public ACssSpeakPunctuation(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
+
+ if(check && expression.getCount() > 1) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
CssValue val = expression.getValue();
@@ -82,6 +96,11 @@
getPropertyName(), ac);
}
+ public ACssSpeakPunctuation(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the current value
*/
Received on Monday, 8 August 2005 13:20:31 UTC