flex 2.5.39

git-svn-id: svn://tug.org/texlive/trunk@33311 c570f23f-e606-0410-a88d-b1316a301751

9 files changed, 470 insertions, 507 deletions

diff --git a/Build/source/README.hacking b/Build/source/README.hacking
index 00b3847abae..3a6e52357f3 100644
--- a/Build/source/README.hacking
+++ b/Build/source/README.hacking
@@ -20,7 +20,7 @@ ltmain.sh (GNU libtool) 2.4.2
 
 bison (GNU Bison) 3.0
 
-flex 2.5.37
+flex 2.5.39
 
 m4 (GNU M4) 1.4.17
 
diff --git a/Build/source/doc/build-tools b/Build/source/doc/build-tools
index f9bb30a7d03..4d078014df9 100644
--- a/Build/source/doc/build-tools
+++ b/Build/source/doc/build-tools
@@ -9,7 +9,7 @@ autoconf (GNU Autoconf) 2.69
 automake (GNU automake) 1.14.1
 ltmain.sh (GNU libtool) 2.4.2
 bison (GNU Bison) 3.0
-flex 2.5.37
+flex 2.5.39
 m4 (GNU M4) 1.4.17
 makeinfo (GNU texinfo) 5.2
 @end example
diff --git a/Build/source/doc/texlive.info b/Build/source/doc/texlive.info
index acece2879ab..df97238daa2 100644
--- a/Build/source/doc/texlive.info
+++ b/Build/source/doc/texlive.info
@@ -357,7 +357,7 @@ and having 'PATH' start with '/usr/local/gnu/bin').  Currently these are
      automake (GNU automake) 1.14.1
      ltmain.sh (GNU libtool) 2.4.2
      bison (GNU Bison) 3.0
-     flex 2.5.37
+     flex 2.5.39
      m4 (GNU M4) 1.4.17
      makeinfo (GNU texinfo) 5.2
 
diff --git a/Build/source/texk/detex/detex-2.8/detex.c b/Build/source/texk/detex/detex-2.8/detex.c
index bc9a5b60a90..ea731990a7a 100644
--- a/Build/source/texk/detex/detex-2.8/detex.c
+++ b/Build/source/texk/detex/detex-2.8/detex.c
@@ -99,7 +99,7 @@ static char	rcsid[] = "$Header: /p/src/local/bin/detex/RCS/detex.l,v 2.22 2007/0
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
 #define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 37
+#define YY_FLEX_SUBMINOR_VERSION 39
 #if YY_FLEX_SUBMINOR_VERSION > 0
 #define FLEX_BETA
 #endif
@@ -258,6 +258,7 @@ extern FILE *yyin, *yyout;
 #define EOB_ACT_LAST_MATCH 2
 
     #define YY_LESS_LINENO(n)
+    #define YY_LINENO_REWIND_TO(ptr)
     
 /* Return all but the first "n" matched characters back to the input stream. */
 #define yyless(n) \
@@ -1626,7 +1627,7 @@ int             csb = 0;		 /* depth of flex context stack */
 
  
 
-#line 1630 "detex.c"
+#line 1631 "detex.c"
 
 #define INITIAL 0
 #define Define 1
@@ -1828,10 +1829,6 @@ YY_DECL
 	register char *yy_cp, *yy_bp;
 	register int yy_act;
     
-#line 182 "detex.l"
-
-#line 1834 "detex.c"
-
 	if ( !(yy_init) )
 		{
 		(yy_init) = 1;
@@ -1858,6 +1855,11 @@ YY_DECL
 		yy_load_buffer_state( );
 		}
 
+	{
+#line 182 "detex.l"
+
+#line 1862 "detex.c"
+
 	while ( 1 )		/* loops until end-of-file is reached */
 		{
 		yy_cp = (yy_c_buf_p);
@@ -1874,7 +1876,7 @@ YY_DECL
 yy_match:
 		do
 			{
-			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
+			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ;
 			if ( yy_accept[yy_current_state] )
 				{
 				(yy_last_accepting_state) = yy_current_state;
@@ -2706,7 +2708,7 @@ YY_RULE_SETUP
 #line 411 "detex.l"
 ECHO;
 	YY_BREAK
-#line 2710 "detex.c"
+#line 2712 "detex.c"
 case YY_STATE_EOF(INITIAL):
 case YY_STATE_EOF(Define):
 case YY_STATE_EOF(Display):
@@ -2858,6 +2860,7 @@ case YY_STATE_EOF(LaPicture):
 			"fatal flex scanner internal error--no action found" );
 	} /* end of action switch */
 		} /* end of scanning one token */
+	} /* end of user's declarations */
 } /* end of yylex */
 
 /* yy_get_next_buffer - try to read in a new buffer
@@ -3491,7 +3494,7 @@ YY_BUFFER_STATE yy_scan_bytes  (yyconst char * yybytes, yy_size_t  _yybytes_len
 	YY_BUFFER_STATE b;
 	char *buf;
 	yy_size_t n;
-	int i;
+	yy_size_t i;
     
 	/* Get memory for full buffer, including space for trailing EOB's. */
 	n = _yybytes_len + 2;
diff --git a/Build/source/texk/lacheck/lacheck-1.26/lacheck.c b/Build/source/texk/lacheck/lacheck-1.26/lacheck.c
index 6062205c51f..454341bf8d4 100644
--- a/Build/source/texk/lacheck/lacheck-1.26/lacheck.c
+++ b/Build/source/texk/lacheck/lacheck-1.26/lacheck.c
@@ -8,7 +8,7 @@
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
 #define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 37
+#define YY_FLEX_SUBMINOR_VERSION 39
 #if YY_FLEX_SUBMINOR_VERSION > 0
 #define FLEX_BETA
 #endif
@@ -167,6 +167,7 @@ extern FILE *yyin, *yyout;
 #define EOB_ACT_LAST_MATCH 2
 
     #define YY_LESS_LINENO(n)
+    #define YY_LINENO_REWIND_TO(ptr)
     
 /* Return all but the first "n" matched characters back to the input stream. */
 #define yyless(n) \
@@ -2166,7 +2167,7 @@ int def_count = 0;
 
 
 
-#line 2170 "lacheck.c"
+#line 2171 "lacheck.c"
 
 #define INITIAL 0
 #define B_ENVIRONMENT 1
@@ -2363,11 +2364,6 @@ YY_DECL
 	register char *yy_cp, *yy_bp;
 	register int yy_act;
     
-#line 237 "lacheck.l"
-
-
-#line 2370 "lacheck.c"
-
 	if ( !(yy_init) )
 		{
 		(yy_init) = 1;
@@ -2400,6 +2396,12 @@ YY_DECL
 		yy_load_buffer_state( );
 		}
 
