summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-06-10 01:18:51 +0000
committerKarl Berry <karl@freefriends.org>2012-06-10 01:18:51 +0000
commit788b637a28c1d3266b42b3d6309fc94f464ab2e9 (patch)
treea0d7d999b190a7c16b71cb683b81c3406f1a1c7e
parent9c0bc67f0334fdd23afd2ab309c8cf3527063e1f (diff)
tweak doc for man page
git-svn-id: svn://tug.org/texlive/trunk@26881 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/tetex/updmap.help2man7
-rwxr-xr-xBuild/source/texk/tetex/updmap.pl71
2 files changed, 44 insertions, 34 deletions
diff --git a/Build/source/texk/tetex/updmap.help2man b/Build/source/texk/tetex/updmap.help2man
index 8fd6c481504..4864c2d74f4 100644
--- a/Build/source/texk/tetex/updmap.help2man
+++ b/Build/source/texk/tetex/updmap.help2man
@@ -3,6 +3,7 @@
# Originally created by Karl Berry.
# The FILES text from Claire Connelly.
# See the Makefile for the help2man invocation.
+# do not fill the long TEXMF* tables.
[NAME]
updmap \- manage TeX font maps, per-user
@@ -12,6 +13,12 @@ updmap-sys \- manage TeX font maps, system-wide
/in the final output/
.SH ENVIRONMENT
+/in the given order/
+.nf
+
+/where YYYY is/
+.fi
+
/give the -n option/
.SH EXAMPLES
diff --git a/Build/source/texk/tetex/updmap.pl b/Build/source/texk/tetex/updmap.pl
index 96950eb4628..96df8868c5b 100755
--- a/Build/source/texk/tetex/updmap.pl
+++ b/Build/source/texk/tetex/updmap.pl
@@ -265,40 +265,40 @@ sub main {
# updmap (user):
# ==============
# as found:
- # TEXMFCONFIG $HOME/.texlive2012/texmf-config/web2c/updmap.cfg
- # TEXMFVAR $HOME/.texlive2012/texmf-var/web2c/updmap.cfg
+ # TEXMFCONFIG $HOME/.texliveYYYY/texmf-config/web2c/updmap.cfg
+ # TEXMFVAR $HOME/.texliveYYYY/texmf-var/web2c/updmap.cfg
# TEXMFHOME $HOME/texmf/web2c/updmap.cfg
- # TEXMFSYSCONFIG $TEXLIVE/2012/texmf-config/web2c/updmap.cfg
- # TEXMFSYSVAR $TEXLIVE/2012/texmf-var/web2c/updmap.cfg
- # TEXMFMAIN $TEXLIVE/2012/texmf/web2c/updmap.cfg
+ # TEXMFSYSCONFIG $TEXLIVE/YYYY/texmf-config/web2c/updmap.cfg
+ # TEXMFSYSVAR $TEXLIVE/YYYY/texmf-var/web2c/updmap.cfg
+ # TEXMFMAIN $TEXLIVE/YYYY/texmf/web2c/updmap.cfg
# TEXMFLOCAL $TEXLIVE/texmf-local/web2c/updmap.cfg
- # TEXMFDIST $TEXLIVE/2012/texmf-dist/web2c/updmap.cfg
+ # TEXMFDIST $TEXLIVE/YYYY/texmf-dist/web2c/updmap.cfg
#
# as used:
- # TEXMFCONFIG $HOME/.texlive2012/texmf-config/web2c/updmap.cfg
- # TEXMFVAR $HOME/.texlive2012/texmf-var/web2c/updmap.cfg
+ # TEXMFCONFIG $HOME/.texliveYYYY/texmf-config/web2c/updmap.cfg
+ # TEXMFVAR $HOME/.texliveYYYY/texmf-var/web2c/updmap.cfg
# TEXMFHOME $HOME/texmf/web2c/updmap.cfg
- # TEXMFSYSCONFIG $TEXLIVE/2012/texmf-config/web2c/updmap.cfg
- # TEXMFSYSVAR $TEXLIVE/2012/texmf-var/web2c/updmap.cfg
+ # TEXMFSYSCONFIG $TEXLIVE/YYYY/texmf-config/web2c/updmap.cfg
+ # TEXMFSYSVAR $TEXLIVE/YYYY/texmf-var/web2c/updmap.cfg
# TEXMFLOCAL $TEXLIVE/texmf-local/web2c/updmap.cfg
- # TEXMFMAIN $TEXLIVE/2012/texmf/web2c/updmap.cfg
- # TEXMFDIST $TEXLIVE/2012/texmf-dist/web2c/updmap.cfg
+ # TEXMFMAIN $TEXLIVE/YYYY/texmf/web2c/updmap.cfg
+ # TEXMFDIST $TEXLIVE/YYYY/texmf-dist/web2c/updmap.cfg
#
# updmap-sys (root):
# ==================
# as found:
- # TEXMFSYSCONFIG $TEXLIVE/2012/texmf-config/web2c/updmap.cfg
- # TEXMFSYSVAR $TEXLIVE/2012/texmf-var/web2c/updmap.cfg
- # TEXMFMAIN $TEXLIVE/2012/texmf/web2c/updmap.cfg
+ # TEXMFSYSCONFIG $TEXLIVE/YYYY/texmf-config/web2c/updmap.cfg
+ # TEXMFSYSVAR $TEXLIVE/YYYY/texmf-var/web2c/updmap.cfg
+ # TEXMFMAIN $TEXLIVE/YYYY/texmf/web2c/updmap.cfg
# TEXMFLOCAL $TEXLIVE/texmf-local/web2c/updmap.cfg
- # TEXMFDIST $TEXLIVE/2012/texmf-dist/web2c/updmap.cfg
+ # TEXMFDIST $TEXLIVE/YYYY/texmf-dist/web2c/updmap.cfg
#
# as used:
- # TEXMFSYSCONFIG $TEXLIVE/2012/texmf-config/web2c/updmap.cfg
- # TEXMFSYSVAR $TEXLIVE/2012/texmf-var/web2c/updmap.cfg
+ # TEXMFSYSCONFIG $TEXLIVE/YYYY/texmf-config/web2c/updmap.cfg
+ # TEXMFSYSVAR $TEXLIVE/YYYY/texmf-var/web2c/updmap.cfg
# TEXMFLOCAL $TEXLIVE/texmf-local/web2c/updmap.cfg
- # TEXMFMAIN $TEXLIVE/2012/texmf/web2c/updmap.cfg
- # TEXMFDIST $TEXLIVE/2012/texmf-dist/web2c/updmap.cfg
+ # TEXMFMAIN $TEXLIVE/YYYY/texmf/web2c/updmap.cfg
+ # TEXMFDIST $TEXLIVE/YYYY/texmf-dist/web2c/updmap.cfg
#
if ($found || $old_updmap_local_found) {
my @tmp;
@@ -2057,23 +2057,26 @@ Explanation of trees and files normally used:
Thus, if updmap.cfg files are present in all trees, and the default
layout is used as shipped with TeX Live, the following files are
- read in this order:
- updmap-sys variant:
- TEXMFSYSCONFIG \$TEXLIVE/2012/texmf-config/web2c/updmap.cfg
- TEXMFSYSVAR \$TEXLIVE/2012/texmf-var/web2c/updmap.cfg
+ read in the given order.
+
+ For updmap-sys:
+ TEXMFSYSCONFIG \$TEXLIVE/YYYY/texmf-config/web2c/updmap.cfg
+ TEXMFSYSVAR \$TEXLIVE/YYYY/texmf-var/web2c/updmap.cfg
TEXMFLOCAL \$TEXLIVE/texmf-local/web2c/updmap.cfg
- TEXMFMAIN \$TEXLIVE/2012/texmf/web2c/updmap.cfg
- TEXMFDIST \$TEXLIVE/2012/texmf-dist/web2c/updmap.cfg
+ TEXMFMAIN \$TEXLIVE/YYYY/texmf/web2c/updmap.cfg
+ TEXMFDIST \$TEXLIVE/YYYY/texmf-dist/web2c/updmap.cfg
- updmap variant:
- TEXMFCONFIG \$HOME/.texlive2012/texmf-config/web2c/updmap.cfg
- TEXMFVAR \$HOME/.texlive2012/texmf-var/web2c/updmap.cfg
+ For updmap:
+ TEXMFCONFIG \$HOME/.texliveYYYY/texmf-config/web2c/updmap.cfg
+ TEXMFVAR \$HOME/.texliveYYYY/texmf-var/web2c/updmap.cfg
TEXMFHOME \$HOME/texmf/web2c/updmap.cfg
- TEXMFSYSCONFIG \$TEXLIVE/2012/texmf-config/web2c/updmap.cfg
- TEXMFSYSVAR \$TEXLIVE/2012/texmf-var/web2c/updmap.cfg
+ TEXMFSYSCONFIG \$TEXLIVE/YYYY/texmf-config/web2c/updmap.cfg
+ TEXMFSYSVAR \$TEXLIVE/YYYY/texmf-var/web2c/updmap.cfg
TEXMFLOCAL \$TEXLIVE/texmf-local/web2c/updmap.cfg
- TEXMFMAIN \$TEXLIVE/2012/texmf/web2c/updmap.cfg
- TEXMFDIST \$TEXLIVE/2012/texmf-dist/web2c/updmap.cfg
+ TEXMFMAIN \$TEXLIVE/YYYY/texmf/web2c/updmap.cfg
+ TEXMFDIST \$TEXLIVE/YYYY/texmf-dist/web2c/updmap.cfg
+
+ (where YYYY is the TeX Live release version).
There is another exception to keep upgradability from earlier versions of
TeX Live: if a file TEXMFLOCAL/web2c/updmap-local.cfg exists (formerly
@@ -2090,7 +2093,7 @@ Explanation of trees and files normally used:
line, then the first one given will be used to save any changes from
--setoption, --enable or --disable. If the config files are taken
from kpsewhich output, then the algorithm is more complex:
- 1) If \$TEXMFHOME/web2c/updmap.cfg or \$TEXMFCONFIG/web2c/updmap.cfg
+ 1) If \$TEXMFCONFIG/web2c/updmap.cfg or \$TEXMFHOME/web2c/updmap.cfg
appears in the list of used files, then the one listed first by
kpsewhich --all (equivalently, the one returned by kpsewhich
updmap.cfg), is used.