handle unterminated \verb

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

15 files changed, 603 insertions, 385 deletions

diff --git a/Build/source/texk/detex/.gdbinit b/Build/source/texk/detex/.gdbinit
new file mode 100644
index 00000000000..16edc66ce7f
--- /dev/null
+++ b/Build/source/texk/detex/.gdbinit
@@ -0,0 +1,7 @@
+define reload
+dont-repeat
+file detex
+end
+
+set env srcdir ../../../texk/detex
+set args -1 $srcdir/testverb.tex
diff --git a/Build/source/texk/detex/ChangeLog b/Build/source/texk/detex/ChangeLog
index b2b8a0c88f2..53ff466210a 100644
--- a/Build/source/texk/detex/ChangeLog
+++ b/Build/source/texk/detex/ChangeLog
@@ -1,3 +1,19 @@
+2022-09-15  Karl Berry  <karl@freefriends.org>
+
+	* configure.ac (detex_version): 2.8.91.
+
+2022-09-14  Karl Berry  <karl@freefriends.org>
+
+	* detex-src/detex.l (NO_MALLOC_DECL) [!NO_MALLOC_DECL]: make
+	#define conditional to placate gcc. (-D on cmdline)
+	(\verb): rewrite to look for both eof (ErrorExit)
+	and eol (Warning). Original bug report sent by Preston Moore
+	to tlsecurity, 08 Jun 2022 22:21:28.
+	* testverb.tex: show some of the cases (not added to make check,
+	with apologies).
+	* Makefile.am (EXTRA_DIST): add testverb.tex.
+	* .gdbinit: new trivial file with gdb helpers.
+
 2022-08-30  Karl Berry  <karl@freefriends.org>
 
 	* detex-src/detex.man: typo fixes from Hilmar Preu\ss{}e,
diff --git a/Build/source/texk/detex/Makefile.am b/Build/source/texk/detex/Makefile.am
index 532485d4028..c3aaa9a01c1 100644
--- a/Build/source/texk/detex/Makefile.am
+++ b/Build/source/texk/detex/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 ## Makefile.am for the TeX Live subdirectory texk/detex/
 ##
-## Copyright 2017 Karl Berry <tex-live@tug.org>
+## Copyright 2017-2022 Karl Berry <tex-live@tug.org>
 ## Copyright 2009-2015 Peter Breitenlohner <tex-live@tug.org>
 ## You may freely use, modify and/or distribute this file.
 ##
@@ -43,7 +43,7 @@ dist_check_SCRIPTS = detex.test
 TESTS = detex.test
 detex.log: detex$(EXEEXT)
 
-EXTRA_DIST += test.lout test.tex test.tout
+EXTRA_DIST += test.lout test.tex test.tout testverb.tex
 
 CLEANFILES = test.out texmf.cnf
 
diff --git a/Build/source/texk/detex/Makefile.in b/Build/source/texk/detex/Makefile.in
index 63656806f05..7cc50f46e84 100644
--- a/Build/source/texk/detex/Makefile.in
+++ b/Build/source/texk/detex/Makefile.in
@@ -561,7 +561,8 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = $(DETEX_TREE) TLpatches test.lout test.tex test.tout
+EXTRA_DIST = $(DETEX_TREE) TLpatches test.lout test.tex test.tout \
+	testverb.tex
 NEVER_DIST = `find . $(NEVER_NAMES)`
 
 # Files not to be distributed
