summaryrefslogtreecommitdiff
path: root/Build/source/texk
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2012-07-09 11:45:34 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2012-07-09 11:45:34 +0000
commit718691c6cb2f452c1712c2313d6ef392b84fc3c4 (patch)
tree1629cf107e223ef4e35f64e2a89bbe9317634004 /Build/source/texk
parent55fb708a622fb5376eacf0e666b2acf8331d55c6 (diff)
detex: Added the never-interactive option to prevent flex
from creating a problematic prototype for isatty() git-svn-id: svn://tug.org/texlive/trunk@26955 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk')
-rw-r--r--Build/source/texk/detex/detex-2.8-PATCHES/ChangeLog6
-rw-r--r--Build/source/texk/detex/detex-2.8-PATCHES/patch-06-never-interactive9
-rw-r--r--Build/source/texk/detex/detex-2.8/detex.l2
-rw-r--r--Build/source/texk/detex/detex.c311
4 files changed, 169 insertions, 159 deletions
diff --git a/Build/source/texk/detex/detex-2.8-PATCHES/ChangeLog b/Build/source/texk/detex/detex-2.8-PATCHES/ChangeLog
index 87557f22a81..00c9a1dad03 100644
--- a/Build/source/texk/detex/detex-2.8-PATCHES/ChangeLog
+++ b/Build/source/texk/detex/detex-2.8-PATCHES/ChangeLog
@@ -1,3 +1,9 @@
+2012-06-21 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * patch-06-never-interactive (new): Added the never-interactive
+ option to prevent flex from creating a problematic prototype for
+ isatty().
+
2011-06-07 Peter Breitenlohner <peb@mppmu.mpg.de>
* patch-05-kern-and-glue (new): Handle `\kern', allow `em/ex'
diff --git a/Build/source/texk/detex/detex-2.8-PATCHES/patch-06-never-interactive b/Build/source/texk/detex/detex-2.8-PATCHES/patch-06-never-interactive
new file mode 100644
index 00000000000..9db44ace3ed
--- /dev/null
+++ b/Build/source/texk/detex/detex-2.8-PATCHES/patch-06-never-interactive
@@ -0,0 +1,9 @@
+diff -ur detex-2.8.orig/detex.l detex-2.8/detex.l
+--- detex-2.8.orig/detex.l 2011-06-07 13:42:05.000000000 +0200
++++ detex-2.8/detex.l 2012-06-21 11:52:31.000000000 +0200
+@@ -1,3 +1,5 @@
++%option never-interactive
++
+ %{
+ #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 $";
diff --git a/Build/source/texk/detex/detex-2.8/detex.l b/Build/source/texk/detex/detex-2.8/detex.l
index 7ace6f49ac3..7b4aaa1a1de 100644
--- a/Build/source/texk/detex/detex-2.8/detex.l
+++ b/Build/source/texk/detex/detex-2.8/detex.l
@@ -1,3 +1,5 @@
+%option never-interactive
+
%{
#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 $";
diff --git a/Build/source/texk/detex/detex.c b/Build/source/texk/detex/detex.c
index 1cfa5e5bee3..a2e3020acd4 100644
--- a/Build/source/texk/detex/detex.c
+++ b/Build/source/texk/detex/detex.c
@@ -1460,7 +1460,7 @@ int yy_flex_debug = 0;
#define YY_RESTORE_YY_MORE_OFFSET
char *yytext;
#line 1 "detex.l"
-#line 2 "detex.l"
+#line 4 "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
@@ -1819,7 +1819,7 @@ YY_DECL
register char *yy_cp, *yy_bp;
register int yy_act;
-#line 173 "detex.l"
+#line 175 "detex.l"
#line 1825 "detex.c"
@@ -1880,16 +1880,12 @@ yy_match:
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
++yy_cp;
}
- while ( yy_base[yy_current_state] != 2913 );
+ while ( yy_current_state != 1066 );
+ yy_cp = (yy_last_accepting_cpos);
+ yy_current_state = (yy_last_accepting_state);
yy_find_action:
yy_act = yy_accept[yy_current_state];
- if ( yy_act == 0 )
- { /* have to back up */
- yy_cp = (yy_last_accepting_cpos);
- yy_current_state = (yy_last_accepting_state);
- yy_act = yy_accept[yy_current_state];
- }
YY_DO_BEFORE_ACTION;
@@ -1906,24 +1902,24 @@ do_action: /* This label is used only to access EOF actions. */
case 1:
YY_RULE_SETUP
-#line 174 "detex.l"
+#line 176 "detex.l"
/* ignore comments */ ;
YY_BREAK
case 2:
/* rule 2 can match eol */
YY_RULE_SETUP
-#line 176 "detex.l"
+#line 178 "detex.l"
{LATEX; IGNORE;}
YY_BREAK
case 3:
YY_RULE_SETUP
-#line 178 "detex.l"
+#line 180 "detex.l"
/* environment start */ {LaBEGIN LaBegin; IGNORE;}
YY_BREAK
case 4:
/* rule 4 can match eol */
YY_RULE_SETUP
-#line 180 "detex.l"
+#line 182 "detex.l"
{ if (BeginEnv("verbatim"))
BEGIN LaEnv;
else
@@ -1934,24 +1930,24 @@ YY_RULE_SETUP
case 5:
/* rule 5 can match eol */
YY_RULE_SETUP
-#line 187 "detex.l"
+#line 189 "detex.l"
/* verbatim mode */ {BEGIN Normal; IGNORE;}
YY_BREAK
case 6:
/* rule 6 can match eol */
YY_RULE_SETUP
-#line 188 "detex.l"
+#line 190 "detex.l"
ECHO;
YY_BREAK
case 7:
YY_RULE_SETUP
-#line 189 "detex.l"
+#line 191 "detex.l"
ECHO;
YY_BREAK
case 8:
/* rule 8 can match eol */
YY_RULE_SETUP
-#line 191 "detex.l"
+#line 193 "detex.l"
{ KILLARGS(1);
if (BeginEnv("minpage"))
BEGIN LaEnv;
@@ -1962,7 +1958,7 @@ YY_RULE_SETUP
YY_BREAK
case 9:
YY_RULE_SETUP
-#line 199 "detex.l"
+#line 201 "detex.l"
{ if (BeginEnv(yytext))
BEGIN LaEnv;
else
@@ -1973,33 +1969,33 @@ YY_RULE_SETUP
case 10:
/* rule 10 can match eol */
YY_RULE_SETUP
-#line 205 "detex.l"
+#line 207 "detex.l"
NEWLINE;
YY_BREAK
case 11:
YY_RULE_SETUP
-#line 206 "detex.l"
+#line 208 "detex.l"
;
YY_BREAK
case 12:
YY_RULE_SETUP
-#line 208 "detex.l"
+#line 210 "detex.l"
/* absorb some environments */ {LaBEGIN LaEnd; IGNORE;}
YY_BREAK
case 13:
/* rule 13 can match eol */
YY_RULE_SETUP
-#line 209 "detex.l"
+#line 211 "detex.l"
NEWLINE;
YY_BREAK
case 14:
YY_RULE_SETUP
-#line 210 "detex.l"
+#line 212 "detex.l"
;
YY_BREAK
case 15:
YY_RULE_SETUP
-#line 212 "detex.l"
+#line 214 "detex.l"
/* end environment */ { if (EndEnv(yytext))
BEGIN Normal;
IGNORE;
@@ -2007,301 +2003,301 @@ YY_RULE_SETUP
YY_BREAK
case 16:
YY_RULE_SETUP
-#line 216 "detex.l"
+#line 218 "detex.l"
{BEGIN LaEnv; IGNORE;}
YY_BREAK
case 17:
/* rule 17 can match eol */
YY_RULE_SETUP
-#line 217 "detex.l"
+#line 219 "detex.l"
NEWLINE;
YY_BREAK
case 18:
YY_RULE_SETUP
-#line 218 "detex.l"
+#line 220 "detex.l"
;
YY_BREAK
case 19:
/* rule 19 can match eol */
YY_RULE_SETUP
-#line 220 "detex.l"
+#line 222 "detex.l"
;
YY_BREAK
case 20:
/* rule 20 can match eol */
YY_RULE_SETUP
-#line 221 "detex.l"
+#line 223 "detex.l"
;
YY_BREAK
case 21:
/* rule 21 can match eol */
YY_RULE_SETUP
-#line 222 "detex.l"
+#line 224 "detex.l"
;
YY_BREAK
case 22:
/* rule 22 can match eol */
YY_RULE_SETUP
-#line 223 "detex.l"
+#line 225 "detex.l"
;
YY_BREAK
case 23:
/* rule 23 can match eol */
YY_RULE_SETUP
-#line 224 "detex.l"
+#line 226 "detex.l"
;
YY_BREAK
case 24:
/* rule 24 can match eol */
YY_RULE_SETUP
-#line 225 "detex.l"
+#line 227 "detex.l"
;
YY_BREAK
case 25:
YY_RULE_SETUP
-#line 227 "detex.l"
+#line 229 "detex.l"
{ KILLARGS(1); }
YY_BREAK
case 26:
YY_RULE_SETUP
-#line 228 "detex.l"
+#line 230 "detex.l"
{ KILLARGS(2); }
YY_BREAK
case 27:
YY_RULE_SETUP
-#line 229 "detex.l"
+#line 231 "detex.l"
{ KILLARGS(2); }
YY_BREAK
case 28:
YY_RULE_SETUP
-#line 230 "detex.l"
+#line 232 "detex.l"
{ KILLARGS(2); }
YY_BREAK
case 29:
YY_RULE_SETUP
-#line 231 "detex.l"
+#line 233 "detex.l"
{ KILLARGS(2); }
YY_BREAK
case 30:
YY_RULE_SETUP
-#line 232 "detex.l"
+#line 234 "detex.l"
{ KILLARGS(2); }
YY_BREAK
case 31:
YY_RULE_SETUP
-#line 233 "detex.l"
+#line 235 "detex.l"
{ KILLARGS(1); }
YY_BREAK
case 32:
YY_RULE_SETUP
-#line 234 "detex.l"
+#line 236 "detex.l"
{ KILLARGS(1); }
YY_BREAK
case 33:
YY_RULE_SETUP
-#line 235 "detex.l"
+#line 237 "detex.l"
{ KILLARGS(2); }
YY_BREAK
case 34:
YY_RULE_SETUP
-#line 236 "detex.l"
+#line 238 "detex.l"
{ KILLARGS(1); }
YY_BREAK
case 35:
YY_RULE_SETUP
-#line 237 "detex.l"
+#line 239 "detex.l"
{ STRIPARGS(2); }
YY_BREAK
case 36:
YY_RULE_SETUP
-#line 238 "detex.l"
+#line 240 "detex.l"
{ KILLARGS(1); }
YY_BREAK
case 37:
YY_RULE_SETUP
-#line 239 "detex.l"
+#line 241 "detex.l"
{ STRIPARGS(2); }
YY_BREAK
case 38:
YY_RULE_SETUP
-#line 240 "detex.l"
+#line 242 "detex.l"
{ KILLARGS(2); }
YY_BREAK
case 39:
YY_RULE_SETUP
-#line 241 "detex.l"
+#line 243 "detex.l"
;
YY_BREAK
case 40:
YY_RULE_SETUP
-#line 242 "detex.l"
+#line 244 "detex.l"
{ KILLARGS(1); }
YY_BREAK
case 41:
/* rule 41 can match eol */
YY_RULE_SETUP
-#line 243 "detex.l"
+#line 245 "detex.l"
{ LaBEGIN LaPicture; }
YY_BREAK
case 42:
YY_RULE_SETUP
-#line 245 "detex.l"
+#line 247 "detex.l"
;
YY_BREAK
case 43:
/* rule 43 can match eol */
YY_RULE_SETUP
-#line 246 "detex.l"
+#line 248 "detex.l"
{ printf("<Picture %s>", yytext); }
YY_BREAK
case 44:
YY_RULE_SETUP
-#line 247 "detex.l"
+#line 249 "detex.l"
BEGIN Normal;
YY_BREAK
case 45:
YY_RULE_SETUP
-#line 249 "detex.l"
+#line 251 "detex.l"
{ KILLARGS(3); }
YY_BREAK
case 46:
YY_RULE_SETUP
-#line 250 "detex.l"
+#line 252 "detex.l"
{ KILLARGS(1); }
YY_BREAK
case 47:
YY_RULE_SETUP
-#line 251 "detex.l"
+#line 253 "detex.l"
{ KILLARGS(2); }
YY_BREAK
case 48:
YY_RULE_SETUP
-#line 252 "detex.l"
+#line 254 "detex.l"
{ KILLARGS(2); }
YY_BREAK
case 49:
YY_RULE_SETUP
-#line 253 "detex.l"
+#line 255 "detex.l"
{ KILLARGS(3); }
YY_BREAK
case 50:
YY_RULE_SETUP
-#line 254 "detex.l"
+#line 256 "detex.l"
{ KILLARGS(1); }
YY_BREAK
case 51:
YY_RULE_SETUP
-#line 255 "detex.l"
+#line 257 "detex.l"
{ STRIPARGS(1); }
YY_BREAK
case 52:
YY_RULE_SETUP
-#line 257 "detex.l"
+#line 259 "detex.l"
;
YY_BREAK
case 53:
YY_RULE_SETUP
-#line 258 "detex.l"
+#line 260 "detex.l"
;
YY_BREAK
case 54:
YY_RULE_SETUP
-#line 259 "detex.l"
+#line 261 "detex.l"
;
YY_BREAK
case 55:
YY_RULE_SETUP
-#line 260 "detex.l"
+#line 262 "detex.l"
;
YY_BREAK
case 56:
YY_RULE_SETUP
-#line 261 "detex.l"
+#line 263 "detex.l"
;
YY_BREAK
case 57:
YY_RULE_SETUP
-#line 262 "detex.l"
+#line 264 "detex.l"
;
YY_BREAK
case 58:
YY_RULE_SETUP
-#line 264 "detex.l"
+#line 266 "detex.l"
/* ignore args */ {KILLARGS(1); IGNORE;}
YY_BREAK
case 59:
YY_RULE_SETUP
-#line 265 "detex.l"
+#line 267 "detex.l"
/* of these \cs */ {KILLARGS(1); IGNORE;}
YY_BREAK
case 60:
YY_RULE_SETUP
-#line 266 "detex.l"
+#line 268 "detex.l"
{KILLARGS(1); IGNORE;}
YY_BREAK
case 61:
YY_RULE_SETUP
-#line 267 "detex.l"
+#line 269 "detex.l"
{CITE(1); IGNORE;}
YY_BREAK
case 62:
YY_RULE_SETUP
-#line 268 "detex.l"
+#line 270 "detex.l"
{LATEX; KILLARGS(1); IGNORE;}
YY_BREAK
case 63:
YY_RULE_SETUP
-#line 269 "detex.l"
+#line 271 "detex.l"
{LATEX; KILLARGS(1); IGNORE;}
YY_BREAK
case 64:
YY_RULE_SETUP
-#line 270 "detex.l"
+#line 272 "detex.l"
{KILLARGS(1); IGNORE;}
YY_BREAK
case 65:
YY_RULE_SETUP
-#line 271 "detex.l"
+#line 273 "detex.l"
{KILLARGS(1); IGNORE;}
YY_BREAK
case 66:
YY_RULE_SETUP
-#line 272 "detex.l"
+#line 274 "detex.l"
{KILLARGS(1); SPACE;}
YY_BREAK
case 67:
YY_RULE_SETUP
-#line 273 "detex.l"
+#line 275 "detex.l"
{KILLARGS(1); SPACE;}
YY_BREAK
case 68:
YY_RULE_SETUP
-#line 274 "detex.l"
+#line 276 "detex.l"
{KILLARGS(1); IGNORE;}
YY_BREAK
case 69:
YY_RULE_SETUP
-#line 275 "detex.l"
+#line 277 "detex.l"
{CITE(1); IGNORE;}
YY_BREAK
case 70:
YY_RULE_SETUP
-#line 276 "detex.l"
+#line 278 "detex.l"
{KILLARGS(1); IGNORE;}
YY_BREAK
case 71:
YY_RULE_SETUP
-#line 277 "detex.l"
+#line 279 "detex.l"
{CITE(1); IGNORE;}
YY_BREAK
case 72:
YY_RULE_SETUP
-#line 278 "detex.l"
+#line 280 "detex.l"
{KILLARGS(1); IGNORE;}
YY_BREAK
case 73:
YY_RULE_SETUP
-#line 279 "detex.l"
+#line 281 "detex.l"
/* ignore \verb<ch>...<ch> */ { if (fLatex) {
char verbchar, c;
verbchar = input();
@@ -2314,137 +2310,137 @@ YY_RULE_SETUP
YY_BREAK
case 74:
YY_RULE_SETUP
-#line 289 "detex.l"
+#line 291 "detex.l"
{ LATEX; KILLARGS(2); }
YY_BREAK
case 75:
YY_RULE_SETUP
-#line 290 "detex.l"
+#line 292 "detex.l"
{ LATEX; KILLARGS(2); }
YY_BREAK
case 76:
YY_RULE_SETUP
-#line 291 "detex.l"
+#line 293 "detex.l"
{ LATEX; KILLARGS(3); }
YY_BREAK
case 77:
YY_RULE_SETUP
-#line 293 "detex.l"
+#line 295 "detex.l"
/* ignore def begin */ {BEGIN Define; IGNORE;}
YY_BREAK
case 78:
YY_RULE_SETUP
-#line 294 "detex.l"
+#line 296 "detex.l"
BEGIN Normal;
YY_BREAK
case 79:
/* rule 79 can match eol */
YY_RULE_SETUP
-#line 295 "detex.l"
+#line 297 "detex.l"
NEWLINE;
YY_BREAK
case 80:
YY_RULE_SETUP
-#line 296 "detex.l"
+#line 298 "detex.l"
;
YY_BREAK
case 81:
YY_RULE_SETUP
-#line 298 "detex.l"
+#line 300 "detex.l"
/* formula mode */ {LaBEGIN LaFormula; IGNORE;}
YY_BREAK
case 82:
YY_RULE_SETUP
-#line 299 "detex.l"
+#line 301 "detex.l"
BEGIN Normal;
YY_BREAK
case 83:
/* rule 83 can match eol */
YY_RULE_SETUP
-#line 300 "detex.l"
+#line 302 "detex.l"
NEWLINE;
YY_BREAK
case 84:
YY_RULE_SETUP
-#line 301 "detex.l"
+#line 303 "detex.l"
;
YY_BREAK
case 85:
YY_RULE_SETUP
-#line 303 "detex.l"
+#line 305 "detex.l"
/* display mode */ {LaBEGIN LaDisplay; IGNORE;}
YY_BREAK
case 86:
YY_RULE_SETUP
-#line 304 "detex.l"
+#line 306 "detex.l"
BEGIN Normal;
YY_BREAK
case 87:
/* rule 87 can match eol */
YY_RULE_SETUP
-#line 305 "detex.l"
+#line 307 "detex.l"
NEWLINE;
YY_BREAK
case 88:
YY_RULE_SETUP
-#line 306 "detex.l"
+#line 308 "detex.l"
;
YY_BREAK
case 89:
YY_RULE_SETUP
-#line 308 "detex.l"
+#line 310 "detex.l"
/* display mode */ {BEGIN Display; IGNORE;}
YY_BREAK
case 90:
YY_RULE_SETUP
-#line 309 "detex.l"
+#line 311 "detex.l"
BEGIN Normal;
YY_BREAK
case 91:
/* rule 91 can match eol */
YY_RULE_SETUP
-#line 310 "detex.l"
+#line 312 "detex.l"
NEWLINE;
YY_BREAK
case 92:
YY_RULE_SETUP
-#line 311 "detex.l"
+#line 313 "detex.l"
;
YY_BREAK
case 93:
YY_RULE_SETUP
-#line 313 "detex.l"
+#line 315 "detex.l"
/* math mode */ {BEGIN Math; IGNORE;}
YY_BREAK
case 94:
YY_RULE_SETUP
-#line 314 "detex.l"
+#line 316 "detex.l"
BEGIN Normal;
YY_BREAK
case 95:
/* rule 95 can match eol */
YY_RULE_SETUP
-#line 315 "detex.l"
+#line 317 "detex.l"
NEWLINE;
YY_BREAK
case 96:
YY_RULE_SETUP
-#line 316 "detex.l"
+#line 318 "detex.l"
;
YY_BREAK
case 97:
YY_RULE_SETUP
-#line 317 "detex.l"
+#line 319 "detex.l"
;
YY_BREAK
case 98:
YY_RULE_SETUP
-#line 319 "detex.l"
+#line 321 "detex.l"
/* process files */ {LaBEGIN LaInclude; IGNORE;}
YY_BREAK
case 99:
YY_RULE_SETUP
-#line 320 "detex.l"
+#line 322 "detex.l"
{ IncludeFile(yytext);
BEGIN Normal;
}
@@ -2452,27 +2448,27 @@ YY_RULE_SETUP
case 100:
/* rule 100 can match eol */
YY_RULE_SETUP
-#line 323 "detex.l"
+#line 325 "detex.l"
NEWLINE;
YY_BREAK
case 101:
YY_RULE_SETUP
-#line 324 "detex.l"
+#line 326 "detex.l"
;
YY_BREAK
case 102:
YY_RULE_SETUP
-#line 326 "detex.l"
+#line 328 "detex.l"
{BEGIN IncludeOnly; IGNORE;}
YY_BREAK
case 103:
YY_RULE_SETUP
-#line 327 "detex.l"
+#line 329 "detex.l"
AddInclude(yytext);
YY_BREAK
case 104:
YY_RULE_SETUP
-#line 328 "detex.l"
+#line 330 "detex.l"
{ if (csbIncList == 0)
rgsbIncList[csbIncList++] = '\0';
BEGIN Normal;
@@ -2481,22 +2477,22 @@ YY_RULE_SETUP
case 105:
/* rule 105 can match eol */
YY_RULE_SETUP
-#line 332 "detex.l"
+#line 334 "detex.l"
NEWLINE;
YY_BREAK
case 106:
YY_RULE_SETUP
-#line 333 "detex.l"
+#line 335 "detex.l"
;
YY_BREAK
case 107:
YY_RULE_SETUP
-#line 335 "detex.l"
+#line 337 "detex.l"
{BEGIN Input; IGNORE;}
YY_BREAK
case 108:
YY_RULE_SETUP
-#line 336 "detex.l"
+#line 338 "detex.l"
{ InputFile(yytext);
BEGIN Normal;
}
@@ -2504,55 +2500,55 @@ YY_RULE_SETUP
case 109:
/* rule 109 can match eol */
YY_RULE_SETUP
-#line 339 "detex.l"
+#line 341 "detex.l"
NEWLINE;
YY_BREAK
case 110:
YY_RULE_SETUP
-#line 340 "detex.l"
+#line 342 "detex.l"
;
YY_BREAK
case 111:
/* rule 111 can match eol */
YY_RULE_SETUP
-#line 342 "detex.l"
+#line 344 "detex.l"
/* handle ligatures */ {(void)printf("%.2s", yytext+1);}
YY_BREAK
case 112:
/* rule 112 can match eol */
YY_RULE_SETUP
-#line 343 "detex.l"
+#line 345 "detex.l"
{(void)printf("%.1s", yytext+1);}
YY_BREAK
case 113:
YY_RULE_SETUP
-#line 344 "detex.l"
+#line 346 "detex.l"
BEGIN LaBreak;
YY_BREAK
case 114:
YY_RULE_SETUP
-#line 346 "detex.l"
+#line 348 "detex.l"
/* ignore other \cs */ {BEGIN Control; IGNORE;}
YY_BREAK
case 115:
YY_RULE_SETUP
-#line 347 "detex.l"
+#line 349 "detex.l"
SPACE;
YY_BREAK
case 116:
/* rule 116 can match eol */
YY_RULE_SETUP
-#line 348 "detex.l"
+#line 350 "detex.l"
NEWLINE;
YY_BREAK
case 117:
YY_RULE_SETUP
-#line 349 "detex.l"
+#line 351 "detex.l"
IGNORE;
YY_BREAK
case 118:
YY_RULE_SETUP
-#line 350 "detex.l"
+#line 352 "detex.l"
{ if (yytext==NULL || strlen(yytext)==0
|| atoi(yytext)==4)
NEWLINE;
@@ -2561,48 +2557,48 @@ YY_RULE_SETUP
YY_BREAK
case 119:
YY_RULE_SETUP
-#line 356 "detex.l"
+#line 358 "detex.l"
IGNORE;
YY_BREAK
case 120:
YY_RULE_SETUP
-#line 357 "detex.l"
+#line 359 "detex.l"
IGNORE;
YY_BREAK
case 121:
/* rule 121 can match eol */
YY_RULE_SETUP
-#line 358 "detex.l"
+#line 360 "detex.l"
{BEGIN Normal; NEWLINE;}
YY_BREAK
case 122:
YY_RULE_SETUP
-#line 359 "detex.l"
+#line 361 "detex.l"
{BEGIN Normal; IGNORE;}
YY_BREAK
case 123:
YY_RULE_SETUP
-#line 360 "detex.l"
+#line 362 "detex.l"
{yyless(0);BEGIN Normal;}
YY_BREAK
case 124:
YY_RULE_SETUP
-#line 362 "detex.l"
+#line 364 "detex.l"
/* special characters */ IGNORE;
YY_BREAK
case 125:
YY_RULE_SETUP
-#line 363 "detex.l"
+#line 365 "detex.l"
IGNORE;
YY_BREAK
case 126:
YY_RULE_SETUP
-#line 364 "detex.l"
+#line 366 "detex.l"
SPACE;
YY_BREAK
case 127:
YY_RULE_SETUP
-#line 366 "detex.l"
+#line 368 "detex.l"
{ if (fWord)
(void)printf("%s\n", yytext);
else
@@ -2611,28 +2607,28 @@ YY_RULE_SETUP
YY_BREAK
case 128:
YY_RULE_SETUP
-#line 371 "detex.l"
+#line 373 "detex.l"
if (!fWord) ECHO;
YY_BREAK
case 129:
/* rule 129 can match eol */
YY_RULE_SETUP
-#line 372 "detex.l"
+#line 374 "detex.l"
if (!fWord) ECHO;
YY_BREAK
case 130:
YY_RULE_SETUP
-#line 374 "detex.l"
+#line 376 "detex.l"
{ BEGIN LaOptArg; }
YY_BREAK
case 131:
YY_RULE_SETUP
-#line 375 "detex.l"
+#line 377 "detex.l"
{ cOpenBrace++; }
YY_BREAK
case 132:
YY_RULE_SETUP
-#line 376 "detex.l"
+#line 378 "detex.l"
{ cOpenBrace--;
if (cOpenBrace == 0)
{
@@ -2643,28 +2639,28 @@ YY_RULE_SETUP
YY_BREAK
case 133:
YY_RULE_SETUP
-#line 383 "detex.l"
+#line 385 "detex.l"
;
YY_BREAK
case 134:
YY_RULE_SETUP
-#line 384 "detex.l"
+#line 386 "detex.l"
BEGIN LaMacro;
YY_BREAK
case 135:
/* rule 135 can match eol */
YY_RULE_SETUP
-#line 385 "detex.l"
+#line 387 "detex.l"
;
YY_BREAK
case 136:
YY_RULE_SETUP
-#line 387 "detex.l"
+#line 389 "detex.l"
{ BEGIN LaOptArg2; }
YY_BREAK
case 137:
YY_RULE_SETUP
-#line 388 "detex.l"
+#line 390 "detex.l"
{ if (cOpenBrace == 0)
{
if (--cArgs==0)
@@ -2678,30 +2674,30 @@ YY_RULE_SETUP
YY_BREAK
case 138:
YY_RULE_SETUP
-#line 398 "detex.l"
+#line 400 "detex.l"
{ cOpenBrace--; }
YY_BREAK
case 139:
YY_RULE_SETUP
-#line 399 "detex.l"
+#line 401 "detex.l"
;
YY_BREAK
case 140:
YY_RULE_SETUP
-#line 400 "detex.l"
+#line 402 "detex.l"
BEGIN LaMacro2;
YY_BREAK
case 141:
YY_RULE_SETUP
-#line 401 "detex.l"
+#line 403 "detex.l"
;
YY_BREAK
case 142:
YY_RULE_SETUP
-#line 402 "detex.l"
+#line 404 "detex.l"
ECHO;
YY_BREAK
-#line 2705 "detex.c"
+#line 2701 "detex.c"
case YY_STATE_EOF(INITIAL):
case YY_STATE_EOF(Define):
case YY_STATE_EOF(Display):
@@ -2788,7 +2784,8 @@ case YY_STATE_EOF(LaPicture):
else
{
- yy_cp = (yy_c_buf_p);
+ yy_cp = (yy_last_accepting_cpos);
+ yy_current_state = (yy_last_accepting_state);
goto yy_find_action;
}
}
@@ -3271,10 +3268,6 @@ static void yy_load_buffer_state (void)
yyfree((void *) b );
}
-#ifndef __cplusplus
-extern int isatty (int );
-#endif /* __cplusplus */
-
/* Initializes or reinitializes a buffer.
* This function is sometimes called more than once on the same buffer,
* such as during a yyrestart() or at EOF.
@@ -3298,7 +3291,7 @@ extern int isatty (int );
b->yy_bs_column = 0;
}
- b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
+ b->yy_is_interactive = 0;
errno = oerrno;
}
@@ -3719,7 +3712,7 @@ void yyfree (void * ptr )
#define YYTABLES_NAME "yytables"
-#line 402 "detex.l"
+#line 404 "detex.l"
/******