- From: Yves Lafon via cvs-syncmail <cvsmail@w3.org>
- Date: Sun, 19 Aug 2012 17:28:27 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2002/css-validator/org/w3c/css/properties/css3
In directory hutz:/tmp/cvs-serv11585
Modified Files:
CssFontSize.java CssFontStretch.java CssFontStyle.java
CssFontVariantAlternates.java CssFontVariantCaps.java
CssFontVariantEastAsian.java CssFontVariantLigatures.java
CssFontVariantNumeric.java CssFontVariantPosition.java
CssFontWeight.java
Log Message:
ignore case
Index: CssFontVariantAlternates.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css3/CssFontVariantAlternates.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssFontVariantAlternates.java 18 Aug 2012 20:30:28 -0000 1.1
+++ CssFontVariantAlternates.java 19 Aug 2012 17:28:25 -0000 1.2
@@ -35,7 +35,7 @@
}
public static final CssIdent getContextualAltValues(CssIdent ident) {
- String s_id = ident.toString();
+ String s_id = ident.toString().toLowerCase();
for (String s : contextualAltValues) {
if (s_id.equals(s)) {
return ident;
Index: CssFontStretch.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css3/CssFontStretch.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssFontStretch.java 4 Aug 2012 21:17:07 -0000 1.1
+++ CssFontStretch.java 19 Aug 2012 17:28:25 -0000 1.2
@@ -25,7 +25,7 @@
static final HashMap<String, CssIdent> allowed_values;
static {
- allowed_values = new HashMap<String, CssIdent>();
+ allowed_values = new HashMap<String, CssIdent>(_allowed_values.length);
for (String s : _allowed_values) {
allowed_values.put(s, CssIdent.getIdent(s));
}
@@ -63,7 +63,7 @@
if (inherit.equals(ident)) {
value = inherit;
} else {
- value = allowed_values.get(val.toString());
+ value = allowed_values.get(val.toString().toLowerCase());
if (value == null) {
throw new InvalidParamException("value",
val.toString(),
Index: CssFontVariantCaps.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css3/CssFontVariantCaps.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssFontVariantCaps.java 7 Aug 2012 12:09:17 -0000 1.1
+++ CssFontVariantCaps.java 19 Aug 2012 17:28:25 -0000 1.2
@@ -65,7 +65,7 @@
} else if (normal.equals(ident)) {
value = normal;
} else {
- value = capsValues.get(ident.toString());
+ value = capsValues.get(ident.toString().toLowerCase());
if (value == null) {
throw new InvalidParamException("value",
val.toString(),
Index: CssFontStyle.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css3/CssFontStyle.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssFontStyle.java 4 Aug 2012 21:17:07 -0000 1.1
+++ CssFontStyle.java 19 Aug 2012 17:28:25 -0000 1.2
@@ -23,7 +23,7 @@
static final ArrayList<CssIdent> allowed_values;
static {
- allowed_values = new ArrayList<CssIdent>(3);
+ allowed_values = new ArrayList<CssIdent>(_allowed_values.length);
for (String s : _allowed_values) {
allowed_values.add(CssIdent.getIdent(s));
}
Index: CssFontVariantPosition.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css3/CssFontVariantPosition.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssFontVariantPosition.java 8 Aug 2012 10:02:08 -0000 1.1
+++ CssFontVariantPosition.java 19 Aug 2012 17:28:25 -0000 1.2
@@ -63,7 +63,7 @@
if (inherit.equals(ident)) {
value = inherit;
} else {
- value = allowedValues.get(ident.toString());
+ value = allowedValues.get(ident.toString().toLowerCase());
if (value == null) {
throw new InvalidParamException("value",
val.toString(),
Index: CssFontSize.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css3/CssFontSize.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssFontSize.java 4 Aug 2012 21:17:06 -0000 1.1
+++ CssFontSize.java 19 Aug 2012 17:28:25 -0000 1.2
@@ -87,7 +87,7 @@
value = inherit;
break;
}
- value = allowed_values.get(val.toString());
+ value = allowed_values.get(val.toString().toLowerCase());
if (value == null) {
throw new InvalidParamException("value",
expression.getValue().toString(),
Index: CssFontWeight.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css3/CssFontWeight.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssFontWeight.java 4 Aug 2012 21:17:07 -0000 1.1
+++ CssFontWeight.java 19 Aug 2012 17:28:25 -0000 1.2
@@ -83,7 +83,7 @@
value = inherit;
break;
}
- value = allowed_values.get(val.toString());
+ value = allowed_values.get(ident.toString().toLowerCase());
if (value == null) {
throw new InvalidParamException("value",
val.toString(),
Index: CssFontVariantEastAsian.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css3/CssFontVariantEastAsian.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssFontVariantEastAsian.java 9 Aug 2012 08:47:45 -0000 1.1
+++ CssFontVariantEastAsian.java 19 Aug 2012 17:28:25 -0000 1.2
@@ -80,7 +80,8 @@
} else if (normal.equals(ident)) {
value = normal;
} else {
- value = eastAsianVariantValues.get(ident.toString());
+ String idStr = ident.toString().toLowerCase();
+ value = eastAsianVariantValues.get(idStr);
if (value != null) {
if (expression.getCount() > 1) {
if (op != CssOperator.SPACE) {
@@ -91,7 +92,7 @@
val = expression.getValue();
CssIdent value2 = null;
if (val.getType() == CssTypes.CSS_IDENT) {
- value2 = eastAsianWidthValues.get(val.toString());
+ value2 = eastAsianWidthValues.get(val.toString().toLowerCase());
}
if (value2 == null) {
throw new InvalidParamException("value",
@@ -104,7 +105,7 @@
value = new CssValueList(v);
}
} else {
- value = eastAsianWidthValues.get(ident.toString());
+ value = eastAsianWidthValues.get(idStr);
if (value != null) {
if (expression.getCount() > 1) {
if (op != CssOperator.SPACE) {
@@ -115,7 +116,7 @@
val = expression.getValue();
CssIdent value2 = null;
if (val.getType() == CssTypes.CSS_IDENT) {
- value2 = eastAsianVariantValues.get(val.toString());
+ value2 = eastAsianVariantValues.get(val.toString().toLowerCase());
}
if (value2 == null) {
throw new InvalidParamException("value",
Index: CssFontVariantLigatures.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css3/CssFontVariantLigatures.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssFontVariantLigatures.java 18 Aug 2012 20:30:28 -0000 1.2
+++ CssFontVariantLigatures.java 19 Aug 2012 17:28:25 -0000 1.3
@@ -34,7 +34,7 @@
}
public static final CssIdent getCommonLigValues(CssIdent ident) {
- String s_id = ident.toString();
+ String s_id = ident.toString().toLowerCase();
for (String s : commonLigValues) {
if (s_id.equals(s)) {
return ident;
@@ -44,7 +44,7 @@
}
public static final CssIdent getDiscretionaryLigValues(CssIdent ident) {
- String s_id = ident.toString();
+ String s_id = ident.toString().toLowerCase();
for (String s : discretionaryLigValues) {
if (s_id.equals(s)) {
return ident;
@@ -54,7 +54,7 @@
}
public static final CssIdent getHistoricalLigValues(CssIdent ident) {
- String s_id = ident.toString();
+ String s_id = ident.toString().toLowerCase();
for (String s : historicalLigValues) {
if (s_id.equals(s)) {
return ident;
Index: CssFontVariantNumeric.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css3/CssFontVariantNumeric.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssFontVariantNumeric.java 10 Aug 2012 05:02:13 -0000 1.1
+++ CssFontVariantNumeric.java 19 Aug 2012 17:28:25 -0000 1.2
@@ -33,7 +33,7 @@
}
public static final CssIdent getNumericFigValues(CssIdent ident) {
- String s_id = ident.toString();
+ String s_id = ident.toString().toLowerCase();
for (String s : numericFigValues) {
if (s_id.equals(s)) {
return ident;
@@ -43,7 +43,7 @@
}
public static final CssIdent getNumericSpaValues(CssIdent ident) {
- String s_id = ident.toString();
+ String s_id = ident.toString().toLowerCase();
for (String s : numericSpaValues) {
if (s_id.equals(s)) {
return ident;
@@ -53,7 +53,7 @@
}
public static final CssIdent getNumericFraValues(CssIdent ident) {
- String s_id = ident.toString();
+ String s_id = ident.toString().toLowerCase();
for (String s : numericFraValues) {
if (s_id.equals(s)) {
return ident;
Received on Sunday, 19 August 2012 17:28:28 UTC