W3C home > Mailing lists > Public > www-validator-cvs@w3.org > September 2005

2002/css-validator/org/w3c/css/properties/css2/font Ascent.java,1.1,1.2 Baseline.java,1.1,1.2 Bbox.java,1.1,1.2 CapHeight.java,1.1,1.2 Centerline.java,1.1,1.2 Css2Style.java,1.1,1.2 DefinitionSrc.java,1.1,1.2 Descent.java,1.1,1.2 FontConstant.java,1.2,1.3 FontFamily.java,1.1,1.2 FontSize.java,1.1,1.2 FontStretch.java,1.1,1.2 FontStyle.java,1.1,1.2 FontVariant.java,1.1,1.2 FontWeight.java,1.1,1.2 Mathline.java,1.1,1.2 Panose1.java,1.1,1.2 Slope.java,1.1,1.2 Src.java,1.1,1.2 Stemh.java,1.1,1.2 Stemv.java,1.1,1.2 Topline.java,1.1,1.2 UnicodeRange.java,1.1,1.2 UnitsPerEm.java,1.1,1.2 Widths.java,1.1,1.2 XHeight.java,1.1,1.2

From: Yves Lafon via cvs-syncmail <cvsmail@w3.org>
Date: Wed, 14 Sep 2005 15:15:00 +0000
To: www-v
Message-Id: <E1EFYzQ-0002pK-RR@lionel-hutz.w3.org>

Update of /sources/public/2002/css-validator/org/w3c/css/properties/css2/font
In directory hutz:/tmp/cvs-serv9389/org/w3c/css/properties/css2/font

Modified Files:
	Ascent.java Baseline.java Bbox.java CapHeight.java 
	Centerline.java Css2Style.java DefinitionSrc.java Descent.java 
	FontConstant.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 
Log Message:
>From Jean-Guilhem Rouel (again!)
Reformatting of code
Fix for bug 774 [1] (even more warnings)
Fix for bug 768 [2]
Modification of the soap output format (each warning list and error list has 
the URI it refers to)


[1] http://www.w3.org/Bugs/Public/show_bug.cgi?id=774
[2] http://www.w3.org/Bugs/Public/show_bug.cgi?id=768



Index: FontFamily.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css2/font/FontFamily.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- FontFamily.java	23 Aug 2005 16:33:50 -0000	1.1
+++ FontFamily.java	14 Sep 2005 15:14:58 -0000	1.2
@@ -23,25 +23,25 @@
 import org.w3c.css.values.CssString;
 import org.w3c.css.values.CssValue;
 
-/** 
+/**
  */
 public class FontFamily extends FontProperty implements CssOperator {
-    
+
     Vector family_name = new Vector();
 
     /**
      * Create a new FontFamily
      */
     public FontFamily() {
-    }  
-    
+    }
+
     /**
      * Create a new FontFamily
      *
      * @param expression the font name
      * @exception InvalidParamException The expression is incorrect
      */
