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

CVS 2002/css-validator/org/w3c/css/parser/analyzer

From: CVS User ylafon <cvsmail@w3.org>
Date: Thu, 10 Jan 2013 11:19:13 +0000
Message-Id: <E1TtGAD-0004Km-5f@roscoe.w3.org>
To: www-validator-cvs@w3.org
Update of /sources/public/2002/css-validator/org/w3c/css/parser/analyzer
In directory roscoe:/tmp/cvs-serv16658

Modified Files:
	CssParser.java CssParser.jj CssParserConstants.java 
	CssParserTokenManager.java 
Log Message:
support for semitones (see css3-speech)

--- /sources/public/2002/css-validator/org/w3c/css/parser/analyzer/CssParser.java	2013/01/03 13:21:00	1.93
+++ /sources/public/2002/css-validator/org/w3c/css/parser/analyzer/CssParser.java	2013/01/10 11:19:12	1.94
@@ -28,6 +28,7 @@
 import org.w3c.css.values.CssUnicodeRange;
 import org.w3c.css.values.CssResolution;
 import org.w3c.css.values.CssRatio;
+import org.w3c.css.values.CssSemitone;
 import org.w3c.css.values.CssTypes;
 import org.w3c.css.values.CssVolume;
 import org.w3c.css.properties.css.CssProperty;
@@ -74,7 +75,7 @@
  * A CSS3 parser  
  *
  * @author Philippe Le Hegaret and Sijtsche Smeman
- * @version $Revision: 1.93 $
+ * @version $Revision: 1.94 $
  */
 public abstract class CssParser implements CssParserConstants {
 
@@ -644,7 +645,7 @@
       case PSEUDOELEMENT_SYM:
       case CLASS:
       case FUNCTIONNOT:
-      case 99:
+      case 100:
         ruleSet();
         break;
       case MEDIA_SYM:
@@ -996,7 +997,7 @@
         case PSEUDOELEMENT_SYM:
         case CLASS:
         case FUNCTIONNOT:
-        case 99:
+        case 100:
           ;
           break;
         default:
@@ -2570,7 +2571,7 @@
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case IDENT:
     case ANY:
-    case 99:
+    case 100:
       element_name(selector);
       label_80:
       while (true) {
@@ -2867,7 +2868,7 @@
         jj_la1[110] = jj_gen;
         ;
       }
-      p = jj_consume_token(99);
+      p = jj_consume_token(100);
     } else {
       ;
     }
@@ -3123,7 +3124,7 @@
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case IDENT:
     case ANY:
-    case 99:
+    case 100:
       element_name(ns);
       break;
     case HASHIDENT:
@@ -3649,6 +3650,7 @@
       case ABSOLUTLENGTH:
       case ANGLE:
       case SPL:
+      case ST:
       case TIME:
       case FREQ:
       case RESOLUTION:
@@ -3727,6 +3729,7 @@
     case ABSOLUTLENGTH:
     case ANGLE:
     case SPL:
+    case ST:
     case TIME:
     case FREQ:
     case RESOLUTION:
@@ -3781,6 +3784,10 @@
         n = jj_consume_token(RESOLUTION);
                        setValue(new CssResolution(), exp, operator, n, RESOLUTION);
         break;
+      case ST:
+        n = jj_consume_token(ST);
+               setValue(new CssSemitone(), exp, operator, n, ST);
+        break;
       case SPL:
         n = jj_consume_token(SPL);
                 setValue(new CssVolume(), exp, operator, n, SPL);
@@ -4439,16 +4446,6 @@
     finally { jj_save(1, xla); }
   }
 
-  private boolean jj_3R_103() {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(35)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(48)) return true;
-    }
-    return false;
-  }
-
   private boolean jj_3_2() {
     if (jj_scan_token(NUMBER)) return true;
     Token xsp;
@@ -4460,11 +4457,21 @@
     return false;
   }
 
+  private boolean jj_3R_103() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(35)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(48)) return true;
+    }
+    return false;
+  }
+
   private boolean jj_3_1() {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3R_103()) jj_scanpos = xsp;
-    if (jj_scan_token(99)) return true;
+    if (jj_scan_token(100)) return true;
     return false;
   }
 
