diff --git a/source/com/intellij/lexer/_XmlLexer.java b/source/com/intellij/lexer/_XmlLexer.java
index 58875ead1677..2d45fd69c2d7 100644
--- a/source/com/intellij/lexer/_XmlLexer.java
+++ b/source/com/intellij/lexer/_XmlLexer.java
@@ -1,4 +1,4 @@
-/* The following code was generated by JFlex 1.4 on 1/13/05 11:58 AM */
+/* The following code was generated by JFlex 1.4 on 2/1/05 4:27 PM */
 
 /* It's an automatically generated code. Do not modify it. */
  package com.intellij.lexer;
@@ -11,7 +11,7 @@
  /**
 * This class is a scanner generated by
 * <a href="http://www.jflex.de/">JFlex</a> 1.4
-* on 1/13/05 11:58 AM from the specification file
+* on 2/1/05 4:27 PM from the specification file
 * <tt>_XmlLexer.flex</tt>
 */
  public class _XmlLexer implements Lexer, Cloneable {
@@ -21,12 +21,15 @@
  /** lexical states */
  public static final int PROCESSING_INSTRUCTION = 9;
  public static final int ATTR_LIST = 4;
+ public static final int EL_ATTR_VALUE = 12;
  public static final int END_TAG = 2;
  public static final int ATTR_VALUE_DQ = 7;
+ public static final int EL_ATTR_VALUE2 = 13;
  public static final int DTD_MARKUP = 6;
- public static final int CDATA = 11;
+ public static final int CDATA = 14;
  public static final int ATTR = 5;
  public static final int TAG = 1;
+ public static final int EL = 11;
  public static final int YYINITIAL = 0;
  public static final int ATTR_VALUE_START = 6;
  public static final int COMMENT = 3;
@@ -37,13 +40,14 @@
   * Translates characters to character classes
   */
  private static final String ZZ_CMAP_PACKED =
-   "\11\0\2\3\1\0\2\3\22\0\1\3\1\7\1\51\1\34\2\0"+
-   "\1\17\1\52\5\0\1\5\1\4\1\54\12\2\1\1\1\22\1\6"+
-   "\1\55\1\16\1\53\1\0\1\13\1\46\1\11\1\12\1\42\1\36"+
-   "\2\1\1\50\2\1\1\47\1\44\1\1\1\37\1\41\2\1\1\43"+
-   "\1\14\1\45\3\1\1\40\1\1\1\10\1\0\1\15\1\0\1\1"+
-   "\1\0\1\23\1\32\4\36\1\20\4\1\1\20\1\33\1\31\1\25"+
-   "\1\24\1\27\1\1\1\26\1\21\1\30\2\1\1\35\2\1\uff85\0";
+   "\11\0\2\3\1\0\2\3\22\0\1\57\1\7\1\51\1\34\1\54"+
+   "\1\0\1\17\1\52\5\0\1\5\1\4\1\60\12\2\1\1\1\22"+
+   "\1\6\1\61\1\16\1\53\1\0\1\13\1\46\1\11\1\12\1\42"+
+   "\1\36\2\1\1\50\2\1\1\47\1\44\1\1\1\37\1\41\2\1"+
+   "\1\43\1\14\1\45\3\1\1\40\1\1\1\10\1\62\1\15\1\0"+
+   "\1\1\1\0\1\23\1\32\4\36\1\20\4\1\1\20\1\33\1\31"+
+   "\1\25\1\24\1\27\1\1\1\26\1\21\1\30\2\1\1\35\2\1"+
+   "\1\55\1\0\1\56\uff82\0";
 
  /**
   * Translates characters to character classes
@@ -56,19 +60,24 @@
  private static final int [] ZZ_ACTION = zzUnpackAction();
 
  private static final String ZZ_ACTION_PACKED_0 =
-   "\3\0\1\1\3\0\2\2\3\0\1\3\1\4\1\5"+
-   "\2\6\1\7\1\6\1\10\1\6\1\11\1\1\1\0"+
-   "\1\12\3\13\1\14\1\15\1\16\3\2\1\17\2\2"+
-   "\1\20\1\6\1\21\1\6\1\22\2\21\2\6\1\3"+
-   "\1\0\1\23\1\24\7\0\1\25\2\0\2\2\1\26"+
-   "\1\0\1\27\1\0\2\21\1\0\1\2\5\0\1\30"+
-   "\10\0\1\31\4\2\2\21\1\32\1\33\2\0\1\34"+
-   "\2\0\1\33\1\2\1\33\1\2\2\21\2\0\2\2"+
-   "\2\21\2\0\2\2\1\35\1\36\2\0\2\2\2\0"+
-   "\2\2\1\37\1\40\2\37";
+   "\1\1\2\0\1\2\3\0\2\3\2\0\3\4\1\0"+
+   "\1\1\1\5\1\6\2\7\1\1\1\7\1\10\1\7"+
+   "\1\11\1\7\1\12\1\2\1\0\1\13\3\14\1\15"+
+   "\1\16\1\17\3\3\1\20\1\7\2\3\1\7\1\21"+
+   "\1\7\1\22\1\7\1\23\2\22\2\7\4\4\1\24"+
+   "\3\4\1\25\1\26\2\1\2\0\1\27\1\30\6\0"+
+   "\1\31\1\1\1\0\1\32\2\0\2\3\1\33\2\3"+
+   "\1\34\1\35\1\0\1\36\1\0\2\22\1\0\1\3"+
+   "\1\0\16\4\4\0\1\37\10\0\1\40\2\3\1\0"+
+   "\2\3\1\0\2\22\2\4\1\37\11\4\1\37\7\4"+
+   "\1\41\1\42\2\0\1\43\2\0\1\42\1\3\1\42"+
+   "\1\3\2\22\1\42\1\4\1\43\2\4\1\42\1\4"+
+   "\1\43\2\4\2\0\2\3\2\22\2\4\2\0\2\3"+
+   "\1\44\1\45\2\4\2\0\2\3\2\4\2\0\2\3"+
+   "\2\4\1\46\1\47\4\46";
 
  private static int [] zzUnpackAction() {
-   int [] result = new int[128];
+   int [] result = new int[209];
    int offset = 0;
    offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result);
    return result;
@@ -93,25 +102,36 @@
  private static final int [] ZZ_ROWMAP = zzUnpackRowMap();
 
  private static final String ZZ_ROWMAP_PACKED_0 =
-   "\0\0\0\56\0\134\0\212\0\270\0\346\0\u0114\0\u0142"+
-   "\0\u0170\0\u019e\0\u01cc\0\u01fa\0\u0228\0\u0256\0\u0284\0\u02b2"+
-   "\0\u0228\0\u02e0\0\u030e\0\u0228\0\u033c\0\u036a\0\u0398\0\u03c6"+
-   "\0\u03f4\0\u0228\0\u030e\0\u02b2\0\u0228\0\u0228\0\u0228\0\u0422"+
-   "\0\u0450\0\u02b2\0\u0228\0\u047e\0\u04ac\0\u04da\0\u0508\0\u0536"+
-   "\0\u0564\0\u0228\0\u0592\0\u05c0\0\u05ee\0\u061c\0\u064a\0\u0678"+
-   "\0\u0228\0\u0228\0\u06a6\0\u06d4\0\u0702\0\u0730\0\u075e\0\u078c"+
-   "\0\u07ba\0\u0228\0\u07e8\0\u0816\0\u0844\0\u0872\0\u0228\0\u0564"+
-   "\0\u0228\0\u08a0\0\u08ce\0\u08fc\0\u05ee\0\u0228\0\u061c\0\u092a"+
-   "\0\u0958\0\u0986\0\u09b4\0\u0228\0\u09e2\0\u0a10\0\u0a3e\0\u0a6c"+
-   "\0\u0a9a\0\u0ac8\0\u0af6\0\u0b24\0\u0228\0\u0b52\0\u0b80\0\u0bae"+
-   "\0\u0bdc\0\u0c0a\0\u0c38\0\u0228\0\u0228\0\u0c66\0\u0c94\0\u0228"+
-   "\0\u0cc2\0\u0cf0\0\u0422\0\u0d1e\0\u047e\0\u0d4c\0\u0d7a\0\u0da8"+
-   "\0\u0dd6\0\u0e04\0\u0e32\0\u0e60\0\u0e8e\0\u0ebc\0\u0eea\0\u0f18"+
-   "\0\u0f46\0\u0f74\0\u0536\0\u0536\0\u0fa2\0\u0fd0\0\u0ffe\0\u102c"+
-   "\0\u105a\0\u1088\0\u10b6\0\u10e4\0\u0228\0\u0228\0\u0422\0\u047e";
+   "\0\0\0\63\0\146\0\231\0\314\0\377\0\u0132\0\u0165"+
+   "\0\u0198\0\u01cb\0\u01fe\0\u0231\0\u0264\0\u0297\0\u02ca\0\u02fd"+
+   "\0\u0330\0\u0363\0\u0396\0\u03c9\0\u03fc\0\u042f\0\u0462\0\u0495"+
+   "\0\u042f\0\u04c8\0\u04fb\0\u052e\0\u0561\0\u0594\0\u042f\0\u0495"+
+   "\0\u0396\0\u042f\0\u042f\0\u042f\0\u05c7\0\u05fa\0\u0396\0\u042f"+
+   "\0\u062d\0\u0660\0\u0693\0\u06c6\0\u06f9\0\u072c\0\u075f\0\u0792"+
+   "\0\u042f\0\u07c5\0\u07f8\0\u082b\0\u085e\0\u0891\0\u08c4\0\u08f7"+
+   "\0\u092a\0\u042f\0\u095d\0\u0990\0\u09c3\0\u042f\0\u042f\0\u042f"+
+   "\0\u09f6\0\u0a29\0\u0a5c\0\u042f\0\u042f\0\u0a8f\0\u0ac2\0\u0af5"+
+   "\0\u0b28\0\u0b5b\0\u0b8e\0\u042f\0\u0bc1\0\u0bf4\0\u042f\0\u0c27"+
+   "\0\u0c5a\0\u0c8d\0\u0cc0\0\u042f\0\u0cf3\0\u0d26\0\u042f\0\u042f"+
+   "\0\u0792\0\u042f\0\u0d59\0\u0d8c\0\u0dbf\0\u082b\0\u042f\0\u085e"+
+   "\0\u0df2\0\u0e25\0\u0e58\0\u0e8b\0\u0ebe\0\u0ef1\0\u0f24\0\u0f57"+
+   "\0\u0f8a\0\u0fbd\0\u0ff0\0\u1023\0\u1056\0\u1089\0\u10bc\0\u10ef"+
+   "\0\u1122\0\u1155\0\u042f\0\u1188\0\u11bb\0\u11ee\0\u1221\0\u1254"+
+   "\0\u1287\0\u12ba\0\u12ed\0\u042f\0\u1320\0\u1353\0\u1386\0\u13b9"+
+   "\0\u13ec\0\u141f\0\u1452\0\u1485\0\u14b8\0\u14eb\0\u0891\0\u151e"+
+   "\0\u1551\0\u1584\0\u15b7\0\u15ea\0\u161d\0\u1650\0\u1683\0\u16b6"+
+   "\0\u095d\0\u16e9\0\u171c\0\u174f\0\u1782\0\u17b5\0\u17e8\0\u181b"+
+   "\0\u042f\0\u042f\0\u184e\0\u1881\0\u042f\0\u18b4\0\u18e7\0\u05c7"+
+   "\0\u191a\0\u0660\0\u194d\0\u1980\0\u19b3\0\u0891\0\u19e6\0\u0891"+
+   "\0\u1a19\0\u1a4c\0\u095d\0\u1a7f\0\u095d\0\u1ab2\0\u1ae5\0\u1b18"+
+   "\0\u1b4b\0\u1b7e\0\u1bb1\0\u1be4\0\u1c17\0\u1c4a\0\u1c7d\0\u1cb0"+
+   "\0\u1ce3\0\u1d16\0\u1d49\0\u075f\0\u075f\0\u1d7c\0\u1daf\0\u1de2"+
+   "\0\u1e15\0\u1e48\0\u1e7b\0\u1eae\0\u1ee1\0\u1f14\0\u1f47\0\u1f7a"+
+   "\0\u1fad\0\u1fe0\0\u2013\0\u042f\0\u042f\0\u05c7\0\u0660\0\u0891"+
+   "\0\u095d";
 
  private static int [] zzUnpackRowMap() {
-   int [] result = new int[128];
+   int [] result = new int[209];
    int offset = 0;
    offset = zzUnpackRowMap(ZZ_ROWMAP_PACKED_0, offset, result);
    return result;
@@ -134,104 +154,196 @@
  private static final int [] ZZ_TRANS = zzUnpackTrans();
 
  private static final String ZZ_TRANS_PACKED_0 =
-   "\3\15\1\16\2\15\1\17\10\15\1\20\36\15\1\21"+
-   "\1\22\1\21\1\16\2\21\1\23\2\21\4\22\1\21"+
-   "\1\24\1\20\2\22\1\21\11\22\1\21\14\22\3\21"+
-   "\1\25\2\21\1\26\1\21\1\16\2\21\1\23\2\21"+
-   "\4\26\1\21\1\24\1\20\2\26\1\21\11\26\1\21"+
-   "\14\26\5\21\5\27\1\30\50\27\1\21\1\31\1\21"+
-   "\1\16\2\21\1\23\2\21\4\31\2\21\1\20\2\31"+
-   "\1\21\11\31\1\21\14\31\5\21\3\32\1\16\2\32"+
-   "\1\33\10\32\1\34\31\32\1\35\1\36\2\32\1\37"+
-   "\6\21\1\23\10\21\1\20\36\21\6\40\1\41\10\40"+
-   "\1\42\31\40\1\43\4\40\6\44\1\45\10\44\1\42"+
-   "\32\44\1\43\3\44\1\21\1\46\4\21\1\23\2\21"+
-   "\4\46\2\21\1\20\2\46\1\21\11\46\1\21\14\46"+
-   "\2\21\1\47\3\21\1\50\1\21\1\16\2\21\1\23"+
-   "\1\21\1\51\4\50\1\21\1\52\1\20\2\50\1\21"+
-   "\11\50\1\21\4\50\1\53\1\50\1\54\5\50\1\55"+
-   "\1\56\3\21\15\15\1\57\40\15\61\0\1\16\61\0"+
-   "\1\60\43\0\1\61\1\62\2\0\1\63\7\0\4\63"+
-   "\3\0\1\64\1\63\1\0\1\65\3\63\1\66\1\63"+
-   "\1\67\2\63\1\70\14\63\6\0\2\22\1\0\2\22"+
-   "\3\0\4\22\3\0\2\22\1\0\11\22\1\0\14\22"+
-   "\14\0\1\71\64\0\1\72\40\0\2\26\1\0\2\26"+
-   "\3\0\4\26\3\0\2\26\1\0\11\26\1\0\14\26"+
-   "\5\0\5\27\1\73\55\27\1\74\50\27\1\0\2\31"+
-   "\1\0\2\31\3\0\4\31\3\0\2\31\1\0\11\31"+
-   "\1\0\14\31\5\0\17\40\1\0\31\40\1\0\13\40"+
-   "\1\75\7\40\1\0\31\40\1\0\4\40\17\44\1\0"+
-   "\32\44\1\0\12\44\1\76\7\44\1\0\32\44\1\0"+
-   "\3\44\1\0\2\46\1\0\2\46\3\0\4\46\3\0"+
-   "\2\46\1\0\11\46\1\0\14\46\23\0\1\77\40\0"+
-   "\2\50\1\0\2\50\3\0\4\50\3\0\2\50\1\0"+
-   "\11\50\1\0\14\50\5\0\15\100\1\101\33\100\1\102"+
-   "\4\100\1\0\2\50\1\0\2\50\3\0\4\50\3\0"+
-   "\2\50\1\0\11\50\1\0\10\50\1\103\3\50\6\0"+
-   "\2\50\1\0\2\50\3\0\4\50\3\0\2\50\1\0"+
-   "\11\50\1\0\3\50\1\104\10\50\5\0\51\105\1\106"+
-   "\4\105\52\107\1\106\3\107\15\0\1\110\45\0\1\111"+
-   "\2\0\1\112\1\0\1\113\44\0\2\63\1\0\2\63"+
-   "\3\0\4\63\3\0\2\63\1\114\11\63\1\0\14\63"+
-   "\6\0\2\63\1\0\2\63\3\0\4\63\3\0\1\63"+
-   "\1\115\1\114\11\63\1\0\14\63\6\0\2\63\1\0"+
-   "\2\63\3\0\4\63\3\0\2\63\1\114\1\63\1\116"+
-   "\6\63\1\117\1\0\14\63\6\0\2\63\1\0\2\63"+
-   "\3\0\4\63\3\0\2\63\1\114\5\63\1\120\3\63"+
-   "\1\0\14\63\6\0\2\63\1\0\2\63\3\0\4\63"+
-   "\3\0\2\63\1\114\7\63\1\121\1\63\1\0\14\63"+
-   "\7\0\1\122\32\0\1\123\25\0\1\111\2\0\1\112"+
-   "\45\0\5\27\1\124\66\27\1\125\37\27\5\40\1\126"+
-   "\2\40\1\127\6\40\1\0\31\40\1\0\4\40\5\44"+
-   "\1\130\2\44\1\131\6\44\1\0\32\44\1\0\3\44"+
-   "\51\102\1\100\4\102\1\0\2\50\1\0\2\50\3\0"+
-   "\4\50\3\0\2\50\1\0\11\50\1\0\11\50\1\132"+
-   "\2\50\6\0\2\50\1\0\2\50\3\0\4\50\3\0"+
-   "\2\50\1\0\11\50\1\0\6\50\1\133\5\50\23\0"+
-   "\1\134\44\0\1\135\61\0\1\136\103\0\1\137\17\0"+
-   "\2\63\1\0\2\63\3\0\4\63\3\0\2\63\1\140"+
-   "\11\63\1\0\14\63\6\0\2\63\1\0\2\63\3\0"+
-   "\4\63\3\0\2\63\1\114\2\63\1\141\6\63\1\0"+
-   "\14\63\6\0\2\63\1\0\2\63\3\0\4\63\3\0"+
-   "\2\63\1\114\1\63\1\115\7\63\1\0\14\63\6\0"+
-   "\2\63\1\0\2\63\3\0\4\63\3\0\2\63\1\114"+
-   "\2\63\1\64\6\63\1\0\14\63\6\0\2\63\1\0"+
-   "\2\63\3\0\4\63\3\0\2\63\1\114\3\63\1\117"+
-   "\5\63\1\0\14\63\7\0\1\122\17\0\1\140\35\0"+
-   "\1\142\6\0\3\142\7\0\1\142\6\0\1\142\3\0"+
-   "\1\142\3\0\1\142\3\0\1\142\7\0\16\27\1\0"+
-   "\37\27\5\40\1\143\11\40\1\0\31\40\1\0\15\40"+
-   "\1\144\5\40\1\0\31\40\1\0\4\40\5\44\1\145"+
-   "\11\44\1\0\32\44\1\0\14\44\1\146\5\44\1\0"+
-   "\32\44\1\0\3\44\1\0\2\50\1\0\2\50\3\0"+
-   "\4\50\3\0\2\50\1\0\11\50\1\0\12\50\1\147"+
-   "\1\50\6\0\2\50\1\0\2\50\3\0\3\50\1\150"+
-   "\3\0\2\50\1\0\11\50\1\0\14\50\17\0\1\151"+
-   "\54\0\1\152\45\0\2\63\1\0\2\63\3\0\4\63"+
-   "\3\0\2\63\1\114\3\63\1\115\5\63\1\0\14\63"+
-   "\7\0\1\142\6\0\3\142\6\0\1\140\1\142\6\0"+
-   "\1\142\3\0\1\142\3\0\1\142\3\0\1\142\7\0"+
-   "\12\40\1\153\4\40\1\0\31\40\1\0\4\40\12\44"+
-   "\1\154\4\44\1\0\32\44\1\0\3\44\1\0\2\50"+
-   "\1\0\2\50\3\0\4\50\3\0\2\50\1\0\11\50"+
-   "\1\0\13\50\1\155\6\0\2\50\1\0\2\50\3\0"+
-   "\4\50\3\0\2\50\1\0\11\50\1\0\5\50\1\156"+
-   "\6\50\20\0\1\157\56\0\1\160\41\0\13\40\1\161"+
-   "\3\40\1\0\31\40\1\0\4\40\13\44\1\162\3\44"+
-   "\1\0\32\44\1\0\3\44\1\0\2\50\1\0\2\50"+
-   "\3\0\1\163\3\50\3\0\2\50\1\0\11\50\1\0"+
-   "\14\50\6\0\2\50\1\0\2\50\3\0\4\50\3\0"+
-   "\2\50\1\0\11\50\1\0\7\50\1\164\4\50\21\0"+
-   "\1\165\101\0\1\166\15\0\14\40\1\167\2\40\1\0"+
-   "\31\40\1\0\4\40\14\44\1\170\2\44\1\0\32\44"+
-   "\1\0\3\44\13\0\1\171\103\0\1\172\14\0\13\40"+
-   "\1\173\3\40\1\0\31\40\1\0\4\40\13\44\1\174"+
-   "\3\44\1\0\32\44\1\0\3\44\10\0\1\175\107\0"+
-   "\1\176\13\0\10\40\1\177\6\40\1\0\31\40\1\0"+
-   "\4\40\10\44\1\200\6\44\1\0\32\44\1\0\3\44";
+   "\3\20\1\21\2\20\1\22\10\20\1\23\34\20\1\24"+
+   "\2\20\1\21\2\20\1\25\1\26\1\27\1\26\1\21"+
+   "\2\26\1\30\2\26\4\27\1\26\1\31\1\23\2\27"+
+   "\1\26\11\27\1\26\14\27\6\26\1\21\1\32\3\26"+
+   "\1\33\1\26\1\21\2\26\1\30\2\26\4\33\1\26"+
+   "\1\31\1\23\2\33\1\26\11\33\1\26\14\33\6\26"+
+   "\1\21\3\26\5\34\1\35\55\34\1\26\1\36\1\26"+
+   "\1\21\2\26\1\30\2\26\4\36\2\26\1\23\2\36"+
+   "\1\26\11\36\1\26\14\36\6\26\1\21\3\26\3\37"+
+   "\1\21\2\37\1\40\10\37\1\41\31\37\1\42\1\43"+
+   "\4\37\1\21\1\37\1\44\1\37\6\26\1\30\10\26"+
+   "\1\23\43\26\6\45\1\46\10\45\1\47\31\45\1\50"+
+   "\2\45\1\51\6\45\6\52\1\53\10\52\1\47\32\52"+
+   "\1\50\1\52\1\54\6\52\1\26\1\55\4\26\1\30"+
+   "\2\26\4\55\2\26\1\23\2\55\1\26\11\55\1\26"+
+   "\14\55\2\26\1\56\10\26\1\57\1\26\1\21\2\26"+
+   "\1\30\1\26\1\60\4\57\1\26\1\61\1\23\2\57"+
+   "\1\26\11\57\1\26\4\57\1\62\1\57\1\63\5\57"+
+   "\1\64\1\65\4\26\1\21\3\26\3\66\1\67\2\66"+
+   "\1\70\10\66\1\71\36\66\1\72\1\21\3\66\6\73"+
+   "\1\74\10\73\1\75\36\73\1\76\12\73\1\74\10\73"+
+   "\1\75\36\73\1\77\4\73\15\100\1\101\45\100\3\20"+
+   "\1\0\2\20\1\0\10\20\1\0\34\20\1\102\2\20"+
+   "\1\0\2\20\1\25\3\0\1\21\53\0\1\21\12\0"+
+   "\1\103\43\0\1\104\4\0\1\105\3\0\1\106\7\0"+
+   "\4\106\3\0\1\107\1\106\1\0\1\110\3\106\1\111"+
+   "\1\106\1\112\2\106\1\113\14\106\12\0\55\20\1\114"+
+   "\10\20\1\0\2\20\1\0\10\20\1\0\34\20\1\115"+
+   "\2\20\1\0\2\20\1\25\64\0\2\27\1\0\2\27"+
+   "\3\0\4\27\3\0\2\27\1\0\11\27\1\0\14\27"+
+   "\21\0\1\116\71\0\1\117\45\0\2\33\1\0\2\33"+
+   "\3\0\4\33\3\0\2\33\1\0\11\33\1\0\14\33"+
+   "\12\0\5\34\1\120\62\34\1\121\55\34\1\0\2\36"+
+   "\1\0\2\36\3\0\4\36\3\0\2\36\1\0\11\36"+
+   "\1\0\14\36\12\0\17\45\1\0\31\45\1\0\2\45"+
+   "\1\0\15\45\1\122\7\45\1\0\31\45\1\0\2\45"+
+   "\1\0\6\45\17\123\1\0\31\123\1\0\3\123\1\124"+
+   "\5\123\17\52\1\0\32\52\1\0\1\52\1\0\15\52"+
+   "\1\125\7\52\1\0\32\52\1\0\1\52\1\0\6\52"+
+   "\17\126\1\0\32\126\1\0\2\126\1\127\5\126\1\0"+
+   "\2\55\1\0\2\55\3\0\4\55\3\0\2\55\1\0"+
+   "\11\55\1\0\14\55\30\0\1\130\45\0\2\57\1\0"+
+   "\2\57\3\0\4\57\3\0\2\57\1\0\11\57\1\0"+
+   "\14\57\12\0\15\131\1\132\33\131\1\133\11\131\1\0"+
+   "\2\57\1\0\2\57\3\0\4\57\3\0\2\57\1\0"+
+   "\11\57\1\0\10\57\1\134\3\57\13\0\2\57\1\0"+
+   "\2\57\3\0\4\57\3\0\2\57\1\0\11\57\1\0"+
+   "\3\57\1\135\10\57\12\0\51\136\1\137\11\136\52\140"+
+   "\1\137\10\140\56\66\2\0\6\66\1\67\52\66\1\0"+
+   "\1\21\12\66\1\141\46\66\2\0\4\66\1\142\7\66"+
+   "\4\142\3\66\1\143\1\142\1\66\1\144\3\142\1\145"+
+   "\1\142\1\146\2\142\1\147\14\142\5\66\2\0\3\66"+
+   "\56\73\1\0\13\73\1\150\46\73\1\0\5\73\1\151"+
+   "\7\73\4\151\3\73\1\152\1\151\1\73\1\153\3\151"+
+   "\1\154\1\151\1\155\2\151\1\156\14\151\5\73\1\0"+
+   "\4\73\15\0\1\157\45\0\55\20\1\0\5\20\5\0"+
+   "\1\160\2\0\1\161\1\0\1\162\51\0\2\106\1\0"+
+   "\2\106\3\0\4\106\3\0\2\106\1\163\11\106\1\0"+
+   "\14\106\13\0\2\106\1\0\2\106\3\0\4\106\3\0"+
+   "\1\106\1\164\1\163\11\106\1\0\14\106\13\0\2\106"+
+   "\1\0\2\106\3\0\4\106\3\0\2\106\1\163\1\106"+
+   "\1\165\6\106\1\166\1\0\14\106\13\0\2\106\1\0"+
+   "\2\106\3\0\4\106\3\0\2\106\1\163\5\106\1\167"+
+   "\3\106\1\0\14\106\13\0\2\106\1\0\2\106\3\0"+
+   "\4\106\3\0\2\106\1\163\7\106\1\170\1\106\1\0"+
+   "\14\106\14\0\1\171\32\0\1\172\25\0\54\20\1\115"+
+   "\5\20\1\25\5\0\1\160\2\0\1\161\52\0\5\34"+
+   "\1\173\73\34\1\174\44\34\5\45\1\175\2\45\1\176"+
+   "\6\45\1\0\31\45\1\0\2\45\1\0\6\45\54\0"+
+   "\1\177\6\0\5\52\1\200\2\52\1\201\6\52\1\0"+
+   "\32\52\1\0\1\52\1\0\6\52\54\0\1\202\6\0"+
+   "\51\133\1\131\11\133\1\0\2\57\1\0\2\57\3\0"+
+   "\4\57\3\0\2\57\1\0\11\57\1\0\11\57\1\203"+
+   "\2\57\13\0\2\57\1\0\2\57\3\0\4\57\3\0"+
+   "\2\57\1\0\11\57\1\0\6\57\1\204\5\57\12\0"+
+   "\5\66\1\205\2\66\1\206\45\66\2\0\4\66\2\142"+
+   "\1\66\2\142\3\66\4\142\3\66\2\142\1\207\11\142"+
+   "\1\66\14\142\5\66\2\0\4\66\2\142\1\66\2\142"+
+   "\3\66\4\142\3\66\1\142\1\210\1\207\11\142\1\66"+
+   "\14\142\5\66\2\0\4\66\2\142\1\66\2\142\3\66"+
+   "\4\142\3\66\2\142\1\207\1\142\1\211\6\142\1\212"+
+   "\1\66\14\142\5\66\2\0\4\66\2\142\1\66\2\142"+
+   "\3\66\4\142\3\66\2\142\1\207\5\142\1\213\3\142"+
+   "\1\66\14\142\5\66\2\0\4\66\2\142\1\66\2\142"+
+   "\3\66\4\142\3\66\2\142\1\207\7\142\1\214\1\142"+
+   "\1\66\14\142\5\66\2\0\5\66\1\215\32\66\1\216"+
+   "\20\66\2\0\3\66\5\73\1\217\2\73\1\220\45\73"+
+   "\1\0\5\73\2\151\1\73\2\151\3\73\4\151\3\73"+
+   "\2\151\1\221\11\151\1\73\14\151\5\73\1\0\5\73"+
+   "\2\151\1\73\2\151\3\73\4\151\3\73\1\151\1\222"+
+   "\1\221\11\151\1\73\14\151\5\73\1\0\5\73\2\151"+
+   "\1\73\2\151\3\73\4\151\3\73\2\151\1\221\1\151"+
+   "\1\223\6\151\1\224\1\73\14\151\5\73\1\0\5\73"+
+   "\2\151\1\73\2\151\3\73\4\151\3\73\2\151\1\221"+
+   "\5\151\1\225\3\151\1\73\14\151\5\73\1\0\5\73"+
+   "\2\151\1\73\2\151\3\73\4\151\3\73\2\151\1\221"+
+   "\7\151\1\226\1\151\1\73\14\151\5\73\1\0\6\73"+
+   "\1\227\32\73\1\230\20\73\1\0\4\73\16\0\1\231"+
+   "\51\0\1\232\66\0\1\233\110\0\1\234\24\0\2\106"+
+   "\1\0\2\106\3\0\4\106\3\0\2\106\1\235\11\106"+
+   "\1\0\14\106\13\0\2\106\1\0\2\106\3\0\4\106"+
+   "\3\0\2\106\1\163\2\106\1\236\6\106\1\0\14\106"+
+   "\13\0\2\106\1\0\2\106\3\0\4\106\3\0\2\106"+
+   "\1\163\1\106\1\164\7\106\1\0\14\106\13\0\2\106"+
+   "\1\0\2\106\3\0\4\106\3\0\2\106\1\163\2\106"+
+   "\1\107\6\106\1\0\14\106\13\0\2\106\1\0\2\106"+
+   "\3\0\4\106\3\0\2\106\1\163\3\106\1\166\5\106"+
+   "\1\0\14\106\14\0\1\171\17\0\1\235\42\0\1\237"+
+   "\6\0\3\237\7\0\1\237\6\0\1\237\3\0\1\237"+
+   "\3\0\1\237\3\0\1\237\14\0\16\34\1\0\44\34"+
+   "\5\45\1\240\11\45\1\0\31\45\1\0\2\45\1\0"+
+   "\17\45\1\241\5\45\1\0\31\45\1\0\2\45\1\0"+
+   "\6\45\17\123\1\0\31\123\1\0\3\123\1\0\5\123"+
+   "\5\52\1\242\11\52\1\0\32\52\1\0\1\52\1\0"+
+   "\17\52\1\243\5\52\1\0\32\52\1\0\1\52\1\0"+
+   "\6\52\17\126\1\0\32\126\1\0\2\126\1\0\5\126"+
+   "\1\0\2\57\1\0\2\57\3\0\4\57\3\0\2\57"+
+   "\1\0\11\57\1\0\12\57\1\244\1\57\13\0\2\57"+
+   "\1\0\2\57\3\0\3\57\1\245\3\0\2\57\1\0"+
+   "\11\57\1\0\14\57\12\0\5\66\1\246\50\66\2\0"+
+   "\14\66\1\247\44\66\2\0\4\66\2\142\1\66\2\142"+
+   "\3\66\4\142\3\66\2\142\1\250\11\142\1\66\14\142"+
+   "\5\66\2\0\4\66\2\142\1\66\2\142\3\66\4\142"+
+   "\3\66\2\142\1\207\2\142\1\251\6\142\1\66\14\142"+
+   "\5\66\2\0\4\66\2\142\1\66\2\142\3\66\4\142"+
+   "\3\66\2\142\1\207\1\142\1\210\7\142\1\66\14\142"+
+   "\5\66\2\0\4\66\2\142\1\66\2\142\3\66\4\142"+
+   "\3\66\2\142\1\207\2\142\1\143\6\142\1\66\14\142"+
+   "\5\66\2\0\4\66\2\142\1\66\2\142\3\66\4\142"+
+   "\3\66\2\142\1\207\3\142\1\212\5\142\1\66\14\142"+
+   "\5\66\2\0\5\66\1\215\17\66\1\250\33\66\2\0"+
+   "\5\66\1\252\6\66\3\252\7\66\1\252\6\66\1\252"+
+   "\3\66\1\252\3\66\1\252\3\66\1\252\7\66\2\0"+
+   "\3\66\5\73\1\253\50\73\1\0\15\73\1\254\44\73"+
+   "\1\0\5\73\2\151\1\73\2\151\3\73\4\151\3\73"+
+   "\2\151\1\255\11\151\1\73\14\151\5\73\1\0\5\73"+
+   "\2\151\1\73\2\151\3\73\4\151\3\73\2\151\1\221"+
+   "\2\151\1\256\6\151\1\73\14\151\5\73\1\0\5\73"+
+   "\2\151\1\73\2\151\3\73\4\151\3\73\2\151\1\221"+
+   "\1\151\1\222\7\151\1\73\14\151\5\73\1\0\5\73"+
+   "\2\151\1\73\2\151\3\73\4\151\3\73\2\151\1\221"+
+   "\2\151\1\152\6\151\1\73\14\151\5\73\1\0\5\73"+
+   "\2\151\1\73\2\151\3\73\4\151\3\73\2\151\1\221"+
+   "\3\151\1\224\5\151\1\73\14\151\5\73\1\0\6\73"+
+   "\1\227\17\73\1\255\33\73\1\0\6\73\1\257\6\73"+
+   "\3\257\7\73\1\257\6\73\1\257\3\73\1\257\3\73"+
+   "\1\257\3\73\1\257\7\73\1\0\4\73\12\0\1\260"+
+   "\61\0\1\261\52\0\2\106\1\0\2\106\3\0\4\106"+
+   "\3\0\2\106\1\163\3\106\1\164\5\106\1\0\14\106"+
+   "\14\0\1\237\6\0\3\237\6\0\1\235\1\237\6\0"+
+   "\1\237\3\0\1\237\3\0\1\237\3\0\1\237\14\0"+
+   "\12\45\1\262\4\45\1\0\31\45\1\0\2\45\1\0"+
+   "\6\45\12\52\1\263\4\52\1\0\32\52\1\0\1\52"+
+   "\1\0\6\52\1\0\2\57\1\0\2\57\3\0\4\57"+
+   "\3\0\2\57\1\0\11\57\1\0\13\57\1\264\13\0"+
+   "\2\57\1\0\2\57\3\0\4\57\3\0\2\57\1\0"+
+   "\11\57\1\0\5\57\1\265\6\57\12\0\12\66\1\266"+
+   "\43\66\2\0\4\66\2\142\1\66\2\142\3\66\4\142"+
+   "\3\66\2\142\1\207\3\142\1\210\5\142\1\66\14\142"+
+   "\5\66\2\0\5\66\1\252\6\66\3\252\6\66\1\250"+
+   "\1\252\6\66\1\252\3\66\1\252\3\66\1\252\3\66"+
+   "\1\252\7\66\2\0\3\66\12\73\1\267\43\73\1\0"+
+   "\5\73\2\151\1\73\2\151\3\73\4\151\3\73\2\151"+
+   "\1\221\3\151\1\222\5\151\1\73\14\151\5\73\1\0"+
+   "\6\73\1\257\6\73\3\257\6\73\1\255\1\257\6\73"+
+   "\1\257\3\73\1\257\3\73\1\257\3\73\1\257\7\73"+
+   "\1\0\4\73\13\0\1\270\63\0\1\271\46\0\13\45"+
+   "\1\272\3\45\1\0\31\45\1\0\2\45\1\0\6\45"+
+   "\13\52\1\273\3\52\1\0\32\52\1\0\1\52\1\0"+
+   "\6\52\1\0\2\57\1\0\2\57\3\0\1\274\3\57"+
+   "\3\0\2\57\1\0\11\57\1\0\14\57\13\0\2\57"+
+   "\1\0\2\57\3\0\4\57\3\0\2\57\1\0\11\57"+
+   "\1\0\7\57\1\275\4\57\12\0\13\66\1\276\42\66"+
+   "\2\0\3\66\13\73\1\277\42\73\1\0\4\73\14\0"+
+   "\1\300\106\0\1\301\22\0\14\45\1\302\2\45\1\0"+
+   "\31\45\1\0\2\45\1\0\6\45\14\52\1\303\2\52"+
+   "\1\0\32\52\1\0\1\52\1\0\6\52\14\66\1\304"+
+   "\41\66\2\0\3\66\14\73\1\305\41\73\1\0\4\73"+
+   "\13\0\1\306\110\0\1\307\21\0\13\45\1\310\3\45"+
+   "\1\0\31\45\1\0\2\45\1\0\6\45\13\52\1\311"+
+   "\3\52\1\0\32\52\1\0\1\52\1\0\6\52\13\66"+
+   "\1\312\42\66\2\0\3\66\13\73\1\313\42\73\1\0"+
+   "\4\73\10\0\1\314\114\0\1\315\20\0\10\45\1\316"+
+   "\6\45\1\0\31\45\1\0\2\45\1\0\6\45\10\52"+
+   "\1\317\6\52\1\0\32\52\1\0\1\52\1\0\6\52"+
+   "\10\66\1\320\45\66\2\0\3\66\10\73\1\321\45\73"+
+   "\1\0\4\73";
 
  private static int [] zzUnpackTrans() {
-   int [] result = new int[4370];
+   int [] result = new int[8262];
    int offset = 0;
    offset = zzUnpackTrans(ZZ_TRANS_PACKED_0, offset, result);
    return result;
@@ -271,16 +383,18 @@
  private static final int [] ZZ_ATTRIBUTE = zzUnpackAttribute();
 
  private static final String ZZ_ATTRIBUTE_PACKED_0 =
-   "\3\0\1\1\3\0\2\1\3\0\1\11\3\1\1\11"+
-   "\2\1\1\11\3\1\1\0\1\1\1\11\2\1\3\11"+
-   "\3\1\1\11\6\1\1\11\5\1\1\0\2\11\7\0"+
-   "\1\11\2\0\2\1\1\11\1\0\1\11\1\0\2\1"+
-   "\1\0\1\11\5\0\1\11\10\0\1\11\6\1\2\11"+
-   "\2\0\1\11\2\0\6\1\2\0\4\1\2\0\4\1"+
-   "\2\0\2\1\2\0\2\1\2\11\2\1";
+   "\1\1\2\0\1\1\3\0\2\1\2\0\3\1\1\0"+
+   "\6\1\1\11\2\1\1\11\3\1\1\0\1\1\1\11"+
+   "\2\1\3\11\3\1\1\11\10\1\1\11\10\1\1\11"+
+   "\3\1\3\11\1\1\2\0\2\11\6\0\1\11\1\1"+
+   "\1\0\1\11\2\0\2\1\1\11\2\1\2\11\1\0"+
+   "\1\11\1\0\2\1\1\0\1\11\1\0\16\1\4\0"+
+   "\1\11\10\0\1\11\2\1\1\0\2\1\1\0\26\1"+
+   "\2\11\2\0\1\11\2\0\20\1\2\0\6\1\2\0"+
+   "\6\1\2\0\4\1\2\0\4\1\2\11\4\1";
 
  private static int [] zzUnpackAttribute() {
-   int [] result = new int[128];
+   int [] result = new int[209];
    int offset = 0;
    offset = zzUnpackAttribute(ZZ_ATTRIBUTE_PACKED_0, offset, result);
    return result;
@@ -336,6 +450,18 @@
  private boolean zzEOFDone;
 
  /* user code: */
+ private boolean elEnabled;
+ private IElementType elStartType = XmlTokenType.XML_DATA_CHARACTERS;
+ private IElementType elEndType = XmlTokenType.XML_DATA_CHARACTERS;
+ private IElementType elValueType = XmlTokenType.XML_DATA_CHARACTERS;
+
+ public void setElTypes(IElementType _elStartType,IElementType _elValueType,IElementType _elEndType) {
+   elStartType = _elStartType;
+   elEndType = _elEndType;
+   elValueType = _elValueType;
+   elEnabled = true;
+ }
+
  private IElementType myTokenType;
  private int myPrevState = YYINITIAL;
  private int myState = YYINITIAL;
@@ -373,7 +499,7 @@
  }
 
  public final int getLastState() {
-   return 11;
+   return 14;
  }
 
  public final IElementType getTokenType(){
@@ -466,7 +592,7 @@
    char [] map = new char[0x10000];
    int i = 0;  /* index in packed string  */
    int j = 0;  /* index in unpacked array */
-   while (i < 140) {
+   while (i < 148) {
      int  count = packed.charAt(i++);
      char value = packed.charAt(i++);
      do map[j++] = value; while (--count > 0);
@@ -624,6 +750,7 @@
   * Resumes scanning until the next regular expression is matched,
   * the end of input is encountered or an I/O-Error occurs.
   *
+  * @return      the next token
   * @exception   java.io.IOException  if any I/O-Error occurs
   */
  public void _locateToken() throws java.io.IOException {
@@ -696,138 +823,183 @@
      zzMarkedPos = zzMarkedPosL;
 
      switch (zzAction < 0 ? zzAction : ZZ_ACTION[zzAction]) {
-       case 30:
-         { myTokenType = XmlTokenType.XML_DOCTYPE_SYSTEM;  return;
-         }
-       case 33: break;
-       case 24:
-         { myTokenType = XmlTokenType.XML_ENTITY_REF_TOKEN; return;
-         }
-       case 34: break;
-       case 21:
-         { myTokenType = XmlTokenType.XML_EMPTY_ELEMENT_END; yybegin(YYINITIAL); return;
-         }
-       case 35: break;
-       case 27:
-         { myTokenType = XmlTokenType.XML_COMMENT_START; yybegin(COMMENT); return;
-         }
-       case 36: break;
-       case 10:
-         { myTokenType = XmlTokenType.XML_NAME; yybegin(ATTR); return;
-         }
-       case 37: break;
-       case 28:
-         { myTokenType = XmlTokenType.XML_CHAR_ENTITY_REF; return;
-         }
-       case 38: break;
-       case 26:
-         { myTokenType = XmlTokenType.XML_CDATA_END; yybegin(YYINITIAL); return;
-         }
-       case 39: break;
-       case 1:
-         { myTokenType = XmlTokenType.XML_COMMENT_CHARACTERS; return;
+       case 39:
+         { myTokenType = XmlTokenType.XML_DOCTYPE_START; yybegin(DOCTYPE); return;
          }
        case 40: break;
-       case 29:
-         { myTokenType = XmlTokenType.XML_DOCTYPE_PUBLIC;  return;
+       case 5:
+         { myTokenType = XmlTokenType.XML_WHITE_SPACE; return;
          }
        case 41: break;
-       case 13:
-         { myTokenType = XmlTokenType.XML_ATTRIBUTE_VALUE_START_DELIMITER; yybegin(ATTR_VALUE_SQ); return;
+       case 32:
+         { myTokenType = XmlTokenType.XML_COMMENT_END; yybegin(YYINITIAL); return;
          }
        case 42: break;
-       case 12:
-         { myTokenType = XmlTokenType.XML_ATTRIBUTE_VALUE_START_DELIMITER; yybegin(ATTR_VALUE_DQ); return;
+       case 26:
+         { myTokenType = XmlTokenType.XML_EMPTY_ELEMENT_END; yybegin(YYINITIAL); return;
          }
        case 43: break;
-       case 6:
+       case 38:
+         { myTokenType = XmlTokenType.XML_CDATA_START; yybegin(CDATA); return;
+         }
+       case 44: break;
+       case 7:
          { if(yystate() == YYINITIAL){
        myTokenType = XmlTokenType.XML_BAD_CHARACTER;
        return;
      }
      else yybegin(popState()); yypushback(yylength());
          }
-       case 44: break;
-       case 32:
-         { myTokenType = XmlTokenType.XML_DOCTYPE_START; yybegin(DOCTYPE); return;
-         }
        case 45: break;
-       case 23:
-         { myTokenType = XmlTokenType.XML_MARKUP; return;
+       case 37:
+         { myTokenType = XmlTokenType.XML_DOCTYPE_SYSTEM;  return;
          }
        case 46: break;
-       case 16:
-         { myTokenType = XmlTokenType.XML_NAME; yybegin(ATTR_LIST); pushState(PROCESSING_INSTRUCTION); return;
-         }
-       case 47: break;
-       case 8:
-         { myTokenType = XmlTokenType.XML_TAG_END; yybegin(YYINITIAL); return;
-         }
-       case 48: break;
-       case 14:
-         { myTokenType = XmlTokenType.XML_EQ; return;
-         }
-       case 49: break;
-       case 31:
-         { myTokenType = XmlTokenType.XML_CDATA_START; yybegin(CDATA); return;
-         }
-       case 50: break;
-       case 5:
-         { myTokenType = XmlTokenType.XML_START_TAG_START; yybegin(TAG); return;
-         }
-       case 51: break;
-       case 18:
-         { myTokenType = XmlTokenType.XML_DOCTYPE_END;  yybegin(YYINITIAL); return;
-         }
-       case 52: break;
-       case 7:
-         { myTokenType = XmlTokenType.XML_NAME; yybegin(ATTR_LIST); pushState(TAG); return;
-         }
-       case 53: break;
-       case 25:
-         { myTokenType = XmlTokenType.XML_COMMENT_END; yybegin(YYINITIAL); return;
-         }
-       case 54: break;
-       case 9:
-         { myTokenType = XmlTokenType.XML_NAME; return;
-         }
-       case 55: break;
-       case 19:
+       case 23:
          { myTokenType = XmlTokenType.XML_PI_START; yybegin(PROCESSING_INSTRUCTION); return;
          }
+       case 47: break;
+       case 4:
+         { myTokenType = elValueType; return;
+         }
+       case 48: break;
+       case 18:
+         { myTokenType = XmlTokenType.XML_NAME;  return;
+         }
+       case 49: break;
+       case 13:
+         { myTokenType = XmlTokenType.XML_ATTRIBUTE_VALUE_START_DELIMITER; yybegin(ATTR_VALUE_DQ); return;
+         }
+       case 50: break;
+       case 24:
+         { myTokenType = XmlTokenType.XML_END_TAG_START; yybegin(END_TAG); return;
+         }
+       case 51: break;
+       case 2:
+         { myTokenType = XmlTokenType.XML_COMMENT_CHARACTERS; return;
+         }
+       case 52: break;
+       case 20:
+         { myTokenType = elEndType; yybegin(YYINITIAL); return;
+         }
+       case 53: break;
+       case 14:
+         { myTokenType = XmlTokenType.XML_ATTRIBUTE_VALUE_START_DELIMITER; yybegin(ATTR_VALUE_SQ); return;
+         }
+       case 54: break;
+       case 34:
+         { myTokenType = XmlTokenType.XML_COMMENT_START; yybegin(COMMENT); return;
+         }
+       case 55: break;
+       case 10:
+         { myTokenType = XmlTokenType.XML_NAME; return;
+         }
        case 56: break;
-       case 11:
-         { yybegin(ATTR_LIST); yypushback(yylength());
+       case 27:
+         { if (elEnabled) {
+   myTokenType = elStartType;
+   yybegin(EL_ATTR_VALUE);
+ } else {
+   myTokenType = XmlTokenType.XML_ATTRIBUTE_VALUE_TOKEN;
+ }
+ return;
          }
        case 57: break;
-       case 2:
-         { myTokenType = XmlTokenType.XML_ATTRIBUTE_VALUE_TOKEN; return;
+       case 30:
+         { myTokenType = XmlTokenType.XML_MARKUP; return;
          }
        case 58: break;
-       case 4:
-         { myTokenType = XmlTokenType.XML_WHITE_SPACE; return;
+       case 28:
+         { if (elEnabled) {
+   myTokenType = elStartType;
+   yybegin(EL_ATTR_VALUE2);
+ } else {
+   myTokenType = XmlTokenType.XML_ATTRIBUTE_VALUE_TOKEN;
+ }
+ return;
          }
        case 59: break;
-       case 15:
-         { myTokenType = XmlTokenType.XML_ATTRIBUTE_VALUE_END_DELIMITER; yybegin(ATTR_LIST); return;
+       case 6:
+         { myTokenType = XmlTokenType.XML_START_TAG_START; yybegin(TAG); return;
          }
        case 60: break;
        case 17:
-         { myTokenType = XmlTokenType.XML_NAME;  return;
+         { myTokenType = XmlTokenType.XML_NAME; yybegin(ATTR_LIST); pushState(PROCESSING_INSTRUCTION); return;
          }
        case 61: break;
-       case 3:
-         { myTokenType = XmlTokenType.XML_DATA_CHARACTERS; return;
+       case 25:
+         { if (elEnabled) {
+   myTokenType = elStartType; yybegin(EL);
+ } else {
+   myTokenType = XmlTokenType.XML_DATA_CHARACTERS;
+ }
+ return;
          }
        case 62: break;
-       case 22:
-         { myTokenType = XmlTokenType.XML_PI_END; yybegin(YYINITIAL); return;
+       case 1:
+         { myTokenType = XmlTokenType.XML_DATA_CHARACTERS; return;
          }
        case 63: break;
-       case 20:
-         { myTokenType = XmlTokenType.XML_END_TAG_START; yybegin(END_TAG); return;
+       case 15:
+         { myTokenType = XmlTokenType.XML_EQ; return;
          }
        case 64: break;
+       case 8:
+         { myTokenType = XmlTokenType.XML_NAME; yybegin(ATTR_LIST); pushState(TAG); return;
+         }
+       case 65: break;
+       case 12:
+         { yybegin(ATTR_LIST); yypushback(yylength());
+         }
+       case 66: break;
+       case 19:
+         { myTokenType = XmlTokenType.XML_DOCTYPE_END;  yybegin(YYINITIAL); return;
+         }
+       case 67: break;
+       case 36:
+         { myTokenType = XmlTokenType.XML_DOCTYPE_PUBLIC;  return;
+         }
+       case 68: break;
+       case 35:
+         { myTokenType = XmlTokenType.XML_CHAR_ENTITY_REF; return;
+         }
+       case 69: break;
+       case 11:
+         { myTokenType = XmlTokenType.XML_NAME; yybegin(ATTR); return;
+         }
+       case 70: break;
+       case 9:
+         { myTokenType = XmlTokenType.XML_TAG_END; yybegin(YYINITIAL); return;
+         }
+       case 71: break;
+       case 31:
+         { myTokenType = XmlTokenType.XML_ENTITY_REF_TOKEN; return;
+         }
+       case 72: break;
+       case 21:
+         { myTokenType = elEndType; yybegin(ATTR_VALUE_DQ); return;
+         }
+       case 73: break;
+       case 29:
+         { myTokenType = XmlTokenType.XML_PI_END; yybegin(YYINITIAL); return;
+         }
+       case 74: break;
+       case 22:
+         { myTokenType = elEndType; yybegin(ATTR_VALUE_SQ); return;
+         }
+       case 75: break;
+       case 33:
+         { myTokenType = XmlTokenType.XML_CDATA_END; yybegin(YYINITIAL); return;
+         }
+       case 76: break;
+       case 16:
+         { myTokenType = XmlTokenType.XML_ATTRIBUTE_VALUE_END_DELIMITER; yybegin(ATTR_LIST); return;
+         }
+       case 77: break;
+       case 3:
+         { myTokenType = XmlTokenType.XML_ATTRIBUTE_VALUE_TOKEN; return;
+         }
+       case 78: break;
        default:
          if (zzInput == YYEOF && zzStartRead == zzCurrentPos) {
            zzAtEOF = true;