- From: CVS User ylafon <cvsmail@w3.org>
- Date: Tue, 18 Dec 2012 09:48:00 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2002/css-validator/org/w3c/css/properties/css2
In directory roscoe:/tmp/cvs-serv29626/css2
Modified Files:
Css2Style.java
Added Files:
CssSpeak.java
Log Message:
speak per css2/css21 and css3 http://www.w3.org/TR/2012/CR-css3-speech-20120320/#speaking-props-speak
--- /sources/public/2002/css-validator/org/w3c/css/properties/css2/Css2Style.java 2012/12/17 14:21:17 1.32
+++ /sources/public/2002/css-validator/org/w3c/css/properties/css2/Css2Style.java 2012/12/18 09:47:59 1.33
@@ -1,5 +1,5 @@
//
-// $Id: Css2Style.java,v 1.32 2012/12/17 14:21:17 ylafon Exp $
+// $Id: Css2Style.java,v 1.33 2012/12/18 09:47:59 ylafon Exp $
// From Philippe Le Hegaret (Philippe.Le_Hegaret@sophia.inria.fr)
//
// (c) COPYRIGHT MIT and INRIA, 1997.
@@ -34,6 +34,7 @@
import org.w3c.css.properties.css.CssPosition;
import org.w3c.css.properties.css.CssQuotes;
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.CssTableLayout;
import org.w3c.css.properties.css.CssTextShadow;
@@ -47,7 +48,7 @@
import org.w3c.css.values.CssIdent;
/**
- * @version $Revision: 1.32 $
+ * @version $Revision: 1.33 $
*/
public class Css2Style extends ACssStyle {
@@ -58,6 +59,7 @@
public CssAzimuth cssAzimuth;
public CssElevation cssElevation;
public CssVolume cssVolume;
+ public CssSpeak cssSpeak;
/**
* font properties
@@ -505,6 +507,15 @@
}
return cssVolume;
}
+
+ public final CssSpeak getSpeak() {
+ if (cssSpeak == null) {
+ cssSpeak =
+ (CssSpeak) style.CascadingOrder(new CssSpeak(),
+ style, selector);
+ }
+ return cssSpeak;
+ }
/**
* Find conflicts in this Style
*
--- /sources/public/2002/css-validator/org/w3c/css/properties/css2/CssSpeak.java 2012/12/18 09:48:00 NONE
+++ /sources/public/2002/css-validator/org/w3c/css/properties/css2/CssSpeak.java 2012/12/18 09:48:00 1.1
// $Id: CssSpeak.java,v 1.1 2012/12/18 09:48:00 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;
/**
* @pec http://www.w3.org/TR/2008/REC-CSS2-20080411/aural.html#speaking-props
*/
public class CssSpeak extends org.w3c.css.properties.css.CssSpeak {
public static final CssIdent[] allowed_values;
static {
String[] _allowed_values = {"normal", "none", "spell-out"};
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 CssSpeak
*/
public CssSpeak() {
}
/**
* Creates a new CssSpeak
*
* @param expression The expression for this property
* @throws org.w3c.css.util.InvalidParamException
* Expressions are incorrect
*/
public CssSpeak(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_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 CssSpeak(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
}
Received on Tuesday, 18 December 2012 09:48:06 UTC