CVS 2002/css-validator/org/w3c/css/properties/css2

Update of /sources/public/2002/css-validator/org/w3c/css/properties/css2
In directory roscoe:/tmp/cvs-serv700/css2

Modified Files:
	Css2Style.java 
Added Files:
	CssSpeechRate.java 
Log Message:
speech-rate + deprecation in CSS3

--- /sources/public/2002/css-validator/org/w3c/css/properties/css2/Css2Style.java	2012/12/18 09:47:59	1.33
+++ /sources/public/2002/css-validator/org/w3c/css/properties/css2/Css2Style.java	2012/12/21 15:55:50	1.34
@@ -1,5 +1,5 @@
 //
-// $Id: Css2Style.java,v 1.33 2012/12/18 09:47:59 ylafon Exp $
+// $Id: Css2Style.java,v 1.34 2012/12/21 15:55:50 ylafon Exp $
 // From Philippe Le Hegaret (Philippe.Le_Hegaret@sophia.inria.fr)
 //
 // (c) COPYRIGHT MIT and INRIA, 1997.
@@ -36,6 +36,7 @@
 import org.w3c.css.properties.css.CssRight;
 import org.w3c.css.properties.css.CssSpeak;
 import org.w3c.css.properties.css.CssSpeakHeader;
+import org.w3c.css.properties.css.CssSpeechRate;
 import org.w3c.css.properties.css.CssTableLayout;
 import org.w3c.css.properties.css.CssTextShadow;
 import org.w3c.css.properties.css.CssTop;
@@ -48,7 +49,7 @@
 import org.w3c.css.values.CssIdent;
 
 /**
- * @version $Revision: 1.33 $
+ * @version $Revision: 1.34 $
  */
 public class Css2Style extends ACssStyle {
 
@@ -60,6 +61,7 @@
 	public CssElevation cssElevation;
 	public CssVolume cssVolume;
 	public CssSpeak cssSpeak;
+	public CssSpeechRate cssSpeechRate;
 
 	/**
 	 * font properties
@@ -516,6 +518,16 @@
 		}
 		return cssSpeak;
 	}
+
+	public final CssSpeechRate getSpeechRate() {
+		if (cssSpeechRate == null) {
+			cssSpeechRate =
+					(CssSpeechRate) style.CascadingOrder(new CssSpeechRate(),
+							style, selector);
+		}
+		return cssSpeechRate;
+	}
+	
 	/**
 	 * Find conflicts in this Style
 	 *

--- /sources/public/2002/css-validator/org/w3c/css/properties/css2/CssSpeechRate.java	2012/12/21 15:55:51	NONE
+++ /sources/public/2002/css-validator/org/w3c/css/properties/css2/CssSpeechRate.java	2012/12/21 15:55:51	1.1
// $Id: CssSpeechRate.java,v 1.1 2012/12/21 15:55:51 ylafon Exp $
// Author: Yves Lafon <ylafon@w3.org>
//
// (c) COPYRIGHT MIT, ERCIM and Keio University, 2012.
// Please first read the full copyright statement in file COPYRIGHT.html
package org.w3c.css.properties.css2;

import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
import org.w3c.css.values.CssIdent;
import org.w3c.css.values.CssNumber;
import org.w3c.css.values.CssTypes;
import org.w3c.css.values.CssValue;

/**
 * @spec http://www.w3.org/TR/2008/REC-CSS2-20080411/aural.html#propdef-speech-rate
 */
public class CssSpeechRate extends org.w3c.css.properties.css.CssSpeechRate {

	public static final CssIdent[] allowed_values;

	static {
		String[] _allowed_values = {"x-slow", "slow", "medium",
				"fast", "x-fast", "faster", "slower"};
		int i = 0;
		allowed_values = new CssIdent[_allowed_values.length];
		for (String s : _allowed_values) {
			allowed_values[i++] = CssIdent.getIdent(s);
		}
	}

	public static final CssIdent getAllowedIdent(CssIdent ident) {
		for (CssIdent id : allowed_values) {
			if (id.equals(ident)) {
				return id;
			}
		}
		return null;
	}

	/**
	 * Create a new CssSpeechRate
	 */
	public CssSpeechRate() {
	}

	/**
	 * Creates a new CssSpeechRate
	 *
	 * @param expression The expression for this property
	 * @throws org.w3c.css.util.InvalidParamException
	 *          Expressions are incorrect
	 */
	public CssSpeechRate(ApplContext ac, CssExpression expression, boolean check)
			throws InvalidParamException {
		if (check && expression.getCount() > 1) {
			throw new InvalidParamException("unrecognize", ac);
		}
		setByUser();

		CssValue val;
		char op;

		val = expression.getValue();
		op = expression.getOperator();

		switch (val.getType()) {
			case CssTypes.CSS_NUMBER:
				CssNumber n = val.getNumber();
				n.checkStrictPositiveness(ac, this);
				value = val;
				break;
			case CssTypes.CSS_IDENT:
				CssIdent id = (CssIdent) val;
				if (inherit.equals(id)) {
					value = inherit;
					break;
				} else {
					value = getAllowedIdent(id);
					if (value != null) {
						break;
					}
				}
			default:
				throw new InvalidParamException("value",
						val.toString(),
						getPropertyName(), ac);
		}
		expression.next();
	}

	public CssSpeechRate(ApplContext ac, CssExpression expression)
			throws InvalidParamException {
		this(ac, expression, false);
	}
}

Received on Friday, 21 December 2012 15:55:56 UTC