diff options
-rw-r--r-- | Build/source/texk/kpathsea/texmf.in | 12 | ||||
-rw-r--r-- | Master/texmf/web2c/texmf.cnf | 16 |
2 files changed, 12 insertions, 16 deletions
diff --git a/Build/source/texk/kpathsea/texmf.in b/Build/source/texk/kpathsea/texmf.in index 1ced054738b..fd6c0196560 100644 --- a/Build/source/texk/kpathsea/texmf.in +++ b/Build/source/texk/kpathsea/texmf.in @@ -255,6 +255,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// @@ -278,12 +284,6 @@ MISCFONTS = .;$TEXMF/fonts/misc// % font name map files. TEXFONTMAPS = .;$TEXMF/fonts/map// -% 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// diff --git a/Master/texmf/web2c/texmf.cnf b/Master/texmf/web2c/texmf.cnf index a106776b613..d26f42237b4 100644 --- a/Master/texmf/web2c/texmf.cnf +++ b/Master/texmf/web2c/texmf.cnf @@ -3,10 +3,6 @@ % distribution won't install its version over yours.) % Public domain. % -% This TeX Live texmf.cnf is not kept in sync with the teTeX texmf.cnf -% (and not maintained by te), since the two distributions need different -% settings. -% % What follows is a super-summary of what this .cnf file can % contain. Please read the Kpathsea manual for more information. % @@ -267,6 +263,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// @@ -293,12 +295,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}// |