diff --git a/xml/impl/src/com/intellij/lexer/__XmlLexer.java b/xml/impl/src/com/intellij/lexer/__XmlLexer.java
index 42c7d9c8eb34..ac4b50698288 100644
--- a/xml/impl/src/com/intellij/lexer/__XmlLexer.java
+++ b/xml/impl/src/com/intellij/lexer/__XmlLexer.java
@@ -1,4 +1,4 @@
-/* The following code was generated by JFlex 1.4.1 on 10/26/09 6:47 PM */
+/* The following code was generated by JFlex 1.4.1 on 26.10.09 22:00 */
 
  /* It's an automatically generated code. Do not modify it. */
 package com.intellij.lexer;
@@ -11,8 +11,8 @@ import com.intellij.psi.xml.XmlTokenType;
 /**
  * This class is a scanner generated by 
  * <a href="http://www.jflex.de/">JFlex</a> 1.4.1
- * on 10/26/09 6:47 PM from the specification file
- * <tt>/Users/spleaner/ideadev/tools/lexer/_XmlLexer.flex</tt>
+ * on 26.10.09 22:00 from the specification file
+ * <tt>C:/IDEA/tools/lexer/_XmlLexer.flex</tt>
  */
 public class __XmlLexer implements FlexLexer {
   /** initial size of the lookahead buffer */
@@ -115,19 +115,20 @@ public class __XmlLexer implements FlexLexer {
   private static final int [] ZZ_ACTION = zzUnpackAction();
 
   private static final String ZZ_ACTION_PACKED_0 =
-    "\1\1\16\0\1\1\1\2\1\1\1\3\1\4\1\1"+
-    "\1\3\1\5\1\6\1\7\2\3\2\10\1\3\4\11"+
-    "\1\12\3\13\1\14\1\15\3\16\1\17\1\20\1\21"+
-    "\2\22\1\23\1\22\1\24\3\22\1\25\1\3\2\12"+
-    "\2\3\2\1\1\26\1\13\4\26\1\27\10\0\1\30"+
-    "\1\31\1\5\1\0\1\32\2\10\1\33\1\12\2\0"+
-    "\1\15\5\0\1\34\1\0\2\12\3\0\1\35\1\36"+
-    "\1\0\1\37\12\0\1\40\1\41\1\42\1\43\1\44"+
-    "\2\12\1\45\1\46\2\0\1\47\2\0\2\12\2\0"+
-    "\2\12\2\0\1\50\1\51\4\0\1\52\1\53";
+    "\1\1\4\0\1\2\11\0\1\1\1\3\1\1\1\4"+
+    "\1\5\1\1\1\4\1\6\1\7\1\10\2\4\2\11"+
+    "\1\4\4\12\1\13\1\2\1\14\1\2\1\15\1\16"+
+    "\3\17\1\20\1\21\1\22\2\23\1\14\1\23\1\24"+
+    "\3\23\1\25\1\4\2\13\2\4\2\1\1\26\1\2"+
+    "\4\26\1\27\10\0\1\30\1\31\1\6\1\0\1\32"+
+    "\2\11\1\33\1\13\2\0\1\2\1\16\5\0\1\34"+
+    "\1\0\2\13\3\0\1\35\1\36\1\0\1\37\12\0"+
+    "\1\40\1\41\1\42\1\43\1\44\2\13\1\45\1\46"+
+    "\2\0\1\47\2\0\2\13\2\0\2\13\2\0\1\50"+
+    "\1\51\4\0\1\52\1\53";
 
   private static int [] zzUnpackAction() {
-    int [] result = new int[145];
+    int [] result = new int[146];
     int offset = 0;
     offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result);
     return result;
@@ -156,24 +157,24 @@ public class __XmlLexer implements FlexLexer {
     "\0\u01b8\0\u01ef\0\u0226\0\u025d\0\u0294\0\u02cb\0\u0302\0\u0339"+
     "\0\u0370\0\u03a7\0\u03de\0\u0415\0\u044c\0\u0483\0\u04ba\0\u04f1"+
     "\0\u0483\0\u0528\0\u055f\0\u0596\0\u05cd\0\u0604\0\u0483\0\u03de"+
-    "\0\u0528\0\u0604\0\u063b\0\u0483\0\u0672\0\u06a9\0\u0483\0\u06e0"+
-    "\0\u0483\0\u03de\0\u0528\0\u0483\0\u0483\0\u0483\0\u0483\0\u0717"+
-    "\0\u03de\0\u0528\0\u0483\0\u074e\0\u0785\0\u07bc\0\u0483\0\u07f3"+
-    "\0\u082a\0\u0861\0\u0898\0\u08cf\0\u0483\0\u0906\0\u0483\0\u093d"+
-    "\0\u0672\0\u03de\0\u0528\0\u0974\0\u0483\0\u09ab\0\u09e2\0\u0a19"+
-    "\0\u0a50\0\u0a87\0\u0abe\0\u0af5\0\u0b2c\0\u0483\0\u0483\0\u0b63"+
-    "\0\u0b9a\0\u0483\0\u0bd1\0\u0c08\0\u0483\0\u0c3f\0\u0c76\0\u0cad"+
-    "\0\u0ce4\0\u0d1b\0\u0d52\0\u0d89\0\u0dc0\0\u07f3\0\u0483\0\u0df7"+
-    "\0\u0e2e\0\u0e65\0\u0898\0\u08cf\0\u0e9c\0\u0483\0\u0483\0\u0ed3"+
-    "\0\u0483\0\u0f0a\0\u0f41\0\u0f78\0\u0faf\0\u0fe6\0\u101d\0\u1054"+
-    "\0\u108b\0\u10c2\0\u10f9\0\u0596\0\u0483\0\u0483\0\u0483\0\u0483"+
-    "\0\u1130\0\u1167\0\u0483\0\u0483\0\u119e\0\u11d5\0\u0483\0\u120c"+
-    "\0\u1243\0\u127a\0\u12b1\0\u12e8\0\u131f\0\u1356\0\u138d\0\u13c4"+
-    "\0\u13fb\0\u063b\0\u063b\0\u1432\0\u1469\0\u14a0\0\u14d7\0\u0483"+
-    "\0\u0483";
+    "\0\u0528\0\u0604\0\u063b\0\u0672\0\u06a9\0\u06e0\0\u0672\0\u0717"+
+    "\0\u0483\0\u03de\0\u0528\0\u0483\0\u0483\0\u0483\0\u0483\0\u074e"+
+    "\0\u03de\0\u0528\0\u0483\0\u0785\0\u07bc\0\u07f3\0\u0483\0\u082a"+
+    "\0\u0861\0\u0898\0\u08cf\0\u0906\0\u0483\0\u093d\0\u0483\0\u0974"+
+    "\0\u09ab\0\u03de\0\u0528\0\u09e2\0\u0483\0\u0a19\0\u0a50\0\u0a87"+
+    "\0\u0abe\0\u0af5\0\u0b2c\0\u0b63\0\u0b9a\0\u0483\0\u0483\0\u0bd1"+
+    "\0\u0c08\0\u0483\0\u0c3f\0\u0c76\0\u0483\0\u0cad\0\u0ce4\0\u0d1b"+
+    "\0\u0d52\0\u0d89\0\u0dc0\0\u0df7\0\u0e2e\0\u0e65\0\u082a\0\u0483"+
+    "\0\u0e9c\0\u0ed3\0\u0f0a\0\u08cf\0\u0906\0\u0f41\0\u0483\0\u0483"+
+    "\0\u0f78\0\u0483\0\u0faf\0\u0fe6\0\u101d\0\u1054\0\u108b\0\u10c2"+
+    "\0\u10f9\0\u1130\0\u1167\0\u119e\0\u0596\0\u0483\0\u0672\0\u0483"+
+    "\0\u0483\0\u11d5\0\u120c\0\u0483\0\u0483\0\u1243\0\u127a\0\u0483"+
+    "\0\u12b1\0\u12e8\0\u131f\0\u1356\0\u138d\0\u13c4\0\u13fb\0\u1432"+
+    "\0\u1469\0\u14a0\0\u063b\0\u063b\0\u14d7\0\u150e\0\u1545\0\u157c"+
+    "\0\u0483\0\u0483";
 
   private static int [] zzUnpackRowMap() {
-    int [] result = new int[145];
+    int [] result = new int[146];
     int offset = 0;
     offset = zzUnpackRowMap(ZZ_ROWMAP_PACKED_0, offset, result);
     return result;
@@ -231,71 +232,73 @@ public class __XmlLexer implements FlexLexer {
     "\1\0\26\34\11\0\2\34\4\0\3\34\1\123\6\0"+
     "\4\34\1\0\2\34\1\0\11\34\1\124\14\34\23\0"+
     "\1\125\54\0\2\43\4\0\3\43\1\126\6\0\4\43"+
-    "\1\0\2\43\1\0\26\43\21\0\1\127\72\0\1\130"+
-    "\52\0\2\50\4\0\3\50\1\131\6\0\4\50\1\0"+
-    "\2\50\1\0\26\50\15\0\1\132\145\0\1\133\7\0"+
-    "\1\134\145\0\1\135\2\0\25\136\1\137\31\136\1\140"+
-    "\7\136\1\0\2\43\4\0\3\43\1\126\6\0\4\43"+
-    "\1\0\2\43\1\0\22\43\1\141\3\43\11\0\2\43"+
-    "\4\0\3\43\1\126\6\0\4\43\1\0\2\43\1\0"+
-    "\15\43\1\142\10\43\10\0\57\143\1\57\7\143\60\144"+
-    "\1\57\6\144\25\0\1\145\42\0\3\100\4\0\1\100"+
-    "\3\0\3\100\2\0\4\100\1\0\2\100\1\0\26\100"+
-    "\23\0\1\146\53\0\17\106\1\0\42\106\1\147\4\106"+
-    "\1\0\2\107\4\0\3\107\1\150\6\0\4\107\1\0"+
-    "\2\107\1\151\26\107\12\0\1\152\40\0\1\153\24\0"+
-    "\2\107\4\0\3\107\1\150\6\0\4\107\1\0\1\107"+
-    "\1\154\1\151\26\107\11\0\2\107\4\0\3\107\1\150"+
-    "\6\0\4\107\1\0\2\107\1\151\2\107\1\155\6\107"+
-    "\1\156\14\107\11\0\2\107\4\0\3\107\1\150\6\0"+
-    "\4\107\1\0\2\107\1\151\6\107\1\157\17\107\11\0"+
-    "\2\107\4\0\3\107\1\150\6\0\4\107\1\0\2\107"+
-    "\1\151\10\107\1\160\15\107\21\0\1\161\6\0\1\162"+
-    "\1\0\1\163\45\0\2\120\4\0\3\120\7\0\4\120"+
-    "\1\0\2\120\1\0\26\120\21\0\1\161\6\0\1\162"+
+    "\1\0\2\43\1\0\26\43\10\0\11\44\1\127\66\44"+
+    "\1\130\66\44\1\127\3\44\1\131\51\44\1\0\2\50"+
+    "\4\0\3\50\1\132\6\0\4\50\1\0\2\50\1\0"+
+    "\26\50\15\0\1\133\145\0\1\134\7\0\1\135\145\0"+
+    "\1\136\2\0\25\137\1\140\31\137\1\141\7\137\1\0"+
+    "\2\43\4\0\3\43\1\126\6\0\4\43\1\0\2\43"+
+    "\1\0\22\43\1\142\3\43\11\0\2\43\4\0\3\43"+
+    "\1\126\6\0\4\43\1\0\2\43\1\0\15\43\1\143"+
+    "\10\43\10\0\57\144\1\57\7\144\60\145\1\57\6\145"+
+    "\25\0\1\146\42\0\3\100\4\0\1\100\3\0\3\100"+
+    "\2\0\4\100\1\0\2\100\1\0\26\100\21\0\1\130"+
+    "\70\0\1\147\53\0\17\106\1\0\42\106\1\150\4\106"+
+    "\1\0\2\107\4\0\3\107\1\151\6\0\4\107\1\0"+
+    "\2\107\1\152\26\107\12\0\1\153\40\0\1\154\24\0"+
+    "\2\107\4\0\3\107\1\151\6\0\4\107\1\0\1\107"+
+    "\1\155\1\152\26\107\11\0\2\107\4\0\3\107\1\151"+
+    "\6\0\4\107\1\0\2\107\1\152\2\107\1\156\6\107"+
+    "\1\157\14\107\11\0\2\107\4\0\3\107\1\151\6\0"+
+    "\4\107\1\0\2\107\1\152\6\107\1\160\17\107\11\0"+
+    "\2\107\4\0\3\107\1\151\6\0\4\107\1\0\2\107"+
+    "\1\152\10\107\1\161\15\107\21\0\1\162\6\0\1\163"+
+    "\1\0\1\164\45\0\2\120\4\0\3\120\7\0\4\120"+
+    "\1\0\2\120\1\0\26\120\21\0\1\162\6\0\1\163"+
     "\47\0\2\123\4\0\3\123\7\0\4\123\1\0\2\123"+
     "\1\0\26\123\11\0\2\34\4\0\3\34\1\123\6\0"+
-    "\4\34\1\0\1\164\1\34\1\0\26\34\11\0\2\126"+
+    "\4\34\1\0\1\165\1\34\1\0\26\34\11\0\2\126"+
     "\4\0\3\126\7\0\4\126\1\0\2\126\1\0\26\126"+
-    "\23\0\1\165\73\0\1\166\47\0\2\131\4\0\3\131"+
-    "\7\0\4\131\1\0\2\131\1\0\26\131\10\0\57\132"+
-    "\1\0\2\132\1\167\4\132\57\133\1\0\5\133\1\170"+
-    "\1\133\60\134\1\0\1\134\1\167\4\134\60\135\1\0"+
-    "\4\135\1\170\1\135\57\140\1\136\7\140\1\0\2\43"+
+    "\10\0\11\44\1\0\55\44\13\0\1\166\53\0\11\44"+
+    "\1\127\6\44\1\167\46\44\1\0\2\132\4\0\3\132"+
+    "\7\0\4\132\1\0\2\132\1\0\26\132\10\0\57\133"+
+    "\1\0\2\133\1\170\4\133\57\134\1\0\5\134\1\171"+
+    "\1\134\60\135\1\0\1\135\1\170\4\135\60\136\1\0"+
+    "\4\136\1\171\1\136\57\141\1\137\7\141\1\0\2\43"+
     "\4\0\3\43\1\126\6\0\4\43\1\0\2\43\1\0"+
-    "\23\43\1\171\2\43\11\0\2\43\4\0\3\43\1\126"+
-    "\6\0\4\43\1\0\2\43\1\0\20\43\1\172\5\43"+
-    "\23\0\1\173\54\0\2\150\4\0\3\150\7\0\4\150"+
-    "\1\0\2\150\1\151\26\150\12\0\1\152\25\0\1\174"+
-    "\40\0\1\175\16\0\3\175\6\0\1\175\6\0\1\175"+
-    "\2\0\1\175\3\0\1\175\3\0\1\175\13\0\2\107"+
-    "\4\0\3\107\1\150\6\0\4\107\1\0\2\107\1\174"+
-    "\26\107\11\0\2\107\4\0\3\107\1\150\6\0\4\107"+
-    "\1\0\2\107\1\151\3\107\1\176\22\107\11\0\2\107"+
-    "\4\0\3\107\1\150\6\0\4\107\1\0\2\107\1\151"+
-    "\2\107\1\154\23\107\11\0\2\107\4\0\3\107\1\150"+
-    "\6\0\4\107\1\0\2\107\1\151\3\107\1\111\22\107"+
-    "\11\0\2\107\4\0\3\107\1\150\6\0\4\107\1\0"+
-    "\2\107\1\151\4\107\1\156\21\107\21\0\1\177\76\0"+
-    "\1\200\112\0\1\201\22\0\2\43\4\0\3\43\1\126"+
-    "\6\0\4\43\1\0\2\43\1\0\24\43\1\202\1\43"+
-    "\11\0\2\43\4\0\3\43\1\126\6\0\3\43\1\203"+
-    "\1\0\2\43\1\0\26\43\12\0\1\175\16\0\3\175"+
-    "\4\0\1\174\1\0\1\175\6\0\1\175\2\0\1\175"+
-    "\3\0\1\175\3\0\1\175\13\0\2\107\4\0\3\107"+
-    "\1\150\6\0\4\107\1\0\2\107\1\151\4\107\1\154"+
-    "\21\107\32\0\1\204\65\0\1\205\46\0\2\43\4\0"+
+    "\23\43\1\172\2\43\11\0\2\43\4\0\3\43\1\126"+
+    "\6\0\4\43\1\0\2\43\1\0\20\43\1\173\5\43"+
+    "\23\0\1\174\54\0\2\151\4\0\3\151\7\0\4\151"+
+    "\1\0\2\151\1\152\26\151\12\0\1\153\25\0\1\175"+
+    "\40\0\1\176\16\0\3\176\6\0\1\176\6\0\1\176"+
+    "\2\0\1\176\3\0\1\176\3\0\1\176\13\0\2\107"+
+    "\4\0\3\107\1\151\6\0\4\107\1\0\2\107\1\175"+
+    "\26\107\11\0\2\107\4\0\3\107\1\151\6\0\4\107"+
+    "\1\0\2\107\1\152\3\107\1\177\22\107\11\0\2\107"+
+    "\4\0\3\107\1\151\6\0\4\107\1\0\2\107\1\152"+
+    "\2\107\1\155\23\107\11\0\2\107\4\0\3\107\1\151"+
+    "\6\0\4\107\1\0\2\107\1\152\3\107\1\111\22\107"+
+    "\11\0\2\107\4\0\3\107\1\151\6\0\4\107\1\0"+
+    "\2\107\1\152\4\107\1\157\21\107\21\0\1\200\76\0"+
+    "\1\201\112\0\1\202\22\0\2\43\4\0\3\43\1\126"+
+    "\6\0\4\43\1\0\2\43\1\0\24\43\1\203\1\43"+
+    "\11\0\2\43\4\0\3\43\1\126\6\0\3\43\1\204"+
+    "\1\0\2\43\1\0\26\43\12\0\1\176\16\0\3\176"+
+    "\4\0\1\175\1\0\1\176\6\0\1\176\2\0\1\176"+
+    "\3\0\1\176\3\0\1\176\13\0\2\107\4\0\3\107"+
+    "\1\151\6\0\4\107\1\0\2\107\1\152\4\107\1\155"+
+    "\21\107\32\0\1\205\65\0\1\206\46\0\2\43\4\0"+
     "\3\43\1\126\6\0\4\43\1\0\2\43\1\0\25\43"+
-    "\1\206\11\0\2\43\4\0\3\43\1\126\6\0\4\43"+
-    "\1\0\2\43\1\0\17\43\1\207\6\43\33\0\1\210"+
-    "\67\0\1\211\43\0\2\43\4\0\3\43\1\126\6\0"+
-    "\1\212\3\43\1\0\2\43\1\0\26\43\11\0\2\43"+
+    "\1\207\11\0\2\43\4\0\3\43\1\126\6\0\4\43"+
+    "\1\0\2\43\1\0\17\43\1\210\6\43\33\0\1\211"+
+    "\67\0\1\212\43\0\2\43\4\0\3\43\1\126\6\0"+
+    "\1\213\3\43\1\0\2\43\1\0\26\43\11\0\2\43"+
     "\4\0\3\43\1\126\6\0\4\43\1\0\2\43\1\0"+
-    "\21\43\1\213\4\43\34\0\1\214\110\0\1\215\43\0"+
-    "\1\216\112\0\1\217\37\0\1\220\116\0\1\221\16\0";
+    "\21\43\1\214\4\43\34\0\1\215\110\0\1\216\43\0"+
+    "\1\217\112\0\1\220\37\0\1\221\116\0\1\222\16\0";
 
   private static int [] zzUnpackTrans() {
-    int [] result = new int[5390];
+    int [] result = new int[5555];
     int offset = 0;
     offset = zzUnpackTrans(ZZ_TRANS_PACKED_0, offset, result);
     return result;
@@ -336,17 +339,17 @@ public class __XmlLexer implements FlexLexer {
   private static final int [] ZZ_ATTRIBUTE = zzUnpackAttribute();
 
   private static final String ZZ_ATTRIBUTE_PACKED_0 =
-    "\1\1\16\0\6\1\1\11\2\1\1\11\5\1\1\11"+
-    "\4\1\1\11\2\1\1\11\1\1\1\11\2\1\4\11"+
-    "\3\1\1\11\3\1\1\11\5\1\1\11\1\1\1\11"+
-    "\5\1\1\11\10\0\2\11\1\1\1\0\1\11\2\1"+
-    "\1\11\1\1\2\0\1\1\5\0\1\11\1\0\2\1"+
-    "\3\0\2\11\1\0\1\11\12\0\1\1\4\11\2\1"+
+    "\1\1\4\0\1\1\11\0\6\1\1\11\2\1\1\11"+
+    "\5\1\1\11\11\1\1\11\2\1\4\11\3\1\1\11"+
+    "\3\1\1\11\5\1\1\11\1\1\1\11\5\1\1\11"+
+    "\10\0\2\11\1\1\1\0\1\11\2\1\1\11\1\1"+
+    "\2\0\2\1\5\0\1\11\1\0\2\1\3\0\2\11"+
+    "\1\0\1\11\12\0\1\1\1\11\1\1\2\11\2\1"+
     "\2\11\2\0\1\11\2\0\2\1\2\0\2\1\2\0"+
     "\2\1\4\0\2\11";
 
   private static int [] zzUnpackAttribute() {
-    int [] result = new int[145];
+    int [] result = new int[146];
     int offset = 0;
     offset = zzUnpackAttribute(ZZ_ATTRIBUTE_PACKED_0, offset, result);
     return result;
@@ -702,7 +705,7 @@ public class __XmlLexer implements FlexLexer {
           { yybegin(ATTR_LIST); return XmlTokenType.XML_ATTRIBUTE_VALUE_END_DELIMITER;
           }
         case 44: break;
-        case 18: 
+        case 19: 
           { return XmlTokenType.XML_ATTRIBUTE_VALUE_TOKEN;
           }
         case 45: break;
@@ -710,11 +713,11 @@ public class __XmlLexer implements FlexLexer {
           { return XmlTokenType.XML_DOCTYPE_SYSTEM;
           }
         case 46: break;
-        case 17: 
+        case 18: 
           { return XmlTokenType.XML_EQ;
           }
         case 47: break;
-        case 9: 
+        case 10: 
           { return XmlTokenType.XML_TAG_CHARACTERS;
           }
         case 48: break;
@@ -722,7 +725,7 @@ public class __XmlLexer implements FlexLexer {
           { yybegin(CDATA); return XmlTokenType.XML_CDATA_START;
           }
         case 49: break;
-        case 5: 
+        case 6: 
           { yybegin(ATTR_LIST); pushState(TAG); return XmlTokenType.XML_NAME;
           }
         case 50: break;
@@ -730,28 +733,28 @@ public class __XmlLexer implements FlexLexer {
           { yybegin(END_TAG); return XmlTokenType.XML_END_TAG_START;
           }
         case 51: break;
-        case 34: 
-          { if (myConditionalCommentsSupport) {
-    yybegin(C_COMMENT_END);
-    return XmlTokenType.XML_CONDITIONAL_COMMENT_END_START;
-  } else return XmlTokenType.XML_COMMENT_CHARACTERS;
-          }
-        case 52: break;
         case 30: 
           { return elTokenType;
           }
-        case 53: break;
-        case 10: 
+        case 52: break;
+        case 11: 
           { return XmlTokenType.XML_NAME;
           }
-        case 54: break;
+        case 53: break;
         case 40: 
           { return XmlTokenType.XML_DOCTYPE_PUBLIC;
           }
-        case 55: break;
+        case 54: break;
         case 39: 
           { yybegin(COMMENT); return XmlTokenType.XML_COMMENT_START;
           }
+        case 55: break;
+        case 13: 
+          { if (myConditionalCommentsSupport) {
+    yybegin(C_COMMENT_START);
+    return XmlTokenType.XML_CONDITIONAL_COMMENT_START;
+  } else return XmlTokenType.XML_COMMENT_CHARACTERS;
+          }
         case 56: break;
         case 36: 
           { return javaEmbeddedTokenType;
@@ -765,7 +768,7 @@ public class __XmlLexer implements FlexLexer {
           { yybegin(ATTR_LIST); pushState(PROCESSING_INSTRUCTION); return XmlTokenType.XML_NAME;
           }
         case 59: break;
-        case 2: 
+        case 3: 
           { return XmlTokenType.XML_REAL_WHITE_SPACE;
           }
         case 60: break;
@@ -777,11 +780,11 @@ public class __XmlLexer implements FlexLexer {
           { yybegin(COMMENT); return XmlTokenType.XML_CONDITIONAL_COMMENT_END;
           }
         case 62: break;
-        case 19: 
+        case 12: 
           { return XmlTokenType.XML_BAD_CHARACTER;
           }
         case 63: break;
-        case 7: 
+        case 8: 
           { yybegin(YYINITIAL); return XmlTokenType.XML_TAG_END;
           }
         case 64: break;
@@ -789,79 +792,79 @@ public class __XmlLexer implements FlexLexer {
           { yybegin(COMMENT); return XmlTokenType.XML_CONDITIONAL_COMMENT_START_END;
           }
         case 65: break;
-        case 33: 
-          { yybegin(YYINITIAL); return XmlTokenType.XML_COMMENT_END;
-          }
-        case 66: break;
         case 4: 
-          { yybegin(TAG); return XmlTokenType.XML_START_TAG_START;
-          }
-        case 67: break;
-        case 26: 
-          { yybegin(YYINITIAL); return XmlTokenType.XML_EMPTY_ELEMENT_END;
-          }
-        case 68: break;
-        case 24: 
-          { yybegin(PROCESSING_INSTRUCTION); return XmlTokenType.XML_PI_START;
-          }
-        case 69: break;
-        case 8: 
-          { yybegin(PI_ANY); return XmlTokenType.XML_NAME;
-          }
-        case 70: break;
-        case 12: 
-          { if (myConditionalCommentsSupport) {
-    yybegin(C_COMMENT_START);
-    return XmlTokenType.XML_CONDITIONAL_COMMENT_START;
-  } else return XmlTokenType.XML_COMMENT_CHARACTERS;
-          }
-        case 71: break;
-        case 13: 
-          { yybegin(ATTR); return XmlTokenType.XML_NAME;
-          }
-        case 72: break;
-        case 14: 
-          { yybegin(ATTR_LIST); yypushback(yylength());
-          }
-        case 73: break;
-        case 21: 
-          { yybegin(YYINITIAL); return XmlTokenType.XML_DOCTYPE_END;
-          }
-        case 74: break;
-        case 38: 
-          { return XmlTokenType.XML_CHAR_ENTITY_REF;
-          }
-        case 75: break;
-        case 6: 
-          { return XmlTokenType.XML_WHITE_SPACE;
-          }
-        case 76: break;
-        case 31: 
-          { return XmlTokenType.XML_ENTITY_REF_TOKEN;
-          }
-        case 77: break;
-        case 15: 
-          { yybegin(ATTR_VALUE_DQ); return XmlTokenType.XML_ATTRIBUTE_VALUE_START_DELIMITER;
-          }
-        case 78: break;
-        case 16: 
-          { yybegin(ATTR_VALUE_SQ); return XmlTokenType.XML_ATTRIBUTE_VALUE_START_DELIMITER;
-          }
-        case 79: break;
-        case 22: 
-          { yybegin(COMMENT); return XmlTokenType.XML_COMMENT_CHARACTERS;
-          }
-        case 80: break;
-        case 37: 
-          { yybegin(YYINITIAL); return XmlTokenType.XML_CDATA_END;
-          }
-        case 81: break;
-        case 3: 
           { if(yystate() == YYINITIAL){
         return XmlTokenType.XML_BAD_CHARACTER;
       }
       else yybegin(popState()); yypushback(yylength());
           }
+        case 66: break;
+        case 33: 
+          { yybegin(YYINITIAL); return XmlTokenType.XML_COMMENT_END;
+          }
+        case 67: break;
+        case 5: 
+          { yybegin(TAG); return XmlTokenType.XML_START_TAG_START;
+          }
+        case 68: break;
+        case 34: 
+          { if (myConditionalCommentsSupport) {
+    yybegin(C_COMMENT_END);
+    return XmlTokenType.XML_CONDITIONAL_COMMENT_END_START;
+  } else return XmlTokenType.XML_COMMENT_CHARACTERS;
+          }
+        case 69: break;
+        case 26: 
+          { yybegin(YYINITIAL); return XmlTokenType.XML_EMPTY_ELEMENT_END;
+          }
+        case 70: break;
+        case 24: 
+          { yybegin(PROCESSING_INSTRUCTION); return XmlTokenType.XML_PI_START;
+          }
+        case 71: break;
+        case 9: 
+          { yybegin(PI_ANY); return XmlTokenType.XML_NAME;
+          }
+        case 72: break;
+        case 14: 
+          { yybegin(ATTR); return XmlTokenType.XML_NAME;
+          }
+        case 73: break;
+        case 15: 
+          { yybegin(ATTR_LIST); yypushback(yylength());
+          }
+        case 74: break;
+        case 21: 
+          { yybegin(YYINITIAL); return XmlTokenType.XML_DOCTYPE_END;
+          }
+        case 75: break;
+        case 38: 
+          { return XmlTokenType.XML_CHAR_ENTITY_REF;
+          }
+        case 76: break;
+        case 7: 
+          { return XmlTokenType.XML_WHITE_SPACE;
+          }
+        case 77: break;
+        case 31: 
+          { return XmlTokenType.XML_ENTITY_REF_TOKEN;
+          }
+        case 78: break;
+        case 16: 
+          { yybegin(ATTR_VALUE_DQ); return XmlTokenType.XML_ATTRIBUTE_VALUE_START_DELIMITER;
+          }
+        case 79: break;
+        case 17: 
+          { yybegin(ATTR_VALUE_SQ); return XmlTokenType.XML_ATTRIBUTE_VALUE_START_DELIMITER;
+          }
+        case 80: break;
+        case 22: 
+          { yybegin(COMMENT); return XmlTokenType.XML_COMMENT_CHARACTERS;
+          }
+        case 81: break;
+        case 37: 
+          { yybegin(YYINITIAL); return XmlTokenType.XML_CDATA_END;
+          }
         case 82: break;
         case 35: 
           { return elTokenType2;
@@ -875,7 +878,7 @@ public class __XmlLexer implements FlexLexer {
           { yybegin(DOCTYPE); return XmlTokenType.XML_DOCTYPE_START;
           }
         case 85: break;
-        case 11: 
+        case 2: 
           { return XmlTokenType.XML_COMMENT_CHARACTERS;
           }
         case 86: break;