+	{
+#line 237 "lacheck.l"
+
+
+#line 2404 "lacheck.c"
+
 	while ( 1 )		/* loops until end-of-file is reached */
 		{
 		yy_cp = (yy_c_buf_p);
@@ -2421,7 +2423,7 @@ YY_DECL
 yy_match:
 		do
 			{
-			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
+			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ;
 			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 				{
 				yy_current_state = (int) yy_def[yy_current_state];
@@ -2586,6 +2588,7 @@ YY_RULE_SETUP
 case 14:
 /* rule 14 can match eol */
 *yy_cp = (yy_hold_char); /* undo effects of setting up yytext */
+YY_LINENO_REWIND_TO(yy_cp - 2);
 (yy_c_buf_p) = yy_cp -= 2;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
@@ -2604,6 +2607,7 @@ YY_RULE_SETUP
 case 15:
 /* rule 15 can match eol */
 *yy_cp = (yy_hold_char); /* undo effects of setting up yytext */
+YY_LINENO_REWIND_TO(yy_cp - 2);
 (yy_c_buf_p) = yy_cp -= 2;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
@@ -2643,6 +2647,7 @@ YY_RULE_SETUP
 case 19:
 /* rule 19 can match eol */
 *yy_cp = (yy_hold_char); /* undo effects of setting up yytext */
+YY_LINENO_REWIND_TO(yy_cp - 1);
 (yy_c_buf_p) = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
@@ -2652,6 +2657,7 @@ YY_RULE_SETUP
 case 20:
 /* rule 20 can match eol */
 *yy_cp = (yy_hold_char); /* undo effects of setting up yytext */
+YY_LINENO_REWIND_TO(yy_bp + 12);
 (yy_c_buf_p) = yy_cp = yy_bp + 12;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
@@ -2668,6 +2674,7 @@ YY_RULE_SETUP
 case 21:
 /* rule 21 can match eol */
 *yy_cp = (yy_hold_char); /* undo effects of setting up yytext */
+YY_LINENO_REWIND_TO(yy_bp + 12);
 (yy_c_buf_p) = yy_cp = yy_bp + 12;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
@@ -2677,6 +2684,7 @@ YY_RULE_SETUP
 case 22:
 /* rule 22 can match eol */
 *yy_cp = (yy_hold_char); /* undo effects of setting up yytext */
+YY_LINENO_REWIND_TO(yy_bp + 3);
 (yy_c_buf_p) = yy_cp = yy_bp + 3;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
@@ -2693,6 +2701,7 @@ YY_RULE_SETUP
 case 23:
 /* rule 23 can match eol */
 *yy_cp = (yy_hold_char); /* undo effects of setting up yytext */
+YY_LINENO_REWIND_TO(yy_bp + 3);
 (yy_c_buf_p) = yy_cp = yy_bp + 3;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
@@ -2877,6 +2886,7 @@ YY_RULE_SETUP
 case 45:
 /* rule 45 can match eol */
 *yy_cp = (yy_hold_char); /* undo effects of setting up yytext */
+YY_LINENO_REWIND_TO(yy_bp + 11);
 (yy_c_buf_p) = yy_cp = yy_bp + 11;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
@@ -2889,6 +2899,7 @@ YY_RULE_SETUP
 case 46:
 /* rule 46 can match eol */
 *yy_cp = (yy_hold_char); /* undo effects of setting up yytext */
+YY_LINENO_REWIND_TO(yy_bp + 9);
 (yy_c_buf_p) = yy_cp = yy_bp + 9;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
@@ -2906,6 +2917,7 @@ YY_RULE_SETUP
 case 48:
 /* rule 48 can match eol */
 *yy_cp = (yy_hold_char); /* undo effects of setting up yytext */
+YY_LINENO_REWIND_TO(yy_cp - 1);
 (yy_c_buf_p) = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
@@ -3004,6 +3016,7 @@ YY_RULE_SETUP
 case 58:
 /* rule 58 can match eol */
 *yy_cp = (yy_hold_char); /* undo effects of setting up yytext */
+YY_LINENO_REWIND_TO(yy_cp - 1);
 (yy_c_buf_p) = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
@@ -3146,6 +3159,7 @@ YY_RULE_SETUP
 case 70:
 /* rule 70 can match eol */
 *yy_cp = (yy_hold_char); /* undo effects of setting up yytext */
+YY_LINENO_REWIND_TO(yy_cp - 1);
 (yy_c_buf_p) = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
@@ -3158,6 +3172,7 @@ YY_RULE_SETUP
 case 71:
 /* rule 71 can match eol */
 *yy_cp = (yy_hold_char); /* undo effects of setting up yytext */
+YY_LINENO_REWIND_TO(yy_cp - 1);
 (yy_c_buf_p) = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
@@ -3172,6 +3187,7 @@ YY_RULE_SETUP
 case 72:
 /* rule 72 can match eol */
 *yy_cp = (yy_hold_char); /* undo effects of setting up yytext */
+YY_LINENO_REWIND_TO(yy_cp - 1);
 (yy_c_buf_p) = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
@@ -3186,6 +3202,7 @@ YY_RULE_SETUP
 case 73:
 /* rule 73 can match eol */
 *yy_cp = (yy_hold_char); /* undo effects of setting up yytext */
+YY_LINENO_REWIND_TO(yy_cp - 1);
 (yy_c_buf_p) = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
@@ -3315,6 +3332,7 @@ YY_RULE_SETUP
 case 86:
 /* rule 86 can match eol */
 *yy_cp = (yy_hold_char); /* undo effects of setting up yytext */
+YY_LINENO_REWIND_TO(yy_bp + 9);
 (yy_c_buf_p) = yy_cp = yy_bp + 9;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 #line 744 "lacheck.l"
@@ -3373,7 +3391,7 @@ YY_RULE_SETUP
 #line 764 "lacheck.l"
 ECHO;
 	YY_BREAK
-#line 3377 "lacheck.c"
+#line 3395 "lacheck.c"
 
 	case YY_END_OF_BUFFER:
 		{
@@ -3502,6 +3520,7 @@ ECHO;
 			"fatal flex scanner internal error--no action found" );
 	} /* end of action switch */
 		} /* end of scanning one token */
+	} /* end of user's declarations */
 } /* end of yylex */
 
 /* yy_get_next_buffer - try to read in a new buffer
@@ -4104,7 +4123,7 @@ YY_BUFFER_STATE yy_scan_bytes  (yyconst char * yybytes, yy_size_t  _yybytes_len
 	YY_BUFFER_STATE b;
 	char *buf;
 	yy_size_t n;
-	int i;
+	yy_size_t i;
     
 	/* Get memory for full buffer, including space for trailing EOB's. */
 	n = _yybytes_len + 2;
diff --git a/Build/source/texk/web2c/omegafonts/pl-lexer.c b/Build/source/texk/web2c/omegafonts/pl-lexer.c
index f2d39860d47..e7294924b0a 100644
--- a/Build/source/texk/web2c/omegafonts/pl-lexer.c
+++ b/Build/source/texk/web2c/omegafonts/pl-lexer.c
@@ -8,7 +8,7 @@
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
 #define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 37
+#define YY_FLEX_SUBMINOR_VERSION 39
 #if YY_FLEX_SUBMINOR_VERSION > 0
 #define FLEX_BETA
 #endif
@@ -180,6 +180,13 @@ extern FILE *yyin, *yyout;
                     if ( yytext[yyl] == '\n' )\
                         --yylineno;\
             }while(0)
+    #define YY_LINENO_REWIND_TO(dst) \
+            do {\
+                const char *p;\
+                for ( p = yy_cp-1; p >= (dst); --p)\
+                    if ( *p == '\n' )\
+                        --yylineno;\
+            }while(0)
     
 /* Return all but the first "n" matched characters back to the input stream. */
 #define yyless(n) \
@@ -371,12 +378,9 @@ static void yy_fatal_error (yyconst char msg[]  );
 	yyleng = (size_t) (yy_cp - yy_bp); \
 	(yy_hold_char) = *yy_cp; \
 	*yy_cp = '\0'; \
-	if ( yyleng + (yy_more_offset) >= YYLMAX ) \
+	if ( yyleng >= YYLMAX ) \
 		YY_FATAL_ERROR( "token too large, exceeds YYLMAX" ); \
-	yy_flex_strncpy( &yytext[(yy_more_offset)], (yytext_ptr), yyleng + 1 ); \
-	yyleng += (yy_more_offset); \
-	(yy_prev_more_offset) = (yy_more_offset); \
-	(yy_more_offset) = 0; \
+	yy_flex_strncpy( yytext, (yytext_ptr), yyleng + 1 ); \
 	(yy_c_buf_p) = yy_cp;
 
 #define YY_NUM_RULES 205
@@ -388,128 +392,95 @@ struct yy_trans_info
 	flex_int32_t yy_verify;
 	flex_int32_t yy_nxt;
 	};
