From 4b2d98dd3342b2b64295f1c2931444dd95736ecb Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 6 Jul 2008 16:57:35 +0000 Subject: doc changes git-svn-id: svn://tug.org/texlive/trunk@9296 c570f23f-e606-0410-a88d-b1316a301751 --- Master/install-tl | 26 +++++++++++++++----------- Master/texmf/scripts/texlive/tlmgr.pl | 23 ++++++++++++++++------- Master/texmf/web2c/texmf.cnf | 11 +++++++++-- 3 files changed, 40 insertions(+), 20 deletions(-) (limited to 'Master') diff --git a/Master/install-tl b/Master/install-tl index 0ef2c5cb5f7..a3948cc50e0 100755 --- a/Master/install-tl +++ b/Master/install-tl @@ -1084,27 +1084,31 @@ sub do_texmf_cnf { push @newtmf, $line; } } + my $TMF; if (!$vars{'from_dvd'}) { - open(TMF,">$vars{'TEXDIR'}/texmf.cnf") - or die("Can't open $vars{'TEXDIR'}/texmf.cnf for writing: $!\n"); + $TMF = ">$vars{'TEXDIR'}/texmf.cnf"; + open(TMF, $TMF) || die "open($TMF) failed: $!\n"; print TMF <$vars{'TEXMFSYSVAR'}/web2c/texmf.cnf") - or die("Can't open $vars{'TEXMFSYSVAR'}/web2c/texmf.cnf for writing: $!\n"); + $TMF = ">$vars{'TEXMFSYSVAR'}/web2c/texmf.cnf"; + open (TMF, $TMF) || die "open($TMF) failed: $!\n"; foreach (@newtmf) { print TMF; } } - close(TMF); + close(TMF) || warn "close($TMF) failed: $!"; } # diff --git a/Master/texmf/scripts/texlive/tlmgr.pl b/Master/texmf/scripts/texlive/tlmgr.pl index 2d5d06bc67d..1bbb737294b 100755 --- a/Master/texmf/scripts/texlive/tlmgr.pl +++ b/Master/texmf/scripts/texlive/tlmgr.pl @@ -1516,15 +1516,24 @@ Do not ask for confirmation, remove immediately. =item B =item B -B This action overwrites any manual changes made in -the respective files: it recreates them from scratch. +The I action overwrites any manual changes made in the +respective files: it recreates them from scratch. -This is especially questionable with updmap, because the result will be -to disable all maps which have been manually installed via C, e.g., for proprietary or local fonts. Only the changes in -the C<--localcfg> file mentioned below are incorporated. +For fmtutil and the language files, this is normal, and both the TeX +Live installer and C routinely call I for them. -In more detail, this action regenerates any of the four config files +For updmap, however, neither the installer nor C use I, +because the result would be to disable all maps which have been manually +installed via C, e.g., for proprietary or local +fonts. Only the changes in the C<--localcfg> file mentioned below are +incorporated by I. + +On the other hand, if you only use the fonts and font packages within +TeX Live, there is nothing wrong with using I. Indeed, +we use it to generate the C file that is maintained in the +live source repository. + +In more detail: I remakes any of the four config files C, C, C, and C from the information present in the local TLPDB. If the files C, C, C, or diff --git a/Master/texmf/web2c/texmf.cnf b/Master/texmf/web2c/texmf.cnf index b3ec4fe9e26..9e11b1da01a 100644 --- a/Master/texmf/web2c/texmf.cnf +++ b/Master/texmf/web2c/texmf.cnf @@ -421,8 +421,15 @@ RUBYINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/ruby// % This definition isn't used from this .cnf file itself (that would be % paradoxical), but the compile-time default in paths.h is built from it. % The SELFAUTO* variables are set automatically from the location of -% argv[0], in kpse_set_progname. -% +% argv[0], in kpse_set_program_name. +% +% This main texmf.cnf file is installed, for a release YYYY, in a +% directory such as /usr/local/texlive/YYYY/texmf/web2c/texmf.cnf. +% Since this file is subject to future updates, the TeX Live installer +% or human administrator may also create a file +% /usr/local/texlive/YYYY/texmf.cnf; any settings in this latter file +% will take precedence over the distributed one under texmf/web2c. +% % For security reasons, it is better not to include . in this path. % TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c} -- cgit v1.2.3