- From: CVS User ylafon <cvsmail@w3.org>
- Date: Fri, 04 Jan 2013 15:41:45 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2002/css-validator/org/w3c/css/properties/css3
In directory roscoe:/tmp/cvs-serv18270/css3
Modified Files:
Css3Style.java
Added Files:
CssVoiceBalance.java
Log Message:
voice-balance per http://www.w3.org/TR/2012/CR-css3-speech-20120320/#voice-balance
--- /sources/public/2002/css-validator/org/w3c/css/properties/css3/Css3Style.java 2012/12/06 19:16:43 1.144
+++ /sources/public/2002/css-validator/org/w3c/css/properties/css3/Css3Style.java 2013/01/04 15:41:44 1.145
@@ -1,6 +1,6 @@
//
-// $Id: Css3Style.java,v 1.144 2012/12/06 19:16:43 ylafon Exp $
+// $Id: Css3Style.java,v 1.145 2013/01/04 15:41:44 ylafon Exp $
// From Sijtsche de Jong (sy.de.jong@let.rug.nl)
//
// COPYRIGHT (c) 1995-2000 World Wide Web Consortium, (MIT, INRIA, Keio University)
@@ -110,6 +110,9 @@
import org.w3c.css.properties.css.CssTransitionDuration;
import org.w3c.css.properties.css.CssTransitionProperty;
import org.w3c.css.properties.css.CssTransitionTimingFunction;
+import org.w3c.css.properties.css.CssVoiceStress;
+import org.w3c.css.properties.css.CssVoiceDuration;
+import org.w3c.css.properties.css.CssVoiceBalance;
import org.w3c.css.properties.css.CssWordBreak;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.Util;
@@ -118,6 +121,10 @@
public class Css3Style extends ATSCStyle {
+ public CssVoiceBalance cssVoiceBalance;
+ public CssVoiceDuration cssVoiceDuration;
+ public CssVoiceStress cssVoiceStress;
+
CssRubyPosition cssRubyPosition;
CssRubyAlign cssRubyAlign;
CssRubyOverhang cssRubyOverhang;
@@ -1453,6 +1460,33 @@
}
return cssImageResolution;
}
+
+ public final CssVoiceBalance getVoiceBalance() {
+ if (cssVoiceBalance == null) {
+ cssVoiceBalance =
+ (CssVoiceBalance) style.CascadingOrder(new CssVoiceBalance(),
+ style, selector);
+ }
+ return cssVoiceBalance;
+ }
+
+ public final CssVoiceStress getVoiceStress() {
+ if (cssVoiceStress == null) {
+ cssVoiceStress =
+ (CssVoiceStress) style.CascadingOrder(new CssVoiceStress(),
+ style, selector);
+ }
+ return cssVoiceStress;
+ }
+
+ public final CssVoiceDuration getVoiceDuration() {
+ if (cssVoiceDuration == null) {
+ cssVoiceDuration =
+ (CssVoiceDuration) style.CascadingOrder(new CssVoiceDuration(),
+ style, selector);
+ }
+ return cssVoiceDuration;
+ }
///
/**
--- /sources/public/2002/css-validator/org/w3c/css/properties/css3/CssVoiceBalance.java 2013/01/04 15:41:45 NONE
+++ /sources/public/2002/css-validator/org/w3c/css/properties/css3/CssVoiceBalance.java 2013/01/04 15:41:45 1.1
// $Id: CssVoiceBalance.java,v 1.1 2013/01/04 15:41:44 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.CssNumber;
import org.w3c.css.values.CssTypes;
import org.w3c.css.values.CssValue;
/**
* @spec http://www.w3.org/TR/2012/CR-css3-speech-20120320/#voice-balance
*/
public class CssVoiceBalance extends org.w3c.css.properties.css.CssVoiceBalance {
public static final CssIdent[] allowed_values;
static {
String[] _allowed_values = {"left", "center", "right", "leftwards", "rightwards"};
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 CssVoiceBalance
*/
public CssVoiceBalance() {
value = initial;
}
/**
* Creates a new CssVoiceBalance
*
* @param expression The expression for this property
* @throws org.w3c.css.util.InvalidParamException
* Expressions are incorrect
*/
public CssVoiceBalance(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_NUMBER:
CssNumber n = val.getNumber();
n.warnLowerEqualThan(ac, 100., this);
n.warnGreaterEqualThan(ac, -100., this);
value = val;
break;
case CssTypes.CSS_IDENT:
CssIdent id = (CssIdent) val;
if (inherit.equals(id)) {
value = inherit;
break;
}
value = getAllowedIdent(id);
if (value != null) {
break;
}
default:
throw new InvalidParamException("value",
val.toString(),
getPropertyName(), ac);
}
expression.next();
}
public CssVoiceBalance(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
}
Received on Friday, 4 January 2013 15:41:45 UTC