web2c: Fixed a typo in e-TeX comment and other minor cleanup

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

16 files changed, 63 insertions, 184 deletions

diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index 806f0e8cc38..3554137ecab 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -4,6 +4,13 @@
 	glob_str_size > buf_size, because buf_size can be changed dynamically,
 	whereas ent_str_size and glob_str_size are constants.
  
+2012-04-08  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* texmfmp.h (mk_shellcmdlist, init_shell_escape,
+	shell_cmd_is_allowed, normalize_quotes): Drop extern decls.
+	(get_seconds_and_micros): Declare only for pdfTeX.
+	(getrandomseed, callmakempx): Removed, MP only.
+
 2012-03-04  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	Avoid 'differ in signedness' warnings.
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index e5bb7d06fb7..8087df40652 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -1422,20 +1422,19 @@ EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h \
 	triptrap/tripos.tex triptrap/writeo triptrap/writeo.2 \
 	mplibdir/ChangeLog $(mpost_web) $(mp_tests) $(libmplib_web) \
 	$(etex_web_srcs) $(etex_ch_srcs) etexdir/ChangeLog \
-	etexdir/INSTALL etexdir/README etexdir/etex_gen.tex \
-	$(etex_tests) tests/wprob.tex etexdir/etrip/etrip.diffs \
-	etexdir/etrip/etrip.fot etexdir/etrip/etrip.log \
-	etexdir/etrip/etrip.out etexdir/etrip/etrip.pl \
-	etexdir/etrip/etrip.tex etexdir/etrip/etrip.typ \
-	etexdir/etrip/etrip1.in etexdir/etrip/etrip2.in \
-	etexdir/etrip/etrip3.in etexdir/etrip/etripin.log \
-	etexdir/etrip/etripman.tex etexdir/etrip/texmf.cnf \
-	etexdir/etrip/trip2.in $(ptex_tests) $(pweb_tests) \
-	$(ptex_web_srcs) $(ptex_ch_srcs) ptexdir/ptex.defines \
-	ptexdir/pbibtex.ch web2c/cvtbib.sed ptexdir/pdvitype.ch \
-	ptexdir/ppltotf.ch ptexdir/ptftopl.ch ptexdir/COPYRIGHT \
-	ptexdir/COPYRIGHT.jis ptexdir/ChangeLog ptexdir/Changes.txt \
-	ptexdir/INSTALL.txt ptexdir/README.txt \
+	etexdir/etex_gen.tex $(etex_tests) tests/wprob.tex \
+	etexdir/etrip/etrip.diffs etexdir/etrip/etrip.fot \
+	etexdir/etrip/etrip.log etexdir/etrip/etrip.out \
+	etexdir/etrip/etrip.pl etexdir/etrip/etrip.tex \
+	etexdir/etrip/etrip.typ etexdir/etrip/etrip1.in \
+	etexdir/etrip/etrip2.in etexdir/etrip/etrip3.in \
+	etexdir/etrip/etripin.log etexdir/etrip/etripman.tex \
+	etexdir/etrip/texmf.cnf etexdir/etrip/trip2.in $(ptex_tests) \
+	$(pweb_tests) $(ptex_web_srcs) $(ptex_ch_srcs) \
+	ptexdir/ptex.defines ptexdir/pbibtex.ch web2c/cvtbib.sed \
+	ptexdir/pdvitype.ch ptexdir/ppltotf.ch ptexdir/ptftopl.ch \
+	ptexdir/COPYRIGHT ptexdir/COPYRIGHT.jis ptexdir/ChangeLog \
+	ptexdir/Changes.txt ptexdir/INSTALL.txt ptexdir/README.txt \
 	ptexdir/tests/nissya_bib.aux ptexdir/tests/nissya.bst \
 	ptexdir/tests/sample.bib tests/memdata1.bst tests/memdata2.bst \
 	tests/memdata3.bst ptexdir/tests/goth10.tfm \