@@ -4494,13 +4501,13 @@
       jj_la1_0 = new int[] {0x0,0x0,0x0,0xe00000,0xe00000,0x0,0x0,0x200000,0x200000,0x0,0xc00000,0xc00000,0x200000,0x200000,0x200000,0x0,0x0,0x200000,0x200000,0x200000,0x0,0x200000,0x0,0x200000,0x200000,0x200000,0x0,0x200000,0x200000,0x200000,0x20000000,0x200000,0x200000,0x0,0x200000,0x80000000,0x200000,0x80000000,0x200000,0x0,0x200000,0x200000,0x200000,0x0,0x200000,0x200000,0x200000,0x200000,0x200000,0x0,0x0,0x200000,0x200000,0x0,0x0,0x200000,0x200000,0x200000,0x200000,0x8000000,0x8000000,0x8000000,0x200000,0x200000,0x200000,0x200000,0x8000000,0x20000000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x20000000,0x58000000,0x200000,0x200000,0x58200000,0x8000000,0x200000,0x20000000,0x200000,0x200000,0x200000,0x0,0x0,0x200000,0x0,0x58200000,0x200000,0x200000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x200000,0x200000,0x3000000,0x200000,0x0,0x200000,0x3000000,0x200000,0x0,0x200000,0x200000,0x0,0x200000,0x200000,0x0,0x0,0x0,0x0,0x200000,0x0,0x0,0x200000,0x0,0x200000,0x8000000,0x200000,0x8000000,0x28000000,0x28000000,0x8000000,0x0,0x200000,0x0,0x200000,0x8000000,0x8000000,0x0,0x0,0x200000,0x0,0x200000,0x8000000,0x200000,0x0,};
    }
    private static void jj_la1_init_1() {
-      jj_la1_1 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x7bd14038,0x0,0x0,0x0,0x0,0x0,0x8,0x200002,0x0,0x0,0x0,0x200002,0x0,0x80009,0x0,0x0,0x0,0x7bd14038,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0,0x0,0x80009,0x0,0x0,0x0,0x100000,0x0,0x0,0x0,0x0,0x0,0x8,0x100000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800,0x800,0x80000808,0x0,0x0,0x0,0x0,0x80000808,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800,0x0,0x0,0x0,0x0,0x0,0x8,0x1000,0x0,0x8,0x0,0x0,0x0,0x7bd04030,0x7bd04030,0x7bd04030,0x7bd04030,0x7bd14038,0x7bc00000,0x7bc00000,0x10008,0x10008,0x10008,0x0,0x0,0x780,0x0,0xa,0x0,0x780,0x0,0x7bd14038,0x0,0x0,0xa,0x0,0x0,0x0,0x8,0x100000,0x30,0x0,0x0,0x100000,0x0,0x0,0x0,0xc000080a,0x0,0xc000080a,0xffe0283a,0xfbe0083a,0x800,0xffc00000,0x0,0x20203a,0x0,0xffe0283a,0x800,0x0,0xfbc00000,0x0,0x20003a,0x0,0xfbe0083a,0x0,0x30,};
+      jj_la1_1 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xf3d14038,0x0,0x0,0x0,0x0,0x0,0x8,0x200002,0x0,0x0,0x0,0x200002,0x0,0x80009,0x0,0x0,0x0,0xf3d14038,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0,0x0,0x80009,0x0,0x0,0x0,0x100000,0x0,0x0,0x0,0x0,0x0,0x8,0x100000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800,0x800,0x808,0x0,0x0,0x0,0x0,0x808,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800,0x0,0x0,0x0,0x0,0x0,0x8,0x1000,0x0,0x8,0x0,0x0,0x0,0xf3d04030,0xf3d04030,0xf3d04030,0xf3d04030,0xf3d14038,0xf3c00000,0xf3c00000,0x10008,0x10008,0x10008,0x0,0x0,0x780,0x0,0xa,0x0,0x780,0x0,0xf3d14038,0x0,0x0,0xa,0x0,0x0,0x0,0x8,0x100000,0x30,0x0,0x0,0x100000,0x0,0x0,0x0,0x8000080a,0x0,0x8000080a,0xffe0283a,0xf3e0083a,0x800,0xffc00000,0x0,0x20203a,0x0,0xffe0283a,0x800,0x0,0xf3c00000,0x0,0x20003a,0x0,0xf3e0083a,0x0,0x30,};
    }
    private static void jj_la1_init_2() {
-      jj_la1_2 = new int[] {0x0,0x0,0x8,0x0,0x0,0x10,0x20,0x0,0x0,0xa0020fc4,0x40000,0x40000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xa0000004,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xf000,0xf000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xa0000004,0xa0000004,0xa0000004,0xa0000004,0xa0000004,0x20000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20000004,0x0,0x0,0x1,0x0,0x0,0x40000000,0x40000000,0x4,0x0,0x0,0x2,0x0,0x0,0x2,0x0,0x1,0x0,0x1,0x10000001,0x10000001,0x0,0x1,0x0,0x10000000,0x0,0x10000001,0x0,0x1,0x1,0x0,0x10000000,0x0,0x10000001,0x0,0x0,};
+      jj_la1_2 = new int[] {0x0,0x0,0x10,0x0,0x0,0x20,0x40,0x0,0x0,0x40041f88,0x80000,0x80000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40000008,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1e000,0x1e000,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40000008,0x40000008,0x40000008,0x40000008,0x40000008,0x40000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40000008,0x0,0x0,0x2,0x0,0x0,0x80000000,0x80000000,0x8,0x0,0x0,0x4,0x0,0x0,0x4,0x0,0x3,0x0,0x3,0x20000003,0x20000003,0x0,0x3,0x0,0x20000000,0x0,0x20000003,0x0,0x2,0x3,0x0,0x20000000,0x0,0x20000003,0x0,0x0,};
    }
    private static void jj_la1_init_3() {
-      jj_la1_3 = new int[] {0x6,0x6,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8,0x0,0x0,0x0,0x0,0x0,0x1,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x1,0x0,0x1,0x0,0x0,0x0,0x1,0x0,0x0,0x1,0x0,0x0,0x0,0x1,0x0,0x0,};
+      jj_la1_3 = new int[] {0xc,0xc,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x11,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x11,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x1,0x1,0x1,0x11,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x0,0x0,0x2,0x2,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2,0x2,0x0,0x2,0x0,0x0,0x0,0x2,0x0,0x0,0x2,0x0,0x0,0x0,0x2,0x0,0x0,};
    }
   final private JJCalls[] jj_2_rtns = new JJCalls[2];
   private boolean jj_rescan = false;
