[90297] jspContext variable not recognized in jsp tag files
diff --git a/bundles/org.eclipse.jst.jsp.core/DevTimeSupport/HeadParsers/JSPHeadTokenizer.jFlex b/bundles/org.eclipse.jst.jsp.core/DevTimeSupport/HeadParsers/JSPHeadTokenizer.jFlex
index 60d1c06..858dd29 100644
--- a/bundles/org.eclipse.jst.jsp.core/DevTimeSupport/HeadParsers/JSPHeadTokenizer.jFlex
+++ b/bundles/org.eclipse.jst.jsp.core/DevTimeSupport/HeadParsers/JSPHeadTokenizer.jFlex
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * Copyright (c) 2005, 2007 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -171,7 +171,7 @@
 // [3] S ::= (0x20 | 0x9 | 0xD | 0xA)+
 S = [\x20\x09\x0D\x0A]
 
-BeginAttribeValue = {S}* \= {S}*
+BeginAttributeeValue = {S}* \= {S}*
 
 LineTerminator = \r|\n
 
@@ -204,16 +204,16 @@
          // another case that's part of the "HTML family" is WML 1.0 (WML 2.0 is part of XHTML)
          "<!DOCTYPE" {S}* "wml" {S}* "PUBLIC" .* "//DTD WML"                   {isWML = true;}
 
-        "<%" {S}* "@" {S}* "page" {S}+   {yybegin(ST_PAGE_DIRECTIVE); return JSPHeadTokenizerConstants.PageDirectiveStart;}
-        "<jsp:directive.page" {S}+           {yybegin(ST_PAGE_DIRECTIVE); return JSPHeadTokenizerConstants.PageDirectiveStart;}
+        "<%" {S}* "@" {S}* ("page"|"tag") {S}+   {yybegin(ST_PAGE_DIRECTIVE); return JSPHeadTokenizerConstants.PageDirectiveStart;}
+        ("<jsp:directive.page"|"<jsp:directive.tag") {S}+           {yybegin(ST_PAGE_DIRECTIVE); return JSPHeadTokenizerConstants.PageDirectiveStart;}
 
 
 }
 
 <ST_XMLDecl>
 {
-        "version" {BeginAttribeValue} {pushCurrentState(); yybegin(QuotedAttributeValue); return XMLHeadTokenizerConstants.XMLDeclVersion;}
-        "encoding" {BeginAttribeValue} {pushCurrentState(); yybegin(QuotedAttributeValue); return XMLHeadTokenizerConstants.XMLDelEncoding;}
+        "version" {BeginAttributeeValue} {pushCurrentState(); yybegin(QuotedAttributeValue); return XMLHeadTokenizerConstants.XMLDeclVersion;}
+        "encoding" {BeginAttributeeValue} {pushCurrentState(); yybegin(QuotedAttributeValue); return XMLHeadTokenizerConstants.XMLDelEncoding;}
         // note the "forced end" (via 'hasMore=false') once the end of XML Declaration found
         // This is since non-ascii chars may follow and may cause IOExceptions which would not occur once stream is
         // read with incorrect encoding (such as if platform encoding is in effect until true encoding detected).
@@ -226,9 +226,9 @@
 <ST_PAGE_DIRECTIVE>
 {
 //  removed 'language' since it really can be handled seperately from encoding, but may add it back later for simple re-use.
-        "language"     {BeginAttribeValue} {pushCurrentState(); yybegin(QuotedAttributeValue); return JSPHeadTokenizerConstants.PageLanguage;}
-        "contentType" {BeginAttribeValue}  {pushCurrentState(); yybegin(QuotedAttributeValue); return JSPHeadTokenizerConstants.PageContentType;}
-        "pageEncoding" {BeginAttribeValue} {pushCurrentState(); yybegin(QuotedAttributeValue); return JSPHeadTokenizerConstants.PageEncoding;}
+        "language"     {BeginAttributeeValue} {pushCurrentState(); yybegin(QuotedAttributeValue); return JSPHeadTokenizerConstants.PageLanguage;}
+        "contentType" {BeginAttributeeValue}  {pushCurrentState(); yybegin(QuotedAttributeValue); return JSPHeadTokenizerConstants.PageContentType;}
+        "pageEncoding" {BeginAttributeeValue} {pushCurrentState(); yybegin(QuotedAttributeValue); return JSPHeadTokenizerConstants.PageEncoding;}
         // note the "forced end" (via 'hasMore=false') once the end of XML Declaration found
         // This is since non-ascii chars may follow and may cause IOExceptions which would not occur once stream is
         // read in correct encoding.
diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contenttype/JSPHeadTokenizer.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contenttype/JSPHeadTokenizer.java
index 58c299a..a7f549b 100644
--- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contenttype/JSPHeadTokenizer.java
+++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contenttype/JSPHeadTokenizer.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * Copyright (c) 2005, 2007 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -8,7 +8,6 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-/* The following code was generated by JFlex 1.4 on 9/18/06 2:12 PM */
 /*nlsXXX*/
 package org.eclipse.jst.jsp.core.internal.contenttype;
 import java.io.IOException;
@@ -24,9 +23,9 @@
 
 /**
  * This class is a scanner generated by 
- * <a href="http://www.jflex.de/">JFlex</a> 1.4
- * on 9/18/06 2:12 PM from the specification file
- * <tt>D:/builds/Workspaces/WTP15maintenance/org.eclipse.jst.jsp.core/DevTimeSupport/HeadParsers/JSPHeadTokenizer.jFlex</tt>
+ * <a href="http://www.jflex.de/">JFlex</a> 1.4.1
+ * on 4/17/07 12:35 AM from the specification file
+ * <tt>D:/eclipse.wtp/workspace/org.eclipse.jst.jsp.core/DevTimeSupport/HeadParsers/JSPHeadTokenizer.jFlex</tt>
  */
 public class JSPHeadTokenizer {
 
@@ -84,12 +83,12 @@
     "\10\0\20\1\2\2\1\1\1\3\1\4\1\5\1\6"+
     "\1\5\1\7\2\5\1\7\1\10\2\11\4\0\1\12"+
     "\1\13\6\0\1\14\5\0\1\15\1\16\1\0\1\17"+
-    "\1\0\1\20\4\0\1\21\36\0\1\22\20\0\1\23"+
-    "\2\0\1\24\6\0\1\25\1\26\22\0\1\27\5\0"+
+    "\1\0\1\20\4\0\1\21\41\0\1\22\7\0\1\23"+
+    "\12\0\1\24\6\0\1\25\1\26\22\0\1\27\5\0"+
     "\1\30\52\0\1\31\5\0\1\32\12\0\1\32";
 
   private static int [] zzUnpackAction() {
-    int [] result = new int[212];
+    int [] result = new int[214];
     int offset = 0;
     offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result);
     return result;
@@ -149,18 +148,9 @@
       from input */
   private int zzEndRead;
 
-  /** number of newlines encountered up to the start of the matched text */
-  //private int yyline;
-
   /** the number of characters up to the start of the matched text */
   private int yychar;
 
-  /**
-   * the number of characters from the last newline up to the start of the 
-   * matched text
-   */
-  //private int yycolumn;
-
   /** 
    * zzAtBOL == true <=> the scanner is currently at the beginning of a line
    */
@@ -407,7 +397,7 @@
     zzAtEOF  = false;
     zzEndRead = zzStartRead = 0;
     zzCurrentPos = zzMarkedPos = zzPushbackPos = 0;
-    //yyline = yychar = yycolumn = 0;
+    yychar = 0;
     zzLexicalState = YYINITIAL;
   }
 
@@ -560,6 +550,7 @@
           else {
             boolean eof = zzRefill();
             zzMarkedPosL = zzMarkedPos;
+            zzEndReadL = zzEndRead;
             zzBufferL = zzBuffer;
             if (eof) 
               zzAtBOL = false;
@@ -808,7 +799,7 @@
               switch (zzInput) {
                 case 6: 
                 case 8: 
-                case 28: zzIsFinal = true; zzState = 25; break zzForNext;
+                case 28: zzIsFinal = true; break zzForNext;
                 case 9: zzState = 59; break zzForNext;
                 default: zzIsFinal = true; zzNoLookAhead = true; zzState = 24; break zzForNext;
               }
@@ -869,7 +860,7 @@
                 case 6: 
                 case 8: 
                 case 9: 
-                case 28: zzState = 41; break zzForNext;
+                case 28: break zzForNext;
                 case 42: zzState = 65; break zzForNext;
                 default: break zzForAction;
               }
@@ -891,7 +882,7 @@
                 case 6: 
                 case 8: 
                 case 9: 
-                case 28: zzState = 46; break zzForNext;
+                case 28: break zzForNext;
                 case 10: zzState = 47; break zzForNext;
                 default: break zzForAction;
               }
@@ -913,7 +904,7 @@
                 case 6: 
                 case 8: 
                 case 9: 
-                case 28: zzState = 49; break zzForNext;
+                case 28: break zzForNext;
                 case 11: zzState = 50; break zzForNext;
                 default: break zzForAction;
               }
