W3C home > Mailing lists > Public > www-validator-cvs@w3.org > January 2013

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

From: CVS User ylafon <cvsmail@w3.org>
Date: Tue, 08 Jan 2013 13:30:13 +0000
Message-Id: <E1TsZFt-0000jE-QN@roscoe.w3.org>
To: www-validator-cvs@w3.org
Update of /sources/public/2002/css-validator/org/w3c/css/properties/css3
In directory roscoe:/tmp/cvs-serv2751/css3

Modified Files:
	Css3Style.java 
Added Files:
	CssVoiceRate.java 
Log Message:
voice-rate per http://www.w3.org/TR/2012/CR-css3-speech-20120320/#voice-props-voice-rate

--- /sources/public/2002/css-validator/org/w3c/css/properties/css3/Css3Style.java	2013/01/04 15:41:44	1.145
+++ /sources/public/2002/css-validator/org/w3c/css/properties/css3/Css3Style.java	2013/01/08 13:30:13	1.146
@@ -1,6 +1,6 @@
 //
 
-// $Id: Css3Style.java,v 1.145 2013/01/04 15:41:44 ylafon Exp $
+// $Id: Css3Style.java,v 1.146 2013/01/08 13:30:13 ylafon Exp $
 // From Sijtsche de Jong (sy.de.jong@let.rug.nl)
 //
 // COPYRIGHT (c) 1995-2000 World Wide Web Consortium, (MIT, INRIA, Keio University)
@@ -113,6 +113,7 @@
 import org.w3c.css.properties.css.CssVoiceStress;
 import org.w3c.css.properties.css.CssVoiceDuration;
 import org.w3c.css.properties.css.CssVoiceBalance;
+import org.w3c.css.properties.css.CssVoiceRate;
 import org.w3c.css.properties.css.CssWordBreak;
 import org.w3c.css.util.ApplContext;
 import org.w3c.css.util.Util;
@@ -123,7 +124,9 @@
 
 	public CssVoiceBalance cssVoiceBalance;
 	public CssVoiceDuration cssVoiceDuration;
+	public CssVoiceRate cssVoiceRate;
 	public CssVoiceStress cssVoiceStress;
+
 	
 	CssRubyPosition cssRubyPosition;
 	CssRubyAlign cssRubyAlign;
@@ -1487,6 +1490,15 @@
 		}
 		return cssVoiceDuration;
 	}
+
+	public final CssVoiceRate getVoiceRate() {
+		if (cssVoiceRate == null) {
+			cssVoiceRate =
+					(CssVoiceRate) style.CascadingOrder(new CssVoiceRate(),
+							style, selector);
+		}
+		return cssVoiceRate;
+	}
 	///
 
 	/**

--- /sources/public/2002/css-validator/org/w3c/css/properties/css3/CssVoiceRate.java	2013/01/08 13:30:13	NONE
+++ /sources/public/2002/css-validator/org/w3c/css/properties/css3/CssVoiceRate.java	2013/01/08 13:30:13	1.1
// $Id: CssVoiceRate.java,v 1.1 2013/01/08 13:30:13 ylafon Exp $
// Author: Yves Lafon <ylafon@w3.org>
//
// (c) COPYRIGHT MIT, ERCIM and Keio University, 2013.
// Please first read the full copyright statement in file COPYRIGHT.html
package org.w3c.css.properties.css3;

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

import java.util.ArrayList;

import static org.w3c.css.values.CssOperator.SPACE;

/**
 * @spec http://www.w3.org/TR/2012/CR-css3-speech-20120320/#voice-props-voice-rate
 */
public class CssVoiceRate extends org.w3c.css.properties.css.CssVoiceRate {

	public static final CssIdent[] allowed_values;

	static {
		String[] _allowed_values = {"normal", "x-slow", "slow", "medium", "fast", "x-fast"};
		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 CssVoiceRate
	 */
	public CssVoiceRate() {
		value = initial;
	}

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

		CssValue val;
		char op;

		CssValue pctValue = null;
		CssValue ideValue = null;

		while (!expression.end()) {
			val = expression.getValue();
			op = expression.getOperator();
			switch (val.getType()) {
				case CssTypes.CSS_PERCENTAGE:
					CssPercentage p = val.getPercentage();
					p.checkPositiveness(ac, this);
					if (pctValue != null) {
						throw new InvalidParamException("value",
								val.toString(),
								getPropertyName(), ac);
					}
					pctValue = val;
					break;
				case CssTypes.CSS_IDENT:
					CssIdent id = (CssIdent) val;
					if (inherit.equals(id)) {
						if (expression.getCount() > 1) {
							throw new InvalidParamException("value",
									inherit,
									getPropertyName(), ac);
						}
						value = inherit;
						break;
					} else {
						if (ideValue == null) {
							ideValue = getAllowedIdent(id);
							if (ideValue != null) {
								break;
							}
						}
					}
				default:
					throw new InvalidParamException("value",
							val.toString(),
							getPropertyName(), ac);
			}
			if (op != SPACE) {
				throw new InvalidParamException("operator",
						((new Character(op)).toString()), ac);
			}
			expression.next();
		}
		// now check what we have...
		if (value != inherit) {
			ArrayList<CssValue> v = new ArrayList<CssValue>(2);
			if (ideValue != null) {
				v.add(ideValue);
			}
			if (pctValue != null) {
				v.add(pctValue);
			}
			value = (v.size() == 1) ? v.get(0) : new CssValueList(v);
		}
	}

	public CssVoiceRate(ApplContext ac, CssExpression expression)
			throws InvalidParamException {
		this(ac, expression, false);
	}
}
Received on Tuesday, 8 January 2013 13:30:15 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Tuesday, 8 January 2013 13:30:15 GMT