diff --git a/Build/source/texk/web2c/alephdir/ChangeLog b/Build/source/texk/web2c/alephdir/ChangeLog
index db524ba81d3..8e5a6752d33 100644
--- a/Build/source/texk/web2c/alephdir/ChangeLog
+++ b/Build/source/texk/web2c/alephdir/ChangeLog
@@ -1,3 +1,7 @@
+2012-04-11  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* eobase.ch: Fixed a typo in TeX text (for e-TeX).
+
 2012-02-16  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* com16bit.ch: Remove test for end-of-file after undump.
diff --git a/Build/source/texk/web2c/alephdir/eobase.ch b/Build/source/texk/web2c/alephdir/eobase.ch
index 5001be06da6..d03011e1edd 100644
--- a/Build/source/texk/web2c/alephdir/eobase.ch
+++ b/Build/source/texk/web2c/alephdir/eobase.ch
@@ -48,8 +48,8 @@
 % TeX is a trademark of the American Mathematical Society.
 % METAFONT is a trademark of Addison-Wesley Publishing Company.
 @y
-
-% e-TeX is copyright (C) 1994,98 by the NTS team; all rights are reserved.
+% e-TeX is copyright (C) 1999-2012 by P. Breitenlohner (1994,98 by the NTS
+% team); all rights are reserved.
 
 % e-TeX and NTS are trademarks of the NTS group.
 % TeX is a trademark of the American Mathematical Society.
@@ -3660,7 +3660,7 @@ f:=cur_val
 procedure@?scan_normal_glue; forward;@t\2@>@/
 procedure@?scan_mu_glue; forward;@t\2@>
 
-@ Here we declare to trivial procedures in order to avoid mutually
+@ Here we declare two trivial procedures in order to avoid mutually
 recursive procedures with parameters.
 
 @<Declare procedures needed for expressions@>=
diff --git a/Build/source/texk/web2c/etexdir/ChangeLog b/Build/source/texk/web2c/etexdir/ChangeLog
index ee9f3889179..2da4c04c04c 100644
--- a/Build/source/texk/web2c/etexdir/ChangeLog
+++ b/Build/source/texk/web2c/etexdir/ChangeLog
@@ -1,3 +1,10 @@
+2012-04-11  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* etex.ch: Fixed a typo in TeX text.
+
+	* INSTALL, README: Removed these obsolete files.
+	* am/etex.am (EXTRA_DIST): Removed INSTALL and README.
+
 2011-09-30  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* wprob.test: New shell script to test for uninitialized line.