-static yyconst flex_int16_t yy_acclist[265] =
+static yyconst flex_int16_t yy_accept[800] =
     {   0,
-      206,  204,  205,    1,  204,  205,    2,  205,    3,  204,
-      205,    4,  204,  205,  204,  205,  204,  205,  204,  205,
-      204,  205,  204,  205,  204,  205,  204,  205,  204,  205,
-      204,  205,  204,  205,  204,  205,  204,  205,  204,  205,
-      204,  205,  204,  205,  204,  205,  204,  205,  204,  205,
-      204,  205,  204,  205,  204,  205,  204,  205,  204,  205,
-        1,  180,    9,   42,    8,    8,    6,  179,    7,   31,
-       44,  102,   41,    5,  107,    9,    9,   43,   40,   46,
-      171,   23,  178,  151,   45,   77,   78,   79,  106,   75,
-        9,  150,   33,   32,   85,   86,   82,   83,   84,  181,
-
-       47,   49,  172,   61,   67,   55,   60,   66,   54,   63,
-       69,   57,   62,   68,   56,   59,   65,   53,   58,   64,
-       52,  177,   30,   48,  188,  187,  189,  186,   70,   71,
-       50,   38,   37,   39,   36,  175,   89,   90,   80,   81,
-       11,  100,  147,  159,   24,  146,  110,  148,  182,  158,
-      157,  156,   73,   12,   51,   16,   98,  149,  104,  105,
-       15,   72,   88,   87,   35,   74,  183,  170,  169,   20,
-      184,  173,  174,   14,  145,   13,  144,  164,  163,  162,
-       27,  111,  109,  112,  185,  115,   28,   26,  101,  153,
-      152,  114,  108,  154,   29,  201,  113,   91,  166,  165,
-
-      167,  176,   21,   76,  120,  122,  119,  117,  123,  121,
-      116,  118,  141,  140,  142,  161,   34,  155,  194,  199,
-      202,  197,  103,   17,  168,   22,  143,  160,  136,  138,
-      135,  133,  139,  137,  132,  134,  192,  195,  190,   25,
-       10,   99,  203,   93,   94,   95,   96,   97,  196,  200,
-      198,  193,  191,  128,  130,  127,  125,  131,  129,  124,
-      126,   92,   18,   19
-    } ;
-
-static yyconst flex_int16_t yy_accept[801] =
-    {   0,
-        1,    1,    1,    2,    4,    7,    9,   12,   15,   17,
-       19,   21,   23,   25,   27,   29,   31,   33,   35,   37,
-       39,   41,   43,   45,   47,   49,   51,   53,   55,   57,
-       59,   61,   62,   62,   62,   62,   62,   62,   62,   62,
-       62,   62,   62,   62,   62,   62,   62,   62,   62,   62,
-       63,   63,   63,   63,   63,   63,   63,   63,   63,   63,
-       63,   63,   63,   63,   63,   63,   63,   63,   63,   63,
-       63,   63,   63,   63,   63,   63,   63,   64,   64,   64,
-       64,   64,   64,   64,   64,   64,   64,   64,   64,   64,
-       64,   64,   64,   64,   64,   64,   64,   65,   65,   66,
-
-       67,   67,   67,   67,   67,   67,   67,   67,   67,   67,
-       68,   68,   68,   68,   68,   68,   68,   68,   68,   68,
-       68,   69,   69,   69,   69,   70,   70,   70,   71,   71,
-       72,   73,   74,   74,   74,   74,   74,   74,   74,   74,
-       75,   75,   75,   75,   76,   76,   76,   76,   77,   78,
-       79,   79,   79,   79,   79,   79,   79,   79,   79,   79,
-       79,   79,   79,   79,   79,   80,   80,   80,   80,   80,
-       80,   81,   81,   81,   81,   81,   81,   81,   81,   81,
-       82,   82,   82,   82,   82,   82,   82,   82,   82,   82,
-       82,   82,   82,   82,   82,   82,   82,   83,   83,   84,
-
-       84,   84,   85,   85,   85,   85,   86,   86,   86,   86,
-       86,   86,   86,   86,   86,   86,   87,   88,   89,   89,
-       89,   89,   89,   90,   91,   92,   93,   93,   93,   93,
-       93,   93,   93,   93,   93,   93,   93,   93,   93,   94,
-       94,   94,   94,   95,   95,   96,   97,   97,   98,   99,
-      100,  100,  100,  101,  101,  101,  101,  101,  102,  103,
-      103,  103,  103,  103,  103,  104,  104,  104,  104,  104,
-      104,  104,  104,  104,  104,  104,  104,  104,  104,  104,
-      104,  104,  104,  104,  104,  104,  104,  104,  105,  106,
-      107,  108,  109,  110,  111,  112,  113,  114,  115,  116,
-
-      117,  118,  119,  120,  121,  122,  122,  123,  123,  123,
-      123,  123,  123,  123,  123,  123,  123,  123,  123,  123,
-      123,  123,  123,  123,  123,  123,  124,  125,  125,  125,
-      125,  125,  125,  125,  125,  125,  125,  125,  125,  125,
-      125,  125,  125,  125,  125,  125,  125,  125,  125,  125,
-      125,  126,  127,  128,  128,  128,  129,  129,  129,  129,
-      129,  129,  130,  131,  131,  131,  131,  131,  131,  131,
-      131,  131,  131,  132,  132,  132,  132,  132,  132,  132,
-      133,  133,  133,  134,  135,  135,  135,  135,  135,  135,
-      136,  136,  137,  137,  137,  137,  137,  137,  137,  138,
-
-      139,  140,  141,  141,  141,  142,  142,  143,  143,  143,
-      143,  143,  143,  143,  143,  143,  143,  143,  144,  144,
-      144,  144,  144,  144,  145,  146,  147,  147,  147,  147,
-      147,  147,  147,  148,  149,  149,  149,  149,  150,  150,
-      150,  150,  150,  150,  150,  150,  151,  152,  153,  153,
-      153,  153,  153,  153,  153,  153,  153,  154,  154,  154,
-      154,  154,  154,  154,  155,  155,  155,  156,  156,  156,
-      156,  156,  156,  156,  156,  156,  156,  156,  156,  156,
-      156,  156,  156,  156,  157,  157,  157,  157,  157,  157,
-      157,  157,  157,  157,  157,  157,  157,  157,  157,  157,
-
-      157,  157,  157,  157,  157,  157,  157,  157,  157,  157,
-      157,  158,  158,  158,  158,  158,  158,  158,  158,  158,
-      158,  158,  159,  159,  159,  159,  159,  159,  159,  159,
-      159,  159,  159,  160,  161,  161,  162,  163,  164,  165,
-      165,  166,  167,  167,  168,  168,  168,  168,  168,  168,
-      168,  169,  169,  169,  169,  169,  170,  171,  172,  172,
-      173,  174,  174,  174,  174,  174,  175,  175,  175,  175,
-      175,  175,  176,  176,  176,  177,  177,  178,  178,  179,
-      180,  180,  180,  181,  181,  182,  182,  183,  184,  184,
-      184,  184,  184,  184,  185,  185,  185,  185,  185,  185,
-
-      185,  185,  185,  185,  185,  185,  185,  185,  185,  185,
-      185,  186,  186,  186,  187,  187,  188,  188,  188,  188,
-      188,  188,  188,  188,  188,  188,  188,  188,  189,  189,
-      189,  189,  189,  190,  190,  190,  190,  190,  191,  191,
-      191,  192,  193,  194,  195,  195,  195,  195,  196,  196,
-      196,  196,  196,  196,  196,  196,  196,  197,  197,  197,
-      197,  197,  197,  198,  199,  199,  199,  200,  201,  202,
-      202,  203,  203,  203,  204,  204,  205,  205,  206,  207,
-      208,  209,  210,  211,  212,  213,  214,  215,  216,  216,
-      217,  217,  217,  218,  218,  218,  218,  218,  219,  219,
-
-      219,  220,  220,  220,  220,  221,  222,  223,  224,  224,
-      225,  225,  225,  226,  226,  226,  227,  227,  228,  229,
-      229,  230,  231,  232,  233,  234,  235,  236,  237,  237,
-      238,  239,  240,  240,  240,  240,  240,  240,  241,  242,
-      242,  243,  243,  243,  243,  243,  244,  244,  244,  244,
-      245,  246,  247,  248,  249,  249,  249,  250,  250,  250,
-      251,  252,  252,  252,  252,  253,  254,  254,  254,  254,
-      254,  254,  254,  254,  254,  254,  254,  254,  255,  256,
-      257,  258,  259,  260,  261,  262,  262,  262,  262,  262,
-      262,  262,  262,  263,  263,  263,  263,  264,  265,  265
+        0,    0,  206,  204,    1,    2,    3,    4,  204,  204,
+      204,  204,  204,  204,  204,  204,  204,  204,  204,  204,
+      204,  204,  204,  204,  204,  204,  204,  204,  204,  204,
+      204,    1,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,  180,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    9,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,   42,    0,    8,    8,
+
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    6,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+      179,    0,    0,    0,    7,    0,    0,   31,    0,   44,
+      102,   41,    0,    0,    0,    0,    0,    0,    0,    5,
+        0,    0,    0,  107,    0,    0,    0,    9,    9,   43,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,   40,    0,    0,    0,    0,    0,
+       46,    0,    0,    0,    0,    0,    0,    0,    0,  171,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,   23,    0,  178,    0,
+
+        0,  151,    0,    0,    0,   45,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,   77,   78,   79,    0,    0,
+        0,    0,  106,   75,    9,  150,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,   33,    0,
+        0,    0,   32,    0,   85,   86,    0,   82,   83,   84,
+        0,    0,  181,    0,    0,    0,    0,   47,   49,    0,
+        0,    0,    0,    0,  172,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,   61,   67,   55,
+       60,   66,   54,   63,   69,   57,   62,   68,   56,   59,
+
+       65,   53,   58,   64,   52,    0,  177,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,   30,   48,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+      188,  187,  189,    0,    0,  186,    0,    0,    0,    0,
+        0,   70,   71,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,   50,    0,    0,    0,    0,    0,    0,   38,
+        0,    0,   37,   39,    0,    0,    0,    0,    0,   36,
+        0,  175,    0,    0,    0,    0,    0,    0,   89,   90,
+
+       80,   81,    0,    0,   11,    0,  100,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,  147,    0,    0,
+        0,    0,    0,  159,   24,  146,    0,    0,    0,    0,
+        0,    0,  110,  148,    0,    0,    0,  182,    0,    0,
+        0,    0,    0,    0,    0,  158,  157,  156,    0,    0,
+        0,    0,    0,    0,    0,    0,   73,    0,    0,    0,
+        0,    0,    0,   12,    0,    0,   51,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,   16,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+       98,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,  149,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,  104,  105,    0,   15,   72,   88,   87,    0,
+       35,   74,    0,  183,    0,    0,    0,    0,    0,    0,
+      170,    0,    0,    0,    0,  169,   20,  184,    0,  173,
+      174,    0,    0,    0,    0,   14,    0,    0,    0,    0,
+        0,  145,    0,    0,   13,    0,  144,    0,  164,  163,
+        0,    0,  162,    0,   27,    0,  111,  109,    0,    0,
+        0,    0,    0,  112,    0,    0,    0,    0,    0,    0,
+
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+      185,    0,    0,  115,    0,   28,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,   26,    0,    0,
+        0,    0,  101,    0,    0,    0,    0,  153,    0,    0,
+      152,  114,  108,  154,    0,    0,    0,   29,    0,    0,
+        0,    0,    0,    0,    0,    0,  201,    0,    0,    0,
+        0,    0,  113,   91,    0,    0,  166,  165,  167,    0,
+      176,    0,    0,   21,    0,   76,    0,  120,  122,  119,
+      117,  123,  121,  116,  118,  141,  140,  142,    0,  161,
+        0,    0,   34,    0,    0,    0,    0,  155,    0,    0,
+
+      194,    0,    0,    0,  199,  202,  197,  103,    0,   17,
+        0,    0,  168,    0,    0,   22,    0,  143,  160,    0,
+      136,  138,  135,  133,  139,  137,  132,  134,    0,  192,
+      195,  190,    0,    0,    0,    0,    0,   25,   10,    0,
+       99,    0,    0,    0,    0,  203,    0,    0,    0,   93,
+       94,   95,   96,   97,    0,    0,  196,    0,    0,  200,
+      198,    0,    0,    0,  193,  191,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,  128,  130,  127,
+      125,  131,  129,  124,  126,    0,    0,    0,    0,    0,
+        0,    0,   92,    0,    0,    0,   18,   19,    0
 
     } ;
 
@@ -957,30 +928,19 @@ static yyconst flex_int32_t yy_rule_can_match_eol[206] =
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0,     };
 
+static yy_state_type yy_last_accepting_state;
+static char *yy_last_accepting_cpos;
+
 extern int yy_flex_debug;
 int yy_flex_debug = 0;
 
-static yy_state_type *yy_state_buf=0, *yy_state_ptr=0;
-static char *yy_full_match;
-static int yy_lp;
-#define REJECT \
-{ \
-*yy_cp = (yy_hold_char); /* undo effects of setting up yytext */ \
-yy_cp = (yy_full_match); /* restore poss. backed-over text */ \
-++(yy_lp); \
-goto find_rule; \
-}
-
-static int yy_more_offset = 0;
-static int yy_prev_more_offset = 0;
-#define yymore() ((yy_more_offset) = yy_flex_strlen( yytext ))
-#define YY_NEED_STRLEN
+/* The intent behind this definition is that it'll catch
+ * any uses of REJECT which flex missed.
+ */
+#define REJECT reject_used_but_not_detected
+#define yymore() yymore_used_but_not_detected
 #define YY_MORE_ADJ 0
-#define YY_RESTORE_YY_MORE_OFFSET \
-	{ \
-	(yy_more_offset) = (yy_prev_more_offset); \
-	yyleng -= (yy_more_offset); \
-	}
+#define YY_RESTORE_YY_MORE_OFFSET
 #ifndef YYLMAX
 #define YYLMAX 8192
 #endif