@@ -959,7 +950,7 @@
                 case 6: 
                 case 8: 
                 case 28: zzIsFinal = true; zzState = 25; break zzForNext;
-                case 9: zzState = 59; break zzForNext;
+                case 9: break zzForNext;
                 default: zzIsFinal = true; zzNoLookAhead = true; zzState = 24; break zzForNext;
               }
 
@@ -986,201 +977,202 @@
                 case 6: 
                 case 8: 
                 case 9: 
-                case 28: zzState = 65; break zzForNext;
-                case 21: zzState = 76; break zzForNext;
+                case 28: break zzForNext;
+                case 19: zzState = 76; break zzForNext;
+                case 21: zzState = 77; break zzForNext;
                 default: break zzForAction;
               }
 
             case 66:
               switch (zzInput) {
-                case 21: zzState = 77; break zzForNext;
+                case 21: zzState = 78; break zzForNext;
                 default: break zzForAction;
               }
 
             case 68:
               switch (zzInput) {
-                case 13: zzState = 78; break zzForNext;
+                case 13: zzState = 79; break zzForNext;
                 default: break zzForAction;
               }
 
             case 69:
               switch (zzInput) {
-                case 17: zzState = 79; break zzForNext;
+                case 17: zzState = 80; break zzForNext;
                 default: break zzForAction;
               }
 
             case 70:
               switch (zzInput) {
-                case 30: zzState = 80; break zzForNext;
+                case 30: zzState = 81; break zzForNext;
                 default: break zzForAction;
               }
 
             case 71:
               switch (zzInput) {
-                case 38: zzState = 81; break zzForNext;
+                case 38: zzState = 82; break zzForNext;
                 default: break zzForAction;
               }
 
             case 72:
               switch (zzInput) {
-                case 19: zzState = 82; break zzForNext;
+                case 19: zzState = 83; break zzForNext;
                 default: break zzForAction;
               }
 
             case 73:
               switch (zzInput) {
-                case 22: zzState = 83; break zzForNext;
+                case 22: zzState = 84; break zzForNext;
                 default: break zzForAction;
               }
 
             case 74:
               switch (zzInput) {
-                case 18: zzState = 84; break zzForNext;
+                case 18: zzState = 85; break zzForNext;
                 default: break zzForAction;
               }
 
             case 75:
               switch (zzInput) {
-                case 14: zzState = 85; break zzForNext;
+                case 14: zzState = 86; break zzForNext;
                 default: break zzForAction;
               }
 
             case 76:
               switch (zzInput) {
-                case 43: zzState = 86; break zzForNext;
+                case 43: zzState = 87; break zzForNext;
                 default: break zzForAction;
               }
 
             case 77:
               switch (zzInput) {
-                case 33: zzState = 87; break zzForNext;
+                case 43: zzState = 88; break zzForNext;
                 default: break zzForAction;
               }
 
             case 78:
               switch (zzInput) {
-                case 14: zzState = 88; break zzForNext;
+                case 33: zzState = 89; break zzForNext;
                 default: break zzForAction;
               }
 
             case 79:
               switch (zzInput) {
-                case 16: zzState = 89; break zzForNext;
+                case 14: zzState = 90; break zzForNext;
                 default: break zzForAction;
               }
 
             case 80:
               switch (zzInput) {
-                case 26: zzState = 90; break zzForNext;
+                case 16: zzState = 91; break zzForNext;
                 default: break zzForAction;
               }
 
             case 81:
               switch (zzInput) {
-                case 24: zzState = 91; break zzForNext;
+                case 26: zzState = 92; break zzForNext;
                 default: break zzForAction;
               }
 
             case 82:
               switch (zzInput) {
-                case 22: zzState = 92; break zzForNext;
+                case 24: zzState = 93; break zzForNext;
                 default: break zzForAction;
               }
 
             case 83:
               switch (zzInput) {
-                case 22: zzState = 93; break zzForNext;
+                case 22: zzState = 94; break zzForNext;
                 default: break zzForAction;
               }
 
             case 84:
               switch (zzInput) {
-                case 19: zzState = 94; break zzForNext;
+                case 22: zzState = 95; break zzForNext;
                 default: break zzForAction;
               }
 
             case 85:
               switch (zzInput) {
-                case 6: 
-                case 8: 
-                case 9: 
-                case 28: zzState = 85; break zzForNext;
-                case 12: zzState = 95; break zzForNext;
+                case 19: zzState = 96; break zzForNext;
                 default: break zzForAction;
               }
 
             case 86:
               switch (zzInput) {
-                case 38: zzState = 96; break zzForNext;
+                case 6: 
+                case 8: 
+                case 9: 
+                case 28: break zzForNext;
+                case 12: zzState = 97; break zzForNext;
                 default: break zzForAction;
               }
 
             case 87:
               switch (zzInput) {
-                case 16: zzState = 97; break zzForNext;
+                case 38: zzState = 98; break zzForNext;
                 default: break zzForAction;
               }
 
             case 88:
               switch (zzInput) {
-                case 6: 
-                case 8: 
-                case 9: 
-                case 28: zzIsFinal = true; zzState = 98; break zzForNext;
+                case 38: zzState = 99; break zzForNext;
                 default: break zzForAction;
               }
 
             case 89:
               switch (zzInput) {
-                case 26: zzState = 99; break zzForNext;
+                case 16: zzState = 100; break zzForNext;
                 default: break zzForAction;
               }
 
             case 90:
               switch (zzInput) {
-                case 17: zzState = 100; break zzForNext;
+                case 6: 
+                case 8: 
+                case 9: 
+                case 28: zzIsFinal = true; zzState = 101; break zzForNext;
                 default: break zzForAction;
               }
 
             case 91:
               switch (zzInput) {
-                case 43: zzState = 101; break zzForNext;
+                case 26: zzState = 102; break zzForNext;
                 default: break zzForAction;
               }
 
             case 92:
               switch (zzInput) {
-                case 29: zzState = 102; break zzForNext;
+                case 17: zzState = 103; break zzForNext;
                 default: break zzForAction;
               }
 
             case 93:
               switch (zzInput) {
-                case 29: zzState = 103; break zzForNext;
+                case 43: zzState = 104; break zzForNext;
                 default: break zzForAction;
               }
 
             case 94:
               switch (zzInput) {
-                case 20: zzState = 104; break zzForNext;
+                case 29: zzState = 105; break zzForNext;
                 default: break zzForAction;
               }
 
             case 95:
               switch (zzInput) {
-                case 13: zzState = 105; break zzForNext;
+                case 29: zzState = 106; break zzForNext;
                 default: break zzForAction;
               }
 
             case 96:
               switch (zzInput) {
-                case 22: zzState = 106; break zzForNext;
+                case 20: zzState = 107; break zzForNext;
                 default: break zzForAction;
               }
 
             case 97:
               switch (zzInput) {
-                case 26: zzState = 107; break zzForNext;
+                case 13: zzState = 108; break zzForNext;
                 default: break zzForAction;
               }
 