@@ -4686,7 +4693,7 @@
   /** Generate ParseException. */
   public ParseException generateParseException() {
     jj_expentries.clear();
-    boolean[] la1tokens = new boolean[100];
+    boolean[] la1tokens = new boolean[101];
     if (jj_kind >= 0) {
       la1tokens[jj_kind] = true;
       jj_kind = -1;
@@ -4709,7 +4716,7 @@
         }
       }
     }
-    for (int i = 0; i < 100; i++) {
+    for (int i = 0; i < 101; i++) {
       if (la1tokens[i]) {
         jj_expentry = new int[1];
         jj_expentry[0] = i;
--- /sources/public/2002/css-validator/org/w3c/css/parser/analyzer/CssParser.jj	2013/01/03 13:21:00	1.92
+++ /sources/public/2002/css-validator/org/w3c/css/parser/analyzer/CssParser.jj	2013/01/10 11:19:12	1.93
@@ -3,7 +3,7 @@
  * (c) COPYRIGHT MIT and INRIA, 1997.
  * Please first read the full copyright statement in file COPYRIGHT.html
  *
- * $Id: CssParser.jj,v 1.92 2013/01/03 13:21:00 ylafon Exp $
+ * $Id: CssParser.jj,v 1.93 2013/01/10 11:19:12 ylafon Exp $
  *
  */
 
@@ -48,6 +48,7 @@
 import org.w3c.css.values.CssUnicodeRange;
 import org.w3c.css.values.CssResolution;
 import org.w3c.css.values.CssRatio;
+import org.w3c.css.values.CssSemitone;
 import org.w3c.css.values.CssTypes;
 import org.w3c.css.values.CssVolume;
 import org.w3c.css.properties.css.CssProperty;
@@ -94,7 +95,7 @@
  * A CSS3 parser  
  *
  * @author Philippe Le Hegaret and Sijtsche Smeman
- * @version $Revision: 1.92 $
+ * @version $Revision: 1.93 $
  */
 public abstract class CssParser {
 
@@ -572,6 +573,7 @@
                    | <NUM> "px" >
   | < ANGLE      : <NUM> ( "deg" | "grad" | "rad" | "turn" ) >
   | < SPL        : <NUM> "db" >
+  | < ST         : <NUM> "st" >
   | < TIME       : <NUM> ( "ms" | "s" ) >
   | < FREQ       : <NUM> ( "Hz" | "kHz" ) >
   | < RESOLUTION : <NUM> ( "dpi" | "dpcm" | "ddpx" ) >
@@ -2329,6 +2331,7 @@
     | n=<TIME> { setValue(new CssTime(), exp, operator, n, TIME); }
     | n=<FREQ> { setValue(new CssFrequency(), exp, operator, n, FREQ); }
     | n=<RESOLUTION> { setValue(new CssResolution(), exp, operator, n, RESOLUTION); }
+    | n=<ST> { setValue(new CssSemitone(), exp, operator, n, ST); }
     | n=<SPL> { setValue(new CssVolume(), exp, operator, n, SPL); }
     | n=<DIMEN> {
 	  addError(new ParseException(ac.getMsg().getString("parser.unknown-dimension")), n.image); }    
--- /sources/public/2002/css-validator/org/w3c/css/parser/analyzer/CssParserConstants.java	2013/01/03 13:21:00	1.24
+++ /sources/public/2002/css-validator/org/w3c/css/parser/analyzer/CssParserConstants.java	2013/01/10 11:19:13	1.25
@@ -127,85 +127,87 @@
   /** RegularExpression Id. */
   int SPL = 58;
   /** RegularExpression Id. */
-  int TIME = 59;
+  int ST = 59;
   /** RegularExpression Id. */
-  int FREQ = 60;
+  int TIME = 60;
   /** RegularExpression Id. */
-  int RESOLUTION = 61;
+  int FREQ = 61;
   /** RegularExpression Id. */
-  int DIMEN = 62;
+  int RESOLUTION = 62;
   /** RegularExpression Id. */
-  int PERCENTAGE = 63;
+  int DIMEN = 63;
   /** RegularExpression Id. */
-  int NUMBER = 64;
+  int PERCENTAGE = 64;
   /** RegularExpression Id. */
-  int IMPORTANT_SYM = 65;
+  int NUMBER = 65;
   /** RegularExpression Id. */
-  int PSEUDOELEMENT_SYM = 66;
+  int IMPORTANT_SYM = 66;
   /** RegularExpression Id. */
-  int CHARSET_SYM = 67;
+  int PSEUDOELEMENT_SYM = 67;
   /** RegularExpression Id. */
-  int IMPORT_SYM = 68;
+  int CHARSET_SYM = 68;
   /** RegularExpression Id. */
-  int NAMESPACE_SYM = 69;
+  int IMPORT_SYM = 69;
   /** RegularExpression Id. */
-  int MEDIA_SYM = 70;
+  int NAMESPACE_SYM = 70;
   /** RegularExpression Id. */
-  int PAGE_SYM = 71;
+  int MEDIA_SYM = 71;
   /** RegularExpression Id. */
-  int FONT_FACE_SYM = 72;
+  int PAGE_SYM = 72;
   /** RegularExpression Id. */
-  int KEYFRAMES_SYM = 73;
+  int FONT_FACE_SYM = 73;
   /** RegularExpression Id. */
-  int PREF_SYM = 74;
+  int KEYFRAMES_SYM = 74;
   /** RegularExpression Id. */
-  int COLOR_PROFILE = 75;
+  int PREF_SYM = 75;
   /** RegularExpression Id. */
-  int ATTOP = 76;
+  int COLOR_PROFILE = 76;
   /** RegularExpression Id. */
-  int ATRIGHT = 77;
+  int ATTOP = 77;
   /** RegularExpression Id. */
-  int ATBOTTOM = 78;
+  int ATRIGHT = 78;
   /** RegularExpression Id. */
-  int ATLEFT = 79;
+  int ATBOTTOM = 79;
   /** RegularExpression Id. */
-  int ATCOUNTER = 80;
+  int ATLEFT = 80;
   /** RegularExpression Id. */
-  int PHONETIC_ALPHABET_SYM = 81;
+  int ATCOUNTER = 81;
   /** RegularExpression Id. */
-  int ATKEYWORD = 82;
+  int PHONETIC_ALPHABET_SYM = 82;
   /** RegularExpression Id. */
-  int RANGE0 = 83;
+  int ATKEYWORD = 83;
   /** RegularExpression Id. */
-  int RANGE1 = 84;
+  int RANGE0 = 84;
   /** RegularExpression Id. */
-  int RANGE2 = 85;
+  int RANGE1 = 85;
   /** RegularExpression Id. */
-  int RANGE3 = 86;
+  int RANGE2 = 86;
   /** RegularExpression Id. */
-  int RANGE4 = 87;
+  int RANGE3 = 87;
   /** RegularExpression Id. */
-  int RANGE5 = 88;
+  int RANGE4 = 88;
   /** RegularExpression Id. */
-  int RANGE6 = 89;
+  int RANGE5 = 89;
   /** RegularExpression Id. */
-  int RANGE = 90;
+  int RANGE6 = 90;
   /** RegularExpression Id. */
-  int UNI = 91;
+  int RANGE = 91;
   /** RegularExpression Id. */
-  int UNICODERANGE = 92;
+  int UNI = 92;
   /** RegularExpression Id. */
-  int CLASS = 93;
+  int UNICODERANGE = 93;
   /** RegularExpression Id. */
-  int FUNCTIONLANG = 94;
+  int CLASS = 94;
   /** RegularExpression Id. */
-  int FUNCTIONNOT = 95;
+  int FUNCTIONLANG = 95;
   /** RegularExpression Id. */
-  int FUNCTION = 96;
+  int FUNCTIONNOT = 96;
   /** RegularExpression Id. */
-  int HTMLSTARTTAG = 97;
+  int FUNCTION = 97;
   /** RegularExpression Id. */
-  int HTMLENDTAG = 98;
+  int HTMLSTARTTAG = 98;
+  /** RegularExpression Id. */
+  int HTMLENDTAG = 99;
 
   /** Lexical state. */
   int DEFAULT = 0;
@@ -271,6 +273,7 @@
     "<ABSOLUTLENGTH>",
     "<ANGLE>",
     "<SPL>",
+    "<ST>",
     "<TIME>",
     "<FREQ>",
     "<RESOLUTION>",
--- /sources/public/2002/css-validator/org/w3c/css/parser/analyzer/CssParserTokenManager.java	2013/01/03 13:21:00	1.49
+++ /sources/public/2002/css-validator/org/w3c/css/parser/analyzer/CssParserTokenManager.java	2013/01/10 11:19:13	1.50
@@ -26,6 +26,7 @@
 import org.w3c.css.values.CssUnicodeRange;
 import org.w3c.css.values.CssResolution;
 import org.w3c.css.values.CssRatio;
+import org.w3c.css.values.CssSemitone;
 import org.w3c.css.values.CssTypes;
 import org.w3c.css.values.CssVolume;
 import org.w3c.css.properties.css.CssProperty;
@@ -107,7 +108,7 @@
          return jjMoveNfa_0(7, 0);
       case 58:
          jjmatchedKind = 52;
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x80000004L);
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x100000008L);
       case 59:
          jjmatchedKind = 44;
          return jjMoveNfa_0(7, 0);
@@ -117,7 +118,7 @@
          jjmatchedKind = 42;
          return jjMoveNfa_0(7, 0);
       case 64:
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x3fff8L);
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x7fff0L);
       case 91:
          jjmatchedKind = 46;
          return jjMoveNfa_0(7, 0);