@@ -1046,7 +1006,7 @@ static void scan_hex_string(void);
 
 /* For Solaris's lex, to increase tables sizes --RP */
 /* Space before number keeps ancient flex happy. */
-#line 1050 "pl-lexer.c"
+#line 1010 "pl-lexer.c"
 
 #define INITIAL 0
 
@@ -1228,11 +1188,6 @@ YY_DECL
 	register char *yy_cp, *yy_bp;
 	register int yy_act;
     
-#line 74 "pl-lexer.l"
-
-
-#line 1235 "pl-lexer.c"
-
 	if ( !(yy_init) )
 		{
 		(yy_init) = 1;
@@ -1241,12 +1196,6 @@ YY_DECL
 		YY_USER_INIT;
 #endif
 
-        /* Create the reject buffer large enough to save one state per allowed character. */
-        if ( ! (yy_state_buf) )
-            (yy_state_buf) = (yy_state_type *)yyalloc(YY_STATE_BUF_SIZE  );
-            if ( ! (yy_state_buf) )
-                YY_FATAL_ERROR( "out of dynamic memory in yylex()" );
-
 		if ( ! (yy_start) )
 			(yy_start) = 1;	/* first start state */
 
@@ -1265,6 +1214,12 @@ YY_DECL
 		yy_load_buffer_state( );
 		}
 
+	{
+#line 74 "pl-lexer.l"
+
+
+#line 1222 "pl-lexer.c"
+
 	while ( 1 )		/* loops until end-of-file is reached */
 		{
 		yy_cp = (yy_c_buf_p);
@@ -1278,14 +1233,15 @@ YY_DECL
 		yy_bp = yy_cp;
 
 		yy_current_state = (yy_start);
-
-		(yy_state_ptr) = (yy_state_buf);
-		*(yy_state_ptr)++ = yy_current_state;
-
 yy_match:
 		do
 			{
-			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
+			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ;
+			if ( yy_accept[yy_current_state] )
+				{
+				(yy_last_accepting_state) = yy_current_state;
+				(yy_last_accepting_cpos) = yy_cp;
+				}
 			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 				{
 				yy_current_state = (int) yy_def[yy_current_state];
@@ -1293,36 +1249,21 @@ yy_match:
 					yy_c = yy_meta[(unsigned int) yy_c];
 				}
 			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-			*(yy_state_ptr)++ = yy_current_state;
 			++yy_cp;
 			}
 		while ( yy_current_state != 799 );
+		yy_cp = (yy_last_accepting_cpos);
+		yy_current_state = (yy_last_accepting_state);
 
 yy_find_action:
-		yy_current_state = *--(yy_state_ptr);
-		(yy_lp) = yy_accept[yy_current_state];
-find_rule: /* we branch to this label when backing up */
-		for ( ; ; ) /* until we find what rule we matched */
-			{
-			if ( (yy_lp) && (yy_lp) < yy_accept[yy_current_state + 1] )
-				{
-				yy_act = yy_acclist[(yy_lp)];
-					{
-					(yy_full_match) = yy_cp;
-					break;
-					}
-				}
-			--yy_cp;
-			yy_current_state = *--(yy_state_ptr);
-			(yy_lp) = yy_accept[yy_current_state];
-			}
+		yy_act = yy_accept[yy_current_state];
 
 		YY_DO_BEFORE_ACTION;
 
 		if ( yy_act != YY_END_OF_BUFFER && yy_rule_can_match_eol[yy_act] )
 			{
-			int yyl;
-			for ( yyl = (yy_prev_more_offset); yyl < yyleng; ++yyl )
+			yy_size_t yyl;
+			for ( yyl = 0; yyl < yyleng; ++yyl )
 				if ( yytext[yyl] == '\n' )
 					   
     yylineno++;
@@ -1333,6 +1274,13 @@ do_action:	/* This label is used only to access EOF actions. */
 
 		switch ( yy_act )
 	{ /* beginning of action switch */
+			case 0: /* must back up */
+			/* undo the effects of YY_DO_BEFORE_ACTION */
+			*yy_cp = (yy_hold_char);
+			yy_cp = (yy_last_accepting_cpos);
+			yy_current_state = (yy_last_accepting_state);
+			goto yy_find_action;
+
 case 1:
 YY_RULE_SETUP
 #line 76 "pl-lexer.l"
@@ -2369,9 +2317,9 @@ YY_RULE_SETUP
 #line 324 "pl-lexer.l"
 ECHO;
 	YY_BREAK
-#line 2373 "pl-lexer.c"
-			case YY_STATE_EOF(INITIAL):
-				yyterminate();
+#line 2321 "pl-lexer.c"
+case YY_STATE_EOF(INITIAL):
+	yyterminate();
 
 	case YY_END_OF_BUFFER:
 		{
@@ -2436,7 +2384,8 @@ ECHO;
 
 			else
 				{
-				yy_cp = (yy_c_buf_p);
+				yy_cp = (yy_last_accepting_cpos);
+				yy_current_state = (yy_last_accepting_state);
 				goto yy_find_action;
 				}
 			}
@@ -2500,6 +2449,7 @@ ECHO;
 			"fatal flex scanner internal error--no action found" );
 	} /* end of action switch */
 		} /* end of scanning one token */
+	} /* end of user's declarations */
 } /* end of yylex */
 
 /* yy_get_next_buffer - try to read in a new buffer
@@ -2561,8 +2511,37 @@ static int yy_get_next_buffer (void)
 		while ( num_to_read <= 0 )
 			{ /* Not enough room in the buffer - grow it. */
 
-			YY_FATAL_ERROR(
-"input buffer overflow, can't enlarge buffer because scanner uses REJECT" );
+			/* just a shorter name for the current buffer */
+			YY_BUFFER_STATE b = YY_CURRENT_BUFFER_LVALUE;
+
+			int yy_c_buf_p_offset =
+				(int) ((yy_c_buf_p) - b->yy_ch_buf);
+
+			if ( b->yy_is_our_buffer )
+				{
+				yy_size_t new_size = b->yy_buf_size * 2;
+
+				if ( new_size <= 0 )
+					b->yy_buf_size += b->yy_buf_size / 8;
+				else
+					b->yy_buf_size *= 2;
+
+				b->yy_ch_buf = (char *)
+					/* Include room in for 2 EOB chars. */
+					yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2  );
+				}
+			else
+				/* Can't grow it, we don't own it. */
+				b->yy_ch_buf = 0;
+
+			if ( ! b->yy_ch_buf )
+				YY_FATAL_ERROR(
+				"fatal error - scanner input buffer overflow" );
+
+			(yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset];
+
+			num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size -
+						number_to_move - 1;
 
 			}
 
@@ -2621,12 +2600,14 @@ static int yy_get_next_buffer (void)
     
 	yy_current_state = (yy_start);
 
-	(yy_state_ptr) = (yy_state_buf);
-	*(yy_state_ptr)++ = yy_current_state;
-
 	for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
 		{
 		register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
+		if ( yy_accept[yy_current_state] )
+			{
+			(yy_last_accepting_state) = yy_current_state;
+			(yy_last_accepting_cpos) = yy_cp;
+			}
 		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 			{
 			yy_current_state = (int) yy_def[yy_current_state];
@@ -2634,7 +2615,6 @@ static int yy_get_next_buffer (void)
 				yy_c = yy_meta[(unsigned int) yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-		*(yy_state_ptr)++ = yy_current_state;
 		}
 
 	return yy_current_state;
@@ -2648,8 +2628,14 @@ static int yy_get_next_buffer (void)
     static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state )
 {
 	register int yy_is_jam;
-    
+    	register char *yy_cp = (yy_c_buf_p);
+
 	register YY_CHAR yy_c = 1;
+	if ( yy_accept[yy_current_state] )
+		{
+		(yy_last_accepting_state) = yy_current_state;
+		(yy_last_accepting_cpos) = yy_cp;
+		}
 	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 		{
 		yy_current_state = (int) yy_def[yy_current_state];
@@ -2658,8 +2644,6 @@ static int yy_get_next_buffer (void)
 		}
 	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
 	yy_is_jam = (yy_current_state == 799);
-	if ( ! yy_is_jam )
-		*(yy_state_ptr)++ = yy_current_state;
 
 		return yy_is_jam ? 0 : yy_current_state;
 }
@@ -3108,7 +3092,7 @@ YY_BUFFER_STATE yy_scan_bytes  (yyconst char * yybytes, yy_size_t  _yybytes_len
 	YY_BUFFER_STATE b;
 	char *buf;
 	yy_size_t n;
-	int i;
+	yy_size_t i;
     
 	/* Get memory for full buffer, including space for trailing EOB's. */
 	n = _yybytes_len + 2;
@@ -3256,11 +3240,6 @@ static int yy_init_globals (void)
     (yy_init) = 0;
     (yy_start) = 0;
 
-    (yy_state_buf) = 0;
-    (yy_state_ptr) = 0;
-    (yy_full_match) = 0;
-    (yy_lp) = 0;
-
 /* Defined in main.c */
 #ifdef YY_STDINIT
     yyin = stdin;
@@ -3291,9 +3270,6 @@ int yylex_destroy  (void)
 	yyfree((yy_buffer_stack) );
 	(yy_buffer_stack) = NULL;
 
-    yyfree ( (yy_state_buf) );
-    (yy_state_buf)  = NULL;
-
     /* Reset the globals. This is important in a non-reentrant scanner so the next time
      * yylex() is called, initialization will occur. */
     yy_init_globals( );
diff --git a/Build/source/texk/web2c/otps/otp-lexer.c b/Build/source/texk/web2c/otps/otp-lexer.c
index 2e2f916ca61..ae6c286a186 100644
--- a/Build/source/texk/web2c/otps/otp-lexer.c
+++ b/Build/source/texk/web2c/otps/otp-lexer.c
@@ -14,7 +14,7 @@
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
 #define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 37
+#define YY_FLEX_SUBMINOR_VERSION 39
 #if YY_FLEX_SUBMINOR_VERSION > 0
 #define FLEX_BETA
 #endif
@@ -186,6 +186,13 @@ extern FILE *yyin, *yyout;
                     if ( yytext[yyl] == '\n' )\
                         --yylineno;\
             }while(0)
+    #define YY_LINENO_REWIND_TO(dst) \
+            do {\
+                const char *p;\
+                for ( p = yy_cp-1; p >= (dst); --p)\
+                    if ( *p == '\n' )\
+                        --yylineno;\
+            }while(0)
     
 /* Return all but the first "n" matched characters back to the input stream. */
 #define yyless(n) \
@@ -377,12 +384,9 @@ static void yy_fatal_error (yyconst char msg[]  );
 	yyleng = (size_t) (yy_cp - yy_bp); \
 	(yy_hold_char) = *yy_cp; \
 	*yy_cp = '\0'; \
-	if ( yyleng + (yy_more_offset) >= YYLMAX ) \
+	if ( yyleng >= YYLMAX ) \
 		YY_FATAL_ERROR( "token too large, exceeds YYLMAX" ); \
-	yy_flex_strncpy( &yytext[(yy_more_offset)], (yytext_ptr), yyleng + 1 ); \
-	yyleng += (yy_more_offset); \
-	(yy_prev_more_offset) = (yy_more_offset); \
-	(yy_more_offset) = 0; \
+	yy_flex_strncpy( yytext, (yytext_ptr), yyleng + 1 ); \
 	(yy_c_buf_p) = yy_cp;
 
 #define YY_NUM_RULES 25
@@ -394,38 +398,20 @@ struct yy_trans_info
 	flex_int32_t yy_verify;
 	flex_int32_t yy_nxt;
 	};