@@ -1189,70 +1181,70 @@
                 case 6: 
                 case 8: 
                 case 9: 
-                case 28: zzIsFinal = true; zzState = 98; break zzForNext;
+                case 28: zzIsFinal = true; zzState = 109; break zzForNext;
                 default: break zzForAction;
               }
 
             case 99:
               switch (zzInput) {
-                case 29: zzState = 108; break zzForNext;
+                case 22: zzState = 98; break zzForNext;
                 default: break zzForAction;
               }
 
             case 100:
               switch (zzInput) {
-                case 29: zzState = 109; break zzForNext;
+                case 26: zzState = 110; break zzForNext;
                 default: break zzForAction;
               }
 
             case 101:
               switch (zzInput) {
-                case 38: zzState = 110; break zzForNext;
+                case 6: 
+                case 8: 
+                case 9: 
+                case 28: zzIsFinal = true; break zzForNext;
                 default: break zzForAction;
               }
 
             case 102:
               switch (zzInput) {
-                case 19: zzState = 111; break zzForNext;
+                case 29: zzState = 111; break zzForNext;
                 default: break zzForAction;
               }
 
             case 103:
               switch (zzInput) {
-                case 18: zzState = 112; break zzForNext;
+                case 29: zzState = 112; break zzForNext;
                 default: break zzForAction;
               }
 
             case 104:
               switch (zzInput) {
-                case 21: zzState = 113; break zzForNext;
+                case 38: zzState = 113; break zzForNext;
                 default: break zzForAction;
               }
 
             case 105:
               switch (zzInput) {
-                case 14: zzState = 114; break zzForNext;
+                case 19: zzState = 114; break zzForNext;
                 default: break zzForAction;
               }
 
             case 106:
               switch (zzInput) {
-                case 6: 
-                case 8: 
-                case 9: 
-                case 28: zzIsFinal = true; zzState = 115; break zzForNext;
+                case 18: zzState = 115; break zzForNext;
                 default: break zzForAction;
               }
 
             case 107:
               switch (zzInput) {
-                case 37: zzState = 116; break zzForNext;
+                case 21: zzState = 116; break zzForNext;
                 default: break zzForAction;
               }
 
             case 108:
               switch (zzInput) {
-                case 38: zzState = 117; break zzForNext;
+                case 14: zzState = 117; break zzForNext;
                 default: break zzForAction;
               }
 
