- From: Yves Lafon via cvs-syncmail <cvsmail@w3.org>
- Date: Fri, 31 Aug 2012 19:52:37 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2002/css-validator/org/w3c/css/properties/css3
In directory hutz:/tmp/cvs-serv18761/css3
Modified Files:
Css3Style.java
Added Files:
CssTextEmphasisStyle.java
Log Message:
text-emphasis-style per http://www.w3.org/TR/2012/WD-css3-text-20120814/#text-emphasis-style0
Index: Css3Style.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css3/Css3Style.java,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- Css3Style.java 31 Aug 2012 14:04:19 -0000 1.55
+++ Css3Style.java 31 Aug 2012 19:52:34 -0000 1.56
@@ -47,6 +47,7 @@
import org.w3c.css.properties.css.CssTextDecorationColor;
import org.w3c.css.properties.css.CssTextDecorationStyle;
import org.w3c.css.properties.css.CssTextEmphasisColor;
+import org.w3c.css.properties.css.CssTextEmphasisStyle;
import org.w3c.css.properties.css.CssTextJustify;
import org.w3c.css.properties.css.CssWordBreak;
import org.w3c.css.util.ApplContext;
@@ -148,6 +149,7 @@
public CssTextDecorationStyle cssTextDecorationStyle;
public CssTextDecorationColor cssTextDecorationColor;
public CssTextEmphasisColor cssTextEmphasisColor;
+ public CssTextEmphasisStyle cssTextEmphasisStyle;
public CssTabSize cssTabSize;
CssDropInitialAfterAdjust cssDropInitialAfterAdjust;
@@ -1432,6 +1434,15 @@
return cssTextEmphasisColor;
}
+ public CssTextEmphasisStyle getTextEmphasisStyle() {
+ if (cssTextEmphasisStyle == null) {
+ cssTextEmphasisStyle =
+ (CssTextEmphasisStyle) style.CascadingOrder(
+ new CssTextEmphasisStyle(), style, selector);
+ }
+ return cssTextEmphasisStyle;
+ }
+
public CssTabSize getTabSize() {
if (cssTabSize == null) {
cssTabSize =
--- NEW FILE: CssTextEmphasisStyle.java ---
// $Id: CssTextEmphasisStyle.java,v 1.1 2012/08/31 19:52:35 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.CssString;
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-emphasis-style01
*/
public class CssTextEmphasisStyle extends org.w3c.css.properties.css.CssTextEmphasisStyle {
public static final CssIdent[] shapeStyle;
public static final CssIdent[] shapeForm;
static {
String[] _shapeStyle = {"filled", "open"};
String[] _shapeForm = {"dot", "circle", "double", "circle", "triangle", "sesame"};
shapeStyle = new CssIdent[_shapeStyle.length];
int i = 0;
for (String s : _shapeStyle) {
shapeStyle[i++] = CssIdent.getIdent(s);
}
shapeForm = new CssIdent[_shapeForm.length];
i = 0;
for (String s : _shapeForm) {
shapeForm[i++] = CssIdent.getIdent(s);
}
}
public static final CssIdent getShapeStyle(CssIdent ident) {
for (CssIdent id : shapeStyle) {
if (id.equals(ident)) {
return id;
}
}
return null;
}
public static final CssIdent getShapeForm(CssIdent ident) {
for (CssIdent id : shapeForm) {
if (id.equals(ident)) {
return id;
}
}
return null;
}
public static final CssIdent getAllowedValue(CssIdent ident) {
if (none.equals(ident)) {
return none;
}
CssIdent v = getShapeStyle(ident);
if (v == null) {
v = getShapeForm(ident);
}
return v;
}
/**
* Create a new CssTextEmphasisStyle
*/
public CssTextEmphasisStyle() {
value = initial;
}
/**
* Creates a new CssTextEmphasisStyle
*
* @param expression The expression for this property
* @throws org.w3c.css.util.InvalidParamException
* Expressions are incorrect
*/
public CssTextEmphasisStyle(ApplContext ac, CssExpression expression, boolean check)
throws InvalidParamException {
if (check && expression.getCount() > 2) {
throw new InvalidParamException("unrecognize", ac);
}
setByUser();
CssValue val;
char op;
CssIdent styleValue = null;
CssIdent formValue = null;
val = expression.getValue();
op = expression.getOperator();
switch (val.getType()) {
case CssTypes.CSS_STRING:
CssString s = (CssString) val;
// limit of 1 character + two surrounding quotes
// TODO might be a warning only
if (s.toString().length() != 3) {
throw new InvalidParamException("value",
s, getPropertyName(), ac);
}
if (check && expression.getCount() != 1) {
throw new InvalidParamException("value",
val.toString(),
getPropertyName(), ac);
}
value = s;
break;
case CssTypes.CSS_IDENT:
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 {
boolean match = false;
int nbgot = 0;
do {
match = false;
if (styleValue == null) {
styleValue = getShapeStyle(ident);
match = (styleValue != null);
}
if (!match && formValue == null) {
formValue = getShapeForm(ident);
match = (formValue != null);
}
if (!match) {
throw new InvalidParamException("value",
val.toString(),
getPropertyName(), ac);
}
nbgot++;
if (expression.getRemainingCount() == 1 || (nbgot == 2)) {
// 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
if (formValue != null && styleValue != null) {
ArrayList<CssValue> v = new ArrayList<CssValue>(2);
v.add(styleValue);
v.add(formValue);
value = new CssValueList(v);
} else {
value = (formValue == null) ? styleValue : formValue;
}
}
break;
default:
throw new InvalidParamException("value",
val.toString(),
getPropertyName(), ac);
}
expression.next();
}
public CssTextEmphasisStyle(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
}
Received on Friday, 31 August 2012 19:52:39 UTC