- From: Yves Lafon via cvs-syncmail <cvsmail@w3.org>
- Date: Sat, 01 Sep 2012 20:21:15 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2002/css-validator/org/w3c/css/properties/css3
In directory hutz:/tmp/cvs-serv25702/css3
Modified Files:
Css3Style.java
Added Files:
CssTextDecorationSkip.java
Log Message:
text-decoration-skip per http://www.w3.org/TR/2012/WD-css3-text-20120814/#text-decoration-skip0
--- NEW FILE: CssTextDecorationSkip.java ---
// $Id: CssTextDecorationSkip.java,v 1.1 2012/09/01 20:21:12 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.CssOperator;
import org.w3c.css.values.CssTypes;
import org.w3c.css.values.CssValue;
import org.w3c.css.values.CssValueList;
import java.util.ArrayList;
/**
* @spec http://www.w3.org/TR/2012/WD-css3-text-20120814/#text-decoration-skip0
*/
public class CssTextDecorationSkip extends org.w3c.css.properties.css.CssTextDecorationSkip {
// objects || spaces || ink || edges
public static final CssIdent edges, spaces, ink, objects;
static {
edges = CssIdent.getIdent("edges");
spaces = CssIdent.getIdent("spaces");
ink = CssIdent.getIdent("ink");
objects = CssIdent.getIdent("objects");
}
public static final CssIdent getAllowedValue(CssIdent ident) {
if (edges.equals(ident)) {
return edges;
}
if (spaces.equals(ident)) {
return spaces;
}
if (ink.equals(ident)) {
return ink;
}
if (objects.equals(ident)) {
return objects;
}
return null;
}
/**
* Create a new CssTextDecorationSkip
*/
public CssTextDecorationSkip() {
value = initial;
}
/**
* Creates a new CssTextDecorationSkip
*
* @param expression The expression for this property
* @throws org.w3c.css.util.InvalidParamException
* Expressions are incorrect
*/
public CssTextDecorationSkip(ApplContext ac, CssExpression expression, boolean check)
throws InvalidParamException {
if (check && expression.getCount() > 4) {
throw new InvalidParamException("unrecognize", ac);
}
setByUser();
CssValue val;
char op;
CssIdent edgValue = null;
CssIdent spaValue = null;
CssIdent inkValue = null;
CssIdent objValue = null;
val = expression.getValue();
op = expression.getOperator();
if (val.getType() != CssTypes.CSS_IDENT) {
throw new InvalidParamException("value",
val.toString(),
getPropertyName(), ac);
}
CssIdent ident = (CssIdent) val;
if (inherit.equals(ident)) {
value = inherit;
if (check && expression.getCount() != 1) {
throw new InvalidParamException("value",
val.toString(),
getPropertyName(), ac);
}
} else if (none.equals(ident)) {
value = none;
if (check && expression.getCount() != 1) {
throw new InvalidParamException("value",
val.toString(),
getPropertyName(), ac);
}
} else {
int nbgot = 0;
do {
if (edgValue == null && edges.equals(ident)) {
edgValue = edges;
} else if (spaValue == null && spaces.equals(ident)) {
spaValue = spaces;
} else if (inkValue == null && ink.equals(ident)) {
inkValue = ink;
} else if (objValue == null && objects.equals(ident)) {
objValue = objects;
} else {
throw new InvalidParamException("value",
val.toString(),
getPropertyName(), ac);
}
nbgot++;
if (expression.getRemainingCount() == 1 || (!check && nbgot == 4)) {
// if we have both, exit
// (needed only if check == false...
break;
}
if (op != CssOperator.SPACE) {
throw new InvalidParamException("operator",
((new Character(op)).toString()), ac);
}
expression.next();
val = expression.getValue();
op = expression.getOperator();
if (val.getType() != CssTypes.CSS_IDENT) {
throw new InvalidParamException("value",
val.toString(),
getPropertyName(), ac);
}
ident = (CssIdent) val;
} while (!expression.end());
// now construct the value
ArrayList<CssValue> v = new ArrayList<CssValue>(nbgot);
if (edgValue != null) {
v.add(edgValue);
}
if (spaValue != null) {
v.add(spaValue);
}
if (inkValue != null) {
v.add(inkValue);
}
if (objValue != null) {
v.add(objValue);
}
value = (nbgot > 1) ? new CssValueList(v) : v.get(0);
}
expression.next();
}
public CssTextDecorationSkip(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
}
Index: Css3Style.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css3/Css3Style.java,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- Css3Style.java 1 Sep 2012 16:55:50 -0000 1.58
+++ Css3Style.java 1 Sep 2012 20:21:12 -0000 1.59
@@ -46,6 +46,7 @@
import org.w3c.css.properties.css.CssTextAlignLast;
import org.w3c.css.properties.css.CssTextDecorationColor;
import org.w3c.css.properties.css.CssTextDecorationLine;
+import org.w3c.css.properties.css.CssTextDecorationSkip;
import org.w3c.css.properties.css.CssTextDecorationStyle;
import org.w3c.css.properties.css.CssTextEmphasisColor;
import org.w3c.css.properties.css.CssTextEmphasisPosition;
@@ -148,9 +149,10 @@
public CssLineBreak cssLineBreak;
public CssTextAlignLast cssTextAlignLast;
public CssTextJustify cssTextJustify;
- public CssTextDecorationStyle cssTextDecorationStyle;
public CssTextDecorationColor cssTextDecorationColor;
public CssTextDecorationLine cssTextDecorationLine;
+ public CssTextDecorationSkip cssTextDecorationSkip;
+ public CssTextDecorationStyle cssTextDecorationStyle;
public CssTextEmphasisColor cssTextEmphasisColor;
public CssTextEmphasisPosition cssTextEmphasisPosition;
public CssTextEmphasisStyle cssTextEmphasisStyle;
@@ -1437,6 +1439,15 @@
}
return cssTextDecorationLine;
}
+
+ public CssTextDecorationSkip getTextDecorationSkip() {
+ if (cssTextDecorationSkip == null) {
+ cssTextDecorationSkip =
+ (CssTextDecorationSkip) style.CascadingOrder(
+ new CssTextDecorationSkip(), style, selector);
+ }
+ return cssTextDecorationSkip;
+ }
public CssTextEmphasisColor getTextEmphasisColor() {
if (cssTextEmphasisColor == null) {
Received on Saturday, 1 September 2012 20:21:16 UTC