- From: CVS User ylafon <cvsmail@w3.org>
- Date: Thu, 10 Jan 2013 11:34:20 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2002/css-validator/org/w3c/css/properties/css3
In directory roscoe:/tmp/cvs-serv22011/css3
Modified Files:
Css3Style.java
Added Files:
CssSpeakAs.java
Log Message:
speak-as per http://www.w3.org/TR/2012/CR-css3-speech-20120320/#speak-as
--- /sources/public/2002/css-validator/org/w3c/css/properties/css3/Css3Style.java 2013/01/09 09:10:06 1.150
+++ /sources/public/2002/css-validator/org/w3c/css/properties/css3/Css3Style.java 2013/01/10 11:34:20 1.151
@@ -1,6 +1,6 @@
//
-// $Id: Css3Style.java,v 1.150 2013/01/09 09:10:06 ylafon Exp $
+// $Id: Css3Style.java,v 1.151 2013/01/10 11:34:20 ylafon Exp $
// From Sijtsche de Jong (sy.de.jong@let.rug.nl)
//
// COPYRIGHT (c) 1995-2000 World Wide Web Consortium, (MIT, INRIA, Keio University)
@@ -92,6 +92,7 @@
import org.w3c.css.properties.css.CssRest;
import org.w3c.css.properties.css.CssRestAfter;
import org.w3c.css.properties.css.CssRestBefore;
+import org.w3c.css.properties.css.CssSpeakAs;
import org.w3c.css.properties.css.CssTabSize;
import org.w3c.css.properties.css.CssTextAlignLast;
import org.w3c.css.properties.css.CssTextDecorationColor;
@@ -134,8 +135,9 @@
public CssRestAfter cssRestAfter;
public CssRestBefore cssRestBefore;
public CssRest cssRest;
+ public CssSpeakAs cssSpeakAs;
+
-
CssRubyPosition cssRubyPosition;
CssRubyAlign cssRubyAlign;
CssRubyOverhang cssRubyOverhang;
@@ -471,7 +473,7 @@
}
return cssColumnSpan;
}
-
+
public CssColumnWidth getColumnWidth() {
if (cssColumnWidth == null) {
cssColumnWidth =
@@ -1543,6 +1545,13 @@
}
return cssRest;
}
+
+ public final CssSpeakAs getSpeakAs() {
+ if (cssSpeakAs == null) {
+ cssSpeakAs = (CssSpeakAs) style.CascadingOrder(new CssSpeakAs(), style, selector);
+ }
+ return cssSpeakAs;
+ }
///
/**
--- /sources/public/2002/css-validator/org/w3c/css/properties/css3/CssSpeakAs.java 2013/01/10 11:34:20 NONE
+++ /sources/public/2002/css-validator/org/w3c/css/properties/css3/CssSpeakAs.java 2013/01/10 11:34:20 1.1
// $Id: CssSpeakAs.java,v 1.1 2013/01/10 11:34:20 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.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/#speak-as
*/
public class CssSpeakAs extends org.w3c.css.properties.css.CssSpeakAs {
public static final CssIdent normal, spell_out, digits;
public static final CssIdent[] punctuation_values;
static {
normal = CssIdent.getIdent("normal");
spell_out = CssIdent.getIdent("spell-out");
digits = CssIdent.getIdent("digits");
String[] _punctuation_values = {"literal-punctuation", "no-punctuation"};
punctuation_values = new CssIdent[_punctuation_values.length];
int i = 0;
for (String s : _punctuation_values) {
punctuation_values[i++] = CssIdent.getIdent(s);
}
}
static CssIdent getPunctuation(CssIdent ident) {
for (CssIdent id : punctuation_values) {
if (id.equals(ident)) {
return id;
}
}
return null;
}
/**
* Create a new CssSpeakAs
*/
public CssSpeakAs() {
value = initial;
}
/**
* Creates a new CssSpeakAs
*
* @param expression The expression for this property
* @throws org.w3c.css.util.InvalidParamException
* Expressions are incorrect
*/
public CssSpeakAs(ApplContext ac, CssExpression expression, boolean check)
throws InvalidParamException {
if (check && expression.getCount() > 3) {
throw new InvalidParamException("unrecognize", ac);
}
setByUser();
CssValue val;
char op;
CssValue spellVal = null;
CssValue digitVal = null;
CssValue punctVal = null;
while (!expression.end()) {
val = expression.getValue();
op = expression.getOperator();
switch (val.getType()) {
case CssTypes.CSS_IDENT:
CssIdent id = (CssIdent) val;
if (inherit.equals(id)) {
if (expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
value = inherit;
break;
}
if (normal.equals(id)) {
if (expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
value = normal;
break;
}
if (spellVal == null) {
if (spell_out.equals(id)) {
spellVal = id;
value = id;
break;
}
}
if (digitVal == null) {
if (digits.equals(id)) {
digitVal = digits;
value = id;
break;
}
}
if (punctVal == null) {
punctVal = getPunctuation(id);
if (punctVal != null) {
value = id;
break;
}
}
// let it fail if unrecognized
default:
throw new InvalidParamException("value", val,
getPropertyName(), ac);
}
if (op != SPACE) {
throw new InvalidParamException("operator",
((new Character(op)).toString()), ac);
}
expression.next();
}
// now construct the value...
if (expression.getCount() > 1) {
ArrayList<CssValue> v = new ArrayList<CssValue>(4);
if (spellVal != null) {
v.add(spellVal);
}
if (digitVal != null) {
v.add(digitVal);
}
if (punctVal != null) {
v.add(punctVal);
}
value = new CssValueList(v);
}
}
public CssSpeakAs(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
}
Received on Thursday, 10 January 2013 11:34:21 UTC