W3C home > Mailing lists > Public > www-validator-cvs@w3.org > August 2012

2002/css-validator/org/w3c/css/properties/css3 CssFont.java,1.1,1.2 CssFontVariant.java,1.1,1.2

From: Yves Lafon via cvs-syncmail <cvsmail@w3.org>
Date: Sun, 05 Aug 2012 06:22:58 +0000
To: www-validator-cvs@w3.org
Message-Id: <E1SxuEs-000273-6j@lionel-hutz.w3.org>
Update of /sources/public/2002/css-validator/org/w3c/css/properties/css3
In directory hutz:/tmp/cvs-serv7994/w3c/css/properties/css3

Modified Files:
	CssFont.java CssFontVariant.java 
Log Message:
font revamp, still some missing properties for CSS3 and @font-face for CSS2 and CSS3

Index: CssFontVariant.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css3/CssFontVariant.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssFontVariant.java	4 Aug 2012 21:17:07 -0000	1.1
+++ CssFontVariant.java	5 Aug 2012 06:22:56 -0000	1.2
@@ -21,6 +21,16 @@
 	public static final CssIdent normal = CssIdent.getIdent("normal");
 	public static final CssIdent smallCaps = CssIdent.getIdent("small-caps");
 
+	public static final CssIdent getAllowedFontVariant(CssIdent ident) {
+		if (smallCaps.equals(ident)) {
+			return smallCaps;
+		}
+		if (normal.equals(ident)) {
+			return normal;
+		}
+		return null;
+	}
+
 	/**
 	 * Creates a new CssFontVariant
 	 *

Index: CssFont.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css3/CssFont.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssFont.java	4 Aug 2012 21:17:06 -0000	1.1
+++ CssFont.java	5 Aug 2012 06:22:56 -0000	1.2
@@ -5,12 +5,6 @@
 // Please first read the full copyright statement in file COPYRIGHT.html
 package org.w3c.css.properties.css3;
 
-import org.w3c.css.properties.css21.CssFontFamily;
-import org.w3c.css.properties.css21.CssFontSize;
-import org.w3c.css.properties.css21.CssFontStyle;
-import org.w3c.css.properties.css21.CssFontVariant;
-import org.w3c.css.properties.css21.CssFontWeight;
-import org.w3c.css.properties.css21.CssLineHeight;
 import org.w3c.css.util.ApplContext;
 import org.w3c.css.util.InvalidParamException;
 import org.w3c.css.values.CssExpression;
@@ -207,6 +201,12 @@
 					throw new InvalidParamException("value",
 							val.toString(),
 							getPropertyName(), ac);
+				case CssTypes.CSS_STRING:
+					fontFamily = new CssFontFamily(ac, expression, check);
+					state = 2;
+					// expression.next is called, so continue instead
+					// of next
+					continue;
 				default:
 					throw new InvalidParamException("value",
 							val.toString(),
Received on Sunday, 5 August 2012 06:22:59 UTC

This archive was generated by hypermail 2.3.1 : Wednesday, 7 January 2015 15:17:50 UTC