File source.dif of Package texlive-bin
--- texk/dviljk/dvi2xx.c
+++ texk/dviljk/dvi2xx.c 2008-09-24 16:16:01.000000000 +0000
@@ -175,7 +175,18 @@ char *argv[];
setbuf(ERR_STREAM, NULL);
G_progname = argv[0];
#ifdef KPATHSEA
+# if defined(LJ)
kpse_set_program_name(argv[0], "dvilj");
+# endif
+# if defined(LJ2P)
+ kpse_set_program_name(argv[0], "dvilj2p");
+# endif
+# if defined(LJ4) && !defined(LJ4L)
+ kpse_set_program_name(argv[0], "dvilj4");
+# endif
+# if defined(LJ4) && defined(LJ4L)
+ kpse_set_program_name(argv[0], "dvilj4l");
+# endif
kpse_set_program_enabled (kpse_pk_format, MAKE_TEX_PK_BY_DEFAULT, kpse_src_compile);
#endif
DecodeArgs(argc, argv);
--- texk/kpathsea/Makefile.in
+++ texk/kpathsea/Makefile.in 2008-09-26 13:32:24.000000000 +0000
@@ -97,16 +97,18 @@ stamp-paths: $(srcdir)/texmf.cnf
| sed '/^$$/d' \
| sed 's/^\([^ =]*\)[ ]*=*[ ]*\(.*\)/#ifndef DEFAULT_\1%#define DEFAULT_\1 "\2"%#endif/' \
| tr '%' '\012' \
- | sed -e 's%\$$TEXMFCONFIG%/nonesuch/texmfconfig%g' \
- -e 's%\$$TEXMFDIST%/nonesuch/texmfdist%g' \
- -e 's%\$$TEXMFDOCDIR%/nonesuch/texmfdocdir%g' \
- -e 's%\$$TEXMFLOCAL%/nonesuch/texmflocal%g' \
- -e 's%\$$TEXMFMAIN%/nonesuch/texmfmain%g' \
- -e 's%\$$TEXMFSYSCONFIG%/nonesuch/texmfsysconfig%g' \
- -e 's%\$$TEXMFSYSVAR%/nonesuch/texmfsysvar%g' \
- -e 's%\$$TEXMFVAR%/nonesuch/texmfvar%g' \
- -e 's%\$$TEXMF%/nonesuch/texmf%g' \
- -e 's%\$$VARTEXFONTS%/nonesuch/vartexfonts%g' \
+ | sed -e 's%\$${\?TEXMFCONFIG}\?%$(texmfconf)%g' \
+ -e 's%\$${\?TEXMFDIST}\?%$(texmf)%g' \
+ -e 's%\$${\?TEXMFDOCDIR}\?%$(texmf)/doc{/english,}:$(texmfmain)/doc{/english,}%g' \
+ -e 's%\$${\?TEXMFLOCAL}\?%$(texmflocal)%g' \
+ -e 's%\$${\?TEXMFMAIN}\?%$(texmfmain)%g' \
+ -e 's%\$${\?TEXMFSYSCONFIG}\?%$(texmfconf)%g' \
+ -e 's%\$${\?TEXMFSYSVAR}\?%$(texmfvar)%g' \
+ -e 's%\$${\?TEXMFVAR}\?%$(texmfvar)%g' \
+ -e 's%\$${\?TEXMFHOME}\?%~/texmf%g' \
+ -e 's%\$${\?TEXMF}\?%{~/texmf,!!$(texmfconf),!!$(texmfvar),!!$(texmfmain),!!$(texmflocal),!!$(texmf)}%g' \
+ -e 's%\$${\?VARTEXFONTS}\?%$(vartexfonts)%g' \
+ -e 's%\$${\?HOME}\?%~%g' \
| sed -e 's%;%:%g' \
>>paths.tmp
@if cmp -s paths.h paths.tmp 2>/dev/null; then \
--- texk/kpathsea/c-fopen.h
+++ texk/kpathsea/c-fopen.h 2008-09-24 15:45:30.000000000 +0000
@@ -34,17 +34,17 @@
/* How to open a binary file for reading: */
#ifndef FOPEN_RBIN_MODE
-#define FOPEN_RBIN_MODE "rb"
+#define FOPEN_RBIN_MODE "r"
#endif /* not FOPEN_RBIN_MODE */
/* How to open a binary file for writing: */
#ifndef FOPEN_WBIN_MODE
-#define FOPEN_WBIN_MODE "wb"
+#define FOPEN_WBIN_MODE "w"
#endif /* not FOPEN_WBIN_MODE */
/* How to open a binary file for appending: */
#ifndef FOPEN_ABIN_MODE
-#define FOPEN_ABIN_MODE "ab"
+#define FOPEN_ABIN_MODE "a"
#endif /* not FOPEN_ABIN_MODE */
/* How to switch an already open file handle to binary mode.
--- texk/kpathsea/c-memstr.h
+++ texk/kpathsea/c-memstr.h 2008-09-24 15:45:30.000000000 +0000
@@ -38,6 +38,7 @@
/* Just to be complete, we make both the system V/ANSI and the BSD
versions of the string functions available. */
+#ifndef __GNUC__
#if !defined(HAVE_STRCHR) && !defined(strchr)
#define strchr index
#endif
@@ -82,4 +83,6 @@ extern char *strstr ();
#endif
#endif
+#endif /* not __GNUC__ */
+
#endif /* not KPATHSEA_C_MEMSTR_H */
--- texk/kpathsea/db.c
+++ texk/kpathsea/db.c 2008-09-24 15:45:30.000000000 +0000
@@ -89,12 +89,21 @@ db_build P2C(hash_table_type *, table,
unsigned len = strlen (db_filename) - sizeof (DB_NAME) + 1; /* Keep the /. */
string top_dir = (string)xmalloc (len + 1);
string cur_dir = NULL; /* First thing in ls-R might be a filename. */
- FILE *db_file = fopen (db_filename, FOPEN_R_MODE);
+ struct stat statdb;
+ FILE *db_file;
strncpy (top_dir, db_filename, len);
top_dir[len] = 0;
-
- if (db_file) {
+
+ if ((getenv("MKTEXLSR") == NULL) &&
+ (stat(db_filename, &statdb) < 0 || statdb.st_size == 0)) {
+ char buf[PATH_MAX+1];
+ snprintf(buf, PATH_MAX, "mktexlsr %s", top_dir);
+ xputenv("MKTEXLSR", "true"); /* fork loop detection */
+ system (buf);
+ }
+
+ if ((db_file = fopen (db_filename, FOPEN_R_MODE))) {
while ((line = read_line (db_file)) != NULL) {
len = strlen (line);
--- texk/kpathsea/mktex.opt
+++ texk/kpathsea/mktex.opt 2008-09-24 15:45:30.000000000 +0000
@@ -37,10 +37,11 @@ if test "$DOSISH" = "no"; then SEP=':';
# TEMPDIR needs to be unique to each process because of the possibility of two
# people running dvips (or whatever) simultaneously.
if test -n "$TMPDIR"; then
- TEMPDIR="${TMPDIR}/mt$$.tmp"
+ TEMPDIR="${TMPDIR}/.mtXXXXXXXXXX"
else
- TEMPDIR="/tmp/mt$$.tmp"
+ TEMPDIR="/tmp/.mtXXXXXXXXXX"
fi
+TEMPDIR=$(mktemp -d "$TEMPDIR") || exit 1
# We want to output only filenames to standard output, but it's too
# error-prone to write the scripts that way, so we direct stdout here.
@@ -48,17 +49,23 @@ STDOUT="$TEMPDIR/mt$$.out"
# We will change search paths to include $KPSE_DOT. This is necessary
# since we cd to $TEMPDIR.
-: ${KPSE_DOT=`pwd`}; export KPSE_DOT
+: ${KPSE_DOT=${PWD}}; export KPSE_DOT
# Clean up on normal or abnormal exit.
# The "cd /" is for MS-DOS and MS-Windows, where there is a separate
# current directory on each drive, and therefore "cd $KPSE_DOT" might
# still leave $TMPDIR current directory on its drive, in which case it
# cannot be removed.
-trap 'rc=$?; cd /; cd "$KPSE_DOT"; test -f "$STDOUT" && cat "$STDOUT"; rm -rf "$TEMPDIR"; exit $rc' \
- 0 1 2 3 7 13 15
+atexit ()
+{
+ local rc=$?
+ cd "$KPSE_DOT"
+ test -n "$STDOUT" -a -f "$STDOUT" && cat "$STDOUT"
+ test -n "$TEMPDIR" -a -d "$TEMPDIR" && rm -rf "$TEMPDIR"
+ exit $rc
+}
+trap 'atexit' EXIT SIGHUP SIGINT SIGQUIT SIGBUS SIGPIPE SIGTERM
-(umask 077 && mkdir "$TEMPDIR") || exit 1
cd "$TEMPDIR" || exit 1
# The alternative location for fonts. The directory need not exist,
@@ -68,6 +75,11 @@ if test -z "$MT_VARTEXFONTS"; then
echo "$0: VARTEXFONTS is not defined. Defaulting to \`$KPSE_DOT'." >&2
MT_VARTEXFONTS='$KPSE_DOT'
fi
+: ${MT_TEXMFVAR=`kpsewhich --expand-var='$TEXMFVAR' | sed 's%^!!%%'`}
+if test -z "$MT_TEXMFVAR"; then
+ echo "$0: TEXMFVAR is not defined. Defaulting to \`$KPSE_DOT'." >&2
+ MT_TEXMFVAR='$KPSE_DOT'
+fi
# The supporting scripts:
: ${MT_MKTEXNAM=`kpsewhich --format='web2c files' mktexnam`}
--- texk/kpathsea/mktexlsr
+++ texk/kpathsea/mktexlsr 2009-07-14 12:09:00.717902035 +0200
@@ -13,6 +13,10 @@
version='$Id: mktexlsr 9164 2008-07-02 17:42:11Z karl $'
progname=`echo $0 | sed 's%.*/%%'`
+
+MKTEXLSR=true; export MKTEXLSR
+set -o noclobber
+
usage="Usage: $progname [DIR]...
Rebuild ls-R filename databases. If one or more arguments DIRS are
@@ -47,6 +51,9 @@ if test "$DOSISH" = "no"; then SEP=':';
# be done before kpsewhich can be called, and thus cannot be put into
# mktex.opt.
dirname=`echo $0 | sed 's%/*[^/][^/]*$%%'`
+case "$SEP$PATH$SEP" in
+ *$SEP$dirname$SEP*) dirname="" ;;
+esac
case $dirname in
"") # Do nothing
;;
@@ -58,6 +65,28 @@ case $dirname in
export PATH ;;
esac
+# Sometimes the scripts and binaries are located elsewhere check this
+# by following the links and extend the path with appropiate dirnames.
+ link=`readlink -f $0`
+dirname=`echo $link | sed 's%/*[^/][^/]*$%%'`
+ cpu=`uname -i|tr '[:upper:]' '[:lower:]' | sed 's/ppc64/ppc/;s/i386/i?86/'`
+ os=`uname -s|tr '[:upper:]' '[:lower:]'`
+ binary=`echo $dirname | sed "s%share%lib%;s%noarch%${cpu}-${os}%"`
+ binary=`echo $binary`
+case "$SEP$PATH$SEP" in
+ *$SEP$dirname$SEP*) dirname="" ;;
+esac
+case $dirname in
+ "") # Do nothing
+ ;;
+ /* | [A-z]:/*) # Absolute name
+ PATH="$dirname$SEP$binary$SEP$PATH"
+ export PATH ;;
+ *) # Relative name
+ PATH="`pwd`/$dirname$SEP`pwd`/$binary$SEP$PATH"
+ export PATH ;;
+esac
+
if tty -s; then verbose=true; else verbose=false; fi
dry_run=false
trees=
@@ -114,6 +143,21 @@ trap 'cd /; test -z "$db_dir_tmp" || rm
shift
}
+nobody="$(id -un nobody)"
+if test "$(id -ur 2> /dev/null)" = "0" -a -n "$nobody" ; then
+ grep -qE 'nobody:[^:]*:[0-9]+:0:0::::' /etc/shadow
+ if test $? -eq 0 ; then
+ echo "$progname: Warning the password of the user nobody has expired." >&2
+ echo " Please use program \`chage' to set maxdays to 99999." >&2
+ echo ""
+ exit 1
+ fi
+ runls () { su $nobody -s /bin/sh -c 'exec -a ls ls -LRa 2>/dev/null'; }
+else
+ runls () { ls -LRa 2>/dev/null; }
+fi
+
+cache="`kpsewhich --expand-var='$VARTEXFONTS'`"
for TEXMFLS_R in "$@"; do
# Prepend cwd if the directory was relative.
case "$TEXMFLS_R" in
@@ -143,12 +187,23 @@ for TEXMFLS_R in "$@"; do
# want to be silent if the directory doesn't exist, since the ls-R
# path ordinarily contains many nonexistent directories.
test -d "$db_dir" || continue
- test -w "$db_dir" || { echo "$progname: $db_dir: directory not writable. Skipping..." >&2; continue; }
+ if test -w "$db_dir" ; then
+ # default
+ db_dir_tmp="$db_dir/.lsR.XXXXXX"
+ else
+ # Escape to writable cache directory
+ test -w "$cache" || { echo "$progname: $db_dir: directory not writable. Skipping..." >&2; continue; }
+ db_dir_tmp="$cache/.lsR.XXXXXX"
+ fi
if test ! -f "$db_file"; then
- cp /dev/null "$db_file"
+ # Note: this script has set the noclobber option at line 18
+ > "$db_file" \
+ || { echo "$progname: could not create file '$db_file'. Skipping..." >&2; continue; }
# Use same permissions as parent directory, minus x,s, or t bits.
chmod `kpsestat -xst "$db_dir"` "$db_file"
+ elif test -w $db_file -a ! -s $db_file ; then
+ : Is writable but empty
elif test -s "$db_file" \
&& test "x`sed '1s/$//;1q' \"$db_file\"`" != "x$ls_R_magic" \
&& test "x`sed '1s/$//;1q' \"$db_file\"`" != "x$old_ls_R_magic"; then
@@ -159,16 +214,23 @@ for TEXMFLS_R in "$@"; do
# Skip if we cannot write the file:
kpseaccess -w "$db_file" || { echo "$progname: $db_file: no write permission. Skipping..." >&2; continue; }
- db_dir_tmp="$db_dir/lsR$$.tmp"
- (umask 077 && mkdir "$db_dir_tmp" ) \
+ until PERMS=`kpsestat = "$db_file"`; do sleep 1; done
+ if test "$PERMS" = "666" -a ! -k "$db_dir" ; then
+ echo "$progname: '$db_file' world writable but '$db_dir' not sticky. Skipping..." >&2;
+ continue;
+ fi
+
+ db_dir_tmp=$(mktemp -d "$db_dir_tmp") \
|| { echo "$progname: could not create directory '$db_dir_tmp'. Skipping..." >&2; continue; }
db_file_tmp="$db_dir_tmp/lsR$$.tmp"
rm -f "$db_file_tmp"
$verbose && echo "$progname: Updating $db_file... " >&2
$dry_run && continue
-
- echo "$ls_R_magic" >"$db_file_tmp"
+
+ # Note: this script has set the noclobber option at line 18
+ echo "$ls_R_magic" >"$db_file_tmp" \
+ || { echo "$progname: could not create file '$db_file_tmp'. Skipping..." >&2; continue; }
# The main task. We put ./: in the output, so top-level files can be
# found via ls-R. Probably irrelevant in practice. The sed command
@@ -180,17 +242,25 @@ for TEXMFLS_R in "$@"; do
#
echo "./:" >>"$db_file_tmp"
vc_dirs='\.\(bzr\|git\|hg\|svn\)\|CVS\|RCS\|_darcs'
- (cd "$TEXMFLS_R" && \ls -LRa 2>/dev/null) \
+ (cd "$TEXMFLS_R" && \runls) \
| sed -e '/^$/{n;s%^\./%%;s%^%./%;}; /^\.$/d; /^\.\.$/d; /^'$vc_dirs'$/d;' \
- -e '/^[\.\/]*lsR[0-9]*\.tmp:*$/d' \
+ -e '/^[\.\/]*lsR[0-9]*\.tmp:*$/d;/^[\.\/]*'${db_dir_tmp##*/}':*$/d' \
| sed -e /$vc_dirs'.*:$/,/^$/d' \
>>"$db_file_tmp"
# To be really safe, a loop.
until PERMS=`kpsestat = "$db_file"`; do sleep 1; done
chmod $PERMS "$db_file_tmp"
- rm -f "$db_file"
- mv "$db_file_tmp" "$db_file"
+ if test -O "$db_file" ; then
+ # We're the owner of the $db_file
+ mv "$db_file_tmp" "$db_file"
+ else
+ # Sticky bit is set see line 141
+ # Temporary unset the noclobber option at line 20
+ set +o noclobber
+ cat "$db_file_tmp" > "$db_file"
+ set -o noclobber
+ fi
rm -rf "$db_dir_tmp"
done
$verbose && echo "$progname: Done." >&2
--- texk/kpathsea/texmf.cnf
+++ texk/kpathsea/texmf.cnf 2008-11-05 17:44:31.493540761 +0100
@@ -44,18 +44,18 @@
% The tree containing the runtime files closely related to the specific
% program version used:
-TEXMFMAIN = $SELFAUTOPARENT/texmf
+TEXMFMAIN = /usr/lib/texmf
% The main distribution tree:
-TEXMFDIST = $SELFAUTOPARENT/texmf-dist
+TEXMFDIST = /usr/share/texmf
% Our documentation-only tree, arranged by language:
-TEXMFDOC = $SELFAUTOPARENT/texmf-doc
+TEXMFDOC = ${TEXMFDIST}/doc;${TEXMFMAIN}/doc
% A place for local additions to a "standard" texmf tree.
% This tree is not used for local configuration maintained by
% texconfig, it uses TEXMFCONFIG below.
-TEXMFLOCAL = $SELFAUTOPARENT/../texmf-local
+TEXMFLOCAL = /usr/local/share/texmf
% TEXMFSYSVAR, where texconfig-sys stores variable runtime data.
% With teTeX-3.0 or later, this must be set.
@@ -63,7 +63,7 @@ TEXMFLOCAL = $SELFAUTOPARENT/../texmf-lo
% TEXMFSYSVAR = $TEXMFMAIN
% For using a separate tree:
% TEXMFSYSVAR = $SELFAUTOPARENT/texmf-var
-TEXMFSYSVAR = $SELFAUTOPARENT/texmf-var
+TEXMFSYSVAR = /var/lib/texmf
% TEXMFSYSCONFIG, where texconfig-sys stores configuration data.
% With teTeX-3.0 or later, this must be set.
@@ -71,11 +71,11 @@ TEXMFSYSVAR = $SELFAUTOPARENT/texmf-var
% TEXMFSYSCONFIG = $TEXMFMAIN
% For using a separate tree:
% TEXMFSYSCONFIG = $SELFAUTOPARENT/texmf-config
-TEXMFSYSCONFIG = $SELFAUTOPARENT/texmf-config
+TEXMFSYSCONFIG = /etc/texmf
% User texmf trees are allowed as follows.
% This used to be HOMETEXMF.
-TEXMFHOME = ~/texmf
+TEXMFHOME = $HOME/texmf
% TEXMFVAR, where texconfig stores variable runtime data.
% With teTeX-3.0 or later, this must be set.
@@ -83,7 +83,7 @@ TEXMFHOME = ~/texmf
% TEXMFVAR = $TEXMFMAIN
% For using a separate tree:
% TEXMFVAR = ~/.texmf-var # teTeX 3.0 default
-TEXMFVAR = ~/.texlive2008/texmf-var
+TEXMFVAR = ${TEXMFSYSVAR}
% TEXMFCONFIG, where texconfig stores configuration data.
% With teTeX-3.0 or later, this must be set.
@@ -93,7 +93,7 @@ TEXMFVAR = ~/.texlive2008/texmf-var
% TEXMFCONFIG = ~/.texmf-config # teTeX 3.0 default
% For using a separate tree:
% TEXMFCONFIG = $SELFAUTOPARENT/texmf-config
-TEXMFCONFIG = ~/.texlive2008/texmf-config
+TEXMFCONFIG = ${TEXMFSYSCONFIG}
% Now, list all the texmf trees. If you have multiple trees you can
% use shell brace notation, like this:
@@ -111,18 +111,18 @@ TEXMFCONFIG = ~/.texlive2008/texmf-confi
% versions should take precedence over those (although it is generally a
% source of confusion to have different versions of a package installed,
% whatever the trees, so try to avoid it).
-TEXMF = {$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST}
+TEXMF = {$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST}
% The system trees. These are the trees that are shared by all the users.
% If a tree appears in this list, the mktex* scripts will use
% VARTEXFONTS for generated files, if the original tree isn't writable;
% otherwise the current working directory is used.
-SYSTEXMF = $TEXMFSYSVAR;$TEXMFMAIN;$TEXMFLOCAL;$TEXMFDIST
+SYSTEXMF = $TEXMFSYSCONFIG;$TEXMFSYSVAR;$TEXMFMAIN;$TEXMFLOCAL;$TEXMFDIST
% Where generated fonts may be written. This tree is used when the sources
% were found in a system tree and either that tree wasn't writable, or the
% varfonts feature was enabled in MT_FEATURES in mktex.cnf.
-VARTEXFONTS = $TEXMFVAR/fonts
+VARTEXFONTS = /var/cache/fonts
% Where to look for ls-R files. There need not be an ls-R in the
% directories in this path, but if there is one, Kpathsea will use it.
@@ -132,7 +132,7 @@ VARTEXFONTS = $TEXMFVAR/fonts
% be searched. This is arguably a bug in kpathsea, but we will not
% think about it now.
%
-TEXMFDBS = {!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST,!!$TEXMFDOC}
+TEXMFDBS = $TEXMF;$VARTEXFONTS
% On some systems, there will be a system tree which contains all the font
% files that may be created as well as the formats. For example
@@ -151,7 +151,7 @@ TEXMFDBS = {!!$TEXMFSYSCONFIG,!!$TEXMFSY
% WEB2C is for Web2C specific files. The current directory may not be
% a good place to look for them.
-WEB2C = $TEXMF/web2c
+WEB2C = ${TEXMFHOME}/web2c;${TEXMFSYSCONFIG}/web2c;${TEXMFSYSVAR}/web2c;$TEXMF/web2c
% TEXINPUTS is for TeX input files -- i.e., anything to be found by \input
% or \openin, including .sty, .eps, etc.
@@ -165,7 +165,7 @@ TEXINPUTS.amstex = .;$TEXMF/tex/{
TEXINPUTS.csplain = .;$TEXMF/tex/{csplain,plain,generic,}//
TEXINPUTS.eplain = .;$TEXMF/tex/{eplain,plain,generic,}//
TEXINPUTS.ftex = .;$TEXMF/tex/{formate,plain,generic,}//
-TEXINPUTS.jadetex = .;$TEXMF/tex/{jadetex,plain,generic,}//
+TEXINPUTS.jadetex = .;$TEXMF/tex/{jadetex,xmltex,plain,generic,}//
TEXINPUTS.mex = .;$TEXMF/tex/{mex,plain,generic,}//
TEXINPUTS.texinfo = .;$TEXMF/tex/{texinfo,plain,generic,}//
TEXINPUTS.xetex = .;$TEXMF/tex/{xetex,plain,generic,}//
@@ -196,23 +196,23 @@ TEXINPUTS.etex = .;$TEXMF/tex/{
% pdfTeX. This form of the input paths is borrowed from teTeX. A certain
% variant of TDS is assumed here, unaffected by the build variables.
-TEXINPUTS.pdfcslatex = .;$TEXMF/tex/{cslatex,csplain,latex,generic,}//
-TEXINPUTS.pdfcsplain = .;$TEXMF/tex/{csplain,plain,generic,}//
-TEXINPUTS.pdfjadetex = .;$TEXMF/tex/{jadetex,plain,generic,}//
-TEXINPUTS.pdflatex = .;$TEXMF/tex/{latex,generic,}//
-TEXINPUTS.pdfmex = .;$TEXMF/tex/{mex,plain,generic,}//
+TEXINPUTS.pdfcslatex = .;$TEXMF/{pdftex,tex}/{cslatex,csplain,latex,generic,}//
+TEXINPUTS.pdfcsplain = .;$TEXMF/{pdftex,tex}/{csplain,plain,generic,}//
+TEXINPUTS.pdfjadetex = .;$TEXMF/{pdftex,tex}/{jadetex,xmltex,plain,generic,}//
+TEXINPUTS.pdflatex = .;$TEXMF/{pdftex,tex}/{latex,generic,}//
+TEXINPUTS.pdfmex = .;$TEXMF/{pdftex,tex}/{mex,plain,generic,}//
TEXINPUTS.utf8mex = .;$TEXMF/tex/{mex,plain,generic,}//
-TEXINPUTS.pdftex = .;$TEXMF/tex/{plain,generic,}//
-TEXINPUTS.pdftexinfo = .;$TEXMF/tex/{texinfo,plain,generic,}//
-TEXINPUTS.pdfamstex = .;$TEXMF/tex/{amstex,plain,generic,}//
+TEXINPUTS.pdftex = .;$TEXMF/{pdftex,tex}/{plain,generic,}//
+TEXINPUTS.pdftexinfo = .;$TEXMF/{pdftex,tex}/{texinfo,plain,generic,}//
+TEXINPUTS.pdfamstex = .;$TEXMF/{pdftex,tex}/{amstex,plain,generic,}//
% pdfeTeX.
-TEXINPUTS.pdfelatex = .;$TEXMF/tex/{latex,generic,}//
-TEXINPUTS.pdfetex = .;$TEXMF/tex/{plain,generic,}//
+TEXINPUTS.pdfelatex = .;$TEXMF/{pdftex,tex}/{latex,generic,}//
+TEXINPUTS.pdfetex = .;$TEXMF/{pdftex,tex}/{plain,generic,}//
% pdfxTeX.
-TEXINPUTS.pdfxlatex = .;$TEXMF/tex/{latex,generic,}//
-TEXINPUTS.pdfxtex = .;$TEXMF/tex/{plain,generic,}//
+TEXINPUTS.pdfxlatex = .;$TEXMF/{pdftex,tex}/{latex,generic,}//
+TEXINPUTS.pdfxtex = .;$TEXMF/{pdftex,tex}/{plain,generic,}//
% XeTeX
TEXINPUTS.xelatex = .;$TEXMF/tex/{xelatex,latex,generic,}//
@@ -239,11 +239,11 @@ TEXINPUTS = .;$TEXMF/tex/{
TEXINPUTS.elambda = .;$TEXMF/tex/{lambda,latex,generic,}//
TEXINPUTS.eomega = .;$TEXMF/tex/{plain,generic,}//
-TEXINPUTS.pdfxmex = .;$TEXMF/tex/{mex,plain,generic,}//
+TEXINPUTS.pdfxmex = .;$TEXMF/{pdftex,tex}/{mex,plain,generic,}//
TEXINPUTS.frpdflatex = .;$TEXMF/tex/{french,latex,generic,}//
TEXINPUTS.frpdftex = .;$TEXMF/tex/{french,plain,generic,}//
TEXINPUTS.xmltex = .;$TEXMF/tex/{xmltex,latex,generic,}//
-TEXINPUTS.pdfxmltex = .;$TEXMF/tex/{xmltex,latex,generic,}//
+TEXINPUTS.pdfxmltex = .;$TEXMF/{pdftex,tex}/{xmltex,latex,generic,}//
TTF2TFMINPUTS = .;$TEXMF/ttf2pk//
@@ -265,14 +265,14 @@ MPINPUTS = .;$TEXMF/metapost//
% We repeat the same definition three times because of the way fmtutil
% is implemented; if we use ${TEXFORMATS}, the mpost/mf/etc. formats
% will not be found.
-TEXFORMATS = .;$TEXMF/web2c{/$engine,}
-MFBASES = .;$TEXMF/web2c{/$engine,}
-MPMEMS = .;$TEXMF/web2c{/$engine,}
+TEXFORMATS = .;$WEB2C/{$engine,}//
+MFBASES = .;$WEB2C/{$engine,}//
+MPMEMS = .;$WEB2C/{$engine,}//
%
% As of 2008, pool files don't exist any more (the strings are compiled
% into the binaries), but just in case something expects to find these
% settings:
-TEXPOOL = .;$TEXMF/web2c
+TEXPOOL = .;$WEB2C
MFPOOL = ${TEXPOOL}
MPPOOL = ${TEXPOOL}
@@ -300,7 +300,7 @@ GFFONTS = .;$TEXMF/fonts/gf/$MAKETEX_MOD
GLYPHFONTS = .;$TEXMF/fonts
% A place to puth everything that doesn't fit the other font categories.
-MISCFONTS = .;$TEXMF/fonts/misc//
+MISCFONTS = .;$TEXMF/fonts/misc//;$TEXMF/fonts/hbf//
% font name map files. This isn't just fonts/map// because ConTeXt
% wants support for having files with the same name in the different
@@ -374,8 +374,8 @@ MPSUPPORT = .;$TEXMF/metapost/support
% For xdvi to find mime.types and .mailcap, if they do not exist in
% ~. These are single directories, not paths.
% (But the default mime.types, at least, may well suffice.)
-MIMELIBDIR = $SELFAUTOPARENT/etc
-MAILCAPLIBDIR = $SELFAUTOPARENT/etc
+MIMELIBDIR = /etc
+MAILCAPLIBDIR = /etc
% Default settings for fontconfig library, used by Win32 versions of
% xetex/xdvipdfmx (note that fontconfig on Linux/Unix-like systems
@@ -447,7 +447,8 @@ RUBYINPUTS = .;$TEXMF/scripts/{$progna
%
% For security reasons, it is better not to include . in this path.
%
-TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c}
+TEXMFCNF = /etc/texmf;/etc/texmf/web2c;/var/lib/texmf/web2c;$TEXMF/web2c
+
# kpathsea 3.5.3 and later sets these at runtime. To avoid empty
# expansions from binaries linked against an earlier version of the
@@ -571,9 +572,9 @@ TEX = etex
% For some xy-pic samples, you may need as much as 700000 words of memory.
% For the vast majority of documents, 60000 or less will do.
%
-main_memory = 3000000 % words of inimemory available; also applies to inimf&mp
-extra_mem_top = 0 % extra high memory for chars, tokens, etc.
-extra_mem_bot = 0 % extra low memory for boxes, glue, breakpoints, etc.
+main_memory = 3500000 % words of inimemory available; also applies to inimf&mp
+extra_mem_top = 0 % extra high memory for chars, tokens, etc. (has to be 0 for omega)
+extra_mem_bot = 0 % extra low memory for boxes, glue, breakpoints, etc. (has to be 0 for omega)
% ConTeXt needs lots of memory.
extra_mem_top.context = 2000000
@@ -645,3 +646,33 @@ gf_buf_size = 16384 % MF
error_line = 79
half_error_line = 50
max_print_line = 79
+
+% These are xmltex specific
+main_memory.xmltex = 1500000
+param_size.xmltex = 1500
+stack_size.xmltex = 1500
+hash_extra.xmltex = 50000
+string_vacancies.xmltex = 45000
+pool_free.xmltex = 47500
+nest_size.xmltex = 500
+save_size.xmltex = 10000
+pool_size.xmltex = 500000
+max_strings.xmltex = 55000
+
+% These are pdfxmltex specific
+main_memory.pdfxmltex = 2500000
+param_size.pdfxmltex = 1500
+stack_size.pdfxmltex = 1500
+hash_extra.pdfxmltex = 50000
+string_vacancies.pdfxmltex = 45000
+pool_free.pdfxmltex = 47500
+nest_size.pdfxmltex = 500
+save_size.pdfxmltex = 10000
+pool_size.pdfxmltex = 500000
+max_strings.pdfxmltex = 55000
+
+% These are jadetex specific
+main_memory.jadetex = 499999
+hash_extra.jadetex = 25000
+pool_size.jadetex = 500000
+save_size.jadetex = 15000
--- texk/make/makevars.mk
+++ texk/make/makevars.mk 2008-09-24 16:27:24.000000000 +0000
@@ -7,7 +7,8 @@ makevars = prefix=$(prefix) exec_prefix=
mandir=$(mandir) manext=$(manext) man1dir=$(man1dir) \
sysconfdir=$(sysconfdir) localstatedir=$(localstatedir) \
libexecdir=$(libexecdir) \
- texmf=$(texmf) web2cdir=$(web2cdir) vartexfonts=$(vartexfonts)\
+ texmf=$(texmf) web2cdir=$(web2cdir) texmfconf=$(texmfconf) \
+ texmfvar=$(texmfvar) vartexfonts=$(vartexfonts) \
texinputdir=$(texinputdir) mfinputdir=$(mfinputdir) mpinputdir=$(mpinputdir)\
fontdir=$(fontdir) fmtdir=$(fmtdir) basedir=$(basedir) memdir=$(memdir) \
texpooldir=$(texpooldir) mfpooldir=$(mfpooldir) mppooldir=$(mppooldir) \
--- texk/make/paths.mk
+++ texk/make/paths.mk 2008-09-26 13:11:57.000000000 +0000
@@ -28,6 +28,12 @@ includedir = @includedir@
# GNU .info* files.
infodir = @infodir@
+# System configuration directory
+sysconfdir = @sysconfdir@
+
+# System status directory
+localstatedir = @localstatedir@
+
# Unix man pages.
manext = 1
mandir = @mandir@
@@ -53,10 +59,16 @@ libexecdir = @libexecdir@
# texmf.cnf yourself.
# The root of the main tree.
+texmflocal = @prefix@/local/share/texmf
+texmfmain = @prefix@/lib/texmf
texmf = @texmfmain@
-# The directory used by varfonts.
-vartexfonts = /var/tmp/texfonts
+# FHS-2.0 and higher requires /var/cache/fonts/, we need also a rw dir
+# /var/lib/texmf/ for formats and other variable data.
+# This because it should be possible to have a ro mounted /usr/.
+texmfconf = $(sysconfdir)/texmf
+texmfvar = $(localstatedir)/texmf
+vartexfonts = /var/cache/fonts
# Regular input files.
texinputdir = $(texmf)/tex
--- texk/ps2pkm/pk2bm.c
+++ texk/ps2pkm/pk2bm.c 2008-09-24 15:45:39.000000000 +0000
@@ -41,8 +41,7 @@ int main(int argc, char *argv[])
quarterword lsbf();
void dots();
chardesc cd;
- char *myname = "pk2bm", *pkname;
- int atoo(char *);
+ char *myname = "pk2bm", *pkname, *endptr;
while (--argc > 0 && (*++argv)[0] == '-') {
done=0;
@@ -50,26 +49,36 @@ int main(int argc, char *argv[])
switch (c) {
case 'c':
if (*++argv[0] == '\0') {
- argc--; argv++;
+ if (--argc == 0) {
+err:
+ printf("%s: illegal value for option %c\n", myname, c);
+ exit(1);
+ }
+ argv++;
}
C = *argv[0];
done = 1; break;
case 'o':
if (*++argv[0] == '\0') {
- argc--; ++argv;
+ if (--argc == 0) goto err;
+ ++argv;
}
- C = atoo(argv[0]);
+ C = strtol(argv[0], &endptr, 8);
+ if (endptr==argv[0] || *endptr) goto err;
done = 1; break;
case 'H':
if (*++argv[0] == '\0') {
- argc--; argv++;
+ if (--argc == 0) goto err;
+ argv++;
}
- h = atoi(argv[0]);
+ h = strtol(argv[0], &endptr, 10);
+ if (endptr==argv[0] || *endptr) goto err;
done=1;
break;
case 'W':
if (*++argv[0] == '\0') {
- argc--; argv++;
+ if (--argc == 0) goto err;
+ argv++;
}
w = atoi(argv[0]);
done=1;
@@ -86,7 +95,7 @@ int main(int argc, char *argv[])
}
}
- if (argc == 0) {
+ if (argc != 1) {
printf("Usage: %s [-bh] {-c char|-o octchar} [-W width -H height] pkfile\n", myname);
exit(1);
}
@@ -199,8 +208,3 @@ quarterword u; int n;
}
}
-int atoo(char *oct)
-{ int octal = 0;
- while (*oct != '\0') octal = 8*octal + (*oct++) - '0';
- return octal & 0xff;
-}
--- texk/tetex/fmtutil
+++ texk/tetex/fmtutil 2008-09-24 16:29:30.000000000 +0000
@@ -113,7 +113,7 @@ setupTmpDir()
trap 'cleanup 1' 1 2 3 7 13 15
needsCleanup=true
- (umask 077; mkdir "$tmpdir") \
+ (umask 077; mkdir -m 0700 "$tmpdir") \
|| abort "could not create directory \`$tmpdir'"
}
@@ -361,7 +361,7 @@ main()
need_find_hyphenfile=false
cfgparam=
cfgmaint=
- tmpdir=${TMPDIR-${TEMP-${TMP-/tmp}}}/$progname.$$
+ tmpdir=${TMPDIR-${TEMP-${TMP-/tmp}}}/$progname.$$.$RANDOM
verboseFlag=true
# mktexfmtMode: if called as mktexfmt, set to true. Will echo the
@@ -678,6 +678,7 @@ run_initex()
*) prgswitch=-progname=$format;;
esac
+ type -p "$engine" &> /dev/null || return
rm -f $fmtfile
# Check for infinite recursion before running the iniTeX:
@@ -688,6 +689,12 @@ run_initex()
mktexfmt_loop=$mktexfmt_loop:$format/$engine
export mktexfmt_loop
+ test "$batchmode" = "yes" && {
+ case "$engine" in
+ tex|ptex)
+ texargs="\\batchmode \\input $texargs"
+ esac
+ }
verboseMsg "$progname: running \`$engine -ini $tcxflag $jobswitch $prgswitch $texargs' ..."
# run in a subshell to get a local effect of TEXPOOL manipulation:
--- texk/tetex/texconfig-dialog
+++ texk/tetex/texconfig-dialog 2008-09-24 15:45:39.000000000 +0000
@@ -159,7 +159,14 @@ termCtl()
###############################################################################
menuMain()
{
- cat <<-'eof'
+ rows="$(stty size)"
+ columns=${rows##* }
+ rows=${rows%% *}
+ test -n "$rows" || rows=0
+ test -n "$columns" || columns=0
+
+ if test $rows -lt 24 -a $columns -lt 80 ; then
+ cat <<-'eof'
The interactive texconfig utility will be started now. Make sure
your screen has at least 24 rows and 80 columns. If texconfig
crashes now, you can still set up your teTeX system using the
@@ -168,8 +175,9 @@ menuMain()
The interactive mode works best with a real vt100 terminal or
inside an xterm window.
-eof
- termCtl readln
+ eof
+ termCtl readln
+ fi
while :; do
logMessage='view logfile'
--- texk/tetex/texconfig
+++ texk/tetex/texconfig 2008-09-24 15:45:39.000000000 +0000
@@ -37,7 +37,7 @@ envVars="
TEXMFDBS TEXMFINI TEXMFSCRIPTS TEXPICTS TEXPKS TEXPOOL TEXPSHEADERS
TEXSOURCES TFMFONTS TRFONTS TTFONTS VFFONTS WEB2C WEBINPUTS
"
-tmpdir=${TMPDIR-${TEMP-${TMP-/tmp}}}/tctmp.$$
+tmpdir=${TMPDIR-${TEMP-${TMP-/tmp}}}/tctmp.$$.$RANDOM
needsCleanup=false
lastUpdatedFile=
@@ -1006,21 +1006,6 @@ For more information about these \`featu
;;
formats)
- cat >&2 <<EOM
-texconfig formats is no longer supported, because manual edits of
-fmtutil.cnf will be overwritten by the new TeX Live package manager,
-tlmgr, which regenerates that file as needed upon package changes.
-Thus, to add or remove formats, the recommended method is to use tlmgr
-to add or remove the appropriate package.
-
-If you need to make manual additions, you can edit the file
-fmtutil-local.cnf under TEXMFLOCAL. Further information with
-tlmgr --help and at http://tug.org/texlive/tlmgr.html.
-
-Exiting.
-EOM
- exit 1 # but leave the real code for posterity
-
setupTmpDir
echo "$progname: analyzing old configuration..." >&2
fmtutil --catcfg > $tmpdir/pre
@@ -1046,22 +1031,6 @@ EOM
# "hyphen FORMAT"
hyphen)
- cat >&2 <<EOM
-texconfig hyphen is no longer supported, because manual edits of
-language.dat (or language.def) will be overwritten by the new TeX Live
-package manager, tlmgr, which regenerates those configuration files as
-needed upon package changes. Thus, to add or remove hyphenation
-patterns, the recommended method is to use tlmgr to add or remove the
-appropriate package.
-
-If you need to make manual additions, you can edit the files
-language-local.dat and language-local.def under TEXMFLOCAL. Further
-information with tlmgr --help and at http://tug.org/texlive/tlmgr.html.
-
-Exiting.
-EOM
- exit 1 # but leave the real code for posterity
-
tcBatchHyphenFormat=$2
formatsForHyphen=`getFormatsForHyphen`
formatsForHyphenFmt=`echo "$formatsForHyphen" | myFmt | sed 's@^@ @'`
@@ -1321,7 +1290,7 @@ Valid PAPER settings:
;;
rehash)
- mktexlsr
+ ( unset KPSE_DOT; mktexlsr )
;;
#
--- texk/tetex/texlinks
+++ texk/tetex/texlinks 2008-09-24 15:45:39.000000000 +0000
@@ -101,7 +101,7 @@ setupTmpDir()
trap 'cleanup 1' 1 2 3 7 13 15
needsCleanup=true
- (umask 077; mkdir "$tmpdir") \
+ (umask 077; mkdir -m 0700 "$tmpdir") \
|| abort "could not create directory \`$tmpdir'"
}
@@ -109,16 +109,18 @@ setupTmpDir()
# search a binary along $PATH:
check_for_binary()
{
- testbin=$1
- set x `echo "$PATH" | sed 's/^:/.:/; s/:$/:./; s/::/:.:/g; s/:/ /g'`; shift
- for i
- do
- if [ -x "$i/$testbin" ]; then
- echo "$i/$testbin"
- return 0
- fi
- done
- return 1
+# testbin=$1
+# set x `echo "$PATH" | sed 's/^:/.:/; s/:$/:./; s/::/:.:/g; s/:/ /g'`; shift
+# for i
+# do
+# if [ -x "$i/$testbin" ]; then
+# echo "$i/$testbin"
+# return 0
+# fi
+# done
+# return 1
+
+ type -p $1
}
@@ -201,8 +203,22 @@ search_symlinkdir()
upd_symlinkdir()
{
search_symlinkdir || return 0
- for i in `sed 's@ .*@@' cnf_file_ln.$$`; do
- install_link "$selfautoloc/$i" "$symlinkdir/$i"
+ set x `cat cnf_file_ln.$$` ; shift
+ while test $# != 0; do
+ fmt=$1; ini=$3; shift; shift; shift
+
+ # Some broken shells destroy the positional arguments when calling a
+ # shellfunction. Therefore, we save and restore them "by hand" in the
+ # main_args_while variable.
+ main_args_while="$@"
+
+ kpsewhich -progname=$fmt -format=tex $ini >/dev/null 2>&1
+ test $? -ne 0 && continue
+
+ install_link "$selfautoloc/$fmt" "$symlinkdir/$fmt"
+
+ # restore positional arguments:
+ set x $main_args_while; shift
done
}
@@ -265,12 +281,12 @@ main()
test -f "$cnf_file" || abort "config file \`$cnf' not found"
- tmpdir=${TMPDIR-${TEMP-${TMP-/tmp}}}/texlinks.$$
+ tmpdir=${TMPDIR-${TEMP-${TMP-/tmp}}}/texlinks.$$.$RANDOM
setupTmpDir
cd "$tmpdir" || cleanup 1
- sed '/^[ ]*#/d; /^[ ]*$/d' $cnf_file \
- | awk '{print $1, $2}' > cnf_file_ln.$$
+ sed '/^[ ]*#/d; /^[ ]*$/d; s%\*%%' $cnf_file \
+ | awk '{print $1, $2, $NF}' > cnf_file_ln.$$
if test -z "$dirs"; then
if test $multiplatform = true; then
@@ -291,13 +307,16 @@ main()
# cnf_file_ln.$$ has lines with "format engine" pairs
set x `cat cnf_file_ln.$$`; shift
while test $# != 0; do
- fmt=$1; engine=$2; shift; shift
+ fmt=$1; engine=$2; ini=$3; shift; shift; shift
# Some broken shells destroy the positional arguments when calling a
# shellfunction. Therefore, we save and restore them "by hand" in the
# main_args_while variable.
main_args_while="$@"
+ kpsewhich -progname=$fmt -format=tex $ini >/dev/null 2>&1
+ test $? -ne 0 && continue
+
test "x$fmt" = "x$engine" && continue
if test -f "$d/$engine"; then
case $unlink in
--- texk/tex4htk/Makefile.in
+++ texk/tex4htk/Makefile.in 2008-09-26 17:58:00.000000000 +0200
@@ -32,13 +32,15 @@ uninstall: uninstall-exec uninstall-data
install-exec: all
$(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
- $(INSTALL) -d "$(prefix)/texmf-dist/scripts/tex4ht"
- for p in $(shell_scripts); do $(INSTALL_SCRIPT) $(srcdir)/$$p "$(prefix)/texmf-dist/scripts/tex4ht/$$p.sh"; done
- for p in $(perl_scripts); do $(INSTALL_SCRIPT) $(srcdir)/$$p "$(prefix)/texmf-dist/scripts/tex4ht/$$p.pl"; done
- if test -d "$(bindir)/../../texmf-dist/scripts/tex4ht"; then \
- d=../../texmf-dist/scripts/tex4ht; \
- elif test -d "$(bindir)/../texmf-dist/scripts/tex4ht"; then \
- d=../texmf-dist/scripts/tex4ht; \
+ $(INSTALL) -d "$(texmf)/scripts/tex4ht"
+ for p in $(shell_scripts); do $(INSTALL_SCRIPT) $(srcdir)/$$p "$(texmf)/scripts/tex4ht/$$p.sh"; done
+ for p in $(perl_scripts); do $(INSTALL_SCRIPT) $(srcdir)/$$p "$(texmf)/scripts/tex4ht/$$p.pl"; done
+ if test -d "$(bindir)/../../../../share/texmf/scripts/tex4ht"; then \
+ d=../../../../share/texmf/scripts/tex4ht; \
+ elif test -d "$(bindir)/../../../share/texmf/scripts/tex4ht"; then \
+ d=../../../share/texmf/scripts/tex4ht; \
+ elif test -d "$(bindir)/../share/texmf/scripts/tex4ht"; then \
+ d=../texmf/scripts/tex4ht; \
else \
echo "Error: texmf-dist/scripts/tex4ht directory not found" >&2; \
exit 1; \
--- texk/texlive/Makefile.in
+++ texk/texlive/Makefile.in 2008-09-26 18:19:22.000000000 +0200
@@ -11,17 +11,17 @@ kpse_include ../make/programs.mk
# of avoiding dangling links produced by Build; the instances
# in texmf are the masters (except when it is CTAN).
LINKED_SCRIPTS = \
- texmf/scripts/a2ping/a2ping.pl \
- texmf/scripts/epstopdf/epstopdf.pl \
- texmf/scripts/pkfix/pkfix.pl \
- texmf/scripts/ps2eps/ps2eps.pl \
- texmf/scripts/simpdftex/simpdftex \
- texmf/scripts/tetex/e2pall.pl \
- texmf/scripts/tetex/texdoctk.pl \
- texmf/scripts/texlive/getnonfreefonts.pl \
- texmf/scripts/texlive/rungs.tlu \
- texmf/scripts/texlive/texdoc.tlu \
- texmf/scripts/texlive/tlmgr.pl \
+ texmf-main/scripts/a2ping/a2ping.pl \
+ texmf-main/scripts/epstopdf/epstopdf.pl \
+ texmf-main/scripts/pkfix/pkfix.pl \
+ texmf-main/scripts/ps2eps/ps2eps.pl \
+ texmf-main/scripts/simpdftex/simpdftex \
+ texmf-main/scripts/tetex/e2pall.pl \
+ texmf-main/scripts/tetex/texdoctk.pl \
+ texmf-main/scripts/texlive/getnonfreefonts.pl \
+ texmf-main/scripts/texlive/rungs.tlu \
+ texmf-main/scripts/texlive/texdoc.tlu \
+ texmf-main/scripts/texlive/tlmgr.pl \
texmf-dist/scripts/bengali/ebong.py \
texmf-dist/scripts/dviasm/dviasm.py \
texmf-dist/scripts/epspdf/epspdf \
@@ -108,6 +108,10 @@ install-exec:
target=$$target; \
rm -f $$target; \
case "$(scriptdir)" in \
+ *lib/texmf/bin/*) \
+ s=$${s/texmf-main/lib/texmf}; \
+ s=$${s/texmf-dist/share/texmf}; \
+ d=../../../..;; \
*/bin) d=..;; \
*/bin/*) d=../..;; \
*) echo "$(scriptdir): strange directory for linked scripts" >&2;\
--- texk/web2c/Makefile.in
+++ texk/web2c/Makefile.in 2008-09-24 15:45:39.000000000 +0000
@@ -67,7 +67,7 @@ windowlink = $(windowlib) $(x_ldflags) $
# With --enable-ipc, TeX may need to link with -lsocket.
socketlibs = @socketlibs@
-common_makeargs = $(MFLAGS) CC='$(CC)' CFLAGS='$(CFLAGS)' LDFLAGS='$(LDFLAGS)' $(XMAKEARGS)
+common_makeargs = $(MFLAGS) CC='$(CC)' CFLAGS='$(CFLAGS)' CXXFLAGS='$(CXXFLAGS)' LDFLAGS='$(LDFLAGS)' $(XMAKEARGS)
window_makeargs = x_cppflags='$(x_cppflags)' $(common_makeargs)
install_makeargs = $(makevars) $(common_makeargs)
--- texk/web2c/fmtutil.in
+++ texk/web2c/fmtutil.in 2008-09-24 16:32:55.000000000 +0000
@@ -74,16 +74,16 @@ amstex pdftex - -translate-file=cp227.
#! pdfamstex pdftex - -translate-file=cp227.tcx *pdfamstex.ini
# Context formats:
-#! cont-cz pdftex cont-usr.tex -8bit *cont-cz.ini
-#! cont-cz xetex cont-usr.tex -8bit *cont-cz.ini
-#! cont-de pdftex cont-usr.tex -8bit *cont-de.ini
-#! cont-de xetex cont-usr.tex -8bit *cont-de.ini
-#! cont-en pdftex cont-usr.tex -8bit *cont-en.ini
-#! cont-en xetex cont-usr.tex -8bit *cont-en.ini
-#! cont-nl pdftex cont-usr.tex -8bit *cont-nl.ini
-#! cont-nl xetex cont-usr.tex -8bit *cont-nl.ini
-#! cont-uk pdftex cont-usr.tex -8bit *cont-uk.ini
-#! cont-uk xetex cont-usr.tex -8bit *cont-uk.ini
+cont-cz pdftex cont-usr.tex -8bit *cont-cz.ini
+cont-cz xetex cont-usr.tex -8bit *cont-cz.ini
+cont-de pdftex cont-usr.tex -8bit *cont-de.ini
+cont-de xetex cont-usr.tex -8bit *cont-de.ini
+cont-en pdftex cont-usr.tex -8bit *cont-en.ini
+cont-en xetex cont-usr.tex -8bit *cont-en.ini
+cont-nl pdftex cont-usr.tex -8bit *cont-nl.ini
+cont-nl xetex cont-usr.tex -8bit *cont-nl.ini
+cont-uk pdftex cont-usr.tex -8bit *cont-uk.ini
+cont-uk xetex cont-usr.tex -8bit *cont-uk.ini
# language-specific things:
@@ -132,7 +132,14 @@ physe pdftex - physe.ini
phyzzx pdftex - physe.ini
# formats with dependencies on earlier formats
-xmltex pdftex language.dat &latex xmltex.ini
-pdfxmltex pdftex language.dat &pdflatex pdfxmltex.ini
-jadetex pdftex language.dat &latex jadetex.ini
-pdfjadetex pdftex language.dat &pdflatex pdfjadetex.ini
+xmltex pdftex language.dat -translate-file=cp227.tcx &latex xmltex.ini
+pdfxmltex pdftex language.dat -translate-file=cp227.tcx &pdflatex pdfxmltex.ini
+jadetex pdftex language.dat -translate-file=cp227.tcx &latex jadetex.ini
+pdfjadetex pdftex language.dat -translate-file=cp227.tcx &pdflatex pdfjadetex.ini
+
+# formats for MusixTeX/MusicTeX
+musixtex pdftex - -translate-file=cp227.tcx &etex musixtex.ins
+pdfmusixtex pdftex - -translate-file=cp227.tcx &pdfetex pdfmusixtex.ins
+#! musictex pdftex - -translate-file=cp227.tcx &etex musictex.ins
+#! pdfmusictex pdftex - -translate-file=cp227.tcx &pdfetex pdfmusictex.ins
+
--- texk/web2c/pdftexdir/Makefile.in
+++ texk/web2c/pdftexdir/Makefile.in 2008-09-24 15:45:39.000000000 +0000
@@ -39,7 +39,7 @@ LIBOBSDCOMPATDIR=../../../libs/obsdcompa
LIBOBSDCOMPATSRCDIR=$(srcdir)/$(LIBOBSDCOMPATDIR)
XCPPFLAGS=-I.. -I$(srcdir)/.. -I../.. -I$(srcdir)/../.. -I$(LIBMD5DIR) \
- -I$(LIBMD5SRCDIR) @LIBPNGCPPFLAGS@ @ZLIBCPPFLAGS@ \
+ -I$(LIBMD5SRCDIR) @LIBPNGCPPFLAGS@ @ZLIBCPPFLAGS@ @LIBXPDFCPPFLAGS@ \
-I$(LIBXPDFDIR) -I$(LIBXPDFDIR)/.. -I$(LIBXPDFSRCDIR) -I$(LIBXPDFSRCDIR)/.. \
-I$(LIBOBSDCOMPATDIR) -I$(LIBOBSDCOMPATDIR)/.. -I$(LIBOBSDCOMPATSRCDIR) \
-I$(LIBOBSDCOMPATSRCDIR)/.. -DpdfTeX
--- texk/web2c/window/regis.c
+++ texk/web2c/window/regis.c 2008-09-24 15:45:39.000000000 +0000
@@ -62,12 +62,14 @@ void mf_regis_blankrectangle P4C(screenc
screenrow, top,
screenrow, bottom)
{
- printf(
+ const char *format =
#ifdef WRITEWHITE
- "%cPpP[%d,%d]W(I0)W(S1)V[%d,%d]V[%d,%d]V[%d,%d]V[%d,%d]W(S0)W(I3)%c\\",
+ "%cPpP[%d,%d]W(I0)W(S1)V[%d,%d]V[%d,%d]V[%d,%d]V[%d,%d]W(S0)W(I3)%c\\"
#else
- "%cPpP[%d,%d]W(I3)W(S1)V[%d,%d]V[%d,%d]V[%d,%d]V[%d,%d]W(S0)W(I0)%c\\",
+ "%cPpP[%d,%d]W(I3)W(S1)V[%d,%d]V[%d,%d]V[%d,%d]V[%d,%d]W(S0)W(I0)%c\\"
#endif
+ ;
+ printf(format,
ESCAPE,left,bottom,right,bottom,right,top,left,top,
left,bottom,ESCAPE);
}
--- texk/web2c/window/x11-Xlib.c
+++ texk/web2c/window/x11-Xlib.c 2008-09-24 15:45:39.000000000 +0000
@@ -73,6 +73,8 @@ static XWMHints wm_hints = {
#define BORDER_WIDTH 1 /* Should get this from resource. */
#define DEFAULT_X_POSITION 0
#define DEFAULT_Y_POSITION 0
+#define DEFAULT_WIDTH 450
+#define DEFAULT_DEPTH 500
/* Return 1 (i.e., true) if display opened successfully, else 0. */
@@ -99,11 +101,11 @@ mf_x11_initscreen()
sizehints.x = DEFAULT_X_POSITION;
sizehints.y = DEFAULT_Y_POSITION;
- sizehints.width = screenwidth;
- sizehints.height = screendepth;
+ sizehints.width = DEFAULT_WIDTH;
+ sizehints.height = DEFAULT_DEPTH;
sizehints.flags = PPosition|PSize;
- sprintf (default_geometry, "%ux%u+%u+%u", screenwidth, screendepth,
+ sprintf (default_geometry, "%ux%u+%u+%u", DEFAULT_WIDTH, DEFAULT_DEPTH,
DEFAULT_X_POSITION, DEFAULT_Y_POSITION);
/* Look up the geometry for this window. (Section 10.2 Obtaining X
--- texk/web2c/window/x11-Xt.c
+++ texk/web2c/window/x11-Xt.c 2008-09-24 15:45:39.000000000 +0000
@@ -18,8 +18,8 @@
#define PLANE 0
-static unsigned int mf_defwidth = 0;
-static unsigned int mf_defheight = 0;
+static unsigned int mf_defwidth = 450;;
+static unsigned int mf_defheight = 500;
static Display *mf_display;
static Window mf_window;
--- texk/xdvik/psgs.c
+++ texk/xdvik/psgs.c 2008-09-24 15:45:39.000000000 +0000
@@ -30,6 +30,8 @@ OTHER DEALINGS IN THE SOFTWARE.
#include <sys/time.h> /* for timeval */
#include <signal.h>
+#include <sys/types.h>
+#include <sys/wait.h>
/* Condition for retrying a write */
#include <errno.h>
@@ -625,6 +627,26 @@ initGS(void)
perror("[xdvik] pipe");
return False;
}
+
+ if (GS_pid > 0) { /* Check if we've a running ghostscript */
+ int status, n = 0;
+ errno = 0;
+retry:
+ switch (waitpid(GS_pid, &status, WNOHANG)) {
+ case -1:
+ if (errno == EINTR)
+ goto retry;
+ return False;
+ case 0:
+ break;
+ default:
+ if (WIFEXITED(status) && WEXITSTATUS(status))
+ return False;
+ if (WIFSIGNALED(status))
+ return False;
+ break; /* Not reached */
+ }
+ }
fflush(stderr); /* to avoid double flushing */
GS_pid = vfork();
if (GS_pid == 0) { /* child */
--- texk/xdvik/xdvi-sh.in
+++ texk/xdvik/xdvi-sh.in 2008-09-24 15:45:39.000000000 +0000
@@ -50,4 +50,19 @@ if test -n "$xdviappfile"; then
XFILESEARCHPATH="$xdviapppath:${XFILESEARCHPATH-%D}"; export XFILESEARCHPATH
fi
-exec @final_exec_name@ $NAMEOPT ${1+"$@"}
+uncompress=
+filename="${1+"$@"}"
+case "${filename}" in
+ *.gz) uncompress="gzip -d -c $filename" ;;
+ *.bz2) uncompress="bzip2 -d -c $filename" ;;
+esac
+if test -n "$uncompress" -a -r "$filename" ; then
+ filename="${filename##*/}"
+ tmpfile="`mktemp ${TMPDIR-/tmp}/${filename%.*}.XXXXXX`" || exit 1
+ trap 'rc=$?; rm -f $tmpfile; exit $rc' 0 1 2 3 6 13 15
+ $uncompress > $tmpfile
+ exec -a xdvi @final_exec_name@ $NAMEOPT $tmpfile
+else
+ exec -a xdvi @final_exec_name@ $NAMEOPT ${1+"$@"}
+fi
+