-static yyconst flex_int16_t yy_acclist[130] =
+static yyconst flex_int16_t yy_accept[102] =
     {   0,
-       26,   24,   25,    1,   24,   25,    3,   25,    3,   24,
-       25,   24,   25,   24,   25,    6,   24,   25,   24,   25,
-       24,   25,   24,   25,    8,   24,   25,   24,   25,    8,
-       24,   25,    8,   24,   25,    8,   24,   25,    8,   24,
-       25,    8,   24,   25,    8,   24,   25,    8,   24,   25,
-        8,   24,   25,    8,   24,   25,    8,   24,   25,    3,
-        9,    2,    6,   11,   10,    8,    8,    8,    8,    8,
-        8,    8,    8,    8,    8,    8,    8,    8,    4,    5,
-        7,    8,    8,    8,    8,    8,    8,    8,    8,    8,
-        8,    8,    8,    8,   22,   20,   23,    8,    8,   21,
-
-        8,   19,    8,    8,    8,    8,    8,    8,    8,   18,
-        8,    8,    8,    8,   12,    8,    8,    8,    8,    8,
-       13,   15,   16,   14,    8,    8,    8,    8,   17
-    } ;
-
-static yyconst flex_int16_t yy_accept[103] =
-    {   0,
-        1,    1,    1,    2,    4,    7,    9,   12,   14,   16,
-       19,   21,   23,   25,   28,   30,   33,   36,   39,   42,
-       45,   48,   51,   54,   57,   60,   61,   61,   62,   62,
-       63,   64,   65,   66,   66,   66,   67,   67,   68,   69,
-       70,   71,   72,   73,   74,   75,   76,   77,   78,   79,
-       80,   81,   82,   83,   84,   85,   86,   87,   88,   89,
-       90,   91,   92,   93,   94,   95,   96,   97,   98,   99,
-      100,  101,  102,  103,  104,  105,  106,  107,  108,  109,
-      110,  111,  112,  113,  114,  115,  116,  117,  118,  119,
-      120,  121,  122,  123,  124,  125,  126,  127,  128,  129,
-
-      130,  130
+        0,    0,   26,   24,    1,    3,    3,   24,   24,    6,
+       24,   24,   24,    8,   24,    8,    8,    8,    8,    8,
+        8,    8,    8,    8,    8,    3,    0,    9,    0,    2,
+        6,   11,   10,    0,    0,    8,    0,    8,    8,    8,
+        8,    8,    8,    8,    8,    8,    8,    8,    8,    4,
+        5,    7,    8,    8,    8,    8,    8,    8,    8,    8,
+        8,    8,    8,    8,    8,   22,   20,   23,    8,    8,
+       21,    8,   19,    8,    8,    8,    8,    8,    8,    8,
+       18,    8,    8,    8,    8,   12,    8,    8,    8,    8,
+        8,   13,   15,   16,   14,    8,    8,    8,    8,   17,
+
+        0
     } ;
 
 static yyconst flex_int32_t yy_ec[256] =
@@ -550,30 +536,19 @@ static yyconst flex_int32_t yy_rule_can_match_eol[26] =
 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0,     };
 
+static yy_state_type yy_last_accepting_state;
+static char *yy_last_accepting_cpos;
+
 extern int yy_flex_debug;
 int yy_flex_debug = 0;
 
-static yy_state_type *yy_state_buf=0, *yy_state_ptr=0;
-static char *yy_full_match;
-static int yy_lp;
-#define REJECT \
-{ \
-*yy_cp = (yy_hold_char); /* undo effects of setting up yytext */ \
-yy_cp = (yy_full_match); /* restore poss. backed-over text */ \
-++(yy_lp); \
-goto find_rule; \
-}
-
-static int yy_more_offset = 0;
-static int yy_prev_more_offset = 0;
-#define yymore() ((yy_more_offset) = yy_flex_strlen( yytext ))
-#define YY_NEED_STRLEN
+/* The intent behind this definition is that it'll catch
+ * any uses of REJECT which flex missed.
+ */
+#define REJECT reject_used_but_not_detected
+#define yymore() yymore_used_but_not_detected
 #define YY_MORE_ADJ 0
-#define YY_RESTORE_YY_MORE_OFFSET \
-	{ \
-	(yy_more_offset) = (yy_prev_more_offset); \
-	yyleng -= (yy_more_offset); \
-	}
+#define YY_RESTORE_YY_MORE_OFFSET
 #ifndef YYLMAX
 #define YYLMAX 8192
 #endif
@@ -611,7 +586,7 @@ along with Omega; if not, write to the Free Software Foundation, Inc.,
 #define OTP_MAXCODE 0xFFFF
 int line_number = 1;
 extern YYSTYPE yylval;
-#line 615 "otp-lexer.c"
+#line 590 "otp-lexer.c"
 
 #define INITIAL 0
 
@@ -793,10 +768,6 @@ YY_DECL
 	register char *yy_cp, *yy_bp;
 	register int yy_act;
     
-#line 48 "otp-lexer.l"
-
-#line 799 "otp-lexer.c"
-
 	if ( !(yy_init) )
 		{
 		(yy_init) = 1;
@@ -805,12 +776,6 @@ YY_DECL
 		YY_USER_INIT;
 #endif
 
-        /* Create the reject buffer large enough to save one state per allowed character. */
-        if ( ! (yy_state_buf) )
-            (yy_state_buf) = (yy_state_type *)yyalloc(YY_STATE_BUF_SIZE  );
-            if ( ! (yy_state_buf) )
-                YY_FATAL_ERROR( "out of dynamic memory in yylex()" );
-
 		if ( ! (yy_start) )
 			(yy_start) = 1;	/* first start state */
 
@@ -829,6 +794,11 @@ YY_DECL
 		yy_load_buffer_state( );
 		}
 
+	{
+#line 48 "otp-lexer.l"
+
+#line 801 "otp-lexer.c"
+
 	while ( 1 )		/* loops until end-of-file is reached */
 		{
 		yy_cp = (yy_c_buf_p);
@@ -842,14 +812,15 @@ YY_DECL
 		yy_bp = yy_cp;
 
 		yy_current_state = (yy_start);
-
-		(yy_state_ptr) = (yy_state_buf);
-		*(yy_state_ptr)++ = yy_current_state;
-
 yy_match:
 		do
 			{
-			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
+			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ;
+			if ( yy_accept[yy_current_state] )
+				{
+				(yy_last_accepting_state) = yy_current_state;
+				(yy_last_accepting_cpos) = yy_cp;
+				}
 			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 				{
 				yy_current_state = (int) yy_def[yy_current_state];
@@ -857,36 +828,21 @@ yy_match:
 					yy_c = yy_meta[(unsigned int) yy_c];
 				}
 			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-			*(yy_state_ptr)++ = yy_current_state;
 			++yy_cp;
 			}
 		while ( yy_current_state != 101 );
+		yy_cp = (yy_last_accepting_cpos);
+		yy_current_state = (yy_last_accepting_state);
 
 yy_find_action:
-		yy_current_state = *--(yy_state_ptr);
-		(yy_lp) = yy_accept[yy_current_state];
-find_rule: /* we branch to this label when backing up */
-		for ( ; ; ) /* until we find what rule we matched */
-			{
-			if ( (yy_lp) && (yy_lp) < yy_accept[yy_current_state + 1] )
-				{
-				yy_act = yy_acclist[(yy_lp)];
-					{
-					(yy_full_match) = yy_cp;
-					break;
-					}
-				}
-			--yy_cp;
-			yy_current_state = *--(yy_state_ptr);
-			(yy_lp) = yy_accept[yy_current_state];
-			}
+		yy_act = yy_accept[yy_current_state];
 
 		YY_DO_BEFORE_ACTION;
 
 		if ( yy_act != YY_END_OF_BUFFER && yy_rule_can_match_eol[yy_act] )
 			{
-			int yyl;
-			for ( yyl = (yy_prev_more_offset); yyl < yyleng; ++yyl )
+			yy_size_t yyl;
+			for ( yyl = 0; yyl < yyleng; ++yyl )
 				if ( yytext[yyl] == '\n' )
 					   
     yylineno++;
@@ -897,6 +853,13 @@ do_action:	/* This label is used only to access EOF actions. */
 
 		switch ( yy_act )
 	{ /* beginning of action switch */
+			case 0: /* must back up */
+			/* undo the effects of YY_DO_BEFORE_ACTION */
+			*yy_cp = (yy_hold_char);
+			yy_cp = (yy_last_accepting_cpos);
+			yy_current_state = (yy_last_accepting_state);
+			goto yy_find_action;
+
 case 1:
 YY_RULE_SETUP
 #line 49 "otp-lexer.l"
@@ -1088,9 +1051,9 @@ YY_RULE_SETUP
 #line 137 "otp-lexer.l"
 ECHO;
 	YY_BREAK
-#line 1092 "otp-lexer.c"
-			case YY_STATE_EOF(INITIAL):
-				yyterminate();
+#line 1055 "otp-lexer.c"
+case YY_STATE_EOF(INITIAL):
+	yyterminate();
 
 	case YY_END_OF_BUFFER:
 		{
@@ -1155,7 +1118,8 @@ ECHO;
 
 			else
 				{
-				yy_cp = (yy_c_buf_p);
+				yy_cp = (yy_last_accepting_cpos);
+				yy_current_state = (yy_last_accepting_state);
 				goto yy_find_action;
 				}
 			}
@@ -1219,6 +1183,7 @@ ECHO;
 			"fatal flex scanner internal error--no action found" );
 	} /* end of action switch */
 		} /* end of scanning one token */
+	} /* end of user's declarations */
 } /* end of yylex */
 
 /* yy_get_next_buffer - try to read in a new buffer
@@ -1280,8 +1245,37 @@ static int yy_get_next_buffer (void)
 		while ( num_to_read <= 0 )
 			{ /* Not enough room in the buffer - grow it. */
 