@@ -1261,47 +1253,47 @@
                 case 6: 
                 case 8: 
                 case 9: 
-                case 28: zzState = 109; break zzForNext;
-                case 7: zzIsFinal = true; zzState = 118; break zzForNext;
+                case 28: zzIsFinal = true; break zzForNext;
                 default: break zzForAction;
               }
 
             case 110:
               switch (zzInput) {
-                case 22: zzState = 119; break zzForNext;
+                case 37: zzState = 118; break zzForNext;
                 default: break zzForAction;
               }
 
             case 111:
               switch (zzInput) {
-                case 19: zzState = 120; break zzForNext;
+                case 38: zzState = 119; break zzForNext;
                 default: break zzForAction;
               }
 
             case 112:
               switch (zzInput) {
-                case 17: zzState = 121; break zzForNext;
+                case 6: 
+                case 8: 
+                case 9: 
+                case 28: break zzForNext;
+                case 7: zzIsFinal = true; zzState = 120; break zzForNext;
                 default: break zzForAction;
               }
 
             case 113:
               switch (zzInput) {
-                case 22: zzState = 122; break zzForNext;
+                case 22: zzState = 121; break zzForNext;
                 default: break zzForAction;
               }
 
             case 114:
               switch (zzInput) {
-                case 29: zzState = 123; break zzForNext;
+                case 19: zzState = 122; break zzForNext;
                 default: break zzForAction;
               }
 
             case 115:
               switch (zzInput) {
-                case 6: 
-                case 8: 
-                case 9: 
-                case 28: zzIsFinal = true; zzState = 115; break zzForNext;
+                case 17: zzState = 123; break zzForNext;
                 default: break zzForAction;
               }
 
@@ -1313,20 +1305,13 @@
 
             case 117:
               switch (zzInput) {
-                case 6: 
-                case 8: 
-                case 9: 
-                case 28: zzState = 117; break zzForNext;
-                case 7: zzIsFinal = true; zzState = 125; break zzForNext;
+                case 29: zzState = 125; break zzForNext;
                 default: break zzForAction;
               }
 
             case 118:
               switch (zzInput) {
-                case 6: 
-                case 8: 
-                case 9: 
-                case 28: zzIsFinal = true; zzState = 118; break zzForNext;
+                case 22: zzState = 126; break zzForNext;
                 default: break zzForAction;
               }
 
@@ -1335,142 +1320,144 @@
                 case 6: 
                 case 8: 
                 case 9: 
