flex 2.6.0

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

1 files changed, 228 insertions, 199 deletions

diff --git a/Build/source/texk/detex/detex-src/detex.c b/Build/source/texk/detex/detex-src/detex.c
index 464e3cc4324..171d81ac926 100644
--- a/Build/source/texk/detex/detex-src/detex.c
+++ b/Build/source/texk/detex/detex-src/detex.c
@@ -1,4 +1,4 @@
-#line 4 "detex.l"
+#line 4 "../../../texk/detex/detex-src/detex.l"
 #ifndef lint
 static char	rcsid[] = "$Header: /p/src/local/bin/detex/RCS/detex.l,v 2.22 2007/03/01 20:22:01 trinkle Exp trinkle $";
 #endif
@@ -90,7 +90,7 @@ static char	rcsid[] = "$Header: /p/src/local/bin/detex/RCS/detex.l,v 2.22 2007/0
 
 
 
-#line 94 "detex.c"
+#line 94 "../../../texk/detex/detex-src/detex.c"
 
 #define  YY_INT_ALIGNED short int
 
@@ -98,8 +98,8 @@ 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 39
+#define YY_FLEX_MINOR_VERSION 6
+#define YY_FLEX_SUBMINOR_VERSION 0
 #if YY_FLEX_SUBMINOR_VERSION > 0
 #define FLEX_BETA
 #endif
@@ -232,7 +232,15 @@ typedef unsigned int flex_uint32_t;
 
 /* Size of default input buffer. */
 #ifndef YY_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k.
+ * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
+ * Ditto for the __ia64__ case accordingly.
+ */
+#define YY_BUF_SIZE 32768
+#else
 #define YY_BUF_SIZE 16384
+#endif /* __ia64__ */
 #endif
 
 /* The state buf must be large enough to hold one state per character in the main buffer.
@@ -435,11 +443,17 @@ extern int yylineno;
 int yylineno = 1;
 
 extern char *yytext;
+#ifdef yytext_ptr
+#undef yytext_ptr
+#endif
 #define yytext_ptr yytext
 
 static yy_state_type yy_get_previous_state (void );
 static yy_state_type yy_try_NUL_trans (yy_state_type current_state  );
 static int yy_get_next_buffer (void );
+#if defined(__GNUC__) && __GNUC__ >= 3
+__attribute__((__noreturn__))
+#endif
 static void yy_fatal_error (yyconst char msg[]  );
 
 /* Done after the current pattern has been matched and before the
@@ -582,7 +596,7 @@ static yyconst flex_int16_t yy_accept[1067] =
         0,    0,    0,    0,    0,    0
     } ;
 
-static yyconst flex_int32_t yy_ec[256] =
+static yyconst YY_CHAR yy_ec[256] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -614,7 +628,7 @@ static yyconst flex_int32_t yy_ec[256] =
         1,    1,    1,    1,    1
     } ;
 
-static yyconst flex_int32_t yy_meta[57] =
+static yyconst YY_CHAR yy_meta[57] =
     {   0,
         1,    2,    3,    2,    1,    1,    1,    4,    1,    1,
         1,    1,    5,    6,    1,    6,    6,    6,    7,    8,
@@ -624,7 +638,7 @@ static yyconst flex_int32_t yy_meta[57] =
         8,    8,   11,    1,   12,    1
     } ;
 
-static yyconst flex_int16_t yy_base[1116] =
+static yyconst flex_uint16_t yy_base[1116] =
     {   0,
         0,    0,    0,    1,    2,    3,    8,   11,   14,   23,
        16,   17,   78,    0,  134,    0,  190,    0,    4,   25,
@@ -878,7 +892,7 @@ static yyconst flex_int16_t yy_def[1116] =
      1066, 1066, 1066, 1066, 1066
     } ;
 
-static yyconst flex_int16_t yy_nxt[2970] =
+static yyconst flex_uint16_t yy_nxt[2970] =
     {   0,
      1066, 1066,   46,   46,   49,   49,   84,   50,   50,   52,
        53,   52,   52,   53,   52,   56,   57,   56,   59,   59,
@@ -1552,9 +1566,9 @@ int yy_flex_debug = 0;
 #define YY_MORE_ADJ 0
 #define YY_RESTORE_YY_MORE_OFFSET
 char *yytext;
-#line 1 "detex.l"
+#line 1 "../../../texk/detex/detex-src/detex.l"
 
-#line 95 "detex.l"
+#line 95 "../../../texk/detex/detex-src/detex.l"
 #undef IGNORE
 
 #define	LaBEGIN		if (fLatex) BEGIN
@@ -1627,7 +1641,7 @@ int             csb = 0;		 /* depth of flex context stack */
 
  
 
-#line 1631 "detex.c"
+#line 1645 "../../../texk/detex/detex-src/detex.c"
 
 #define INITIAL 0
 #define Define 1
@@ -1680,11 +1694,11 @@ void yyset_extra (YY_EXTRA_TYPE user_defined  );
 
 FILE *yyget_in (void );
 
-void yyset_in  (FILE * in_str  );
+void yyset_in  (FILE * _in_str  );
 
 FILE *yyget_out (void );
 
-void yyset_out  (FILE * out_str  );
+void yyset_out  (FILE * _out_str  );
 
 yy_size_t yyget_leng (void );
 
@@ -1692,7 +1706,7 @@ char *yyget_text (void );
 
 int yyget_lineno (void );
 
-void yyset_lineno (int line_number  );
+void yyset_lineno (int _line_number  );
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -1706,8 +1720,12 @@ extern int yywrap (void );
 #endif
 #endif
 
+#ifndef YY_NO_UNPUT
+    
     static void yyunput (int c,char *buf_ptr  );
     
+#endif
+
 #ifndef yytext_ptr
 static void yy_flex_strncpy (char *,yyconst char *,int );
 #endif
