texmf.cnf-4WIN

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

1 files changed, 14 insertions, 12 deletions

diff --git a/Master/texmf/web2c/texmf.cnf-4WIN b/Master/texmf/web2c/texmf.cnf-4WIN
index 351dd382db9..ab09ea50cd2 100644
--- a/Master/texmf/web2c/texmf.cnf-4WIN
+++ b/Master/texmf/web2c/texmf.cnf-4WIN
@@ -1,7 +1,7 @@
 % 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/2007 edition, this file should be 
+% Adapted for Win32 in TeX Live 2007 edition, this file should be 
 % copied to $TEXMFVAR/web2c/
 % Public domain.
 %
@@ -89,8 +89,10 @@ TEXMFLOCAL = $SELFAUTOPARENT/../texmf-local
 %TEXMFSYSCONFIG = $SELFAUTOPARENT/texmf-config
 
 % User texmf trees are allowed as follows.
-% This used to be HOMETEXMF.
-TEXMFHOME = $HOME/texmf
+% This used to be HOMETEXMF. On Windows $HOME is usually not set, so users 
+% have to set TEXMFHOME to the absolute path. For the moment we use TEXMFLOCAL
+%TEXMFHOME = $HOME/texmf
+TEXMFHOME = $TEXMFLOCAL
 
 % TEXMFVAR, where texconfig stores variable runtime data.
 % With teTeX-3.0 or later, this must be set.
@@ -119,7 +121,7 @@ TEXMFVAR = $SELFAUTOPARENT/texmf-var
 % For texconfig to work properly, TEXMFCONFIG and TEXMFVAR should be named
 % explicitly and before all other trees.
 %TEXMF = {$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST}
-TEXMF = {!!$TEXMFVAR,!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST}
+TEXMF = {!!$TEXMFVAR,$TEXMFHOME,!!$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
@@ -139,8 +141,8 @@ VARTEXFONTS = $TEXMFVAR/fonts
 % 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 = $TEXMF
+TEXMFDBS = {!!$TEXMFVAR,!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST}
+%TEXMFDBS = $TEXMF
 
 % It may be convenient to define TEXMF like this:
 %   TEXMF = {$TEXMFHOME,!!$TEXMFLOCAL,!!$TEXMFMAIN,$HOME}
@@ -271,6 +273,12 @@ TEXPOOL = .;$TEXMF/web2c
 MFPOOL = .;$TEXMF/web2c
 MPPOOL = .;$TEXMF/web2c
 
+% support the original xdvi.  Must come before the generic settings.
+PKFONTS.XDvi   = .;$TEXMF/%s;$VARTEXFONTS/pk/{%m,modeless}//
+VFFONTS.XDvi   = .;$TEXMF/%s
+PSHEADERS.XDvi = .;$TEXMF/%q{dvips,fonts/type1}//
+TEXPICTS.XDvi  = .;$TEXMF/%q{dvips,tex}//
+
 % Device-independent font metric files.
 VFFONTS = .;$TEXMF/fonts/vf//
 TFMFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/tfm//
@@ -297,12 +305,6 @@ MISCFONTS = .;$TEXMF/fonts/misc//
 % map file syntax the definition can be simplified again.
 TEXFONTMAPS = .;$TEXMF/fonts/map/{$progname,pdftex,dvips,}//
 
-% support non"k"-xdvi:
-PKFONTS.XDvi    = .;$TEXMF/%s;$VARTEXFONTS/pk/{%m,modeless}//
-VFFONTS.XDvi    = .;$TEXMF/%s
-PSHEADERS.XDvi  = .;$TEXMF/%q{dvips,fonts/type1}//
-TEXPICTS.XDvi   = .;$TEXMF/%q{dvips,tex}//
-
 % BibTeX bibliographies and style files.
 BIBINPUTS = .;$TEXMF/bibtex/bib//
 BSTINPUTS = .;$TEXMF/bibtex/{bst,csf}//