--- texmf/web2c/fmtutil.cnf +++ texmf/web2c/fmtutil.cnf 2011-09-13 15:40:39.608426212 +0000 @@ -45,11 +45,11 @@ amstex pdftex - -translate-file=cp227.tc # from context: cont-en pdftex cont-usr.tex -8bit *cont-en.ini cont-en xetex cont-usr.tex -8bit *cont-en.ini -#! cont-de pdftex cont-usr.tex -8bit *cont-de.ini -#! cont-fr pdftex cont-usr.tex -8bit *cont-fr.ini -#! cont-it pdftex cont-usr.tex -8bit *cont-it.ini -#! cont-nl pdftex cont-usr.tex -8bit *cont-nl.ini -#! cont-ro pdftex cont-usr.tex -8bit *cont-ro.ini +cont-de pdftex cont-usr.tex -8bit *cont-de.ini +cont-fr pdftex cont-usr.tex -8bit *cont-fr.ini +cont-it pdftex cont-usr.tex -8bit *cont-it.ini +cont-nl pdftex cont-usr.tex -8bit *cont-nl.ini +cont-ro pdftex cont-usr.tex -8bit *cont-ro.ini # # from cslatex: cslatex pdftex - -etex -translate-file=cp227.tcx cslatex.ini @@ -63,8 +63,8 @@ pdfcsplain pdftex - -etex -translate-fil eplain pdftex language.dat -translate-file=cp227.tcx *eplain.ini # # from jadetex: -jadetex pdftex language.dat *jadetex.ini -pdfjadetex pdftex language.dat *pdfjadetex.ini +jadetex pdftex language.dat -translate-file=cp227.tcx *jadetex.ini +pdfjadetex pdftex language.dat -translate-file=cp227.tcx *pdfjadetex.ini # # from latex-bin: latex pdftex language.dat -translate-file=cp227.tcx *latex.ini @@ -117,5 +117,11 @@ xetex xetex language.def -etex xetex.ini xelatex xetex language.dat -etex xelatex.ini # # from xmltex: -xmltex pdftex language.dat *xmltex.ini -pdfxmltex pdftex language.dat *pdfxmltex.ini +xmltex pdftex language.dat -translate-file=cp227.tcx *xmltex.ini +pdfxmltex pdftex language.dat -translate-file=cp227.tcx *pdfxmltex.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 --- texmf/web2c/mktex.opt +++ texmf/web2c/mktex.opt 2012-05-14 13:26:00.034911495 +0200 @@ -0,0 +1,141 @@ +# mktex.opt -- common mktex* options, etc. +# Meant to be sourced after $usage, $version, and $MT_TEXMFMAIN have been set. +# +# Originally written by Thomas Esser. Public domain. +# $Id: mktex.opt 18383 2010-05-20 18:31:24Z karl $ + +if test "x$1" = x--help || test "x$1" = x-help; then + echo "$usage" + exit 0 +elif test "x$1" = x--version || test "x$1" = x-version; then + echo "`basename $0` $version" + kpsewhich --version + exit 0 +elif test $# -lt ${mt_min_args-1}; then + echo "$0: Missing argument(s)." >&2 + echo "Try \``basename $0` --help' for more information." >&2 + exit 1 +elif test $# -gt ${mt_max_args-1}; then + num=$# + while test $# -gt `expr $num - ${mt_max_args-1}`; do shift; done + echo "$0: Extra arguments $*." >&2 + echo "Try \``basename $0` --help' for more information." >&2 + exit 1 +fi + +# MS-DOS and MS-Windows define $COMSPEC or $ComSpec and use `;' to separate +# directories in path lists whereas Unix uses `:'. Make an exception for +# Cygwin, which pretends to be UNIX. +# Create a variable that holds the right character to be used by the scripts. +DOSISH=no +case `uname -s` in + CYGWIN*|Cygwin*|cygwin*) ;; + *) if test -n "$COMSPEC" || test -n "$ComSpec"; then DOSISH=yes; fi +esac +if test "$DOSISH" = "no"; then SEP=':'; else SEP=';';fi + +# 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}/.mtXXXXXXXXXX" +else + 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. +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 + +# 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. +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 + +cd "$TEMPDIR" || exit 1 + +# The alternative location for fonts. The directory need not exist, +# so we use --expand-var here. We also perform a sanity check. +: ${MT_VARTEXFONTS=`kpsewhich --expand-var='$VARTEXFONTS' | sed 's%^!!%%'`} +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`} +test -n "$MT_MKTEXNAM" || MT_MKTEXNAM="$MT_TEXMFMAIN/web2c/mktexnam" +: ${MT_MKTEXNAM_OPT=`kpsewhich --format='web2c files' mktexnam.opt`} +test -n "$MT_MKTEXNAM_OPT" || MT_MKTEXNAM_OPT="$MT_TEXMFMAIN/web2c/mktexnam.opt" +: ${MT_MKTEXDIR=`kpsewhich --format='web2c files' mktexdir`} +test -n "$MT_MKTEXDIR" || MT_MKTEXDIR="$MT_TEXMFMAIN/web2c/mktexdir" +: ${MT_MKTEXDIR_OPT=`kpsewhich --format='web2c files' mktexdir.opt`} +test -n "$MT_MKTEXDIR_OPT" || MT_MKTEXDIR_OPT="$MT_TEXMFMAIN/web2c/mktexdir.opt" +: ${MT_MKTEXUPD=`kpsewhich --format='web2c files' mktexupd`} +test -n "$MT_MKTEXUPD" || MT_MKTEXUPD="$MT_TEXMFMAIN/web2c/mktexupd" + +# mktexupd and mktexlsr make sure they're coordinated via this. A copy of +# the first string is found in mktexlsr. +ls_R_magic='% ls-R -- filename database for kpathsea; do not change this line.' +# Old ls-R files should continue to work. +old_ls_R_magic='% ls-R -- maintained by MakeTeXls-R; do not change this line.' + +# Read defaults from mktex.cnf if that file exists. Can be used to +# overwrite anything defined below. Please use the same syntax as +# given here (e.g. ``: ${MODE=ljfour}'', not just ``MODE=ljfour'', as +# this can cause trouble (e.g. when the mode for mktexnam is +# already specified on the command line). +: ${MT_MKTEX_CNF=`kpsewhich --format='web2c files' mktex.cnf`} +test -n "$MT_MKTEX_CNF" && test -r "$MT_MKTEX_CNF" && . "$MT_MKTEX_CNF" + +# Possible features: appendonlydir dosnames fontmaps nomfdrivers nomode +# stripsupplier striptypeface texmfvar varfonts. +if test "$DOSISH" = "yes"; then + : ${MT_FEATURES=appendonlydir:dosnames} +else + : ${MT_FEATURES=appendonlydir} +fi +: ${MODE=ljfour} +: ${BDPI=600} +: ${DPI=600} +: ${MAG=1.0} +: ${ps_to_pk=gsftopk} # some prefer ps2pk + +case ":${MT_FEATURES}:" in +*:varfonts:*) + if test -w "$MT_VARTEXFONTS" ; then + # Allow fonts to be read and written (especially in case we make + # directories) by everyone. + umask 0 + else + umask 022 + MT_VARTEXFONTS=$HOME/.cache/texmf/fonts + test -d $MT_VARTEXFONTS || mkdir -p $MT_VARTEXFONTS + fi +esac + +# Cache values that may be useful for recursive calls. +export MT_MKTEX_OPT MT_MKTEX_CNF +export MT_MKTEXNAM MT_MKTEXNAM_OPT +export MT_MKTEXDIR MT_MKTEXDIR_OPT +export MT_MKTEXUPD +export MT_TEXMFMAIN MT_VARTEXFONTS --- texmf/web2c/texmf.cnf +++ texmf/web2c/texmf.cnf 2012-04-25 14:16:47.365727641 +0000 @@ -53,31 +53,34 @@ TEXMFROOT = $SELFAUTOPARENT % The tree containing runtime files related to the specific % distribution and version. -TEXMFMAIN = $TEXMFROOT/texmf +TEXMFMAIN = /usr/lib/texmf % The main tree of packages, distribution-agnostic: -TEXMFDIST = $TEXMFROOT/texmf-dist +TEXMFDIST = /usr/share/texmf + +% Our documentation-only tree, arranged by language: +TEXMFDOC = ${TEXMFDIST}/doc;${TEXMFMAIN}/doc % Local additions to the distribution trees. -TEXMFLOCAL = $TEXMFROOT/../texmf-local +TEXMFLOCAL = /usr/local/share/texmf % TEXMFSYSVAR, where *-sys store cached runtime data. -TEXMFSYSVAR = $TEXMFROOT/texmf-var +TEXMFSYSVAR = /var/lib/texmf % TEXMFSYSCONFIG, where *-sys store configuration data. -TEXMFSYSCONFIG = $TEXMFROOT/texmf-config +TEXMFSYSCONFIG = /etc/texmf % Per-user texmf tree(s) -- organized per the TDS, as usual. To define % more than one per-user tree, set this to a list of directories in % braces, as described above. (This used to be HOMETEXMF.) ~ expands % to %USERPROFILE% on Windows, $HOME otherwise. -TEXMFHOME = ~/texmf +TEXMFHOME = $HOME/texmf % TEXMFVAR, where texconfig/updmap/fmtutil store cached runtime data. -TEXMFVAR = ~/.texlive2011/texmf-var +TEXMFVAR = ${TEXMFSYSVAR} % TEXMFCONFIG, where texconfig/updmap/fmtutil store configuration data. -TEXMFCONFIG = ~/.texlive2011/texmf-config +TEXMFCONFIG = ${TEXMFSYSCONFIG} % List all the texmf trees. % @@ -92,7 +95,7 @@ TEXMFCONFIG = ~/.texlive2011/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} % 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. @@ -100,18 +103,17 @@ TEXMF = {$TEXMFCONFIG,$TEXMFVAR,$TEXMFHO % does not create ls-R files in the non-!! elements -- because if an % ls-R is present, it will be used, and the disk will not be searched. % This is arguably a bug in kpathsea. -TEXMFDBS = {!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST} +TEXMFDBS = $TEXMF;$VARTEXFONTS % The system trees. These are the trees that are shared by all 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 % 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 @@ -122,7 +124,7 @@ VARTEXFONTS = $TEXMFVAR/fonts % % Remove $VARTEXFONTS from TEXMFDBS if the VARTEXFONTS directory is below % one of the TEXMF directories (avoids overlapping ls-R files). - +VARTEXFONTS = /var/cache/texmf/fonts %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Usually you will not need to edit any of the following variables. @@ -130,7 +132,7 @@ VARTEXFONTS = $TEXMFVAR/fonts % 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. We specify paths for all known @@ -171,23 +173,23 @@ TEXINPUTS.elatex = .;$TEXMF/tex/{ TEXINPUTS.etex = .;$TEXMF/tex/{plain,generic,}// % pdfTeX. -TEXINPUTS.pdfcslatex = .;$TEXMF/tex/{cslatex,csplain,latex,generic,}// -TEXINPUTS.pdfcsplain = .;$TEXMF/tex/{csplain,plain,generic,}// -TEXINPUTS.pdflatex = .;$TEXMF/tex/{latex,generic,}// -TEXINPUTS.pdfmex = .;$TEXMF/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.pdfcslatex = .;$TEXMF/{pdftex,tex}/{cslatex,csplain,latex,generic,}// +TEXINPUTS.pdfcsplain = .;$TEXMF/{pdftex,tex}/{csplain,plain,generic,}// +TEXINPUTS.pdflatex = .;$TEXMF/{pdftex,tex}/{latex,generic,}// +TEXINPUTS.pdfmex = .;$TEXMF/{pdftex,tex}/{mex,plain,generic,}// +TEXINPUTS.utf8mex = .;$TEXMF/{pdftex,tex}/{mex,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.pdfxmex = .;$TEXMF/tex/{mex,plain,generic,}// -TEXINPUTS.pdfxtex = .;$TEXMF/tex/{plain,generic,}// +TEXINPUTS.pdfxlatex = .;$TEXMF/{pdftex,tex}/{latex,generic,}// +TEXINPUTS.pdfxmex = .;$TEXMF/{pdftex,tex}/{mex,plain,generic,}// +TEXINPUTS.pdfxtex = .;$TEXMF/{pdftex,tex}/{plain,generic,}// % LuaTeX. TEXINPUTS.lualatex = .;$TEXMF/tex/{lualatex,latex,luatex,generic,}// @@ -229,18 +231,18 @@ BSTINPUTS.pbibtex = .;$TEXMF/{pbib TEXINPUTS.context = .;$TEXMF/tex/{context,plain,generic}// % jadetex. -TEXINPUTS.jadetex = .;$TEXMF/tex/{jadetex,latex,generic,}// -TEXINPUTS.pdfjadetex = .;$TEXMF/tex/{jadetex,latex,generic,}// +TEXINPUTS.jadetex = .;$TEXMF/tex/{jadetex,xmltex,latex,plain,generic,}// +TEXINPUTS.pdfjadetex = .;$TEXMF/{pdftex,tex}/{jadetex,xmltex,latex,plain,generic,}// % XMLTeX. -TEXINPUTS.xmltex = .;$TEXMF/tex/{xmltex,latex,generic,}// -TEXINPUTS.pdfxmltex = .;$TEXMF/tex/{xmltex,latex,generic,}// +TEXINPUTS.xmltex = .;$TEXMF/tex/{xmltex,latex,plain,generic,}// +TEXINPUTS.pdfxmltex = .;$TEXMF/{pdftex,tex}/{xmltex,latex,plain,generic,}// % Miscellany, no longer built. TEXINPUTS.lamstex = .;$TEXMF/tex/{lamstex,plain,generic,}// TEXINPUTS.lollipop = .;$TEXMF/tex/{lollipop,plain,generic,}// -TEXINPUTS.frpdflatex = .;$TEXMF/tex/{french,latex,generic,}// -TEXINPUTS.frpdftex = .;$TEXMF/tex/{french,plain,generic,}// +TEXINPUTS.frpdflatex = .;$TEXMF/{pdftex,tex}/{french,latex,generic,}// +TEXINPUTS.frpdftex = .;$TEXMF/{pdftex,tex}/{french,plain,generic,}// % Earlier entries override later ones, so put this generic one last. TEXINPUTS = .;$TEXMF/tex/{$progname,generic,}// @@ -259,13 +261,13 @@ 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: -TEXPOOL = .;$TEXMF/web2c +TEXPOOL = .;$WEB2C MFPOOL = ${TEXPOOL} MPPOOL = ${TEXPOOL} @@ -293,7 +295,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 @@ -375,8 +377,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 = $TEXMFROOT/etc -MAILCAPLIBDIR = $TEXMFROOT/etc +MIMELIBDIR = /etc +MAILCAPLIBDIR = /etc % Default settings for the fontconfig library as used by the Windows % versions of xetex/xdvipdfmx. On Unixish systems, fontconfig ignores @@ -463,7 +465,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 @@ -642,9 +645,9 @@ BIBTEX_CSFILE = 88591lat.csf % 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 @@ -728,3 +731,33 @@ max_strings.pbibtex = 35307 line_length.gftype = 500 max_rows.gftype = 8191 max_cols.gftype = 8191 + +% 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