diff options
Diffstat (limited to 'Build')
55 files changed, 175 insertions, 74 deletions
diff --git a/Build/source/texk/dvipng/ChangeLog b/Build/source/texk/dvipng/ChangeLog index ff1e5a6fb3b..ddbbc34b370 100644 --- a/Build/source/texk/dvipng/ChangeLog +++ b/Build/source/texk/dvipng/ChangeLog @@ -1,3 +1,8 @@ +2010-03-09 Peter Breitenlohner <peb@mppmu.mpg.de> + + * configure.ac: Check for kpse_set_program_name() as used in + dvipng.c instead of kpse_set_progname(). + 2010-02-24 Peter Breitenlohner <peb@mppmu.mpg.de> * configure.ac, help/Makefile.am: Do not even try to rebuild diff --git a/Build/source/texk/dvipng/configure b/Build/source/texk/dvipng/configure index 804d459b4fa..aa1217d4da3 100755 --- a/Build/source/texk/dvipng/configure +++ b/Build/source/texk/dvipng/configure @@ -15433,8 +15433,8 @@ fi eval CPPFLAGS=\"$KPATHSEA_INCLUDES \$CPPFLAGS\" eval LIBS=\"$KPATHSEA_LIBS \$LIBS\" -ac_fn_c_check_func "$LINENO" "kpse_set_progname" "ac_cv_func_kpse_set_progname" -if test "x$ac_cv_func_kpse_set_progname" = x""yes; then : +ac_fn_c_check_func "$LINENO" "kpse_set_program_name" "ac_cv_func_kpse_set_program_name" +if test "x$ac_cv_func_kpse_set_program_name" = x""yes; then : $as_echo "#define HAVE_LIBKPATHSEA 1" >>confdefs.h diff --git a/Build/source/texk/dvipng/configure.ac b/Build/source/texk/dvipng/configure.ac index 8d6db35beac..53af4e5b689 100644 --- a/Build/source/texk/dvipng/configure.ac +++ b/Build/source/texk/dvipng/configure.ac @@ -138,7 +138,7 @@ AC_CHECK_FUNC([gdImageCreate], This drawing library can be downloaded at http://www.boutell.com/gd])]) KPSE_ADD_FLAGS([kpathsea]) -AC_CHECK_FUNC([kpse_set_progname], +AC_CHECK_FUNC([kpse_set_program_name], [AC_DEFINE([HAVE_LIBKPATHSEA], 1, [Define to 1 if you have the `kpathsea' library (-lkpathsea).])], [AC_MSG_ERROR([cannot find/use libkpathsea])]) diff --git a/Build/source/texk/dvipng/dvipng-1.12-PATCHES/ChangeLog b/Build/source/texk/dvipng/dvipng-1.12-PATCHES/ChangeLog index f076d87063a..91100698f24 100644 --- a/Build/source/texk/dvipng/dvipng-1.12-PATCHES/ChangeLog +++ b/Build/source/texk/dvipng/dvipng-1.12-PATCHES/ChangeLog @@ -1,3 +1,8 @@ +2010-03-09 Peter Breitenlohner <peb@mppmu.mpg.de> + + * patch-12-set_program_name: Replace kpse_set_progname() by + kpse_set_program_name(). + 2010-02-24 Peter Breitenlohner <peb@mppmu.mpg.de> * patch-10-mmap-for-WIN32 (new): Former MIKTEX code for mmap diff --git a/Build/source/texk/dvipng/dvipng-1.12-PATCHES/patch-12-set_program_name b/Build/source/texk/dvipng/dvipng-1.12-PATCHES/patch-12-set_program_name new file mode 100644 index 00000000000..4225fff4f98 --- /dev/null +++ b/Build/source/texk/dvipng/dvipng-1.12-PATCHES/patch-12-set_program_name @@ -0,0 +1,26 @@ + Replace kpse_set_progname() by kpse_set_program_name(). + +diff -ur dvipng-1.12.orig/ChangeLog dvipng-1.12/ChangeLog +--- dvipng-1.12.orig/ChangeLog 2010-02-24 17:29:03.000000000 +0100 ++++ dvipng-1.12/ChangeLog 2010-03-09 18:53:23.800798994 +0100 +@@ -1,3 +1,8 @@ ++2010-03-09 Peter Breitenlohner <peb@mppmu.mpg.de> ++ ++ * configure.ac: Check for kpse_set_program_name() as used in ++ dvipng.c instead of kpse_set_progname(). ++ + 2010-02-24 Peter Breitenlohner <peb@mppmu.mpg.de> + + Support WIN32 builds (native or MinGW32). +diff -ur dvipng-1.12.orig/configure.ac dvipng-1.12/configure.ac +--- dvipng-1.12.orig/configure.ac 2009-02-23 14:47:03.000000000 +0100 ++++ dvipng-1.12/configure.ac 2010-03-09 18:50:33.116303898 +0100 +@@ -69,7 +69,7 @@ + AC_CHECK_LIB([gd], [gdImageCreate],, + [AC_MSG_ERROR([cannot find/use libgd + This drawing library can be downloaded at http://www.boutell.com/gd])]) +-AC_CHECK_LIB([kpathsea], [kpse_set_progname],, ++AC_CHECK_LIB([kpathsea], [kpse_set_program_name],, + AC_MSG_ERROR([cannot find/use libkpathsea])) + AC_CHECK_LIB([t1], [T1_InitLib]) + PSFONTS_O="" diff --git a/Build/source/texk/dvipng/dvipng-1.12/ChangeLog b/Build/source/texk/dvipng/dvipng-1.12/ChangeLog index be4403114cd..4336c507b8d 100644 --- a/Build/source/texk/dvipng/dvipng-1.12/ChangeLog +++ b/Build/source/texk/dvipng/dvipng-1.12/ChangeLog @@ -1,3 +1,8 @@ +2010-03-09 Peter Breitenlohner <peb@mppmu.mpg.de> + + * configure.ac: Check for kpse_set_program_name() as used in + dvipng.c instead of kpse_set_progname(). + 2010-02-24 Peter Breitenlohner <peb@mppmu.mpg.de> Support WIN32 builds (native or MinGW32). diff --git a/Build/source/texk/dvipng/dvipng-1.12/configure.ac b/Build/source/texk/dvipng/dvipng-1.12/configure.ac index 509591c93ba..751087a1f49 100644 --- a/Build/source/texk/dvipng/dvipng-1.12/configure.ac +++ b/Build/source/texk/dvipng/dvipng-1.12/configure.ac @@ -69,7 +69,7 @@ AC_CHECK_LIB([png], [png_read_image],, AC_CHECK_LIB([gd], [gdImageCreate],, [AC_MSG_ERROR([cannot find/use libgd This drawing library can be downloaded at http://www.boutell.com/gd])]) -AC_CHECK_LIB([kpathsea], [kpse_set_progname],, +AC_CHECK_LIB([kpathsea], [kpse_set_program_name],, AC_MSG_ERROR([cannot find/use libkpathsea])) AC_CHECK_LIB([t1], [T1_InitLib]) PSFONTS_O="" diff --git a/Build/source/texk/dvisvgm/ChangeLog b/Build/source/texk/dvisvgm/ChangeLog index 345a41a9508..7eb8ee87f19 100644 --- a/Build/source/texk/dvisvgm/ChangeLog +++ b/Build/source/texk/dvisvgm/ChangeLog @@ -1,3 +1,8 @@ +2010-03-09 Peter Breitenlohner <peb@mppmu.mpg.de> + + * configure.ac: Check for kpse_set_program_name() instead of + kpse_set_progname(). + 2009-11-18 Peter Breitenlohner <peb@mppmu.mpg.de> * Makefile.am, configure.ac: Allow to link with libgs, load diff --git a/Build/source/texk/dvisvgm/configure b/Build/source/texk/dvisvgm/configure index 18823c7f75c..8b9b47de008 100755 --- a/Build/source/texk/dvisvgm/configure +++ b/Build/source/texk/dvisvgm/configure @@ -18102,8 +18102,8 @@ fi eval CPPFLAGS=\"$KPATHSEA_INCLUDES \$CPPFLAGS\" eval LIBS=\"$KPATHSEA_LIBS \$LIBS\" -ac_fn_c_check_func "$LINENO" "kpse_set_progname" "ac_cv_func_kpse_set_progname" -if test "x$ac_cv_func_kpse_set_progname" = x""yes; then : +ac_fn_c_check_func "$LINENO" "kpse_set_program_name" "ac_cv_func_kpse_set_program_name" +if test "x$ac_cv_func_kpse_set_program_name" = x""yes; then : $as_echo "#define HAVE_LIBKPATHSEA 1" >>confdefs.h diff --git a/Build/source/texk/dvisvgm/configure.ac b/Build/source/texk/dvisvgm/configure.ac index 8301b3e14f3..6ab273d890f 100644 --- a/Build/source/texk/dvisvgm/configure.ac +++ b/Build/source/texk/dvisvgm/configure.ac @@ -106,7 +106,7 @@ AC_CHECK_FUNC([FT_Init_FreeType], [AC_MSG_ERROR([cannot find/use libfreetype])]) KPSE_ADD_FLAGS([kpathsea]) -AC_CHECK_FUNC([kpse_set_progname], +AC_CHECK_FUNC([kpse_set_program_name], [AC_DEFINE([HAVE_LIBKPATHSEA], 1, [Define to 1 if you have the `kpathsea' library (-lkpathsea).])], [AC_MSG_ERROR([cannot find/use libkpathsea])]) diff --git a/Build/source/texk/gsftopk/ChangeLog b/Build/source/texk/gsftopk/ChangeLog index 779a38fa204..39b3f4ef6fd 100644 --- a/Build/source/texk/gsftopk/ChangeLog +++ b/Build/source/texk/gsftopk/ChangeLog @@ -1,3 +1,8 @@ +2010-03-09 Peter Breitenlohner <peb@mppmu.mpg.de> + + * gsftopk.c: Use kpse_set_program_name() instead of + kpse_set_progname(). + 2010-02-12 Peter Breitenlohner <peb@mppmu.mpg.de> * gsftopk.c [WIN32]: Patches for MinGW32 build diff --git a/Build/source/texk/gsftopk/gsftopk.c b/Build/source/texk/gsftopk/gsftopk.c index 799b9329f96..0531222041e 100644 --- a/Build/source/texk/gsftopk/gsftopk.c +++ b/Build/source/texk/gsftopk/gsftopk.c @@ -2251,7 +2251,7 @@ Author of gsftopk: Paul Vojta."); #ifdef WIN32 setmode(fileno(stdout), _O_BINARY); #endif - kpse_set_progname(argv[0]); + kpse_set_program_name(argv[0], NULL); kpse_init_prog("GSFTOPK", (int) (dpi + 0.5), NULL, "cmr10"); if (!test) xputenv_int("KPATHSEA_DPI", (int) (dpi + 0.5)); diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog index d61ba8d0667..ae40d04d0f4 100644 --- a/Build/source/texk/kpathsea/ChangeLog +++ b/Build/source/texk/kpathsea/ChangeLog @@ -1,3 +1,9 @@ +2010-03-09 Peter Breitenlohner <peb@mppmu.mpg.de> + + * texmf.cnf: Add '.gftype' to GFtype specific parameters. + * progname.h: Remove kpse_set_progname from exported API. + Deprecated since 1998. Kept in library for Versions 5.x.y. + 2010-03-08 Peter Breitenlohner <peb@mppmu.mpg.de> * xrealloc.c (xrealloc): Allocate 1 byte if passed size 0. diff --git a/Build/source/texk/kpathsea/pathsearch.c b/Build/source/texk/kpathsea/pathsearch.c index 4bc0b974d29..8d376ab85ab 100644 --- a/Build/source/texk/kpathsea/pathsearch.c +++ b/Build/source/texk/kpathsea/pathsearch.c @@ -343,7 +343,7 @@ search (kpathsea kpse, const_string path, const_string original_name, signature); that we do NOT need time stamp of root directories; and that we do NOT need the write access bit in st_mode. - Note that `kpse_set_progname' needs the EXEC bits, + Note that `kpse_set_program_name' needs the EXEC bits, but it was already called by the time we get here. */ unsigned short save_djgpp_flags = _djstat_flags; @@ -430,7 +430,7 @@ search_list (kpathsea kpse, const_string path, const_string* names, signature); that we do NOT need time stamp of root directories; and that we do NOT need the write access bit in st_mode. - Note that `kpse_set_progname' needs the EXEC bits, + Note that `kpse_set_program_name' needs the EXEC bits, but it was already called by the time we get here. */ unsigned short save_djgpp_flags = _djstat_flags; diff --git a/Build/source/texk/kpathsea/progname.c b/Build/source/texk/kpathsea/progname.c index e5cf8c937bf..7fe68742a09 100644 --- a/Build/source/texk/kpathsea/progname.c +++ b/Build/source/texk/kpathsea/progname.c @@ -672,6 +672,8 @@ kpse_set_program_name (const_string argv0, const_string progname) kpathsea_set_program_name (kpse_def, argv0, progname); } +/* DEPRECATED since 1998 -- To be removed in Version 6.0.0. */ + void kpse_set_progname (const_string argv0) { diff --git a/Build/source/texk/kpathsea/progname.h b/Build/source/texk/kpathsea/progname.h index 438420fe1a9..b5e7af87103 100644 --- a/Build/source/texk/kpathsea/progname.h +++ b/Build/source/texk/kpathsea/progname.h @@ -49,7 +49,9 @@ extern KPSEDLL string kpse_selfdir (const_string argv0); extern KPSEDLL void kpse_set_program_name (const_string argv0, const_string progname); -/* DEPRECATED +#ifdef MAKE_KPSE_DLL /* libkpathsea internal only */ + +/* DEPRECATED since 1998 -- To be removed in Version 6.0.0. Set first two variables above (if they're not predefined) to a copy of ARGV0 and everything in ARGV0 after the last directory separator, respectively. kpse_program_name is _always_ set to a copy of everything @@ -57,6 +59,8 @@ extern KPSEDLL void kpse_set_program_name (const_string argv0, extern KPSEDLL void kpse_set_progname (const_string argv0); -#endif +#endif /* MAKE_KPSE_DLL */ + +#endif /* KPSE_COMPAT_API */ #endif /* not KPATHSEA_PROGNAME_H */ diff --git a/Build/source/texk/kpathsea/texmf.cnf b/Build/source/texk/kpathsea/texmf.cnf index d8824c718a5..be1e99baa98 100644 --- a/Build/source/texk/kpathsea/texmf.cnf +++ b/Build/source/texk/kpathsea/texmf.cnf @@ -692,6 +692,6 @@ screen_width = 1664 screen_depth = 1200 % GFtype only. -line_length = 500 -max_rows = 8191 -max_cols = 8191 +line_length.gftype = 500 +max_rows.gftype = 8191 +max_cols.gftype = 8191 diff --git a/Build/source/texk/makeindexk/ChangeLog b/Build/source/texk/makeindexk/ChangeLog index afe346a8629..eb71b2e53bb 100644 --- a/Build/source/texk/makeindexk/ChangeLog +++ b/Build/source/texk/makeindexk/ChangeLog @@ -1,3 +1,8 @@ +2010-03-09 Peter Breitenlohner <peb@mppmu.mpg.de> + + * mkind.c: Use kpse_set_program_name() instead of + kpse_set_progname(). + 2010-02-23 Peter Breitenlohner <peb@mppmu.mpg.de> * mkind.h (DUPLICATE) [WIN32]: #undef before #define. diff --git a/Build/source/texk/makeindexk/mkind.c b/Build/source/texk/makeindexk/mkind.c index 1856ded8bd9..60c292fc7d0 100644 --- a/Build/source/texk/makeindexk/mkind.c +++ b/Build/source/texk/makeindexk/mkind.c @@ -105,7 +105,7 @@ main(int argc, char *argv[]) pgm_fn++; #if USE_KPATHSEA - kpse_set_progname (pgm_fn); /* use the same name as the intro message */ + kpse_set_program_name (pgm_fn, NULL); /* use the same name as the intro message */ #endif diff --git a/Build/source/texk/ps2pkm/ChangeLog b/Build/source/texk/ps2pkm/ChangeLog index f084aa0017d..7600d60ce6c 100644 --- a/Build/source/texk/ps2pkm/ChangeLog +++ b/Build/source/texk/ps2pkm/ChangeLog @@ -1,3 +1,8 @@ +2010-03-09 Peter Breitenlohner <peb@mppmu.mpg.de> + + * ps2pk.c: Use kpse_set_program_name() instead of + kpse_set_progname(). + 2010-02-27 Peter Breitenlohner <peb@mppmu.mpg.de> * Makefile.am: List all used header files. diff --git a/Build/source/texk/ps2pkm/ps2pk.c b/Build/source/texk/ps2pkm/ps2pk.c index 4d08e0fdcf7..7d917816f8f 100644 --- a/Build/source/texk/ps2pkm/ps2pk.c +++ b/Build/source/texk/ps2pkm/ps2pk.c @@ -352,7 +352,7 @@ int argc; char *argv[]; psname = argv[0]; argc--; argv++; #ifdef KPATHSEA - kpse_set_progname(myname); + kpse_set_program_name(myname, NULL); #endif #ifndef KPATHSEA diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog index 5489e7c3bbe..36db8facf8c 100644 --- a/Build/source/texk/web2c/ChangeLog +++ b/Build/source/texk/web2c/ChangeLog @@ -1,3 +1,16 @@ +2010-03-10 Peter Breitenlohner <peb@mppmu.mpg.de> + + * cpascal.h (kpsesetprogname): Removed. + * bibtex.ch, dvicopy.ch, dvitype.ch, gftodvi.ch, gftopk.ch, + patgen.ch, pktogf.ch, pktype.ch, pltotf.ch, pooltype.ch, + tangle.ch, tftopl.ch, vftovp.ch, vptovf.ch, weave.ch: + Use kpse_set_program_name(argv[0], nil) instead of + kpse_set_progname(argv[0]). + * gftype.ch: Use kpse_set_program_name(argv[0], 'gftype') + instead of kpse_set_progname(argv[0]). + * triptrap/texmf.cnf: Add '.inimf' to Metafont specific, and + '.gftype' to GFtype specific parameters. + 2010-03-09 Karl Berry <karl@tug.org> * bibtex.web: final 0.99d, from Oren. diff --git a/Build/source/texk/web2c/bibtex.ch b/Build/source/texk/web2c/bibtex.ch index 5beca8e13f6..647e01385b0 100644 --- a/Build/source/texk/web2c/bibtex.ch +++ b/Build/source/texk/web2c/bibtex.ch @@ -647,7 +647,7 @@ do_nothing; {the ``default system'' doesn't use the command line} end @y @<Process a possible command line@>= -kpse_set_progname (argv[0]); +kpse_set_program_name (argv[0], nil); parse_arguments; @z diff --git a/Build/source/texk/web2c/cpascal.h b/Build/source/texk/web2c/cpascal.h index 5428f8ecb44..f41d9ea8ec7 100644 --- a/Build/source/texk/web2c/cpascal.h +++ b/Build/source/texk/web2c/cpascal.h @@ -246,7 +246,6 @@ typedef const unsigned char *const_w2custring; #define kpsefindvf kpse_find_vf #define kpseinnameok kpse_in_name_ok #define kpseinitprog kpse_init_prog -#define kpsesetprogname kpse_set_progname #define kpsesetprogramname kpse_set_program_name #define kpseresetprogramname kpse_reset_program_name #define kpsegfformat kpse_gf_format diff --git a/Build/source/texk/web2c/dvicopy.ch b/Build/source/texk/web2c/dvicopy.ch index 9371281d8ce..c4ff1ee9232 100644 --- a/Build/source/texk/web2c/dvicopy.ch +++ b/Build/source/texk/web2c/dvicopy.ch @@ -24,7 +24,7 @@ procedure initialize; {this procedure gets things started properly} procedure initialize; {this procedure gets things started properly} var @<Local variables for initialization@>@/ begin - kpse_set_progname (argv[0]); + kpse_set_program_name (argv[0], nil); parse_arguments; print (banner); print_ln (version_string); @z diff --git a/Build/source/texk/web2c/dvitype.ch b/Build/source/texk/web2c/dvitype.ch index 44c48a05c39..d06ecfb80d4 100644 --- a/Build/source/texk/web2c/dvitype.ch +++ b/Build/source/texk/web2c/dvitype.ch @@ -47,7 +47,7 @@ procedure initialize; {this procedure gets things started properly} procedure initialize; {this procedure gets things started properly} var i:integer; {loop index for initializations} begin - kpse_set_progname (argv[0]); + kpse_set_program_name (argv[0], nil); parse_arguments; print (banner); print_ln (version_string); diff --git a/Build/source/texk/web2c/gftodvi.ch b/Build/source/texk/web2c/gftodvi.ch index 6227feff207..9e8db5eb13f 100644 --- a/Build/source/texk/web2c/gftodvi.ch +++ b/Build/source/texk/web2c/gftodvi.ch @@ -69,7 +69,7 @@ var @<Globals in the outer block@>@/ procedure initialize; {this procedure gets things started properly} var @!i,@!j,@!m,@!n:integer; {loop indices for initializations} begin - kpse_set_progname (argv[0]); + kpse_set_program_name (argv[0], nil); kpse_init_prog ('GFTODVI', 0, nil, nil); parse_arguments; if verbose then begin diff --git a/Build/source/texk/web2c/gftopk.ch b/Build/source/texk/web2c/gftopk.ch index ed5cc0f598c..65504f88b03 100644 --- a/Build/source/texk/web2c/gftopk.ch +++ b/Build/source/texk/web2c/gftopk.ch @@ -55,7 +55,7 @@ var @<Globals in the outer block@>@/ procedure initialize; {this procedure gets things started properly} var i:integer; {loop index for initializations} begin - kpse_set_progname (argv[0]); + kpse_set_program_name (argv[0], nil); kpse_init_prog ('GFTOPK', 0, nil, nil); parse_arguments; print(banner); print_ln(version_string); diff --git a/Build/source/texk/web2c/gftype.ch b/Build/source/texk/web2c/gftype.ch index 3ee9cb763eb..b26f81a1378 100644 --- a/Build/source/texk/web2c/gftype.ch +++ b/Build/source/texk/web2c/gftype.ch @@ -51,7 +51,7 @@ procedure initialize; {this procedure gets things started properly} @!bound_default:integer; {temporary for setup} @!bound_name:const_cstring; {temporary for setup} begin - kpse_set_progname (argv[0]); + kpse_set_program_name (argv[0], 'gftype'); kpse_init_prog ('GFTYPE', 0, nil, nil); parse_arguments; print(banner);print_ln(version_string); diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog index 350c16e95e2..cd538550194 100644 --- a/Build/source/texk/web2c/luatexdir/ChangeLog +++ b/Build/source/texk/web2c/luatexdir/ChangeLog @@ -1,3 +1,8 @@ +2010-03-09 Peter Breitenlohner <peb@mppmu.mpg.de> + + * luatangle.ch: Use kpse_set_program_name(argv[0], nil) instead + of kpse_set_progname(argv[0]). + 2010-02-15 Peter Breitenlohner <peb@mppmu.mpg.de> * am/luamisc.am (libluamisc_a_CPPFLAGS): Adapt to zziplib now diff --git a/Build/source/texk/web2c/luatexdir/luatangle.ch b/Build/source/texk/web2c/luatexdir/luatangle.ch index 4e1ab58208e..9c5af9db75a 100644 --- a/Build/source/texk/web2c/luatexdir/luatangle.ch +++ b/Build/source/texk/web2c/luatexdir/luatangle.ch @@ -72,7 +72,7 @@ procedure initialize; procedure initialize; var @<Local variables for initialization@>@/ begin - kpse_set_progname (argv[0]); + kpse_set_program_name (argv[0], nil); parse_arguments; @<Set initial values@>@/ @z diff --git a/Build/source/texk/web2c/omegaware/ChangeLog b/Build/source/texk/web2c/omegaware/ChangeLog index 63e7397f820..923c96cd14e 100644 --- a/Build/source/texk/web2c/omegaware/ChangeLog +++ b/Build/source/texk/web2c/omegaware/ChangeLog @@ -1,3 +1,9 @@ +2010-03-09 Peter Breitenlohner <peb@mppmu.mpg.de> + + * odvicopy.ch, odvitype.ch, ofm2opl.ch, opl2ofm.ch, otangle.ch, + ovf2ovp.ch, ovp2ovf: Use kpse_set_program_name(argv[0], nil) + instead of kpse_set_progname(argv[0]). + 2010-01-22 Peter Breitenlohner <peb@mppmu.mpg.de> * odvitype.ch (open_dvi_file): Skip use of cur_name. diff --git a/Build/source/texk/web2c/omegaware/odvicopy.ch b/Build/source/texk/web2c/omegaware/odvicopy.ch index 7215b186642..9a8fcfe4fe3 100644 --- a/Build/source/texk/web2c/omegaware/odvicopy.ch +++ b/Build/source/texk/web2c/omegaware/odvicopy.ch @@ -33,7 +33,7 @@ procedure initialize; {this procedure gets things started properly} procedure initialize; {this procedure gets things started properly} var @<Local variables for initialization@>@/ begin - kpse_set_progname (argv[0]); + kpse_set_program_name (argv[0], nil); parse_arguments; print (banner); print_ln (version_string); @z diff --git a/Build/source/texk/web2c/omegaware/odvitype.ch b/Build/source/texk/web2c/omegaware/odvitype.ch index cf2893dfc66..2acd6ad32e8 100644 --- a/Build/source/texk/web2c/omegaware/odvitype.ch +++ b/Build/source/texk/web2c/omegaware/odvitype.ch @@ -55,7 +55,7 @@ procedure initialize; {this procedure gets things started properly} procedure initialize; {this procedure gets things started properly} var i:integer; {loop index for initializations} begin - kpse_set_progname (argv[0]); + kpse_set_program_name (argv[0], nil); parse_arguments; print (banner); print_ln (version_string); diff --git a/Build/source/texk/web2c/omegaware/ofm2opl.ch b/Build/source/texk/web2c/omegaware/ofm2opl.ch index fac46b06d80..9e2a462feba 100644 --- a/Build/source/texk/web2c/omegaware/ofm2opl.ch +++ b/Build/source/texk/web2c/omegaware/ofm2opl.ch @@ -49,7 +49,7 @@ procedure initialize; {this procedure gets things started properly} @<Define |parse_arguments|@> procedure initialize; {this procedure gets things started properly} begin - kpse_set_progname (argv[0]); + kpse_set_program_name (argv[0], nil); kpse_init_prog ('OFM2OPL', 0, nil, nil); {We |xrealloc| when we know how big the file is. The 1000 comes from the negative lower bound.} diff --git a/Build/source/texk/web2c/omegaware/opl2ofm.ch b/Build/source/texk/web2c/omegaware/opl2ofm.ch index 1e134a69bd3..2510e995faa 100644 --- a/Build/source/texk/web2c/omegaware/opl2ofm.ch +++ b/Build/source/texk/web2c/omegaware/opl2ofm.ch @@ -35,7 +35,7 @@ procedure initialize; {this procedure gets things started properly} procedure initialize; {this procedure gets things started properly} var @<Local variables for initialization@>@/ begin - kpse_set_progname (argv[0]); + kpse_set_program_name (argv[0], nil); parse_arguments; @z diff --git a/Build/source/texk/web2c/omegaware/otangle.ch b/Build/source/texk/web2c/omegaware/otangle.ch index 84e5dc406ba..6dc54623d97 100644 --- a/Build/source/texk/web2c/omegaware/otangle.ch +++ b/Build/source/texk/web2c/omegaware/otangle.ch @@ -71,7 +71,7 @@ procedure initialize; procedure initialize; var @<Local variables for initialization@>@/ begin - kpse_set_progname (argv[0]); + kpse_set_program_name (argv[0], nil); parse_arguments; @<Set initial values@>@/ @z diff --git a/Build/source/texk/web2c/omegaware/ovf2ovp.ch b/Build/source/texk/web2c/omegaware/ovf2ovp.ch index 9ab40b511c9..24ec29f0a02 100644 --- a/Build/source/texk/web2c/omegaware/ovf2ovp.ch +++ b/Build/source/texk/web2c/omegaware/ovf2ovp.ch @@ -26,7 +26,7 @@ procedure initialize; {this procedure gets things started properly} procedure initialize; {this procedure gets things started properly} var @!k:integer; {all-purpose index for initialization} begin - kpse_set_progname (argv[0]); + kpse_set_program_name (argv[0], nil); kpse_init_prog ('VFTOVP', 0, nil, nil); parse_arguments; @z diff --git a/Build/source/texk/web2c/omegaware/ovp2ovf.ch b/Build/source/texk/web2c/omegaware/ovp2ovf.ch index 62c2b250bae..8e5695027a1 100644 --- a/Build/source/texk/web2c/omegaware/ovp2ovf.ch +++ b/Build/source/texk/web2c/omegaware/ovp2ovf.ch @@ -24,7 +24,7 @@ procedure initialize; {this procedure gets things started properly} procedure initialize; {this procedure gets things started properly} var @<Local variables for initialization@>@/ begin - kpse_set_progname (argv[0]); + kpse_set_program_name (argv[0], nil); parse_arguments; @z diff --git a/Build/source/texk/web2c/patgen.ch b/Build/source/texk/web2c/patgen.ch index 78be9792ff2..02cce046a4f 100644 --- a/Build/source/texk/web2c/patgen.ch +++ b/Build/source/texk/web2c/patgen.ch @@ -45,7 +45,7 @@ procedure initialize; {this procedure gets things started properly} procedure initialize; {this procedure gets things started properly} var @<Local variables for initialization@>@/ begin - kpse_set_progname (argv[0]); + kpse_set_program_name (argv[0], nil); parse_arguments; print (banner); print_ln (version_string); diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog index f19611f3603..d5d93472e89 100644 --- a/Build/source/texk/web2c/pdftexdir/ChangeLog +++ b/Build/source/texk/web2c/pdftexdir/ChangeLog @@ -1,3 +1,8 @@ +2010-03-09 Peter Breitenlohner <peb@mppmu.mpg.de> + + * ttf2afm.c: Use kpse_set_program_name(argv[0], NULL) instead of + kpse_set_progname(argv[0]). + 2010-02-14 Peter Breitenlohner <peb@mppmu.mpg.de> * writet1.c (append_cs_return): Cast to byte * to avoid warning. diff --git a/Build/source/texk/web2c/pdftexdir/ttf2afm.c b/Build/source/texk/web2c/pdftexdir/ttf2afm.c index 02945f4d81f..27780adf8f0 100644 --- a/Build/source/texk/web2c/pdftexdir/ttf2afm.c +++ b/Build/source/texk/web2c/pdftexdir/ttf2afm.c @@ -1016,7 +1016,7 @@ int main(int argc, char **argv) char date[128], *s; time_t t = time(&t); int c; - kpse_set_progname(argv[0]); + kpse_set_program_name(argv[0], NULL); kpse_init_prog("ttf2afm", 0, 0, 0); while ((c = getopt(argc, argv, "iucve:o:m:")) != -1) switch (c) { diff --git a/Build/source/texk/web2c/pktogf.ch b/Build/source/texk/web2c/pktogf.ch index aa4ead80631..c5079eb91f2 100644 --- a/Build/source/texk/web2c/pktogf.ch +++ b/Build/source/texk/web2c/pktogf.ch @@ -54,7 +54,7 @@ var @<Globals in the outer block@>@/ procedure initialize; {this procedure gets things started properly} var i:integer; {loop index for initializations} begin - kpse_set_progname (argv[0]); + kpse_set_program_name (argv[0], nil); kpse_init_prog ('PKTOGF', 0, nil, nil); parse_arguments; print_ln(banner);@/ diff --git a/Build/source/texk/web2c/pktype.ch b/Build/source/texk/web2c/pktype.ch index 677c3d298db..36fb4f71189 100644 --- a/Build/source/texk/web2c/pktype.ch +++ b/Build/source/texk/web2c/pktype.ch @@ -38,7 +38,7 @@ var @<Globals in the outer block@>@/ procedure initialize; {this procedure gets things started properly} var i:integer; {loop index for initializations} begin - kpse_set_progname (argv[0]); + kpse_set_program_name (argv[0], nil); kpse_init_prog ('PKTYPE', 0, nil, nil); parse_arguments; print(banner); print_ln(version_string);@/ diff --git a/Build/source/texk/web2c/pltotf.ch b/Build/source/texk/web2c/pltotf.ch index d8259e4ac03..f51d6859baf 100644 --- a/Build/source/texk/web2c/pltotf.ch +++ b/Build/source/texk/web2c/pltotf.ch @@ -28,7 +28,7 @@ procedure initialize; {this procedure gets things started properly} procedure initialize; {this procedure gets things started properly} var @<Local variables for initialization@>@/ begin - kpse_set_progname (argv[0]); + kpse_set_program_name (argv[0], nil); parse_arguments; @z diff --git a/Build/source/texk/web2c/pooltype.ch b/Build/source/texk/web2c/pooltype.ch index 55e8a65bd8b..85849a3efa4 100644 --- a/Build/source/texk/web2c/pooltype.ch +++ b/Build/source/texk/web2c/pooltype.ch @@ -25,7 +25,7 @@ procedure initialize; {this procedure gets things started properly} procedure initialize; {this procedure gets things started properly} var @<Local variables for initialization@>@; begin - kpse_set_progname (argv[0]); + kpse_set_program_name (argv[0], nil); parse_arguments; @<Set initial values of key variables@> @z diff --git a/Build/source/texk/web2c/tangle.ch b/Build/source/texk/web2c/tangle.ch index f25eadec12b..3771e2a1107 100644 --- a/Build/source/texk/web2c/tangle.ch +++ b/Build/source/texk/web2c/tangle.ch @@ -63,7 +63,7 @@ procedure initialize; procedure initialize; var @<Local variables for initialization@>@/ begin - kpse_set_progname (argv[0]); + kpse_set_program_name (argv[0], nil); parse_arguments; @<Set initial values@>@/ @z diff --git a/Build/source/texk/web2c/tangleboot.pin b/Build/source/texk/web2c/tangleboot.pin index b0709eeb67a..e0ca48e45eb 100644 --- a/Build/source/texk/web2c/tangleboot.pin +++ b/Build/source/texk/web2c/tangleboot.pin @@ -125,29 +125,29 @@ if optind+2=argc then begin chgname:=extendfilename(cmdline(optind+1), 'ch');end;pascalname:=basenamechangesuffix(webname,'.web','.p');end; {:188}procedure initialize;var{16:}i:0..255;{:16}{41:}wi:0..2; {:41}{45:}zi:0..4;{:45}{51:}h:0..hashsize; -{:51}begin kpsesetprogname(argv[0]);parsearguments;{10:}history:=0; -{:10}{14:}xchr[32]:=' ';xchr[33]:='!';xchr[34]:='"';xchr[35]:='#'; -xchr[36]:='$';xchr[37]:='%';xchr[38]:='&';xchr[39]:='''';xchr[40]:='('; -xchr[41]:=')';xchr[42]:='*';xchr[43]:='+';xchr[44]:=',';xchr[45]:='-'; -xchr[46]:='.';xchr[47]:='/';xchr[48]:='0';xchr[49]:='1';xchr[50]:='2'; -xchr[51]:='3';xchr[52]:='4';xchr[53]:='5';xchr[54]:='6';xchr[55]:='7'; -xchr[56]:='8';xchr[57]:='9';xchr[58]:=':';xchr[59]:=';';xchr[60]:='<'; -xchr[61]:='=';xchr[62]:='>';xchr[63]:='?';xchr[64]:='@';xchr[65]:='A'; -xchr[66]:='B';xchr[67]:='C';xchr[68]:='D';xchr[69]:='E';xchr[70]:='F'; -xchr[71]:='G';xchr[72]:='H';xchr[73]:='I';xchr[74]:='J';xchr[75]:='K'; -xchr[76]:='L';xchr[77]:='M';xchr[78]:='N';xchr[79]:='O';xchr[80]:='P'; -xchr[81]:='Q';xchr[82]:='R';xchr[83]:='S';xchr[84]:='T';xchr[85]:='U'; -xchr[86]:='V';xchr[87]:='W';xchr[88]:='X';xchr[89]:='Y';xchr[90]:='Z'; -xchr[91]:='[';xchr[92]:='\';xchr[93]:=']';xchr[94]:='^';xchr[95]:='_'; -xchr[96]:='`';xchr[97]:='a';xchr[98]:='b';xchr[99]:='c';xchr[100]:='d'; -xchr[101]:='e';xchr[102]:='f';xchr[103]:='g';xchr[104]:='h'; -xchr[105]:='i';xchr[106]:='j';xchr[107]:='k';xchr[108]:='l'; -xchr[109]:='m';xchr[110]:='n';xchr[111]:='o';xchr[112]:='p'; -xchr[113]:='q';xchr[114]:='r';xchr[115]:='s';xchr[116]:='t'; -xchr[117]:='u';xchr[118]:='v';xchr[119]:='w';xchr[120]:='x'; -xchr[121]:='y';xchr[122]:='z';xchr[123]:='{';xchr[124]:='|'; -xchr[125]:='}';xchr[126]:='~';xchr[0]:=' ';xchr[127]:=' '; -{:14}{17:}for i:=1 to 31 do xchr[i]:=chr(i); +{:51}begin kpsesetprogramname(argv[0],nil);parsearguments; +{10:}history:=0;{:10}{14:}xchr[32]:=' ';xchr[33]:='!';xchr[34]:='"'; +xchr[35]:='#';xchr[36]:='$';xchr[37]:='%';xchr[38]:='&';xchr[39]:=''''; +xchr[40]:='(';xchr[41]:=')';xchr[42]:='*';xchr[43]:='+';xchr[44]:=','; +xchr[45]:='-';xchr[46]:='.';xchr[47]:='/';xchr[48]:='0';xchr[49]:='1'; +xchr[50]:='2';xchr[51]:='3';xchr[52]:='4';xchr[53]:='5';xchr[54]:='6'; +xchr[55]:='7';xchr[56]:='8';xchr[57]:='9';xchr[58]:=':';xchr[59]:=';'; +xchr[60]:='<';xchr[61]:='=';xchr[62]:='>';xchr[63]:='?';xchr[64]:='@'; +xchr[65]:='A';xchr[66]:='B';xchr[67]:='C';xchr[68]:='D';xchr[69]:='E'; +xchr[70]:='F';xchr[71]:='G';xchr[72]:='H';xchr[73]:='I';xchr[74]:='J'; +xchr[75]:='K';xchr[76]:='L';xchr[77]:='M';xchr[78]:='N';xchr[79]:='O'; +xchr[80]:='P';xchr[81]:='Q';xchr[82]:='R';xchr[83]:='S';xchr[84]:='T'; +xchr[85]:='U';xchr[86]:='V';xchr[87]:='W';xchr[88]:='X';xchr[89]:='Y'; +xchr[90]:='Z';xchr[91]:='[';xchr[92]:='\';xchr[93]:=']';xchr[94]:='^'; +xchr[95]:='_';xchr[96]:='`';xchr[97]:='a';xchr[98]:='b';xchr[99]:='c'; +xchr[100]:='d';xchr[101]:='e';xchr[102]:='f';xchr[103]:='g'; +xchr[104]:='h';xchr[105]:='i';xchr[106]:='j';xchr[107]:='k'; +xchr[108]:='l';xchr[109]:='m';xchr[110]:='n';xchr[111]:='o'; +xchr[112]:='p';xchr[113]:='q';xchr[114]:='r';xchr[115]:='s'; +xchr[116]:='t';xchr[117]:='u';xchr[118]:='v';xchr[119]:='w'; +xchr[120]:='x';xchr[121]:='y';xchr[122]:='z';xchr[123]:='{'; +xchr[124]:='|';xchr[125]:='}';xchr[126]:='~';xchr[0]:=' '; +xchr[127]:=' ';{:14}{17:}for i:=1 to 31 do xchr[i]:=chr(i); for i:=128 to 255 do xchr[i]:=chr(i); {:17}{18:}for i:=0 to 255 do xord[chr(i)]:=32; for i:=1 to 255 do xord[xchr[i]]:=i;xord[' ']:=32; diff --git a/Build/source/texk/web2c/tftopl.ch b/Build/source/texk/web2c/tftopl.ch index 233c2821d8d..f0f7986cb37 100644 --- a/Build/source/texk/web2c/tftopl.ch +++ b/Build/source/texk/web2c/tftopl.ch @@ -50,7 +50,7 @@ procedure initialize; {this procedure gets things started properly} @<Define |parse_arguments|@> procedure initialize; {this procedure gets things started properly} begin - kpse_set_progname (argv[0]); + kpse_set_program_name (argv[0], nil); kpse_init_prog ('TFTOPL', 0, nil, nil); {We |xrealloc| when we know how big the file is. The 1000 comes from the negative lower bound.} diff --git a/Build/source/texk/web2c/triptrap/texmf.cnf b/Build/source/texk/web2c/triptrap/texmf.cnf index 6713c41d8b3..b6162e58c6e 100644 --- a/Build/source/texk/web2c/triptrap/texmf.cnf +++ b/Build/source/texk/web2c/triptrap/texmf.cnf @@ -46,10 +46,10 @@ dvi_buf_size = 800 % and the original trip setting is 307, so no point in changing the default. % Metafont only. -gf_buf_size = 8 % trapman.tex says to use this. -MFTERM = trap % get the right screen output -screen_width = 100 -screen_depth = 200 +gf_buf_size.inimf = 8 % trapman.tex says to use this. +MFTERM.inimf = trap % get the right screen output +screen_width.inimf = 100 +screen_depth.inimf = 200 % MetaPost only. Turn off callmakempx, i.e., makempx, % since we can only test tex and dvitomp, and we'll test those in other @@ -88,6 +88,6 @@ MFPOOL = . MPPOOL = . % GFtype only. -line_length = 79 -max_rows = 79 -max_cols = 79 +line_length.gftype = 79 +max_rows.gftype = 79 +max_cols.gftype = 79 diff --git a/Build/source/texk/web2c/vftovp.ch b/Build/source/texk/web2c/vftovp.ch index c2b8d6ed174..026e8ef6d28 100644 --- a/Build/source/texk/web2c/vftovp.ch +++ b/Build/source/texk/web2c/vftovp.ch @@ -28,7 +28,7 @@ procedure initialize; {this procedure gets things started properly} procedure initialize; {this procedure gets things started properly} var @!k:integer; {all-purpose index for initialization} begin - kpse_set_progname (argv[0]); + kpse_set_program_name (argv[0], nil); kpse_init_prog ('VFTOVP', 0, nil, nil); parse_arguments; @z diff --git a/Build/source/texk/web2c/vptovf.ch b/Build/source/texk/web2c/vptovf.ch index d394d210b3d..7455ab58892 100644 --- a/Build/source/texk/web2c/vptovf.ch +++ b/Build/source/texk/web2c/vptovf.ch @@ -17,7 +17,7 @@ procedure initialize; {this procedure gets things started properly} procedure initialize; {this procedure gets things started properly} var @<Local variables for initialization@>@/ begin - kpse_set_progname (argv[0]); + kpse_set_program_name (argv[0], nil); parse_arguments; @z diff --git a/Build/source/texk/web2c/weave.ch b/Build/source/texk/web2c/weave.ch index 94aa30229e8..15372d2bae8 100644 --- a/Build/source/texk/web2c/weave.ch +++ b/Build/source/texk/web2c/weave.ch @@ -73,7 +73,7 @@ var @<Globals in the outer block@>@/ procedure initialize; var @<Local variables for initialization@>@/ begin - kpse_set_progname (argv[0]); + kpse_set_program_name (argv[0], nil); parse_arguments; @<Set initial values@>@/ @z diff --git a/Build/source/texk/web2c/web2c/ChangeLog b/Build/source/texk/web2c/web2c/ChangeLog index 1e46cbe3a0b..0529dd6b909 100644 --- a/Build/source/texk/web2c/web2c/ChangeLog +++ b/Build/source/texk/web2c/web2c/ChangeLog @@ -1,6 +1,7 @@ 2010-03-09 Peter Breitenlohner <peb@mppmu.mpg.de> * common.defines (BIBXRETALLOCNOSET): New procedure. + (kpsesetprogname): Removed. 2010-03-05 Peter Breitenlohner <peb@mppmu.mpg.de> diff --git a/Build/source/texk/web2c/web2c/common.defines b/Build/source/texk/web2c/web2c/common.defines index 44f0a0d6034..bdd35768fa8 100644 --- a/Build/source/texk/web2c/web2c/common.defines +++ b/Build/source/texk/web2c/web2c/common.defines @@ -163,7 +163,6 @@ @define procedure input2ints (); @define procedure input3ints (); @define procedure kpseinitprog (); -@define procedure kpsesetprogname (); @define procedure kpsesetprogramname (); @define procedure kpseresetprogramname (); @define procedure kpsesetprogramenabled (); |