-			YY_FATAL_ERROR(
-"input buffer overflow, can't enlarge buffer because scanner uses REJECT" );
+			/* just a shorter name for the current buffer */
+			YY_BUFFER_STATE b = YY_CURRENT_BUFFER_LVALUE;
+
+			int yy_c_buf_p_offset =
+				(int) ((yy_c_buf_p) - b->yy_ch_buf);
+
+			if ( b->yy_is_our_buffer )
+				{
+				yy_size_t new_size = b->yy_buf_size * 2;
+
+				if ( new_size <= 0 )
+					b->yy_buf_size += b->yy_buf_size / 8;
+				else
+					b->yy_buf_size *= 2;
+
+				b->yy_ch_buf = (char *)
+					/* Include room in for 2 EOB chars. */
+					yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2  );
+				}
+			else
+				/* Can't grow it, we don't own it. */
+				b->yy_ch_buf = 0;
+
+			if ( ! b->yy_ch_buf )
+				YY_FATAL_ERROR(
+				"fatal error - scanner input buffer overflow" );
+
+			(yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset];
+
+			num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size -
+						number_to_move - 1;
 
 			}
 
@@ -1340,12 +1334,14 @@ static int yy_get_next_buffer (void)
     
 	yy_current_state = (yy_start);
 
-	(yy_state_ptr) = (yy_state_buf);
-	*(yy_state_ptr)++ = yy_current_state;
-
 	for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
 		{
 		register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
+		if ( yy_accept[yy_current_state] )
+			{
+			(yy_last_accepting_state) = yy_current_state;
+			(yy_last_accepting_cpos) = yy_cp;
+			}
 		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 			{
 			yy_current_state = (int) yy_def[yy_current_state];
@@ -1353,7 +1349,6 @@ static int yy_get_next_buffer (void)
 				yy_c = yy_meta[(unsigned int) yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-		*(yy_state_ptr)++ = yy_current_state;
 		}
 
 	return yy_current_state;
@@ -1367,8 +1362,14 @@ static int yy_get_next_buffer (void)
     static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state )
 {
 	register int yy_is_jam;
-    
+    	register char *yy_cp = (yy_c_buf_p);
+
 	register YY_CHAR yy_c = 1;
+	if ( yy_accept[yy_current_state] )
+		{
+		(yy_last_accepting_state) = yy_current_state;
+		(yy_last_accepting_cpos) = yy_cp;
+		}
 	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 		{
 		yy_current_state = (int) yy_def[yy_current_state];
@@ -1377,8 +1378,6 @@ static int yy_get_next_buffer (void)
 		}
 	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
 	yy_is_jam = (yy_current_state == 101);
-	if ( ! yy_is_jam )
-		*(yy_state_ptr)++ = yy_current_state;
 
 		return yy_is_jam ? 0 : yy_current_state;
 }
@@ -1827,7 +1826,7 @@ YY_BUFFER_STATE yy_scan_bytes  (yyconst char * yybytes, yy_size_t  _yybytes_len
 	YY_BUFFER_STATE b;
 	char *buf;
 	yy_size_t n;
-	int i;
+	yy_size_t i;
     
 	/* Get memory for full buffer, including space for trailing EOB's. */
 	n = _yybytes_len + 2;
@@ -1975,11 +1974,6 @@ static int yy_init_globals (void)
     (yy_init) = 0;
     (yy_start) = 0;
 
-    (yy_state_buf) = 0;
-    (yy_state_ptr) = 0;
-    (yy_full_match) = 0;
-    (yy_lp) = 0;
-
 /* Defined in main.c */
 #ifdef YY_STDINIT
     yyin = stdin;
@@ -2010,9 +2004,6 @@ int yylex_destroy  (void)
 	yyfree((yy_buffer_stack) );
 	(yy_buffer_stack) = NULL;
 
-    yyfree ( (yy_state_buf) );
-    (yy_state_buf)  = NULL;
-
     /* Reset the globals. This is important in a non-reentrant scanner so the next time
      * yylex() is called, initialization will occur. */
     yy_init_globals( );
diff --git a/Build/source/texk/web2c/web2c/web2c-lexer.c b/Build/source/texk/web2c/web2c/web2c-lexer.c
index 00d1dff0bc0..adeabdea0ee 100644
--- a/Build/source/texk/web2c/web2c/web2c-lexer.c
+++ b/Build/source/texk/web2c/web2c/web2c-lexer.c
@@ -15,7 +15,7 @@
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
 #define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 37
+#define YY_FLEX_SUBMINOR_VERSION 39
 #if YY_FLEX_SUBMINOR_VERSION > 0
 #define FLEX_BETA
 #endif
@@ -187,6 +187,13 @@ extern FILE *yyin, *yyout;
                     if ( yytext[yyl] == '\n' )\
                         --yylineno;\
             }while(0)
+    #define YY_LINENO_REWIND_TO(dst) \
+            do {\
+                const char *p;\
+                for ( p = yy_cp-1; p >= (dst); --p)\
+                    if ( *p == '\n' )\
+                        --yylineno;\
+            }while(0)
     
 /* Return all but the first "n" matched characters back to the input stream. */
 #define yyless(n) \
@@ -378,12 +385,9 @@ static void yy_fatal_error (yyconst char msg[]  );
 	yyleng = (size_t) (yy_cp - yy_bp); \
 	(yy_hold_char) = *yy_cp; \
 	*yy_cp = '\0'; \
-	if ( yyleng + (yy_more_offset) >= YYLMAX ) \
+	if ( yyleng >= YYLMAX ) \
 		YY_FATAL_ERROR( "token too large, exceeds YYLMAX" ); \
-	yy_flex_strncpy( &yytext[(yy_more_offset)], (yytext_ptr), yyleng + 1 ); \
-	yyleng += (yy_more_offset); \
-	(yy_prev_more_offset) = (yy_more_offset); \
-	(yy_more_offset) = 0; \
+	yy_flex_strncpy( yytext, (yytext_ptr), yyleng + 1 ); \
 	(yy_c_buf_p) = yy_cp;
 
 #define YY_NUM_RULES 74
@@ -395,77 +399,38 @@ struct yy_trans_info
 	flex_int32_t yy_verify;
 	flex_int32_t yy_nxt;
 	};
