whitespace and doc fixes to unify with kpathsea/texmf.in.

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

1 files changed, 86 insertions, 89 deletions

diff --git a/Master/texmf/web2c/texmf.cnf b/Master/texmf/web2c/texmf.cnf
index 1932eee2c49..a940e402f27 100644
--- a/Master/texmf/web2c/texmf.cnf
+++ b/Master/texmf/web2c/texmf.cnf
@@ -6,7 +6,7 @@
 % 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.
 %
@@ -86,7 +86,7 @@ TEXMFSYSVAR = $SELFAUTOPARENT/texmf-var
 %   TEXMFSYSCONFIG = $SELFAUTOPARENT/texmf-config
 TEXMFSYSCONFIG = $SELFAUTOPARENT/texmf-config
 
-% User texmf trees are allowed as follows.  
+% User texmf trees are allowed as follows.
 % This used to be HOMETEXMF.
 TEXMFHOME = $HOME/texmf
 
@@ -126,7 +126,6 @@ SYSTEXMF = $TEXMFLOCAL;$TEXMFMAIN;$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 = /var/tmp/texfonts
 VARTEXFONTS = $TEXMFVAR/fonts
 
 % Where to look for ls-R files.  There need not be an ls-R in the
@@ -162,90 +161,90 @@ TEXMFDBS = $TEXMF
 
 % WEB2C is for Web2C specific files.  The current directory may not be
 % a good place to look for them.
-WEB2C =	$TEXMF/web2c
+WEB2C = $TEXMF/web2c
 
 % TEXINPUTS is for TeX input files -- i.e., anything to be found by \input
-% or \openin, including .sty, .eps, etc. 
+% or \openin, including .sty, .eps, etc.
 
 % Plain TeX.  Have the command tex check all directories as a last
 % resort, we may have plain-compatible stuff anywhere.
-TEXINPUTS.tex		= .;$TEXMF/tex/{plain,generic,}//
+TEXINPUTS.tex           = .;$TEXMF/tex/{plain,generic,}//
 
 % Other plain-based formats.
-TEXINPUTS.amstex	= .;$TEXMF/tex/{amstex,plain,generic,}//
-TEXINPUTS.csplain	= .;$TEXMF/tex/{csplain,plain,generic,}//
-TEXINPUTS.eplain	= .;$TEXMF/tex/{eplain,plain,generic,}//
-TEXINPUTS.ftex		= .;$TEXMF/tex/{formate,plain,generic,}//
-TEXINPUTS.jadetex	= .;$TEXMF/tex/{jadetex,plain,generic,}//
-TEXINPUTS.mex		= .;$TEXMF/tex/{mex,plain,generic,}//
-TEXINPUTS.texinfo	= .;$TEXMF/tex/{texinfo,plain,generic,}//
+TEXINPUTS.amstex        = .;$TEXMF/tex/{amstex,plain,generic,}//
+TEXINPUTS.csplain       = .;$TEXMF/tex/{csplain,plain,generic,}//
+TEXINPUTS.eplain        = .;$TEXMF/tex/{eplain,plain,generic,}//
+TEXINPUTS.ftex          = .;$TEXMF/tex/{formate,plain,generic,}//
+TEXINPUTS.jadetex       = .;$TEXMF/tex/{jadetex,plain,generic,}//
+TEXINPUTS.mex           = .;$TEXMF/tex/{mex,plain,generic,}//
+TEXINPUTS.texinfo       = .;$TEXMF/tex/{texinfo,plain,generic,}//
 
 % LaTeX 2e specific macros are stored in latex/, macros that can only be
 % used with 2.09 in latex209/.  In addition, we look in the directory
 % latex209, useful for macros that were written for 2.09 and do not
 % mention 2e at all, but can be used with 2e.
