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: Wed, 02 Jan 2013 10:33:10 +0000
Message-Id: <E1TqLdG-0006la-WB@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-serv25778/css2

Modified Files:
	Css2Style.java 
Added Files:
	CssSpeakPunctuation.java 
Log Message:
speak-punctuation

--- /sources/public/2002/css-validator/org/w3c/css/properties/css2/Css2Style.java	2012/12/21 15:55:50	1.34
+++ /sources/public/2002/css-validator/org/w3c/css/properties/css2/Css2Style.java	2013/01/02 10:33:10	1.35
@@ -1,5 +1,5 @@
 //
-// $Id: Css2Style.java,v 1.34 2012/12/21 15:55:50 ylafon Exp $
+// $Id: Css2Style.java,v 1.35 2013/01/02 10:33:10 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.CssSpeakPunctuation;
 import org.w3c.css.properties.css.CssSpeechRate;
 import org.w3c.css.properties.css.CssTableLayout;
 import org.w3c.css.properties.css.CssTextShadow;
@@ -49,7 +50,7 @@
 import org.w3c.css.values.CssIdent;
 
 /**
- * @version $Revision: 1.34 $
+ * @version $Revision: 1.35 $
  */
 public class Css2Style extends ACssStyle {
 
@@ -62,6 +63,7 @@
 	public CssVolume cssVolume;
 	public CssSpeak cssSpeak;
 	public CssSpeechRate cssSpeechRate;
+	public CssSpeakPunctuation cssSpeakPunctuation;
 
 	/**
 	 * font properties
@@ -527,7 +529,15 @@
 		}
 		return cssSpeechRate;
 	}
-	
+
+	public final CssSpeakPunctuation getSpeakPunctuation() {
+		if (cssSpeakPunctuation == null) {
+			cssSpeakPunctuation =
+					(CssSpeakPunctuation) style.CascadingOrder(new CssSpeakPunctuation(),
+							style, selector);
+		}
+		return cssSpeakPunctuation;
+	}
 	/**
 	 * Find conflicts in this Style
 	 *

--- /sources/public/2002/css-validator/org/w3c/css/properties/css2/CssSpeakPunctuation.java	2013/01/02 10:33:10	NONE
+++ /sources/public/2002/css-validator/org/w3c/css/properties/css2/CssSpeakPunctuation.java	2013/01/02 10:33:10	1.1
// $Id: CssSpeakPunctuation.java,v 1.1 2013/01/02 10:33:10 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.CssTypes;
import org.w3c.css.values.CssValue;

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

	public static final CssIdent[] allowed_values;

	static {
		String[] _allowed_values = {"code", "none"};
		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 CssSpeakHeader
	 */
	public CssSpeakPunctuation() {
	}

	/**
	 * Creates a new CssSpeakPunctuation
	 *
	 * @param expression The expression for this property
	 * @throws org.w3c.css.util.InvalidParamException
	 *          Expressions are incorrect
	 */
	public CssSpeakPunctuation(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();

		if (val.getType() == CssTypes.CSS_IDENT) {
			CssIdent id = (CssIdent) val;
			if (inherit.equals(id)) {
				value = inherit;
			} else {
				value = getAllowedIdent(id);
				if (value == null) {
					throw new InvalidParamException("value",
							val.toString(),
							getPropertyName(), ac);
				}
			}
		} else {
			throw new InvalidParamException("value",
					val.toString(),
					getPropertyName(), ac);
		}
		expression.next();
	}

	public CssSpeakPunctuation(ApplContext ac, CssExpression expression)
			throws InvalidParamException {
		this(ac, expression, false);
	}
}
Received on Wednesday, 2 January 2013 10:33:12 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Wednesday, 2 January 2013 10:33:12 GMT