-    public FontFamily(ApplContext ac, CssExpression expression, boolean check) 
+    public FontFamily(ApplContext ac, CssExpression expression, boolean check)
 	    throws InvalidParamException {
 	boolean family = true;
 	CssValue val = expression.getValue();
@@ -49,18 +49,18 @@
 
 	setByUser();
 	//@@ and if name is already in the vector ?
-	
+
 
 	while (family) {
 	    val = expression.getValue();
 	    op = expression.getOperator();
-	    
+
 	    if ((op != COMMA) && (op != SPACE)) {
-		throw new InvalidParamException("operator", 
+		throw new InvalidParamException("operator",
 						((new Character(op)).toString()),
 						ac);
 	    }
-	    
+
 	    if (val instanceof CssString) {
 		if (op == COMMA) { // "helvetica", "roman"
 		    String name = (String) val.get();
@@ -78,9 +78,9 @@
 		    expression.next();
 		} else {
 		    CssValue next = expression.getNextValue();
-		    
+
 		    if (next instanceof CssIdent) {
-			CssIdent New = new CssIdent(val.get() + " " 
+			CssIdent New = new CssIdent(val.get() + " "
 						    + next.get());
 			expression.remove();
 			op = expression.getOperator();
@@ -97,38 +97,38 @@
 		throw new InvalidParamException("value", expression.getValue(),
 						getPropertyName(), ac);
 	}
-	
+
     }
-    
+
     public FontFamily(ApplContext ac, CssExpression expression)
 	    throws InvalidParamException {
 	this(ac, expression, false);
     }
-    
+
     /**
      * Returns all fonts name
-     */  
+     */
     public Enumeration elements() {
 	return family_name.elements();
     }
-    
+
     /**
      * Returns the size
      */
     public int size() {
 	return family_name.size();
     }
-    
+
     /**
      * Returns the font (null if no font)
-     */  
+     */
     public Object get() {
 	if (family_name.size() == 0) {
 	    return null;
 	}
 	return family_name.firstElement();
     }
-    
+
     /**
      * Returns a string representation of the object.
      */
@@ -141,12 +141,12 @@
 	}
 	return r.substring(2);
     }
-    
+
     String convertString (String value) {
 	if (value.indexOf('"') != -1) {
 	    return '\'' + value + '\'';
 	} else if (value.indexOf('\'') != -1) {
-	    return '"' + value + '"';	    
+	    return '"' + value + '"';
 	} else {
 	    return value;
 	}
@@ -154,11 +154,11 @@
 
     /**
      * Returns the name of this property
-     */  
+     */
     public String getPropertyName() {
 	return "font-family";
     }
-    
+
     /**
      * Add this property to the CssStyle.
      *
@@ -172,13 +172,13 @@
 	}
 	style0.fontFamily = this;
     }
-    
+
     /**
      * Get this property in the style.
      *
      * @param style The style where the property is
      * @param resolve if true, resolve the style to find this property
-     */  
+     */
     public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
 	if (resolve) {
 	    return ((Css2Style) style).getFaceFontFamily();
@@ -186,30 +186,30 @@
 	    return ((Css2Style) style).fontFamily;
 	}
     }
-    
+
     /**
      * Compares two properties for equality.
      *
      * @param value The other property.
-     */  
+     */
     public boolean equals(CssProperty property) {
 	return false; //@@ FIXME
     }
-    
+
     private static String trimToOneSpace(String name) {
 	int count = name.length();
 	char[] dst = new char[count];
 	char[] src = new char[count];
 	int index = -1;
-	
+
 	name.getChars(0, count, src, 0);
 	for(int i=0; i < count; i++)
-	    if ( i == 0 || ! Util.isWhiteSpace(src[i]) || 
-		 ( Util.isWhiteSpace(src[i]) && 
+	    if ( i == 0 || ! Util.isWhiteSpace(src[i]) ||
+		 ( Util.isWhiteSpace(src[i]) &&
 		   !Util.isWhiteSpace(dst[index]) ) )
 		dst[++index] = src[i];
-	
+
 	return new String(dst, 0, index+1);
     }
-    
+
 }

Index: Topline.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css2/font/Topline.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Topline.java	23 Aug 2005 16:33:50 -0000	1.1
+++ Topline.java	14 Sep 2005 15:14:58 -0000	1.2
@@ -19,22 +19,22 @@
 /**
  */
 public class Topline extends CssProperty {
-    
+
     CssValue value;
-    
+
     /**
      * Create a new Topline
      */
     public Topline() {
 	// nothing to do
     }
-    
+
     /**
      * Creates a new Topline
      *
      * @param expression the unicode em
      * @exception InvalidParamException values are incorrect
-     */  
+     */
     public Topline(ApplContext ac, CssExpression expression, boolean check)
     	throws InvalidParamException {
 	CssValue val = expression.getValue();
@@ -44,37 +44,37 @@
 	    value = val;
 	    expression.next();
 	} else {
-	    throw new InvalidParamException("value", expression.getValue(), 
+	    throw new InvalidParamException("value", expression.getValue(),
 					    getPropertyName(), ac);
 	}
     }
-    
+
     public Topline(ApplContext ac, CssExpression expression)
 	    throws InvalidParamException {
 	this(ac, expression, false);
     }
-    
+
     /**
      * Returns the current value
-     */  
+     */
     public Object get() {
 	return value;
     }
-    
+
     /**
      * Returns a string representation of the object.
      */
-    public String toString() {  
+    public String toString() {
 	return value.toString();
     }
-    
+
     /**
      * Returns the name of this property
-     */  
+     */
     public String getPropertyName() {
 	return "topline";
     }
-    
+
     /**
      * Add this property to the CssStyle.
      *
@@ -87,13 +87,13 @@
 	}
 	style0.topline = this;
     }
-    
+
     /**
      * Get this property in the style.
      *
      * @param style The style where the property is
      * @param resolve if true, resolve the style to find this property
-     */  
+     */
     public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
 	if (resolve) {
 	    return ((Css2Style) style).getTopline();
@@ -101,23 +101,23 @@
 	    return ((Css2Style) style).topline;
 	}
     }
-    
+
     /**
      * Compares two properties for equality.
      *
      * @param value The other property.
-     */  
+     */
     public boolean equals(CssProperty property) {
 	// @@TODO
 	return false;
     }
-    
+
     /**
      * Is the value of this property is a default value.
      * It is used by all macro for the function <code>print</code>
-     */  
+     */
     public boolean isDefault() {
 	return false;
     }
-    
+
 }

Index: UnitsPerEm.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css2/font/UnitsPerEm.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- UnitsPerEm.java	23 Aug 2005 16:33:50 -0000	1.1
+++ UnitsPerEm.java	14 Sep 2005 15:14:58 -0000	1.2
@@ -19,22 +19,22 @@
 /**
  */
 public class UnitsPerEm extends CssProperty {
-    
+
     CssValue value;
-    
+
     /**
      * Create a new UnitsPerEm
      */
     public UnitsPerEm() {
 	// nothing to do
     }
-    
+
     /**
      * Creates a new UnitsPerEm
      *
      * @param expression the unicode em
      * @exception InvalidParamException values are incorrect
-     */  
+     */
     public UnitsPerEm(ApplContext ac, CssExpression expression, boolean check)
     	throws InvalidParamException {
 	CssValue val = expression.getValue();
@@ -44,37 +44,37 @@
 	    value = val;
 	    expression.next();
 	} else {
-	    throw new InvalidParamException("value", expression.getValue(), 
+	    throw new InvalidParamException("value", expression.getValue(),
 					    getPropertyName(), ac);
 	}
     }
-    
+
     public UnitsPerEm(ApplContext ac, CssExpression expression)
 	    throws InvalidParamException {
 	this(ac, expression, false);
     }
-    
+
     /**
      * Returns the current value
-     */  
+     */
     public Object get() {
 	return value;
     }
-    
+
     /**
      * Returns a string representation of the object.
      */
-    public String toString() {  
+    public String toString() {
 	return value.toString();
     }
-    
+
     /**
      * Returns the name of this property
-     */  
+     */
     public String getPropertyName() {
 	return "units-per-em";
     }
-    
+
     /**
      * Add this property to the CssStyle.
      *
@@ -87,13 +87,13 @@
 	}
 	style0.unitsPerEm = this;
     }
-    
+
     /**
      * Get this property in the style.
      *
      * @param style The style where the property is
      * @param resolve if true, resolve the style to find this property
-     */  
+     */
     public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
 	if (resolve) {
 	    return ((Css2Style) style).getUnitsPerEm();
@@ -101,23 +101,23 @@
 	    return ((Css2Style) style).unitsPerEm;
 	}
     }
-    
+
     /**
      * Compares two properties for equality.
      *
      * @param value The other property.
-     */  
+     */
     public boolean equals(CssProperty property) {
 	// @@TODO
 	return false;
     }
-    
+
     /**
      * Is the value of this property is a default value.
      * It is used by all macro for the function <code>print</code>
-     */  
+     */
     public boolean isDefault() {
 	return false;
     }
-    
+
 }

Index: Baseline.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css2/font/Baseline.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Baseline.java	23 Aug 2005 16:33:50 -0000	1.1
+++ Baseline.java	14 Sep 2005 15:14:58 -0000	1.2
@@ -19,22 +19,22 @@
 /**
  */
 public class Baseline extends CssProperty {
-    
+
     CssValue value;
-    
+
     /**
      * Create a new Baseline
      */
     public Baseline() {
 	// nothing to do
     }
-    
+
     /**
      * Creates a new Baseline
      *
      * @param expression the unicode em
      * @exception InvalidParamException values are incorrect
-     */  
+     */
     public Baseline(ApplContext ac, CssExpression expression, boolean check)
     	throws InvalidParamException {
 	CssValue val = expression.getValue();
@@ -44,37 +44,37 @@
 	    value = val;
 	    expression.next();
 	} else {
-	    throw new InvalidParamException("value", expression.getValue(), 
+	    throw new InvalidParamException("value", expression.getValue(),
 					    getPropertyName(), ac);
 	}
     }
-    
+
     public Baseline(ApplContext ac, CssExpression expression)
 	    throws InvalidParamException {
 	this(ac, expression, false);
     }
-    
+
     /**
      * Returns the current value
-     */  
+     */
     public Object get() {
 	return value;
     }
-    
+
     /**
      * Returns a string representation of the object.
      */
-    public String toString() {  
+    public String toString() {
 	return value.toString();
     }
-    
+
     /**
      * Returns the name of this property
-     */  
+     */
     public String getPropertyName() {
 	return "baseline";
     }
-    
+
     /**
      * Add this property to the CssStyle.
      *
@@ -87,13 +87,13 @@
 	}
 	style0.baseline = this;
     }
-    
+
     /**
      * Get this property in the style.
      *
      * @param style The style where the property is
      * @param resolve if true, resolve the style to find this property
-     */  
+     */
     public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
 	if (resolve) {
 	    return ((Css2Style) style).getBaseline();
@@ -101,23 +101,23 @@
 	    return ((Css2Style) style).baseline;
 	}
     }
-    
+
     /**
      * Compares two properties for equality.
      *
      * @param value The other property.
-     */  
+     */
     public boolean equals(CssProperty property) {
 	// @@TODO
 	return false;
     }
-    
+
     /**
      * Is the value of this property is a default value.
      * It is used by all macro for the function <code>print</code>
-     */  
+     */
     public boolean isDefault() {
 	return false;
     }
-    
+
 }

Index: CapHeight.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css2/font/CapHeight.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CapHeight.java	23 Aug 2005 16:33:50 -0000	1.1
+++ CapHeight.java	14 Sep 2005 15:14:58 -0000	1.2
@@ -19,22 +19,22 @@
 /**
  */
 public class CapHeight extends CssProperty {
-    
+
     CssValue value;
-    
+
     /**
      * Create a new CapHeight
      */
     public CapHeight() {
 	// nothing to do
     }
-    
+
     /**
      * Creates a new CapHeight
      *
      * @param expression the unicode em
      * @exception InvalidParamException values are incorrect
-     */  
+     */
     public CapHeight(ApplContext ac, CssExpression expression, boolean check)
     	throws InvalidParamException {
 	CssValue val = expression.getValue();
@@ -44,37 +44,37 @@
 	    value = val;
 	    expression.next();
 	} else {
-	    throw new InvalidParamException("value", expression.getValue(), 
+	    throw new InvalidParamException("value", expression.getValue(),
 					    getPropertyName(), ac);
 	}
     }
-    
+
     public CapHeight(ApplContext ac, CssExpression expression)
 	    throws InvalidParamException {
 	this(ac, expression, false);
     }
-    
+
     /**
      * Returns the current value
-     */  
+     */
     public Object get() {
 	return value;
     }
-    
+
     /**
      * Returns a string representation of the object.
      */
-    public String toString() {  
+    public String toString() {
 	return value.toString();
     }
-    
+
     /**
      * Returns the name of this property
-     */  
+     */
     public String getPropertyName() {
 	return "cap-height";
     }
-    
+
     /**
      * Add this property to the CssStyle.
      *
@@ -87,13 +87,13 @@
 	}
 	style0.capHeight = this;
     }
-    
+
     /**
      * Get this property in the style.
      *
      * @param style The style where the property is
      * @param resolve if true, resolve the style to find this property
-     */  
+     */
     public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
 	if (resolve) {
 	    return ((Css2Style) style).getCapHeight();
@@ -101,23 +101,23 @@
 	    return ((Css2Style) style).capHeight;
 	}
     }
-    
+
     /**
      * Compares two properties for equality.
      *
      * @param value The other property.
-     */  
+     */
     public boolean equals(CssProperty property) {
 	// @@TODO
 	return false;
     }
-    
+
     /**
      * Is the value of this property is a default value.
      * It is used by all macro for the function <code>print</code>
-     */  
+     */
     public boolean isDefault() {
 	return false;
     }
-    
+
 }

Index: Bbox.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css2/font/Bbox.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Bbox.java	23 Aug 2005 16:33:50 -0000	1.1
+++ Bbox.java	14 Sep 2005 15:14:58 -0000	1.2
@@ -20,28 +20,28 @@
 /**
  */
 public class Bbox extends CssProperty {
-    
+
     CssValue[] value = new CssValue[4];
-    
+
     /**
      * Create a new Bbox
      */
     public Bbox() {
 	// nothing to do
     }
-    
+
     /**
      * Creates a new Bbox
      *
      * @param expression the unicode em
      * @exception InvalidParamException values are incorrect
-     */  
+     */
     public Bbox(ApplContext ac, CssExpression expression, boolean check)
     	throws InvalidParamException {
 	CssValue val;
 	char op;
 	int i = 0;
-	setByUser();	
+	setByUser();
 
 	val = expression.getValue();
 	op = expression.getOperator();
@@ -53,7 +53,7 @@
 					    getPropertyName(), ac);
 	}
 	if (op != CssOperator.COMMA || expression.end()) {
-	    throw new InvalidParamException("few-value", 
+	    throw new InvalidParamException("few-value",
 					    getPropertyName(), ac);
 	}
 
@@ -67,7 +67,7 @@
 					    getPropertyName(), ac);
 	}
 	if (op != CssOperator.COMMA || expression.end()) {
-	    throw new InvalidParamException("few-value", 
+	    throw new InvalidParamException("few-value",
 					    getPropertyName(), ac);
 	}
 
@@ -81,7 +81,7 @@
 					    getPropertyName(), ac);
 	}
 	if (op != CssOperator.COMMA || expression.end()) {
-	    throw new InvalidParamException("few-value", 
+	    throw new InvalidParamException("few-value",
 					    getPropertyName(), ac);
 	}
 
@@ -95,37 +95,37 @@
 					    getPropertyName(), ac);
 	}
     }
-    
+
     public Bbox(ApplContext ac, CssExpression expression)
 	    throws InvalidParamException {
 	this(ac, expression, false);
     }
-    
+
     /**
      * Returns the current value
-     */  
+     */
     public Object get() {
 	return value[0];
     }
-    
+
     /**
      * Returns a string representation of the object.
      */
-    public String toString() {  
+    public String toString() {
 	String ret = "";
 	for (int i = 0; i < 4; i++) {
 	    ret += ", " + value[i];
 	}
 	return ret.substring(2);
     }
-    
+
     /**
      * Returns the name of this property
-     */  
+     */
     public String getPropertyName() {
 	return "bbox";
     }
-    
+
     /**
      * Add this property to the CssStyle.
      *
@@ -138,13 +138,13 @@
 	}
 	style0.bbox = this;
     }
-    
+
     /**
      * Get this property in the style.
      *
      * @param style The style where the property is
      * @param resolve if true, resolve the style to find this property
-     */  
+     */
     public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
 	if (resolve) {
 	    return ((Css2Style) style).getBbox();
@@ -152,23 +152,23 @@
 	    return ((Css2Style) style).bbox;
 	}
     }