-TEXINPUTS.cslatex	= .;$TEXMF/tex/{cslatex,csplain,latex,generic,}//
-TEXINPUTS.platex	= .;$TEXMF/tex/{platex,latex,generic,}//
-TEXINPUTS.latex		= .;$TEXMF/tex/{latex,generic,}//
-TEXINPUTS.olatex	= .;$TEXMF/tex/{latex,generic,}//
-TEXINPUTS.latex209	= .;$TEXMF/tex/{latex209,generic,latex,}//
+TEXINPUTS.cslatex       = .;$TEXMF/tex/{cslatex,csplain,latex,generic,}//
+TEXINPUTS.platex        = .;$TEXMF/tex/{platex,latex,generic,}//
+TEXINPUTS.latex         = .;$TEXMF/tex/{latex,generic,}//
+TEXINPUTS.olatex        = .;$TEXMF/tex/{latex,generic,}//
+TEXINPUTS.latex209      = .;$TEXMF/tex/{latex209,generic,latex,}//
 
 % Fontinst needs to read afm files.
-TEXINPUTS.fontinst	= .;$TEXMF/{tex,fonts/afm}//
+TEXINPUTS.fontinst      = .;$TEXMF/{tex,fonts/afm}//
 
 % MLTeX.
-TEXINPUTS.frlatex	= .;$TEXMF/tex/{french,latex,generic,}//
-TEXINPUTS.frtex		= .;$TEXMF/tex/{french,plain,generic,}//
-TEXINPUTS.mllatex	= .;$TEXMF/tex/{latex,generic,}//
-TEXINPUTS.mltex		= .;$TEXMF/tex/{plain,generic,}//
+TEXINPUTS.frlatex       = .;$TEXMF/tex/{french,latex,generic,}//
+TEXINPUTS.frtex         = .;$TEXMF/tex/{french,plain,generic,}//
+TEXINPUTS.mllatex       = .;$TEXMF/tex/{latex,generic,}//
+TEXINPUTS.mltex         = .;$TEXMF/tex/{plain,generic,}//
 
 % e-TeX.  This form of the input paths is borrowed from teTeX.  A certain
 % variant of TDS is assumed here, unaffected by the build variables.
-TEXINPUTS.elatex	= .;$TEXMF/tex/{latex,generic,}//
-TEXINPUTS.etex		= .;$TEXMF/tex/{plain,generic,}//
+TEXINPUTS.elatex        = .;$TEXMF/tex/{latex,generic,}//
+TEXINPUTS.etex          = .;$TEXMF/tex/{plain,generic,}//
 
 % pdfTeX.  This form of the input paths is borrowed from teTeX.  A certain
 % variant of TDS is assumed here, unaffected by the build variables.