@@ -1728,7 +1746,12 @@ static int input (void );
 
 /* Amount of stuff to slurp up with each read. */
 #ifndef YY_READ_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k */
+#define YY_READ_BUF_SIZE 16384
+#else
 #define YY_READ_BUF_SIZE 8192
+#endif /* __ia64__ */
 #endif
 
 /* Copy whatever the last rule matched to the standard output. */
@@ -1815,7 +1838,7 @@ extern int yylex (void);
 
 /* Code executed at the end of each rule. */
 #ifndef YY_BREAK
-#define YY_BREAK break;
+#define YY_BREAK /*LINTED*/break;
 #endif
 
 #define YY_RULE_SETUP \
@@ -1825,9 +1848,9 @@ extern int yylex (void);
  */
 YY_DECL
 {
-	register yy_state_type yy_current_state;
-	register char *yy_cp, *yy_bp;
-	register int yy_act;
+	yy_state_type yy_current_state;
+	char *yy_cp, *yy_bp;
+	int yy_act;
     
 	if ( !(yy_init) )
 		{
@@ -1856,11 +1879,11 @@ YY_DECL
 		}
 
 	{
-#line 182 "detex.l"
+#line 182 "../../../texk/detex/detex-src/detex.l"
 
-#line 1862 "detex.c"
+#line 1885 "../../../texk/detex/detex-src/detex.c"
 
-	while ( 1 )		/* loops until end-of-file is reached */
+	while ( /*CONSTCOND*/1 )		/* loops until end-of-file is reached */
 		{
 		yy_cp = (yy_c_buf_p);
 
@@ -1876,7 +1899,7 @@ YY_DECL
 yy_match:
 		do
 			{
-			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ;
+			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;
@@ -1913,24 +1936,24 @@ do_action:	/* This label is used only to access EOF actions. */
 
 case 1:
 YY_RULE_SETUP
-#line 183 "detex.l"
+#line 183 "../../../texk/detex/detex-src/detex.l"
 /* ignore comments */	;
 	YY_BREAK
 case 2:
 /* rule 2 can match eol */
 YY_RULE_SETUP
-#line 185 "detex.l"
+#line 185 "../../../texk/detex/detex-src/detex.l"
 {LATEX; IGNORE;}
 	YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 187 "detex.l"
+#line 187 "../../../texk/detex/detex-src/detex.l"
 /* environment start */	{LaBEGIN LaBegin; IGNORE;}
 	YY_BREAK
 case 4:
 /* rule 4 can match eol */
 YY_RULE_SETUP
-#line 189 "detex.l"
+#line 189 "../../../texk/detex/detex-src/detex.l"
 {   if (BeginEnv("verbatim"))
 							BEGIN LaEnv;
 						    else
@@ -1941,24 +1964,24 @@ YY_RULE_SETUP
 case 5:
 /* rule 5 can match eol */
 YY_RULE_SETUP
-#line 196 "detex.l"
+#line 196 "../../../texk/detex/detex-src/detex.l"
 /* verbatim mode */	{BEGIN Normal; IGNORE;}
 	YY_BREAK
 case 6:
 /* rule 6 can match eol */
 YY_RULE_SETUP
-#line 197 "detex.l"
+#line 197 "../../../texk/detex/detex-src/detex.l"
 ECHO;
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 198 "detex.l"
+#line 198 "../../../texk/detex/detex-src/detex.l"
 ECHO;
 	YY_BREAK
 case 8:
 /* rule 8 can match eol */
 YY_RULE_SETUP
-#line 200 "detex.l"
+#line 200 "../../../texk/detex/detex-src/detex.l"
 { KILLARGS(1);
 						  if (BeginEnv("minpage"))
 							BEGIN LaEnv;
@@ -1969,7 +1992,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 208 "detex.l"
+#line 208 "../../../texk/detex/detex-src/detex.l"
 {   if (BeginEnv(yytext))
 							BEGIN LaEnv;
 						    else
@@ -1980,33 +2003,33 @@ YY_RULE_SETUP
 case 10:
 /* rule 10 can match eol */
 YY_RULE_SETUP
-#line 214 "detex.l"
+#line 214 "../../../texk/detex/detex-src/detex.l"
 NEWLINE;
 	YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 215 "detex.l"
+#line 215 "../../../texk/detex/detex-src/detex.l"
 ;
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 217 "detex.l"
+#line 217 "../../../texk/detex/detex-src/detex.l"
 /* absorb some environments */	{LaBEGIN LaEnd; IGNORE;}
 	YY_BREAK
 case 13:
 /* rule 13 can match eol */
 YY_RULE_SETUP
-#line 218 "detex.l"
+#line 218 "../../../texk/detex/detex-src/detex.l"
 NEWLINE;
 	YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 219 "detex.l"
+#line 219 "../../../texk/detex/detex-src/detex.l"
 ;
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 221 "detex.l"
+#line 221 "../../../texk/detex/detex-src/detex.l"
 /* end environment */	{   if (EndEnv(yytext))
 							BEGIN Normal;
 						    IGNORE;
@@ -2014,301 +2037,301 @@ YY_RULE_SETUP
 	YY_BREAK
 case 16:
 YY_RULE_SETUP
-#line 225 "detex.l"
+#line 225 "../../../texk/detex/detex-src/detex.l"
 {BEGIN LaEnv; IGNORE;}
 	YY_BREAK
 case 17:
 /* rule 17 can match eol */
 YY_RULE_SETUP
-#line 226 "detex.l"
+#line 226 "../../../texk/detex/detex-src/detex.l"
 NEWLINE;
 	YY_BREAK
 case 18:
 YY_RULE_SETUP
-#line 227 "detex.l"
+#line 227 "../../../texk/detex/detex-src/detex.l"
 ;
 	YY_BREAK
 case 19:
 /* rule 19 can match eol */
 YY_RULE_SETUP
-#line 229 "detex.l"
+#line 229 "../../../texk/detex/detex-src/detex.l"
 ;
 	YY_BREAK
 case 20:
 /* rule 20 can match eol */
 YY_RULE_SETUP
-#line 230 "detex.l"
+#line 230 "../../../texk/detex/detex-src/detex.l"
 ;
 	YY_BREAK
 case 21:
 /* rule 21 can match eol */
 YY_RULE_SETUP
-#line 231 "detex.l"
+#line 231 "../../../texk/detex/detex-src/detex.l"
 ;
 	YY_BREAK
 case 22:
 /* rule 22 can match eol */
 YY_RULE_SETUP
-#line 232 "detex.l"
+#line 232 "../../../texk/detex/detex-src/detex.l"
 ;
 	YY_BREAK
 case 23:
 /* rule 23 can match eol */
 YY_RULE_SETUP
-#line 233 "detex.l"
+#line 233 "../../../texk/detex/detex-src/detex.l"
 ;
 	YY_BREAK
 case 24:
 /* rule 24 can match eol */
 YY_RULE_SETUP
-#line 234 "detex.l"
+#line 234 "../../../texk/detex/detex-src/detex.l"
 ;
 	YY_BREAK
 case 25:
 YY_RULE_SETUP
-#line 236 "detex.l"
+#line 236 "../../../texk/detex/detex-src/detex.l"
 { KILLARGS(1); }
 	YY_BREAK
 case 26:
 YY_RULE_SETUP
-#line 237 "detex.l"
+#line 237 "../../../texk/detex/detex-src/detex.l"
 { KILLARGS(2); }
 	YY_BREAK
 case 27:
 YY_RULE_SETUP
-#line 238 "detex.l"
+#line 238 "../../../texk/detex/detex-src/detex.l"
 { KILLARGS(2); }
 	YY_BREAK
 case 28:
 YY_RULE_SETUP
-#line 239 "detex.l"
+#line 239 "../../../texk/detex/detex-src/detex.l"
 { KILLARGS(2); }
 	YY_BREAK
 case 29:
 YY_RULE_SETUP
-#line 240 "detex.l"
+#line 240 "../../../texk/detex/detex-src/detex.l"
 { KILLARGS(2); }
 	YY_BREAK
 case 30:
 YY_RULE_SETUP
-#line 241 "detex.l"
+#line 241 "../../../texk/detex/detex-src/detex.l"
 { KILLARGS(2); }
 	YY_BREAK
 case 31:
 YY_RULE_SETUP
-#line 242 "detex.l"
+#line 242 "../../../texk/detex/detex-src/detex.l"
 { KILLARGS(1); }
 	YY_BREAK
 case 32:
 YY_RULE_SETUP
-#line 243 "detex.l"
+#line 243 "../../../texk/detex/detex-src/detex.l"
 { KILLARGS(1); }
 	YY_BREAK
 case 33:
 YY_RULE_SETUP
-#line 244 "detex.l"
+#line 244 "../../../texk/detex/detex-src/detex.l"
 { KILLARGS(2); }
 	YY_BREAK
 case 34:
 YY_RULE_SETUP
-#line 245 "detex.l"
+#line 245 "../../../texk/detex/detex-src/detex.l"
 { KILLARGS(1); }
 	YY_BREAK
 case 35:
 YY_RULE_SETUP
-#line 246 "detex.l"
+#line 246 "../../../texk/detex/detex-src/detex.l"
 { STRIPARGS(2); }
 	YY_BREAK
 case 36:
 YY_RULE_SETUP
-#line 247 "detex.l"
+#line 247 "../../../texk/detex/detex-src/detex.l"
 { KILLARGS(1); }
 	YY_BREAK
 case 37:
 YY_RULE_SETUP
-#line 248 "detex.l"
+#line 248 "../../../texk/detex/detex-src/detex.l"
 { STRIPARGS(2); }
 	YY_BREAK
 case 38:
 YY_RULE_SETUP
-#line 249 "detex.l"
+#line 249 "../../../texk/detex/detex-src/detex.l"
 { KILLARGS(2); }
 	YY_BREAK
 case 39:
 YY_RULE_SETUP
-#line 250 "detex.l"
+#line 250 "../../../texk/detex/detex-src/detex.l"
 ;
 	YY_BREAK
 case 40:
 YY_RULE_SETUP
-#line 251 "detex.l"
+#line 251 "../../../texk/detex/detex-src/detex.l"
 { KILLARGS(1); }
 	YY_BREAK
 case 41:
 /* rule 41 can match eol */
 YY_RULE_SETUP
-#line 252 "detex.l"
+#line 252 "../../../texk/detex/detex-src/detex.l"
 { LaBEGIN LaPicture; }
 	YY_BREAK
 case 42:
 YY_RULE_SETUP
-#line 254 "detex.l"
+#line 254 "../../../texk/detex/detex-src/detex.l"
 ;
 	YY_BREAK
 case 43:
 /* rule 43 can match eol */
 YY_RULE_SETUP
-#line 255 "detex.l"
+#line 255 "../../../texk/detex/detex-src/detex.l"
 { printf("<Picture %s>", yytext); }
 	YY_BREAK
 case 44:
 YY_RULE_SETUP
-#line 256 "detex.l"
+#line 256 "../../../texk/detex/detex-src/detex.l"
 BEGIN Normal;
 	YY_BREAK
 case 45:
 YY_RULE_SETUP
-#line 258 "detex.l"
+#line 258 "../../../texk/detex/detex-src/detex.l"
 { KILLARGS(3); }
 	YY_BREAK
 case 46:
 YY_RULE_SETUP
-#line 259 "detex.l"
+#line 259 "../../../texk/detex/detex-src/detex.l"
 { KILLARGS(1); }
 	YY_BREAK
 case 47:
 YY_RULE_SETUP
-#line 260 "detex.l"
+#line 260 "../../../texk/detex/detex-src/detex.l"
 { KILLARGS(2); }
 	YY_BREAK
 case 48:
 YY_RULE_SETUP
-#line 261 "detex.l"
+#line 261 "../../../texk/detex/detex-src/detex.l"
 { KILLARGS(2); }
 	YY_BREAK
 case 49:
 YY_RULE_SETUP
-#line 262 "detex.l"
+#line 262 "../../../texk/detex/detex-src/detex.l"
 { KILLARGS(3); }
 	YY_BREAK
 case 50:
 YY_RULE_SETUP
-#line 263 "detex.l"
+#line 263 "../../../texk/detex/detex-src/detex.l"
 { KILLARGS(1); }
 	YY_BREAK
 case 51:
 YY_RULE_SETUP
-#line 264 "detex.l"
+#line 264 "../../../texk/detex/detex-src/detex.l"
 { STRIPARGS(1); }
 	YY_BREAK
 case 52:
 YY_RULE_SETUP
-#line 266 "detex.l"
+#line 266 "../../../texk/detex/detex-src/detex.l"
 ;
 	YY_BREAK
 case 53:
 YY_RULE_SETUP
-#line 267 "detex.l"
+#line 267 "../../../texk/detex/detex-src/detex.l"
 ;
 	YY_BREAK
 case 54:
 YY_RULE_SETUP
-#line 268 "detex.l"
+#line 268 "../../../texk/detex/detex-src/detex.l"
 ;
 	YY_BREAK
 case 55:
 YY_RULE_SETUP
-#line 269 "detex.l"
+#line 269 "../../../texk/detex/detex-src/detex.l"
 ;
 	YY_BREAK
 case 56:
 YY_RULE_SETUP
-#line 270 "detex.l"
+#line 270 "../../../texk/detex/detex-src/detex.l"
 ;
 	YY_BREAK
 case 57:
 YY_RULE_SETUP
-#line 271 "detex.l"
+#line 271 "../../../texk/detex/detex-src/detex.l"
 ;
 	YY_BREAK
 case 58:
 YY_RULE_SETUP
-#line 273 "detex.l"
+#line 273 "../../../texk/detex/detex-src/detex.l"
 /* ignore args  */	{KILLARGS(1); IGNORE;}
 	YY_BREAK
 case 59:
 YY_RULE_SETUP
-#line 274 "detex.l"
+#line 274 "../../../texk/detex/detex-src/detex.l"
 /* of these \cs */	{KILLARGS(1); IGNORE;}
 	YY_BREAK
 case 60:
 YY_RULE_SETUP
-#line 275 "detex.l"
+#line 275 "../../../texk/detex/detex-src/detex.l"
 {KILLARGS(1); IGNORE;}
 	YY_BREAK
 case 61:
 YY_RULE_SETUP
-#line 276 "detex.l"
+#line 276 "../../../texk/detex/detex-src/detex.l"
 {CITE(1); IGNORE;}
 	YY_BREAK
 case 62:
 YY_RULE_SETUP
-#line 277 "detex.l"
+#line 277 "../../../texk/detex/detex-src/detex.l"
 {LATEX; KILLARGS(1); IGNORE;}
 	YY_BREAK
 case 63:
 YY_RULE_SETUP
-#line 278 "detex.l"
+#line 278 "../../../texk/detex/detex-src/detex.l"
 {LATEX; KILLARGS(1); IGNORE;}
 	YY_BREAK
 case 64:
 YY_RULE_SETUP
-#line 279 "detex.l"
+#line 279 "../../../texk/detex/detex-src/detex.l"
 {KILLARGS(1); IGNORE;}
 	YY_BREAK
 case 65:
 YY_RULE_SETUP
-#line 280 "detex.l"
+#line 280 "../../../texk/detex/detex-src/detex.l"
 {KILLARGS(1); IGNORE;}
 	YY_BREAK
 case 66:
 YY_RULE_SETUP
-#line 281 "detex.l"
+#line 281 "../../../texk/detex/detex-src/detex.l"
 {KILLARGS(1); SPACE;}
 	YY_BREAK
 case 67:
 YY_RULE_SETUP
-#line 282 "detex.l"
+#line 282 "../../../texk/detex/detex-src/detex.l"
 {KILLARGS(1); SPACE;}
 	YY_BREAK
 case 68:
 YY_RULE_SETUP
-#line 283 "detex.l"
+#line 283 "../../../texk/detex/detex-src/detex.l"
 {KILLARGS(1); IGNORE;}
 	YY_BREAK
 case 69:
 YY_RULE_SETUP
-#line 284 "detex.l"
+#line 284 "../../../texk/detex/detex-src/detex.l"
 {CITE(1); IGNORE;}
 	YY_BREAK
 case 70:
 YY_RULE_SETUP
-#line 285 "detex.l"
+#line 285 "../../../texk/detex/detex-src/detex.l"
 {KILLARGS(1); IGNORE;}
 	YY_BREAK
 case 71:
 YY_RULE_SETUP
-#line 286 "detex.l"
+#line 286 "../../../texk/detex/detex-src/detex.l"
 {CITE(1); IGNORE;}
 	YY_BREAK
 case 72:
 YY_RULE_SETUP
-#line 287 "detex.l"
+#line 287 "../../../texk/detex/detex-src/detex.l"
 {KILLARGS(1); IGNORE;}
 	YY_BREAK
 case 73:
 YY_RULE_SETUP
-#line 288 "detex.l"
+#line 288 "../../../texk/detex/detex-src/detex.l"
 /* ignore \verb<ch>...<ch> */	{   if (fLatex) {
 						 	char verbchar, c;
 						 	verbchar = input();
@@ -2321,137 +2344,137 @@ YY_RULE_SETUP
 	YY_BREAK
 case 74:
 YY_RULE_SETUP
-#line 298 "detex.l"
+#line 298 "../../../texk/detex/detex-src/detex.l"
 { LATEX; KILLARGS(2); }
 	YY_BREAK
 case 75:
 YY_RULE_SETUP
-#line 299 "detex.l"
+#line 299 "../../../texk/detex/detex-src/detex.l"
 { LATEX; KILLARGS(2); }
 	YY_BREAK
 case 76:
 YY_RULE_SETUP
-#line 300 "detex.l"
+#line 300 "../../../texk/detex/detex-src/detex.l"
 { LATEX; KILLARGS(3); }
 	YY_BREAK
 case 77:
 YY_RULE_SETUP
-#line 302 "detex.l"
+#line 302 "../../../texk/detex/detex-src/detex.l"
 /* ignore def begin */	{BEGIN Define; IGNORE;}
 	YY_BREAK
 case 78:
 YY_RULE_SETUP
-#line 303 "detex.l"
+#line 303 "../../../texk/detex/detex-src/detex.l"
 BEGIN Normal;
 	YY_BREAK
 case 79:
 /* rule 79 can match eol */
 YY_RULE_SETUP
-#line 304 "detex.l"
+#line 304 "../../../texk/detex/detex-src/detex.l"
 NEWLINE;
 	YY_BREAK
 case 80:
 YY_RULE_SETUP
-#line 305 "detex.l"
+#line 305 "../../../texk/detex/detex-src/detex.l"
 ;
 	YY_BREAK
 case 81:
 YY_RULE_SETUP
-#line 307 "detex.l"
+#line 307 "../../../texk/detex/detex-src/detex.l"
 /* formula mode */	{LaBEGIN LaFormula; IGNORE;}
 	YY_BREAK
 case 82:
 YY_RULE_SETUP
-#line 308 "detex.l"
+#line 308 "../../../texk/detex/detex-src/detex.l"
 BEGIN Normal;
 	YY_BREAK
 case 83:
 /* rule 83 can match eol */
 YY_RULE_SETUP
-#line 309 "detex.l"
+#line 309 "../../../texk/detex/detex-src/detex.l"
 NEWLINE;
 	YY_BREAK
 case 84:
 YY_RULE_SETUP
-#line 310 "detex.l"
+#line 310 "../../../texk/detex/detex-src/detex.l"
 ;
 	YY_BREAK
 case 85:
 YY_RULE_SETUP
-#line 312 "detex.l"
+#line 312 "../../../texk/detex/detex-src/detex.l"
 /* display mode */	{LaBEGIN LaDisplay; IGNORE;}
 	YY_BREAK
 case 86:
 YY_RULE_SETUP
-#line 313 "detex.l"
+#line 313 "../../../texk/detex/detex-src/detex.l"
 BEGIN Normal;
 	YY_BREAK
 case 87:
 /* rule 87 can match eol */
 YY_RULE_SETUP
-#line 314 "detex.l"
+#line 314 "../../../texk/detex/detex-src/detex.l"
 NEWLINE;
 	YY_BREAK
 case 88:
 YY_RULE_SETUP
-#line 315 "detex.l"
+#line 315 "../../../texk/detex/detex-src/detex.l"
 ;
 	YY_BREAK
 case 89:
 YY_RULE_SETUP
-#line 317 "detex.l"
+#line 317 "../../../texk/detex/detex-src/detex.l"
 /* display mode */	{BEGIN Display; IGNORE;}
 	YY_BREAK
 case 90:
 YY_RULE_SETUP
-#line 318 "detex.l"
+#line 318 "../../../texk/detex/detex-src/detex.l"
 BEGIN Normal;
 	YY_BREAK
 case 91:
 /* rule 91 can match eol */
 YY_RULE_SETUP
-#line 319 "detex.l"
+#line 319 "../../../texk/detex/detex-src/detex.l"
 NEWLINE;
 	YY_BREAK
 case 92:
 YY_RULE_SETUP
-#line 320 "detex.l"
+#line 320 "../../../texk/detex/detex-src/detex.l"
 ;
 	YY_BREAK
 case 93:
 YY_RULE_SETUP
-#line 322 "detex.l"
+#line 322 "../../../texk/detex/detex-src/detex.l"
 /* math mode */		{BEGIN Math; IGNORE;}
 	YY_BREAK
 case 94:
 YY_RULE_SETUP
-#line 323 "detex.l"
+#line 323 "../../../texk/detex/detex-src/detex.l"
 BEGIN Normal;
 	YY_BREAK
 case 95:
 /* rule 95 can match eol */
 YY_RULE_SETUP
-#line 324 "detex.l"
+#line 324 "../../../texk/detex/detex-src/detex.l"
 NEWLINE;
 	YY_BREAK
 case 96:
 YY_RULE_SETUP
-#line 325 "detex.l"
+#line 325 "../../../texk/detex/detex-src/detex.l"
 ;
 	YY_BREAK
 case 97:
 YY_RULE_SETUP
-#line 326 "detex.l"
+#line 326 "../../../texk/detex/detex-src/detex.l"
 ;
 	YY_BREAK
 case 98:
 YY_RULE_SETUP
-#line 328 "detex.l"
+#line 328 "../../../texk/detex/detex-src/detex.l"
 /* process files */	{LaBEGIN LaInclude; IGNORE;}
 	YY_BREAK
 case 99:
 YY_RULE_SETUP
-#line 329 "detex.l"
+#line 329 "../../../texk/detex/detex-src/detex.l"
 {   IncludeFile(yytext);
 						    BEGIN Normal;
 						}
@@ -2459,27 +2482,27 @@ YY_RULE_SETUP
 case 100:
 /* rule 100 can match eol */
 YY_RULE_SETUP
-#line 332 "detex.l"
+#line 332 "../../../texk/detex/detex-src/detex.l"
 NEWLINE;
 	YY_BREAK
 case 101:
 YY_RULE_SETUP
-#line 333 "detex.l"
+#line 333 "../../../texk/detex/detex-src/detex.l"
 ;
 	YY_BREAK
 case 102:
 YY_RULE_SETUP
-#line 335 "detex.l"
+#line 335 "../../../texk/detex/detex-src/detex.l"
 {BEGIN IncludeOnly; IGNORE;}
 	YY_BREAK
 case 103:
 YY_RULE_SETUP
-#line 336 "detex.l"
+#line 336 "../../../texk/detex/detex-src/detex.l"
 AddInclude(yytext);
 	YY_BREAK
 case 104:
 YY_RULE_SETUP
-#line 337 "detex.l"
+#line 337 "../../../texk/detex/detex-src/detex.l"
 {   if (csbIncList == 0)
 							rgsbIncList[csbIncList++] = '\0';
 						    BEGIN Normal;
@@ -2488,22 +2511,22 @@ YY_RULE_SETUP
 case 105:
 /* rule 105 can match eol */
 YY_RULE_SETUP
-#line 341 "detex.l"
+#line 341 "../../../texk/detex/detex-src/detex.l"
 NEWLINE;
 	YY_BREAK
 case 106:
 YY_RULE_SETUP
-#line 342 "detex.l"
+#line 342 "../../../texk/detex/detex-src/detex.l"
 ;
 	YY_BREAK
 case 107:
 YY_RULE_SETUP
-#line 344 "detex.l"
+#line 344 "../../../texk/detex/detex-src/detex.l"
 {BEGIN Input; IGNORE;}
 	YY_BREAK
 case 108:
 YY_RULE_SETUP
-#line 345 "detex.l"
+#line 345 "../../../texk/detex/detex-src/detex.l"
 {   InputFile(yytext);
 						    BEGIN Normal;
 						}
@@ -2511,55 +2534,55 @@ YY_RULE_SETUP
 case 109:
 /* rule 109 can match eol */
 YY_RULE_SETUP
-#line 348 "detex.l"
+#line 348 "../../../texk/detex/detex-src/detex.l"
 NEWLINE;
 	YY_BREAK
 case 110:
 YY_RULE_SETUP
-#line 349 "detex.l"
+#line 349 "../../../texk/detex/detex-src/detex.l"
 ;
 	YY_BREAK
 case 111:
 /* rule 111 can match eol */
 YY_RULE_SETUP
-#line 351 "detex.l"
+#line 351 "../../../texk/detex/detex-src/detex.l"
 /* handle ligatures */	{(void)printf("%.2s", yytext+1);}
 	YY_BREAK
 case 112:
 /* rule 112 can match eol */
 YY_RULE_SETUP
-#line 352 "detex.l"
+#line 352 "../../../texk/detex/detex-src/detex.l"
 {(void)printf("%.1s", yytext+1);}
 	YY_BREAK
 case 113:
 YY_RULE_SETUP
-#line 353 "detex.l"
+#line 353 "../../../texk/detex/detex-src/detex.l"
 BEGIN LaBreak;
 	YY_BREAK
 case 114:
 YY_RULE_SETUP
-#line 355 "detex.l"
+#line 355 "../../../texk/detex/detex-src/detex.l"
 /* ignore other \cs */	{BEGIN Control; IGNORE;}
 	YY_BREAK
 case 115:
 YY_RULE_SETUP
-#line 356 "detex.l"
+#line 356 "../../../texk/detex/detex-src/detex.l"
 SPACE;
 	YY_BREAK
 case 116:
 /* rule 116 can match eol */
 YY_RULE_SETUP
-#line 357 "detex.l"
+#line 357 "../../../texk/detex/detex-src/detex.l"
 NEWLINE;
 	YY_BREAK
 case 117:
 YY_RULE_SETUP
-#line 358 "detex.l"
+#line 358 "../../../texk/detex/detex-src/detex.l"
 IGNORE;
 	YY_BREAK
 case 118:
 YY_RULE_SETUP
-#line 359 "detex.l"
+#line 359 "../../../texk/detex/detex-src/detex.l"
 {  if (yytext==NULL || strlen(yytext)==0
 							|| atoi(yytext)==4)
 							NEWLINE;
@@ -2568,48 +2591,48 @@ YY_RULE_SETUP
 	YY_BREAK
 case 119:
 YY_RULE_SETUP
-#line 365 "detex.l"
+#line 365 "../../../texk/detex/detex-src/detex.l"
 IGNORE;
 	YY_BREAK
 case 120:
 YY_RULE_SETUP
-#line 366 "detex.l"
+#line 366 "../../../texk/detex/detex-src/detex.l"
 IGNORE;
 	YY_BREAK
 case 121:
 /* rule 121 can match eol */
 YY_RULE_SETUP
-#line 367 "detex.l"
+#line 367 "../../../texk/detex/detex-src/detex.l"
 {BEGIN Normal; NEWLINE;}
 	YY_BREAK
 case 122:
 YY_RULE_SETUP
-#line 368 "detex.l"
+#line 368 "../../../texk/detex/detex-src/detex.l"
 {BEGIN Normal; IGNORE;}
 	YY_BREAK
 case 123:
 YY_RULE_SETUP
-#line 369 "detex.l"
+#line 369 "../../../texk/detex/detex-src/detex.l"
 {yyless(0);BEGIN Normal;}
 	YY_BREAK
 case 124:
 YY_RULE_SETUP
-#line 371 "detex.l"
+#line 371 "../../../texk/detex/detex-src/detex.l"
 /* special characters */	IGNORE;
 	YY_BREAK
 case 125:
 YY_RULE_SETUP
-#line 372 "detex.l"
+#line 372 "../../../texk/detex/detex-src/detex.l"
 IGNORE;
 	YY_BREAK
 case 126:
 YY_RULE_SETUP
-#line 373 "detex.l"
+#line 373 "../../../texk/detex/detex-src/detex.l"
 SPACE;
 	YY_BREAK
 case 127:
 YY_RULE_SETUP
-#line 375 "detex.l"
+#line 375 "../../../texk/detex/detex-src/detex.l"
 {   if (fWord)
 							(void)printf("%s\n", yytext);
 						    else
@@ -2618,28 +2641,28 @@ YY_RULE_SETUP
 	YY_BREAK
 case 128:
 YY_RULE_SETUP
-#line 380 "detex.l"
+#line 380 "../../../texk/detex/detex-src/detex.l"
 if (!fWord) ECHO;
 	YY_BREAK
 case 129:
 /* rule 129 can match eol */
 YY_RULE_SETUP
-#line 381 "detex.l"
+#line 381 "../../../texk/detex/detex-src/detex.l"
 if (!fWord) ECHO;
 	YY_BREAK
 case 130:
 YY_RULE_SETUP
-#line 383 "detex.l"
+#line 383 "../../../texk/detex/detex-src/detex.l"
 { BEGIN LaOptArg; }
 	YY_BREAK
 case 131:
 YY_RULE_SETUP
-#line 384 "detex.l"
+#line 384 "../../../texk/detex/detex-src/detex.l"
 { cOpenBrace++; }
 	YY_BREAK
 case 132:
 YY_RULE_SETUP
-#line 385 "detex.l"
+#line 385 "../../../texk/detex/detex-src/detex.l"
 {   cOpenBrace--;
 						    if (cOpenBrace == 0)
 						    {
@@ -2650,28 +2673,28 @@ YY_RULE_SETUP
 	YY_BREAK
 case 133:
 YY_RULE_SETUP
-#line 392 "detex.l"
+#line 392 "../../../texk/detex/detex-src/detex.l"
 ;
 	YY_BREAK
 case 134:
 YY_RULE_SETUP
-#line 393 "detex.l"
+#line 393 "../../../texk/detex/detex-src/detex.l"
 BEGIN LaMacro;	
 	YY_BREAK
 case 135:
 /* rule 135 can match eol */
 YY_RULE_SETUP
-#line 394 "detex.l"
+#line 394 "../../../texk/detex/detex-src/detex.l"
 ;
 	YY_BREAK
 case 136:
 YY_RULE_SETUP
-#line 396 "detex.l"
+#line 396 "../../../texk/detex/detex-src/detex.l"
 { BEGIN LaOptArg2; }
 	YY_BREAK
 case 137:
 YY_RULE_SETUP
-#line 397 "detex.l"
+#line 397 "../../../texk/detex/detex-src/detex.l"
 { if (cOpenBrace == 0)
 						    {
 							if (--cArgs==0)
@@ -2685,30 +2708,30 @@ YY_RULE_SETUP
 	YY_BREAK
 case 138:
 YY_RULE_SETUP
-#line 407 "detex.l"
+#line 407 "../../../texk/detex/detex-src/detex.l"
 {   cOpenBrace--; }
 	YY_BREAK
 case 139:
 YY_RULE_SETUP
-#line 408 "detex.l"
+#line 408 "../../../texk/detex/detex-src/detex.l"
 ;
 	YY_BREAK
 case 140:
 YY_RULE_SETUP
-#line 409 "detex.l"
+#line 409 "../../../texk/detex/detex-src/detex.l"
 BEGIN LaMacro2;	
 	YY_BREAK
 case 141:
 YY_RULE_SETUP
-#line 410 "detex.l"
+#line 410 "../../../texk/detex/detex-src/detex.l"
 ;
 	YY_BREAK
 case 142:
 YY_RULE_SETUP
-#line 411 "detex.l"
+#line 411 "../../../texk/detex/detex-src/detex.l"
 ECHO;
 	YY_BREAK
-#line 2712 "detex.c"
+#line 2735 "../../../texk/detex/detex-src/detex.c"
 case YY_STATE_EOF(INITIAL):
 case YY_STATE_EOF(Define):
 case YY_STATE_EOF(Display):
@@ -2872,9 +2895,9 @@ case YY_STATE_EOF(LaPicture):
  */
 static int yy_get_next_buffer (void)
 {
-    	register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
-	register char *source = (yytext_ptr);
-	register int number_to_move, i;
+    	char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
+	char *source = (yytext_ptr);
+	yy_size_t number_to_move, i;
 	int ret_val;
 
 	if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
@@ -2903,7 +2926,7 @@ static int yy_get_next_buffer (void)
 	/* Try to read more data. */
 
 	/* First move last chars to start of buffer. */
-	number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1;
+	number_to_move = (yy_size_t) ((yy_c_buf_p) - (yytext_ptr)) - 1;
 
 	for ( i = 0; i < number_to_move; ++i )
 		*(dest++) = *(source++);
@@ -3006,14 +3029,14 @@ static int yy_get_next_buffer (void)
 
     static yy_state_type yy_get_previous_state (void)
 {
-	register yy_state_type yy_current_state;
-	register char *yy_cp;
+	yy_state_type yy_current_state;
+	char *yy_cp;
     
 	yy_current_state = (yy_start);
 
 	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);
+		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;
@@ -3038,10 +3061,10 @@ 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);
+	int yy_is_jam;
+    	char *yy_cp = (yy_c_buf_p);
 
-	register YY_CHAR yy_c = 1;
+	YY_CHAR yy_c = 1;
 	if ( yy_accept[yy_current_state] )
 		{
 		(yy_last_accepting_state) = yy_current_state;
@@ -3059,9 +3082,11 @@ static int yy_get_next_buffer (void)
 		return yy_is_jam ? 0 : yy_current_state;
 }
 
-    static void yyunput (int c, register char * yy_bp )
+#ifndef YY_NO_UNPUT
+
+    static void yyunput (int c, char * yy_bp )
 {
-	register char *yy_cp;
+	char *yy_cp;
     
     yy_cp = (yy_c_buf_p);
 
@@ -3071,10 +3096,10 @@ static int yy_get_next_buffer (void)
 	if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
 		{ /* need to shift things up to make room */
 		/* +2 for EOB chars. */
-		register yy_size_t number_to_move = (yy_n_chars) + 2;
-		register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[
+		yy_size_t number_to_move = (yy_n_chars) + 2;
+		char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[
 					YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2];
-		register char *source =
+		char *source =
 				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move];
 
 		while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
@@ -3096,6 +3121,8 @@ static int yy_get_next_buffer (void)
 	(yy_c_buf_p) = yy_cp;
 }
 
+#endif
+
 #ifndef YY_NO_INPUT
 #ifdef __cplusplus
     static int yyinput (void)
@@ -3245,7 +3272,7 @@ static void yy_load_buffer_state  (void)
 	if ( ! b )
 		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
 
-	b->yy_buf_size = size;
+	b->yy_buf_size = (yy_size_t)size;
 
 	/* yy_ch_buf has to be 2 characters longer than the size given because
 	 * we need to put in 2 end-of-buffer characters.
@@ -3400,7 +3427,7 @@ static void yyensure_buffer_stack (void)
 		 * scanner will even need a stack. We use 2 instead of 1 to avoid an
 		 * immediate realloc on the next call.
          */
-		num_to_alloc = 1;
+		num_to_alloc = 1; // After all that talk, this was set to 1 anyways...
 		(yy_buffer_stack) = (struct yy_buffer_state**)yyalloc
 								(num_to_alloc * sizeof(struct yy_buffer_state*)
 								);
@@ -3417,7 +3444,7 @@ static void yyensure_buffer_stack (void)
 	if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){
 
 		/* Increase the buffer to prepare for a possible push. */
-		int grow_size = 8 /* arbitrary grow size */;
+		yy_size_t grow_size = 8 /* arbitrary grow size */;
 
 		num_to_alloc = (yy_buffer_stack_max) + grow_size;
 		(yy_buffer_stack) = (struct yy_buffer_state**)yyrealloc
@@ -3525,7 +3552,7 @@ YY_BUFFER_STATE yy_scan_bytes  (yyconst char * yybytes, yy_size_t  _yybytes_len
 
 static void yy_fatal_error (yyconst char* msg )
 {
-    	(void) fprintf( stderr, "%s\n", msg );
+			(void) fprintf( stderr, "%s\n", msg );
 	exit( YY_EXIT_FAILURE );
 }
 
@@ -3591,29 +3618,29 @@ char *yyget_text  (void)
 }
 
 /** Set the current line number.
- * @param line_number
+ * @param _line_number line number
  * 
  */
-void yyset_lineno (int  line_number )
+void yyset_lineno (int  _line_number )
 {
     
-    yylineno = line_number;
+    yylineno = _line_number;
 }
 
 /** Set the input stream. This does not discard the current
  * input buffer.
- * @param in_str A readable stream.
+ * @param _in_str A readable stream.
  * 
  * @see yy_switch_to_buffer
  */
-void yyset_in (FILE *  in_str )
+void yyset_in (FILE *  _in_str )
 {
-        yyin = in_str ;
+        yyin = _in_str ;
 }
 
-void yyset_out (FILE *  out_str )
+void yyset_out (FILE *  _out_str )
 {
-        yyout = out_str ;
+        yyout = _out_str ;
 }
 
 int yyget_debug  (void)
@@ -3621,9 +3648,9 @@ int yyget_debug  (void)
         return yy_flex_debug;
 }
 
-void yyset_debug (int  bdebug )
+void yyset_debug (int  _bdebug )
 {
-        yy_flex_debug = bdebug ;
+        yy_flex_debug = _bdebug ;
 }
 
 static int yy_init_globals (void)
@@ -3683,7 +3710,8 @@ int yylex_destroy  (void)
 #ifndef yytext_ptr
 static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
 {
-	register int i;
+		
+	int i;
 	for ( i = 0; i < n; ++i )
 		s1[i] = s2[i];
 }
@@ -3692,7 +3720,7 @@ static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
 #ifdef YY_NEED_STRLEN
 static int yy_flex_strlen (yyconst char * s )
 {
-	register int n;
+	int n;
 	for ( n = 0; s[n]; ++n )
 		;
 
@@ -3702,11 +3730,12 @@ static int yy_flex_strlen (yyconst char * s )
 
 void *yyalloc (yy_size_t  size )
 {
-	return (void *) malloc( size );
+			return (void *) malloc( size );
 }
 
 void *yyrealloc  (void * ptr, yy_size_t  size )
 {
+		
 	/* The cast to (char *) in the following accommodates both
 	 * implementations that use char* generic pointers, and those
 	 * that use void* generic pointers.  It works with the latter
@@ -3719,12 +3748,12 @@ void *yyrealloc  (void * ptr, yy_size_t  size )
 
 void yyfree (void * ptr )
 {
-	free( (char *) ptr );	/* see yyrealloc() for (char *) cast */
+			free( (char *) ptr );	/* see yyrealloc() for (char *) cast */
 }
 
 #define YYTABLES_NAME "yytables"
 
-#line 411 "detex.l"
+#line 411 "../../../texk/detex/detex-src/detex.l"
 
 
 /******