summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStaszek Wawrykiewicz <staw@gust.org.pl>2007-01-06 01:30:04 +0000
committerStaszek Wawrykiewicz <staw@gust.org.pl>2007-01-06 01:30:04 +0000
commit18a623518093abb22f6ec5a5a2f9b55bfedd4ff8 (patch)
treef8850803a3474475499eca7e486f888084ef3462
parente3aeb4ae1570d125174e3e0bcb3b411168466e1d (diff)
texmf.cnf and texmf.cnf-4WIN
git-svn-id: svn://tug.org/texlive/trunk@3172 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf/web2c/texmf.cnf7
-rw-r--r--Master/texmf/web2c/texmf.cnf-4WIN27
2 files changed, 26 insertions, 8 deletions
diff --git a/Master/texmf/web2c/texmf.cnf b/Master/texmf/web2c/texmf.cnf
index 2daac5cdb49..21dbca96225 100644
--- a/Master/texmf/web2c/texmf.cnf
+++ b/Master/texmf/web2c/texmf.cnf
@@ -365,6 +365,13 @@ MPSUPPORT = .;$TEXMF/metapost/support
MIMELIBDIR = $SELFAUTOPARENT/etc
MAILCAPLIBDIR = $SELFAUTOPARENT/etc
+% Default settings for fontconfig library, used by Win32 versions of
+% xetex/xdvipdfmx (note that fontconfig on Linux/Unix-like systems
+% will ignore settings in this file)
+FONTCONFIG_FILE=fonts.conf
+FONTCONFIG_PATH=$SELFAUTOLOC/conf
+FC_CACHEDIR=$SELFAUTOLOC/cache
+
% TeX documentation and source files, for use with kpsewhich.
% TeX Live has a separate hierarchy with just documentation, texmf-doc,
% in addition to the doc files in the other hierarchies.
diff --git a/Master/texmf/web2c/texmf.cnf-4WIN b/Master/texmf/web2c/texmf.cnf-4WIN
index dd952748b2c..01a404d1968 100644
--- a/Master/texmf/web2c/texmf.cnf-4WIN
+++ b/Master/texmf/web2c/texmf.cnf-4WIN
@@ -1,8 +1,8 @@
% original texmf.cnf -- runtime path configuration file for kpathsea.
% (If you change or delete `original' on the previous line, the
% distribution won't install its version over yours.)
-% adapted for Win32 in TeX Live 2006 edition, this file should be copied
-% to $TEXMFVAR/web2c/
+% Adapted for Win32 in TeX Live 2006/2007 edition, this file should be
+% copied to $TEXMFVAR/web2c/
% Public domain.
%
% This TeX Live texmf.cnf is not kept in sync with the teTeX texmf.cnf
@@ -135,9 +135,12 @@ VARTEXFONTS = $TEXMFVAR/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.
%
-% Remove $VARTEXFONTS from TEXMFDBS if the VARTEXFONTS directory is below
-% one of the TEXMF directories (avoids overlapping ls-R files).
-TEXMFDBS = $TEXMF
+% By default, this is only the !! elements of TEXMF, so that mktexlsr
+% 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, but we will not think about it now.
+%TEXMFDBS = {!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST}
+TEXMFDBS = {!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST}
% It may be convenient to define TEXMF like this:
% TEXMF = {$TEXMFHOME,!!$TEXMFLOCAL,!!$TEXMFMAIN,$HOME}
@@ -157,6 +160,9 @@ TEXMFDBS = $TEXMF
% is used on many Linux systems. In this case, set VARTEXFONTS like this
% VARTEXFONTS = $TEXMFVAR/fonts
% and do not mention it in TEXMFDBS (but _do_ mention TEXMFVAR).
+%
+% Remove $VARTEXFONTS from TEXMFDBS if the VARTEXFONTS directory is below
+% one of the TEXMF directories (avoids overlapping ls-R files).
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -312,7 +318,8 @@ TEXPSHEADERS.gsftopk = .;$TEXMF/{dvips,fonts/{enc,type1,type42,type3,truetype}}/
% OSFONTDIR is to provide a convenient hook for allowing TeX to find
% fonts installed on the system (outside of TeX). An empty default
% value would add "//" to the search paths, so we give it a dummy value.
-OSFONTDIR = /please/set/osfontdir/in/the/environment
+%OSFONTDIR = /please/set/osfontdir/in/the/environment
+OSFONTDIR = %SystemRoot%/fonts//
% PostScript Type 1 outline fonts.
T1FONTS = .;$TEXMF/fonts/type1//;$OSFONTDIR//
@@ -408,8 +415,8 @@ TEXMFSCRIPTS = $TEXMF/scripts/{$engine,$progname,}//
% The SELFAUTO* variables are set automatically from the location of
% argv[0], in kpse_set_progname.
%
-% The TETEXDIR stuff isn't likely to relevant unless you're using teTeX,
-% but it doesn't hurt.
+% The TETEXDIR stuff isn't likely to be relevant unless you're using
+% teTeX, but it doesn't hurt.
%
% For security reasons, it is better not to have . part of the path.
%
@@ -485,6 +492,10 @@ file_line_error_style = f
% if MP is in troff mode. Set to `0' to disable this feature.
MPXCOMMAND = makempx
+% Used by makempx to run TeX. We use "etex" because MetaPost is
+% expecting DVI, and not "tex" because we want first line parsing.
+TEX = etex
+
% Part 3: Array and other sizes for TeX (and Metafont and MetaPost).
%