-    
+
     /**
      * Compares two properties for equality.
      *
      * @param value The other property.
-     */  
+     */
     public boolean equals(CssProperty property) {
 	// @@TODO
 	return false;
     }
-    
+
     /**
      * Is the value of this property is a default value.
      * It is used by all macro for the function <code>print</code>
-     */  
+     */
     public boolean isDefault() {
 	return false;
     }
-    
+
 }

Index: UnicodeRange.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css2/font/UnicodeRange.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- UnicodeRange.java	23 Aug 2005 16:33:50 -0000	1.1
+++ UnicodeRange.java	14 Sep 2005 15:14:58 -0000	1.2
@@ -22,22 +22,22 @@
 /**
  */
 public class UnicodeRange extends CssProperty {
-    
+
     Vector values = new Vector();
-    
+
     /**
      * Create a new UnicodeRange
      */
     public UnicodeRange() {
 	// nothing to do
     }
-    
+
     /**
      * Creates a new UnicodeRange
      *
      * @param expression the unicode range
      * @exception InvalidParamException values are incorrect
-     */  
+     */
     public UnicodeRange(ApplContext ac, CssExpression expression,
 	    boolean check) throws InvalidParamException {
 	char op = expression.getOperator();
@@ -48,32 +48,32 @@
 	    if (val instanceof CssUnicodeRange) {
 		// nothing
 	    } else {
-		throw new InvalidParamException("value", expression.getValue(), 
+		throw new InvalidParamException("value", expression.getValue(),
 						getPropertyName(), ac);
 	    }
 	    values.addElement(val);
 	    op = expression.getOperator();
 	    expression.next();
 	} while (op == CssOperator.COMMA);
-	
+
     }
-    
+
     public UnicodeRange(ApplContext ac, CssExpression expression)
 	    throws InvalidParamException {
 	this(ac, expression, false);
     }
-    
+
     /**
      * Returns the current value
-     */  
+     */
     public Object get() {
 	return values.elementAt(0);
     }
-    
+
     /**
      * Returns a string representation of the object.
      */
-    public String toString() {  
+    public String toString() {
 	String ret ="";
 	int i = 0;
 
@@ -84,14 +84,14 @@
 
 	return ret.substring(2);
     }
-    
+
     /**
      * Returns the name of this property
-     */  
+     */
     public String getPropertyName() {
 	return "unicode-range";
     }
-    
+
     /**
      * Add this property to the CssStyle.
      *
@@ -104,13 +104,13 @@
 	}
 	style0.unicodeRange = this;
     }
-    
+
     /**
      * Get this property in the style.
      *
      * @param style The style where the property is
      * @param resolve if true, resolve the style to find this property
-     */  
+     */
     public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
 	if (resolve) {
 	    return ((Css2Style) style).getFaceUnicodeRange();
@@ -118,23 +118,23 @@
 	    return ((Css2Style) style).unicodeRange;
 	}
     }
-    
+
     /**
      * Compares two properties for equality.
      *
      * @param value The other property.
-     */  
+     */
     public boolean equals(CssProperty property) {
 	// @@TODO
 	return false;
     }
-    
+
     /**
      * Is the value of this property is a default value.
      * It is used by all macro for the function <code>print</code>
-     */  
+     */
     public boolean isDefault() {
 	return false;
     }
-    
+
 }

Index: FontVariant.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css2/font/FontVariant.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- FontVariant.java	23 Aug 2005 16:33:50 -0000	1.1
+++ FontVariant.java	14 Sep 2005 15:14:58 -0000	1.2
@@ -22,9 +22,9 @@
 /**
  */
 public class FontVariant extends CssProperty implements FontConstant {
-    
+
     Vector values = new Vector();
-    
+
     private static CssIdent all = new CssIdent("all");
 
     /**
@@ -33,13 +33,13 @@
     public FontVariant() {
 	// nothing to do
     }
-    
+
     /**
      * Creates a new FontVariant
      *
      * @param expression the font variant
      * @exception InvalidParamException values are incorrect
-     */  
+     */
     public FontVariant(ApplContext ac, CssExpression expression, boolean check)
     	throws InvalidParamException {
 	char op = expression.getOperator();
@@ -57,36 +57,36 @@
 		    }
 		}
 		if (i == FONTVARIANT.length) {
-		    throw new InvalidParamException("value", 
-						    expression.getValue(), 
+		    throw new InvalidParamException("value",
+						    expression.getValue(),
 						    getPropertyName(), ac);
 		}
 	    } else {
-		throw new InvalidParamException("value", expression.getValue(), 
+		throw new InvalidParamException("value", expression.getValue(),
 						getPropertyName(), ac);
 	    }
 	    op = expression.getOperator();
 	    expression.next();
 	} while (op == CssOperator.COMMA);
-	
+
     }
-    
+
     public FontVariant(ApplContext ac, CssExpression expression)
 	    throws InvalidParamException {
 	this(ac, expression, false);
     }
-    
+
     /**
      * Returns the current value
-     */  
+     */
     public Object get() {
 	return values.elementAt(0);
     }
-    
+
     /**
      * Returns a string representation of the object.
      */
-    public String toString() {  
+    public String toString() {
 	String ret ="";
 	int i = 0;
 
@@ -97,14 +97,14 @@
 
 	return ret.substring(2);
     }
-    
+
     /**
      * Returns the name of this property
-     */  
+     */
     public String getPropertyName() {
 	return "font-variant";
     }
-    
+
     /**
      * Add this property to the CssStyle.
      *
@@ -117,13 +117,13 @@
 	}
 	style0.fontVariant = this;
     }
-    
+
     /**
      * Get this property in the style.
      *
      * @param style The style where the property is
      * @param resolve if true, resolve the style to find this property
-     */  
+     */
     public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
 	if (resolve) {
 	    return ((Css2Style) style).getFaceFontVariant();
@@ -131,27 +131,27 @@
 	    return ((Css2Style) style).fontVariant;
 	}
     }
-    
+
     /**
      * Compares two properties for equality.
      *
      * @param value The other property.
-     */  
+     */
     public boolean equals(CssProperty property) {
 	// @@TODO
 	return false;
     }
-    
+
     /**
      * Is the value of this property is a default value.
      * It is used by all macro for the function <code>print</code>
-     */  
+     */
     public boolean isDefault() {
 	return false;
     }
-    
+
     private static int[] hash_values;