diff --git a/Build/source/texk/detex/TLpatches/01-no-malloc-decl b/Build/source/texk/detex/TLpatches/01-no-malloc-decl
new file mode 100644
index 00000000000..5dea1d5e795
--- /dev/null
+++ b/Build/source/texk/detex/TLpatches/01-no-malloc-decl
@@ -0,0 +1,13 @@
+--- detex-src/detex.l	(revision 64397)
++++ detex-src/detex.l	(working copy)
+@@ -110,7 +110,10 @@
+ #define STRIPARGS(x)	cArgs=x; LaBEGIN LaMacro2
+ #define	CITE(x)		if (fLatex && !fCite) KILLARGS(x)
+ 
++/* avoid gratuitous gcc warning from passing -D for this on command line */
++#ifndef NO_MALLOC_DECL
+ #define NO_MALLOC_DECL
++#endif
+ 
+ void LineBreak();
+ void Ignore();
diff --git a/Build/source/texk/detex/TLpatches/04-verb-termination b/Build/source/texk/detex/TLpatches/04-verb-termination
new file mode 100644
index 00000000000..35d3d9c451d
--- /dev/null
+++ b/Build/source/texk/detex/TLpatches/04-verb-termination
@@ -0,0 +1,42 @@
+--- detex-src/detex.l	(revision 64397)
++++ detex-src/detex.l	(working copy)
+@@ -346,15 +349,30 @@ VERBSYMBOL	=|\\leq|\\geq|\\in|>|<|\\subseteq|\subs
+ 							footnoteLevel = currBracesLevel;
+ 							++currBracesLevel;
+ 							}
+-<Normal>"\\verb" /* ignore \verb<ch>...<ch> */	{   if (fLatex) {
+-						 	char verbchar, c;
+-						 	verbchar = input();
+-						 	while ((c = input()) != verbchar)
+-							    /*if (c == '\n')
+-								NEWLINE;*/
+-								putchar(c);
+-						    }
+-						    IGNORE;
++<Normal>"\\verb" /* ignore \verb<ch>...<ch> */	{
++  /* Sorry to use different formatting, but it seemed better not
++     to cram all this code over in the rightmost 20 chars. */
++  if (fLatex) {
++    char verbchar, c;
++    verbchar = input();
++    if (verbchar != EOF) {
++      while ((c = input()) != verbchar && c != '\n' && c != EOF) {
++        putchar(c);
++      }
++    }
++    /* would be nice to include input filenames and line numbers */
++    if (verbchar == EOF || c == EOF) {
++      /* do this test first in case verbchar is eof */
++      ErrorExit("\\verb not complete before eof");
++    }
++    if (c == '\n') {
++      char delim[2];
++      delim[0] = verbchar;
++      delim[1] = 0;
++      Warning("\\verb not terminated before eol, delimiter", delim);
++    }
++  }
++  IGNORE;
+ 						}
+ 
+ <Normal>"\\newcommand"				{ LATEX; KILLARGS(2); }
diff --git a/Build/source/texk/detex/TLpatches/07-help-summary b/Build/source/texk/detex/TLpatches/07-help-summary
new file mode 100644
index 00000000000..b0e9cd4e4e8
--- /dev/null
+++ b/Build/source/texk/detex/TLpatches/07-help-summary
@@ -0,0 +1,12 @@
+--- detex-src/detex.l	(revision 64397)
++++ detex-src/detex.l	(working copy)
+@@ -1093,7 +1111,8 @@ UsageExit(void)
+ {
+ 	(void)printf("\n%s [ -clnrstw1 ] [ -e environment-list ] [ filename[.tex] ... ]\n",
+ 		sbProgName);
+-	puts("  -c  echo LaTeX \\cite, \\ref, and \\pageref values\n  \
++	puts("Strip (La)TeX commands from the input.\n\n  \
++                -c  echo LaTeX \\cite, \\ref, and \\pageref values\n  \
+ -e  <env-list> list of LaTeX environments to ignore\n  \
+ -l  force latex mode\n  \
+ -n  do not follow \\input, \\include and \\subfile\n  \
diff --git a/Build/source/texk/detex/TLpatches/09-help-url-at-end b/Build/source/texk/detex/TLpatches/09-help-url-at-end
new file mode 100644
index 00000000000..be746d9a0fa
--- /dev/null
+++ b/Build/source/texk/detex/TLpatches/09-help-url-at-end
@@ -0,0 +1,33 @@
+--- detex-src/detex.l	(revision 64397)
++++ detex-src/detex.l	(working copy)
+@@ -1093,7 +1111,8 @@ UsageExit(void)
+ {
+ 	(void)printf("\n%s [ -clnrstw1 ] [ -e environment-list ] [ filename[.tex] ... ]\n",
+ 		sbProgName);
+-	puts("  -c  echo LaTeX \\cite, \\ref, and \\pageref values\n  \
++	puts("Strip (La)TeX commands from the input.\n\n  \
++-c  echo LaTeX \\cite, \\ref, and \\pageref values\n  \
+ -e  <env-list> list of LaTeX environments to ignore\n  \
+ -l  force latex mode\n  \
+ -n  do not follow \\input, \\include and \\subfile\n  \
+@@ -1102,7 +1121,10 @@ UsageExit(void)
+ -t  force tex mode\n  \
+ -w  word only output\n  \
+ -1  outputs the original file name and line number in the beginning of each line\n  \
+--v  show program version and exit");
++-v  show program version and exit\n\
++\n\
++opendetex home page: https://github.com/pkubowicz/opendetex");
++	(void)printf("opendetex version %s\n", VERSION);
+ 	exit(0);
+ }
+ 
+@@ -1113,7 +1135,6 @@ UsageExit(void)
+ void
+ VersionExit(void)
+ {
+-	(void)printf("\nOpenDetex version %s\nhttps://github.com/pkubowicz/opendetex\n",
+-		VERSION);
++	(void)printf("\nopendetex version %s\n", VERSION);
+ 	exit(0);
+ }
diff --git a/Build/source/texk/detex/configure b/Build/source/texk/detex/configure
index 93ce870ca72..9dc7e513ed9 100755
--- a/Build/source/texk/detex/configure
+++ b/Build/source/texk/detex/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for detex (TeX Live) 2.8.9.
+# Generated by GNU Autoconf 2.71 for detex (TeX Live) 2.8.91.
 #
 # Report bugs to <tex-k@tug.org>.
 #
@@ -629,8 +629,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='detex (TeX Live)'
 PACKAGE_TARNAME='detex--tex-live-'
-PACKAGE_VERSION='2.8.9'
-PACKAGE_STRING='detex (TeX Live) 2.8.9'
+PACKAGE_VERSION='2.8.91'
+PACKAGE_STRING='detex (TeX Live) 2.8.91'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
@@ -1376,7 +1376,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures detex (TeX Live) 2.8.9 to adapt to many kinds of systems.
+\`configure' configures detex (TeX Live) 2.8.91 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1448,7 +1448,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of detex (TeX Live) 2.8.9:";;
+     short | recursive ) echo "Configuration of detex (TeX Live) 2.8.91:";;
    esac
   cat <<\_ACEOF
 
@@ -1567,7 +1567,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-detex (TeX Live) configure 2.8.9
+detex (TeX Live) configure 2.8.91
 generated by GNU Autoconf 2.71
 
 Copyright (C) 2021 Free Software Foundation, Inc.
@@ -2091,7 +2091,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by detex (TeX Live) $as_me 2.8.9, which was
+It was created by detex (TeX Live) $as_me 2.8.91, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   $ $0$ac_configure_args_raw
@@ -8413,7 +8413,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='detex--tex-live-'
- VERSION='2.8.9'
+ VERSION='2.8.91'
 
 
 printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -14806,7 +14806,7 @@ Usage: $0 [OPTIONS]
 Report bugs to <bug-libtool@gnu.org>."
 
 lt_cl_version="\
-detex (TeX Live) config.lt 2.8.9
+detex (TeX Live) config.lt 2.8.91
 configured by $0, generated by GNU Autoconf 2.71.
 
 Copyright (C) 2011 Free Software Foundation, Inc.
@@ -16402,7 +16402,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by detex (TeX Live) $as_me 2.8.9, which was
+This file was extended by detex (TeX Live) $as_me 2.8.91, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -16470,7 +16470,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
-detex (TeX Live) config.status 2.8.9
+detex (TeX Live) config.status 2.8.91
 configured by $0, generated by GNU Autoconf 2.71,
   with options \\"\$ac_cs_config\\"
 
diff --git a/Build/source/texk/detex/configure.ac b/Build/source/texk/detex/configure.ac
index 4c1d27d0629..91f06222f0b 100644
--- a/Build/source/texk/detex/configure.ac
+++ b/Build/source/texk/detex/configure.ac
@@ -1,14 +1,14 @@
 dnl $Id$
 dnl Process this file with autoconf to produce a configure script.
 dnl
-dnl   Copyright 2014-2020 Karl Berry <tex-live@tug.org>
+dnl   Copyright 2014-2022 Karl Berry <tex-live@tug.org>
 dnl   Copyright 2009-2013 Peter Breitenlohner <tex-live@tug.org>
 dnl
 dnl   This file is free software; the copyright holder
 dnl   gives unlimited permission to copy and/or distribute it,
 dnl   with or without modifications, as long as this notice is preserved.
 dnl
-m4_define([detex_version], [2.8.9])[]dnl using unmodified detex source tree
+m4_define([detex_version], [2.8.91])[]
 AC_INIT([detex (TeX Live)], detex_version, [tex-k@tug.org])
 AC_PREREQ([2.65])
 AC_CONFIG_SRCDIR([detex-src/detex.l])
diff --git a/Build/source/texk/detex/detex-src/README b/Build/source/texk/detex/detex-src/README
index e95b40f5930..261a9e56e79 100644
--- a/Build/source/texk/detex/detex-src/README
+++ b/Build/source/texk/detex/detex-src/README
@@ -1,4 +1,4 @@
-OpenDetex - Version 2.8.9
+OpenDetex - Version 2.8.91 (TeX Live)
 
 OpenDetex is a program to remove TeX constructs from a text file.  It recognizes
 the \input command.
diff --git a/Build/source/texk/detex/detex-src/detex.c b/Build/source/texk/detex/detex-src/detex.c
index d484f249c92..830ea9b4bac 100644
--- a/Build/source/texk/detex/detex-src/detex.c
+++ b/Build/source/texk/detex/detex-src/detex.c
@@ -1,3 +1,4 @@
+#line 5 "../../../texk/detex/detex-src/detex.l"
 /*
  * Copyright (c) 1986-2007 Purdue University
  * All rights reserved.
@@ -35,6 +36,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE SOFTWARE.
  */
 
+
 /*
  * detex [-e environment-list] [-c] [-l] [-n] [-s] [-t] [-w] [-1] [file[.tex] ]
  *
@@ -87,7 +89,9 @@
 
 #endif /* KPATHSEA */
 
-#line 91 "lex.yy.c"
+
+
+#line 95 "../../../texk/detex/detex-src/detex.c"
 
 #define  YY_INT_ALIGNED short int
 
@@ -96,7 +100,7 @@
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
 #define YY_FLEX_MINOR_VERSION 6
-#define YY_FLEX_SUBMINOR_VERSION 4
+#define YY_FLEX_SUBMINOR_VERSION 0
 #if YY_FLEX_SUBMINOR_VERSION > 0
 #define FLEX_BETA
 #endif
@@ -171,48 +175,60 @@ typedef unsigned int flex_uint32_t;
 #define UINT32_MAX             (4294967295U)
 #endif
 
-#ifndef SIZE_MAX
-#define SIZE_MAX               (~(size_t)0)
-#endif
-
 #endif /* ! C99 */
 
 #endif /* ! FLEXINT_H */
 
-/* begin standard C++ headers. */
+#ifdef __cplusplus
+
+/* The "const" storage-class-modifier is valid. */
+#define YY_USE_CONST
 
-/* TODO: this is always defined, so inline it */
-#define yyconst const
+#else	/* ! __cplusplus */
 
-#if defined(__GNUC__) && __GNUC__ >= 3
-#define yynoreturn __attribute__((__noreturn__))
+/* C99 requires __STDC__ to be defined as 1. */
+#if defined (__STDC__)
+
+#define YY_USE_CONST
+
+#endif	/* defined (__STDC__) */
+#endif	/* ! __cplusplus */
+
+#ifdef YY_USE_CONST
+#define yyconst const
 #else
-#define yynoreturn
+#define yyconst
 #endif
 
 /* Returned upon end-of-file. */
 #define YY_NULL 0
 
-/* Promotes a possibly negative, possibly signed char to an
- *   integer in range [0..255] for use as an array index.
+/* Promotes a possibly negative, possibly signed char to an unsigned
+ * integer for use as an array index.  If the signed char is negative,
+ * we want to instead treat it as an 8-bit unsigned char, hence the
+ * double cast.
  */
-#define YY_SC_TO_UI(c) ((YY_CHAR) (c))
+#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c)
 
 /* Enter a start condition.  This macro really ought to take a parameter,
  * but we do it the disgusting crufty way forced on us by the ()-less
  * definition of BEGIN.
  */
 #define BEGIN (yy_start) = 1 + 2 *
+
 /* Translate the current start state into a value that can be later handed
  * to BEGIN to return to the state.  The YYSTATE alias is for lex
  * compatibility.
  */
 #define YY_START (((yy_start) - 1) / 2)
 #define YYSTATE YY_START
+
 /* Action number for EOF rule of a given start state. */
 #define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
+
 /* Special action meaning "start processing a new file". */
-#define YY_NEW_FILE yyrestart( yyin  )
+#define YY_NEW_FILE yyrestart(yyin  )
+
 #define YY_END_OF_BUFFER_CHAR 0
 
 /* Size of default input buffer. */
@@ -242,14 +258,14 @@ typedef struct yy_buffer_state *YY_BUFFER_STATE;
 typedef size_t yy_size_t;
 #endif
 
-extern int yyleng;
+extern yy_size_t yyleng;
 
 extern FILE *yyin, *yyout;
 
 #define EOB_ACT_CONTINUE_SCAN 0
 #define EOB_ACT_END_OF_FILE 1
 #define EOB_ACT_LAST_MATCH 2
-    
+
     #define YY_LESS_LINENO(n)
     #define YY_LINENO_REWIND_TO(ptr)
     
@@ -266,6 +282,7 @@ extern FILE *yyin, *yyout;
 		YY_DO_BEFORE_ACTION; /* set up yytext again */ \
 		} \
 	while ( 0 )
+
 #define unput(c) yyunput( c, (yytext_ptr)  )
 
 #ifndef YY_STRUCT_YY_BUFFER_STATE
@@ -280,12 +297,12 @@ struct yy_buffer_state
 	/* Size of input buffer in bytes, not including room for EOB
 	 * characters.
 	 */
-	int yy_buf_size;
+	yy_size_t yy_buf_size;
 
 	/* Number of characters read into yy_ch_buf, not including EOB
 	 * characters.
 	 */
-	int yy_n_chars;
+	yy_size_t yy_n_chars;
 
 	/* Whether we "own" the buffer - i.e., we know we created it,
 	 * and can realloc() it to grow it, and should free() it to
@@ -308,7 +325,7 @@ struct yy_buffer_state
 
     int yy_bs_lineno; /**< The line count. */
     int yy_bs_column; /**< The column count. */
-
+    
 	/* Whether to try to fill the input buffer when we reach the
 	 * end of it.
 	 */
@@ -336,7 +353,7 @@ struct yy_buffer_state
 /* Stack of input buffers. */
 static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */
 static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */
-static YY_BUFFER_STATE * yy_buffer_stack = NULL; /**< Stack as an array. */
+static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
 
 /* We provide macros for accessing buffer states in case in the
  * future we want to put the buffer states in a more general
@@ -347,6 +364,7 @@ static YY_BUFFER_STATE * yy_buffer_stack = NULL; /**< Stack as an array. */
 #define YY_CURRENT_BUFFER ( (yy_buffer_stack) \
                           ? (yy_buffer_stack)[(yy_buffer_stack_top)] \
                           : NULL)
+
 /* Same as previous macro, but useful when we know that the buffer stack is not
  * NULL or when we need an lvalue. For internal use only.
  */
@@ -354,11 +372,11 @@ static YY_BUFFER_STATE * yy_buffer_stack = NULL; /**< Stack as an array. */
 
 /* yy_hold_char holds the character lost when yytext is formed. */
 static char yy_hold_char;
-static int yy_n_chars;		/* number of characters read into yy_ch_buf */
-int yyleng;
+static yy_size_t yy_n_chars;		/* number of characters read into yy_ch_buf */
+yy_size_t yyleng;
 
 /* Points to current character in buffer. */
-static char *yy_c_buf_p = NULL;
+static char *yy_c_buf_p = (char *) 0;
 static int yy_init = 0;		/* whether we need to initialize */
 static int yy_start = 0;	/* start state number */
 
@@ -367,56 +385,62 @@ static int yy_start = 0;	/* start state number */
  */
 static int yy_did_buffer_switch_on_eof;
 
-void yyrestart ( FILE *input_file  );
-void yy_switch_to_buffer ( YY_BUFFER_STATE new_buffer  );
-YY_BUFFER_STATE yy_create_buffer ( FILE *file, int size  );
-void yy_delete_buffer ( YY_BUFFER_STATE b  );
-void yy_flush_buffer ( YY_BUFFER_STATE b  );
-void yypush_buffer_state ( YY_BUFFER_STATE new_buffer  );
-void yypop_buffer_state ( void );
+void yyrestart (FILE *input_file  );
+void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer  );
+YY_BUFFER_STATE yy_create_buffer (FILE *file,int size  );
+void yy_delete_buffer (YY_BUFFER_STATE b  );
+void yy_flush_buffer (YY_BUFFER_STATE b  );
+void yypush_buffer_state (YY_BUFFER_STATE new_buffer  );
+void yypop_buffer_state (void );
+
+static void yyensure_buffer_stack (void );
+static void yy_load_buffer_state (void );
+static void yy_init_buffer (YY_BUFFER_STATE b,FILE *file  );
 
-static void yyensure_buffer_stack ( void );
-static void yy_load_buffer_state ( void );
-static void yy_init_buffer ( YY_BUFFER_STATE b, FILE *file  );
-#define YY_FLUSH_BUFFER yy_flush_buffer( YY_CURRENT_BUFFER )
+#define YY_FLUSH_BUFFER yy_flush_buffer(YY_CURRENT_BUFFER )
 
-YY_BUFFER_STATE yy_scan_buffer ( char *base, yy_size_t size  );
-YY_BUFFER_STATE yy_scan_string ( const char *yy_str  );
-YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, int len  );
+YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size  );
+YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str  );
+YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,yy_size_t len  );
 
-void *yyalloc ( yy_size_t  );
-void *yyrealloc ( void *, yy_size_t  );
-void yyfree ( void *  );
+void *yyalloc (yy_size_t  );
+void *yyrealloc (void *,yy_size_t  );
+void yyfree (void *  );
 
 #define yy_new_buffer yy_create_buffer
+
 #define yy_set_interactive(is_interactive) \
 	{ \
 	if ( ! YY_CURRENT_BUFFER ){ \
         yyensure_buffer_stack (); \
 		YY_CURRENT_BUFFER_LVALUE =    \
-            yy_create_buffer( yyin, YY_BUF_SIZE ); \
+            yy_create_buffer(yyin,YY_BUF_SIZE ); \
 	} \
 	YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
 	}
+
 #define yy_set_bol(at_bol) \
 	{ \
 	if ( ! YY_CURRENT_BUFFER ){\
         yyensure_buffer_stack (); \
 		YY_CURRENT_BUFFER_LVALUE =    \
-            yy_create_buffer( yyin, YY_BUF_SIZE ); \
+            yy_create_buffer(yyin,YY_BUF_SIZE ); \
 	} \
 	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
 	}
+
 #define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
 
 /* Begin user sect3 */
-typedef flex_uint8_t YY_CHAR;
 
-FILE *yyin = NULL, *yyout = NULL;
+typedef unsigned char YY_CHAR;
+
+FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0;
 
 typedef int yy_state_type;
 
 extern int yylineno;
+
 int yylineno = 1;
 
 extern char *yytext;
@@ -425,20 +449,24 @@ extern char *yytext;
 #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 );
-static void yynoreturn yy_fatal_error ( const char* msg  );
+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
  * corresponding action - sets up yytext.
  */
 #define YY_DO_BEFORE_ACTION \
 	(yytext_ptr) = yy_bp; \
-	yyleng = (int) (yy_cp - yy_bp); \
+	yyleng = (size_t) (yy_cp - yy_bp); \
 	(yy_hold_char) = *yy_cp; \
 	*yy_cp = '\0'; \
 	(yy_c_buf_p) = yy_cp;
+
 #define YY_NUM_RULES 174
 #define YY_END_OF_BUFFER 175
 /* This struct is not used in this scanner,
@@ -448,7 +476,7 @@ struct yy_trans_info
 	flex_int32_t yy_verify;
 	flex_int32_t yy_nxt;
 	};
-static const flex_int16_t yy_accept[1362] =
+static yyconst flex_int16_t yy_accept[1362] =
     {   0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,  145,  145,    0,    0,    0,    0,
@@ -602,7 +630,7 @@ static const flex_int16_t yy_accept[1362] =
         0
     } ;
 
-static const YY_CHAR 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,
@@ -634,7 +662,7 @@ static const YY_CHAR yy_ec[256] =
         1,    1,    1,    1,    1
     } ;
 
-static const YY_CHAR yy_meta[61] =
+static yyconst YY_CHAR yy_meta[61] =
     {   0,
         1,    2,    3,    2,    4,    1,    1,    5,    1,    1,
         1,    1,    6,    7,    1,    7,    7,    1,    7,    1,
@@ -644,7 +672,7 @@ static const YY_CHAR yy_meta[61] =
         9,    9,    9,    9,    9,    9,   12,    1,   13,    1
     } ;
 
-static const flex_int16_t yy_base[1416] =
+static yyconst flex_uint16_t yy_base[1416] =
     {   0,
         0,    0,    0,    1,    2,    6,   14,   26,   11,   30,
        43,   47,   96,    0,  156,    0,  216,    0,  274,  277,
@@ -804,7 +832,7 @@ static const flex_int16_t yy_base[1416] =
      2288, 2290, 3173, 2291, 2293
     } ;
 
-static const flex_int16_t yy_def[1416] =
+static yyconst flex_int16_t yy_def[1416] =
     {   0,
      1362, 1362, 1363, 1363, 1364, 1364, 1365, 1365, 1366, 1366,
      1367, 1367, 1361,   13, 1361,   15, 1361,   17, 1368, 1368,
@@ -964,7 +992,7 @@ static const flex_int16_t yy_def[1416] =
      1361, 1361, 1361, 1361, 1361
     } ;
 
-static const flex_int16_t yy_nxt[3432] =
+static yyconst flex_uint16_t yy_nxt[3432] =
     {   0,
      1361, 1361,   48,   48,   51, 1361, 1361,   52,   51,  108,
       108,   52,   61,   62,   61,   57,   58,   57,  134,   53,
@@ -1346,7 +1374,7 @@ static const flex_int16_t yy_nxt[3432] =
      1361
     } ;
 
-static const flex_int16_t yy_chk[3432] =
+static yyconst flex_int16_t yy_chk[3432] =
     {   0,
         0,    0,    3,    4,    5,    0,    0,    5,    6,   23,
        24,    6,    9,    9,    9,    7,    7,    7,   39,    5,
@@ -1742,9 +1770,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 97 "detex.l"
+#line 97 "../../../texk/detex/detex-src/detex.l"
 #undef IGNORE
 #undef ECHO
 
@@ -1761,7 +1789,10 @@ char *yytext;
 #define STRIPARGS(x)	cArgs=x; LaBEGIN LaMacro2
 #define	CITE(x)		if (fLatex && !fCite) KILLARGS(x)
 
+/* avoid gratuitous gcc warning from passing -D for this on command line */
+#ifndef NO_MALLOC_DECL
 #define NO_MALLOC_DECL
+#endif
 
 void LineBreak();
 void Ignore();
@@ -1835,9 +1866,11 @@ int				fIsColumn0 = 1;			/* Are we at the begining of a line? */
 int				csb = 0;				/* depth of flex context stack */
 #endif /* FLEX_SCANNER */
 
-#line 1839 "lex.yy.c"
 
-#line 1841 "lex.yy.c"
+
+ 
+
+#line 1874 "../../../texk/detex/detex-src/detex.c"
 
 #define INITIAL 0
 #define Define 1
@@ -1874,36 +1907,36 @@ int				csb = 0;				/* depth of flex context stack */
 #define YY_EXTRA_TYPE void *
 #endif
 
-static int yy_init_globals ( void );
+static int yy_init_globals (void );
 
 /* Accessor methods to globals.
    These are made visible to non-reentrant scanners for convenience. */
 
-int yylex_destroy ( void );
+int yylex_destroy (void );
 
-int yyget_debug ( void );
+int yyget_debug (void );
 
-void yyset_debug ( int debug_flag  );
+void yyset_debug (int debug_flag  );
 
-YY_EXTRA_TYPE yyget_extra ( void );
+YY_EXTRA_TYPE yyget_extra (void );
 
-void yyset_extra ( YY_EXTRA_TYPE user_defined  );
+void yyset_extra (YY_EXTRA_TYPE user_defined  );
 
-FILE *yyget_in ( void );
+FILE *yyget_in (void );
 
-void yyset_in  ( FILE * _in_str  );
+void yyset_in  (FILE * _in_str  );
 
-FILE *yyget_out ( void );
+FILE *yyget_out (void );
 
-void yyset_out  ( FILE * _out_str  );
+void yyset_out  (FILE * _out_str  );
 
-			int yyget_leng ( void );
+yy_size_t yyget_leng (void );
 
-char *yyget_text ( void );
+char *yyget_text (void );
 
-int yyget_lineno ( 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.
@@ -1911,9 +1944,9 @@ void yyset_lineno ( int _line_number  );
 
 #ifndef YY_SKIP_YYWRAP
 #ifdef __cplusplus
-extern "C" int yywrap ( void );
+extern "C" int yywrap (void );
 #else
-extern int yywrap ( void );
+extern int yywrap (void );
 #endif
 #endif
 
@@ -1922,18 +1955,19 @@ extern int yywrap ( void );
 #endif
 
 #ifndef yytext_ptr
-static void yy_flex_strncpy ( char *, const char *, int );
+static void yy_flex_strncpy (char *,yyconst char *,int );
 #endif
 
 #ifdef YY_NEED_STRLEN
-static int yy_flex_strlen ( const char * );
+static int yy_flex_strlen (yyconst char * );
 #endif
 
 #ifndef YY_NO_INPUT
+
 #ifdef __cplusplus
-static int yyinput ( void );
+static int yyinput (void );
 #else
-static int input ( void );
+static int input (void );
 #endif
 
 #endif
@@ -1953,7 +1987,7 @@ static int input ( void );
 /* This used to be an fputs(), but since the string might contain NUL's,
  * we now use fwrite().
  */
-#define ECHO do { if (fwrite( yytext, (size_t) yyleng, 1, yyout )) {} } while (0)
+#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)
 #endif
 
 /* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
@@ -1964,7 +1998,7 @@ static int input ( void );
 	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
 		{ \
 		int c = '*'; \
-		int n; \
+		size_t n; \
 		for ( n = 0; n < max_size && \
 			     (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
 			buf[n] = (char) c; \
@@ -1977,7 +2011,7 @@ static int input ( void );
 	else \
 		{ \
 		errno=0; \
-		while ( (result = (int) fread(buf, 1, (yy_size_t) max_size, yyin)) == 0 && ferror(yyin)) \
+		while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \
 			{ \
 			if( errno != EINTR) \
 				{ \
@@ -2066,16 +2100,16 @@ YY_DECL
 		if ( ! YY_CURRENT_BUFFER ) {
 			yyensure_buffer_stack ();
 			YY_CURRENT_BUFFER_LVALUE =
-				yy_create_buffer( yyin, YY_BUF_SIZE );
+				yy_create_buffer(yyin,YY_BUF_SIZE );
 		}
 
-		yy_load_buffer_state(  );
+		yy_load_buffer_state( );
 		}
 
 	{
-#line 208 "detex.l"
+#line 211 "../../../texk/detex/detex-src/detex.l"
 
-#line 2079 "lex.yy.c"
+#line 2113 "../../../texk/detex/detex-src/detex.c"
 
 	while ( /*CONSTCOND*/1 )		/* loops until end-of-file is reached */
 		{
@@ -2103,9 +2137,9 @@ yy_match:
 				{
 				yy_current_state = (int) yy_def[yy_current_state];
 				if ( yy_current_state >= 1362 )
-					yy_c = yy_meta[yy_c];
+					yy_c = yy_meta[(unsigned int) yy_c];
 				}
-			yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
+			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
 			++yy_cp;
 			}
 		while ( yy_current_state != 1361 );
@@ -2130,24 +2164,24 @@ do_action:	/* This label is used only to access EOF actions. */
 
 case 1:
 YY_RULE_SETUP
-#line 209 "detex.l"
+#line 212 "../../../texk/detex/detex-src/detex.l"
 /* ignore comments */	{INCRLINENO;}
 	YY_BREAK
 case 2:
 /* rule 2 can match eol */
 YY_RULE_SETUP
-#line 211 "detex.l"
+#line 214 "../../../texk/detex/detex-src/detex.l"
 {LATEX; IGNORE;}
 	YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 213 "detex.l"
+#line 216 "../../../texk/detex/detex-src/detex.l"
 /* environment start */	{LaBEGIN LaBegin; IGNORE;}
 	YY_BREAK
 case 4:
 /* rule 4 can match eol */
 YY_RULE_SETUP
-#line 215 "detex.l"
+#line 218 "../../../texk/detex/detex-src/detex.l"
 { if (BeginEnv("verbatim"))
 							BEGIN LaEnv;
 						    else
@@ -2158,24 +2192,24 @@ YY_RULE_SETUP
 case 5:
 /* rule 5 can match eol */
 YY_RULE_SETUP
-#line 222 "detex.l"
+#line 225 "../../../texk/detex/detex-src/detex.l"
 /* verbatim mode */	{BEGIN Normal; IGNORE;}
 	YY_BREAK
 case 6:
 /* rule 6 can match eol */
 YY_RULE_SETUP
-#line 223 "detex.l"
+#line 226 "../../../texk/detex/detex-src/detex.l"
 ECHO;
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 224 "detex.l"
+#line 227 "../../../texk/detex/detex-src/detex.l"
 ECHO;
 	YY_BREAK
 case 8:
 /* rule 8 can match eol */
 YY_RULE_SETUP
-#line 226 "detex.l"
+#line 229 "../../../texk/detex/detex-src/detex.l"
 { KILLARGS(1);
 						  if (BeginEnv("minipage"))
 							BEGIN LaEnv;
@@ -2187,7 +2221,7 @@ YY_RULE_SETUP
 case 9:
 /* rule 9 can match eol */
 YY_RULE_SETUP
-#line 234 "detex.l"
+#line 237 "../../../texk/detex/detex-src/detex.l"
 {
 						  if (BeginEnv("table"))
 							BEGIN LaEnv;
@@ -2199,7 +2233,7 @@ YY_RULE_SETUP
 case 10:
 /* rule 10 can match eol */
 YY_RULE_SETUP
-#line 242 "detex.l"
+#line 245 "../../../texk/detex/detex-src/detex.l"
 {
 						  if (BeginEnv("figure"))
 							BEGIN LaEnv;
@@ -2210,7 +2244,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 250 "detex.l"
+#line 253 "../../../texk/detex/detex-src/detex.l"
 { if (BeginEnv(yytext))
 							BEGIN LaEnv;
 						    else
@@ -2221,28 +2255,28 @@ YY_RULE_SETUP
 /*<LaBegin>"\n"					NEWLINE;*/
 case 12:
 YY_RULE_SETUP
-#line 257 "detex.l"
+#line 260 "../../../texk/detex/detex-src/detex.l"
 {INCRLINENO;}
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 259 "detex.l"
+#line 262 "../../../texk/detex/detex-src/detex.l"
 /* absorb some environments */	{LaBEGIN LaEnd; IGNORE;}
 	YY_BREAK
 case 14:
 /* rule 14 can match eol */
 YY_RULE_SETUP
-#line 260 "detex.l"
+#line 263 "../../../texk/detex/detex-src/detex.l"
 ;/*NEWLINE;*/
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 261 "detex.l"
+#line 264 "../../../texk/detex/detex-src/detex.l"
 {INCRLINENO;}
 	YY_BREAK
 case 16:
 YY_RULE_SETUP
-#line 263 "detex.l"
+#line 266 "../../../texk/detex/detex-src/detex.l"
 /* end environment */	{   if (EndEnv(yytext))
 							BEGIN Normal;
 						    IGNORE;
@@ -2250,354 +2284,354 @@ YY_RULE_SETUP
 	YY_BREAK
 case 17:
 YY_RULE_SETUP
-#line 267 "detex.l"
+#line 270 "../../../texk/detex/detex-src/detex.l"
 {BEGIN LaEnv; IGNORE;}
 	YY_BREAK
 /*<LaEnd>"\n"					NEWLINE;*/
 case 18:
 YY_RULE_SETUP
-#line 269 "detex.l"
+#line 272 "../../../texk/detex/detex-src/detex.l"
 {INCRLINENO;}
 	YY_BREAK
 case 19:
 /* rule 19 can match eol */
 YY_RULE_SETUP
-#line 271 "detex.l"
+#line 274 "../../../texk/detex/detex-src/detex.l"
 ;
 	YY_BREAK
 case 20:
 /* rule 20 can match eol */
 YY_RULE_SETUP
-#line 272 "detex.l"
+#line 275 "../../../texk/detex/detex-src/detex.l"
 ;
 	YY_BREAK
 case 21:
 /* rule 21 can match eol */
 YY_RULE_SETUP
-#line 273 "detex.l"
+#line 276 "../../../texk/detex/detex-src/detex.l"
 ;
 	YY_BREAK
 case 22:
 /* rule 22 can match eol */
 YY_RULE_SETUP
-#line 274 "detex.l"
+#line 277 "../../../texk/detex/detex-src/detex.l"
 ;
 	YY_BREAK
 case 23:
 /* rule 23 can match eol */
 YY_RULE_SETUP
-#line 275 "detex.l"
+#line 278 "../../../texk/detex/detex-src/detex.l"
 ;
 	YY_BREAK
 case 24:
 /* rule 24 can match eol */
 YY_RULE_SETUP
-#line 276 "detex.l"
+#line 279 "../../../texk/detex/detex-src/detex.l"
 ;
 	YY_BREAK
 case 25:
 YY_RULE_SETUP
-#line 277 "detex.l"
+#line 280 "../../../texk/detex/detex-src/detex.l"
 ; /* hack to fix \begin{minipage}{300pt} */
 	YY_BREAK
 case 26:
 YY_RULE_SETUP
-#line 279 "detex.l"
+#line 282 "../../../texk/detex/detex-src/detex.l"
 { KILLARGS(1); }
 	YY_BREAK
 case 27:
 YY_RULE_SETUP
-#line 280 "detex.l"
+#line 283 "../../../texk/detex/detex-src/detex.l"
 { KILLARGS(2); }
 	YY_BREAK
 case 28:
 YY_RULE_SETUP
-#line 281 "detex.l"
+#line 284 "../../../texk/detex/detex-src/detex.l"
 { KILLARGS(2); }
 	YY_BREAK
 case 29:
 YY_RULE_SETUP
-#line 282 "detex.l"
+#line 285 "../../../texk/detex/detex-src/detex.l"
 { KILLARGS(2); }
 	YY_BREAK
 case 30:
 YY_RULE_SETUP
-#line 283 "detex.l"
+#line 286 "../../../texk/detex/detex-src/detex.l"
 { KILLARGS(2); }
 	YY_BREAK
 case 31:
 YY_RULE_SETUP
-#line 284 "detex.l"
+#line 287 "../../../texk/detex/detex-src/detex.l"
 { KILLARGS(2); }
 	YY_BREAK
 case 32:
 YY_RULE_SETUP
-#line 285 "detex.l"
+#line 288 "../../../texk/detex/detex-src/detex.l"
 { KILLARGS(1); }
 	YY_BREAK
 case 33:
 YY_RULE_SETUP
-#line 286 "detex.l"
+#line 289 "../../../texk/detex/detex-src/detex.l"
 { KILLARGS(1); }
 	YY_BREAK
 case 34:
 YY_RULE_SETUP
-#line 287 "detex.l"
+#line 290 "../../../texk/detex/detex-src/detex.l"
 { KILLARGS(2); }
 	YY_BREAK
 case 35:
 YY_RULE_SETUP
-#line 288 "detex.l"
+#line 291 "../../../texk/detex/detex-src/detex.l"
 { KILLARGS(1); }
 	YY_BREAK
 case 36:
 YY_RULE_SETUP
-#line 289 "detex.l"
+#line 292 "../../../texk/detex/detex-src/detex.l"
 { STRIPARGS(2); }
 	YY_BREAK
 case 37:
 YY_RULE_SETUP
-#line 290 "detex.l"
+#line 293 "../../../texk/detex/detex-src/detex.l"
 { KILLARGS(1); }
 	YY_BREAK
 case 38:
 YY_RULE_SETUP
-#line 291 "detex.l"
+#line 294 "../../../texk/detex/detex-src/detex.l"
 { STRIPARGS(2); }
 	YY_BREAK
 case 39:
 YY_RULE_SETUP
-#line 292 "detex.l"
+#line 295 "../../../texk/detex/detex-src/detex.l"
 { KILLARGS(2); }
 	YY_BREAK
 case 40:
 YY_RULE_SETUP
-#line 293 "detex.l"
+#line 296 "../../../texk/detex/detex-src/detex.l"
 ;
 	YY_BREAK
 case 41:
 YY_RULE_SETUP
-#line 294 "detex.l"
+#line 297 "../../../texk/detex/detex-src/detex.l"
 { KILLARGS(1); }
 	YY_BREAK
 case 42:
 /* rule 42 can match eol */
 YY_RULE_SETUP
-#line 295 "detex.l"
+#line 298 "../../../texk/detex/detex-src/detex.l"
 { LaBEGIN LaPicture; }
 	YY_BREAK
 case 43:
 YY_RULE_SETUP
-#line 297 "detex.l"
+#line 300 "../../../texk/detex/detex-src/detex.l"
 ;
 	YY_BREAK
 case 44:
 /* rule 44 can match eol */
 YY_RULE_SETUP
-#line 298 "detex.l"
+#line 301 "../../../texk/detex/detex-src/detex.l"
 { if(fShowPictures) { printf("<Picture %s>", yytext); } }
 	YY_BREAK
 case 45:
 /* rule 45 can match eol */
 YY_RULE_SETUP
-#line 299 "detex.l"
+#line 302 "../../../texk/detex/detex-src/detex.l"
 { BEGIN Normal; INCRLINENO; }
 	YY_BREAK
 case 46:
 YY_RULE_SETUP
-#line 300 "detex.l"
+#line 303 "../../../texk/detex/detex-src/detex.l"
 BEGIN Normal;
 	YY_BREAK
 case 47:
 YY_RULE_SETUP
-#line 302 "detex.l"
+#line 305 "../../../texk/detex/detex-src/detex.l"
 { KILLARGS(3); }
 	YY_BREAK
 case 48:
 YY_RULE_SETUP
-#line 303 "detex.l"
+#line 306 "../../../texk/detex/detex-src/detex.l"
 { KILLARGS(1); }
 	YY_BREAK
 case 49:
 YY_RULE_SETUP
-#line 304 "detex.l"
+#line 307 "../../../texk/detex/detex-src/detex.l"
 { KILLARGS(2); }
 	YY_BREAK
 case 50:
 YY_RULE_SETUP
-#line 305 "detex.l"
+#line 308 "../../../texk/detex/detex-src/detex.l"
 { KILLARGS(2); }
 	YY_BREAK
 case 51:
 YY_RULE_SETUP
-#line 306 "detex.l"
+#line 309 "../../../texk/detex/detex-src/detex.l"
 { KILLARGS(3); }
 	YY_BREAK
 case 52:
 YY_RULE_SETUP
-#line 307 "detex.l"
+#line 310 "../../../texk/detex/detex-src/detex.l"
 { KILLARGS(1); }
 	YY_BREAK
 case 53:
 YY_RULE_SETUP
-#line 308 "detex.l"
+#line 311 "../../../texk/detex/detex-src/detex.l"
 { STRIPARGS(1); }
 	YY_BREAK
 case 54:
 YY_RULE_SETUP
-#line 309 "detex.l"
+#line 312 "../../../texk/detex/detex-src/detex.l"
 { KILLARGS(1); }
 	YY_BREAK
 case 55:
 YY_RULE_SETUP
-#line 310 "detex.l"
+#line 313 "../../../texk/detex/detex-src/detex.l"
 { KILLARGS(1); }
 	YY_BREAK
 case 56:
 YY_RULE_SETUP
-#line 311 "detex.l"
+#line 314 "../../../texk/detex/detex-src/detex.l"
 { KILLARGS(3); }
 	YY_BREAK
 case 57:
 YY_RULE_SETUP
-#line 313 "detex.l"
+#line 316 "../../../texk/detex/detex-src/detex.l"
 ;/*NEWLINE;*/
 	YY_BREAK
 case 58:
 YY_RULE_SETUP
-#line 314 "detex.l"
+#line 317 "../../../texk/detex/detex-src/detex.l"
 ;/*NEWLINE;*/
 	YY_BREAK
 case 59:
 YY_RULE_SETUP
-#line 315 "detex.l"
+#line 318 "../../../texk/detex/detex-src/detex.l"
 ;/*NEWLINE;*/
 	YY_BREAK
 case 60:
 YY_RULE_SETUP
-#line 316 "detex.l"
+#line 319 "../../../texk/detex/detex-src/detex.l"
 ;/*NEWLINE;*/
 	YY_BREAK
 case 61:
 YY_RULE_SETUP
-#line 317 "detex.l"
+#line 320 "../../../texk/detex/detex-src/detex.l"
 ;/*NEWLINE;*/
 	YY_BREAK
 case 62:
 YY_RULE_SETUP
-#line 318 "detex.l"
+#line 321 "../../../texk/detex/detex-src/detex.l"
 ;/*NEWLINE;*/
 	YY_BREAK
 case 63:
 YY_RULE_SETUP
-#line 319 "detex.l"
+#line 322 "../../../texk/detex/detex-src/detex.l"
 ;/*NEWLINE;*/
 	YY_BREAK
 case 64:
 YY_RULE_SETUP
-#line 321 "detex.l"
+#line 324 "../../../texk/detex/detex-src/detex.l"
 /* ignore args  */	{KILLARGS(1); IGNORE;}
 	YY_BREAK
 case 65:
 YY_RULE_SETUP
-#line 322 "detex.l"
+#line 325 "../../../texk/detex/detex-src/detex.l"
 /* of these \cs */	{KILLARGS(1); IGNORE;}
 	YY_BREAK
 case 66:
 YY_RULE_SETUP
-#line 323 "detex.l"
+#line 326 "../../../texk/detex/detex-src/detex.l"
 {KILLARGS(1); IGNORE;}
 	YY_BREAK
 case 67:
 YY_RULE_SETUP
-#line 324 "detex.l"
+#line 327 "../../../texk/detex/detex-src/detex.l"
 {KILLARGS(1);} /* kill space before */
 	YY_BREAK
 case 68:
 YY_RULE_SETUP
-#line 325 "detex.l"
+#line 328 "../../../texk/detex/detex-src/detex.l"
 {LATEX; KILLARGS(1); IGNORE;}
 	YY_BREAK
 case 69:
 YY_RULE_SETUP
-#line 326 "detex.l"
+#line 329 "../../../texk/detex/detex-src/detex.l"
 {LATEX; KILLARGS(1); IGNORE;}
 	YY_BREAK
 case 70:
 YY_RULE_SETUP
-#line 327 "detex.l"
+#line 330 "../../../texk/detex/detex-src/detex.l"
 {KILLARGS(1); IGNORE;}
 	YY_BREAK
 case 71:
 YY_RULE_SETUP
-#line 328 "detex.l"
+#line 331 "../../../texk/detex/detex-src/detex.l"
 {KILLARGS(1); IGNORE;}
 	YY_BREAK
 case 72:
 YY_RULE_SETUP
-#line 329 "detex.l"
+#line 332 "../../../texk/detex/detex-src/detex.l"
 {KILLARGS(1);}
 	YY_BREAK
 case 73:
 YY_RULE_SETUP
-#line 330 "detex.l"
+#line 333 "../../../texk/detex/detex-src/detex.l"
 {KILLARGS(1);}
 	YY_BREAK
 /*<Normal>"\\footnote"				{KILLARGS(1); SPACE;}*/
 case 74:
 YY_RULE_SETUP
-#line 332 "detex.l"
+#line 335 "../../../texk/detex/detex-src/detex.l"
 {KILLARGS(1); IGNORE;}
 	YY_BREAK
 case 75:
 YY_RULE_SETUP
-#line 333 "detex.l"
+#line 336 "../../../texk/detex/detex-src/detex.l"
 {CITE(1); IGNORE;}
 	YY_BREAK
 case 76:
 YY_RULE_SETUP
-#line 334 "detex.l"
+#line 337 "../../../texk/detex/detex-src/detex.l"
 {CITE(1); IGNORE;}
 	YY_BREAK
 case 77:
 YY_RULE_SETUP
-#line 335 "detex.l"
+#line 338 "../../../texk/detex/detex-src/detex.l"
 {KILLARGS(1); IGNORE;}
 	YY_BREAK
 case 78:
 YY_RULE_SETUP
-#line 336 "detex.l"
+#line 339 "../../../texk/detex/detex-src/detex.l"
 {CITE(1); IGNORE;}
 	YY_BREAK
 case 79:
 YY_RULE_SETUP
-#line 337 "detex.l"
+#line 340 "../../../texk/detex/detex-src/detex.l"
 {KILLARGS(2); IGNORE;}
 	YY_BREAK
 case 80:
 YY_RULE_SETUP
-#line 338 "detex.l"
+#line 341 "../../../texk/detex/detex-src/detex.l"
 {KILLARGS(2); IGNORE;}
 	YY_BREAK
 case 81:
 YY_RULE_SETUP
-#line 339 "detex.l"
+#line 342 "../../../texk/detex/detex-src/detex.l"
 { KILLARGS(1); }
 	YY_BREAK
 case 82:
 YY_RULE_SETUP
-#line 340 "detex.l"
+#line 343 "../../../texk/detex/detex-src/detex.l"
 { KILLARGS(2); }
 	YY_BREAK
 case 83:
 YY_RULE_SETUP
-#line 342 "detex.l"
+#line 345 "../../../texk/detex/detex-src/detex.l"
 {KILLARGS(1);}
 	YY_BREAK
 case 84:
 /* rule 84 can match eol */
 YY_RULE_SETUP
-#line 344 "detex.l"
+#line 347 "../../../texk/detex/detex-src/detex.l"
 {
 							putchar('(');
 							footnoteLevel = currBracesLevel;
@@ -2606,171 +2640,186 @@ YY_RULE_SETUP
 	YY_BREAK
 case 85:
 YY_RULE_SETUP
-#line 349 "detex.l"
-/* ignore \verb<ch>...<ch> */	{   if (fLatex) {
-						 	char verbchar, c;
-						 	verbchar = input();
-						 	while ((c = input()) != verbchar)
-							    /*if (c == '\n')
-								NEWLINE;*/
-								putchar(c);
-						    }
-						    IGNORE;
+#line 352 "../../../texk/detex/detex-src/detex.l"
+/* ignore \verb<ch>...<ch> */	{
+  /* Sorry to use different formatting, but it seemed better not
+     to cram all this code over in the rightmost 20 chars. */
+  if (fLatex) {
+    char verbchar, c;
+    verbchar = input();
+    if (verbchar != EOF) {
+      while ((c = input()) != verbchar && c != '\n' && c != EOF) {
+        putchar(c);
+      }
+    }
+    /* would be nice to include input filenames and line numbers */
+    if (verbchar == EOF || c == EOF) {
+      /* do this test first in case verbchar is eof */
+      ErrorExit("\\verb not complete before eof");
+    }
+    if (c == '\n') {
+      char delim[2];
+      delim[0] = verbchar;
+      delim[1] = 0;
+      Warning("\\verb not terminated before eol, delimiter", delim);
+    }
+  }
+  IGNORE;
 						}
 	YY_BREAK
 case 86:
 YY_RULE_SETUP
-#line 360 "detex.l"
+#line 378 "../../../texk/detex/detex-src/detex.l"
 { LATEX; KILLARGS(2); }
 	YY_BREAK
 case 87:
 YY_RULE_SETUP
-#line 361 "detex.l"
+#line 379 "../../../texk/detex/detex-src/detex.l"
 { LATEX; KILLARGS(2); }
 	YY_BREAK
 case 88:
 YY_RULE_SETUP
-#line 362 "detex.l"
+#line 380 "../../../texk/detex/detex-src/detex.l"
 { LATEX; KILLARGS(3); }
 	YY_BREAK
 case 89:
 YY_RULE_SETUP
-#line 364 "detex.l"
+#line 382 "../../../texk/detex/detex-src/detex.l"
 /* ignore def begin */	{BEGIN Define; IGNORE;}
 	YY_BREAK
 case 90:
 YY_RULE_SETUP
-#line 365 "detex.l"
+#line 383 "../../../texk/detex/detex-src/detex.l"
 BEGIN Normal;
 	YY_BREAK
 case 91:
 /* rule 91 can match eol */
 YY_RULE_SETUP
-#line 366 "detex.l"
+#line 384 "../../../texk/detex/detex-src/detex.l"
 NEWLINE;
 	YY_BREAK
 case 92:
 YY_RULE_SETUP
-#line 367 "detex.l"
+#line 385 "../../../texk/detex/detex-src/detex.l"
 ;
 	YY_BREAK
 case 93:
 YY_RULE_SETUP
-#line 369 "detex.l"
+#line 387 "../../../texk/detex/detex-src/detex.l"
 /* formula mode */	{LaBEGIN LaFormula; NOUN;}
 	YY_BREAK
 case 94:
 YY_RULE_SETUP
-#line 370 "detex.l"
+#line 388 "../../../texk/detex/detex-src/detex.l"
 BEGIN Normal;
 	YY_BREAK
 case 95:
 /* rule 95 can match eol */
 YY_RULE_SETUP
-#line 371 "detex.l"
+#line 389 "../../../texk/detex/detex-src/detex.l"
 NEWLINE;
 	YY_BREAK
 case 96:
 YY_RULE_SETUP
-#line 372 "detex.l"
+#line 390 "../../../texk/detex/detex-src/detex.l"
 VERBNOUN;
 	YY_BREAK
 case 97:
 YY_RULE_SETUP
-#line 373 "detex.l"
+#line 391 "../../../texk/detex/detex-src/detex.l"
 ;
 	YY_BREAK
 case 98:
 YY_RULE_SETUP
-#line 375 "detex.l"
+#line 393 "../../../texk/detex/detex-src/detex.l"
 /* display mode */	{LaBEGIN LaDisplay; NOUN;}
 	YY_BREAK
 case 99:
 YY_RULE_SETUP
-#line 376 "detex.l"
+#line 394 "../../../texk/detex/detex-src/detex.l"
 BEGIN Normal;
 	YY_BREAK
 case 100:
 /* rule 100 can match eol */
 YY_RULE_SETUP
-#line 377 "detex.l"
+#line 395 "../../../texk/detex/detex-src/detex.l"
 NEWLINE;
 	YY_BREAK
 case 101:
 YY_RULE_SETUP
-#line 378 "detex.l"
+#line 396 "../../../texk/detex/detex-src/detex.l"
 VERBNOUN;
 	YY_BREAK
 case 102:
 YY_RULE_SETUP
-#line 379 "detex.l"
+#line 397 "../../../texk/detex/detex-src/detex.l"
 ;
 	YY_BREAK
 case 103:
 YY_RULE_SETUP
-#line 381 "detex.l"
+#line 399 "../../../texk/detex/detex-src/detex.l"
 /* display mode */	{BEGIN Display; NOUN;}
 	YY_BREAK
 case 104:
 YY_RULE_SETUP
-#line 382 "detex.l"
+#line 400 "../../../texk/detex/detex-src/detex.l"
 BEGIN Normal;
 	YY_BREAK
 case 105:
 /* rule 105 can match eol */
 YY_RULE_SETUP
-#line 383 "detex.l"
+#line 401 "../../../texk/detex/detex-src/detex.l"
 NEWLINE;
 	YY_BREAK
 case 106:
 YY_RULE_SETUP
-#line 384 "detex.l"
+#line 402 "../../../texk/detex/detex-src/detex.l"
 VERBNOUN;
 	YY_BREAK
 case 107:
 YY_RULE_SETUP
-#line 385 "detex.l"
+#line 403 "../../../texk/detex/detex-src/detex.l"
 ;
 	YY_BREAK
 case 108:
 YY_RULE_SETUP
-#line 387 "detex.l"
+#line 405 "../../../texk/detex/detex-src/detex.l"
 /* math mode */		{BEGIN Math; NOUN;}
 	YY_BREAK
 case 109:
 YY_RULE_SETUP
-#line 388 "detex.l"
+#line 406 "../../../texk/detex/detex-src/detex.l"
 BEGIN Normal;
 	YY_BREAK
 case 110:
 /* rule 110 can match eol */
 YY_RULE_SETUP
-#line 389 "detex.l"
+#line 407 "../../../texk/detex/detex-src/detex.l"
 ;
 	YY_BREAK
 case 111:
 YY_RULE_SETUP
-#line 390 "detex.l"
+#line 408 "../../../texk/detex/detex-src/detex.l"
 ;
 	YY_BREAK
 case 112:
 YY_RULE_SETUP
-#line 391 "detex.l"
+#line 409 "../../../texk/detex/detex-src/detex.l"
 VERBNOUN;
 	YY_BREAK
 case 113:
 YY_RULE_SETUP
-#line 392 "detex.l"
+#line 410 "../../../texk/detex/detex-src/detex.l"
 ;
 	YY_BREAK
 case 114:
 YY_RULE_SETUP
-#line 394 "detex.l"
+#line 412 "../../../texk/detex/detex-src/detex.l"
 /* process files */	{LaBEGIN LaInclude; IGNORE;}
 	YY_BREAK
 case 115:
 YY_RULE_SETUP
-#line 395 "detex.l"
+#line 413 "../../../texk/detex/detex-src/detex.l"
 {   IncludeFile(yytext);
 						    BEGIN Normal;
 						}
@@ -2778,27 +2827,27 @@ YY_RULE_SETUP
 case 116:
 /* rule 116 can match eol */
 YY_RULE_SETUP
-#line 398 "detex.l"
+#line 416 "../../../texk/detex/detex-src/detex.l"
 NEWLINE;
 	YY_BREAK
 case 117:
 YY_RULE_SETUP
-#line 399 "detex.l"
+#line 417 "../../../texk/detex/detex-src/detex.l"
 ;
 	YY_BREAK
 case 118:
 YY_RULE_SETUP
-#line 401 "detex.l"
+#line 419 "../../../texk/detex/detex-src/detex.l"
 {BEGIN IncludeOnly; IGNORE;}
 	YY_BREAK
 case 119:
 YY_RULE_SETUP
-#line 402 "detex.l"
+#line 420 "../../../texk/detex/detex-src/detex.l"
 AddInclude(yytext);
 	YY_BREAK
 case 120:
 YY_RULE_SETUP
-#line 403 "detex.l"
+#line 421 "../../../texk/detex/detex-src/detex.l"
 {   if (csbIncList == 0)
 							rgsbIncList[csbIncList++] = '\0';
 						    BEGIN Normal;
@@ -2807,22 +2856,22 @@ YY_RULE_SETUP
 case 121:
 /* rule 121 can match eol */
 YY_RULE_SETUP
-#line 407 "detex.l"
+#line 425 "../../../texk/detex/detex-src/detex.l"
 NEWLINE;
 	YY_BREAK
 case 122:
 YY_RULE_SETUP
-#line 408 "detex.l"
+#line 426 "../../../texk/detex/detex-src/detex.l"
 ;
 	YY_BREAK
 case 123:
 YY_RULE_SETUP
-#line 410 "detex.l"
+#line 428 "../../../texk/detex/detex-src/detex.l"
 /* process files */	{LaBEGIN LaSubfile; IGNORE;}
 	YY_BREAK
 case 124:
 YY_RULE_SETUP
-#line 411 "detex.l"
+#line 429 "../../../texk/detex/detex-src/detex.l"
 {   IncludeFile(yytext);
 						    BEGIN Normal;
 						}
@@ -2830,22 +2879,22 @@ YY_RULE_SETUP
 case 125:
 /* rule 125 can match eol */
 YY_RULE_SETUP
-#line 414 "detex.l"
+#line 432 "../../../texk/detex/detex-src/detex.l"
 NEWLINE;
 	YY_BREAK
 case 126:
 YY_RULE_SETUP
-#line 415 "detex.l"
+#line 433 "../../../texk/detex/detex-src/detex.l"
 ;
 	YY_BREAK
 case 127:
 YY_RULE_SETUP
-#line 417 "detex.l"
+#line 435 "../../../texk/detex/detex-src/detex.l"
 {BEGIN Input; IGNORE;}
 	YY_BREAK
 case 128:
 YY_RULE_SETUP
-#line 418 "detex.l"
+#line 436 "../../../texk/detex/detex-src/detex.l"
 {   InputFile(yytext);
 						    BEGIN Normal;
 						}
@@ -2853,66 +2902,66 @@ YY_RULE_SETUP
 case 129:
 /* rule 129 can match eol */
 YY_RULE_SETUP
-#line 421 "detex.l"
+#line 439 "../../../texk/detex/detex-src/detex.l"
 NEWLINE;
 	YY_BREAK
 case 130:
 YY_RULE_SETUP
-#line 422 "detex.l"
+#line 440 "../../../texk/detex/detex-src/detex.l"
 ;
 	YY_BREAK
 /* escaping commands */
 case 131:
 YY_RULE_SETUP
-#line 425 "detex.l"
+#line 443 "../../../texk/detex/detex-src/detex.l"
 putchar('/');
 	YY_BREAK
 case 132:
 YY_RULE_SETUP
-#line 426 "detex.l"
+#line 444 "../../../texk/detex/detex-src/detex.l"
 putchar('%');
 	YY_BREAK
 case 133:
 /* rule 133 can match eol */
 YY_RULE_SETUP
-#line 428 "detex.l"
+#line 446 "../../../texk/detex/detex-src/detex.l"
 /* handle ligatures */	{(void)printf("%.2s", yytext+1);}
 	YY_BREAK
 case 134:
 /* rule 134 can match eol */
 YY_RULE_SETUP
-#line 429 "detex.l"
+#line 447 "../../../texk/detex/detex-src/detex.l"
 {(void)printf("%.1s", yytext+1);}
 	YY_BREAK
 case 135:
 YY_RULE_SETUP
-#line 430 "detex.l"
+#line 448 "../../../texk/detex/detex-src/detex.l"
 {NEWLINE;}	/*BEGIN LaBreak;*/
 	YY_BREAK
 case 136:
 YY_RULE_SETUP
-#line 432 "detex.l"
+#line 450 "../../../texk/detex/detex-src/detex.l"
 /* ignore other \cs */	{BEGIN Control; IGNORE;}
 	YY_BREAK
 case 137:
 YY_RULE_SETUP
-#line 433 "detex.l"
+#line 451 "../../../texk/detex/detex-src/detex.l"
 SPACE;
 	YY_BREAK
 case 138:
 /* rule 138 can match eol */
 YY_RULE_SETUP
-#line 434 "detex.l"
+#line 452 "../../../texk/detex/detex-src/detex.l"
 NEWLINE;
 	YY_BREAK
 case 139:
 YY_RULE_SETUP
-#line 435 "detex.l"
+#line 453 "../../../texk/detex/detex-src/detex.l"
 IGNORE;
 	YY_BREAK
 case 140:
 YY_RULE_SETUP
-#line 436 "detex.l"
+#line 454 "../../../texk/detex/detex-src/detex.l"
 {  if (yytext==NULL || strlen(yytext)==0
 							|| atoi(yytext)>=0)
 							NEWLINE;
@@ -2921,85 +2970,85 @@ YY_RULE_SETUP
 	YY_BREAK
 case 141:
 YY_RULE_SETUP
-#line 442 "detex.l"
+#line 460 "../../../texk/detex/detex-src/detex.l"
 IGNORE;
 	YY_BREAK
 case 142:
 YY_RULE_SETUP
-#line 443 "detex.l"
+#line 461 "../../../texk/detex/detex-src/detex.l"
 IGNORE;
 	YY_BREAK
 case 143:
 /* rule 143 can match eol */
 YY_RULE_SETUP
-#line 444 "detex.l"
+#line 462 "../../../texk/detex/detex-src/detex.l"
 {BEGIN Normal; /*NEWLINE;*/}
 	YY_BREAK
 case 144:
 YY_RULE_SETUP
-#line 445 "detex.l"
+#line 463 "../../../texk/detex/detex-src/detex.l"
 {++currBracesLevel;BEGIN Normal; IGNORE;}
 	YY_BREAK
 case 145:
 YY_RULE_SETUP
-#line 446 "detex.l"
+#line 464 "../../../texk/detex/detex-src/detex.l"
 {BEGIN Normal; IGNORE;}
 	YY_BREAK
 case 146:
 YY_RULE_SETUP
-#line 447 "detex.l"
+#line 465 "../../../texk/detex/detex-src/detex.l"
 {yyless(0);BEGIN Normal;}
 	YY_BREAK
 case 147:
 YY_RULE_SETUP
-#line 449 "detex.l"
+#line 467 "../../../texk/detex/detex-src/detex.l"
 /* special characters */	IGNORE;
 	YY_BREAK
 case 148:
 YY_RULE_SETUP
-#line 450 "detex.l"
+#line 468 "../../../texk/detex/detex-src/detex.l"
 IGNORE;
 	YY_BREAK
 case 149:
 YY_RULE_SETUP
-#line 451 "detex.l"
+#line 469 "../../../texk/detex/detex-src/detex.l"
 SPACE;
 	YY_BREAK
 case 150:
 YY_RULE_SETUP
-#line 452 "detex.l"
+#line 470 "../../../texk/detex/detex-src/detex.l"
 putchar('-');
 	YY_BREAK
 case 151:
 YY_RULE_SETUP
-#line 453 "detex.l"
+#line 471 "../../../texk/detex/detex-src/detex.l"
 putchar('"');
 	YY_BREAK
 case 152:
 YY_RULE_SETUP
-#line 454 "detex.l"
+#line 472 "../../../texk/detex/detex-src/detex.l"
 putchar('\'');
 	YY_BREAK
 case 153:
 YY_RULE_SETUP
-#line 455 "detex.l"
+#line 473 "../../../texk/detex/detex-src/detex.l"
 putchar('"');
 	YY_BREAK
 case 154:
 YY_RULE_SETUP
-#line 456 "detex.l"
+#line 474 "../../../texk/detex/detex-src/detex.l"
 putchar('"');
 	YY_BREAK
 /* braces */
 case 155:
 YY_RULE_SETUP
-#line 459 "detex.l"
+#line 477 "../../../texk/detex/detex-src/detex.l"
 { ++currBracesLevel;
 							}
 	YY_BREAK
 case 156:
 YY_RULE_SETUP
-#line 461 "detex.l"
+#line 479 "../../../texk/detex/detex-src/detex.l"
 {
 							--currBracesLevel;
 							if (currBracesLevel == footnoteLevel) {
@@ -3010,7 +3059,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 157:
 YY_RULE_SETUP
-#line 468 "detex.l"
+#line 486 "../../../texk/detex/detex-src/detex.l"
 {   if (fWord)
 							(void)printf("%s\n", yytext);
 						    else
@@ -3019,39 +3068,39 @@ YY_RULE_SETUP
 	YY_BREAK
 case 158:
 YY_RULE_SETUP
-#line 473 "detex.l"
+#line 491 "../../../texk/detex/detex-src/detex.l"
 if (!fWord) ECHO;
 	YY_BREAK
 case 159:
 YY_RULE_SETUP
-#line 474 "detex.l"
+#line 492 "../../../texk/detex/detex-src/detex.l"
 { INCRLINENO; if (!fWord) ECHO; }
 	YY_BREAK
 case 160:
 /* rule 160 can match eol */
 YY_RULE_SETUP
-#line 475 "detex.l"
+#line 493 "../../../texk/detex/detex-src/detex.l"
 { if (!fWord) NEWLINE; }
 	YY_BREAK
 case 161:
 YY_RULE_SETUP
-#line 476 "detex.l"
+#line 494 "../../../texk/detex/detex-src/detex.l"
 if (!fWord) putchar('\t');
 	YY_BREAK
 case 162:
 YY_RULE_SETUP
-#line 478 "detex.l"
+#line 496 "../../../texk/detex/detex-src/detex.l"
 { BEGIN LaOptArg; }
 	YY_BREAK
 case 163:
 YY_RULE_SETUP
-#line 479 "detex.l"
+#line 497 "../../../texk/detex/detex-src/detex.l"
 { cOpenBrace++; }
 	YY_BREAK
 case 164:
 /* rule 164 can match eol */
 YY_RULE_SETUP
-#line 480 "detex.l"
+#line 498 "../../../texk/detex/detex-src/detex.l"
 {   cOpenBrace--; INCRLINENO;
 						    if (cOpenBrace == 0)
 						    {
@@ -3062,28 +3111,28 @@ YY_RULE_SETUP
 	YY_BREAK
 case 165:
 YY_RULE_SETUP
-#line 487 "detex.l"
+#line 505 "../../../texk/detex/detex-src/detex.l"
 ;
 	YY_BREAK
 case 166:
 YY_RULE_SETUP
-#line 488 "detex.l"
+#line 506 "../../../texk/detex/detex-src/detex.l"
 BEGIN LaMacro;	
 	YY_BREAK
 case 167:
 /* rule 167 can match eol */
 YY_RULE_SETUP
-#line 489 "detex.l"
+#line 507 "../../../texk/detex/detex-src/detex.l"
 ;
 	YY_BREAK
 case 168:
 YY_RULE_SETUP
-#line 491 "detex.l"
+#line 509 "../../../texk/detex/detex-src/detex.l"
 { BEGIN LaOptArg2; }
 	YY_BREAK
 case 169:
 YY_RULE_SETUP
-#line 492 "detex.l"
+#line 510 "../../../texk/detex/detex-src/detex.l"
 { if (cOpenBrace == 0)
 						    {
 							if (--cArgs==0)
@@ -3097,30 +3146,30 @@ YY_RULE_SETUP
 	YY_BREAK
 case 170:
 YY_RULE_SETUP
-#line 502 "detex.l"
+#line 520 "../../../texk/detex/detex-src/detex.l"
 {   cOpenBrace--; }
 	YY_BREAK
 case 171:
 YY_RULE_SETUP
-#line 503 "detex.l"
+#line 521 "../../../texk/detex/detex-src/detex.l"
 ;
 	YY_BREAK
 case 172:
 YY_RULE_SETUP
-#line 504 "detex.l"
+#line 522 "../../../texk/detex/detex-src/detex.l"
 BEGIN LaMacro2;	
 	YY_BREAK
 case 173:
 YY_RULE_SETUP
-#line 505 "detex.l"
+#line 523 "../../../texk/detex/detex-src/detex.l"
 ;
 	YY_BREAK
 case 174:
 YY_RULE_SETUP
-#line 506 "detex.l"
+#line 524 "../../../texk/detex/detex-src/detex.l"
 ECHO;
 	YY_BREAK
-#line 3124 "lex.yy.c"
+#line 3173 "../../../texk/detex/detex-src/detex.c"
 case YY_STATE_EOF(INITIAL):
 case YY_STATE_EOF(Define):
 case YY_STATE_EOF(Display):
@@ -3220,7 +3269,7 @@ case YY_STATE_EOF(LaPicture):
 				{
 				(yy_did_buffer_switch_on_eof) = 0;
 
-				if ( yywrap(  ) )
+				if ( yywrap( ) )
 					{
 					/* Note: because we've taken care in
 					 * yy_get_next_buffer() to have set up
@@ -3287,7 +3336,7 @@ static int yy_get_next_buffer (void)
 {
     	char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
 	char *source = (yytext_ptr);
-	int number_to_move, i;
+	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] )
@@ -3316,7 +3365,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++);
@@ -3329,7 +3378,7 @@ static int yy_get_next_buffer (void)
 
 	else
 		{
-			int num_to_read =
+			yy_size_t num_to_read =
 			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
 
 		while ( num_to_read <= 0 )
@@ -3343,7 +3392,7 @@ static int yy_get_next_buffer (void)
 
 			if ( b->yy_is_our_buffer )
 				{
-				int new_size = b->yy_buf_size * 2;
+				yy_size_t new_size = b->yy_buf_size * 2;
 
 				if ( new_size <= 0 )
 					b->yy_buf_size += b->yy_buf_size / 8;
@@ -3352,12 +3401,11 @@ static int yy_get_next_buffer (void)
 
 				b->yy_ch_buf = (char *)
 					/* Include room in for 2 EOB chars. */
-					yyrealloc( (void *) b->yy_ch_buf,
-							 (yy_size_t) (b->yy_buf_size + 2)  );
+					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 = NULL;
+				b->yy_ch_buf = 0;
 
 			if ( ! b->yy_ch_buf )
 				YY_FATAL_ERROR(
@@ -3385,7 +3433,7 @@ static int yy_get_next_buffer (void)
 		if ( number_to_move == YY_MORE_ADJ )
 			{
 			ret_val = EOB_ACT_END_OF_FILE;
-			yyrestart( yyin  );
+			yyrestart(yyin  );
 			}
 
 		else
@@ -3399,15 +3447,12 @@ static int yy_get_next_buffer (void)
 	else
 		ret_val = EOB_ACT_CONTINUE_SCAN;
 
-	if (((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
+	if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
 		/* Extend the array by 50%, plus the number we really need. */
-		int new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
-		YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc(
-			(void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf, (yy_size_t) new_size  );
+		yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
+		YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size  );
 		if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
 			YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
-		/* "- 2" to take care of EOB's */
-		YY_CURRENT_BUFFER_LVALUE->yy_buf_size = (int) (new_size - 2);
 	}
 
 	(yy_n_chars) += number_to_move;
@@ -3440,9 +3485,9 @@ static int yy_get_next_buffer (void)
 			{
 			yy_current_state = (int) yy_def[yy_current_state];
 			if ( yy_current_state >= 1362 )
-				yy_c = yy_meta[yy_c];
+				yy_c = yy_meta[(unsigned int) yy_c];
 			}
-		yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
+		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
 		}
 
 	return yy_current_state;
@@ -3468,9 +3513,9 @@ static int yy_get_next_buffer (void)
 		{
 		yy_current_state = (int) yy_def[yy_current_state];
 		if ( yy_current_state >= 1362 )
-			yy_c = yy_meta[yy_c];
+			yy_c = yy_meta[(unsigned int) yy_c];
 		}
-	yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
+	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
 	yy_is_jam = (yy_current_state == 1361);
 
 		return yy_is_jam ? 0 : yy_current_state;
@@ -3504,7 +3549,7 @@ static int yy_get_next_buffer (void)
 
 		else
 			{ /* need more input */
-			int offset = (int) ((yy_c_buf_p) - (yytext_ptr));
+			yy_size_t offset = (yy_c_buf_p) - (yytext_ptr);
 			++(yy_c_buf_p);
 
 			switch ( yy_get_next_buffer(  ) )
@@ -3521,14 +3566,14 @@ static int yy_get_next_buffer (void)
 					 */
 
 					/* Reset buffer status. */
-					yyrestart( yyin );
+					yyrestart(yyin );
 
 					/*FALLTHROUGH*/
 
 				case EOB_ACT_END_OF_FILE:
 					{
-					if ( yywrap(  ) )
-						return 0;
+					if ( yywrap( ) )
+						return EOF;
 
 					if ( ! (yy_did_buffer_switch_on_eof) )
 						YY_NEW_FILE;
@@ -3565,11 +3610,11 @@ static int yy_get_next_buffer (void)
 	if ( ! YY_CURRENT_BUFFER ){
         yyensure_buffer_stack ();
 		YY_CURRENT_BUFFER_LVALUE =
-            yy_create_buffer( yyin, YY_BUF_SIZE );
+            yy_create_buffer(yyin,YY_BUF_SIZE );
 	}
 
-	yy_init_buffer( YY_CURRENT_BUFFER, input_file );
-	yy_load_buffer_state(  );
+	yy_init_buffer(YY_CURRENT_BUFFER,input_file );
+	yy_load_buffer_state( );
 }
 
 /** Switch to a different input buffer.
@@ -3597,7 +3642,7 @@ static int yy_get_next_buffer (void)
 		}
 
 	YY_CURRENT_BUFFER_LVALUE = new_buffer;
-	yy_load_buffer_state(  );
+	yy_load_buffer_state( );
 
 	/* We don't actually know whether we did this switch during
 	 * EOF (yywrap()) processing, but the only time this flag
@@ -3625,22 +3670,22 @@ static void yy_load_buffer_state  (void)
 {
 	YY_BUFFER_STATE b;
     
-	b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state )  );
+	b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state )  );
 	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.
 	 */
-	b->yy_ch_buf = (char *) yyalloc( (yy_size_t) (b->yy_buf_size + 2)  );
+	b->yy_ch_buf = (char *) yyalloc(b->yy_buf_size + 2  );
 	if ( ! b->yy_ch_buf )
 		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
 
 	b->yy_is_our_buffer = 1;
 
-	yy_init_buffer( b, file );
+	yy_init_buffer(b,file );
 
 	return b;
 }
@@ -3659,9 +3704,9 @@ static void yy_load_buffer_state  (void)
 		YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
 
 	if ( b->yy_is_our_buffer )
-		yyfree( (void *) b->yy_ch_buf  );
+		yyfree((void *) b->yy_ch_buf  );
 
-	yyfree( (void *) b  );
+	yyfree((void *) b  );
 }
 
 /* Initializes or reinitializes a buffer.
@@ -3673,7 +3718,7 @@ static void yy_load_buffer_state  (void)
 {
 	int oerrno = errno;
     
-	yy_flush_buffer( b );
+	yy_flush_buffer(b );
 
 	b->yy_input_file = file;
 	b->yy_fill_buffer = 1;
@@ -3716,7 +3761,7 @@ static void yy_load_buffer_state  (void)
 	b->yy_buffer_status = YY_BUFFER_NEW;
 
 	if ( b == YY_CURRENT_BUFFER )
-		yy_load_buffer_state(  );
+		yy_load_buffer_state( );
 }
 
 /** Pushes the new state onto the stack. The new state becomes
@@ -3747,7 +3792,7 @@ void yypush_buffer_state (YY_BUFFER_STATE new_buffer )
 	YY_CURRENT_BUFFER_LVALUE = new_buffer;
 
 	/* copied from yy_switch_to_buffer. */
-	yy_load_buffer_state(  );
+	yy_load_buffer_state( );
 	(yy_did_buffer_switch_on_eof) = 1;
 }
 
@@ -3766,7 +3811,7 @@ void yypop_buffer_state (void)
 		--(yy_buffer_stack_top);
 
 	if (YY_CURRENT_BUFFER) {
-		yy_load_buffer_state(  );
+		yy_load_buffer_state( );
 		(yy_did_buffer_switch_on_eof) = 1;
 	}
 }
@@ -3784,15 +3829,15 @@ 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; /* After all that talk, this was set to 1 anyways... */
+		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*)
 								);
 		if ( ! (yy_buffer_stack) )
 			YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" );
-
+								  
 		memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
-
+				
 		(yy_buffer_stack_max) = num_to_alloc;
 		(yy_buffer_stack_top) = 0;
 		return;
@@ -3821,7 +3866,7 @@ static void yyensure_buffer_stack (void)
  * @param base the character buffer
  * @param size the size in bytes of the character buffer
  * 
- * @return the newly allocated buffer state object.
+ * @return the newly allocated buffer state object. 
  */
 YY_BUFFER_STATE yy_scan_buffer  (char * base, yy_size_t  size )
 {
@@ -3831,23 +3876,23 @@ YY_BUFFER_STATE yy_scan_buffer  (char * base, yy_size_t  size )
 	     base[size-2] != YY_END_OF_BUFFER_CHAR ||
 	     base[size-1] != YY_END_OF_BUFFER_CHAR )
 		/* They forgot to leave room for the EOB's. */
-		return NULL;
+		return 0;
 
-	b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state )  );
+	b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state )  );
 	if ( ! b )
 		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" );
 
-	b->yy_buf_size = (int) (size - 2);	/* "- 2" to take care of EOB's */
+	b->yy_buf_size = size - 2;	/* "- 2" to take care of EOB's */
 	b->yy_buf_pos = b->yy_ch_buf = base;
 	b->yy_is_our_buffer = 0;
-	b->yy_input_file = NULL;
+	b->yy_input_file = 0;
 	b->yy_n_chars = b->yy_buf_size;
 	b->yy_is_interactive = 0;
 	b->yy_at_bol = 1;
 	b->yy_fill_buffer = 0;
 	b->yy_buffer_status = YY_BUFFER_NEW;
 
-	yy_switch_to_buffer( b  );
+	yy_switch_to_buffer(b  );
 
 	return b;
 }
@@ -3860,10 +3905,10 @@ YY_BUFFER_STATE yy_scan_buffer  (char * base, yy_size_t  size )
  * @note If you want to scan bytes that may contain NUL values, then use
  *       yy_scan_bytes() instead.
  */
-YY_BUFFER_STATE yy_scan_string (const char * yystr )
+YY_BUFFER_STATE yy_scan_string (yyconst char * yystr )
 {
     
-	return yy_scan_bytes( yystr, (int) strlen(yystr) );
+	return yy_scan_bytes(yystr,strlen(yystr) );
 }
 
 /** Setup the input buffer state to scan the given bytes. The next call to yylex() will
@@ -3873,16 +3918,16 @@ YY_BUFFER_STATE yy_scan_string (const char * yystr )
  * 
  * @return the newly allocated buffer state object.
  */
-YY_BUFFER_STATE yy_scan_bytes  (const char * yybytes, int  _yybytes_len )
+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 = (yy_size_t) (_yybytes_len + 2);
-	buf = (char *) yyalloc( n  );
+	n = _yybytes_len + 2;
+	buf = (char *) yyalloc(n  );
 	if ( ! buf )
 		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" );
 
@@ -3891,7 +3936,7 @@ YY_BUFFER_STATE yy_scan_bytes  (const char * yybytes, int  _yybytes_len )
 
 	buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;
 
-	b = yy_scan_buffer( buf, n );
+	b = yy_scan_buffer(buf,n );
 	if ( ! b )
 		YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" );
 
@@ -3907,9 +3952,9 @@ YY_BUFFER_STATE yy_scan_bytes  (const char * yybytes, int  _yybytes_len )
 #define YY_EXIT_FAILURE 2
 #endif
 
-static void yynoreturn yy_fatal_error (const char* msg )
+static void yy_fatal_error (yyconst char* msg )
 {
-			fprintf( stderr, "%s\n", msg );
+			(void) fprintf( stderr, "%s\n", msg );
 	exit( YY_EXIT_FAILURE );
 }
 
@@ -3937,7 +3982,7 @@ static void yynoreturn yy_fatal_error (const char* msg )
  */
 int yyget_lineno  (void)
 {
-    
+        
     return yylineno;
 }
 
@@ -3960,7 +4005,7 @@ FILE *yyget_out  (void)
 /** Get the length of the current token.
  * 
  */
-int yyget_leng  (void)
+yy_size_t yyget_leng  (void)
 {
         return yyleng;
 }
@@ -4016,10 +4061,10 @@ static int yy_init_globals (void)
      * This function is called from yylex_destroy(), so don't allocate here.
      */
 
-    (yy_buffer_stack) = NULL;
+    (yy_buffer_stack) = 0;
     (yy_buffer_stack_top) = 0;
     (yy_buffer_stack_max) = 0;
-    (yy_c_buf_p) = NULL;
+    (yy_c_buf_p) = (char *) 0;
     (yy_init) = 0;
     (yy_start) = 0;
 
@@ -4028,8 +4073,8 @@ static int yy_init_globals (void)
     yyin = stdin;
     yyout = stdout;
 #else
-    yyin = NULL;
-    yyout = NULL;
+    yyin = (FILE *) 0;
+    yyout = (FILE *) 0;
 #endif
 
     /* For future reference: Set errno on error, since we are called by
@@ -4044,7 +4089,7 @@ int yylex_destroy  (void)
     
     /* Pop the buffer stack, destroying each element. */
 	while(YY_CURRENT_BUFFER){
-		yy_delete_buffer( YY_CURRENT_BUFFER  );
+		yy_delete_buffer(YY_CURRENT_BUFFER  );
 		YY_CURRENT_BUFFER_LVALUE = NULL;
 		yypop_buffer_state();
 	}
@@ -4065,7 +4110,7 @@ int yylex_destroy  (void)
  */
 
 #ifndef yytext_ptr
-static void yy_flex_strncpy (char* s1, const char * s2, int n )
+static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
 {
 		
 	int i;
@@ -4075,7 +4120,7 @@ static void yy_flex_strncpy (char* s1, const char * s2, int n )
 #endif
 
 #ifdef YY_NEED_STRLEN
-static int yy_flex_strlen (const char * s )
+static int yy_flex_strlen (yyconst char * s )
 {
 	int n;
 	for ( n = 0; s[n]; ++n )
@@ -4087,7 +4132,7 @@ static int yy_flex_strlen (const char * s )
 
 void *yyalloc (yy_size_t  size )
 {
-			return malloc(size);
+			return (void *) malloc( size );
 }
 
 void *yyrealloc  (void * ptr, yy_size_t  size )
@@ -4100,7 +4145,7 @@ void *yyrealloc  (void * ptr, yy_size_t  size )
 	 * any pointer type to void*, and deal with argument conversions
 	 * as though doing an assignment.
 	 */
-	return realloc(ptr, size);
+	return (void *) realloc( (char *) ptr, size );
 }
 
 void yyfree (void * ptr )
@@ -4110,7 +4155,8 @@ void yyfree (void * ptr )
 
 #define YYTABLES_NAME "yytables"
 
-#line 506 "detex.l"
+#line 524 "../../../texk/detex/detex-src/detex.l"
+
 
 
 /******
@@ -4264,8 +4310,8 @@ yywrap(void)
         /* Pop context state */
 	if (csb > 0) {
 		free(fFileNames[csb]);
-		yy_delete_buffer( YY_CURRENT_BUFFER );
-		yy_switch_to_buffer( rgsb[--csb] );
+		yy_delete_buffer(YY_CURRENT_BUFFER );
+		yy_switch_to_buffer(rgsb[--csb] );
 	}
 #endif /* FLEX_SCANNER */
 	if (cfp > 0) {
@@ -4434,7 +4480,7 @@ InputFile(char *sbFile)
 	rgsb[csb++]     = YY_CURRENT_BUFFER;
 	fFileLines[csb] = 1;
 	fFileNames[csb] = strdup(sbFile);
-	yy_switch_to_buffer(yy_create_buffer( yyin, YY_BUF_SIZE ) );
+	yy_switch_to_buffer(yy_create_buffer(yyin,YY_BUF_SIZE ) );
 #endif /* FLEX_SCANNER */
 }
 
@@ -4462,7 +4508,7 @@ IncludeFile(char *sbFile)
 	rgsb[csb++]     = YY_CURRENT_BUFFER;
 	fFileLines[csb] = 1;
 	fFileNames[csb] = strdup(sbFile);
-	yy_switch_to_buffer(yy_create_buffer( yyin, YY_BUF_SIZE ) );
+	yy_switch_to_buffer(yy_create_buffer(yyin,YY_BUF_SIZE ) );
 #endif /* FLEX_SCANNER */
 }
 
@@ -4701,7 +4747,8 @@ UsageExit(void)
 {
 	(void)printf("\n%s [ -clnrstw1 ] [ -e environment-list ] [ filename[.tex] ... ]\n",
 		sbProgName);
-	puts("  -c  echo LaTeX \\cite, \\ref, and \\pageref values\n  \
+	puts("Strip (La)TeX commands from the input.\n\n  \
+-c  echo LaTeX \\cite, \\ref, and \\pageref values\n  \
 -e  <env-list> list of LaTeX environments to ignore\n  \
 -l  force latex mode\n  \
 -n  do not follow \\input, \\include and \\subfile\n  \
@@ -4710,7 +4757,10 @@ UsageExit(void)
 -t  force tex mode\n  \
 -w  word only output\n  \
 -1  outputs the original file name and line number in the beginning of each line\n  \
--v  show program version and exit");
+-v  show program version and exit\n\
+\n\
+opendetex home page: https://github.com/pkubowicz/opendetex");
+	(void)printf("opendetex version %s\n", VERSION);
 	exit(0);
 }
 
@@ -4721,8 +4771,7 @@ UsageExit(void)
 void
 VersionExit(void)
 {
-	(void)printf("\nOpenDetex version %s\nhttps://github.com/pkubowicz/opendetex\n",
-		VERSION);
+	(void)printf("\nopendetex version %s\n", VERSION);
 	exit(0);
 }
 
diff --git a/Build/source/texk/detex/detex-src/detex.l b/Build/source/texk/detex/detex-src/detex.l
index 0b0590a97ff..2f55fdaeaba 100644
--- a/Build/source/texk/detex/detex-src/detex.l
+++ b/Build/source/texk/detex/detex-src/detex.l
@@ -110,7 +110,10 @@
 #define STRIPARGS(x)	cArgs=x; LaBEGIN LaMacro2
 #define	CITE(x)		if (fLatex && !fCite) KILLARGS(x)
 
+/* avoid gratuitous gcc warning from passing -D for this on command line */
+#ifndef NO_MALLOC_DECL
 #define NO_MALLOC_DECL
+#endif
 
 void LineBreak();
 void Ignore();
@@ -346,15 +349,30 @@ VERBSYMBOL	=|\\leq|\\geq|\\in|>|<|\\subseteq|\subseteq|\\subset|\\supset|\\sim|\
 							footnoteLevel = currBracesLevel;
 							++currBracesLevel;
 							}
-<Normal>"\\verb" /* ignore \verb<ch>...<ch> */	{   if (fLatex) {
-						 	char verbchar, c;
-						 	verbchar = input();
-						 	while ((c = input()) != verbchar)
-							    /*if (c == '\n')
-								NEWLINE;*/
-								putchar(c);
-						    }
-						    IGNORE;
+<Normal>"\\verb" /* ignore \verb<ch>...<ch> */	{
+  /* Sorry to use different formatting, but it seemed better not
+     to cram all this code over in the rightmost 20 chars. */
+  if (fLatex) {
+    char verbchar, c;
+    verbchar = input();
+    if (verbchar != EOF) {
+      while ((c = input()) != verbchar && c != '\n' && c != EOF) {
+        putchar(c);
+      }
+    }
+    /* would be nice to include input filenames and line numbers */
+    if (verbchar == EOF || c == EOF) {
+      /* do this test first in case verbchar is eof */
+      ErrorExit("\\verb not complete before eof");
+    }
+    if (c == '\n') {
+      char delim[2];
+      delim[0] = verbchar;
+      delim[1] = 0;
+      Warning("\\verb not terminated before eol, delimiter", delim);
+    }
+  }
+  IGNORE;
 						}
 
 <Normal>"\\newcommand"				{ LATEX; KILLARGS(2); }
@@ -1093,7 +1111,8 @@ UsageExit(void)
 {
 	(void)printf("\n%s [ -clnrstw1 ] [ -e environment-list ] [ filename[.tex] ... ]\n",
 		sbProgName);
-	puts("  -c  echo LaTeX \\cite, \\ref, and \\pageref values\n  \
+	puts("Strip (La)TeX commands from the input.\n\n  \
+-c  echo LaTeX \\cite, \\ref, and \\pageref values\n  \
 -e  <env-list> list of LaTeX environments to ignore\n  \
 -l  force latex mode\n  \
 -n  do not follow \\input, \\include and \\subfile\n  \
@@ -1102,7 +1121,10 @@ UsageExit(void)
 -t  force tex mode\n  \
 -w  word only output\n  \
 -1  outputs the original file name and line number in the beginning of each line\n  \
--v  show program version and exit");
+-v  show program version and exit\n\
+\n\
+opendetex home page: https://github.com/pkubowicz/opendetex");
+	(void)printf("opendetex version %s\n", VERSION);
 	exit(0);
 }
 
@@ -1113,7 +1135,6 @@ UsageExit(void)
 void
 VersionExit(void)
 {
-	(void)printf("\nOpenDetex version %s\nhttps://github.com/pkubowicz/opendetex\n",
-		VERSION);
+	(void)printf("\nopendetex version %s\n", VERSION);
 	exit(0);
 }
diff --git a/Build/source/texk/detex/detex-src/detex.man b/Build/source/texk/detex/detex-src/detex.man
index caa480e519a..9640906d878 100644
--- a/Build/source/texk/detex/detex-src/detex.man
+++ b/Build/source/texk/detex/detex-src/detex.man
@@ -1,4 +1,4 @@
-.TH DETEX 1 "30 August 2022" "Purdue University"
+.TH DETEX 1 "15 September 2022" "TeX Live"
 .SH NAME
 detex \- a filter to strip \fITeX\fP commands from a .tex file.
 .SH SYNOPSIS
@@ -120,15 +120,17 @@ exceed the system's limit on the number of simultaneously opened files.
 .I Detex
 ignores unrecognized option characters after printing a warning message.
 .SH AUTHOR
-Originally written by Daniel Trinkle, Computer Science Department, Purdue University
+Originally written by Daniel Trinkle, Computer Science Department,
+Purdue University.
 .PP
 Maintained by Piotr Kubowicz <https://github.com/pkubowicz/opendetex>.
 .SH BUGS
 .I Detex
-is not a complete
+is not a
 .I TeX
-interpreter, so it can be confused by some constructs.
-Most errors result in too much rather than too little output.
+interpreter (it essentially reads the input with a (f)lex program), so
+it is easily confused by some constructs. Most errors result in too much
+rather than too little output.
 .PP
 Running \fILaTeX\fR
 source without a ``\\begin{document}''
diff --git a/Build/source/texk/detex/testverb.tex b/Build/source/texk/detex/testverb.tex
new file mode 100644
index 00000000000..3cea97c0611
--- /dev/null
+++ b/Build/source/texk/detex/testverb.tex
@@ -0,0 +1,22 @@
+% $Id$
+% Sadly, this is not tested as part of make check; if you feel so
+% inclined, please add it. For now, just including the file for the record.
+% 
+% The problem was that the \verb parsing in detex.l did not check for
+% going past eof when looking for the matching delimiter. With random
+% stuff following the \verb, this would typically cause a crash ("in
+% __memmove_avx_unaligned_erms") as buffers filled with junk.
+% 
+% Testing for eof before the opening delimiter catches another case in
+% the code.
+% 
+% Also, as long as we're here, might as well check that the closing
+% delimiter is found on the same line as the opening, since that's what
+% LaTeX requires.
+% 
+% Bug report sent by Preston Moore to tlsecurity, 08 Jun 2022 22:21:28.
+%
+\begin{document} % force interpretation as LaTeX
+\verb+ok+
+\verb|
+\verb