@@ -131,9 +132,9 @@
          return jjMoveStringLiteralDfa1_0(0x80000000L, 0x0L);
       case 76:
       case 108:
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x40000000L);
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x80000000L);
       case 124:
-         jjmatchedKind = 99;
+         jjmatchedKind = 100;
          return jjMoveStringLiteralDfa1_0(0x2000000L, 0x0L);
       case 125:
          jjmatchedKind = 38;
@@ -155,9 +156,9 @@
       case 45:
          return jjMoveStringLiteralDfa2_0(active0, 0x800000L, active1, 0L);
       case 58:
-         if ((active1 & 0x4L) != 0L)
+         if ((active1 & 0x8L) != 0L)
          {
-            jjmatchedKind = 66;
+            jjmatchedKind = 67;
             jjmatchedPos = 1;
          }
          break;
@@ -185,40 +186,40 @@
          break;
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x40000000L);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x80000000L);
       case 66:
       case 98:
-         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x4000L);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x8000L);
       case 67:
       case 99:
-         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x10808L);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x21010L);
       case 70:
       case 102:
-         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x100L);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x200L);
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x10L);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x20L);
       case 75:
       case 107:
-         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x200L);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x400L);
       case 76:
       case 108:
-         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x8000L);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x10000L);
       case 77:
       case 109:
-         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x40L);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x80L);
       case 78:
       case 110:
-         return jjMoveStringLiteralDfa2_0(active0, 0x80000000L, active1, 0x80000020L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x80000000L, active1, 0x100000040L);
       case 80:
       case 112:
-         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x20480L);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x40900L);
       case 82:
       case 114:
-         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x2000L);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x4000L);
       case 84:
       case 116:
-         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x1000L);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x2000L);
       default :
          break;
    }
@@ -245,7 +246,7 @@
          break;
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0xa0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x140L);
       case 68:
       case 100:
          if ((active0 & 0x80000000L) != 0L)
@@ -256,25 +257,25 @@
          break;
       case 69:
       case 101:
-         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x8240L);
+         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x10480L);
       case 72:
       case 104:
-         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x20008L);
+         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x40010L);
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x2000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x4000L);
       case 77:
       case 109:
-         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x10L);
+         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x20L);
       case 78:
       case 110:
-         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x40000000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x80000000L);
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x80015900L);
+         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x10002b200L);
       case 82:
       case 114:
-         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x400L);
+         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x800L);
       default :
          break;
    }
@@ -299,48 +300,48 @@
          break;
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x8L);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x10L);
       case 68:
       case 100:
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x40L);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x80L);
       case 69:
       case 101:
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x400L);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x800L);
       case 70:
       case 102:
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x8000L);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x10000L);
       case 71:
       case 103:
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x40002080L);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x80004100L);
       case 76:
       case 108:
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x800L);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x1000L);
       case 77:
       case 109:
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x20L);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x40L);
       case 78:
       case 110:
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x100L);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x200L);
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x20000L);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x40000L);
       case 80:
       case 112:
-         if ((active1 & 0x1000L) != 0L)
+         if ((active1 & 0x2000L) != 0L)
          {
-            jjmatchedKind = 76;
+            jjmatchedKind = 77;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x10L);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x20L);
       case 84:
       case 116:
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x80004000L);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x100008000L);
       case 85:
       case 117:
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x10000L);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x20000L);
       case 89:
       case 121:
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x200L);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x400L);
       default :
          break;
    }
@@ -357,51 +358,51 @@
    switch(curChar)
    {
       case 40:
-         if ((active1 & 0x40000000L) != 0L)
+         if ((active1 & 0x80000000L) != 0L)
          {
-            jjmatchedKind = 94;
+            jjmatchedKind = 95;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x80000000L) != 0L)
+         else if ((active1 & 0x100000000L) != 0L)
          {
-            jjmatchedKind = 95;
+            jjmatchedKind = 96;
             jjmatchedPos = 4;
          }
          break;
       case 69:
       case 101:
-         if ((active1 & 0x80L) != 0L)
+         if ((active1 & 0x100L) != 0L)
          {
-            jjmatchedKind = 71;
+            jjmatchedKind = 72;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active1, 0x20L);
+         return jjMoveStringLiteralDfa5_0(active1, 0x40L);
       case 70:
       case 102:
-         return jjMoveStringLiteralDfa5_0(active1, 0x600L);
+         return jjMoveStringLiteralDfa5_0(active1, 0xc00L);
       case 72:
       case 104:
-         return jjMoveStringLiteralDfa5_0(active1, 0x2000L);
+         return jjMoveStringLiteralDfa5_0(active1, 0x4000L);
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa5_0(active1, 0x40L);
+         return jjMoveStringLiteralDfa5_0(active1, 0x80L);
       case 78:
       case 110:
-         return jjMoveStringLiteralDfa5_0(active1, 0x30000L);
+         return jjMoveStringLiteralDfa5_0(active1, 0x60000L);
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa5_0(active1, 0x810L);
+         return jjMoveStringLiteralDfa5_0(active1, 0x1020L);
       case 82:
       case 114:
-         return jjMoveStringLiteralDfa5_0(active1, 0x8L);
+         return jjMoveStringLiteralDfa5_0(active1, 0x10L);
       case 84:
       case 116:
-         if ((active1 & 0x8000L) != 0L)
+         if ((active1 & 0x10000L) != 0L)
          {
-            jjmatchedKind = 79;
+            jjmatchedKind = 80;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active1, 0x4100L);
+         return jjMoveStringLiteralDfa5_0(active1, 0x8200L);
       default :
          break;
    }
