[subversion-commit] SVN tetex commit + diffs: r294 - tex-common/trunk/scripts

[Florent Rougon]

Author: frn
Date: 2005-10-21 10:59:52 +0000 (Fri, 21 Oct 2005)
New Revision: 294

Modified:
   tex-common/trunk/scripts/update-fmtutil.8
   tex-common/trunk/scripts/update-fontlang
   tex-common/trunk/scripts/update-updmap.1
Log:
update-fontlang: - do the check for /usr/share/texmf/web2c/updmap.cfg only in
                   system-wide mode
                 - remove --enable and --disable from $bad_options

update-updmap.1: typos

update-fmtutil.8: small fixes, but this is hopeless and should be merged with
                  update-updmap.1.


Modified: tex-common/trunk/scripts/update-fmtutil.8
===================================================================
--- tex-common/trunk/scripts/update-fmtutil.8	2005-10-21 10:51:32 UTC (rev 293)
+++ tex-common/trunk/scripts/update-fmtutil.8	2005-10-21 10:59:52 UTC (rev 294)
@@ -15,19 +15,20 @@
 because the original script was designed for Debian packaging system.
 .PP
 .B update-fmtutil
-is a shell script to generate /var/lib/texmf/web2c/fmtutil.cnf from files in 
-/etc/texmf/fmt.d/*.cnf
+is a shell script to generate /var/lib/texmf/web2c/fmtutil.cnf from files
+matching the pattern /etc/texmf/fmt.d/*.cnf.
 .PP
-The main tetex-bin provides 00tetex.cnf only and we assume that other TeX 
-related packages should provide files with necessary contents.
-The two digit numeral determines the order in which update-fmtutil read a file.
+The tex-common package provides 00tex.cnf only and other TeX-related packages
+can provide their own .cnf files in /etc/texmf/fmt.d/. These files should have
+a name starting with a two-digit integer indicating the order in which
+update-fmtutil is supposed to read them.
 .PP
 A user who wants to customize /var/lib/texmf/web2c/fmtutil.cnf should add, 
-for example, 22myfmt.cnf in /etc/texmf/fmt.d/ and run 'update-fmtutil'.
+for example, 22local-foo.cnf in /etc/texmf/fmt.d/ and run 'update-fmtutil'.
 .SH OPTIONS
 .TP
 .B \-v
-Show verbose messages.
+Show verbose messages (deprecated; will be the default setting soon).
 .SH AUTHOR
 This manual page was written by Atsuhito Kohda <kohda at debian.org>,
 for the Debian GNU/Linux system (but may be used by others).

Modified: tex-common/trunk/scripts/update-fontlang
===================================================================
--- tex-common/trunk/scripts/update-fontlang	2005-10-21 10:51:32 UTC (rev 293)
+++ tex-common/trunk/scripts/update-fontlang	2005-10-21 10:59:52 UTC (rev 294)
@@ -242,11 +242,11 @@
     fi
 
     # Check for $DEFAULT_OUTPUTFILE_BASENAME in wrong places (currently,
-    # only enabled for update-updmap)
-    if [ "$progname" = "update-updmap" ]; then
+    # only enabled for update-updmap), if running in system-wide mode.
+    if [ $syswide_mode = 1 ] && [ "$progname" = "update-updmap" ]; then
         badly_located_cfg_file="/usr/share/texmf/web2c/$DEFAULT_OUTPUTFILE_BASENAME"
         badly_used_prg=updmap-sys
-        bad_options="--edit, --enable, --disable, --syncwithtrees, etc."
+        bad_options="--edit, --syncwithtrees, etc."
 
         if [ -e "$badly_located_cfg_file" ]; then
             printf "\

Modified: tex-common/trunk/scripts/update-updmap.1
===================================================================
--- tex-common/trunk/scripts/update-updmap.1	2005-10-21 10:51:32 UTC (rev 293)
+++ tex-common/trunk/scripts/update-updmap.1	2005-10-21 10:59:52 UTC (rev 294)
@@ -220,7 +220,7 @@
 .Nm
 as a user,  it will produce a user-specific 
 .Pa updmap.cfg
-file as follows: If files with the same name exist in both directories,
+file as follows: if files with the same name exist in both directories,
 the version in
 .Pa ~/.texmf-config/updmap.d/
 will be used; files with unique names will be used from either
@@ -229,16 +229,16 @@
 If you want to keep your files elsewhere, specify their location with
 options (see 
 .Sx OPTIONS
-below)
+below).
 .Sh OPTIONS
 .Bl -tag -width ".Fl -version"
-.It Fl o, -conf-dir Ev conf-dir
+.It Fl c, -conf-dir Ev conf-dir
 in user-specific mode, use configuration files from 
 .Ev conf-dir
 instead of 
 .Pa $TEXMFCONFIG/updmap.d/
 .It Fl  o, -output-file Ev outputfile
-in user-specific mode, Generate 
+in user-specific mode, generate 
 .Ev outputfile
 instead of
 .Pa $TEXMFVAR/web2c/updmap.cfg