- From: Yves Lafon via cvs-syncmail <cvsmail@w3.org>
- Date: Mon, 03 Sep 2012 20:35:47 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2002/css-validator/org/w3c/css/properties/css3
In directory hutz:/tmp/cvs-serv14259/css3
Modified Files:
Css3Style.java
Added Files:
CssTextIndent.java
Removed Files:
CssTextIndentCSS3.java
Log Message:
text-indent per http://www.w3.org/TR/2012/WD-css3-text-20120814/#text-indent0
Index: Css3Style.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css3/Css3Style.java,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- Css3Style.java 3 Sep 2012 09:39:22 -0000 1.61
+++ Css3Style.java 3 Sep 2012 20:35:45 -0000 1.62
@@ -202,7 +202,6 @@
CssMarqueeStyle cssMarqueeStyle;
- CssTextIndentCSS3 cssTextIndentCSS3;
CssBlockProgression cssBlockProgression;
@@ -1449,15 +1448,6 @@
}
///
- public CssTextIndentCSS3 getTextIndentCSS3() {
- if (cssTextIndentCSS3 == null) {
- cssTextIndentCSS3 =
- (CssTextIndentCSS3) style.CascadingOrder(
- new CssTextIndentCSS3(), style, selector);
- }
- return cssTextIndentCSS3;
- }
-
public CssBlockProgression getBlockProgression() {
if (cssBlockProgression == null) {
cssBlockProgression =
--- CssTextIndentCSS3.java DELETED ---
--- NEW FILE: CssTextIndent.java ---
// $Id: CssTextIndent.java,v 1.1 2012/09/03 20:35:45 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.CssNumber;
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-indent0
*/
public class CssTextIndent extends org.w3c.css.properties.css.CssTextIndent {
public static final CssIdent hanging, each_line;
static {
hanging = CssIdent.getIdent("hanging");
each_line = CssIdent.getIdent("each-line");
}
/**
* Create a new CssTextIndent
*/
public CssTextIndent() {
value = initial;
}
/**
* Creates a new CssTextIndent
*
* @param expression The expression for this property
* @throws org.w3c.css.util.InvalidParamException
* Expressions are incorrect
*/
public CssTextIndent(ApplContext ac, CssExpression expression, boolean check)
throws InvalidParamException {
if (check && expression.getCount() > 3) {
throw new InvalidParamException("unrecognize", ac);
}
setByUser();
CssValue val;
char op;
CssValue sizeVal = null;
CssValue hangVal = null;
CssValue eachVal = null;
while (!expression.end()) {
val = expression.getValue();
op = expression.getOperator();
switch (val.getType()) {
case CssTypes.CSS_NUMBER:
val = ((CssNumber) val).getLength();
case CssTypes.CSS_LENGTH:
case CssTypes.CSS_PERCENTAGE:
if (sizeVal != null) {
throw new InvalidParamException("value",
val.toString(), getPropertyName(), ac);
}
sizeVal = val;
// we check that we are at the beginning or at the end
// as it can't happen between two idents.
if ((hangVal != null || eachVal != null) && expression.getRemainingCount() > 1) {
// TODO specific error (can't happen between...)
throw new InvalidParamException("value",
val.toString(), getPropertyName(), ac);
}
break;
case CssTypes.CSS_IDENT:
CssIdent ident = (CssIdent) val;
if (inherit.equals(ident)) {
value = inherit;
if (check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
break;
}
if (hangVal == null && hanging.equals(ident)) {
hangVal = hanging;
break;
}
if (eachVal == null && each_line.equals(ident)) {
eachVal = each_line;
break;
}
default:
throw new InvalidParamException("value",
expression.getValue().toString(),
getPropertyName(), ac);
}
expression.next();
}
// sanity check, we must have a length or percentage
if (value != inherit) {
if (sizeVal == null) {
throw new InvalidParamException("value",
expression.toString(), getPropertyName(), ac);
}
if (expression.getCount() == 1) {
value = sizeVal;
} else {
ArrayList<CssValue> v = new ArrayList<CssValue>(4);
v.add(sizeVal);
if (hangVal != null) {
v.add(hangVal);
}
if (eachVal != null) {
v.add(eachVal);
}
value = new CssValueList(v);
}
}
}
public CssTextIndent(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
}
Received on Monday, 3 September 2012 20:35:49 UTC