-TEXINPUTS.pdfcslatex	= .;$TEXMF/tex/{cslatex,csplain,latex,generic,}//
-TEXINPUTS.pdfcsplain	= .;$TEXMF/tex/{csplain,plain,generic,}//
-TEXINPUTS.pdfjadetex	= .;$TEXMF/tex/{jadetex,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/tex/{cslatex,csplain,latex,generic,}//
+TEXINPUTS.pdfcsplain    = .;$TEXMF/tex/{csplain,plain,generic,}//
+TEXINPUTS.pdfjadetex    = .;$TEXMF/tex/{jadetex,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,}//
 
 % pdfeTeX.
-TEXINPUTS.pdfelatex	= .;$TEXMF/tex/{latex,generic,}//
-TEXINPUTS.pdfetex	= .;$TEXMF/tex/{plain,generic,}//
+TEXINPUTS.pdfelatex     = .;$TEXMF/tex/{latex,generic,}//
+TEXINPUTS.pdfetex       = .;$TEXMF/tex/{plain,generic,}//
 
 % pdfxTeX.
-TEXINPUTS.pdfxlatex	= .;$TEXMF/tex/{latex,generic,}//
-TEXINPUTS.pdfxtex	= .;$TEXMF/tex/{plain,generic,}//
+TEXINPUTS.pdfxlatex     = .;$TEXMF/tex/{latex,generic,}//
+TEXINPUTS.pdfxtex       = .;$TEXMF/tex/{plain,generic,}//
 
 % XeTeX
-TEXINPUTS.xelatex	= .;$TEXMF/tex/{xelatex,latex,generic,}//
-TEXINPUTS.xeplain	= .;$TEXMF/tex/{xeplain,eplain,plain,generic,}//
-TEXINPUTS.xetex		= .;$TEXMF/tex/{xetex,plain,generic,}//
+TEXINPUTS.xelatex       = .;$TEXMF/tex/{xelatex,latex,generic,}//
+TEXINPUTS.xeplain       = .;$TEXMF/tex/{xeplain,eplain,plain,generic,}//
+TEXINPUTS.xetex         = .;$TEXMF/tex/{xetex,plain,generic,}//
 
 % Omega / Aleph
-TEXINPUTS.lamed		= .;$TEXMF/tex/{lamed,lambda,latex,generic,}//
-TEXINPUTS.lambda	= .;$TEXMF/tex/{lambda,latex,generic,}//
-TEXINPUTS.omega		= .;$TEXMF/tex/{plain,generic,}//
-TEXINPUTS.aleph		= .;$TEXMF/tex/{plain,generic,}//
+TEXINPUTS.lamed         = .;$TEXMF/tex/{lamed,lambda,latex,generic,}//
+TEXINPUTS.lambda        = .;$TEXMF/tex/{lambda,latex,generic,}//
+TEXINPUTS.omega         = .;$TEXMF/tex/{plain,generic,}//
+TEXINPUTS.aleph         = .;$TEXMF/tex/{plain,generic,}//
 
-% Context macros by Hans Hagen:
-TEXINPUTS.context	= .;$TEXMF/tex/{context,plain,generic,}//
+% ConTeXt
+TEXINPUTS.context       = .;$TEXMF/tex/{context,plain,generic,}//
 
-% odd formats  needing their own paths
-TEXINPUTS.lamstex	= .;$TEXMF/tex/{lamstex,plain,generic,}//
-TEXINPUTS.lollipop	= .;$TEXMF/tex/{lollipop,plain,generic,}//
-TEXINPUTS.platex-pl	= .;$TEXMF/tex/{platex,latex,generic,}//
-TEXINPUTS.pdfplatex	= .;$TEXMF/tex/{platex,latex,generic,}//
+% odd formats needing their own paths
+TEXINPUTS.lamstex       = .;$TEXMF/tex/{lamstex,plain,generic,}//
+TEXINPUTS.lollipop      = .;$TEXMF/tex/{lollipop,plain,generic,}//
+TEXINPUTS.platex-pl     = .;$TEXMF/tex/{platex,latex,generic,}//
+TEXINPUTS.pdfplatex     = .;$TEXMF/tex/{platex,latex,generic,}//
 
 % Earlier entries override later ones, so put this last.
-TEXINPUTS		= .;$TEXMF/tex/{$progname,generic,}//
+TEXINPUTS               = .;$TEXMF/tex/{$progname,generic,}//
 
 % Metafont, MetaPost inputs.
 MFINPUTS = .;$TEXMF/metafont//;{$TEXMF/fonts,$VARTEXFONTS}/source//
@@ -344,15 +343,13 @@ CMAPFONTS = .;$TEXMF/fonts/cmap//
 % Subfont definition files.
 SFDFONTS = .;$TEXMF/fonts/sfd//
 
+% OpenType outline fonts.
+OPENTYPEFONTS = .;$TEXMF/fonts/opentype//
+
 % pdftex config files:
 PDFTEXCONFIG = .;$TEXMF/pdftex/{$progname,}//
 
 % Used by DMP (ditroff-to-mpx), called by makempx -troff.
-% The path given is correct for GROFF on Linux installed under /usr,
-% assuming the 'current' symlink is in place. If not, the system
-% maintainer is adviced to add the symlink instead of editting
-% the TRFONTS setting.
-% Originally: TRFONTS = /usr/lib/font/devpost
 TRFONTS = /usr/{local,}/share/groff/{current/font,site-font}/devps
 MPSUPPORT = .;$TEXMF/metapost/support
 
@@ -405,17 +402,17 @@ TEXMFSCRIPTS = $TEXMF/scripts/{$engine,$progname,}//
 %
 % For security reasons, it is better not to have . part of the path.
 %
-TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c}:/.$TETEXDIR
+TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c};/.$TETEXDIR
 