-                case 28: zzState = 119; break zzForNext;
-                case 7: zzIsFinal = true; zzState = 126; break zzForNext;
+                case 28: break zzForNext;
+                case 7: zzIsFinal = true; zzState = 127; break zzForNext;
                 default: break zzForAction;
               }
 
             case 120:
               switch (zzInput) {
-                case 20: zzState = 127; break zzForNext;
+                case 6: 
+                case 8: 
+                case 9: 
+                case 28: zzIsFinal = true; break zzForNext;
                 default: break zzForAction;
               }
 
             case 121:
               switch (zzInput) {
-                case 16: zzState = 128; break zzForNext;
+                case 6: 
+                case 8: 
+                case 9: 
+                case 28: break zzForNext;
+                case 7: zzIsFinal = true; zzState = 128; break zzForNext;
                 default: break zzForAction;
               }
 
             case 122:
               switch (zzInput) {
-                case 6: 
-                case 8: 
-                case 9: 
-                case 28: zzState = 122; break zzForNext;
-                case 23: zzState = 129; break zzForNext;
-                case 34: zzState = 130; break zzForNext;
+                case 20: zzState = 129; break zzForNext;
                 default: break zzForAction;
               }
 
             case 123:
               switch (zzInput) {
-                case 30: zzState = 131; break zzForNext;
+                case 16: zzState = 130; break zzForNext;
                 default: break zzForAction;
               }
 
             case 124:
               switch (zzInput) {
-                case 18: zzState = 132; break zzForNext;
+                case 6: 
+                case 8: 
+                case 9: 
+                case 28: break zzForNext;
+                case 23: zzState = 131; break zzForNext;
+                case 34: zzState = 132; break zzForNext;
                 default: break zzForAction;
               }
 
             case 125:
               switch (zzInput) {
-                case 6: 
-                case 8: 
-                case 9: 
-                case 28: zzIsFinal = true; zzState = 125; break zzForNext;
+                case 30: zzState = 133; break zzForNext;
                 default: break zzForAction;
               }
 
             case 126:
               switch (zzInput) {
-                case 6: 
-                case 8: 
-                case 9: 
-                case 28: zzIsFinal = true; zzState = 126; break zzForNext;
+                case 18: zzState = 134; break zzForNext;
                 default: break zzForAction;
               }
 
             case 127:
               switch (zzInput) {
-                case 21: zzState = 133; break zzForNext;
+                case 6: 
+                case 8: 
+                case 9: 
+                case 28: zzIsFinal = true; break zzForNext;
                 default: break zzForAction;
               }
 
             case 128:
               switch (zzInput) {
-                case 26: zzState = 134; break zzForNext;
+                case 6: 
+                case 8: 
+                case 9: 
+                case 28: zzIsFinal = true; break zzForNext;
                 default: break zzForAction;
               }
 
             case 129:
               switch (zzInput) {
-                case 19: zzState = 135; break zzForNext;
+                case 21: zzState = 135; break zzForNext;
                 default: break zzForAction;
               }
 
             case 130:
               switch (zzInput) {
-                case 13: zzState = 136; break zzForNext;
+                case 26: zzState = 136; break zzForNext;
                 default: break zzForAction;
               }
 
             case 131:
               switch (zzInput) {
-                case 6: 
-                case 8: 
-                case 9: 
-                case 28: zzState = 131; break zzForNext;
-                case 7: zzState = 137; break zzForNext;
+                case 19: zzState = 137; break zzForNext;
                 default: break zzForAction;
               }
 
             case 132:
               switch (zzInput) {
-                case 19: zzState = 138; break zzForNext;
+                case 13: zzState = 138; break zzForNext;
                 default: break zzForAction;
               }
 
             case 133:
               switch (zzInput) {
-                case 22: zzState = 139; break zzForNext;
+                case 6: 
+                case 8: 
+                case 9: 
+                case 28: break zzForNext;
+                case 7: zzState = 139; break zzForNext;
                 default: break zzForAction;
               }
 
             case 134:
               switch (zzInput) {
-                case 29: zzState = 140; break zzForNext;
+                case 19: zzState = 140; break zzForNext;
                 default: break zzForAction;
               }
 
             case 135:
               switch (zzInput) {
-                case 13: zzState = 141; break zzForNext;
+                case 22: zzState = 141; break zzForNext;
                 default: break zzForAction;
               }
 
             case 136:
               switch (zzInput) {
-                case 14: zzState = 142; break zzForNext;
+                case 29: zzState = 142; break zzForNext;
                 default: break zzForAction;
               }
 
             case 137:
               switch (zzInput) {
-                case 6: 
-                case 8: 
-                case 9: 
-                case 28: zzState = 137; break zzForNext;
-                case 31: 
-                case 32: zzState = 143; break zzForNext;
+                case 13: zzState = 143; break zzForNext;
                 default: break zzForAction;
               }
 
             case 138:
               switch (zzInput) {
-                case 26: zzState = 144; break zzForNext;
+                case 14: zzState = 144; break zzForNext;
                 default: break zzForAction;
               }
 
@@ -1479,61 +1466,59 @@
                 case 6: 
                 case 8: 
                 case 9: 
-                case 28: zzState = 139; break zzForNext;
-                case 7: zzIsFinal = true; zzState = 145; break zzForNext;
+                case 28: break zzForNext;
+                case 31: 
+                case 32: zzState = 145; break zzForNext;
                 default: break zzForAction;
               }
 
             case 140:
               switch (zzInput) {
-                case 38: zzState = 146; break zzForNext;
+                case 26: zzState = 146; break zzForNext;
                 default: break zzForAction;
               }
 
             case 141:
               switch (zzInput) {
-                case 14: zzState = 147; break zzForNext;
+                case 6: 
+                case 8: 
+                case 9: 
+                case 28: break zzForNext;
+                case 7: zzIsFinal = true; zzState = 147; break zzForNext;
                 default: break zzForAction;
               }
 
             case 142:
               switch (zzInput) {
-                case 6: 
-                case 8: 
-                case 9: 
-                case 28: zzState = 142; break zzForNext;
-                case 21: zzState = 148; break zzForNext;
+                case 38: zzState = 148; break zzForNext;
                 default: break zzForAction;
               }
 
             case 143:
               switch (zzInput) {
-                case 23: zzState = 149; break zzForNext;
+                case 14: zzState = 149; break zzForNext;
                 default: break zzForAction;
               }
 
             case 144:
               switch (zzInput) {
-                case 45: zzState = 150; break zzForNext;
+                case 6: 
+                case 8: 
+                case 9: 
+                case 28: break zzForNext;
+                case 21: zzState = 150; break zzForNext;
                 default: break zzForAction;
               }
 
             case 145:
               switch (zzInput) {
-                case 6: 
-                case 8: 
-                case 9: 
-                case 28: zzIsFinal = true; zzState = 145; break zzForNext;
+                case 23: zzState = 151; break zzForNext;
                 default: break zzForAction;
               }
 
             case 146:
               switch (zzInput) {
-                case 6: 
-                case 8: 
-                case 9: 
-                case 28: zzState = 146; break zzForNext;
-                case 7: zzIsFinal = true; zzState = 151; break zzForNext;
+                case 45: zzState = 152; break zzForNext;
                 default: break zzForAction;
               }
 
