W3C home > Mailing lists > Public > www-validator-cvs@w3.org > January 2013

CVS 2002/css-validator/org/w3c/css/properties/aural

From: CVS User ylafon <cvsmail@w3.org>
Date: Tue, 08 Jan 2013 11:13:38 +0000
Message-Id: <E1TsX7i-0001I5-9f@roscoe.w3.org>
To: www-validator-cvs@w3.org
Update of /sources/public/2002/css-validator/org/w3c/css/properties/aural
In directory roscoe:/tmp/cvs-serv4867/aural

Modified Files:
	ACssStyle.java 
Removed Files:
	ACssVoiceFamily.java ACssVoiceFamilyCSS3.java 
Log Message:
voice-family per css2/21 and css3 http://www.w3.org/TR/2012/CR-css3-speech-20120320/#voice-props-voice-family

--- /sources/public/2002/css-validator/org/w3c/css/properties/aural/ACssStyle.java	2013/01/06 21:06:48	1.25
+++ /sources/public/2002/css-validator/org/w3c/css/properties/aural/ACssStyle.java	2013/01/08 11:13:38	1.26
@@ -1,5 +1,5 @@
 //
-// $Id: ACssStyle.java,v 1.25 2013/01/06 21:06:48 ylafon Exp $
+// $Id: ACssStyle.java,v 1.26 2013/01/08 11:13:38 ylafon Exp $
 // From Philippe Le Hegaret (Philippe.Le_Hegaret@sophia.inria.fr)
 //
 // (c) COPYRIGHT MIT and INRIA, 1997.
@@ -9,30 +9,18 @@
 import org.w3c.css.parser.CssSelectors;
 import org.w3c.css.properties.css1.Css1Style;
 import org.w3c.css.util.ApplContext;
-import org.w3c.css.util.Warning;
 import org.w3c.css.util.Warnings;
 
 /**
- * @version $Revision: 1.25 $
+ * @version $Revision: 1.26 $
  */
 public class ACssStyle extends Css1Style {
 
-	ACssVoiceFamily acssVoiceFamily;
 
 	ACssVoiceVolume acssVoiceVolume;
-	ACssVoiceFamilyCSS3 acssVoiceFamilyCSS3;
 	ACssVoiceRate acssVoiceRate;
 	ACssVoicePitchRange acssVoicePitchRange;
 
-	/**
-	 * Get the voice family
-	 */
-	public ACssVoiceFamily getVoiceFamily() {
-		if (acssVoiceFamily == null) {
-			acssVoiceFamily = (ACssVoiceFamily) style.CascadingOrder(new ACssVoiceFamily(), style, selector);
-		}
-		return acssVoiceFamily;
-	}
 
 	public ACssVoiceVolume getVoiceVolume() {
 		if (acssVoiceVolume == null) {
@@ -42,14 +30,6 @@
 		return acssVoiceVolume;
 	}
 
-	public ACssVoiceFamilyCSS3 getVoiceFamilyCSS3() {
-		if (acssVoiceFamilyCSS3 == null) {
-			acssVoiceFamilyCSS3 =
-					(ACssVoiceFamilyCSS3) style.CascadingOrder(new ACssVoiceFamilyCSS3(), style, selector);
-		}
-		return acssVoiceFamilyCSS3;
-	}
-
 	public ACssVoiceRate getVoiceRate() {
 		if (acssVoiceRate == null) {
 			acssVoiceRate =
@@ -75,6 +55,7 @@
 	public void findConflicts(ApplContext ac, Warnings warnings,
 							  CssSelectors selector, CssSelectors[] allSelectors) {
 		super.findConflicts(ac, warnings, selector, allSelectors);
+		/*
 		if (acssVoiceFamily != null) {
 			if (!acssVoiceFamily.containsGenericFamily()) {
 				warnings.addWarning(new Warning(acssVoiceFamily,
@@ -85,6 +66,7 @@
 						"with-space", 1, ac));
 			}
 		}
+		*/
 	  /* TODO move to CSS2
 
 		if ((acssPause.getBefore() != null) &&
Received on Tuesday, 8 January 2013 11:13:39 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Tuesday, 8 January 2013 11:13:56 GMT