-static yyconst flex_int16_t yy_acclist[319] =
+static yyconst flex_int16_t yy_accept[278] =
     {   0,
-       75,   73,   74,    1,   73,   74,    1,   74,    3,   73,
-       74,   73,   74,   61,   73,   74,   62,   73,   74,   53,
-       73,   74,   51,   73,   74,   68,   73,   74,   52,   73,
-       74,   67,   73,   74,   54,   73,   74,   48,   73,   74,
-       70,   73,   74,   69,   73,   74,   57,   73,   74,   55,
-       73,   74,   58,   73,   74,   73,   74,   72,   73,   74,
-       63,   73,   74,   64,   73,   74,   71,   73,   74,   72,
-       73,   74,   72,   73,   74,   72,   73,   74,   72,   73,
-       74,   72,   73,   74,   72,   73,   74,   72,   73,   74,
-       72,   73,   74,   72,   73,   74,   72,   73,   74,   72,
-
-       73,   74,   72,   73,   74,   72,   73,   74,   72,   73,
-       74,   72,   73,   74,   72,   73,   74,   72,   73,   74,
-       72,   73,   74,   72,   73,   74,    2,   73,   74,    1,
-       50,   66,   48,   65,   59,   56,   60,   72,   72,   72,
-       72,   72,   72,   72,   72,   19,   72,   72,   72,   72,
-       72,   72,   72,   72,   27,   72,   72,   72,   72,   32,
-       72,   33,   72,   72,   72,   72,   72,   72,   41,   72,
-       72,   72,   72,   72,   49,   50,   47,   47,   12,   72,
-       72,   72,   72,   72,   72,   17,   72,   72,   72,   22,
-       72,   72,   24,   72,   72,   72,   72,   72,   72,   72,
-
-       29,   72,   72,   31,   72,   72,   72,   72,   72,   72,
-       72,   72,   72,   44,   72,   72,   50,   72,   72,   72,
-       15,   72,   72,   72,   21,   72,   72,   23,   72,   72,
-       26,   72,   72,   72,   72,   72,   72,   72,   72,   72,
-       72,   72,   72,   40,   72,   42,   72,   72,   72,   47,
-       13,   72,   14,   72,   18,   72,   16,   72,   72,   72,
-       72,   38,   39,   72,   72,   72,   28,   72,   72,   72,
-       72,   72,   72,   72,   72,   43,   72,   45,   72,   11,
-       20,   72,    5,   72,   72,   72,    4,   72,   72,   46,
-       72,   72,   72,   72,   36,   72,   37,   72,   10,    7,
-
-       72,   72,    6,   72,    1,   72,   35,   72,   25,   72,
-       72,   30,   72,   72,   34,   72,    9,    8
-    } ;
-
-static yyconst flex_int16_t yy_accept[279] =
-    {   0,
-        1,    1,    1,    2,    4,    7,    9,   12,   14,   17,
-       20,   23,   26,   29,   32,   35,   38,   41,   44,   47,
-       50,   53,   56,   58,   61,   64,   67,   70,   73,   76,
-       79,   82,   85,   88,   91,   94,   97,  100,  103,  106,
-      109,  112,  115,  118,  121,  124,  127,  130,  131,  131,
-      131,  132,  133,  133,  134,  134,  135,  136,  137,  138,
-      138,  138,  139,  140,  141,  142,  143,  144,  145,  146,
-      148,  149,  150,  151,  152,  153,  154,  155,  157,  158,
-      159,  160,  162,  164,  165,  166,  167,  168,  169,  171,
-      172,  173,  174,  175,  175,  175,  177,  178,  178,  179,
-
-      179,  179,  181,  182,  183,  184,  185,  186,  188,  189,
-      190,  192,  193,  195,  196,  197,  197,  197,  197,  198,
-      198,  199,  200,  201,  203,  204,  206,  207,  208,  209,
-      210,  211,  212,  213,  214,  216,  217,  217,  218,  218,
-      218,  218,  219,  220,  221,  223,  224,  225,  227,  228,
-      230,  231,  233,  233,  233,  233,  233,  233,  233,  233,
-      234,  234,  234,  235,  236,  237,  238,  239,  240,  241,
-      242,  243,  244,  246,  248,  249,  250,  250,  250,  251,
-      251,  251,  253,  255,  257,  259,  260,  261,  262,  262,
-      262,  262,  262,  263,  264,  264,  264,  264,  265,  266,
-
-      267,  269,  270,  271,  272,  273,  274,  275,  276,  278,
-      280,  280,  280,  281,  283,  284,  285,  286,  286,  286,
-      286,  286,  287,  288,  289,  290,  292,  293,  294,  295,
-      297,  299,  299,  300,  301,  302,  302,  302,  303,  304,
-      305,  306,  307,  309,  311,  311,  311,  312,  314,  315,
-      315,  315,  315,  317,  317,  317,  317,  317,  317,  317,
-      317,  317,  317,  317,  317,  317,  317,  317,  317,  317,
-      317,  317,  317,  317,  318,  318,  319,  319
+        0,    0,   75,   73,    1,    1,    3,   73,   61,   62,
+       53,   51,   68,   52,   67,   54,   48,   70,   69,   57,
+       55,   58,   73,   72,   63,   64,   71,   72,   72,   72,
+       72,   72,   72,   72,   72,   72,   72,   72,   72,   72,
+       72,   72,   72,   72,   72,   72,    2,    1,    0,    0,
+       50,   66,    0,   48,    0,   65,   59,   56,   60,    0,
+        0,   72,   72,   72,   72,   72,   72,   72,   72,   19,
+       72,   72,   72,   72,   72,   72,   72,   27,   72,   72,
+       72,   32,   33,   72,   72,   72,   72,   72,   41,   72,
+       72,   72,   72,    0,    0,   49,   47,    0,   47,    0,
+
+        0,   12,   72,   72,   72,   72,   72,   17,   72,   72,
+       22,   72,   24,   72,   72,    0,    0,    0,   72,    0,
+       72,   72,   72,   29,   72,   31,   72,   72,   72,   72,
+       72,   72,   72,   72,   44,   72,    0,   50,    0,    0,
+        0,   72,   72,   72,   15,   72,   72,   21,   72,   23,
+       72,   26,    0,    0,    0,    0,    0,    0,    0,   72,
+        0,    0,   72,   72,   72,   72,   72,   72,   72,   72,
+       72,   72,   40,   42,   72,   72,    0,    0,   47,    0,
+        0,   13,   14,   18,   16,   72,   72,   72,    0,    0,
+        0,    0,   38,   39,    0,    0,    0,   72,   72,   72,
+
+       28,   72,   72,   72,   72,   72,   72,   72,   43,   45,
+        0,    0,   11,   20,    5,   72,   72,    0,    0,    0,
+        0,   72,    4,   72,   72,   46,   72,   72,   72,   36,
+       37,    0,   10,    7,   72,    0,    0,   72,    6,   72,
+        1,   72,   35,   25,    0,    0,   72,   30,   72,    0,
+        0,    0,   34,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    9,    0,    8,    0
     } ;
 
 static yyconst flex_int32_t yy_ec[256] =
@@ -696,30 +661,19 @@ static yyconst flex_int32_t yy_rule_can_match_eol[75] =
     0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,     };
 
+static yy_state_type yy_last_accepting_state;
+static char *yy_last_accepting_cpos;
+
 extern int yy_flex_debug;
 int yy_flex_debug = 0;
 
-static yy_state_type *yy_state_buf=0, *yy_state_ptr=0;
-static char *yy_full_match;
-static int yy_lp;
-#define REJECT \
-{ \
-*yy_cp = (yy_hold_char); /* undo effects of setting up yytext */ \
-yy_cp = (yy_full_match); /* restore poss. backed-over text */ \
-++(yy_lp); \
-goto find_rule; \
-}
-
-static int yy_more_offset = 0;
-static int yy_prev_more_offset = 0;
-#define yymore() ((yy_more_offset) = yy_flex_strlen( yytext ))
-#define YY_NEED_STRLEN
+/* The intent behind this definition is that it'll catch
+ * any uses of REJECT which flex missed.
+ */
+#define REJECT reject_used_but_not_detected
+#define yymore() yymore_used_but_not_detected
 #define YY_MORE_ADJ 0
-#define YY_RESTORE_YY_MORE_OFFSET \
-	{ \
-	(yy_more_offset) = (yy_prev_more_offset); \
-	yyleng -= (yy_more_offset); \
-	}
+#define YY_RESTORE_YY_MORE_OFFSET
 #ifndef YYLMAX
 #define YYLMAX 8192
 #endif
@@ -755,7 +709,7 @@ yywrap (void)
   return 1;
 }
 #define YY_SKIP_YYWRAP /* not that it matters */
-#line 759 "web2c-lexer.c"
+#line 713 "web2c-lexer.c"
 
 #define INITIAL 0
 
@@ -937,10 +891,6 @@ YY_DECL
 	register char *yy_cp, *yy_bp;
 	register int yy_act;
     
-#line 53 "web2c-lexer.l"
-
-#line 943 "web2c-lexer.c"
-
 	if ( !(yy_init) )
 		{
 		(yy_init) = 1;
@@ -949,12 +899,6 @@ YY_DECL
 		YY_USER_INIT;
 #endif
 
-        /* Create the reject buffer large enough to save one state per allowed character. */
-        if ( ! (yy_state_buf) )
-            (yy_state_buf) = (yy_state_type *)yyalloc(YY_STATE_BUF_SIZE  );
-            if ( ! (yy_state_buf) )
-                YY_FATAL_ERROR( "out of dynamic memory in yylex()" );
-
 		if ( ! (yy_start) )
 			(yy_start) = 1;	/* first start state */
 
@@ -973,6 +917,11 @@ YY_DECL
 		yy_load_buffer_state( );
 		}
 
