- From: CVS User ylafon <cvsmail@w3.org>
- Date: Mon, 17 Dec 2012 14:21:17 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2002/css-validator/org/w3c/css/properties/css2
In directory roscoe:/tmp/cvs-serv5817/css2
Modified Files:
Css2Style.java
Added Files:
CssVolume.java
Log Message:
volume per css2/css21 (and deprecated in css3)
--- /sources/public/2002/css-validator/org/w3c/css/properties/css2/Css2Style.java 2012/12/07 12:18:56 1.31
+++ /sources/public/2002/css-validator/org/w3c/css/properties/css2/Css2Style.java 2012/12/17 14:21:17 1.32
@@ -1,5 +1,5 @@
//
-// $Id: Css2Style.java,v 1.31 2012/12/07 12:18:56 ylafon Exp $
+// $Id: Css2Style.java,v 1.32 2012/12/17 14:21:17 ylafon Exp $
// From Philippe Le Hegaret (Philippe.Le_Hegaret@sophia.inria.fr)
//
// (c) COPYRIGHT MIT and INRIA, 1997.
@@ -8,6 +8,7 @@
import org.w3c.css.parser.CssSelectors;
import org.w3c.css.properties.aural.ACssStyle;
+import org.w3c.css.properties.css.CssAzimuth;
import org.w3c.css.properties.css.CssBorderCollapse;
import org.w3c.css.properties.css.CssBorderSpacing;
import org.w3c.css.properties.css.CssBottom;
@@ -17,6 +18,7 @@
import org.w3c.css.properties.css.CssCounterReset;
import org.w3c.css.properties.css.CssCursor;
import org.w3c.css.properties.css.CssDirection;
+import org.w3c.css.properties.css.CssElevation;
import org.w3c.css.properties.css.CssEmptyCells;
import org.w3c.css.properties.css.CssLeft;
import org.w3c.css.properties.css.CssMarkerOffset;
@@ -38,13 +40,14 @@
import org.w3c.css.properties.css.CssTop;
import org.w3c.css.properties.css.CssUnicodeBidi;
import org.w3c.css.properties.css.CssVisibility;
+import org.w3c.css.properties.css.CssVolume;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.Warning;
import org.w3c.css.util.Warnings;
import org.w3c.css.values.CssIdent;
/**
- * @version $Revision: 1.31 $
+ * @version $Revision: 1.32 $
*/
public class Css2Style extends ACssStyle {
@@ -52,8 +55,9 @@
/**
* aural properties
*/
- public org.w3c.css.properties.css.CssAzimuth cssAzimuth;
- public org.w3c.css.properties.css.CssElevation cssElevation;
+ public CssAzimuth cssAzimuth;
+ public CssElevation cssElevation;
+ public CssVolume cssVolume;
/**
* font properties
@@ -492,6 +496,15 @@
}
return cssSpeakHeader;
}
+
+ public final CssVolume getVolume() {
+ if (cssVolume == null) {
+ cssVolume =
+ (CssVolume) style.CascadingOrder(new CssVolume(),
+ style, selector);
+ }
+ return cssVolume;
+ }
/**
* Find conflicts in this Style
*
--- /sources/public/2002/css-validator/org/w3c/css/properties/css2/CssVolume.java 2012/12/17 14:21:17 NONE
+++ /sources/public/2002/css-validator/org/w3c/css/properties/css2/CssVolume.java 2012/12/17 14:21:17 1.1
// $Id: CssVolume.java,v 1.1 2012/12/17 14:21:17 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.CssNumber;
import org.w3c.css.values.CssPercentage;
import org.w3c.css.values.CssTypes;
import org.w3c.css.values.CssValue;
/**
* @pec http://www.w3.org/TR/2008/REC-CSS2-20080411/aural.html#volume-props
*/
public class CssVolume extends org.w3c.css.properties.css.CssVolume {
public static final CssIdent[] allowed_values;
static {
String[] _allowed_values = {"silent", "x-soft", "soft", "medium", "loud", "x-loud"};
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 CssVolume
*/
public CssVolume() {
}
/**
* Creates a new CssVolume
*
* @param expression The expression for this property
* @throws org.w3c.css.util.InvalidParamException
* Expressions are incorrect
*/
public CssVolume(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.warnPositiveness(ac, this);
n.warnLowerEqualThan(ac, 100, this);
// FIXME clip to 100
value = val;
break;
case CssTypes.CSS_PERCENTAGE:
CssPercentage p = val.getPercentage();
p.warnPositiveness(ac, this);
p.warnLowerEqualThan(ac, 100, this);
value = val;
break;
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 CssVolume(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
}
Received on Monday, 17 December 2012 14:21:25 UTC