- From: Yves Lafon via cvs-syncmail <cvsmail@w3.org>
- Date: Mon, 08 Aug 2005 13:18:06 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2002/css-validator/org/w3c/css/font
In directory hutz:/tmp/cvs-serv27412/org/w3c/css/font
Modified Files:
Ascent.java Baseline.java Bbox.java CapHeight.java
Centerline.java Css2Style.java DefinitionSrc.java Descent.java
FontFamily.java FontSize.java FontStretch.java FontStyle.java
FontVariant.java FontWeight.java Mathline.java Panose1.java
Slope.java Src.java Stemh.java Stemv.java Topline.java
UnicodeRange.java UnitsPerEm.java Widths.java XHeight.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: FontFamily.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/font/FontFamily.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- FontFamily.java 8 Apr 2002 21:17:08 -0000 1.2
+++ FontFamily.java 8 Aug 2005 13:18:04 -0000 1.3
@@ -9,18 +9,19 @@
package org.w3c.css.font;
-import java.util.Vector;
import java.util.Enumeration;
-import org.w3c.css.util.Util;
-import org.w3c.css.properties.CssProperty;
-import org.w3c.css.values.CssOperator;
+import java.util.Vector;
+
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.CssProperty;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.util.Util;
import org.w3c.css.values.CssExpression;
-import org.w3c.css.values.CssValue;
import org.w3c.css.values.CssIdent;
+import org.w3c.css.values.CssOperator;
import org.w3c.css.values.CssString;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
+import org.w3c.css.values.CssValue;
/**
*/
@@ -40,7 +41,7 @@
* @param expression the font name
* @exception InvalidParamException The expression is incorrect
*/
- public FontFamily(ApplContext ac, CssExpression expression)
+ public FontFamily(ApplContext ac, CssExpression expression, boolean check)
throws InvalidParamException {
boolean family = true;
CssValue val = expression.getValue();
@@ -99,6 +100,11 @@
}
+ public FontFamily(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns all fonts name
*/
Index: Topline.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/font/Topline.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Topline.java 8 Apr 2002 21:17:08 -0000 1.2
+++ Topline.java 8 Aug 2005 13:18:04 -0000 1.3
@@ -8,14 +8,13 @@
*/
package org.w3c.css.font;
-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 Topline(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public Topline(ApplContext ac, CssExpression expression, boolean check)
+ throws InvalidParamException {
CssValue val = expression.getValue();
setByUser();
@@ -49,6 +49,11 @@
}
}
+ public Topline(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the current value
*/
Index: UnitsPerEm.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/font/UnitsPerEm.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- UnitsPerEm.java 8 Apr 2002 21:17:08 -0000 1.2
+++ UnitsPerEm.java 8 Aug 2005 13:18:04 -0000 1.3
@@ -8,14 +8,13 @@
*/
package org.w3c.css.font;
-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 UnitsPerEm(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public UnitsPerEm(ApplContext ac, CssExpression expression, boolean check)
+ throws InvalidParamException {
CssValue val = expression.getValue();
setByUser();
@@ -49,6 +49,11 @@
}
}
+ public UnitsPerEm(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the current value
*/
Index: Baseline.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/font/Baseline.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Baseline.java 8 Apr 2002 21:17:08 -0000 1.2
+++ Baseline.java 8 Aug 2005 13:18:04 -0000 1.3
@@ -8,14 +8,13 @@
*/
package org.w3c.css.font;
-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 Baseline(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public Baseline(ApplContext ac, CssExpression expression, boolean check)
+ throws InvalidParamException {
CssValue val = expression.getValue();
setByUser();
@@ -49,6 +49,11 @@
}
}
+ public Baseline(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the current value
*/
Index: CapHeight.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/font/CapHeight.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CapHeight.java 8 Apr 2002 21:17:08 -0000 1.2
+++ CapHeight.java 8 Aug 2005 13:18:04 -0000 1.3
@@ -8,14 +8,13 @@
*/
package org.w3c.css.font;
-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 CapHeight(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public CapHeight(ApplContext ac, CssExpression expression, boolean check)
+ throws InvalidParamException {
CssValue val = expression.getValue();
setByUser();
@@ -49,6 +49,11 @@
}
}
+ public CapHeight(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the current value
*/
Index: Bbox.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/font/Bbox.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Bbox.java 8 Apr 2002 21:17:08 -0000 1.2
+++ Bbox.java 8 Aug 2005 13:18:04 -0000 1.3
@@ -8,15 +8,14 @@
*/
package org.w3c.css.font;
-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 Bbox(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public Bbox(ApplContext ac, CssExpression expression, boolean check)
+ throws InvalidParamException {
CssValue val;
char op;
int i = 0;
@@ -96,6 +96,11 @@
}
}
+ public Bbox(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the current value
*/
Index: UnicodeRange.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/font/UnicodeRange.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- UnicodeRange.java 8 Apr 2002 21:17:08 -0000 1.2
+++ UnicodeRange.java 8 Aug 2005 13:18:04 -0000 1.3
@@ -9,14 +9,15 @@
package org.w3c.css.font;
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.CssOperator;
-import org.w3c.css.values.CssValue;
import org.w3c.css.values.CssUnicodeRange;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
+import org.w3c.css.values.CssValue;
/**
*/
@@ -37,7 +38,8 @@
* @param expression the unicode range
* @exception InvalidParamException values are incorrect
*/
- public UnicodeRange(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public UnicodeRange(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
char op = expression.getOperator();
CssValue val = expression.getValue();
setByUser();
@@ -56,6 +58,11 @@
}
+ public UnicodeRange(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the current value
*/
Index: FontVariant.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/font/FontVariant.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- FontVariant.java 8 Apr 2002 21:17:08 -0000 1.2
+++ FontVariant.java 8 Aug 2005 13:18:04 -0000 1.3
@@ -9,14 +9,15 @@
package org.w3c.css.font;
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.CssIdent;
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;
/**
*/
@@ -39,7 +40,8 @@
* @param expression the font variant
* @exception InvalidParamException values are incorrect
*/
- public FontVariant(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public FontVariant(ApplContext ac, CssExpression expression, boolean check)
+ throws InvalidParamException {
char op = expression.getOperator();
CssValue val = expression.getValue();
setByUser();
@@ -69,6 +71,11 @@
}
+ public FontVariant(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the current value
*/
Index: Descent.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/font/Descent.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Descent.java 8 Apr 2002 21:17:08 -0000 1.2
+++ Descent.java 8 Aug 2005 13:18:04 -0000 1.3
@@ -8,14 +8,13 @@
*/
package org.w3c.css.font;
-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 Descent(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public Descent(ApplContext ac, CssExpression expression, boolean check)
+ throws InvalidParamException {
CssValue val = expression.getValue();
setByUser();
@@ -49,6 +49,11 @@
}
}
+ public Descent(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the current value
*/
Index: DefinitionSrc.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/font/DefinitionSrc.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- DefinitionSrc.java 8 Apr 2002 21:17:08 -0000 1.2
+++ DefinitionSrc.java 8 Aug 2005 13:18:04 -0000 1.3
@@ -8,14 +8,13 @@
*/
package org.w3c.css.font;
-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,8 @@
* @param expression the unicode em
* @exception InvalidParamException values are incorrect
*/
- public DefinitionSrc(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public DefinitionSrc(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
CssValue val = expression.getValue();
setByUser();
@@ -49,6 +49,11 @@
}
}
+ public DefinitionSrc(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the current value
*/
Index: FontSize.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/font/FontSize.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- FontSize.java 8 Apr 2002 21:17:08 -0000 1.2
+++ FontSize.java 8 Aug 2005 13:18:04 -0000 1.3
@@ -9,16 +9,17 @@
package org.w3c.css.font;
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.CssOperator;
-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.values.CssOperator;
+import org.w3c.css.values.CssValue;
/**
*/
@@ -41,7 +42,8 @@
* @param expression the font size
* @exception InvalidParamException values are incorrect
*/
- public FontSize(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public FontSize(ApplContext ac, CssExpression expression, boolean check)
+ throws InvalidParamException {
char op = expression.getOperator();
CssValue val = expression.getValue();
setByUser();
@@ -68,6 +70,11 @@
}
+ public FontSize(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the current value
*/
Index: FontWeight.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/font/FontWeight.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- FontWeight.java 8 Apr 2002 21:17:08 -0000 1.2
+++ FontWeight.java 8 Aug 2005 13:18:04 -0000 1.3
@@ -9,15 +9,16 @@
package org.w3c.css.font;
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.CssOperator;
-import org.w3c.css.values.CssValue;
import org.w3c.css.values.CssIdent;
import org.w3c.css.values.CssNumber;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
+import org.w3c.css.values.CssOperator;
+import org.w3c.css.values.CssValue;
/**
*/
@@ -40,7 +41,8 @@
* @param expression the font weight
* @exception InvalidParamException values are incorrect
*/
- public FontWeight(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public FontWeight(ApplContext ac, CssExpression expression, boolean check)
+ throws InvalidParamException {
char op = expression.getOperator();
CssValue val = expression.getValue();
setByUser();
@@ -87,6 +89,11 @@
}
+ public FontWeight(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the current value
*/
Index: Css2Style.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/font/Css2Style.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Css2Style.java 8 Apr 2002 21:17:08 -0000 1.2
+++ Css2Style.java 8 Aug 2005 13:18:04 -0000 1.3
@@ -8,9 +8,6 @@
*/
package org.w3c.css.font;
-import java.util.Enumeration;
-
-import org.w3c.css.util.Warnings;
import org.w3c.css.parser.CssPrinterStyle;
/**
Index: Slope.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/font/Slope.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Slope.java 8 Apr 2002 21:17:08 -0000 1.2
+++ Slope.java 8 Aug 2005 13:18:04 -0000 1.3
@@ -8,14 +8,13 @@
*/
package org.w3c.css.font;
-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 Slope(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public Slope(ApplContext ac, CssExpression expression, boolean check)
+ throws InvalidParamException {
CssValue val = expression.getValue();
setByUser();
@@ -49,6 +49,11 @@
}
}
+ public Slope(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the current value
*/
Index: Stemv.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/font/Stemv.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Stemv.java 8 Apr 2002 21:17:08 -0000 1.2
+++ Stemv.java 8 Aug 2005 13:18:04 -0000 1.3
@@ -8,14 +8,13 @@
*/
package org.w3c.css.font;
-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 Stemv(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public Stemv(ApplContext ac, CssExpression expression, boolean check)
+ throws InvalidParamException {
CssValue val = expression.getValue();
setByUser();
@@ -49,6 +49,11 @@
}
}
+ public Stemv(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the current value
*/
Index: Mathline.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/font/Mathline.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Mathline.java 8 Apr 2002 21:17:08 -0000 1.2
+++ Mathline.java 8 Aug 2005 13:18:04 -0000 1.3
@@ -8,14 +8,13 @@
*/
package org.w3c.css.font;
-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 Mathline(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public Mathline(ApplContext ac, CssExpression expression, boolean check)
+ throws InvalidParamException {
CssValue val = expression.getValue();
setByUser();
@@ -49,6 +49,11 @@
}
}
+ public Mathline(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the current value
*/
Index: FontStretch.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/font/FontStretch.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- FontStretch.java 8 Apr 2002 21:17:08 -0000 1.2
+++ FontStretch.java 8 Aug 2005 13:18:04 -0000 1.3
@@ -9,14 +9,15 @@
package org.w3c.css.font;
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.CssIdent;
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;
/**
*/
@@ -39,7 +40,8 @@
* @param expression the font stretch
* @exception InvalidParamException values are incorrect
*/
- public FontStretch(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public FontStretch(ApplContext ac, CssExpression expression, boolean check)
+ throws InvalidParamException {
char op = expression.getOperator();
CssValue val = expression.getValue();
setByUser();
@@ -75,6 +77,11 @@
}
+ public FontStretch(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the current value
*/
Index: Widths.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/font/Widths.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Widths.java 8 Apr 2002 21:17:08 -0000 1.2
+++ Widths.java 8 Aug 2005 13:18:04 -0000 1.3
@@ -9,15 +9,16 @@
package org.w3c.css.font;
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,7 +39,8 @@
* @param expression the unicode em
* @exception InvalidParamException values are incorrect
*/
- public Widths(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public Widths(ApplContext ac, CssExpression expression, boolean check)
+ throws InvalidParamException {
CssValue val;
char op;
int i = 0;
@@ -78,6 +80,11 @@
}
+ public Widths(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the current value
*/
Index: Ascent.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/font/Ascent.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Ascent.java 8 Apr 2002 21:17:08 -0000 1.2
+++ Ascent.java 8 Aug 2005 13:18:04 -0000 1.3
@@ -8,14 +8,13 @@
*/
package org.w3c.css.font;
-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 Ascent(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public Ascent(ApplContext ac, CssExpression expression, boolean check)
+ throws InvalidParamException {
CssValue val = expression.getValue();
setByUser();
@@ -49,6 +49,11 @@
}
}
+ public Ascent(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the current value
*/
Index: Panose1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/font/Panose1.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Panose1.java 8 Apr 2002 21:17:08 -0000 1.2
+++ Panose1.java 8 Aug 2005 13:18:04 -0000 1.3
@@ -8,15 +8,14 @@
*/
package org.w3c.css.font;
-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 Panose1(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public Panose1(ApplContext ac, CssExpression expression, boolean check)
+ throws InvalidParamException {
CssValue val;
char op;
int i = 0;
@@ -63,6 +63,11 @@
}
}
+ public Panose1(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the current value
*/
Index: Stemh.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/font/Stemh.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Stemh.java 8 Apr 2002 21:17:08 -0000 1.2
+++ Stemh.java 8 Aug 2005 13:18:04 -0000 1.3
@@ -8,14 +8,13 @@
*/
package org.w3c.css.font;
-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 Stemh(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public Stemh(ApplContext ac, CssExpression expression, boolean check)
+ throws InvalidParamException {
CssValue val = expression.getValue();
setByUser();
@@ -49,6 +49,11 @@
}
}
+ public Stemh(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the current value
*/
Index: Src.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/font/Src.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Src.java 8 Apr 2002 21:17:08 -0000 1.2
+++ Src.java 8 Aug 2005 13:18:04 -0000 1.3
@@ -9,17 +9,17 @@
package org.w3c.css.font;
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 Src(ApplContext ac, CssExpression expression)
+ public Src(ApplContext ac, CssExpression expression, boolean check)
throws InvalidParamException {
CssValue val;
char op;
@@ -75,6 +75,11 @@
} while (op == COMMA);
}
+ public Src(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the value of this property
*/
Index: XHeight.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/font/XHeight.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- XHeight.java 8 Apr 2002 21:17:08 -0000 1.2
+++ XHeight.java 8 Aug 2005 13:18:04 -0000 1.3
@@ -8,14 +8,13 @@
*/
package org.w3c.css.font;
-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 XHeight(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public XHeight(ApplContext ac, CssExpression expression, boolean check)
+ throws InvalidParamException {
CssValue val = expression.getValue();
setByUser();
@@ -49,6 +49,11 @@
}
}
+ public XHeight(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the current value
*/
Index: Centerline.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/font/Centerline.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Centerline.java 8 Apr 2002 21:17:08 -0000 1.2
+++ Centerline.java 8 Aug 2005 13:18:04 -0000 1.3
@@ -8,14 +8,13 @@
*/
package org.w3c.css.font;
-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 Centerline(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public Centerline(ApplContext ac, CssExpression expression, boolean check)
+ throws InvalidParamException {
CssValue val = expression.getValue();
setByUser();
@@ -49,6 +49,11 @@
}
}
+ public Centerline(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/font/proplistATSC,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- proplistATSC 8 Jan 2003 10:54:48 -0000 1.2
+++ proplistATSC 8 Aug 2005 13:18:04 -0000 1.3
@@ -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: FontStyle.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/font/FontStyle.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- FontStyle.java 8 Apr 2002 21:17:08 -0000 1.2
+++ FontStyle.java 8 Aug 2005 13:18:04 -0000 1.3
@@ -9,14 +9,15 @@
package org.w3c.css.font;
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.CssIdent;
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;
/**
*/
@@ -39,7 +40,8 @@
* @param expression the font style
* @exception InvalidParamException values are incorrect
*/
- public FontStyle(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public FontStyle(ApplContext ac, CssExpression expression, boolean check)
+ throws InvalidParamException {
char op = expression.getOperator();
CssValue val = expression.getValue();
setByUser();
@@ -75,6 +77,11 @@
}
+ public FontStyle(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the current value
*/
Received on Monday, 8 August 2005 13:20:27 UTC