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

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

From: CVS User ylafon <cvsmail@w3.org>
Date: Tue, 08 Jan 2013 11:13:38 +0000
Message-Id: <E1TsX7i-0001Ij-L0@roscoe.w3.org>
To: www-validator-cvs@w3.org
Update of /sources/public/2002/css-validator/org/w3c/css/properties/css2
In directory roscoe:/tmp/cvs-serv4867/css2

Modified Files:
	Css2Style.java 
Added Files:
	CssVoiceFamily.java 
Log Message:
voice-family per css2/21 and css3 http://www.w3.org/TR/2012/CR-css3-speech-20120320/#voice-props-voice-family

--- /sources/public/2002/css-validator/org/w3c/css/properties/css2/Css2Style.java	2013/01/06 21:06:48	1.46
+++ /sources/public/2002/css-validator/org/w3c/css/properties/css2/Css2Style.java	2013/01/08 11:13:38	1.47
@@ -1,5 +1,5 @@
 //
-// $Id: Css2Style.java,v 1.46 2013/01/06 21:06:48 ylafon Exp $
+// $Id: Css2Style.java,v 1.47 2013/01/08 11:13:38 ylafon Exp $
 // From Philippe Le Hegaret (Philippe.Le_Hegaret@sophia.inria.fr)
 //
 // (c) COPYRIGHT MIT and INRIA, 1997.
@@ -55,6 +55,7 @@
 import org.w3c.css.properties.css.CssTop;
 import org.w3c.css.properties.css.CssUnicodeBidi;
 import org.w3c.css.properties.css.CssVisibility;
+import org.w3c.css.properties.css.CssVoiceFamily;
 import org.w3c.css.properties.css.CssVolume;
 import org.w3c.css.util.ApplContext;
 import org.w3c.css.util.Warning;
@@ -62,7 +63,7 @@
 import org.w3c.css.values.CssIdent;
 
 /**
- * @version $Revision: 1.46 $
+ * @version $Revision: 1.47 $
  */
 public class Css2Style extends ACssStyle {
 
@@ -88,7 +89,7 @@
 	public CssPauseBefore cssPauseBefore;
 	public CssPause cssPause;
 	public CssPlayDuring cssPlayDuring;
-
+	public CssVoiceFamily cssVoiceFamily;
 
 	/**
 	 * font properties
@@ -671,6 +672,15 @@
 		}
 		return cssPlayDuring;
 	}
+
+	public final CssVoiceFamily getVoiceFamily() {
+		if (cssVoiceFamily == null) {
+			cssVoiceFamily =
+					(CssVoiceFamily) style.CascadingOrder(new CssVoiceFamily(),
+							style, selector);
+		}
+		return cssVoiceFamily;
+	}
 	
 	/**
 	 * Find conflicts in this Style

--- /sources/public/2002/css-validator/org/w3c/css/properties/css2/CssVoiceFamily.java	2013/01/08 11:13:38	NONE
+++ /sources/public/2002/css-validator/org/w3c/css/properties/css2/CssVoiceFamily.java	2013/01/08 11:13:38	1.1
// $Id: CssVoiceFamily.java,v 1.1 2013/01/08 11:13:38 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.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.CssLayerList;
import org.w3c.css.values.CssTypes;
import org.w3c.css.values.CssValue;

import java.util.ArrayList;

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

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

	public static final ArrayList<CssIdent> genericVoices;

	static {
		String[] _genericVoices = {"male", "female", "child"};

		genericVoices = new ArrayList<CssIdent>(_genericVoices.length);
		for (String s : _genericVoices) {
			genericVoices.add(CssIdent.getIdent(s));
		}
	}

	static CssIdent getGenericVoiceName(CssIdent ident) {
		for (CssIdent id : genericVoices) {
			if (id.equals(ident)) {
				return id;
			}
		}
		return null;
	}

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

	/**
	 * Creates a new CssVoiceFamily
	 *
	 * @param expression The expression for this property
	 * @throws org.w3c.css.util.InvalidParamException
	 *          Expressions are incorrect
	 */
	public CssVoiceFamily(ApplContext ac, CssExpression expression, boolean check)
			throws InvalidParamException {
		ArrayList<CssValue> values = new ArrayList<CssValue>();

		while (!expression.end()) {
			char op = expression.getOperator();
			CssValue val = expression.getValue();
			switch (val.getType()) {
				case CssTypes.CSS_STRING:
					String s = val.toString();
					values.add(val);
					break;
				case CssTypes.CSS_IDENT:
					ArrayList<CssIdent> idval = new ArrayList<CssIdent>();
					idval.add((CssIdent) val);
					// we add idents if separated by spaces...
					while (op == SPACE && expression.getRemainingCount() > 1) {
						expression.next();
						op = expression.getOperator();
						val = expression.getValue();
						if (val.getType() == CssTypes.CSS_IDENT) {
							idval.add((CssIdent) val);
						} else {
							throw new InvalidParamException("value", val,
									getPropertyName(), ac);
						}
					}
					checkExpression(ac, values, idval, check);
					break;
				default:
					throw new InvalidParamException("value", val,
							getPropertyName(), ac);
			}
			expression.next();
			if (!expression.end() && (op != COMMA)) {
				throw new InvalidParamException("operator",
						((new Character(op)).toString()), ac);
			}
		}
		checkValues(ac, values);
		value = (values.size() > 1) ? new CssLayerList(values) : values.get(0);
	}

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

	private void checkExpression(ApplContext ac, ArrayList<CssValue> curval,
								 ArrayList<CssIdent> values, boolean check) {
		CssIdent val;
		if (values.size() > 1) {
			// create a value out of that.
			StringBuilder sb = new StringBuilder();
			boolean addSpace = false;
			for (CssIdent id : values) {
				if (addSpace) {
					sb.append(' ');
				} else {
					addSpace = true;
				}
				sb.append(id);
			}
			ac.getFrame().addWarning("with-space", 1);
			val = new CssIdent(sb.toString());
		} else {
			val = values.get(0);
			// could be done in the consistency check, but...
			if (null != getGenericVoiceName(val)) {
				hasGenericVoiceFamily = true;
			}
			if (inherit.equals(val)) {
				val = inherit;
			}
		}
		curval.add(val);
	}

	// final consistency check
	private void checkValues(ApplContext ac, ArrayList<CssValue> values)
			throws InvalidParamException {
		// we need to check that we don't have 'inherit' in multiple values
		if (values.size() > 1) {
			for (CssValue val : values) {
				if (inherit.equals(val)) {
					throw new InvalidParamException("unrecognize", ac);
				}
			}
		}
		if (inherit != value && !hasGenericVoiceFamily) {
			ac.getFrame().addWarning("no-generic-family", getPropertyName());
		}
	}
}
Received on Tuesday, 8 January 2013 11:13:43 GMT

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