@@ -418,35 +419,35 @@
    switch(curChar)
    {
       case 45:
-         return jjMoveStringLiteralDfa6_0(active1, 0x100L);
+         return jjMoveStringLiteralDfa6_0(active1, 0x200L);
       case 65:
       case 97:
-         if ((active1 & 0x40L) != 0L)
+         if ((active1 & 0x80L) != 0L)
          {
-            jjmatchedKind = 70;
+            jjmatchedKind = 71;
             jjmatchedPos = 5;
          }
          break;
       case 69:
       case 101:
-         return jjMoveStringLiteralDfa6_0(active1, 0x20400L);
+         return jjMoveStringLiteralDfa6_0(active1, 0x40800L);
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa6_0(active1, 0x4000L);
+         return jjMoveStringLiteralDfa6_0(active1, 0x8000L);
       case 82:
       case 114:
-         return jjMoveStringLiteralDfa6_0(active1, 0xa10L);
+         return jjMoveStringLiteralDfa6_0(active1, 0x1420L);
       case 83:
       case 115:
-         return jjMoveStringLiteralDfa6_0(active1, 0x28L);
+         return jjMoveStringLiteralDfa6_0(active1, 0x50L);
       case 84:
       case 116:
-         if ((active1 & 0x2000L) != 0L)
+         if ((active1 & 0x4000L) != 0L)
          {
-            jjmatchedKind = 77;
+            jjmatchedKind = 78;
             jjmatchedPos = 5;
          }
-         return jjMoveStringLiteralDfa6_0(active1, 0x10000L);
+         return jjMoveStringLiteralDfa6_0(active1, 0x20000L);
       default :
          break;
    }
@@ -463,38 +464,38 @@
    switch(curChar)
    {
       case 45:
-         return jjMoveStringLiteralDfa7_0(active1, 0x800L);
+         return jjMoveStringLiteralDfa7_0(active1, 0x1000L);
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa7_0(active1, 0x200L);
+         return jjMoveStringLiteralDfa7_0(active1, 0x400L);
       case 69:
       case 101:
-         return jjMoveStringLiteralDfa7_0(active1, 0x10008L);
+         return jjMoveStringLiteralDfa7_0(active1, 0x20010L);
       case 70:
       case 102:
-         return jjMoveStringLiteralDfa7_0(active1, 0x100L);
+         return jjMoveStringLiteralDfa7_0(active1, 0x200L);
       case 77:
       case 109:
-         if ((active1 & 0x4000L) != 0L)
+         if ((active1 & 0x8000L) != 0L)
          {
-            jjmatchedKind = 78;
+            jjmatchedKind = 79;
             jjmatchedPos = 6;
          }
          break;
       case 80:
       case 112:
-         return jjMoveStringLiteralDfa7_0(active1, 0x20L);
+         return jjMoveStringLiteralDfa7_0(active1, 0x40L);
       case 82:
       case 114:
-         return jjMoveStringLiteralDfa7_0(active1, 0x400L);
+         return jjMoveStringLiteralDfa7_0(active1, 0x800L);
       case 84:
       case 116:
-         if ((active1 & 0x10L) != 0L)
+         if ((active1 & 0x20L) != 0L)
          {
-            jjmatchedKind = 68;
+            jjmatchedKind = 69;
             jjmatchedPos = 6;
          }
-         return jjMoveStringLiteralDfa7_0(active1, 0x20000L);
+         return jjMoveStringLiteralDfa7_0(active1, 0x40000L);
       default :
          break;
    }
@@ -512,32 +513,32 @@
    {
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa8_0(active1, 0x120L);
+         return jjMoveStringLiteralDfa8_0(active1, 0x240L);
       case 69:
       case 101:
-         return jjMoveStringLiteralDfa8_0(active1, 0x400L);
+         return jjMoveStringLiteralDfa8_0(active1, 0x800L);
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa8_0(active1, 0x20000L);
+         return jjMoveStringLiteralDfa8_0(active1, 0x40000L);
       case 77:
       case 109:
-         return jjMoveStringLiteralDfa8_0(active1, 0x200L);
+         return jjMoveStringLiteralDfa8_0(active1, 0x400L);
       case 80:
       case 112:
-         return jjMoveStringLiteralDfa8_0(active1, 0x800L);
+         return jjMoveStringLiteralDfa8_0(active1, 0x1000L);
       case 82:
       case 114:
-         if ((active1 & 0x10000L) != 0L)

[5817 lines skipped]
Received on Thursday, 10 January 2013 11:19:14 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Thursday, 10 January 2013 11:19:15 GMT