- From: Yves Lafon via cvs-syncmail <cvsmail@w3.org>
- Date: Mon, 08 Aug 2005 13:18:05 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2002/css-validator/org/w3c/css/atsc
In directory hutz:/tmp/cvs-serv27412/org/w3c/css/atsc
Modified Files:
ATSCColor.java ATSCDynamicRefresh.java ATSCNavDown.java
ATSCNavIndex.java ATSCNavLeft.java ATSCNavRight.java
ATSCNavUp.java ATSCStyle.java AscentATSC.java
BaselineATSC.java BboxATSC.java CapHeightATSC.java
CenterlineATSC.java CssBackgroundATSC.java
CssBackgroundAttachmentATSC.java CssBackgroundColorATSC.java
CssBackgroundImageATSC.java CssBackgroundPositionATSC.java
CssBackgroundRepeatATSC.java CssBorderATSC.java
CssBorderBottomATSC.java CssBorderBottomColorATSC.java
CssBorderBottomStyleATSC.java CssBorderBottomWidthATSC.java
CssBorderColorATSC.java CssBorderFaceColorATSC.java
CssBorderFaceStyleATSC.java CssBorderFaceWidthATSC.java
CssBorderLeftATSC.java CssBorderLeftColorATSC.java
CssBorderLeftStyleATSC.java CssBorderLeftWidthATSC.java
CssBorderRightATSC.java CssBorderRightColorATSC.java
CssBorderRightStyleATSC.java CssBorderRightWidthATSC.java
CssBorderStyleATSC.java CssBorderTopATSC.java
CssBorderTopColorATSC.java CssBorderTopStyleATSC.java
CssBorderTopWidthATSC.java CssBorderWidthATSC.java
DefinitionSrcATSC.java DescentATSC.java MathlineATSC.java
Panose1ATSC.java SlopeATSC.java SrcATSC.java StemhATSC.java
StemvATSC.java ToplineATSC.java UnitsPerEmATSC.java
WidthsATSC.java XHeightATSC.java proplistATSC
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: CenterlineATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/atsc/CenterlineATSC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CenterlineATSC.java 24 Jul 2002 14:42:28 -0000 1.1
+++ CenterlineATSC.java 8 Aug 2005 13:18:03 -0000 1.2
@@ -8,14 +8,13 @@
*/
package org.w3c.css.atsc;
-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.values.CssExpression;
-import org.w3c.css.values.CssValue;
import org.w3c.css.values.CssNumber;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
+import org.w3c.css.values.CssValue;
/**
*/
@@ -36,7 +35,8 @@
* @param expression the unicode em
* @exception InvalidParamException values are incorrect
*/
- public CenterlineATSC(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public CenterlineATSC(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
CssValue val = expression.getValue();
setByUser();
@@ -51,6 +51,11 @@
}
}
+ public CenterlineATSC(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the current value
*/
Index: XHeightATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/atsc/XHeightATSC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- XHeightATSC.java 24 Jul 2002 14:42:28 -0000 1.1
+++ XHeightATSC.java 8 Aug 2005 13:18:03 -0000 1.2
@@ -8,14 +8,13 @@
*/
package org.w3c.css.atsc;
-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.values.CssExpression;
-import org.w3c.css.values.CssValue;
import org.w3c.css.values.CssNumber;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
+import org.w3c.css.values.CssValue;
/**
*/
@@ -36,7 +35,13 @@
* @param expression the unicode em
* @exception InvalidParamException values are incorrect
*/
- public XHeightATSC(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public XHeightATSC(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
+
+ if(check && expression.getCount() > 1) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
+
CssValue val = expression.getValue();
setByUser();
@@ -51,6 +56,11 @@
}
}
+ public XHeightATSC(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the current value
*/
@@ -61,7 +71,7 @@
/**
* Returns a string representation of the object.
*/
- public String toString() {
+ public String toString() {
return value.toString();
}
Index: CssBorderLeftATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/atsc/CssBorderLeftATSC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssBorderLeftATSC.java 24 Jul 2002 14:42:28 -0000 1.1
+++ CssBorderLeftATSC.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 2002/07/24 14:42:28 sijtsche
* ATSC TV profile files
*
@@ -33,16 +43,16 @@
*/
package org.w3c.css.atsc;
-import org.w3c.css.parser.CssStyle;
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.CssValue;
import org.w3c.css.values.CssLength;
import org.w3c.css.values.CssOperator;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
-import org.w3c.css.properties.CssProperty;
+import org.w3c.css.values.CssValue;
/**
* <H4>
@@ -94,7 +104,8 @@
* @param expression The expression for this property
* @exception InvalidParamException The expression is incorrect
*/
- public CssBorderLeftATSC(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public CssBorderLeftATSC(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
CssValue val = null;
char op = SPACE;
boolean find = true;
@@ -147,6 +158,11 @@
color = new CssBorderLeftColorATSC();
}
+ public CssBorderLeftATSC(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the value of this property
*/
Index: ATSCNavRight.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/atsc/ATSCNavRight.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ATSCNavRight.java 8 Jan 2003 10:59:18 -0000 1.2
+++ ATSCNavRight.java 8 Aug 2005 13:18:03 -0000 1.3
@@ -9,15 +9,14 @@
package org.w3c.css.atsc;
import org.w3c.css.parser.CssStyle;
-import org.w3c.css.values.CssIdent;
-import org.w3c.css.values.CssValue;
-import org.w3c.css.values.CssExpression;
-import org.w3c.css.values.CssString;
import org.w3c.css.properties.CssProperty;
-import org.w3c.css.util.Util;
-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.CssNumber;
+import org.w3c.css.values.CssString;
+import org.w3c.css.values.CssValue;
/**
* <P>
@@ -45,7 +44,7 @@
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
*/
- public ATSCNavRight (ApplContext ac, CssExpression expression)
+ public ATSCNavRight (ApplContext ac, CssExpression expression, boolean check)
throws InvalidParamException {
this.ac = ac;
@@ -67,6 +66,11 @@
}
}
+ public ATSCNavRight(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Add this property to the CssStyle.
*
Index: ATSCColor.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/atsc/ATSCColor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ATSCColor.java 24 Jul 2002 14:42:28 -0000 1.1
+++ ATSCColor.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 2002/07/24 14:42:28 sijtsche
* ATSC TV profile files
*
@@ -49,12 +59,12 @@
package org.w3c.css.atsc;
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.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
-import org.w3c.css.properties.CssProperty;
+import org.w3c.css.values.CssValue;
/**
* <H4>
@@ -71,10 +81,10 @@
* the <EM>foreground</EM> color). There are different ways to specify red:
* <PRE>
* EM { color: red } /* natural language * /
- * EM { color: rgb(255,0,0) } /* RGB range 0-255 * /
- * </PRE>
- * @version $Revision$
- */
+ * EM { color: rgb(255,0,0) } /* RGB range 0-255 * /
+ * </PRE>
+ * @version $Revision$
+ */
public class ATSCColor extends CssProperty {
CssValue color;
@@ -91,7 +101,8 @@
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
*/
- public ATSCColor(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public ATSCColor(ApplContext ac, CssExpression expression, boolean check)
+ throws InvalidParamException {
CssValue val = expression.getValue();
setByUser();
@@ -110,6 +121,11 @@
}
}
+ public ATSCColor(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the value of this property
*/
Index: ToplineATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/atsc/ToplineATSC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ToplineATSC.java 24 Jul 2002 14:42:28 -0000 1.1
+++ ToplineATSC.java 8 Aug 2005 13:18:03 -0000 1.2
@@ -8,14 +8,13 @@
*/
package org.w3c.css.atsc;
-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.values.CssExpression;
-import org.w3c.css.values.CssValue;
import org.w3c.css.values.CssNumber;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
+import org.w3c.css.values.CssValue;
/**
*/
@@ -36,7 +35,13 @@
* @param expression the unicode em
* @exception InvalidParamException values are incorrect
*/
- public ToplineATSC(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public ToplineATSC(ApplContext ac, CssExpression expression, boolean check)
+ throws InvalidParamException {
+
+ if(check && expression.getCount() > 1) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
+
CssValue val = expression.getValue();
setByUser();
@@ -51,6 +56,11 @@
}
}
+ public ToplineATSC(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the current value
*/
Index: UnitsPerEmATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/atsc/UnitsPerEmATSC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- UnitsPerEmATSC.java 24 Jul 2002 14:42:28 -0000 1.1
+++ UnitsPerEmATSC.java 8 Aug 2005 13:18:03 -0000 1.2
@@ -8,14 +8,13 @@
*/
package org.w3c.css.atsc;
-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.values.CssExpression;
-import org.w3c.css.values.CssValue;
import org.w3c.css.values.CssNumber;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
+import org.w3c.css.values.CssValue;
/**
*/
@@ -36,7 +35,13 @@
* @param expression the unicode em
* @exception InvalidParamException values are incorrect
*/
- public UnitsPerEmATSC(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public UnitsPerEmATSC(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
+
+ if(check && expression.getCount() > 1) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
+
CssValue val = expression.getValue();
setByUser();
@@ -51,6 +56,11 @@
}
}
+ public UnitsPerEmATSC(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the current value
*/
Index: CssBorderColorATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/atsc/CssBorderColorATSC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssBorderColorATSC.java 24 Jul 2002 14:42:28 -0000 1.1
+++ CssBorderColorATSC.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 2002/07/24 14:42:28 sijtsche
* ATSC TV profile files
*
@@ -25,16 +35,16 @@
package org.w3c.css.atsc;
-import org.w3c.css.parser.CssStyle;
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.CssValue;
import org.w3c.css.values.CssIdent;
import org.w3c.css.values.CssOperator;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
-import org.w3c.css.properties.CssProperty;
+import org.w3c.css.values.CssValue;
/**
* <H4>
@@ -93,8 +103,8 @@
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
*/
- public CssBorderColorATSC(ApplContext ac, CssExpression expression)
- throws InvalidParamException {
+ public CssBorderColorATSC(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
setByUser();
@@ -160,6 +170,11 @@
}
}
+ public CssBorderColorATSC(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the value of this property
*/
Index: CssBorderRightColorATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/atsc/CssBorderRightColorATSC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssBorderRightColorATSC.java 24 Jul 2002 14:42:28 -0000 1.1
+++ CssBorderRightColorATSC.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 2002/07/24 14:42:28 sijtsche
* ATSC TV profile files
*
@@ -29,11 +39,11 @@
import org.w3c.css.parser.CssPrinterStyle;
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.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
-import org.w3c.css.properties.CssProperty;
/**
* Be careful, this is not a CSS1 property !
@@ -68,13 +78,18 @@
* @param expression The expression for this property.
* @exception InvalidParamException Values are incorrect
*/
- public CssBorderRightColorATSC(ApplContext ac, CssExpression expression)
- throws InvalidParamException {
+ public CssBorderRightColorATSC(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
setByUser();
face = new CssBorderFaceColorATSC(ac, expression);
}
+ public CssBorderRightColorATSC(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the value of this property
*/
Index: CssBorderLeftWidthATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/atsc/CssBorderLeftWidthATSC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssBorderLeftWidthATSC.java 24 Jul 2002 14:42:28 -0000 1.1
+++ CssBorderLeftWidthATSC.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 2002/07/24 14:42:28 sijtsche
* ATSC TV profile files
*
@@ -25,11 +35,11 @@
package org.w3c.css.atsc;
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.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
-import org.w3c.css.properties.CssProperty;
/**
* <H4>
@@ -90,13 +100,18 @@
* @param expression The expression for this property.
* @exception InvalidParamException Values are incorrect
*/
- public CssBorderLeftWidthATSC(ApplContext ac, CssExpression expression)
- throws InvalidParamException {
+ public CssBorderLeftWidthATSC(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
setByUser();
face = new CssBorderFaceWidthATSC(ac, expression);
}
+ public CssBorderLeftWidthATSC(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the value of this property
*/
Index: SrcATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/atsc/SrcATSC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- SrcATSC.java 24 Jul 2002 14:42:28 -0000 1.1
+++ SrcATSC.java 8 Aug 2005 13:18:03 -0000 1.2
@@ -9,17 +9,17 @@
package org.w3c.css.atsc;
import java.util.Vector;
-import org.w3c.css.properties.CssProperty;
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.CssFunction;
-import org.w3c.css.values.CssURL;
-import org.w3c.css.values.CssString;
+import org.w3c.css.values.CssIdent;
import org.w3c.css.values.CssOperator;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
+import org.w3c.css.values.CssString;
+import org.w3c.css.values.CssURL;
+import org.w3c.css.values.CssValue;
/**
* @version $Revision$
@@ -41,7 +41,7 @@
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
*/
- public SrcATSC(ApplContext ac, CssExpression expression)
+ public SrcATSC(ApplContext ac, CssExpression expression, boolean check)
throws InvalidParamException {
CssValue val;
char op;
@@ -77,6 +77,11 @@
} while (op == COMMA);
}
+ public SrcATSC(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the value of this property
*/
Index: ATSCStyle.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/atsc/ATSCStyle.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ATSCStyle.java 8 Jan 2003 10:59:44 -0000 1.2
+++ ATSCStyle.java 8 Aug 2005 13:18:03 -0000 1.3
@@ -8,9 +8,6 @@
package org.w3c.css.atsc;
-import java.util.Enumeration;
-
-import org.w3c.css.util.Warnings;
import org.w3c.css.parser.CssPrinterStyle;
/**
Index: CssBackgroundRepeatATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/atsc/CssBackgroundRepeatATSC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssBackgroundRepeatATSC.java 24 Jul 2002 14:42:28 -0000 1.1
+++ CssBackgroundRepeatATSC.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 2002/07/24 14:42:28 sijtsche
* ATSC TV profile files
*
@@ -34,13 +44,13 @@
package org.w3c.css.atsc;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.CssBackgroundConstants;
+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.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
-import org.w3c.css.properties.CssProperty;
-import org.w3c.css.properties.CssBackgroundConstants;
+import org.w3c.css.values.CssValue;
/**
* <H4>
@@ -88,8 +98,8 @@
* @param expression The expression for this property
* @exception InvalidParamException The expression is incorrect
*/
- public CssBackgroundRepeatATSC(ApplContext ac, CssExpression expression)
- throws InvalidParamException {
+ public CssBackgroundRepeatATSC(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
CssValue val = expression.getValue();
setByUser();
@@ -109,6 +119,11 @@
getPropertyName(), ac);
}
+ public CssBackgroundRepeatATSC(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the value of this property
*/
Index: WidthsATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/atsc/WidthsATSC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- WidthsATSC.java 24 Jul 2002 14:42:28 -0000 1.1
+++ WidthsATSC.java 8 Aug 2005 13:18:03 -0000 1.2
@@ -9,15 +9,16 @@
package org.w3c.css.atsc;
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.values.CssExpression;
+import org.w3c.css.values.CssNumber;
import org.w3c.css.values.CssOperator;
-import org.w3c.css.values.CssValue;
import org.w3c.css.values.CssUnicodeRange;
-import org.w3c.css.values.CssNumber;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
+import org.w3c.css.values.CssValue;
/**
*/
@@ -38,10 +39,11 @@
* @param expression the unicode em
* @exception InvalidParamException values are incorrect
*/
- public WidthsATSC(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public WidthsATSC(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
CssValue val;
char op;
- int i = 0;
+ //int i = 0;
setByUser();
{
val = expression.getValue();
@@ -82,6 +84,11 @@
}
+ public WidthsATSC(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the current value
*/
Index: ATSCNavUp.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/atsc/ATSCNavUp.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ATSCNavUp.java 8 Jan 2003 10:58:09 -0000 1.2
+++ ATSCNavUp.java 8 Aug 2005 13:18:03 -0000 1.3
@@ -9,15 +9,14 @@
package org.w3c.css.atsc;
import org.w3c.css.parser.CssStyle;
-import org.w3c.css.values.CssIdent;
-import org.w3c.css.values.CssValue;
-import org.w3c.css.values.CssExpression;
-import org.w3c.css.values.CssString;
import org.w3c.css.properties.CssProperty;
-import org.w3c.css.util.Util;
-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.CssNumber;
+import org.w3c.css.values.CssString;
+import org.w3c.css.values.CssValue;
/**
* <P>
@@ -45,7 +44,7 @@
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
*/
- public ATSCNavUp (ApplContext ac, CssExpression expression)
+ public ATSCNavUp (ApplContext ac, CssExpression expression, boolean check)
throws InvalidParamException {
this.ac = ac;
@@ -67,6 +66,11 @@
}
}
+ public ATSCNavUp(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Add this property to the CssStyle.
*
Index: CssBackgroundPositionATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/atsc/CssBackgroundPositionATSC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssBackgroundPositionATSC.java 24 Jul 2002 14:42:28 -0000 1.1
+++ CssBackgroundPositionATSC.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 2002/07/24 14:42:28 sijtsche
* ATSC TV profile files
*
@@ -46,17 +56,18 @@
package org.w3c.css.atsc;
import org.w3c.css.parser.CssStyle;
-import org.w3c.css.values.CssExpression;
+import org.w3c.css.properties.CssBackgroundAttachment;
+import org.w3c.css.properties.CssBackgroundConstants;
import org.w3c.css.properties.CssProperty;
-import org.w3c.css.values.CssValue;
+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.CssPercentage;
import org.w3c.css.values.CssLength;
import org.w3c.css.values.CssNumber;
import org.w3c.css.values.CssOperator;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
-import org.w3c.css.properties.CssBackgroundConstants;
+import org.w3c.css.values.CssPercentage;
+import org.w3c.css.values.CssValue;
/**
@@ -155,8 +166,8 @@
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
*/
- public CssBackgroundPositionATSC(ApplContext ac, CssExpression expression)
- throws InvalidParamException {
+ public CssBackgroundPositionATSC(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
setByUser();
CssValue val = expression.getValue();
char op = expression.getOperator();
@@ -217,6 +228,11 @@
}
+ public CssBackgroundPositionATSC(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the value of this property
*/
Index: CssBackgroundImageATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/atsc/CssBackgroundImageATSC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssBackgroundImageATSC.java 24 Jul 2002 14:42:28 -0000 1.1
+++ CssBackgroundImageATSC.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 2002/07/24 14:42:28 sijtsche
* ATSC TV profile files
*
@@ -41,13 +51,13 @@
package org.w3c.css.atsc;
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.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
-import org.w3c.css.properties.CssProperty;
+import org.w3c.css.values.CssValue;
/**
* <H4>
@@ -87,8 +97,8 @@
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
*/
- public CssBackgroundImageATSC(ApplContext ac, CssExpression expression)
- throws InvalidParamException {
+ public CssBackgroundImageATSC(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
setByUser();
@@ -108,6 +118,11 @@
}
}
+ public CssBackgroundImageATSC(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the value of this property
*/
Index: StemvATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/atsc/StemvATSC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- StemvATSC.java 24 Jul 2002 14:42:28 -0000 1.1
+++ StemvATSC.java 8 Aug 2005 13:18:03 -0000 1.2
@@ -8,14 +8,13 @@
*/
package org.w3c.css.atsc;
-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.values.CssExpression;
-import org.w3c.css.values.CssValue;
import org.w3c.css.values.CssNumber;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
+import org.w3c.css.values.CssValue;
/**
*/
@@ -36,7 +35,13 @@
* @param expression the unicode em
* @exception InvalidParamException values are incorrect
*/
- public StemvATSC(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public StemvATSC(ApplContext ac, CssExpression expression, boolean check)
+ throws InvalidParamException {
+
+ if(check && expression.getCount() > 1) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
+
CssValue val = expression.getValue();
setByUser();
@@ -51,6 +56,11 @@
}
}
+ public StemvATSC(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the current value
*/
Index: CssBorderLeftStyleATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/atsc/CssBorderLeftStyleATSC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssBorderLeftStyleATSC.java 24 Jul 2002 14:42:28 -0000 1.1
+++ CssBorderLeftStyleATSC.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 2002/07/24 14:42:28 sijtsche
* ATSC TV profile files
*
@@ -25,11 +35,10 @@
package org.w3c.css.atsc;
import org.w3c.css.parser.CssStyle;
-import org.w3c.css.values.CssExpression;
-import org.w3c.css.values.CssValue;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
import org.w3c.css.properties.CssProperty;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
/**
* Be careful, this is not a CSS1 property !
@@ -63,13 +72,18 @@
* @param expression The expression for this property.
* @exception InvalidParamException Values are incorrect
*/
- public CssBorderLeftStyleATSC(ApplContext ac, CssExpression expression)
- throws InvalidParamException {
+ public CssBorderLeftStyleATSC(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
setByUser();
face = new CssBorderFaceStyleATSC(ac, expression);
}
+ public CssBorderLeftStyleATSC(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the value of this property
*/
Index: CssBorderTopWidthATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/atsc/CssBorderTopWidthATSC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssBorderTopWidthATSC.java 24 Jul 2002 14:42:28 -0000 1.1
+++ CssBorderTopWidthATSC.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 2002/07/24 14:42:28 sijtsche
* ATSC TV profile files
*
@@ -25,11 +35,11 @@
package org.w3c.css.atsc;
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.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
-import org.w3c.css.properties.CssProperty;
/**
* <H4>
@@ -90,13 +100,18 @@
* @param expression The expression for this property.
* @exception InvalidParamException Values are incorrect
*/
- public CssBorderTopWidthATSC(ApplContext ac, CssExpression expression)
- throws InvalidParamException {
+ public CssBorderTopWidthATSC(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
setByUser();
face = new CssBorderFaceWidthATSC(ac, expression);
}
+ public CssBorderTopWidthATSC(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the value of this property
*/
Index: CssBorderStyleATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/atsc/CssBorderStyleATSC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssBorderStyleATSC.java 24 Jul 2002 14:42:28 -0000 1.1
+++ CssBorderStyleATSC.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 2002/07/24 14:42:28 sijtsche
* ATSC TV profile files
*
@@ -26,13 +36,13 @@
package org.w3c.css.atsc;
import org.w3c.css.parser.CssPrinterStyle;
-import org.w3c.css.parser.CssStyle;
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.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
-import org.w3c.css.properties.CssProperty;
/**
* <H4>
@@ -131,7 +141,8 @@
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
*/
- public CssBorderStyleATSC(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public CssBorderStyleATSC(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
setByUser();
@@ -187,6 +198,11 @@
}
}
+ public CssBorderStyleATSC(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the value of this property
*/
Index: CssBorderFaceWidthATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/atsc/CssBorderFaceWidthATSC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssBorderFaceWidthATSC.java 24 Jul 2002 14:42:28 -0000 1.1
+++ CssBorderFaceWidthATSC.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 2002/07/24 14:42:28 sijtsche
* ATSC TV profile files
*
@@ -30,15 +40,14 @@
*/
package org.w3c.css.atsc;
-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.CssLength;
import org.w3c.css.values.CssNumber;
-import org.w3c.css.values.CssIdent;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
-import org.w3c.css.properties.CssProperty;
+import org.w3c.css.values.CssValue;
/**
* @version $Revision$
@@ -69,8 +78,8 @@
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
*/
- public CssBorderFaceWidthATSC(ApplContext ac, CssExpression expression)
- throws InvalidParamException {
+ public CssBorderFaceWidthATSC(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
CssValue val = expression.getValue();
@@ -97,6 +106,11 @@
expression.next();
}
+ public CssBorderFaceWidthATSC(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the internal value
*/
Index: Panose1ATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/atsc/Panose1ATSC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Panose1ATSC.java 24 Jul 2002 14:42:28 -0000 1.1
+++ Panose1ATSC.java 8 Aug 2005 13:18:03 -0000 1.2
@@ -8,15 +8,14 @@
*/
package org.w3c.css.atsc;
-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.values.CssExpression;
+import org.w3c.css.values.CssNumber;
import org.w3c.css.values.CssOperator;
import org.w3c.css.values.CssValue;
-import org.w3c.css.values.CssNumber;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
/**
*/
@@ -37,12 +36,13 @@
* @param expression the unicode em
* @exception InvalidParamException values are incorrect
*/
- public Panose1ATSC(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public Panose1ATSC(ApplContext ac, CssExpression expression, boolean check)
+ throws InvalidParamException {
CssValue val;
char op;
int i = 0;
setByUser();
-
+
{
val = expression.getValue();
ac.getFrame().addWarning("atsc", val.toString());
@@ -51,6 +51,7 @@
do {
val = expression.getValue();
op = expression.getOperator();
+
if (val instanceof CssNumber) {
value[i++] = val;
expression.next();
@@ -68,6 +69,11 @@
}
}
+ public Panose1ATSC(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the current value
*/
Index: CapHeightATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/atsc/CapHeightATSC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CapHeightATSC.java 24 Jul 2002 14:42:28 -0000 1.1
+++ CapHeightATSC.java 8 Aug 2005 13:18:03 -0000 1.2
@@ -8,14 +8,13 @@
*/
package org.w3c.css.atsc;
-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.values.CssExpression;
-import org.w3c.css.values.CssValue;
import org.w3c.css.values.CssNumber;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
+import org.w3c.css.values.CssValue;
/**
*/
@@ -36,7 +35,8 @@
* @param expression the unicode em
* @exception InvalidParamException values are incorrect
*/
- public CapHeightATSC(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public CapHeightATSC(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
CssValue val = expression.getValue();
setByUser();
@@ -51,6 +51,11 @@
}
}
+ public CapHeightATSC(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the current value
*/
Index: CssBorderTopATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/atsc/CssBorderTopATSC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssBorderTopATSC.java 24 Jul 2002 14:42:28 -0000 1.1
+++ CssBorderTopATSC.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 2002/07/24 14:42:28 sijtsche
* ATSC TV profile files
*
@@ -36,16 +46,16 @@
*/
package org.w3c.css.atsc;
+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.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.CssLength;
import org.w3c.css.values.CssOperator;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
-import org.w3c.css.properties.CssProperty;
+import org.w3c.css.values.CssValue;
/**
* <H4>
@@ -97,7 +107,8 @@
* @param expression The expression for this property
* @exception InvalidParamException The expression is incorrect
*/
- public CssBorderTopATSC(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public CssBorderTopATSC(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
CssValue val = null;
char op = SPACE;
boolean find = true;
@@ -154,6 +165,11 @@
}
}
+ public CssBorderTopATSC(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the value of this property
*/
Index: CssBorderTopStyleATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/atsc/CssBorderTopStyleATSC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssBorderTopStyleATSC.java 24 Jul 2002 14:42:28 -0000 1.1
+++ CssBorderTopStyleATSC.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 2002/07/24 14:42:28 sijtsche
* ATSC TV profile files
*
@@ -25,10 +35,10 @@
package org.w3c.css.atsc;
import org.w3c.css.parser.CssStyle;
-import org.w3c.css.values.CssExpression;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
import org.w3c.css.properties.CssProperty;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
/**
* Be careful, this is not a CSS1 property !
@@ -62,13 +72,18 @@
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
*/
- public CssBorderTopStyleATSC(ApplContext ac, CssExpression expression)
- throws InvalidParamException {
+ public CssBorderTopStyleATSC(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
setByUser();
face = new CssBorderFaceStyleATSC(ac, expression);
}
+ public CssBorderTopStyleATSC(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the value of this property
*/
Index: CssBackgroundAttachmentATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/atsc/CssBackgroundAttachmentATSC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssBackgroundAttachmentATSC.java 24 Jul 2002 14:42:28 -0000 1.1
+++ CssBackgroundAttachmentATSC.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 2002/07/24 14:42:28 sijtsche
* ATSC TV profile files
*
@@ -33,17 +43,14 @@
*/
package org.w3c.css.atsc;
-import org.w3c.css.values.CssIdent;
-import java.util.Vector;
import org.w3c.css.parser.CssStyle;
-import org.w3c.css.properties.CssProperty;
import org.w3c.css.properties.CssBackgroundConstants;
+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.CssIdent;
import org.w3c.css.values.CssValue;
-import org.w3c.css.values.CssNumber;
-
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
/**
* <H4>
@@ -88,8 +95,8 @@
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
*/
- public CssBackgroundAttachmentATSC(ApplContext ac, CssExpression expression)
- throws InvalidParamException {
+ public CssBackgroundAttachmentATSC(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
setByUser();
CssValue val = expression.getValue();
@@ -108,6 +115,11 @@
getPropertyName(), ac);
}
+ public CssBackgroundAttachmentATSC(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the value of this property
*/
Index: MathlineATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/atsc/MathlineATSC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- MathlineATSC.java 24 Jul 2002 14:42:28 -0000 1.1
+++ MathlineATSC.java 8 Aug 2005 13:18:03 -0000 1.2
@@ -8,14 +8,13 @@
*/
package org.w3c.css.atsc;
-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.values.CssExpression;
-import org.w3c.css.values.CssValue;
import org.w3c.css.values.CssNumber;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
+import org.w3c.css.values.CssValue;
/**
*/
@@ -36,7 +35,9 @@
* @param expression the unicode em
* @exception InvalidParamException values are incorrect
*/
- public MathlineATSC(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public MathlineATSC(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
+
CssValue val = expression.getValue();
setByUser();
@@ -51,6 +52,11 @@
}
}
+ public MathlineATSC(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the current value
*/
Index: CssBorderTopColorATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/atsc/CssBorderTopColorATSC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssBorderTopColorATSC.java 24 Jul 2002 14:42:28 -0000 1.1
+++ CssBorderTopColorATSC.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 2002/07/24 14:42:28 sijtsche
* ATSC TV profile files
*
@@ -24,13 +34,13 @@
*/
package org.w3c.css.atsc;
-import org.w3c.css.parser.CssStyle;
import org.w3c.css.parser.CssPrinterStyle;
+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.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
-import org.w3c.css.properties.CssProperty;
/**
* Be careful, this is not a CSS1 property !
@@ -63,12 +73,17 @@
* @param expression The expression fir this property
* @exception InvalidParamException Values are incorrect
*/
- public CssBorderTopColorATSC(ApplContext ac, CssExpression expression)
- throws InvalidParamException {
+ public CssBorderTopColorATSC(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
setByUser();
face = new CssBorderFaceColorATSC(ac, expression);
}
+ public CssBorderTopColorATSC(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the value of this property
*/
Index: ATSCNavLeft.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/atsc/ATSCNavLeft.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ATSCNavLeft.java 8 Jan 2003 10:58:09 -0000 1.2
+++ ATSCNavLeft.java 8 Aug 2005 13:18:03 -0000 1.3
@@ -9,15 +9,14 @@
package org.w3c.css.atsc;
import org.w3c.css.parser.CssStyle;
-import org.w3c.css.values.CssIdent;
-import org.w3c.css.values.CssValue;
-import org.w3c.css.values.CssString;
-import org.w3c.css.values.CssExpression;
import org.w3c.css.properties.CssProperty;
-import org.w3c.css.util.Util;
-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.CssNumber;
+import org.w3c.css.values.CssString;
+import org.w3c.css.values.CssValue;
/**
* <P>
@@ -45,7 +44,7 @@
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
*/
- public ATSCNavLeft (ApplContext ac, CssExpression expression)
+ public ATSCNavLeft (ApplContext ac, CssExpression expression, boolean check)
throws InvalidParamException {
this.ac = ac;
@@ -67,6 +66,11 @@
}
}
+ public ATSCNavLeft(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Add this property to the CssStyle.
*
Index: CssBorderBottomStyleATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/atsc/CssBorderBottomStyleATSC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssBorderBottomStyleATSC.java 24 Jul 2002 14:42:28 -0000 1.1
+++ CssBorderBottomStyleATSC.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 2002/07/24 14:42:28 sijtsche
* ATSC TV profile files
*
@@ -25,12 +35,10 @@
package org.w3c.css.atsc;
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.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
import org.w3c.css.properties.CssProperty;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
/**
* Be careful, this is not a CSS1 property !
@@ -63,13 +71,18 @@
* @param expression The expression for this property.
* @exception InvalidParamException Values are incorrect
*/
- public CssBorderBottomStyleATSC(ApplContext ac, CssExpression expression)
- throws InvalidParamException {
+ public CssBorderBottomStyleATSC(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
setByUser();
face = new CssBorderFaceStyleATSC(ac, expression);
}
+ public CssBorderBottomStyleATSC(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the value of this property
*/
Index: ATSCNavDown.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/atsc/ATSCNavDown.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ATSCNavDown.java 8 Jan 2003 10:58:09 -0000 1.2
+++ ATSCNavDown.java 8 Aug 2005 13:18:03 -0000 1.3
@@ -9,15 +9,14 @@
package org.w3c.css.atsc;
import org.w3c.css.parser.CssStyle;
-import org.w3c.css.values.CssIdent;
-import org.w3c.css.values.CssString;
-import org.w3c.css.values.CssValue;
-import org.w3c.css.values.CssExpression;
import org.w3c.css.properties.CssProperty;
-import org.w3c.css.util.Util;
-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.CssNumber;
+import org.w3c.css.values.CssString;
+import org.w3c.css.values.CssValue;
/**
* This property is used to effect explicit directional navigation control by
@@ -38,7 +37,7 @@
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
*/
- public ATSCNavDown (ApplContext ac, CssExpression expression)
+ public ATSCNavDown (ApplContext ac, CssExpression expression, boolean check)
throws InvalidParamException {
this.ac = ac;
@@ -61,6 +60,11 @@
}
+ public ATSCNavDown(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Add this property to the CssStyle.
*
Index: DefinitionSrcATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/atsc/DefinitionSrcATSC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- DefinitionSrcATSC.java 24 Jul 2002 14:42:28 -0000 1.1
+++ DefinitionSrcATSC.java 8 Aug 2005 13:18:03 -0000 1.2
@@ -8,14 +8,13 @@
*/
package org.w3c.css.atsc;
-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.values.CssExpression;
-import org.w3c.css.values.CssValue;
import org.w3c.css.values.CssURL;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
+import org.w3c.css.values.CssValue;
/**
*/
@@ -36,7 +35,9 @@
* @param expression the unicode em
* @exception InvalidParamException values are incorrect
*/
- public DefinitionSrcATSC(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public DefinitionSrcATSC(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
+
CssValue val = expression.getValue();
setByUser();
@@ -51,6 +52,11 @@
}
}
+ public DefinitionSrcATSC(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the current value
*/
Index: DescentATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/atsc/DescentATSC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- DescentATSC.java 24 Jul 2002 14:42:28 -0000 1.1
+++ DescentATSC.java 8 Aug 2005 13:18:03 -0000 1.2
@@ -8,14 +8,13 @@
*/
package org.w3c.css.atsc;
-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.values.CssExpression;
-import org.w3c.css.values.CssValue;
import org.w3c.css.values.CssNumber;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
+import org.w3c.css.values.CssValue;
/**
*/
@@ -36,7 +35,9 @@
* @param expression the unicode em
* @exception InvalidParamException values are incorrect
*/
- public DescentATSC(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public DescentATSC(ApplContext ac, CssExpression expression, boolean check)
+ throws InvalidParamException {
+
CssValue val = expression.getValue();
setByUser();
@@ -51,6 +52,11 @@
}
}
+ public DescentATSC(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the current value
*/
Index: SlopeATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/atsc/SlopeATSC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- SlopeATSC.java 24 Jul 2002 14:42:28 -0000 1.1
+++ SlopeATSC.java 8 Aug 2005 13:18:03 -0000 1.2
@@ -8,14 +8,13 @@
*/
package org.w3c.css.atsc;
-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.values.CssExpression;
-import org.w3c.css.values.CssValue;
import org.w3c.css.values.CssNumber;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
+import org.w3c.css.values.CssValue;
/**
*/
@@ -36,7 +35,13 @@
* @param expression the unicode em
* @exception InvalidParamException values are incorrect
*/
- public SlopeATSC(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public SlopeATSC(ApplContext ac, CssExpression expression, boolean check)
+ throws InvalidParamException {
+
+ if(check && expression.getCount() > 1) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
+
CssValue val = expression.getValue();
setByUser();
@@ -51,6 +56,11 @@
}
}
+ public SlopeATSC(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the current value
*/
Index: ATSCDynamicRefresh.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/atsc/ATSCDynamicRefresh.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ATSCDynamicRefresh.java 8 Jan 2003 10:57:10 -0000 1.1
+++ ATSCDynamicRefresh.java 8 Aug 2005 13:18:03 -0000 1.2
@@ -9,14 +9,13 @@
package org.w3c.css.atsc;
import org.w3c.css.parser.CssStyle;
-import org.w3c.css.values.CssIdent;
-import org.w3c.css.values.CssValue;
-import org.w3c.css.values.CssExpression;
import org.w3c.css.properties.CssProperty;
-import org.w3c.css.util.Util;
-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.CssNumber;
+import org.w3c.css.values.CssValue;
public class ATSCDynamicRefresh extends CssProperty {
@@ -37,8 +36,8 @@
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
*/
- public ATSCDynamicRefresh (ApplContext ac, CssExpression expression)
- throws InvalidParamException {
+ public ATSCDynamicRefresh (ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
this.ac = ac;
setByUser(); // tell this property is set by the user
@@ -63,6 +62,11 @@
}
}
+ public ATSCDynamicRefresh(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Add this property to the CssStyle.
*
Index: CssBorderBottomWidthATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/atsc/CssBorderBottomWidthATSC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssBorderBottomWidthATSC.java 24 Jul 2002 14:42:28 -0000 1.1
+++ CssBorderBottomWidthATSC.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 2002/07/24 14:42:28 sijtsche
* ATSC TV profile files
*
@@ -25,11 +35,11 @@
package org.w3c.css.atsc;
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.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
-import org.w3c.css.properties.CssProperty;
/**
* <H4>
@@ -88,13 +98,18 @@
* @param expression The expression for this property.
* @exception InvalidParamException Values are incorrect
*/
- public CssBorderBottomWidthATSC(ApplContext ac, CssExpression expression)
- throws InvalidParamException {
+ public CssBorderBottomWidthATSC(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
setByUser();
face = new CssBorderFaceWidthATSC(ac, expression);
}
+ public CssBorderBottomWidthATSC(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the value of this property
*/
Index: BaselineATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/atsc/BaselineATSC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- BaselineATSC.java 24 Jul 2002 14:42:28 -0000 1.1
+++ BaselineATSC.java 8 Aug 2005 13:18:03 -0000 1.2
@@ -8,14 +8,13 @@
*/
package org.w3c.css.atsc;
-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.values.CssExpression;
-import org.w3c.css.values.CssValue;
import org.w3c.css.values.CssNumber;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
+import org.w3c.css.values.CssValue;
/**
*/
@@ -36,7 +35,8 @@
* @param expression the unicode em
* @exception InvalidParamException values are incorrect
*/
- public BaselineATSC(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public BaselineATSC(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
CssValue val = expression.getValue();
setByUser();
@@ -51,6 +51,11 @@
}
}
+ public BaselineATSC(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the current value
*/
Index: AscentATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/atsc/AscentATSC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- AscentATSC.java 24 Jul 2002 14:42:28 -0000 1.1
+++ AscentATSC.java 8 Aug 2005 13:18:03 -0000 1.2
@@ -8,14 +8,13 @@
*/
package org.w3c.css.atsc;
-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.values.CssExpression;
-import org.w3c.css.values.CssValue;
import org.w3c.css.values.CssNumber;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
+import org.w3c.css.values.CssValue;
/**
*/
@@ -36,7 +35,8 @@
* @param expression the unicode em
* @exception InvalidParamException values are incorrect
*/
- public AscentATSC(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public AscentATSC(ApplContext ac, CssExpression expression, boolean check)
+ throws InvalidParamException {
CssValue val = expression.getValue();
setByUser();
@@ -51,6 +51,11 @@
}
}
+ public AscentATSC(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the current value
*/
Index: CssBorderATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/atsc/CssBorderATSC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssBorderATSC.java 24 Jul 2002 14:42:28 -0000 1.1
+++ CssBorderATSC.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 2002/07/24 14:42:28 sijtsche
* ATSC TV profile files
*
@@ -31,14 +41,14 @@
*/
package org.w3c.css.atsc;
-import org.w3c.css.parser.CssStyle;
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.CssValue;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
-import org.w3c.css.properties.CssProperty;
/**
* @version $Revision$
@@ -66,11 +76,11 @@
* @param value The value for this property
* @exception InvalidParamException The value is incorrect
*/
- public CssBorderATSC(ApplContext ac, CssExpression value) throws InvalidParamException {
+ public CssBorderATSC(ApplContext ac, CssExpression value, boolean check)
+ throws InvalidParamException {
CssValue val = value.getValue();
- setByUser();
-
+ setByUser();
top = new CssBorderTopATSC(ac, value);
@@ -103,7 +113,12 @@
left.color =
new CssBorderLeftColorATSC((CssBorderFaceColorATSC) top.color.get());
bottom.color =
- new CssBorderBottomColorATSC((CssBorderFaceColorATSC) top.color.get());
+ new CssBorderBottomColorATSC((CssBorderFaceColorATSC) top.color.get());
+ }
+
+ public CssBorderATSC(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
}
/**
Index: CssBorderLeftColorATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/atsc/CssBorderLeftColorATSC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssBorderLeftColorATSC.java 24 Jul 2002 14:42:28 -0000 1.1
+++ CssBorderLeftColorATSC.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 2002/07/24 14:42:28 sijtsche
* ATSC TV profile files
*
@@ -24,13 +34,13 @@
*/
package org.w3c.css.atsc;
-import org.w3c.css.parser.CssStyle;
import org.w3c.css.parser.CssPrinterStyle;
+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.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
-import org.w3c.css.properties.CssProperty;
/**
* Be careful, this is not a CSS1 property !
@@ -65,12 +75,18 @@
* @param expression The expression for this property.
* @exception InvalidParamException Values are incorrect
*/
- public CssBorderLeftColorATSC(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public CssBorderLeftColorATSC(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
setByUser();
face = new CssBorderFaceColorATSC(ac, expression);
}
+ public CssBorderLeftColorATSC(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the value of this property
*/
Index: CssBorderFaceStyleATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/atsc/CssBorderFaceStyleATSC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssBorderFaceStyleATSC.java 24 Jul 2002 14:42:28 -0000 1.1
+++ CssBorderFaceStyleATSC.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 2002/07/24 14:42:28 sijtsche
* ATSC TV profile files
*
@@ -30,13 +40,11 @@
*/
package org.w3c.css.atsc;
-import org.w3c.css.parser.CssStyle;
+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.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
-import org.w3c.css.properties.CssProperty;
+import org.w3c.css.values.CssValue;
/**
* @version $Revision$
@@ -73,8 +81,8 @@
* @param expression The expression for this face
* @exception InvalidParamException The expression is incorrect
*/
- public CssBorderFaceStyleATSC(ApplContext ac, CssExpression expression)
- throws InvalidParamException {
+ public CssBorderFaceStyleATSC(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
CssValue val = expression.getValue();
@@ -91,6 +99,11 @@
throw new InvalidParamException("value", val.toString(), "style", ac);
}
+ public CssBorderFaceStyleATSC(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
Index: CssBorderRightWidthATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/atsc/CssBorderRightWidthATSC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssBorderRightWidthATSC.java 24 Jul 2002 14:42:28 -0000 1.1
+++ CssBorderRightWidthATSC.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 2002/07/24 14:42:28 sijtsche
* ATSC TV profile files
*
@@ -25,11 +35,11 @@
package org.w3c.css.atsc;
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.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
-import org.w3c.css.properties.CssProperty;
/**
* <H4>
@@ -90,7 +100,8 @@
* @param expression The expression for this property.
* @exception InvalidParamException Values are incorrect
*/
- public CssBorderRightWidthATSC(ApplContext ac, CssExpression expression)
+ public CssBorderRightWidthATSC(ApplContext ac, CssExpression expression,
+ boolean check)
throws InvalidParamException {
setByUser();
@@ -98,6 +109,11 @@
face = new CssBorderFaceWidthATSC(ac, expression);
}
+ public CssBorderRightWidthATSC(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the value of this property
*/
Index: CssBorderRightStyleATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/atsc/CssBorderRightStyleATSC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssBorderRightStyleATSC.java 24 Jul 2002 14:42:28 -0000 1.1
+++ CssBorderRightStyleATSC.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 2002/07/24 14:42:28 sijtsche
* ATSC TV profile files
*
@@ -25,10 +35,10 @@
package org.w3c.css.atsc;
import org.w3c.css.parser.CssStyle;
-import org.w3c.css.values.CssExpression;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
import org.w3c.css.properties.CssProperty;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
/**
* Be careful, this is not a CSS1 property !
@@ -64,14 +74,19 @@
* @param expression The expression for this property.
* @exception InvalidParamException Values are incorrect
*/
- public CssBorderRightStyleATSC(ApplContext ac, CssExpression expression)
- throws InvalidParamException {
+ public CssBorderRightStyleATSC(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
setByUser();
face = new CssBorderFaceStyleATSC(ac, expression);
}
+ public CssBorderRightStyleATSC(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the value of this property
*/
Index: CssBorderBottomColorATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/atsc/CssBorderBottomColorATSC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssBorderBottomColorATSC.java 24 Jul 2002 14:42:28 -0000 1.1
+++ CssBorderBottomColorATSC.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 2002/07/24 14:42:28 sijtsche
* ATSC TV profile files
*
@@ -24,13 +34,13 @@
*/
package org.w3c.css.atsc;
-import org.w3c.css.parser.CssStyle;
import org.w3c.css.parser.CssPrinterStyle;
+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.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
-import org.w3c.css.properties.CssProperty;
/**
* Be careful, this is not a CSS1 property !
@@ -65,14 +75,19 @@
* @param expression The expression for this property.
* @exception InvalidParamException Values are incorrect
*/
- public CssBorderBottomColorATSC(ApplContext ac, CssExpression expression)
- throws InvalidParamException {
+ public CssBorderBottomColorATSC(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
setByUser();
face = new CssBorderFaceColorATSC(ac, expression);
}
+ public CssBorderBottomColorATSC(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the value of this property
*/
Index: CssBorderRightATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/atsc/CssBorderRightATSC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssBorderRightATSC.java 24 Jul 2002 14:42:28 -0000 1.1
+++ CssBorderRightATSC.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 2002/07/24 14:42:28 sijtsche
* ATSC TV profile files
*
@@ -34,15 +44,15 @@
package org.w3c.css.atsc;
import org.w3c.css.parser.CssPrinterStyle;
-import org.w3c.css.parser.CssStyle;
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.CssValue;
import org.w3c.css.values.CssLength;
import org.w3c.css.values.CssOperator;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
-import org.w3c.css.properties.CssProperty;
+import org.w3c.css.values.CssValue;
/**
* <H4>
@@ -94,7 +104,8 @@
* @param expression The expression for this property
* @exception InvalidParamException The expression is incorrect
*/
- public CssBorderRightATSC(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public CssBorderRightATSC(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
CssValue val = null;
char op = SPACE;
boolean find = true;
@@ -146,6 +157,11 @@
color = new CssBorderRightColorATSC();
}
+ public CssBorderRightATSC(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the value of this property
*/
Index: ATSCNavIndex.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/atsc/ATSCNavIndex.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ATSCNavIndex.java 8 Jan 2003 10:59:18 -0000 1.2
+++ ATSCNavIndex.java 8 Aug 2005 13:18:03 -0000 1.3
@@ -9,14 +9,13 @@
package org.w3c.css.atsc;
import org.w3c.css.parser.CssStyle;
-import org.w3c.css.values.CssIdent;
-import org.w3c.css.values.CssValue;
-import org.w3c.css.values.CssExpression;
import org.w3c.css.properties.CssProperty;
-import org.w3c.css.util.Util;
-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.CssNumber;
+import org.w3c.css.values.CssValue;
/**
* <P>
@@ -48,7 +47,7 @@
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
*/
- public ATSCNavIndex (ApplContext ac, CssExpression expression)
+ public ATSCNavIndex (ApplContext ac, CssExpression expression, boolean check)
throws InvalidParamException {
this.ac = ac;
@@ -74,6 +73,11 @@
}
}
+ public ATSCNavIndex(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Add this property to the CssStyle.
*
Index: CssBackgroundColorATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/atsc/CssBackgroundColorATSC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssBackgroundColorATSC.java 24 Jul 2002 14:42:28 -0000 1.1
+++ CssBackgroundColorATSC.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 2002/07/24 14:42:28 sijtsche
* ATSC TV profile files
*
@@ -41,13 +51,12 @@
package org.w3c.css.atsc;
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.ATSCColor;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
-import org.w3c.css.properties.CssProperty;
+import org.w3c.css.values.CssValue;
/**
* <H4>
@@ -85,8 +94,8 @@
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
*/
- public CssBackgroundColorATSC(ApplContext ac, CssExpression expression)
- throws InvalidParamException {
+ public CssBackgroundColorATSC(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
setByUser();
CssValue val = expression.getValue();
@@ -110,6 +119,11 @@
}
}
+ public CssBackgroundColorATSC(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the value of this property
*/
Index: CssBackgroundATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/atsc/CssBackgroundATSC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssBackgroundATSC.java 24 Jul 2002 14:42:28 -0000 1.1
+++ CssBackgroundATSC.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 2002/07/24 14:42:28 sijtsche
* ATSC TV profile files
*
@@ -39,17 +49,21 @@
*/
package org.w3c.css.atsc;
-import org.w3c.css.parser.CssStyle;
import org.w3c.css.parser.CssPrinterStyle;
import org.w3c.css.parser.CssSelectors;
-import org.w3c.css.values.CssOperator;
+import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.CssBackgroundAttachment;
+import org.w3c.css.properties.CssBackgroundColor;
+import org.w3c.css.properties.CssBackgroundConstants;
+import org.w3c.css.properties.CssBackgroundImage;
+import org.w3c.css.properties.CssBackgroundPosition;
+import org.w3c.css.properties.CssBackgroundRepeat;
+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.values.CssIdent;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
-import org.w3c.css.properties.CssProperty;
-import org.w3c.css.properties.CssBackgroundConstants;
/**
* <H4>
@@ -111,8 +125,8 @@
* @param expression The expression for this property
* @exception InvalidParamException The expression is incorrect
*/
- public CssBackgroundATSC(ApplContext ac, CssExpression expression)
- throws InvalidParamException {
+ public CssBackgroundATSC(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
CssValue val = expression.getValue();
char op = SPACE;
boolean find = true;
@@ -198,6 +212,11 @@
position = new CssBackgroundPositionATSC();
}
+ public CssBackgroundATSC(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the value of this property
*/
Index: CssBorderWidthATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/atsc/CssBorderWidthATSC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssBorderWidthATSC.java 24 Jul 2002 14:42:28 -0000 1.1
+++ CssBorderWidthATSC.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 2002/07/24 14:42:28 sijtsche
* ATSC TV profile files
*
@@ -36,15 +46,14 @@
*/
package org.w3c.css.atsc;
-import org.w3c.css.parser.CssStyle;
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.CssValue;
import org.w3c.css.values.CssOperator;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
-import org.w3c.css.properties.CssProperty;
/**
* <H4>
@@ -113,7 +122,8 @@
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
*/
- public CssBorderWidthATSC(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public CssBorderWidthATSC(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
setByUser();
switch (expression.getCount()) {
@@ -168,6 +178,11 @@
}
}
+ public CssBorderWidthATSC(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the value of this property
*/
Index: StemhATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/atsc/StemhATSC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- StemhATSC.java 24 Jul 2002 14:42:28 -0000 1.1
+++ StemhATSC.java 8 Aug 2005 13:18:03 -0000 1.2
@@ -8,14 +8,13 @@
*/
package org.w3c.css.atsc;
-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.values.CssExpression;
-import org.w3c.css.values.CssValue;
import org.w3c.css.values.CssNumber;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
+import org.w3c.css.values.CssValue;
/**
*/
@@ -36,7 +35,13 @@
* @param expression the unicode em
* @exception InvalidParamException values are incorrect
*/
- public StemhATSC(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public StemhATSC(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
+
+ if(check && expression.getCount() > 1) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
+
CssValue val = expression.getValue();
setByUser();
@@ -51,6 +56,11 @@
}
}
+ public StemhATSC(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the current value
*/
Index: proplistATSC
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/atsc/proplistATSC,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- proplistATSC 8 Jan 2003 10:55:41 -0000 1.3
+++ proplistATSC 8 Aug 2005 13:18:03 -0000 1.4
@@ -114,26 +114,26 @@
padding-left: org.w3c.css.properties.CssPaddingLeft
padding-right: org.w3c.css.properties.CssPaddingRight
padding: org.w3c.css.properties.CssPadding
-border-top-width: org.w3c.css.properties.CssBorderTopWidthATSC
-border-right-width: org.w3c.css.properties.CssBorderRightWidthATSC
-border-left-width: org.w3c.css.properties.CssBorderLeftWidthATSC
-border-bottom-width: org.w3c.css.properties.CssBorderBottomWidthATSC
-border-top-color: org.w3c.css.properties.CssBorderTopColorATSC
-border-right-color: org.w3c.css.properties.CssBorderRightColorATSC
-border-left-color: org.w3c.css.properties.CssBorderLeftColorATSC
-border-bottom-color: org.w3c.css.properties.CssBorderBottomColorATSC
-border-top-style: org.w3c.css.properties.CssBorderTopStyleATSC
-border-right-style: org.w3c.css.properties.CssBorderRightStyleATSC
-border-left-style: org.w3c.css.properties.CssBorderLeftStyleATSC
-border-bottom-style: org.w3c.css.properties.CssBorderBottomStyleATSC
-border-width: org.w3c.css.properties.CssBorderWidthATSC
-border-color: org.w3c.css.properties.CssBorderColorATSC
-border-style: org.w3c.css.properties.CssBorderStyleATSC
-border-top: org.w3c.css.properties.CssBorderTopATSC
-border-right: org.w3c.css.properties.CssBorderRightATSC
-border-left: org.w3c.css.properties.CssBorderLeftATSC
-border-bottom: org.w3c.css.properties.CssBorderBottomATSC
-border: org.w3c.css.properties.CssBorderATSC
+border-top-width: org.w3c.css.atsc.CssBorderTopWidthATSC
+border-right-width: org.w3c.css.atsc.CssBorderRightWidthATSC
+border-left-width: org.w3c.css.atsc.CssBorderLeftWidthATSC
+border-bottom-width: org.w3c.css.atsc.CssBorderBottomWidthATSC
+border-top-color: org.w3c.css.atsc.CssBorderTopColorATSC
+border-right-color: org.w3c.css.atsc.CssBorderRightColorATSC
+border-left-color: org.w3c.css.atsc.CssBorderLeftColorATSC
+border-bottom-color: org.w3c.css.atsc.CssBorderBottomColorATSC
+border-top-style: org.w3c.css.atsc.CssBorderTopStyleATSC
+border-right-style: org.w3c.css.atsc.CssBorderRightStyleATSC
+border-left-style: org.w3c.css.atsc.CssBorderLeftStyleATSC
+border-bottom-style: org.w3c.css.atsc.CssBorderBottomStyleATSC
+border-width: org.w3c.css.atsc.CssBorderWidthATSC
+border-color: org.w3c.css.atsc.CssBorderColorATSC
+border-style: org.w3c.css.atsc.CssBorderStyleATSC
+border-top: org.w3c.css.atsc.CssBorderTopATSC
+border-right: org.w3c.css.atsc.CssBorderRightATSC
+border-left: org.w3c.css.atsc.CssBorderLeftATSC
+border-bottom: org.w3c.css.atsc.CssBorderBottomATSC
+border: org.w3c.css.atsc.CssBorderATSC
width: org.w3c.css.properties.CssWidth
height: org.w3c.css.properties.CssHeight
float: org.w3c.css.properties.CssFloat
Index: CssBorderBottomATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/atsc/CssBorderBottomATSC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssBorderBottomATSC.java 24 Jul 2002 14:42:28 -0000 1.1
+++ CssBorderBottomATSC.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 2002/07/24 14:42:28 sijtsche
* ATSC TV profile files
*
@@ -33,16 +43,16 @@
*/
package org.w3c.css.atsc;
-import org.w3c.css.parser.CssStyle;
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.CssValue;
import org.w3c.css.values.CssLength;
import org.w3c.css.values.CssOperator;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
-import org.w3c.css.properties.CssProperty;
+import org.w3c.css.values.CssValue;
/**
* <H4>
@@ -93,8 +103,8 @@
* @param expression The expression for this property
* @exception InvalidParamException The expression is incorrect
*/
- public CssBorderBottomATSC(ApplContext ac, CssExpression expression)
- throws InvalidParamException {
+ public CssBorderBottomATSC(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
CssValue val = null;
char op = SPACE;
@@ -148,6 +158,11 @@
color = new CssBorderBottomColorATSC();
}
+ public CssBorderBottomATSC(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the value of this property
*/
Index: BboxATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/atsc/BboxATSC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- BboxATSC.java 24 Jul 2002 14:42:28 -0000 1.1
+++ BboxATSC.java 8 Aug 2005 13:18:03 -0000 1.2
@@ -8,15 +8,14 @@
*/
package org.w3c.css.atsc;
-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.values.CssExpression;
+import org.w3c.css.values.CssNumber;
import org.w3c.css.values.CssOperator;
import org.w3c.css.values.CssValue;
-import org.w3c.css.values.CssNumber;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
/**
*/
@@ -37,7 +36,8 @@
* @param expression the unicode em
* @exception InvalidParamException values are incorrect
*/
- public BboxATSC(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public BboxATSC(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
CssValue val;
char op;
int i = 0;
@@ -101,6 +101,11 @@
}
}
+ public BboxATSC(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the current value
*/
Index: CssBorderFaceColorATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/atsc/CssBorderFaceColorATSC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssBorderFaceColorATSC.java 24 Jul 2002 14:42:28 -0000 1.1
+++ CssBorderFaceColorATSC.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 2002/07/24 14:42:28 sijtsche
* ATSC TV profile files
*
@@ -21,13 +31,12 @@
*/
package org.w3c.css.atsc;
-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.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
-import org.w3c.css.properties.CssProperty;
+import org.w3c.css.values.CssValue;
/**
* @version $Revision$
@@ -67,7 +76,8 @@
* @param expression The expression for this property.
* @exception InvalidParamException color is not a color
*/
- public CssBorderFaceColorATSC(ApplContext ac, CssExpression expression)
+ public CssBorderFaceColorATSC(ApplContext ac, CssExpression expression,
+ boolean check)
throws InvalidParamException {
CssValue val = expression.getValue();
@@ -85,6 +95,11 @@
expression.next();
}
+ public CssBorderFaceColorATSC(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the internal color
*/
Received on Monday, 8 August 2005 13:20:37 UTC