-    
+
     static {
 	hash_values = new int[FONTVARIANT.length];
 	for (int i=0; i<FONTVARIANT.length; i++)

Index: Descent.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css2/font/Descent.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Descent.java	23 Aug 2005 16:33:50 -0000	1.1
+++ Descent.java	14 Sep 2005 15:14:58 -0000	1.2
@@ -19,22 +19,22 @@
 /**
  */
 public class Descent extends CssProperty {
-    
+
     CssValue value;
-    
+
     /**
      * Create a new Descent
      */
     public Descent() {
 	// nothing to do
     }
-    
+
     /**
      * Creates a new Descent
      *
      * @param expression the unicode em
      * @exception InvalidParamException values are incorrect
-     */  
+     */
     public Descent(ApplContext ac, CssExpression expression, boolean check)
     	throws InvalidParamException {
 	CssValue val = expression.getValue();
@@ -44,37 +44,37 @@
 	    value = val;
 	    expression.next();
 	} else {
-	    throw new InvalidParamException("value", expression.getValue(), 
+	    throw new InvalidParamException("value", expression.getValue(),
 					    getPropertyName(), ac);
 	}
     }
-    
+
     public Descent(ApplContext ac, CssExpression expression)
 	    throws InvalidParamException {
 	this(ac, expression, false);
     }
-    
+
     /**
      * Returns the current value
-     */  
+     */
     public Object get() {
 	return value;
     }
-    
+
     /**
      * Returns a string representation of the object.
      */
-    public String toString() {  
+    public String toString() {
 	return value.toString();
     }
-    
+
     /**
      * Returns the name of this property
-     */  
+     */
     public String getPropertyName() {
 	return "descent";
     }
-    
+
     /**
      * Add this property to the CssStyle.
      *
@@ -87,13 +87,13 @@
 	}
 	style0.descent = this;
     }
-    
+
     /**
      * Get this property in the style.
      *
      * @param style The style where the property is
      * @param resolve if true, resolve the style to find this property
-     */  
+     */
     public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
 	if (resolve) {
 	    return ((Css2Style) style).getDescent();
@@ -101,23 +101,23 @@
 	    return ((Css2Style) style).descent;
 	}
     }
-    
+
     /**
      * Compares two properties for equality.
      *
      * @param value The other property.
-     */  
+     */
     public boolean equals(CssProperty property) {
 	// @@TODO
 	return false;
     }
-    
+
     /**
      * Is the value of this property is a default value.
      * It is used by all macro for the function <code>print</code>
-     */  
+     */
     public boolean isDefault() {
 	return false;
     }
-    
+
 }

Index: DefinitionSrc.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css2/font/DefinitionSrc.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- DefinitionSrc.java	23 Aug 2005 16:33:50 -0000	1.1
+++ DefinitionSrc.java	14 Sep 2005 15:14:58 -0000	1.2
@@ -19,22 +19,22 @@
 /**
  */
 public class DefinitionSrc extends CssProperty {
-    
+
     CssValue value;
-    
+
     /**
      * Create a new DefinitionSrc
      */
     public DefinitionSrc() {
 	// nothing to do
     }
-    
+
     /**
      * Creates a new DefinitionSrc
      *
      * @param expression the unicode em
      * @exception InvalidParamException values are incorrect
-     */  
+     */
     public DefinitionSrc(ApplContext ac, CssExpression expression,
 	    boolean check) throws InvalidParamException {
 	CssValue val = expression.getValue();
@@ -44,37 +44,37 @@
 	    value = val;
 	    expression.next();
 	} else {
-	    throw new InvalidParamException("value", expression.getValue(), 
+	    throw new InvalidParamException("value", expression.getValue(),
 					    getPropertyName(), ac);
 	}
     }
-    
+
     public DefinitionSrc(ApplContext ac, CssExpression expression)
 	    throws InvalidParamException {
 	this(ac, expression, false);
     }
-    
+
     /**
      * Returns the current value
-     */  
+     */
     public Object get() {
 	return value;
     }
-    
+
     /**
      * Returns a string representation of the object.
      */
-    public String toString() {  
+    public String toString() {
 	return value.toString();
     }
-    
+
     /**
      * Returns the name of this property
-     */  
+     */
     public String getPropertyName() {
 	return "definition-src";
     }
-    
+
     /**
      * Add this property to the CssStyle.
      *
@@ -87,13 +87,13 @@
 	}
 	style0.definitionSrc = this;
     }
-    
+
     /**
      * Get this property in the style.
      *
      * @param style The style where the property is
      * @param resolve if true, resolve the style to find this property
-     */  
+     */
     public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
 	if (resolve) {
 	    return ((Css2Style) style).getDefinitionSrc();
@@ -101,23 +101,23 @@
 	    return ((Css2Style) style).definitionSrc;
 	}
     }
-    
+
     /**
      * Compares two properties for equality.
      *
      * @param value The other property.
-     */  
+     */
     public boolean equals(CssProperty property) {
 	// @@TODO
 	return false;
     }
-    
+
     /**
      * Is the value of this property is a default value.
      * It is used by all macro for the function <code>print</code>
-     */  
+     */
     public boolean isDefault() {
 	return false;
     }
-    
+
 }

Index: FontSize.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css2/font/FontSize.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- FontSize.java	23 Aug 2005 16:33:50 -0000	1.1
+++ FontSize.java	14 Sep 2005 15:14:58 -0000	1.2
@@ -24,9 +24,9 @@
 /**
  */
 public class FontSize extends CssProperty implements FontConstant {
-    
+
     Vector values = new Vector();
-    
+
     private static CssIdent all = new CssIdent("all");
 
     /**
@@ -35,13 +35,13 @@
     public FontSize() {
 	// nothing to do
     }
-    
+
     /**
      * Creates a new FontSize
      *
      * @param expression the font size
      * @exception InvalidParamException values are incorrect
-     */  
+     */
     public FontSize(ApplContext ac, CssExpression expression, boolean check)
     	throws InvalidParamException {
 	char op = expression.getOperator();
@@ -60,32 +60,32 @@
 	    } else if (val instanceof CssNumber) {
 		values.addElement(((CssNumber) val).getLength());
 	    } else {
-		throw new InvalidParamException("value", expression.getValue(), 
+		throw new InvalidParamException("value", expression.getValue(),
 						getPropertyName(), ac);
 	    }
 	    values.addElement(val);
 	    op = expression.getOperator();
 	    expression.next();
 	} while (op == CssOperator.COMMA);
-	
+
     }
-    
+
     public FontSize(ApplContext ac, CssExpression expression)
 	    throws InvalidParamException {
 	this(ac, expression, false);
     }
-    
+
     /**
      * Returns the current value
-     */  
+     */
     public Object get() {
 	return values.elementAt(0);
     }
-    
+
     /**
      * Returns a string representation of the object.
      */
-    public String toString() {  
+    public String toString() {
 	String ret ="";
 	int i = 0;
 
@@ -96,14 +96,14 @@
 
 	return ret.substring(2);
     }
-    
+
     /**
      * Returns the name of this property
-     */  
+     */
     public String getPropertyName() {
 	return "font-size";
     }
-    
+
     /**
      * Add this property to the CssStyle.
      *
@@ -116,13 +116,13 @@
 	}
 	style0.fontSize = this;
     }
-    
+
     /**
      * Get this property in the style.
      *
      * @param style The style where the property is
      * @param resolve if true, resolve the style to find this property
-     */  
+     */
     public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
 	if (resolve) {
 	    return ((Css2Style) style).getFaceFontSize();
@@ -130,23 +130,23 @@
 	    return ((Css2Style) style).fontSize;
 	}
     }
-    
+
     /**
      * Compares two properties for equality.
      *
      * @param value The other property.
-     */  
+     */
     public boolean equals(CssProperty property) {
 	// @@TODO
 	return false;
     }
-    
+
     /**
      * Is the value of this property is a default value.
      * It is used by all macro for the function <code>print</code>
-     */  
+     */
     public boolean isDefault() {
 	return false;
     }
-    
+
 }

Index: FontWeight.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css2/font/FontWeight.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- FontWeight.java	23 Aug 2005 16:33:50 -0000	1.1
+++ FontWeight.java	14 Sep 2005 15:14:58 -0000	1.2
@@ -23,9 +23,9 @@
 /**
  */
 public class FontWeight extends CssProperty implements FontConstant {
-    
+
     Vector values = new Vector();
-    
+
     private static CssIdent all = new CssIdent("all");
 
     /**
@@ -34,13 +34,13 @@
     public FontWeight() {
 	// nothing to do
     }
-    
+
     /**
      * Creates a new FontWeight
      *
      * @param expression the font weight
      * @exception InvalidParamException values are incorrect
-     */  
+     */
     public FontWeight(ApplContext ac, CssExpression expression, boolean check)
     	throws InvalidParamException {
 	char op = expression.getOperator();
@@ -64,47 +64,50 @@
 		    }
 		}
 		if (i == FONTWEIGHT.length) {
-		    throw new InvalidParamException("value", 
-						    expression.getValue(), 
+		    throw new InvalidParamException("value",
+						    expression.getValue(),
 						    getPropertyName(), ac);
 		}
 	    } else if (val instanceof CssNumber) {
-		float valf = ((Float) val.get()).floatValue();
-		int vali = (int) valf;
-		if ((valf - (float) vali) == 0
-		    && isCorrectWeight(vali)) {
-		    values.addElement(val);
-		} else {
-		    throw new InvalidParamException("value", 
-						    expression.getValue(), 
-						    getPropertyName(), ac);
+		Object valf = val.get();
+		if(valf instanceof Integer) {
+		    int vali = ((Integer) valf).intValue();
+		    if(isCorrectWeight(vali)) { // verify the entire part number
+			values.addElement(val);
+		    }
+		}
+		else {
+		    throw new InvalidParamException("value",
+			    expression.getValue(),
+			    getPropertyName(), ac);
 		}
-	    } else {
-		throw new InvalidParamException("value", expression.getValue(), 
-						getPropertyName(), ac);
+	    }
+	    else {
+		throw new InvalidParamException("value", expression.getValue(),
+			getPropertyName(), ac);
 	    }
 	    op = expression.getOperator();
 	    expression.next();
 	} while (op == CssOperator.COMMA);
-	
+
     }
-    
+
     public FontWeight(ApplContext ac, CssExpression expression)
 	    throws InvalidParamException {
 	this(ac, expression, false);
     }
-    
+
     /**
      * Returns the current value
-     */  
+     */
     public Object get() {
 	return values.elementAt(0);
     }
-    
+
     /**
      * Returns a string representation of the object.
      */
-    public String toString() {  
+    public String toString() {
 	String ret ="";
 	int i = 0;
 
@@ -115,14 +118,14 @@
 
 	return ret.substring(2);
     }
-    
+
     /**
      * Returns the name of this property
-     */  
+     */
     public String getPropertyName() {
 	return "font-weight";
     }
-    
+
     /**
      * Add this property to the CssStyle.
      *
@@ -135,13 +138,13 @@
 	}
 	style0.fontWeight = this;
     }
-    
+
     /**
      * Get this property in the style.
      *
      * @param style The style where the property is
      * @param resolve if true, resolve the style to find this property
-     */  
+     */
     public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
 	if (resolve) {
 	    return ((Css2Style) style).getFaceFontWeight();
@@ -149,32 +152,32 @@
 	    return ((Css2Style) style).fontWeight;
 	}
     }
-    
+
     /**
      * Compares two properties for equality.
      *
      * @param value The other property.
-     */  
+     */
     public boolean equals(CssProperty property) {
 	// @@TODO
 	return false;
     }
-    
+
     /**
      * Is the value of this property is a default value.
      * It is used by all macro for the function <code>print</code>
-     */  
+     */
     public boolean isDefault() {
 	return false;
     }
-    
+
     private boolean isCorrectWeight(int val) {
 	val = val / 100;
 	return val > 0 && val < 10;
     }
-    
+
     private static int[] hash_values;