+	{
+#line 53 "web2c-lexer.l"
+
+#line 924 "web2c-lexer.c"
+
 	while ( 1 )		/* loops until end-of-file is reached */
 		{
 		yy_cp = (yy_c_buf_p);
@@ -986,14 +935,15 @@ YY_DECL
 		yy_bp = yy_cp;
 
 		yy_current_state = (yy_start);
-
-		(yy_state_ptr) = (yy_state_buf);
-		*(yy_state_ptr)++ = yy_current_state;
-
 yy_match:
 		do
 			{
-			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
+			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ;
+			if ( yy_accept[yy_current_state] )
+				{
+				(yy_last_accepting_state) = yy_current_state;
+				(yy_last_accepting_cpos) = yy_cp;
+				}
 			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 				{
 				yy_current_state = (int) yy_def[yy_current_state];
@@ -1001,36 +951,21 @@ yy_match:
 					yy_c = yy_meta[(unsigned int) yy_c];
 				}
 			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-			*(yy_state_ptr)++ = yy_current_state;
 			++yy_cp;
 			}
 		while ( yy_current_state != 277 );
+		yy_cp = (yy_last_accepting_cpos);
+		yy_current_state = (yy_last_accepting_state);
 
 yy_find_action:
-		yy_current_state = *--(yy_state_ptr);
-		(yy_lp) = yy_accept[yy_current_state];
-find_rule: /* we branch to this label when backing up */
-		for ( ; ; ) /* until we find what rule we matched */
-			{
-			if ( (yy_lp) && (yy_lp) < yy_accept[yy_current_state + 1] )
-				{
-				yy_act = yy_acclist[(yy_lp)];
-					{
-					(yy_full_match) = yy_cp;
-					break;
-					}
-				}
-			--yy_cp;
-			yy_current_state = *--(yy_state_ptr);
-			(yy_lp) = yy_accept[yy_current_state];
-			}
+		yy_act = yy_accept[yy_current_state];
 
 		YY_DO_BEFORE_ACTION;
 
 		if ( yy_act != YY_END_OF_BUFFER && yy_rule_can_match_eol[yy_act] )
 			{
-			int yyl;
-			for ( yyl = (yy_prev_more_offset); yyl < yyleng; ++yyl )
+			yy_size_t yyl;
+			for ( yyl = 0; yyl < yyleng; ++yyl )
 				if ( yytext[yyl] == '\n' )
 					   
     yylineno++;
@@ -1041,6 +976,13 @@ do_action:	/* This label is used only to access EOF actions. */
 
 		switch ( yy_act )
 	{ /* beginning of action switch */
+			case 0: /* must back up */
+			/* undo the effects of YY_DO_BEFORE_ACTION */
+			*yy_cp = (yy_hold_char);
+			yy_cp = (yy_last_accepting_cpos);
+			yy_current_state = (yy_last_accepting_state);
+			goto yy_find_action;
+
 case 1:
 /* rule 1 can match eol */
 YY_RULE_SETUP
@@ -1502,9 +1444,9 @@ YY_RULE_SETUP
 #line 230 "web2c-lexer.l"
 ECHO;
 	YY_BREAK
-#line 1506 "web2c-lexer.c"
-			case YY_STATE_EOF(INITIAL):
-				yyterminate();
+#line 1448 "web2c-lexer.c"
+case YY_STATE_EOF(INITIAL):
+	yyterminate();
 
 	case YY_END_OF_BUFFER:
 		{
@@ -1569,7 +1511,8 @@ ECHO;
 
 			else
 				{
-				yy_cp = (yy_c_buf_p);
+				yy_cp = (yy_last_accepting_cpos);
+				yy_current_state = (yy_last_accepting_state);
 				goto yy_find_action;
 				}
 			}
@@ -1633,6 +1576,7 @@ ECHO;
 			"fatal flex scanner internal error--no action found" );
 	} /* end of action switch */
 		} /* end of scanning one token */
+	} /* end of user's declarations */
 } /* end of yylex */
 
 /* yy_get_next_buffer - try to read in a new buffer
@@ -1694,8 +1638,37 @@ static int yy_get_next_buffer (void)
 		while ( num_to_read <= 0 )
 			{ /* Not enough room in the buffer - grow it. */
 
-			YY_FATAL_ERROR(
-"input buffer overflow, can't enlarge buffer because scanner uses REJECT" );
+			/* just a shorter name for the current buffer */
+			YY_BUFFER_STATE b = YY_CURRENT_BUFFER_LVALUE;
+
+			int yy_c_buf_p_offset =
+				(int) ((yy_c_buf_p) - b->yy_ch_buf);
+
+			if ( b->yy_is_our_buffer )
+				{
+				yy_size_t new_size = b->yy_buf_size * 2;
+
+				if ( new_size <= 0 )
+					b->yy_buf_size += b->yy_buf_size / 8;
+				else
+					b->yy_buf_size *= 2;
+
+				b->yy_ch_buf = (char *)
+					/* Include room in for 2 EOB chars. */
+					yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2  );
+				}
+			else
+				/* Can't grow it, we don't own it. */
+				b->yy_ch_buf = 0;
+
+			if ( ! b->yy_ch_buf )
+				YY_FATAL_ERROR(
+				"fatal error - scanner input buffer overflow" );
+
+			(yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset];
+
+			num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size -
+						number_to_move - 1;
 
 			}
 
@@ -1754,12 +1727,14 @@ static int yy_get_next_buffer (void)
     
 	yy_current_state = (yy_start);
 
-	(yy_state_ptr) = (yy_state_buf);
-	*(yy_state_ptr)++ = yy_current_state;
-
 	for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
 		{
 		register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
+		if ( yy_accept[yy_current_state] )
+			{
+			(yy_last_accepting_state) = yy_current_state;
+			(yy_last_accepting_cpos) = yy_cp;
+			}
 		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 			{
 			yy_current_state = (int) yy_def[yy_current_state];
@@ -1767,7 +1742,6 @@ static int yy_get_next_buffer (void)
 				yy_c = yy_meta[(unsigned int) yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-		*(yy_state_ptr)++ = yy_current_state;
 		}
 
 	return yy_current_state;
@@ -1781,8 +1755,14 @@ static int yy_get_next_buffer (void)
     static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state )
 {
 	register int yy_is_jam;
-    
+    	register char *yy_cp = (yy_c_buf_p);
+
 	register YY_CHAR yy_c = 1;
+	if ( yy_accept[yy_current_state] )
+		{
+		(yy_last_accepting_state) = yy_current_state;
+		(yy_last_accepting_cpos) = yy_cp;
+		}
 	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 		{
 		yy_current_state = (int) yy_def[yy_current_state];
@@ -1791,8 +1771,6 @@ static int yy_get_next_buffer (void)
 		}
 	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
 	yy_is_jam = (yy_current_state == 277);
-	if ( ! yy_is_jam )
-		*(yy_state_ptr)++ = yy_current_state;
 
 		return yy_is_jam ? 0 : yy_current_state;
 }
@@ -2241,7 +2219,7 @@ YY_BUFFER_STATE yy_scan_bytes  (yyconst char * yybytes, yy_size_t  _yybytes_len
 	YY_BUFFER_STATE b;
 	char *buf;
 	yy_size_t n;
-	int i;
+	yy_size_t i;
     
 	/* Get memory for full buffer, including space for trailing EOB's. */
 	n = _yybytes_len + 2;
@@ -2389,11 +2367,6 @@ static int yy_init_globals (void)
     (yy_init) = 0;
     (yy_start) = 0;
 
-    (yy_state_buf) = 0;
-    (yy_state_ptr) = 0;
-    (yy_full_match) = 0;
-    (yy_lp) = 0;
-
 /* Defined in main.c */
 #ifdef YY_STDINIT
     yyin = stdin;
@@ -2424,9 +2397,6 @@ int yylex_destroy  (void)
 	yyfree((yy_buffer_stack) );
 	(yy_buffer_stack) = NULL;
 
-    yyfree ( (yy_state_buf) );
-    (yy_state_buf)  = NULL;
-
     /* Reset the globals. This is important in a non-reentrant scanner so the next time
      * yylex() is called, initialization will occur. */
     yy_init_globals( );
diff --git a/Build/source/utils/xindy/xindy-2.4/tex2xindy/tex2xindy.c b/Build/source/utils/xindy/xindy-2.4/tex2xindy/tex2xindy.c
index d2d573336e2..7ab53a357c9 100644
--- a/Build/source/utils/xindy/xindy-2.4/tex2xindy/tex2xindy.c
+++ b/Build/source/utils/xindy/xindy-2.4/tex2xindy/tex2xindy.c
@@ -23,7 +23,7 @@
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
 #define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 37
+#define YY_FLEX_SUBMINOR_VERSION 39
 #if YY_FLEX_SUBMINOR_VERSION > 0
 #define FLEX_BETA
 #endif
@@ -182,6 +182,7 @@ extern FILE *yyin, *yyout;
 #define EOB_ACT_LAST_MATCH 2
 
     #define YY_LESS_LINENO(n)
+    #define YY_LINENO_REWIND_TO(ptr)
     
 /* Return all but the first "n" matched characters back to the input stream. */
 #define yyless(n) \
@@ -748,7 +749,7 @@ static void omega_output_utf8 ( int width )
 }
 
 
-#line 752 "tex2xindy.c"
+#line 753 "tex2xindy.c"
 
 #define INITIAL 0
 #define key 1
@@ -938,11 +939,6 @@ YY_DECL
 	register char *yy_cp, *yy_bp;
 	register int yy_act;
     
-#line 222 "tex2xindy.l"
-
-
-#line 945 "tex2xindy.c"
-
 	if ( !(yy_init) )
 		{
 		(yy_init) = 1;
@@ -969,6 +965,12 @@ YY_DECL
 		yy_load_buffer_state( );
 		}
 
+	{
+#line 222 "tex2xindy.l"
+
+
+#line 973 "tex2xindy.c"
+
 	while ( 1 )		/* loops until end-of-file is reached */
 		{
 		yy_cp = (yy_c_buf_p);
@@ -985,7 +987,7 @@ YY_DECL
 yy_match:
 		do
 			{
-			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
+			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ;
 			if ( yy_accept[yy_current_state] )
 				{
 				(yy_last_accepting_state) = yy_current_state;
@@ -1310,7 +1312,7 @@ YY_RULE_SETUP
 #line 378 "tex2xindy.l"
 ECHO;
 	YY_BREAK
-#line 1314 "tex2xindy.c"
+#line 1316 "tex2xindy.c"
 case YY_STATE_EOF(INITIAL):
 case YY_STATE_EOF(key):
 case YY_STATE_EOF(print):
@@ -1450,6 +1452,7 @@ case YY_STATE_EOF(skiplocation):
 			"fatal flex scanner internal error--no action found" );
 	} /* end of action switch */
 		} /* end of scanning one token */
+	} /* end of user's declarations */
 } /* end of yylex */
 
 /* yy_get_next_buffer - try to read in a new buffer
@@ -2083,7 +2086,7 @@ YY_BUFFER_STATE yy_scan_bytes  (yyconst char * yybytes, yy_size_t  _yybytes_len
 	YY_BUFFER_STATE b;
 	char *buf;
 	yy_size_t n;
-	int i;
+	yy_size_t i;
     
 	/* Get memory for full buffer, including space for trailing EOB's. */
 	n = _yybytes_len + 2;
@@ -2479,3 +2482,4 @@ int yywrap (void)
   Revision 1.1  1996/06/24  08:53:57  kehr
   Initial checkin of the Makefile, README and tex2xindy.
 */
+