- From: CVS User ylafon <cvsmail@w3.org>
- Date: Wed, 02 Jan 2013 10:52:59 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2002/css-validator/org/w3c/css/properties/css3
In directory roscoe:/tmp/cvs-serv30781/css3
Modified Files:
CssSpeakHeader.java
Added Files:
CssSpeakNumeral.java
Log Message:
speak-numeral
--- /sources/public/2002/css-validator/org/w3c/css/properties/css3/CssSpeakHeader.java 2012/12/17 15:11:45 1.2
+++ /sources/public/2002/css-validator/org/w3c/css/properties/css3/CssSpeakHeader.java 2013/01/02 10:52:59 1.3
@@ -1,4 +1,4 @@
-// $Id: CssSpeakHeader.java,v 1.2 2012/12/17 15:11:45 ylafon Exp $
+// $Id: CssSpeakHeader.java,v 1.3 2013/01/02 10:52:59 ylafon Exp $
// Author: Yves Lafon <ylafon@w3.org>
//
// (c) COPYRIGHT MIT, ERCIM and Keio University, 2012.
@@ -42,6 +42,7 @@
* Create a new CssSpeakHeader
*/
public CssSpeakHeader() {
+ value = initial;
}
/**
--- /sources/public/2002/css-validator/org/w3c/css/properties/css3/CssSpeakNumeral.java 2013/01/02 10:52:59 NONE
+++ /sources/public/2002/css-validator/org/w3c/css/properties/css3/CssSpeakNumeral.java 2013/01/02 10:52:59 1.1
// $Id: CssSpeakNumeral.java,v 1.1 2013/01/02 10:52:59 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.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.CssTypes;
import org.w3c.css.values.CssValue;
/**
* @spec http://www.w3.org/TR/2011/REC-CSS2-20110607/aural.html#propdef-speak-numeral
*/
public class CssSpeakNumeral extends org.w3c.css.properties.css.CssSpeakNumeral {
public static final CssIdent[] allowed_values;
static {
String[] _allowed_values = {"digits", "continuous"};
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 CssSpeakNumeral
*/
public CssSpeakNumeral() {
value = initial;
}
/**
* Creates a new CssSpeakNumeral
*
* @param expression The expression for this property
* @throws org.w3c.css.util.InvalidParamException
* Expressions are incorrect
*/
public CssSpeakNumeral(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();
// same as CSS21 plus a warning
ac.getFrame().addWarning("deprecatedproperty", getPropertyName());
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 CssSpeakNumeral(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
}
Received on Wednesday, 2 January 2013 10:53:03 UTC