-    
+
     static {
 	hash_values = new int[FONTWEIGHT.length];
 	for (int i=0; i<FONTWEIGHT.length; i++)

Index: Css2Style.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css2/font/Css2Style.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Css2Style.java	23 Aug 2005 16:33:50 -0000	1.1
+++ Css2Style.java	14 Sep 2005 15:14:58 -0000	1.2
@@ -23,7 +23,7 @@
     FontSize    fontSize;
     UnicodeRange    unicodeRange;
     UnitsPerEm unitsPerEm;
-    Src src; 
+    Src src;
     Panose1 panose1;
     Bbox bbox;
     Widths widths;
@@ -46,127 +46,127 @@
     public final FontFamily getFaceFontFamily() {
         return fontFamily;
     }
-    
+
     /**
      * Get the font-style property
      */
     public final FontStyle getFaceFontStyle() {
         return fontStyle;
     }
-    
+
     /**
      * Get the font-variant property
      */
     public final FontVariant getFaceFontVariant() {
         return fontVariant;
     }
-    
+
     /**
      * Get the font-weight property
      */
     public final FontWeight getFaceFontWeight() {
         return fontWeight;
     }
-    
+
     /**
      * Get the font-stretch property
      */
     public final FontStretch getFaceFontStretch() {
         return fontStretch;
     }
-    
+
     /**
      * Get the font-size property
      */
     public final FontSize getFaceFontSize() {
         return fontSize;
     }
-    
+
     /**
      * Get the unicode-range property
      */
     public final UnicodeRange getFaceUnicodeRange() {
         return unicodeRange;
     }
-    
-    
+
+
     /**
      * Get the units-per-em property
      */
     public final UnitsPerEm getUnitsPerEm() {
         return unitsPerEm;
     }
-    
+
     /**
      * Get the stemv property
      */
     public final Stemv getStemv() {
         return stemv;
     }
-    
+
     /**
      * Get the src property
      */
     public final Src getSrc() {
         return src;
     }
-    
+
     /**
      * Get the panose1 property
      */
     public final Panose1 getPanose1() {
         return panose1;
     }
-    
+
     /**
      * Get the widths property
      */
     public final Widths getWidths() {
         return widths;
     }
- 
+
     /**
      * Get the bbox property
      */
     public final Bbox getBbox() {
         return bbox;
     }
-    
+
     /**
      * Get the stemh property
      */
     public final Stemh getStemh() {
         return stemh;
     }
-    
+
     /**
      * Get the slope property
      */
     public final Slope getSlope() {
         return slope;
-    }  
-    
+    }
+
     /**
      * Get the ascent property
      */
     public final Ascent getAscent() {
         return ascent;
     }
-    
+
     /**
      * Get the descent property
      */
     public final Descent getDescent() {
         return descent;
     }
-    
+
     /**
      * Get the cap-height property
      */
     public final CapHeight getCapHeight() {
         return capHeight;
     }
-    
+
     /**
      * Get the x-height property
      */
@@ -180,14 +180,14 @@
     public final Baseline getBaseline() {
         return baseline;
     }
-    
+
     /**
      * Get the centerline property
      */
     public final Centerline getCenterline() {
         return centerline;
     }
-    
+
     /**
      * Get the mathline property
      */
@@ -201,7 +201,7 @@
     public final Topline getTopline() {
         return topline;
     }
-    
+
     /**
      * Get the definition-src property
      */
@@ -209,12 +209,12 @@
         return definitionSrc;
     }
 