-# $progname; kpathsea v. 3.5.3 or later overwrites this at runtime. To
+# $progname: kpathsea v. 3.5.3 or later overwrites this at runtime. To
 # avoid empty expansions from binaries linked against an earlier
 # version of the library, we set $progname and $engine to something
-# non-empty;
+# non-empty:
 progname = unset
 engine = unset
 
 
-%  Part 2: Non-path options
+%  Part 2: Non-path options.
 
 % Write .log/.dvi/etc. files here, if the current directory is unwritable.
 % TEXMFOUTPUT = /tmp
@@ -509,7 +506,7 @@ extra_mem_top.context = 2000000
 extra_mem_bot.context = 4000000
 
 % Words of font info for TeX (total size of all TFM files, approximately).
-% Must be >= 20000 and <= 4000000 (without tex.ch) changes.
+% Must be >= 20000 and <= 4000000 (without tex.ch changes).
 font_mem_size = 1200000
 
 % Total number of fonts. Must be >= 50 and <= 2000 (without tex.ch changes).
@@ -540,11 +537,11 @@ buf_size = 200000
 % the sources), but we don't need that much.  The value here suffices
 % for all known free hyphenation patterns to be loaded simultaneously
 % (as TeX Live does).
-% 
+%
 trie_size = 300000
 
 hyph_size = 8191        % prime number of hyphenation exceptions, >610, <32767.
-			% http://primes.utm.edu/curios/page.php/8191.html
+                        % http://primes.utm.edu/curios/page.php/8191.html
 nest_size = 500         % simultaneous semantic levels (e.g., groups)
 max_in_open = 15        % simultaneous input files and error insertions
 param_size = 10000      % simultaneous macro parameters
@@ -582,24 +579,24 @@ max_print_line = 79
 
 %  Part 4: extra format definitions for TeX Live
 
-TEXINPUTS.elambda	= .;$TEXMF/tex/{lambda,latex,generic,}//
-TEXINPUTS.eomega	= .;$TEXMF/tex/{plain,generic,}//
-TEXINPUTS.pdfxmex	= .;$TEXMF/tex/{mex,plain,generic,}//
-TEXINPUTS.frpdflatex	= .;$TEXMF/tex/{french,latex,generic,}//
-TEXINPUTS.frpdftex	= .;$TEXMF/tex/{french,plain,generic,}//
-TEXINPUTS.xmltex	= .;$TEXMF/tex/{xmltex,latex,generic,}//
-TEXINPUTS.pdfxmltex	= .;$TEXMF/tex/{xmltex,latex,generic,}//
+TEXINPUTS.elambda       = .;$TEXMF/tex/{lambda,latex,generic,}//
+TEXINPUTS.eomega        = .;$TEXMF/tex/{plain,generic,}//
+TEXINPUTS.pdfxmex       = .;$TEXMF/tex/{mex,plain,generic,}//
+TEXINPUTS.frpdflatex    = .;$TEXMF/tex/{french,latex,generic,}//
+TEXINPUTS.frpdftex      = .;$TEXMF/tex/{french,plain,generic,}//
+TEXINPUTS.xmltex        = .;$TEXMF/tex/{xmltex,latex,generic,}//
+TEXINPUTS.pdfxmltex     = .;$TEXMF/tex/{xmltex,latex,generic,}//
 