@@ -1542,101 +1527,109 @@
                 case 6: 
                 case 8: 
                 case 9: 
-                case 28: zzState = 147; break zzForNext;
-                case 21: zzState = 152; break zzForNext;
+                case 28: zzIsFinal = true; break zzForNext;
                 default: break zzForAction;
               }
 
             case 148:
               switch (zzInput) {
-                case 24: zzState = 153; break zzForNext;
+                case 6: 
+                case 8: 
+                case 9: 
+                case 28: break zzForNext;
+                case 7: zzIsFinal = true; zzState = 153; break zzForNext;
                 default: break zzForAction;
               }
 
             case 149:
               switch (zzInput) {
-                case 19: zzState = 154; break zzForNext;
+                case 6: 
+                case 8: 
+                case 9: 
+                case 28: break zzForNext;
+                case 21: zzState = 154; break zzForNext;
                 default: break zzForAction;
               }
 
             case 150:
               switch (zzInput) {
-                case 22: zzState = 155; break zzForNext;
+                case 24: zzState = 155; break zzForNext;
                 default: break zzForAction;
               }
 
             case 151:
               switch (zzInput) {
-                case 6: 
-                case 8: 
-                case 9: 
-                case 28: zzIsFinal = true; zzState = 151; break zzForNext;
+                case 19: zzState = 156; break zzForNext;
                 default: break zzForAction;
               }
 
             case 152:
               switch (zzInput) {
-                case 24: zzState = 156; break zzForNext;
+                case 22: zzState = 157; break zzForNext;
                 default: break zzForAction;
               }
 
             case 153:
               switch (zzInput) {
-                case 25: zzState = 157; break zzForNext;
+                case 6: 
+                case 8: 
+                case 9: 
+                case 28: zzIsFinal = true; break zzForNext;
                 default: break zzForAction;
               }
 
             case 154:
               switch (zzInput) {
-                case 19: zzState = 158; break zzForNext;
+                case 24: zzState = 158; break zzForNext;
                 default: break zzForAction;
               }
 
             case 155:
               switch (zzInput) {
-                case 35: zzState = 159; break zzForNext;
+                case 25: zzState = 159; break zzForNext;
                 default: break zzForAction;
               }
 
             case 156:
               switch (zzInput) {
-                case 25: zzState = 160; break zzForNext;
+                case 19: zzState = 160; break zzForNext;
                 default: break zzForAction;
               }
 
             case 157:
               switch (zzInput) {
-                case 14: zzState = 161; break zzForNext;
+                case 35: zzState = 161; break zzForNext;
                 default: break zzForAction;
               }
 
             case 158:
               switch (zzInput) {
-                case 21: zzState = 162; break zzForNext;
+                case 25: zzState = 162; break zzForNext;
                 default: break zzForAction;
               }
 
             case 159:
               switch (zzInput) {
-                case 21: zzState = 76; break zzForNext;
+                case 14: zzState = 163; break zzForNext;
                 default: break zzForAction;
               }
 
             case 160:
               switch (zzInput) {
-                case 14: zzState = 163; break zzForNext;
+                case 21: zzState = 164; break zzForNext;
                 default: break zzForAction;
               }
 
             case 161:
               switch (zzInput) {
-                case 26: zzState = 164; break zzForNext;
+                case 19: zzState = 76; break zzForNext;
+                case 21: zzState = 77; break zzForNext;
                 default: break zzForAction;
               }
 
             case 162:
               switch (zzInput) {
-                case 33: zzState = 165; break zzForNext;
+                case 14: zzState = 165; break zzForNext;
                 default: break zzForAction;
               }
 
@@ -1648,13 +1641,13 @@
 
             case 164:
               switch (zzInput) {
-                case 18: zzState = 167; break zzForNext;
+                case 33: zzState = 167; break zzForNext;
                 default: break zzForAction;
               }
 
             case 165:
               switch (zzInput) {
-                case 27: zzState = 168; break zzForNext;
+                case 26: zzState = 168; break zzForNext;
                 default: break zzForAction;
               }
 
@@ -1667,13 +1660,12 @@
             case 167:
               switch (zzInput) {
                 case 27: zzState = 170; break zzForNext;
-                case 9: break zzForAction;
-                default: zzState = 167; break zzForNext;
+                default: break zzForAction;
               }
 
             case 168:
               switch (zzInput) {
-                case 27: zzState = 171; break zzForNext;
+                case 18: zzState = 171; break zzForNext;
                 default: break zzForAction;
               }
 