-    
+
     /**
      * Print this style.
      *
      * @param printer The printer interface.
-     */  
+     */
     public void print(CssPrinterStyle printer) {
 	super.print(printer);
 	if (fontFamily != null) {

Index: Slope.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css2/font/Slope.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Slope.java	23 Aug 2005 16:33:50 -0000	1.1
+++ Slope.java	14 Sep 2005 15:14:58 -0000	1.2
@@ -19,22 +19,22 @@
 /**
  */
 public class Slope extends CssProperty {
-    
+
     CssValue value;
-    
+
     /**
      * Create a new Slope
      */
     public Slope() {
 	// nothing to do
     }
-    
+
     /**
      * Creates a new Slope
      *
      * @param expression the unicode em
      * @exception InvalidParamException values are incorrect
-     */  
+     */
     public Slope(ApplContext ac, CssExpression expression, boolean check)
     	throws InvalidParamException {
 	CssValue val = expression.getValue();
@@ -44,37 +44,37 @@
 	    value = val;
 	    expression.next();
 	} else {
-	    throw new InvalidParamException("value", expression.getValue(), 
+	    throw new InvalidParamException("value", expression.getValue(),
 					    getPropertyName(), ac);
 	}
     }
-    
+
     public Slope(ApplContext ac, CssExpression expression)
 	    throws InvalidParamException {
 	this(ac, expression, false);
     }
-    
+
     /**
      * Returns the current value
-     */  
+     */
     public Object get() {
 	return value;
     }
-    
+
     /**
      * Returns a string representation of the object.
      */
-    public String toString() {  
+    public String toString() {
 	return value.toString();
     }
-    
+
     /**
      * Returns the name of this property
-     */  
+     */
     public String getPropertyName() {
 	return "slope";
     }
-    
+
     /**
      * Add this property to the CssStyle.
      *
@@ -87,13 +87,13 @@
 	}
 	style0.slope = this;
     }
-    
+
     /**
      * Get this property in the style.
      *
      * @param style The style where the property is
      * @param resolve if true, resolve the style to find this property
-     */  
+     */
     public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
 	if (resolve) {
 	    return ((Css2Style) style).getSlope();
@@ -101,23 +101,23 @@
 	    return ((Css2Style) style).slope;
 	}
     }
-    
+
     /**
      * Compares two properties for equality.
      *
      * @param value The other property.
-     */  
+     */
     public boolean equals(CssProperty property) {
 	// @@TODO
 	return false;
     }
-    
+
     /**
      * Is the value of this property is a default value.
      * It is used by all macro for the function <code>print</code>
-     */  
+     */
     public boolean isDefault() {
 	return false;
     }
-    
+
 }

Index: Stemv.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css2/font/Stemv.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Stemv.java	23 Aug 2005 16:33:50 -0000	1.1
+++ Stemv.java	14 Sep 2005 15:14:58 -0000	1.2
@@ -19,22 +19,22 @@
 /**
  */
 public class Stemv extends CssProperty {
-    
+
     CssValue value;
-    
+
     /**
      * Create a new Stemv
      */
     public Stemv() {
 	// nothing to do
     }
-    
+
     /**
      * Creates a new Stemv
      *
      * @param expression the unicode em
      * @exception InvalidParamException values are incorrect
-     */  
+     */
     public Stemv(ApplContext ac, CssExpression expression, boolean check)
     	throws InvalidParamException {
 	CssValue val = expression.getValue();
@@ -44,37 +44,37 @@
 	    value = val;
 	    expression.next();
 	} else {
-	    throw new InvalidParamException("value", expression.getValue(), 
+	    throw new InvalidParamException("value", expression.getValue(),
 					    getPropertyName(), ac);
 	}
     }
-    
+
     public Stemv(ApplContext ac, CssExpression expression)
 	    throws InvalidParamException {
 	this(ac, expression, false);
     }
-    
+
     /**
      * Returns the current value
-     */  
+     */
     public Object get() {
 	return value;
     }
-    
+
     /**
      * Returns a string representation of the object.
      */
-    public String toString() {  
+    public String toString() {
 	return value.toString();
     }
-    
+
     /**
      * Returns the name of this property
-     */  
+     */
     public String getPropertyName() {
 	return "stemv";
     }
-    
+
     /**
      * Add this property to the CssStyle.
      *
@@ -87,13 +87,13 @@
 	}
 	style0.stemv = this;
     }
-    
+
     /**
      * Get this property in the style.
      *
      * @param style The style where the property is
      * @param resolve if true, resolve the style to find this property
-     */  
+     */
     public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
 	if (resolve) {
 	    return ((Css2Style) style).getStemv();
@@ -101,23 +101,23 @@
 	    return ((Css2Style) style).stemv;
 	}
     }
-    
+
     /**
      * Compares two properties for equality.
      *
      * @param value The other property.
-     */  
+     */
     public boolean equals(CssProperty property) {
 	// @@TODO
 	return false;
     }
-    
+
     /**
      * Is the value of this property is a default value.
      * It is used by all macro for the function <code>print</code>
-     */  
+     */
     public boolean isDefault() {
 	return false;
     }
-    
+
 }

Index: FontConstant.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css2/font/FontConstant.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- FontConstant.java	8 Sep 2005 12:24:01 -0000	1.2
+++ FontConstant.java	14 Sep 2005 15:14:58 -0000	1.3
@@ -13,26 +13,26 @@
 
   /**
    * Array of font-style values
-   */  
+   */
   static String[] FONTSTYLE = { "normal", "italic", "oblique" };
 
   /**
    * Array of font-variant values
-   */  
+   */
   static String[] FONTVARIANT = { "normal", "small-caps" };
 
   /**
    * Array of font-weight values
-   */  
+   */
     static String[] FONTWEIGHT = { "normal", "bold" };
-  
+
   /**
    * Array of font-stretch values
-   */  
-  static String[] FONTSTRETCH = { "normal", "wider", "narrower", 
-				  "ultra-condensed", "extra-condensed", 
-				  "condensed", "semi-condensed", 
+   */
+  static String[] FONTSTRETCH = { "normal", "wider", "narrower",
+				  "ultra-condensed", "extra-condensed",
+				  "condensed", "semi-condensed",
 				  "semi-expanded", "expanded", "extra-expanded",
 				  "ultra-expanded", "inherit" };
-  
+
 }

Index: Mathline.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css2/font/Mathline.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Mathline.java	23 Aug 2005 16:33:50 -0000	1.1
+++ Mathline.java	14 Sep 2005 15:14:58 -0000	1.2
@@ -19,22 +19,22 @@
 /**
  */
 public class Mathline extends CssProperty {
-    
+
     CssValue value;
-    
+
     /**
      * Create a new Mathline
      */
     public Mathline() {
 	// nothing to do
     }
-    
+
     /**
      * Creates a new Mathline
      *
      * @param expression the unicode em
      * @exception InvalidParamException values are incorrect
-     */  
+     */
     public Mathline(ApplContext ac, CssExpression expression, boolean check)
     	throws InvalidParamException {
 	CssValue val = expression.getValue();
@@ -44,37 +44,37 @@
 	    value = val;
 	    expression.next();
 	} else {
-	    throw new InvalidParamException("value", expression.getValue(), 
+	    throw new InvalidParamException("value", expression.getValue(),
 					    getPropertyName(), ac);
 	}
     }
-    
+
     public Mathline(ApplContext ac, CssExpression expression)
 	    throws InvalidParamException {
 	this(ac, expression, false);
     }
-    
+
     /**
      * Returns the current value
-     */  
+     */
     public Object get() {
 	return value;
     }
-    
+
     /**
      * Returns a string representation of the object.
      */
-    public String toString() {  
+    public String toString() {
 	return value.toString();
     }
-    
+
     /**
      * Returns the name of this property
-     */  
+     */
     public String getPropertyName() {
 	return "mathline";
     }
-    
+
     /**
      * Add this property to the CssStyle.
      *
@@ -87,13 +87,13 @@
 	}
 	style0.mathline = this;
     }
-    
+
     /**
      * Get this property in the style.
      *
      * @param style The style where the property is
      * @param resolve if true, resolve the style to find this property
-     */  
+     */
     public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
 	if (resolve) {
 	    return ((Css2Style) style).getMathline();
@@ -101,23 +101,23 @@
 	    return ((Css2Style) style).mathline;
 	}
     }
-    
+
     /**
      * Compares two properties for equality.
      *
      * @param value The other property.
-     */  
+     */
     public boolean equals(CssProperty property) {
 	// @@TODO
 	return false;
     }
-    
+
     /**
      * Is the value of this property is a default value.
      * It is used by all macro for the function <code>print</code>
-     */  
+     */
     public boolean isDefault() {
 	return false;
     }
-    
+
 }

Index: FontStretch.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css2/font/FontStretch.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- FontStretch.java	23 Aug 2005 16:33:50 -0000	1.1
+++ FontStretch.java	14 Sep 2005 15:14:58 -0000	1.2
@@ -22,9 +22,9 @@
 /**
  */
 public class FontStretch extends CssProperty implements FontConstant {
-    
+
     Vector values = new Vector();
-    
+
     private static CssIdent all = new CssIdent("all");
 
     /**
@@ -33,13 +33,13 @@
     public FontStretch() {
 	// nothing to do
     }
-    
+
     /**
      * Creates a new FontStretch
      *
      * @param expression the font stretch
      * @exception InvalidParamException values are incorrect
-     */  
+     */
     public FontStretch(ApplContext ac, CssExpression expression, boolean check)
     	throws InvalidParamException {
 	char op = expression.getOperator();
@@ -63,36 +63,36 @@
 		    }
 		}
 		if (i == FONTSTRETCH.length) {
-		    throw new InvalidParamException("value", 
-						    expression.getValue(), 
+		    throw new InvalidParamException("value",
+						    expression.getValue(),
 						    getPropertyName(), ac);
 		}
 	    } else {
-		throw new InvalidParamException("value", expression.getValue(), 
+		throw new InvalidParamException("value", expression.getValue(),
 						getPropertyName(), ac);
 	    }
 	    op = expression.getOperator();
 	    expression.next();
 	} while (op == CssOperator.COMMA);
-	
+
     }
-    
+
     public FontStretch(ApplContext ac, CssExpression expression)
 	    throws InvalidParamException {
 	this(ac, expression, false);
     }
-    
+
     /**
      * Returns the current value
-     */  
+     */
     public Object get() {
 	return values.elementAt(0);
     }
-    
+
     /**
      * Returns a string representation of the object.
      */
-    public String toString() {  
+    public String toString() {
 	String ret ="";
 	int i = 0;
 
@@ -103,14 +103,14 @@
 
 	return ret.substring(2);
     }
-    
+
     /**
      * Returns the name of this property
-     */  
+     */
     public String getPropertyName() {
 	return "font-stretch";
     }
-    
+
     /**
      * Add this property to the CssStyle.
      *
@@ -123,13 +123,13 @@
 	}
 	style0.fontStretch = this;
     }
-    
+
     /**
      * Get this property in the style.
      *
      * @param style The style where the property is
      * @param resolve if true, resolve the style to find this property
-     */  
+     */
     public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
 	if (resolve) {
 	    return ((Css2Style) style).getFaceFontStretch();
@@ -137,27 +137,27 @@
 	    return ((Css2Style) style).fontStretch;
 	}
     }
-    
+
     /**
      * Compares two properties for equality.
      *
      * @param value The other property.
-     */  
+     */
     public boolean equals(CssProperty property) {
 	// @@TODO
 	return false;
     }
-    
+
     /**
      * Is the value of this property is a default value.
      * It is used by all macro for the function <code>print</code>
-     */  
+     */
     public boolean isDefault() {
 	return false;
     }
-    
+
     private static int[] hash_values;
-    
+
     static {
 	hash_values = new int[FONTSTRETCH.length];
 	for (int i=0; i<FONTSTRETCH.length; i++)

Index: Widths.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css2/font/Widths.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Widths.java	23 Aug 2005 16:33:50 -0000	1.1
+++ Widths.java	14 Sep 2005 15:14:58 -0000	1.2
@@ -23,28 +23,28 @@
 /**
  */
 public class Widths extends CssProperty implements CssOperator {
-    
+
     Vector values = new Vector();
-    
+
     /**
      * Create a new Widths
      */
     public Widths() {
 	// nothing to do
     }
-    
+
     /**
      * Creates a new Widths
      *
      * @param expression the unicode em
      * @exception InvalidParamException values are incorrect
-     */  
+     */
     public Widths(ApplContext ac, CssExpression expression, boolean check)
     	throws InvalidParamException {
 	CssValue val;
 	char op;
 	int i = 0;
-	setByUser();	
+	setByUser();
 
 	do {
 	    val = expression.getValue();
@@ -52,15 +52,15 @@
 	    if (val instanceof CssUnicodeRange) {
 		values.addElement(val);
 		if (op != SPACE) {
-		    throw new InvalidParamException("operator", 
+		    throw new InvalidParamException("operator",
 						    new Character(op),
 						    getPropertyName(), ac);
 		}
 		if (expression.end()) {
-		    throw new InvalidParamException("few-value", 
+		    throw new InvalidParamException("few-value",
 						    getPropertyName(), ac);
 		}
-		expression.next();		
+		expression.next();
 	    }
 	    do {
 		op = expression.getOperator();
@@ -69,7 +69,7 @@
 		    values.addElement(" ");
 		    values.addElement(val);
 		} else {
-		    throw new InvalidParamException("value", 
+		    throw new InvalidParamException("value",
 						    val,
 						    getPropertyName(), ac);
 		}
@@ -79,23 +79,23 @@
 	} while (op == CssOperator.COMMA);
 
     }
-    
+
     public Widths(ApplContext ac, CssExpression expression)
 	    throws InvalidParamException {
 	this(ac, expression, false);
     }
-    
+
     /**
      * Returns the current value
-     */  
+     */
     public Object get() {
 	return values.elementAt(0);
     }
-    
+
     /**
      * Returns a string representation of the object.
      */
-    public String toString() {  
+    public String toString() {
 	String ret = "";
 	int i = 0;
 	while (i < (values.size() - 2)) {
@@ -104,14 +104,14 @@
 	}
 	return ret;
     }
-    
+
     /**
      * Returns the name of this property
-     */  
+     */
     public String getPropertyName() {
 	return "widths";
     }
-    
+
     /**
      * Add this property to the CssStyle.
      *
@@ -124,13 +124,13 @@
 	}
 	style0.widths = this;
     }
-    
+
     /**
      * Get this property in the style.
      *
      * @param style The style where the property is
      * @param resolve if true, resolve the style to find this property
-     */  
+     */
     public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
 	if (resolve) {
 	    return ((Css2Style) style).getWidths();
@@ -138,23 +138,23 @@
 	    return ((Css2Style) style).widths;
 	}
     }
-    
+
     /**
      * Compares two properties for equality.
      *
      * @param value The other property.
-     */  
+     */
     public boolean equals(CssProperty property) {
 	// @@TODO
 	return false;
     }
-    
+
     /**
      * Is the value of this property is a default value.
      * It is used by all macro for the function <code>print</code>
-     */  
+     */
     public boolean isDefault() {
 	return false;
     }
-    
+
 }

Index: Ascent.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css2/font/Ascent.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Ascent.java	23 Aug 2005 16:33:50 -0000	1.1
+++ Ascent.java	14 Sep 2005 15:14:58 -0000	1.2
@@ -19,22 +19,22 @@
 /**
  */
 public class Ascent extends CssProperty {
-    
+
     CssValue value;
-    
+
     /**
      * Create a new Ascent
      */
     public Ascent() {
 	// nothing to do
     }
-    
+
     /**
      * Creates a new Ascent
      *
      * @param expression the unicode em
      * @exception InvalidParamException values are incorrect
-     */  
+     */
     public Ascent(ApplContext ac, CssExpression expression, boolean check)
     	throws InvalidParamException {
 	CssValue val = expression.getValue();
@@ -44,37 +44,37 @@
 	    value = val;
 	    expression.next();
 	} else {
-	    throw new InvalidParamException("value", expression.getValue(), 
+	    throw new InvalidParamException("value", expression.getValue(),
 					    getPropertyName(), ac);
 	}
     }
-    
+
     public Ascent(ApplContext ac, CssExpression expression)
 	    throws InvalidParamException {
 	this(ac, expression, false);
     }
-    
+
     /**
      * Returns the current value
-     */  
+     */
     public Object get() {
 	return value;
     }
-    
+
     /**
      * Returns a string representation of the object.
      */
-    public String toString() {  
+    public String toString() {
 	return value.toString();
     }
-    
+
     /**
      * Returns the name of this property
-     */  
+     */
     public String getPropertyName() {
 	return "ascent";
     }
-    
+
     /**
      * Add this property to the CssStyle.
      *
@@ -87,13 +87,13 @@
 	}
 	style0.ascent = this;
     }
-    
+
     /**
      * Get this property in the style.
      *
      * @param style The style where the property is
      * @param resolve if true, resolve the style to find this property
-     */  
+     */
     public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
 	if (resolve) {
 	    return ((Css2Style) style).getAscent();
@@ -101,23 +101,23 @@
 	    return ((Css2Style) style).ascent;
 	}
     }
-    
+
     /**
      * Compares two properties for equality.
      *
      * @param value The other property.
-     */  
+     */
     public boolean equals(CssProperty property) {
 	// @@TODO
 	return false;
     }
-    
+
     /**
      * Is the value of this property is a default value.
      * It is used by all macro for the function <code>print</code>
-     */  
+     */
     public boolean isDefault() {
 	return false;
     }
-    
+
 }

Index: Panose1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css2/font/Panose1.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Panose1.java	23 Aug 2005 16:33:50 -0000	1.1
+++ Panose1.java	14 Sep 2005 15:14:58 -0000	1.2
@@ -20,28 +20,28 @@
 /**
  */
 public class Panose1 extends CssProperty {
-    
+
     CssValue[] value = new CssValue[10];
-    
+
     /**
      * Create a new Panose1
      */
     public Panose1() {
 	// nothing to do
     }
-    
+
     /**
      * Creates a new Panose1
      *
      * @param expression the unicode em
      * @exception InvalidParamException values are incorrect
-     */  
+     */
     public Panose1(ApplContext ac, CssExpression expression, boolean check)
     	throws InvalidParamException {
 	CssValue val;
 	char op;
 	int i = 0;
-	setByUser();	
+	setByUser();
 
 	do {
 	    val = expression.getValue();
@@ -53,46 +53,46 @@
 		throw new InvalidParamException("value", expression.getValue(),
 						getPropertyName(), ac);
 	    }
-	} while (!expression.end() 
+	} while (!expression.end()
 		 && (op == CssOperator.SPACE)
 		 && (i < 10));
 
 	if (i != 10) {
-	    throw new InvalidParamException("few-value", 
+	    throw new InvalidParamException("few-value",
 					    getPropertyName(), ac);
 	}
     }
-    
+
     public Panose1(ApplContext ac, CssExpression expression)
 	    throws InvalidParamException {
 	this(ac, expression, false);
     }
-    
+
     /**
      * Returns the current value
-     */  
+     */
     public Object get() {
 	return value[0];
     }
-    
+
     /**
      * Returns a string representation of the object.
      */
-    public String toString() {  
+    public String toString() {
 	String ret = "";
 	for (int i = 0; i < 10; i++) {
 	    ret += " " + value[i];
 	}
 	return ret.substring(1);
     }
-    
+
     /**
      * Returns the name of this property
-     */  
+     */
     public String getPropertyName() {
 	return "panose-1";
     }
-    
+
     /**
      * Add this property to the CssStyle.
      *
@@ -105,13 +105,13 @@
 	}
 	style0.panose1 = this;
     }
-    
+
     /**
      * Get this property in the style.
      *
      * @param style The style where the property is
      * @param resolve if true, resolve the style to find this property
-     */  
+     */
     public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
 	if (resolve) {
 	    return ((Css2Style) style).getPanose1();
@@ -119,23 +119,23 @@
 	    return ((Css2Style) style).panose1;
 	}
     }
-    
+
     /**
      * Compares two properties for equality.
      *
      * @param value The other property.
-     */  
+     */
     public boolean equals(CssProperty property) {
 	// @@TODO
 	return false;
     }
-    
+
     /**
      * Is the value of this property is a default value.
      * It is used by all macro for the function <code>print</code>
-     */  
+     */
     public boolean isDefault() {
 	return false;
     }
-    
+
 }

Index: Stemh.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css2/font/Stemh.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Stemh.java	23 Aug 2005 16:33:50 -0000	1.1
+++ Stemh.java	14 Sep 2005 15:14:58 -0000	1.2
@@ -19,22 +19,22 @@
 /**
  */
 public class Stemh extends CssProperty {
-    
+
     CssValue value;
-    
+
     /**
      * Create a new Stemh
      */
     public Stemh() {
 	// nothing to do
     }
-    
+
     /**
      * Creates a new Stemh
      *
      * @param expression the unicode em
      * @exception InvalidParamException values are incorrect
-     */  
+     */
     public Stemh(ApplContext ac, CssExpression expression, boolean check)
     	throws InvalidParamException {
 	CssValue val = expression.getValue();
@@ -44,37 +44,37 @@
 	    value = val;
 	    expression.next();
 	} else {
-	    throw new InvalidParamException("value", expression.getValue(), 
+	    throw new InvalidParamException("value", expression.getValue(),
 					    getPropertyName(), ac);
 	}
     }
-    
+
     public Stemh(ApplContext ac, CssExpression expression)
 	    throws InvalidParamException {
 	this(ac, expression, false);
     }
-    
+
     /**
      * Returns the current value
-     */  
+     */
     public Object get() {
 	return value;
     }
-    
+
     /**
      * Returns a string representation of the object.
      */
-    public String toString() {  
+    public String toString() {
 	return value.toString();
     }
-    
+
     /**
      * Returns the name of this property
-     */  
+     */
     public String getPropertyName() {
 	return "stemh";
     }
-    
+
     /**
      * Add this property to the CssStyle.
      *
@@ -87,13 +87,13 @@
 	}
 	style0.stemh = this;
     }
-    
+
     /**
      * Get this property in the style.
      *
      * @param style The style where the property is
      * @param resolve if true, resolve the style to find this property
-     */  
+     */
     public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
 	if (resolve) {
 	    return ((Css2Style) style).getStemh();
@@ -101,23 +101,23 @@
 	    return ((Css2Style) style).stemh;
 	}
     }
-    
+
     /**
      * Compares two properties for equality.
      *
      * @param value The other property.
-     */  
+     */
     public boolean equals(CssProperty property) {
 	// @@TODO
 	return false;
     }
-    
+
     /**
      * Is the value of this property is a default value.
      * It is used by all macro for the function <code>print</code>
-     */  
+     */
     public boolean isDefault() {
 	return false;
     }
-    
+
 }

Index: Src.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css2/font/Src.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Src.java	23 Aug 2005 16:33:50 -0000	1.1
+++ Src.java	14 Sep 2005 15:14:58 -0000	1.2
@@ -24,28 +24,28 @@
 /**
  * @version $Revision$
  */
-public class Src extends CssProperty 
+public class Src extends CssProperty
         implements CssOperator {
-    
+
     Vector values = new Vector();
-    
+
     /**
      * Create a new CssSrc
      */
     public Src() {
     }
-    
+
     /**
      * Create a new CssSrc
      *
      * @param expression The expression for this property
      * @exception InvalidParamException Values are incorrect
-     */  
-    public Src(ApplContext ac, CssExpression expression, boolean check) 
+     */
+    public Src(ApplContext ac, CssExpression expression, boolean check)
 	    throws InvalidParamException {
 	CssValue val;
 	char op;
-	
+
 	setByUser();
 	do {
 	    val = expression.getValue();
@@ -66,34 +66,34 @@
 		values.addElement(recognizeFontFaceName(ac, (CssFunction) val));
 		expression.next();
 	    } else {
-		throw new InvalidParamException("value", 
-						val.toString(), 
+		throw new InvalidParamException("value",
+						val.toString(),
 						getPropertyName(), ac);
 	    }
 	    // @@HACK
 	    values.addElement(", ");
 	} while (op == COMMA);
     }
-    
+
     public Src(ApplContext ac, CssExpression expression)
 	    throws InvalidParamException {
 	this(ac, expression, false);
     }
-    
+
     /**
      * Returns the value of this property
      */
     public Object get() {
 	return null;
     }
-    
+
     /**
      * Returns the name of this property
-     */  
+     */
     public String getPropertyName() {
 	return "src";
     }
-    
+
     /**
      * Returns a string representation of the object.
      */
@@ -105,7 +105,7 @@
 	}
 	return ret;
     }
-    
+
     /**
      * Add this property to the CssStyle.
      *
@@ -118,13 +118,13 @@
 	}
 	style0.src = this;
     }
-    
+
     /**
      * Get this property in the style.
      *
      * @param style The style where the property is
      * @param resolve if true, resolve the style to find this property
-     */  
+     */
     public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
 	if (resolve) {
 	    return ((Css2Style) style).getSrc();
@@ -132,25 +132,25 @@
 	    return ((Css2Style) style).src;
 	}
     }
-    
+
     /**
      * Compares two properties for equality.
      *
      * @param value The other property.
-     */  
+     */
     public boolean equals(CssProperty property) {
 	return false;
     }
-    
+
     /**
      * Is the value of this property is a default value.
      * It is used by all macro for the function <code>print</code>
-     */  
+     */
     public boolean isDefault() {
 	return false;
     }
-    
-    private CssFunction recognizeFormat(ApplContext ac, CssFunction val) 
+
+    private CssFunction recognizeFormat(ApplContext ac, CssFunction val)
 	    throws InvalidParamException {
 	if (val.getName().equals("format")) {
 	    CssExpression params = val.getParameters();
@@ -160,28 +160,28 @@
 		op = params.getOperator();
 		if (params.getValue() instanceof CssString) {
 		    // nothing
-		} else {		    
-		    throw new InvalidParamException("format", 
-						    val, 
+		} else {
+		    throw new InvalidParamException("format",
+						    val,
 						    getPropertyName(), ac);
 		}
 		params.next();
 	    } while (op == COMMA);
-	    if (!params.end()) { 
-		throw new InvalidParamException("format", 
-						val, 
+	    if (!params.end()) {
+		throw new InvalidParamException("format",
+						val,
 						getPropertyName(), ac);
 	    }
 	    params.starts();
 	    return val;
 	} else {
-	    throw new InvalidParamException("format", 
-					    val, 
+	    throw new InvalidParamException("format",
+					    val,
 					    getPropertyName(), ac);
 	}
     }
 
-    private CssFunction recognizeFontFaceName(ApplContext ac, CssFunction func) 
+    private CssFunction recognizeFontFaceName(ApplContext ac, CssFunction func)
 	    throws InvalidParamException {
 	if (func.getName().equals("local")) {
 	    CssExpression params = func.getParameters();
@@ -191,9 +191,9 @@
 	    if (params.getValue() instanceof CssString) {
 		if (params.getCount() == 1) {
 		    return func;
-		} else {		    
-		    throw new InvalidParamException("local", 
-						    func, 
+		} else {
+		    throw new InvalidParamException("local",
+						    func,
 						    getPropertyName(), ac);
 		}
 	    }
@@ -202,23 +202,23 @@
 		op = params.getOperator();
 		if (params.getValue() instanceof CssIdent) {
 		    // nothing
-		} else {		    
-		    throw new InvalidParamException("local", 
-						    func, 
+		} else {
+		    throw new InvalidParamException("local",
+						    func,
 						    getPropertyName(), ac);
 		}
 		params.next();
 	    } while (op == COMMA);
-	    if (!params.end()) { 
-		throw new InvalidParamException("local", 
-						func, 
+	    if (!params.end()) {
+		throw new InvalidParamException("local",
+						func,
 						getPropertyName(), ac);
 	    }
 	    params.starts();
 	    return func;
 	} else {
-	    throw new InvalidParamException("local", 
-					    func, 
+	    throw new InvalidParamException("local",
+					    func,
 					    getPropertyName(), ac);
 	}
     }

Index: XHeight.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css2/font/XHeight.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- XHeight.java	23 Aug 2005 16:33:50 -0000	1.1
+++ XHeight.java	14 Sep 2005 15:14:58 -0000	1.2
@@ -19,22 +19,22 @@
 /**
  */
 public class XHeight extends CssProperty {
-    
+
     CssValue value;
-    
+
     /**
      * Create a new XHeight
      */
     public XHeight() {
 	// nothing to do
     }
-    
+
     /**
      * Creates a new XHeight
      *
      * @param expression the unicode em
      * @exception InvalidParamException values are incorrect
-     */  
+     */
     public XHeight(ApplContext ac, CssExpression expression, boolean check)
     	throws InvalidParamException {
 	CssValue val = expression.getValue();
@@ -44,37 +44,37 @@
 	    value = val;
 	    expression.next();
 	} else {
-	    throw new InvalidParamException("value", expression.getValue(), 
+	    throw new InvalidParamException("value", expression.getValue(),
 					    getPropertyName(), ac);
 	}
     }
-    
+
     public XHeight(ApplContext ac, CssExpression expression)
 	    throws InvalidParamException {
 	this(ac, expression, false);
     }
-    
+
     /**
      * Returns the current value
-     */  
+     */
     public Object get() {
 	return value;
     }
-    
+
     /**
      * Returns a string representation of the object.
      */
-    public String toString() {  
+    public String toString() {
 	return value.toString();
     }
-    
+
     /**
      * Returns the name of this property
-     */  
+     */
     public String getPropertyName() {
 	return "x-height";
     }
-    
+
     /**
      * Add this property to the CssStyle.
      *
@@ -87,13 +87,13 @@
 	}
 	style0.xHeight = this;
     }
-    
+
     /**
      * Get this property in the style.
      *
      * @param style The style where the property is
      * @param resolve if true, resolve the style to find this property
-     */  
+     */
     public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
 	if (resolve) {
 	    return ((Css2Style) style).getXHeight();
@@ -101,23 +101,23 @@
 	    return ((Css2Style) style).xHeight;
 	}
     }
-    
+
     /**
      * Compares two properties for equality.
      *
      * @param value The other property.
-     */  
+     */
     public boolean equals(CssProperty property) {
 	// @@TODO
 	return false;
     }
-    
+
     /**
      * Is the value of this property is a default value.
      * It is used by all macro for the function <code>print</code>
-     */  
+     */
     public boolean isDefault() {
 	return false;
     }
-    
+
 }

Index: Centerline.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css2/font/Centerline.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Centerline.java	23 Aug 2005 16:33:50 -0000	1.1
+++ Centerline.java	14 Sep 2005 15:14:58 -0000	1.2
@@ -19,22 +19,22 @@
 /**
  */
 public class Centerline extends CssProperty {
-    
+
     CssValue value;
-    
+
     /**
      * Create a new Centerline
      */
     public Centerline() {
 	// nothing to do
     }
-    
+
     /**
      * Creates a new Centerline
      *
      * @param expression the unicode em
      * @exception InvalidParamException values are incorrect
-     */  
+     */
     public Centerline(ApplContext ac, CssExpression expression, boolean check)
     	throws InvalidParamException {
 	CssValue val = expression.getValue();
@@ -44,37 +44,37 @@
 	    value = val;
 	    expression.next();
 	} else {
-	    throw new InvalidParamException("value", expression.getValue(), 
+	    throw new InvalidParamException("value", expression.getValue(),
 					    getPropertyName(), ac);
 	}
     }
-    
+
     public Centerline(ApplContext ac, CssExpression expression)
 	    throws InvalidParamException {
 	this(ac, expression, false);
     }
-    
+
     /**
      * Returns the current value
-     */  
+     */
     public Object get() {
 	return value;
     }
-    
+
     /**
      * Returns a string representation of the object.
      */
-    public String toString() {  
+    public String toString() {
 	return value.toString();
     }
-    
+
     /**
      * Returns the name of this property
-     */  
+     */
     public String getPropertyName() {
 	return "centerline";
     }
-    
+
     /**
      * Add this property to the CssStyle.
      *
@@ -87,13 +87,13 @@
 	}
 	style0.centerline = this;
     }
-    
+
     /**
      * Get this property in the style.
      *
      * @param style The style where the property is
      * @param resolve if true, resolve the style to find this property
-     */  
+     */
     public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
 	if (resolve) {
 	    return ((Css2Style) style).getCenterline();
@@ -101,23 +101,23 @@
 	    return ((Css2Style) style).centerline;
 	}
     }
-    
+
     /**
      * Compares two properties for equality.
      *
      * @param value The other property.
-     */  
+     */
     public boolean equals(CssProperty property) {
 	// @@TODO
 	return false;
     }
-    
+
     /**
      * Is the value of this property is a default value.
      * It is used by all macro for the function <code>print</code>
-     */  
+     */
     public boolean isDefault() {
 	return false;
     }
-    
+
 }

Index: FontStyle.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css2/font/FontStyle.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- FontStyle.java	23 Aug 2005 16:33:50 -0000	1.1
+++ FontStyle.java	14 Sep 2005 15:14:58 -0000	1.2
@@ -22,9 +22,9 @@
 /**
  */
 public class FontStyle extends CssProperty implements FontConstant {
-    
+
     Vector values = new Vector();
-    
+
     private static CssIdent all = new CssIdent("all");
 
     /**
@@ -33,13 +33,13 @@
     public FontStyle() {
 	// nothing to do
     }
-    
+
     /**
      * Creates a new FontStyle
      *
      * @param expression the font style
      * @exception InvalidParamException values are incorrect
-     */  
+     */
     public FontStyle(ApplContext ac, CssExpression expression, boolean check)
     	throws InvalidParamException {
 	char op = expression.getOperator();
@@ -63,36 +63,36 @@
 		    }
 		}
 		if (i == FONTSTYLE.length) {
-		    throw new InvalidParamException("value", 
-						    expression.getValue(), 
+		    throw new InvalidParamException("value",
+						    expression.getValue(),
 						    getPropertyName(), ac);
 		}
 	    } else {
-		throw new InvalidParamException("value", expression.getValue(), 
+		throw new InvalidParamException("value", expression.getValue(),
 						getPropertyName(), ac);
 	    }
 	    op = expression.getOperator();
 	    expression.next();
 	} while (op == CssOperator.COMMA);
-	
+
     }
-    
+
     public FontStyle(ApplContext ac, CssExpression expression)
 	    throws InvalidParamException {
 	this(ac, expression, false);
     }
-    
+
     /**
      * Returns the current value
-     */  
+     */
     public Object get() {
 	return values.elementAt(0);
     }
-    
+
     /**
      * Returns a string representation of the object.
      */
-    public String toString() {  
+    public String toString() {
 	String ret ="";
 	int i = 0;
 
@@ -103,14 +103,14 @@
 
 	return ret.substring(2);
     }
-    
+
     /**
      * Returns the name of this property
-     */  
+     */
     public String getPropertyName() {
 	return "font-style";
     }
-    
+
     /**
      * Add this property to the CssStyle.
      *
@@ -123,13 +123,13 @@
 	}
 	style0.fontStyle = this;
     }
-    
+
     /**
      * Get this property in the style.
      *
      * @param style The style where the property is
      * @param resolve if true, resolve the style to find this property
-     */  
+     */
     public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
 	if (resolve) {
 	    return ((Css2Style) style).getFaceFontStyle();
@@ -137,27 +137,27 @@
 	    return ((Css2Style) style).fontStyle;
 	}
     }
-    
+
     /**
      * Compares two properties for equality.
      *
      * @param value The other property.
-     */  
+     */
     public boolean equals(CssProperty property) {
 	// @@TODO
 	return false;
     }
-    
+
     /**
      * Is the value of this property is a default value.
      * It is used by all macro for the function <code>print</code>
-     */  
+     */
     public boolean isDefault() {
 	return false;
     }
-    
+
     private static int[] hash_values;
-    
+
     static {
 	hash_values = new int[FONTSTYLE.length];
 	for (int i=0; i<FONTSTYLE.length; i++)
Received on Wednesday, 14 September 2005 15:17:07 UTC

This archive was generated by hypermail 2.4.0 : Friday, 17 January 2020 23:02:14 UTC