summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Build/source/texk/texlive/tl_scripts/Makefile.am5
-rw-r--r--Build/source/texk/texlive/tl_scripts/Makefile.in5
-rw-r--r--Build/source/texk/texlive/tl_scripts/updmap.help2man2
-rw-r--r--Master/texmf-dist/doc/man/man1/updmap-sys.man1.pdfbin16930 -> 16810 bytes
-rw-r--r--Master/texmf-dist/doc/man/man1/updmap.141
-rw-r--r--Master/texmf-dist/doc/man/man1/updmap.man1.pdfbin16930 -> 16810 bytes
6 files changed, 25 insertions, 28 deletions
diff --git a/Build/source/texk/texlive/tl_scripts/Makefile.am b/Build/source/texk/texlive/tl_scripts/Makefile.am
index b623a5f9db3..9942ede0c58 100644
--- a/Build/source/texk/texlive/tl_scripts/Makefile.am
+++ b/Build/source/texk/texlive/tl_scripts/Makefile.am
@@ -105,9 +105,10 @@ dist_web2c_DATA = fmtutil.cnf
## we don't want to require help2man for an install. Leave that to be
## done by hand.
.PHONY: xupdmap.1
-xupdmap.1: updmap.help2man updmap.pl
+updmap_dir = $(srcdir)/../linked_scripts/texlive
+xupdmap.1: updmap.help2man $(updmap_dir)/updmap.pl
help2man --include=$< --source="TeX Live" --no-info \
- $(srcdir)/updmap.pl >/tmp/$@
+ $(updmap_dir)/updmap.pl >/tmp/$@
EXTRA_DIST += updmap.help2man
diff --git a/Build/source/texk/texlive/tl_scripts/Makefile.in b/Build/source/texk/texlive/tl_scripts/Makefile.in
index 33886d47921..62a0b47a7de 100644
--- a/Build/source/texk/texlive/tl_scripts/Makefile.in
+++ b/Build/source/texk/texlive/tl_scripts/Makefile.in
@@ -284,6 +284,7 @@ dist_texconfig_SCRIPTS = tcfmgr
dist_texconfig_DATA = tcfmgr.map
web2cdir = $(datarootdir)/texmf-dist/web2c
dist_web2c_DATA = fmtutil.cnf
+updmap_dir = $(srcdir)/../linked_scripts/texlive
run_texlinks = $(DESTDIR)$(bindir)/texlinks -v \
-f $(DESTDIR)$(web2cdir)/fmtutil.cnf \
-e "$(EXEEXT)" $(DESTDIR)$(bindir)
@@ -817,9 +818,9 @@ uninstall-man1-links:
done
.PHONY: xupdmap.1
-xupdmap.1: updmap.help2man updmap.pl
+xupdmap.1: updmap.help2man $(updmap_dir)/updmap.pl
help2man --include=$< --source="TeX Live" --no-info \
- $(srcdir)/updmap.pl >/tmp/$@
+ $(updmap_dir)/updmap.pl >/tmp/$@
.PHONY: run-texlinks
run-texlinks:
diff --git a/Build/source/texk/texlive/tl_scripts/updmap.help2man b/Build/source/texk/texlive/tl_scripts/updmap.help2man
index 4864c2d74f4..345e4296040 100644
--- a/Build/source/texk/texlive/tl_scripts/updmap.help2man
+++ b/Build/source/texk/texlive/tl_scripts/updmap.help2man
@@ -26,7 +26,7 @@ updmap-sys \- manage TeX font maps, system-wide
Configuration and input files:
.IP "\fIupdmap\&.cfg\fP"
Main configuration file\&. In
-\fItexmf/web2c\fP by default, but may be located elsewhere
+\fItexmf-dist/web2c\fP by default, but may be located elsewhere
depending on your distribution\&. Each texmf tree read should have its
own \fIupdmap.cfg\fP.
.IP "\fIdvips35\&.map\fP"
diff --git a/Master/texmf-dist/doc/man/man1/updmap-sys.man1.pdf b/Master/texmf-dist/doc/man/man1/updmap-sys.man1.pdf
index 3724185c6da..1b031bcb8c7 100644
--- a/Master/texmf-dist/doc/man/man1/updmap-sys.man1.pdf
+++ b/Master/texmf-dist/doc/man/man1/updmap-sys.man1.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/man/man1/updmap.1 b/Master/texmf-dist/doc/man/man1/updmap.1
index 5bc81acc69d..08aa3487e1d 100644
--- a/Master/texmf-dist/doc/man/man1/updmap.1
+++ b/Master/texmf-dist/doc/man/man1/updmap.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.40.9.
-.TH UPDMAP "1" "August 2012" "TeX Live" "User Commands"
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.41.2.
+.TH UPDMAP "1" "April 2013" "TeX Live" "User Commands"
.SH NAME
updmap \- manage TeX font maps, per-user
.br
@@ -11,7 +11,7 @@ updmap-sys \- manage TeX font maps, system-wide
.B updmap-sys
[\fIOPTION\fR] ... [\fICOMMAND\fR]
.SH DESCRIPTION
-updmap (TeX Live, multi) version $Id: updmap.pl 27264 2012\-07\-31 05:10:29Z preining $
+updmap (TeX Live, multi) version $Id: updmap.pl 30043 2013\-04\-19 19:47:12Z preining $
.PP
Update the default font map files used by pdftex, dvips, and dvipdfm(x),
and optionally pxdvi, as determined by all configuration files updmap.cfg
@@ -169,10 +169,7 @@ Explanation of trees and files normally used:
If \fB\-\-cnffile\fR is specified on the command line (possibly multiple
times), its value(s) are used. Otherwise, updmap reads all the
updmap.cfg files found by running `kpsewhich \fB\-all\fR updmap.cfg', in the
-order returned by kpsewhich, with one exception: an updmap.cfg found
-in TEXMFLOCAL is given higher priority than the updmap.cfg in
-TEXMFMAIN, to ensure that local adjustments by administrators take
-precedence over what is shipped in TeX Live.
+order returned by kpsewhich.
.IP
In any case, if multiple updmap.cfg files are found, all the maps
mentioned in all the updmap.cfg files are merged.
@@ -183,26 +180,24 @@ read, in the given order.
.nf
.IP
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/YYYY/texmf/web2c/updmap.cfg
-TEXMFDIST $TEXLIVE/YYYY/texmf\-dist/web2c/updmap.cfg
+TEXMFSYSCONFIG \fI$TEXLIVE/YYYY/texmf\-config/web2c/updmap.cfg\fP
+TEXMFSYSVAR \fI$TEXLIVE/YYYY/texmf\-var/web2c/updmap.cfg\fP
+TEXMFLOCAL \fI$TEXLIVE/texmf\-local/web2c/updmap.cfg\fP
+TEXMFDIST \fI$TEXLIVE/YYYY/texmf\-dist/web2c/updmap.cfg\fP
.IP
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/YYYY/texmf\-config/web2c/updmap.cfg
-TEXMFSYSVAR $TEXLIVE/YYYY/texmf\-var/web2c/updmap.cfg
-TEXMFLOCAL $TEXLIVE/texmf\-local/web2c/updmap.cfg
-TEXMFMAIN $TEXLIVE/YYYY/texmf/web2c/updmap.cfg
-TEXMFDIST $TEXLIVE/YYYY/texmf\-dist/web2c/updmap.cfg
+TEXMFHOME \fI$HOME/texmf/web2c/updmap.cfg\fP
+TEXMFSYSCONFIG \fI$TEXLIVE/YYYY/texmf\-config/web2c/updmap.cfg\fP
+TEXMFSYSVAR \fI$TEXLIVE/YYYY/texmf\-var/web2c/updmap.cfg\fP
+TEXMFLOCAL \fI$TEXLIVE/texmf\-local/web2c/updmap.cfg\fP
+TEXMFDIST \fI$TEXLIVE/YYYY/texmf\-dist/web2c/updmap.cfg\fP
.IP
(where YYYY is the TeX Live release version).
.fi
.IP
-There is another exception to keep upgradability from earlier versions
+There is one exception to keep upgradability from earlier versions
of TeX Live: if a file TEXMFLOCAL/web2c/updmap\-local.cfg exists
(formerly used by tlmgr to merge local fonts), then the file
TEXMFLOCAL/web2c/updmap.cfg is ignored (if it exists) and that
@@ -218,13 +213,13 @@ line, then the first one given will be used to save any changes from
\fB\-\-setoption\fR, \fB\-\-enable\fR or \fB\-\-disable\fR. If the config files are taken
from kpsewhich output, then the algorithm is more complex:
.IP
-1) If $TEXMFCONFIG/web2c/updmap.cfg or $TEXMFHOME/web2c/updmap.cfg
+1) If \fI$TEXMFCONFIG/web2c/updmap.cfg\fP or \fI$TEXMFHOME/web2c/updmap.cfg\fP
appears in the list of used files, then the one listed first by
kpsewhich \fB\-\-all\fR (equivalently, the one returned by kpsewhich
updmap.cfg), is used.
.IP
2) If neither of the above two are present and changes are made, a
-new config file is created in $TEXMFCONFIG/web2c/updmap.cfg.
+new config file is created in \fI$TEXMFCONFIG/web2c/updmap.cfg\fP.
.IP
Resolving multiple definitions of a font:
.IP
@@ -250,7 +245,7 @@ in the higher\-priority updmap.cfg file.
As an example, suppose you have a copy of MathTime Pro fonts
and want to disable the Belleek version of the fonts; that is,
disable the map belleek.map. You can create the file
-$TEXMFCONFIG/web2c/updmap.cfg with the content
+\fI$TEXMFCONFIG/web2c/updmap.cfg\fP with the content
.IP
#! Map belleek.map
Map mt\-plus.map
@@ -282,7 +277,7 @@ instructions, read the beginning of updmap.cfg.
Configuration and input files:
.IP "\fIupdmap\&.cfg\fP"
Main configuration file\&. In
-\fItexmf/web2c\fP by default, but may be located elsewhere
+\fItexmf-dist/web2c\fP by default, but may be located elsewhere
depending on your distribution\&. Each texmf tree read should have its
own \fIupdmap.cfg\fP.
.IP "\fIdvips35\&.map\fP"
diff --git a/Master/texmf-dist/doc/man/man1/updmap.man1.pdf b/Master/texmf-dist/doc/man/man1/updmap.man1.pdf
index 16e384812c7..1d46b3acb1a 100644
--- a/Master/texmf-dist/doc/man/man1/updmap.man1.pdf
+++ b/Master/texmf-dist/doc/man/man1/updmap.man1.pdf
Binary files differ