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: Fri, 04 Jan 2013 13:14:02 +0000
Message-Id: <E1Tr762-0006wo-9l@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-serv26639/aural

Modified Files:
	ACssStyle.java 
Removed Files:
	ACssPause.java ACssPauseAfter.java ACssPauseBefore.java 
Log Message:
pause[-before|-after] per css2/css21 and css3 http://www.w3.org/TR/2012/CR-css3-speech-20120320/#pause

--- /sources/public/2002/css-validator/org/w3c/css/properties/aural/ACssStyle.java	2013/01/04 11:07:25	1.17
+++ /sources/public/2002/css-validator/org/w3c/css/properties/aural/ACssStyle.java	2013/01/04 13:14:02	1.18
@@ -1,5 +1,5 @@
 //
-// $Id: ACssStyle.java,v 1.17 2013/01/04 11:07:25 ylafon Exp $
+// $Id: ACssStyle.java,v 1.18 2013/01/04 13:14:02 ylafon Exp $
 // From Philippe Le Hegaret (Philippe.Le_Hegaret@sophia.inria.fr)
 //
 // (c) COPYRIGHT MIT and INRIA, 1997.
@@ -11,215 +11,181 @@
 import org.w3c.css.util.ApplContext;
 import org.w3c.css.util.Warning;
 import org.w3c.css.util.Warnings;