-TTF2TFMINPUTS =			.;$TEXMF/ttf2pk//
+TTF2TFMINPUTS =                 .;$TEXMF/ttf2pk//
 
 % For bibtex8. Do we really need to repeat the BIBINPUTS setting?
-BIBINPUTS.bibtex8 =		.;$TEXMF/bibtex/{bib,}//
-BSTINPUTS.bibtex8 =		.;$TEXMF/bibtex/{bst,csf,}//
+BIBINPUTS.bibtex8 =             .;$TEXMF/bibtex/{bib,}//
+BSTINPUTS.bibtex8 =             .;$TEXMF/bibtex/{bst,csf,}//
 
 % allow for compressed files, and various extenions
-TEXDOCSSUFFIX	= ;.pdf;.ps;.dvi;.html;.txt;.tex
-TEXDOCSCOMPRESS	= ;.gz;.bz2;.zip;.Z
-TEXDOCEXT	= {$TEXDOCSSUFFIX}{$TEXDOCSCOMPRESS}
+TEXDOCSSUFFIX   = ;.pdf;.ps;.dvi;.html;.txt;.tex
+TEXDOCSCOMPRESS = ;.gz;.bz2;.zip;.Z
+TEXDOCEXT       = {$TEXDOCSSUFFIX}{$TEXDOCSCOMPRESS}
 
 %% t4ht utility, sharing files with TeX4ht
 TEX4HTFONTSET=alias,iso8859,unicode
@@ -623,13 +620,13 @@ RUBYINPUTS   = .;$TEXMF/scripts/{$progname,$engine,}/ruby//
 % Winedt:
 %  TEXEDIT=C:\WinEdt\WinEdt.exe "[Open('%s');SelLine(%d,7)]
 % Textpad:
-%  TEXEDIT =			c:\Progra~1\TextPad\System\Ddeopn32 TextPad %s(%d)
+%  TEXEDIT =                    c:\Progra~1\TextPad\System\Ddeopn32 TextPad %s(%d)
 % UltraEdit (newer Win32 versions):
-%  TEXEDIT =			uedit32 %s/%d/1
+%  TEXEDIT =                    uedit32 %s/%d/1
 % WinTeXShell32:
-%  TEXEDIT =			texshell.exe /l=%d %s
+%  TEXEDIT =                    texshell.exe /l=%d %s
 % vi, vim, gvim. here we show Windows gvim.exe:
-%  TEXEDIT =			gvim.exe %s +%d
+%  TEXEDIT =                    gvim.exe %s +%d
 % PFE:
 %  TEXEDIT=pfe32/g%d  %s
 % MED:
@@ -646,17 +643,17 @@ RUBYINPUTS   = .;$TEXMF/scripts/{$progname,$engine,}/ruby//
 % For unix
 %
 % vi, vim, NEdit, (X)Emacs, pico, jed
-% TEXEDIT =			vi     +%d %s
-% TEXEDIT =			vim    +%d %s
-% TEXEDIT =			nedit  +%d %s
-% TEXEDIT =			xemacs +%d %s
-% TEXEDIT =			emacs +%d %s
+% TEXEDIT =                     vi     +%d %s
+% TEXEDIT =                     vim    +%d %s
+% TEXEDIT =                     nedit  +%d %s
+% TEXEDIT =                     xemacs +%d %s
+% TEXEDIT =                     emacs +%d %s
 
 %(x)fte:
-% TEXEDIT =			xfte   -l%d %s
+% TEXEDIT =                     xfte   -l%d %s
 
 % Disable search on multiple suffixes filenames. In many case, when `foo.bar'
 % is looked for, you do not want to look for `foo.bar.tex' before. This flag
 % disables searching for standard suffixes if the file name has already an
 % extension of 3 characters. Default value is true (old behaviour).
-allow_multiple_suffixes =			f
+allow_multiple_suffixes =                       f