summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Build/source/texk/kpathsea/ChangeLog5
-rw-r--r--Build/source/texk/kpathsea/texmf.cnf11
-rw-r--r--Master/texmf/web2c/texmf.cnf23
3 files changed, 21 insertions, 18 deletions
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index eab0cb7132e..b60b2faace0 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-18 Karl Berry <karl@tug.org>
+
+ * texmf.cnf (TEXDOCS): remove .; better for texdoc not
+ to be confused by files randomly in the current directory.
+
2010-03-11 Peter Breitenlohner <peb@mppmu.mpg.de>
* texmf.cnf: Append '.mf' to Metafont specific parameters.
diff --git a/Build/source/texk/kpathsea/texmf.cnf b/Build/source/texk/kpathsea/texmf.cnf
index d2751951e51..2a239af9dba 100644
--- a/Build/source/texk/kpathsea/texmf.cnf
+++ b/Build/source/texk/kpathsea/texmf.cnf
@@ -261,13 +261,6 @@ TTF2TFMINPUTS = .;$TEXMF/ttf2pk//
MFINPUTS = .;$TEXMF/metafont//;{$TEXMF/fonts,$VARTEXFONTS}/source//
MPINPUTS = .;$TEXMF/metapost//
-% The following are not needed any more here.
-% Moved to texdoc.cnf (and hard-coded default), see the texdoc manual.
-% See texdoc's source too if you need to allow compressed documentation.
-% TEXDOCSSUFFIX = ;.pdf;.ps;.dvi;.html;.txt;.tex
-% TEXDOCSCOMPRESS = ;.gz;.bz2;.zip;.Z
-% TEXDOCEXT = {$TEXDOCSSUFFIX}{$TEXDOCSCOMPRESS}
-
% Dump files (fmt/base/mem) for vir{tex,mf,mp} to read.
% We want to find the engine-specific file, e.g., cont-en.fmt can
% exist under both pdftex/ and xetex/. But just in case some formats
@@ -399,8 +392,8 @@ FONTCONFIG_FILE=fonts.conf
FONTCONFIG_PATH=$TEXMFSYSVAR/fonts/conf
FC_CACHEDIR=$TEXMFSYSVAR/fonts/cache
-% TeX documentation and source files, for use with kpsewhich (and texdoc).
-TEXDOCS = .;$TEXMF/doc//
+% TeX documentation and source files, for use with texdoc and kpsewhich.
+TEXDOCS = $TEXMF/doc//
TEXSOURCES = .;$TEXMF/source//
% Web and CWeb input paths.
diff --git a/Master/texmf/web2c/texmf.cnf b/Master/texmf/web2c/texmf.cnf
index 20e730c5201..2a239af9dba 100644
--- a/Master/texmf/web2c/texmf.cnf
+++ b/Master/texmf/web2c/texmf.cnf
@@ -261,13 +261,6 @@ TTF2TFMINPUTS = .;$TEXMF/ttf2pk//
MFINPUTS = .;$TEXMF/metafont//;{$TEXMF/fonts,$VARTEXFONTS}/source//
MPINPUTS = .;$TEXMF/metapost//
-% The following are not needed any more here.
-% Moved to texdoc.cnf (and hard-coded default), see the texdoc manual.
-% See texdoc's source too if you need to allow compressed documentation.
-% TEXDOCSSUFFIX = ;.pdf;.ps;.dvi;.html;.txt;.tex
-% TEXDOCSCOMPRESS = ;.gz;.bz2;.zip;.Z
-% TEXDOCEXT = {$TEXDOCSSUFFIX}{$TEXDOCSCOMPRESS}
-
% Dump files (fmt/base/mem) for vir{tex,mf,mp} to read.
% We want to find the engine-specific file, e.g., cont-en.fmt can
% exist under both pdftex/ and xetex/. But just in case some formats
@@ -399,8 +392,8 @@ FONTCONFIG_FILE=fonts.conf
FONTCONFIG_PATH=$TEXMFSYSVAR/fonts/conf
FC_CACHEDIR=$TEXMFSYSVAR/fonts/cache
-% TeX documentation and source files, for use with kpsewhich (and texdoc).
-TEXDOCS = .;$TEXMF/doc//
+% TeX documentation and source files, for use with texdoc and kpsewhich.
+TEXDOCS = $TEXMF/doc//
TEXSOURCES = .;$TEXMF/source//
% Web and CWeb input paths.
@@ -686,3 +679,15 @@ gf_buf_size = 16384 % MF
error_line = 79
half_error_line = 50
max_print_line = 79
+
+% Metafont only.
+screen_width.mf = 1664
+screen_depth.mf = 1200
+
+% BibTeX only (also used for hash_size and hash_prime).
+max_strings.bibtex = 35307
+
+% GFtype only.
+line_length.gftype = 500
+max_rows.gftype = 8191
+max_cols.gftype = 8191