1 files changed, 52 insertions, 32 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/tetex/updmap.cfg.5 b/Build/source/texk/texlive/linked_scripts/tetex/updmap.cfg.5
index 0d8c90b5412..43a7cc2d23f 100644
--- a/Build/source/texk/texlive/linked_scripts/tetex/updmap.cfg.5
+++ b/Build/source/texk/texlive/linked_scripts/tetex/updmap.cfg.5
@@ -1,6 +1,7 @@
 .\" Hey, Emacs!  This is an -*- nroff -*- source file.
-.\" 
+.\"
 .\" Copyright (C) 2004, 2012 Hilmar Preusse <hille42@web.de>
+.\" Copyright (C) 2012 Norbert Preining <preining@logic.at> 
 .\" 
 .\" This is free software; you can redistribute it and/or modify it under
 .\" the terms of the GNU General Public License as published by the Free
@@ -15,7 +16,7 @@
 .\" You should have received a copy of the GNU General Public License 
 .\" along with this program.  if not, see <http://www.gnu.org/licenses/>.
 .\" 
-.TH "UPDMAP.CFG" "12" "March 2012" "TeX Live" "TeX Live"
+.TH "UPDMAP.CFG" "20" "November 2012" "TeX Live" "TeX Live"
 .SH "NAME"
 \fBupdmap.cfg\fR \- configuration of font mapping/inclusion for dvips and
 friends.
@@ -28,16 +29,19 @@ Type3) mostly coming from MetaFont.
 .PP
 \fBupdmap\fP is a utility that creates font configuration files for
 \fBdvips\fP(1), \fBpdftex\fP(1), \fBxdvi\fP(1), \fBps2pk\fP(1),
-\fBgsftopk\fP(1), \fBdvipdfm\fP(1) and (soon) \fBdvipdfmx\fP(1)\&.  In
+\fBgsftopk\fP(1), and \fBdvipdfmx\fP(1)\&.  In
 an ideal world, updmap would be unnecessary -- each of these programs
 would read the same configuration file to learn what fonts are
 available and how they should be treated\&.  As things stand, however,
 each of these tools has subtly different requirements and thereby
 needs its own font configuration file\&.  \fBupdmap\fP creates font
-configuration files for all of these programs from a single source,
-\fBupdmap.cfg\fR, allowing you to easily keep all the different
+configuration files for all of these programs from several sources,
+namely all \fBupdmap.cfg\fR, allowing you to easily keep all the different
 configuration files in sync\&.
 .P
+Running "updmap --help" will output the main documentation for using
+\fBupdmap\fR.
+.P
 \fBdvipsPreferOutline\fR
 .br
 Configures if \fBdvips\fR (by default) should prefer bitmap fonts or outline fonts
@@ -62,11 +66,11 @@ ADOBE:   Adobe fonts with "vendor" filenames (e.g. hvnbo___.pfb)
 .br
 ADOBEkb: Adobe fonts with  "berry" filenames (e.g. phvbo8an.pfb)
 .P
-\fBdvipsDownloadBase\fR
+\fBdvipsDownloadBase35\fR
 .br
-Configures if \fBdvips\fR (by default) should download the standard 35 LaserWriter
-fonts into the document (set \fItrue\fR) or should these fonts be used from the ps
-interpreter / printer (set \fIfalse\fR).
+Configures if \fBdvips\fR (by default) should download the 35 base
+PostScript fonts into the document (set \fItrue\fR) or should these
+fonts be used from the ps interpreter / printer (set \fIfalse\fR).
 .br
 The user can override the default by specifying \fBdvips\fR \fI-Pdownload35\fR
 (resp. \fBdvips\fR \fI-Pbuiltin35\fR) to download the LW35 fonts
@@ -76,21 +80,31 @@ Valid settings are \fItrue\fR / \fIfalse\fR.
 .P
 \fBpdftexDownloadBase14\fR
 .br
-Should \fBpdftex\fR download the base 14 pdf fonts? Since some configurations
+Should \fBpdftex\fR download the 14 base PDF fonts? Since some configurations
 (ps / pdf tools / printers) use bad default fonts, it is safer to download