@@ -1681,20 +1673,20 @@
               switch (zzInput) {
                 case 27: zzState = 172; break zzForNext;
                 case 9: break zzForAction;
-                default: zzState = 169; break zzForNext;
+                default: break zzForNext;
               }
 
             case 170:
               switch (zzInput) {
                 case 27: zzState = 173; break zzForNext;
-                case 9: break zzForAction;
-                default: zzState = 167; break zzForNext;
+                default: break zzForAction;
               }
 
             case 171:
               switch (zzInput) {
-                case 34: zzState = 174; break zzForNext;
-                default: break zzForAction;
+                case 27: zzState = 174; break zzForNext;
+                case 9: break zzForAction;
+                default: break zzForNext;
               }
 
             case 172:
@@ -1706,21 +1698,20 @@
 
             case 173:
               switch (zzInput) {
-                case 27: zzState = 173; break zzForNext;
-                case 16: zzState = 176; break zzForNext;
-                case 9: break zzForAction;
-                default: zzState = 167; break zzForNext;
+                case 34: zzState = 176; break zzForNext;
+                default: break zzForAction;
               }
 
             case 174:
               switch (zzInput) {
-                case 34: zzState = 177; break zzForNext;
-                default: break zzForAction;
+                case 27: zzState = 177; break zzForNext;
+                case 9: break zzForAction;
+                default: zzState = 171; break zzForNext;
               }
 
             case 175:
               switch (zzInput) {
-                case 27: zzState = 175; break zzForNext;
+                case 27: break zzForNext;
                 case 16: zzState = 178; break zzForNext;
                 case 9: break zzForAction;
                 default: zzState = 169; break zzForNext;
@@ -1728,16 +1719,16 @@
 
             case 176:
               switch (zzInput) {
-                case 27: zzState = 170; break zzForNext;
-                case 19: zzState = 179; break zzForNext;
-                case 9: break zzForAction;
-                default: zzState = 167; break zzForNext;
+                case 34: zzState = 179; break zzForNext;
+                default: break zzForAction;
               }
 
             case 177:
               switch (zzInput) {
-                case 34: zzState = 180; break zzForNext;
-                default: break zzForAction;
+                case 27: break zzForNext;
+                case 16: zzState = 180; break zzForNext;
+                case 9: break zzForAction;
+                default: zzState = 171; break zzForNext;
               }
 
             case 178:
@@ -1750,16 +1741,16 @@
 
             case 179:
               switch (zzInput) {
-                case 27: zzState = 170; break zzForNext;
-                case 16: zzState = 182; break zzForNext;
-                case 9: break zzForAction;
-                default: zzState = 167; break zzForNext;
+                case 34: zzState = 182; break zzForNext;
+                default: break zzForAction;
               }
 
             case 180:
               switch (zzInput) {
-                case 35: zzState = 183; break zzForNext;
-                default: break zzForAction;
+                case 27: zzState = 174; break zzForNext;
+                case 19: zzState = 183; break zzForNext;
+                case 9: break zzForAction;
+                default: zzState = 171; break zzForNext;
               }
 
             case 181:
@@ -1772,16 +1763,16 @@
 
             case 182:
               switch (zzInput) {
-                case 27: zzState = 170; break zzForNext;
-                case 28: zzState = 185; break zzForNext;
-                case 9: break zzForAction;
-                default: zzState = 167; break zzForNext;
+                case 35: zzState = 185; break zzForNext;
+                default: break zzForAction;
               }
 
             case 183:
               switch (zzInput) {
-                case 34: zzState = 186; break zzForNext;
-                default: break zzForAction;
+                case 27: zzState = 174; break zzForNext;
+                case 16: zzState = 186; break zzForNext;
+                case 9: break zzForAction;
+                default: zzState = 171; break zzForNext;
               }
 
             case 184:
@@ -1794,133 +1785,135 @@
 
             case 185:
               switch (zzInput) {
-                case 27: zzState = 170; break zzForNext;
                 case 34: zzState = 188; break zzForNext;
-                case 9: break zzForAction;
-                default: zzState = 167; break zzForNext;
+                default: break zzForAction;
               }
 
             case 186:
               switch (zzInput) {
-                case 36: zzState = 189; break zzForNext;
-                default: break zzForAction;
+                case 27: zzState = 174; break zzForNext;
+                case 28: zzState = 189; break zzForNext;
+                case 9: break zzForAction;
+                default: zzState = 171; break zzForNext;
               }
 
             case 187:
               switch (zzInput) {
                 case 27: zzState = 172; break zzForNext;
-                case 12: zzState = 190; break zzForNext;
+                case 34: zzState = 190; break zzForNext;
                 case 9: break zzForAction;
                 default: zzState = 169; break zzForNext;
               }
 
             case 188:
               switch (zzInput) {
-                case 27: zzState = 170; break zzForNext;
-                case 13: zzState = 191; break zzForNext;
-                case 9: break zzForAction;
-                default: zzState = 167; break zzForNext;
+                case 36: zzState = 191; break zzForNext;
+                default: break zzForAction;
               }
 
             case 189:
               switch (zzInput) {
-                case 35: zzState = 192; break zzForNext;
-                default: break zzForAction;
+                case 27: zzState = 174; break zzForNext;
+                case 12: zzState = 192; break zzForNext;
+                case 9: break zzForAction;
+                default: zzState = 171; break zzForNext;
               }
 
             case 190:
               switch (zzInput) {
                 case 27: zzState = 172; break zzForNext;
-                case 23: zzState = 193; break zzForNext;
+                case 13: zzState = 193; break zzForNext;
                 case 9: break zzForAction;
                 default: zzState = 169; break zzForNext;
               }
 
             case 191:
               switch (zzInput) {
-                case 27: zzState = 170; break zzForNext;
-                case 14: zzIsFinal = true; zzState = 194; break zzForNext;
-                case 9: break zzForAction;
-                default: zzState = 167; break zzForNext;
+                case 35: zzState = 194; break zzForNext;
+                default: break zzForAction;
               }
 
             case 192:
               switch (zzInput) {
-                case 17: zzState = 195; break zzForNext;
-                default: break zzForAction;
+                case 27: zzState = 174; break zzForNext;
+                case 23: zzState = 195; break zzForNext;
+                case 9: break zzForAction;
+                default: zzState = 171; break zzForNext;
               }
 
             case 193:
               switch (zzInput) {
                 case 27: zzState = 172; break zzForNext;
-                case 19: zzState = 196; break zzForNext;
+                case 14: zzIsFinal = true; zzState = 196; break zzForNext;
                 case 9: break zzForAction;
                 default: zzState = 169; break zzForNext;
               }
 
             case 194:
               switch (zzInput) {
-                case 27: zzState = 170; break zzForNext;
-                case 9: break zzForAction;
-                default: zzState = 167; break zzForNext;
+                case 17: zzState = 197; break zzForNext;
+                default: break zzForAction;
               }
 
             case 195:
               switch (zzInput) {
-                case 37: zzState = 197; break zzForNext;
-                default: break zzForAction;
+                case 27: zzState = 174; break zzForNext;
+                case 19: zzState = 198; break zzForNext;
+                case 9: break zzForAction;
+                default: zzState = 171; break zzForNext;
               }
 
             case 196:
               switch (zzInput) {
                 case 27: zzState = 172; break zzForNext;
-                case 13: zzState = 198; break zzForNext;
                 case 9: break zzForAction;
                 default: zzState = 169; break zzForNext;
               }
 
             case 197:
               switch (zzInput) {
-                case 38: zzState = 199; break zzForNext;
+                case 37: zzState = 199; break zzForNext;
                 default: break zzForAction;
               }
 
             case 198:
               switch (zzInput) {
-                case 27: zzState = 172; break zzForNext;
-                case 14: zzIsFinal = true; zzState = 200; break zzForNext;
+                case 27: zzState = 174; break zzForNext;
+                case 13: zzState = 200; break zzForNext;
                 case 9: break zzForAction;
-                default: zzState = 169; break zzForNext;
+                default: zzState = 171; break zzForNext;
               }
 
             case 199:
               switch (zzInput) {
-                case 27: zzState = 201; break zzForNext;
+                case 38: zzState = 201; break zzForNext;
                 default: break zzForAction;
               }
 
             case 200:
               switch (zzInput) {
-                case 27: zzState = 172; break zzForNext;
+                case 27: zzState = 174; break zzForNext;
+                case 14: zzIsFinal = true; zzState = 202; break zzForNext;
                 case 9: break zzForAction;
-                default: zzState = 169; break zzForNext;
+                default: zzState = 171; break zzForNext;
               }
 
             case 201:
               switch (zzInput) {
-                case 39: zzState = 202; break zzForNext;
+                case 27: zzState = 203; break zzForNext;
                 default: break zzForAction;
               }
 
             case 202:
               switch (zzInput) {
-                case 40: zzState = 203; break zzForNext;
-                default: break zzForAction;
+                case 27: zzState = 174; break zzForNext;
+                case 9: break zzForAction;
+                default: zzState = 171; break zzForNext;
               }
 
             case 203:
               switch (zzInput) {
-                case 40: zzState = 204; break zzForNext;
+                case 39: zzState = 204; break zzForNext;
                 default: break zzForAction;
               }
 
@@ -1932,37 +1925,49 @@
 
             case 205:
               switch (zzInput) {
-                case 27: zzState = 206; break zzForNext;
+                case 40: zzState = 206; break zzForNext;
                 default: break zzForAction;
               }
 
             case 206:
               switch (zzInput) {
-                case 12: zzState = 207; break zzForNext;
+                case 40: zzState = 207; break zzForNext;
                 default: break zzForAction;
               }
 
             case 207:
               switch (zzInput) {
-                case 23: zzState = 208; break zzForNext;
+                case 27: zzState = 208; break zzForNext;
                 default: break zzForAction;
               }
 
             case 208:
               switch (zzInput) {
-                case 19: zzState = 209; break zzForNext;
+                case 12: zzState = 209; break zzForNext;
                 default: break zzForAction;
               }
 
             case 209:
               switch (zzInput) {
-                case 13: zzState = 210; break zzForNext;
+                case 23: zzState = 210; break zzForNext;
                 default: break zzForAction;
               }
 
             case 210:
               switch (zzInput) {
-                case 14: zzIsFinal = true; zzNoLookAhead = true; zzState = 211; break zzForNext;
+                case 19: zzState = 211; break zzForNext;
+                default: break zzForAction;
+              }
+
+            case 211:
+              switch (zzInput) {
+                case 13: zzState = 212; break zzForNext;
+                default: break zzForAction;
+              }
+
+            case 212:
+              switch (zzInput) {
+                case 14: zzIsFinal = true; zzNoLookAhead = true; zzState = 213; break zzForNext;
                 default: break zzForAction;
               }
 
@@ -2093,7 +2098,9 @@
           if (zzInput == YYEOF && zzStartRead == zzCurrentPos) {
             zzAtEOF = true;
             zzDoEOF();
-              { hasMore = false; return EncodingParserConstants.EOF; }
+              {
+                hasMore = false; return EncodingParserConstants.EOF;
+              }
           } 
           else {
             zzScanError(ZZ_NO_MATCH);