-import org.w3c.css.values.CssPercentage;
 
 /**
- * @version $Revision: 1.17 $
+ * @version $Revision: 1.18 $
  */
 public class ACssStyle extends Css1Style {
 
-  ACssPause  acssPause = new ACssPause(); // it's a macro
-  ACssVoiceFamily acssVoiceFamily;
-  ACssPlayDuring acssPlayDuring;
-
-  ACssSpeakDate    acssSpeakDate;
-  ACssSpeakTime    acssSpeakTime;
-
-  ACssVoiceVolume  acssVoiceVolume;
-  ACssVoiceBalance acssVoiceBalance;
-  ACssVoiceFamilyCSS3 acssVoiceFamilyCSS3;
-  ACssVoiceRate    acssVoiceRate;
-  ACssVoicePitchRange acssVoicePitchRange;
-  ACssVoiceStress  acssVoiceStress;
-  ACssVoiceDuration acssVoiceDuration;
-  ACssInterpretAs  acssInterpretAs;
-  ACssPhonemes 	   acssPhonemes;
-
-  /**
-   * Get the pause after
-   */
-  public ACssPauseAfter getPauseAfter() {
-    if (acssPause.pauseAfter == null) {
-      acssPause.pauseAfter = (ACssPauseAfter) style.CascadingOrder(new ACssPauseAfter(), style, selector);
-    }
-    return acssPause.pauseAfter;
-  }
-
-  /**
-   * Get the pause before
-   */
-  public ACssPauseBefore getPauseBefore() {
-    if (acssPause.pauseBefore == null) {
-      acssPause.pauseBefore = (ACssPauseBefore) style.CascadingOrder(new ACssPauseBefore(), style, selector);
-    }
-    return acssPause.pauseBefore;
-  }
-
-  /**
-   * Get the pause
-   */
-  public ACssPause getPause() {
-    if (acssPause.pauseAfter == null) {
-      acssPause.pauseAfter = getPauseAfter();
-    }
-    if (acssPause.pauseBefore == null) {
-      acssPause.pauseBefore = getPauseBefore();
-    }
-    return acssPause;
-  }
-
-  /**
-   * Get the voice family
-   */
-  public ACssVoiceFamily getVoiceFamily() {
-    if (acssVoiceFamily == null) {
-      acssVoiceFamily = (ACssVoiceFamily) style.CascadingOrder(new ACssVoiceFamily(), style, selector);
-    }
-    return acssVoiceFamily;
-  }
-
-  /**
-   * Get the play during
-   */
-  public ACssPlayDuring getPlayDuring() {
-    if (acssPlayDuring == null) {
-      acssPlayDuring =
-	(ACssPlayDuring) style.CascadingOrder(new ACssPlayDuring(),
-					      style, selector);
-    }
-    return acssPlayDuring;
-  }
-
-  /**
-   * Get the speak date
-   */
-  public ACssSpeakDate getSpeakDate() {
-    if (acssSpeakDate == null) {
-      acssSpeakDate =
-	(ACssSpeakDate) style.CascadingOrder(new ACssSpeakDate(), style, selector);
-    }
-    return acssSpeakDate;
-  }
-
-  /**
-   * Get the speak time
-   */
-  public ACssSpeakTime getSpeakTime() {
-    if (acssSpeakTime == null) {
-      acssSpeakTime =
-	(ACssSpeakTime) style.CascadingOrder(new ACssSpeakTime(), style, selector);
-    }
-    return acssSpeakTime;
-  }
-
-  public ACssVoiceVolume getVoiceVolume() {
-    if (acssVoiceVolume == null) {
-      acssVoiceVolume =
-	(ACssVoiceVolume) style.CascadingOrder(new ACssVoiceVolume(), style, selector);
-    }
-    return acssVoiceVolume;
-  }
-
-  public ACssVoiceBalance getVoiceBalance() {
-    if (acssVoiceBalance == null) {
-      acssVoiceBalance =
-	(ACssVoiceBalance) style.CascadingOrder(new ACssVoiceBalance(), style, selector);
-    }
-    return acssVoiceBalance;
-  }
-
-  public ACssVoiceFamilyCSS3 getVoiceFamilyCSS3() {
-    if (acssVoiceFamilyCSS3 == null) {
-      acssVoiceFamilyCSS3 =
-	(ACssVoiceFamilyCSS3) style.CascadingOrder(new ACssVoiceFamilyCSS3(), style, selector);
-    }
-    return acssVoiceFamilyCSS3;
-  }
-
-  public ACssVoiceRate getVoiceRate() {
-    if (acssVoiceRate == null) {
-      acssVoiceRate =
-	(ACssVoiceRate) style.CascadingOrder(new ACssVoiceRate(), style, selector);
-    }
-    return acssVoiceRate;
-  }
-
-  public ACssVoicePitchRange getVoicePitchRange() {
-    if (acssVoicePitchRange == null) {
-      acssVoicePitchRange =
-	(ACssVoicePitchRange) style.CascadingOrder(new ACssVoicePitchRange(), style, selector);
-    }
-    return acssVoicePitchRange;
-  }
-
-  public ACssVoiceStress getVoiceStress() {
-    if (acssVoiceStress == null) {
-      acssVoiceStress =
-	(ACssVoiceStress) style.CascadingOrder(new ACssVoiceStress(), style, selector);
-    }
-    return acssVoiceStress;
-  }
-
-  public ACssVoiceDuration getVoiceDuration() {
-    if (acssVoiceDuration == null) {
-      acssVoiceDuration =
-	(ACssVoiceDuration) style.CascadingOrder(new ACssVoiceDuration(), style, selector);
-    }
-    return acssVoiceDuration;
-  }
-
-  public ACssInterpretAs getInterpretAs() {
-    if (acssInterpretAs == null) {
-      acssInterpretAs =
-	(ACssInterpretAs) style.CascadingOrder(new ACssInterpretAs(), style, selector);
-    }
-    return acssInterpretAs;
-  }
-
-  public ACssPhonemes getPhonemes() {
-    if (acssPhonemes == null) {
-      acssPhonemes =
-	(ACssPhonemes) style.CascadingOrder(new ACssPhonemes(), style, selector);
-    }
-    return acssPhonemes;
-  }
-
-    /**
-   * Find conflicts in this Style
-   *
-   * @param warnings For warnings reports.
-   * @param allSelectors All contexts is the entire style sheet.
-   */
-  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,
-		    "no-generic-family", 2, ac));
-	}
-	if (acssVoiceFamily.withSpace) {
-	    warnings.addWarning(new Warning(acssVoiceFamily,
-		    "with-space", 1, ac));
-	}
-    }
-
-    if ((acssPause.getBefore() != null) &&
-	!acssPause.getBefore().isSoftlyInherited() &&
-	!(acssPause.getBefore().get() instanceof CssPercentage)) {
-      // Using relative units gives more robust stylesheets
-	warnings.addWarning(new Warning(acssPause.getBefore(),
-		"relative", 2, ac));
-    }
-    if ((acssPause.getAfter() != null) &&
-	!acssPause.getAfter().isSoftlyInherited() &&
-	!(acssPause.getAfter().get() instanceof CssPercentage)) {
-	// Using relative units gives more robust stylesheets
-	warnings.addWarning(new Warning(acssPause.getAfter(),
-		"relative", 2, ac));
-    }
+	ACssVoiceFamily acssVoiceFamily;
+	ACssPlayDuring acssPlayDuring;
 
+	ACssSpeakDate acssSpeakDate;
+	ACssSpeakTime acssSpeakTime;
 