-the fonts. The pdf files will get bigger, though.
+the fonts. The pdf files get bigger, but that is the cost.
 .br
 Valid settings are \fItrue\fR (download the fonts) or \fIfalse\fR (don't
-download the fonts). Adobe recommends to embed all fonts.
+download the fonts). Adobe recommends embedding all fonts.
 .P
-\fBdvipdfmDownloadBase14\fR
+\fBpxdviUse\fR
 .br
-Should \fBdvipdfm\fR download the base 14 pdf fonts? Since some configurations
-(ps / pdf tools / printers) use bad default fonts, it is safer to download
-the fonts. The pdf files will get bigger, though.
+Should special map files for pxdvi be created? pxdvi is an adaption of xdvi
+with support for reading and displaying files generated by the ptex family
+of engines.
 .br
-Valid settings are \fItrue\fR (download the fonts) or \fIfalse\fR (don't
-download the fonts).
+Valid settings are \fItrue\fR (generate configuration) or \fIfalse\fR. See
+http://www.tug.org/texlive/updmap-kanji.html for detailed discussion.
+.P
+\fBkanjiEmbed\fR
+.br
+\fBkanjiVariant\fR
+.br
+The options \fBkanjiEmbed\fR and \fBkanjiVariant\fR specify special
+replacements in the map lines.  In a map, the string "@kanjiEmbed@"
+will be replaced by the value of that option; similarly for
+\fBkanjiVariant\fR.  In this way, users of Japanese TeX can select
+different fonts to be included in the final output.
 .P
 \fBMap\fR
 .br
@@ -99,9 +113,8 @@ document) to the pfb file containing the Postscript code.
 .br
 Usage: \fBMap\fR filename.map
 .P
-The syntax of map files is the same as \fBdvips\fP(1) uses, see
-section 6.4, "'psfonts.map': PostScript font catalog" in the manual of
-\fBdvips\fP(1), available as info and pdf file.
+The syntax of map files is the same as \fBdvips\fP(1) uses, see the
+section "psfonts.map" in the manual of \fBdvips\fP(1).
 .P
 \fBMixedMap\fR
 .br
@@ -112,24 +125,31 @@ entries will not be used in the default map of \fBdvips\fR if
 .br
 Usage: \fBMixedMap\fR filename.map
 .P
+\fBKanjiMap\fR
+.br
+Similar to \fBMap\fR. This should be used for kanji fonts.
+.br
+Usage: \fBKanjiMap\fR filename.map
+.P
 The sign \fB#\fR precedes a comment.
 .P
-Not used Map files should be commented out using the string \fB#!\fR at the
-beginning of the line. These entries can be (de-)activated using \fBupdmap\fR
-with the options \fI--enable\fR and \fI--disable\fR.
-.SH "SPECIAL TO DEBIAN"
-In Debian the file \fBupdmap.cfg\fR is a generated file sitting in /var. It is
-generated by concatenating the *.cfg files from /etc/texmf/updmap.d/. These
-files follow the syntax of updmap.cfg, but contain only parts of it.
+Map files not to be used should be commented out using the string
+\fB#!\fR at the beginning of the line. Such entries can be
+(de-)activated using \fBupdmap\fR with the options \fI--enable\fR and
+\fI--disable\fR, respectively.
+
 .SH "AUTHOR"
-This manual page was written by Hilmar Preusse <hille42@web.de>, for
+This manual page was written by Hilmar Preusse <hille42@web.de> and 
+extended by Norbert Preining <preining@logic.at>, for
 the Debian GNU/Linux system by simply copying the comments from
 \fBupdmap.cfg\fR and rewriting some of them. It may be used by other
 distributions without contacting the author. Any mistakes or omissions in
-the manual page are my fault; inquiries about or corrections to this manual
-page should be directed to me (and not to the primary author).
+the manual page are our fault; inquiries about or corrections to this manual
+page should be directed to tex-live@tug.org.
+
 .SH "SEE ALSO"
-updmap(1), info page of dvips(1)
+updmap(1), dvips(1)
+
 .SH "THANKS TO"
 Frank Kuester,
 Thomas Esser.