diff --git a/Build/source/texk/web2c/etexdir/INSTALL b/Build/source/texk/web2c/etexdir/INSTALL
deleted file mode 100644
index 71579017187..00000000000
--- a/Build/source/texk/web2c/etexdir/INSTALL
+++ /dev/null
@@ -1,98 +0,0 @@
-Contents:
-
-Installation
-  Additional `configure' options
-  Additional targets
-  Trip, etrip, trap, and mptrap: Torture tests
-
-
-Installation
-************
-
-  Installing e-TeX requires that you have already installed the Web2c
-source tree (either `web-7.2.tar.gz' and `web2c-7.2.tar.gz' with
-`web2c-7.2' as top-level directory, or `texk-7.2.tar.gz' with `texk-7.2').
-See web2c/INSTALL for details.
-
-Unpack the distribution file `web2c-7.2-etex-2.0.tar.gz' in the parent of
-the top-level directory. If necessary move the directory
-`<top_level>/web2c/etexdir' containing all e-TeX files into your source
-tree. Then (re-)configure the whole source tree.
-
-You will also need some e-TeX specific files in the TDS tree. Change to
-to the TDS root (`<texmf>') and unpack the distribution file
-`etexlib-2.0.tar.gz'. If you have already installed an earlier version,
-first remove the directory `<texmf>/etex' containing all the old files.
-
-Additional `configure' options
-==============================
-
-  This section describes only the e-TeX specific `configure' options,
-for the general Web2c `configure' options see `../INSTALL'.
-
-`--without-etex'
-`--with-etex=no'
-     Do not automatically generate and install e-TeX and e-TeX formats
-     (as part of `make' resp. `make install').
-
-`--with-etex=yes'
-`--with-etex=etex'
-     Automatically generate and install e-TeX and e-TeX formats (in
-     extended mode) in addition to TeX and TeX formats. This is the default.
-
-`--with-etex=tex'
-     Automatically generate e-TeX and e-TeX formats (in compatibility as
-     well as extended mode) and install them, using e-TeX instead of TeX.
-     Do not install TeX and TeX formats.
-
-Additional targets
-==================
-
-  e-TeX adds some new Web2c Make targets and the e-TeX specific `configure'
-options described above influence the behaviour of some other targets.
-
-`formats'
-`install-formats'
-     Make or install all the memory dumps (*note Memory dumps::.).  By
-     default, the standard plain formats plus `latex.fmt' or `latex.efmt'
-     plus possibly `elatex.efmt' are made.  The `latex.efmt' is in e-TeX
-     compatibility mode, to be used when e-TeX is installed instead of TeX;
-     the `elatex.efmt' is in extended mode.  You can add other formats by
-     redefining the `fmts', `cfmts', `efmts', `bases', and `mems' variables.
-     See the top of `web2c/Makefile' for the possibilities.
-
-`triptrap'
-`trip'
-`etrip'
-`trap'
-`mptrap'
-     To run the torture tests for TeX, e-TeX, Metafont, and MetaPost
-     (respectively).  See the next section.
-
-Trip, etrip, trap, and mptrap: Torture tests
-============================================
-
-  To validate your TeX and/or e-TeX, Metafont, and MetaPost executables,
-run `make triptrap'.  This runs the trip and/or etrip, trap, and mptrap
-"torture tests".  See the files `triptrap/tripman.tex', 
-`etexdir/etrip/etripman.tex', `triptrap/trapman.tex', and
-`triptrap/mptrap.readme' for detailed information and background on the
-tests.
-
-  The differences between your executables' behavior and the standard
-values will show up on your terminal.  See the file `./INSTALL' for the
-acceptable differences.
-
-  The files `trip.diffs', `mftrap.diffs', and `mptrap.diffs' in the
-`triptrap' directory and `etexdir/etrip/etrip.diffs' show the standard diffs
-against the original output.  If you diff your diffs against these files,
-you should come up clean.  For example
-     make etrip >&myetrip.diffs
-     diff etexdir/etrip/etrip.diffs myetrip.diffs
-
-  To run the tests separately, use the targets `trip', `etrip', `trap', and
-`mptrap'.  Warning: with the `configure' option `--without-etex' the target
-`etrip' will cause Make to first generate the e-TeX executable; similarly
-with the `configure' option `--with-etex=tex' the target `trip' will cause
-Make to first generate the TeX executable.
-
diff --git a/Build/source/texk/web2c/etexdir/README b/Build/source/texk/web2c/etexdir/README
deleted file mode 100644
index 87864b2aa1c..00000000000
--- a/Build/source/texk/web2c/etexdir/README
+++ /dev/null
@@ -1,16 +0,0 @@
-This directory contains the Web2c implementation of e-TeX (Version 2.0).
-
-See `NEWS' for major changes by release, `ChangeLog` for all changes.
-See `INSTALL' for installation instructions.
-See `../../kpathsea/BUGS' for details on reporting bugs.
-
-e-TeX is copyright (C) 1994,97 by the NTS team; all rights are reserved.
-
-You can get the original e-TeX from http://www.rhbnc.ac.uk/e-TeX/ or
-from ftp://www.rhbnc.ac.uk/e-TeX/ (these URLs map to the identical fileset).
-Current information on e-TeX is also available at the same location.
-
-The original Web2c files can be obtained from
-ftp://ftpth.mppmu.mpg.de/e-TeX/latest
-
-Peter Breitenlohner <peb@mppmu.mpg.de>
diff --git a/Build/source/texk/web2c/etexdir/am/etex.am b/Build/source/texk/web2c/etexdir/am/etex.am
index 634ca86cc18..70fc4072f34 100644
--- a/Build/source/texk/web2c/etexdir/am/etex.am
+++ b/Build/source/texk/web2c/etexdir/am/etex.am
@@ -70,8 +70,6 @@ DISTCLEANFILES += $(nodist_etex_SOURCES) etex.web etex.ch etex-web2c \
 
 EXTRA_DIST += \
 	etexdir/ChangeLog \
-	etexdir/INSTALL \
-	etexdir/README \
 	etexdir/etex_gen.tex
 
 # e-TeX Tests
diff --git a/Build/source/texk/web2c/etexdir/etex.ch b/Build/source/texk/web2c/etexdir/etex.ch
index 551504aad59..7bb480e215e 100644
--- a/Build/source/texk/web2c/etexdir/etex.ch
+++ b/Build/source/texk/web2c/etexdir/etex.ch
@@ -3,7 +3,7 @@
 % to be applied to tex.web in order to define the
 % e-TeX program.
  
-% e-TeX is copyright (C) 1999-2011 by P. Breitenlohner (1994,98 by the NTS
+% e-TeX is copyright (C) 1999-2012 by P. Breitenlohner (1994,98 by the NTS
 % team); all rights are reserved. Copying of this file is authorized only if
 % (1) you are P. Breitenlohner, or if (2) you make absolutely no changes to
 % your copy. (Programs such as TIE allow the application of several change
@@ -29,7 +29,7 @@
 % TeX is a trademark of the American Mathematical Society.
 % METAFONT is a trademark of Addison-Wesley Publishing Company.
 @y
-% e-TeX is copyright (C) 1999-2011 by P. Breitenlohner (1994,98 by the NTS
+% e-TeX is copyright (C) 1999-2012 by P. Breitenlohner (1994,98 by the NTS
 % team); all rights are reserved. Copying of this file is authorized only if
 % (1) you are P. Breitenlohner, or if (2) you make absolutely no changes to
 % your copy. (Programs such as TIE allow the application of several change
@@ -4964,7 +4964,7 @@ f:=cur_val
 procedure@?scan_normal_glue; forward;@t\2@>@/
 procedure@?scan_mu_glue; forward;@t\2@>
 
-@ Here we declare to trivial procedures in order to avoid mutually
+@ Here we declare two trivial procedures in order to avoid mutually
 recursive procedures with parameters.
 
 @<Declare procedures needed for expressions@>=
diff --git a/Build/source/texk/web2c/lib/ChangeLog b/Build/source/texk/web2c/lib/ChangeLog
index d567c2e53c8..6ec9633bbdf 100644
--- a/Build/source/texk/web2c/lib/ChangeLog
+++ b/Build/source/texk/web2c/lib/ChangeLog
@@ -1,3 +1,10 @@
+2012-04-08  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* texmfmp.c (mk_shellcmdlist, init_shell_escape,
+	shell_cmd_is_allowed, normalize_quotes): Declare as static.
+	(get_seconds_and_micros): Define only for pdfTeX.
+	(getrandomseed): Removed, MP only.
+
 2012-03-04  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	Avoid 'differ in signedness' warnings.
diff --git a/Build/source/texk/web2c/lib/texmfmp.c b/Build/source/texk/web2c/lib/texmfmp.c
index d435d7cc466..eedba336354 100644
--- a/Build/source/texk/web2c/lib/texmfmp.c
+++ b/Build/source/texk/web2c/lib/texmfmp.c
@@ -200,7 +200,7 @@ Isspace (char c)
 
 static char **cmdlist = NULL;
 
-void 
+static void 
 mk_shellcmdlist (const char *v)
 {
   char **p;
@@ -245,7 +245,7 @@ mk_shellcmdlist (const char *v)
 /* Called from maininit.  Not static because also called from
    luatexdir/lua/luainit.c.  */
 
-void
+static void
 init_shell_escape (void)
 {
   if (shellenabledp < 0) {  /* --no-shell-escape on cmd line */
@@ -303,7 +303,7 @@ char_needs_quote (int c)
    should get executed.  And we set CMDNAME to its first word; this is
    what is checked against the shell_escape_commands list.  */
 
-int
+static int
 shell_cmd_is_allowed (const char *cmd, char **safecmd, char **cmdname)
 {
   char **p;
@@ -1302,7 +1302,7 @@ readtcxfile (void)
 #endif /* TeX || MF [character translation] */
 
 #ifdef XeTeX /* XeTeX handles this differently, and allows odd quotes within names */
-string
+static string
 normalize_quotes (const_string name, const_string mesg)
 {
     int quote_char = 0;
@@ -1349,7 +1349,7 @@ normalize_quotes (const_string name, const_string mesg)
 #else
 /* Normalize quoting of filename -- that is, only quote if there is a space,
    and always use the quote-name-quote style. */
-string
+static string
 normalize_quotes (const_string name, const_string mesg)
 {
     boolean quoted = false;
@@ -2023,6 +2023,7 @@ get_date_and_time (integer *minutes,  integer *day,
   }
 }
 
+#if defined(pdfTeX)
 /*
  Getting a high resolution time.
  */
@@ -2045,27 +2046,7 @@ get_seconds_and_micros (integer *seconds,  integer *micros)
   *micros  = 0;
 #endif
 }
-
-/*
-  Generating a better seed numbers
-  */
-integer
-getrandomseed(void)
-{
-#if defined (HAVE_GETTIMEOFDAY)
-  struct timeval tv;
-  gettimeofday(&tv, NULL);
-  return (tv.tv_usec + 1000000 * tv.tv_usec);
-#elif defined (HAVE_FTIME)
-  struct timeb tb;
-  ftime(&tb);
-  return (tb.millitm + 1000 * tb.time);
-#else
-  time_t myclock = time ((time_t*)NULL);
-  struct tm *tmptr = localtime(&myclock);
-  return (tmptr->tm_sec + 60*(tmptr->tm_min + 60*tmptr->tm_hour));
 #endif
-}
 
 /* Read a line of input as efficiently as possible while still looking
    like Pascal.  We set `last' to `first' and return `false' if we get
diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog
index 32435d1db6e..016109e2757 100644
--- a/Build/source/texk/web2c/pdftexdir/ChangeLog
+++ b/Build/source/texk/web2c/pdftexdir/ChangeLog
@@ -18,6 +18,10 @@
 	(get_pdf_suppress_warning_dup_map): new fn.
 	(warn_dest_dup): check pdf_suppress_warning_dup_dest.
 
+2012-04-11  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* pdftex.web: Fixed a typo in TeX text (for e-TeX).
+
 2012-01-18  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* writejbig2.c (getstreamlen): Change type to `off_t'.
diff --git a/Build/source/texk/web2c/pdftexdir/pdftex.web b/Build/source/texk/web2c/pdftexdir/pdftex.web
index fd9b470b437..9620180d691 100644
--- a/Build/source/texk/web2c/pdftexdir/pdftex.web
+++ b/Build/source/texk/web2c/pdftexdir/pdftex.web
@@ -15,7 +15,7 @@
 % You should have received a copy of the GNU General Public License along with
 % this program.  If not, see <http://www.gnu.org/licenses/>.
 
-% e-TeX is copyright (C) 1999-2011 by P. Breitenlohner (1994,98 by the NTS
+% e-TeX is copyright (C) 1999-2012 by P. Breitenlohner (1994,98 by the NTS
 % team); all rights are reserved. Copying of this file is authorized only if
 % (1) you are P. Breitenlohner, or if (2) you make absolutely no changes to
 % your copy. (Programs such as TIE allow the application of several change
@@ -38279,7 +38279,7 @@ f:=cur_val
 procedure@?scan_normal_glue; forward;@t\2@>@/
 procedure@?scan_mu_glue; forward;@t\2@>
 
-@ Here we declare to trivial procedures in order to avoid mutually
+@ Here we declare two trivial procedures in order to avoid mutually
 recursive procedures with parameters.
 
 @<Declare procedures needed for expressions@>=
diff --git a/Build/source/texk/web2c/texmfmp.h b/Build/source/texk/web2c/texmfmp.h
index c580374f15b..2f8cad65cc1 100644
--- a/Build/source/texk/web2c/texmfmp.h
+++ b/Build/source/texk/web2c/texmfmp.h
@@ -95,12 +95,6 @@ typedef void* voidpointer;
 #define OUT_FILE gffile
 #define OUT_BUF gfbuf
 #endif /* MF */
-#ifdef MP
-#define TEXMFPOOLNAME "mp.pool"
-#define TEXMFENGINENAME "metapost"
-#define DUMP_FILE memfile
-#define DUMP_FORMAT kpse_mem_format
-#endif /* MP */
 
 /* Restore underscores.  */
 #define kpsedvipsconfigformat kpse_dvips_config_format
@@ -111,7 +105,7 @@ typedef void* voidpointer;
 #define kpsetexpoolformat kpse_texpool_format
 #define kpsetexformat kpse_tex_format
 
-/* Hacks for TeX that are better not to #ifdef, see texmfmp.c.  */
+/* Hacks for TeX that are better not to #ifdef, see lib/openclose.c.  */
 extern int tfmtemp, texinputtype;
 
 /* pdfTeX uses these for pipe support */
@@ -125,9 +119,6 @@ extern void close_file_or_pipe (FILE *);
 #endif
 
 /* Executing shell commands.  */
-extern void mk_shellcmdlist (const char *);
-extern void init_shell_escape (void);
-extern int shell_cmd_is_allowed (const char *cmd, char **safecmd, char **cmdname);
 extern int runsystem (const char *cmd);
 
 /* The entry point.  */
@@ -143,8 +134,6 @@ extern string translate_filename;
 #define translatefilename translate_filename
 #endif
 
-extern string normalize_quotes (const_string name, const_string mesg);
-
 #ifdef TeX
 /* The type `glueratio' should be a floating point type which won't
    unnecessarily increase the size of the memoryword structure.  This is
@@ -199,12 +188,11 @@ extern boolean input_line (FILE *);
 #define	dateandtime(i,j,k,l) get_date_and_time (&(i), &(j), &(k), &(l))
 extern void get_date_and_time (integer *, integer *, integer *, integer *);
 
+#if defined(pdfTeX)
 /* Get high-res time info. */
 #define secondsandmicros(i,j) get_seconds_and_micros (&(i), &(j))
 extern void get_seconds_and_micros (integer *, integer *);
-
-/* This routine has to return a scaled value. */
-extern integer getrandomseed (void);
+#endif
 
 /* Copy command-line arguments into the buffer, despite the name.  */
 extern void topenin (void);
@@ -262,10 +250,6 @@ extern void topenin (void);
 #define dumpcore uexit (1)
 #endif
 
-#ifdef MP
-extern boolean callmakempx (string, string);
-#endif
-
 #ifdef MF
 extern boolean initscreen (void);
 extern void updatescreen (void);
diff --git a/Build/source/texk/web2c/web2c/ChangeLog b/Build/source/texk/web2c/web2c/ChangeLog
index a2459045767..e713b1c64e2 100644
--- a/Build/source/texk/web2c/web2c/ChangeLog
+++ b/Build/source/texk/web2c/web2c/ChangeLog
@@ -1,3 +1,7 @@
+2012-04-08  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* texmf.defines (callmakempx, getrandomseed): Removed, MP only.
+
 2012-03-04  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	Avoid 'differ in signedness' warnings.
diff --git a/Build/source/texk/web2c/web2c/texmf.defines b/Build/source/texk/web2c/web2c/texmf.defines
index bb7081c63a6..4a624aced2a 100644
--- a/Build/source/texk/web2c/web2c/texmf.defines
+++ b/Build/source/texk/web2c/web2c/texmf.defines
@@ -19,11 +19,9 @@
 
 @define function bopenin ();
 @define function bopenout ();
-@define function callmakempx ();
 @define function floorscaled ();
 @define function floorunscaled ();
 @define function getjobname ();
-@define function getrandomseed;
 @define function initscreen;
 @define function inputln ();
 @define function isnewsource ();