-  }
+	ACssVoiceVolume acssVoiceVolume;
+	ACssVoiceBalance acssVoiceBalance;
+	ACssVoiceFamilyCSS3 acssVoiceFamilyCSS3;
+	ACssVoiceRate acssVoiceRate;
+	ACssVoicePitchRange acssVoicePitchRange;
+	ACssVoiceStress acssVoiceStress;
+	ACssVoiceDuration acssVoiceDuration;
+	ACssInterpretAs acssInterpretAs;
+	ACssPhonemes acssPhonemes;
+
+	/**
+	 * Get the voice family
+	 */
+	public ACssVoiceFamily getVoiceFamily() {
+		if (acssVoiceFamily == null) {
+			acssVoiceFamily = (ACssVoiceFamily) style.CascadingOrder(new ACssVoiceFamily(), style, selector);
+		}
+		return acssVoiceFamily;
+	}
+
+	/**
+	 * Get the play during
+	 */
+	public ACssPlayDuring getPlayDuring() {
+		if (acssPlayDuring == null) {
+			acssPlayDuring =
+					(ACssPlayDuring) style.CascadingOrder(new ACssPlayDuring(),
+							style, selector);
+		}
+		return acssPlayDuring;
+	}
+
+	/**
+	 * Get the speak date
+	 */
+	public ACssSpeakDate getSpeakDate() {
+		if (acssSpeakDate == null) {
+			acssSpeakDate =
+					(ACssSpeakDate) style.CascadingOrder(new ACssSpeakDate(), style, selector);
+		}
+		return acssSpeakDate;
+	}
+
+	/**
+	 * Get the speak time
+	 */
+	public ACssSpeakTime getSpeakTime() {
+		if (acssSpeakTime == null) {
+			acssSpeakTime =
+					(ACssSpeakTime) style.CascadingOrder(new ACssSpeakTime(), style, selector);
+		}
+		return acssSpeakTime;
+	}
+
+	public ACssVoiceVolume getVoiceVolume() {
+		if (acssVoiceVolume == null) {
+			acssVoiceVolume =
+					(ACssVoiceVolume) style.CascadingOrder(new ACssVoiceVolume(), style, selector);
+		}
+		return acssVoiceVolume;
+	}
+
+	public ACssVoiceBalance getVoiceBalance() {
+		if (acssVoiceBalance == null) {
+			acssVoiceBalance =
+					(ACssVoiceBalance) style.CascadingOrder(new ACssVoiceBalance(), style, selector);
+		}
+		return acssVoiceBalance;
+	}
+
+	public ACssVoiceFamilyCSS3 getVoiceFamilyCSS3() {
+		if (acssVoiceFamilyCSS3 == null) {
+			acssVoiceFamilyCSS3 =
+					(ACssVoiceFamilyCSS3) style.CascadingOrder(new ACssVoiceFamilyCSS3(), style, selector);
+		}
+		return acssVoiceFamilyCSS3;
+	}
+
+	public ACssVoiceRate getVoiceRate() {
+		if (acssVoiceRate == null) {
+			acssVoiceRate =
+					(ACssVoiceRate) style.CascadingOrder(new ACssVoiceRate(), style, selector);
+		}
+		return acssVoiceRate;
+	}
+
+	public ACssVoicePitchRange getVoicePitchRange() {
+		if (acssVoicePitchRange == null) {
+			acssVoicePitchRange =
+					(ACssVoicePitchRange) style.CascadingOrder(new ACssVoicePitchRange(), style, selector);
+		}
+		return acssVoicePitchRange;
+	}
+
+	public ACssVoiceStress getVoiceStress() {
+		if (acssVoiceStress == null) {
+			acssVoiceStress =
+					(ACssVoiceStress) style.CascadingOrder(new ACssVoiceStress(), style, selector);
+		}
+		return acssVoiceStress;
+	}
+
+	public ACssVoiceDuration getVoiceDuration() {
+		if (acssVoiceDuration == null) {
+			acssVoiceDuration =
+					(ACssVoiceDuration) style.CascadingOrder(new ACssVoiceDuration(), style, selector);
+		}
+		return acssVoiceDuration;
+	}
+
+	public ACssInterpretAs getInterpretAs() {
+		if (acssInterpretAs == null) {
+			acssInterpretAs =
+					(ACssInterpretAs) style.CascadingOrder(new ACssInterpretAs(), style, selector);
+		}
+		return acssInterpretAs;
+	}
+
+	public ACssPhonemes getPhonemes() {
+		if (acssPhonemes == null) {
+			acssPhonemes =
+					(ACssPhonemes) style.CascadingOrder(new ACssPhonemes(), style, selector);
+		}
+		return acssPhonemes;
+	}
+
+	/**
+	 * Find conflicts in this Style
+	 *
+	 * @param warnings     For warnings reports.
+	 * @param allSelectors All contexts is the entire style sheet.
+	 */
+	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,
+						"no-generic-family", 2, ac));
+			}
+			if (acssVoiceFamily.withSpace) {
+				warnings.addWarning(new Warning(acssVoiceFamily,
+						"with-space", 1, ac));
+			}
+		}
+	  /* TODO move to CSS2
+
+		if ((acssPause.getBefore() != null) &&
+				!acssPause.getBefore().isSoftlyInherited() &&
+				!(acssPause.getBefore().get() instanceof CssPercentage)) {
+			// Using relative units gives more robust stylesheets
+			warnings.addWarning(new Warning(acssPause.getBefore(),
+					"relative", 2, ac));
+		}
+		if ((acssPause.getAfter() != null) &&
+				!acssPause.getAfter().isSoftlyInherited() &&
+				!(acssPause.getAfter().get() instanceof CssPercentage)) {
+			// Using relative units gives more robust stylesheets
+			warnings.addWarning(new Warning(acssPause.getAfter(),
+					"relative", 2, ac));
+		}
+
+      */
+	}
 
 }
Received on Friday, 4 January 2013 13:14:03 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Friday, 4 January 2013 13:14:12 GMT