diff options
Diffstat (limited to 'Master/tlpkg/dev/quilt-patches/dev.mupdmap-integration')
-rw-r--r-- | Master/tlpkg/dev/quilt-patches/dev.mupdmap-integration | 976 |
1 files changed, 976 insertions, 0 deletions
diff --git a/Master/tlpkg/dev/quilt-patches/dev.mupdmap-integration b/Master/tlpkg/dev/quilt-patches/dev.mupdmap-integration new file mode 100644 index 00000000000..c7da49280c8 --- /dev/null +++ b/Master/tlpkg/dev/quilt-patches/dev.mupdmap-integration @@ -0,0 +1,976 @@ +--- + install-tl | 7 + texmf-dist/web2c/updmap.cfg | 230 +++ + texmf/scripts/texlive/tlmgr.pl | 131 - + texmf/web2c/updmap-hdr.cfg | 107 - + texmf/web2c/updmap.cfg | 256 --- + tlpkg/TeXLive/TLUtils.pm | 67 + 7 files changed, 2071 insertions(+), 1744 deletions(-) + +Index: Master/texmf/web2c/updmap.cfg +=================================================================== +--- Master.orig/texmf/web2c/updmap.cfg 2012-01-12 12:54:40.000000000 +0900 ++++ Master/texmf/web2c/updmap.cfg 2012-01-12 12:55:09.000000000 +0900 +@@ -1,31 +1,7 @@ +-# Generated by /home/texlive/karl/Master/bin/i386-linux/tlmgr on Mon Jan 9 04:29:26 2012 +-# $Id: updmap-hdr.cfg 24398 2011-10-26 01:07:22Z preining $ +-# +-# The full updmap.cfg is generated by concatenating updmap-hdr.cfg with +-# all the Map and MixedMap lines from an installation, possibly +-# appending a local configuration file. +-# +-# To make local customizations to the map files, please use of the +-# following methods: +-# +-# 1) call +-# updmap-sys --enable Map=foo.map +-# for each map file. (Or MixedMap instead of Map, if your font has +-# both Metafont and outline definitions.) See the updmap --help +-# documentation. +-# +-# 2) add your local map entries to the file +-# TEXMFLOCAL/web2c/updmap-local.cfg +-# and then call +-# tlmgr generate updmap +-# which will concatenate updmap-local.cfg to the end of the final +-# updmap.cfg. (You can override the local.cfg file location with the +-# --localcfg option; see tlmgr --help.) +-# +-# If you use either of these methods, your local adaptations will be +-# preserved when tlmgr updates the installation or this config file. +-# Manual edits to updmap.cfg may be lost on update. +- ++# ++# updmap.cfg ++# TEXMFMAIN ++# only the options are defined here + + ################################################################ + # OPTIONS +@@ -100,227 +76,3 @@ + # map file used. + kanjiEmbed noEmbed + +-################################################################ +-# Map files. +-################################################################ +-# +-# There are two possible entries: Map and MixedMap. Both have one additional +-# argument: the filename of the map file. MixedMap ("mixed" means that +-# the font is available as bitmap and as outline) lines will not be used +-# in the default map of dvips if dvipsPreferOutline is false. Inactive +-# Map files should be marked by "#! " (without the quotes), not just #. +-# +- +-Map OrnementsADF.map +-Map ArrowsADF.map +-Map BulletsADF.map +-MixedMap allrunes.map +-Map euler.map +-MixedMap cm.map +-MixedMap cmextra.map +-MixedMap cyrillic.map +-MixedMap latxfont.map +-MixedMap symbols.map +-Map uaq.map +-Map antt.map +-Map arabi.map +-MixedMap arabtex.map +-Map archaicprw.map +-Map arev.map +-Map bkaiu.map +-Map bsmiu.map +-Map gbsnu.map +-Map gkaiu.map +-Map ascii.map +-Map augie.map +-Map auncial.map +-Map aurical.map +-Map ybv.map +-MixedMap bbold.map +-Map belleek.map +-Map bera.map +-Map ybd.map +-Map sqrcaps.map +-Map boondox.map +-Map pbsi.map +-Map burmese.map +-Map calligra.map +-Map cantarell.map +-Map cmin.map +-MixedMap cbgreek-full.map +-MixedMap ccpl.map +-Map ccicons.map +-Map clm.map +-Map chemarrow.map +-Map cjhebrew.map +-MixedMap cmtext-bsr-interpolated.map +-Map cm-lgc.map +-MixedMap cm-super-t1.map +-MixedMap cm-super-t2a.map +-MixedMap cm-super-t2b.map +-MixedMap cm-super-t2c.map +-MixedMap cm-super-ts1.map +-MixedMap cm-super-x2.map +-Map cmcyr.map +-MixedMap cmll.map +-Map comfortaa.map +-Map original-context-symbol.map +-MixedMap csother.map +-MixedMap cstext.map +-Map cyklop.map +-Map dejavu-type1.map +-Map dictsym.map +-Map dstroke.map +-Map droid.map +-Map dutchcal.map +-Map yes.map +-Map epigrafica.map +-Map epiolmec.map +-MixedMap esint.map +-Map ESSTIX.map +-Map esvect.map +-MixedMap ethiop.map +-MixedMap eurosym.map +-Map fdsymbol.map +-Map fge.map +-Map foekfont.map +-Map fonetika.map +-Map fourier-utopia-expert.map +-Map fourier.map +-Map frcursive.map +-Map garuda-c90.map +-Map gfsartemisia.map +-Map gfsbaskerville.map +-Map gfsbodoni.map +-Map gfscomplutum.map +-Map gfsdidot.map +-Map gfsneohellenic.map +-Map gfsporson.map +-Map gfssolomos.map +-Map yfrak.map +-Map ugq.map +-Map grverb.map +-MixedMap hfbright.map +-MixedMap iby.map +-Map fi4.map +-Map Acorn.map +-Map AnnSton.map +-Map ArtNouv.map +-Map ArtNouvc.map +-Map Carrickc.map +-Map Eichenla.map +-Map Eileen.map +-Map EileenBl.map +-Map Elzevier.map +-Map GotIn.map +-Map GoudyIn.map +-Map Kinigcap.map +-Map Konanur.map +-Map Kramer.map +-Map MorrisIn.map +-Map Nouveaud.map +-Map Romantik.map +-Map Rothdn.map +-Map RoyalIn.map +-Map Sanremo.map +-Map Starburst.map +-Map Typocaps.map +-Map Zallman.map +-Map iwona.map +-KanjiMap otf-@kanjiEmbed@.map +-KanjiMap otf-cktx.map +-Map kerkis.map +-Map knitfont.map +-Map kpfonts.map +-Map kurier.map +-Map lato.map +-Map libertine.map +-Map yly.map +-Map linearA.map +-Map l7x-urwvn.map +-Map lm.map +-MixedMap lxfonts.map +-MixedMap manfnt.map +-Map marvosym.map +-Map mathabx.map +-Map mdbch.map +-Map mdput.map +-Map mdugm.map +-Map mdsymbol.map +-Map troff-updmap.map +-MixedMap mflogo.map +-Map MnSymbol.map +-MixedMap mongolian.map +-MixedMap musix.map +-Map norasi-c90.map +-Map cherokee.map +-Map ocrb.map +-Map oinuit.map +-Map omega.map +-Map opensans.map +-Map paratype-type1.map +-Map phaistos.map +-MixedMap pigpen.map +-MixedMap plother.map +-MixedMap pltext.map +-Map ap.map +-Map prodint.map +-Map charter.map +-Map fpls.map +-Map pazo.map +-Map utopia.map +-KanjiMap morisawa.map +-KanjiMap ptex-@kanjiEmbed@.map +-Map pxfonts.map +-Map pxtx.map +-Map recycle.map +-Map yrd.map +-MixedMap rsfs.map +-Map rsfso.map +-Map skt.map +-MixedMap semaf.map +-Map SkakNew.map +-Map starfont.map +-Map icelandic.map +-MixedMap stmaryrd.map +-Map tabvar.map +-Map mathpple.map +-Map qag.map +-Map qbk.map +-Map qcr.map +-Map qcs.map +-Map qhv.map +-Map qpl.map +-Map qtm.map +-Map qzc.map +-Map tfrupee.map +-MixedMap tipa.map +-MixedMap trajan.map +-Map txfonts.map +-Map gptimes.map +-Map umj.map +-MixedMap dvng.map +-Map yv1.map +-Map yv2.map +-Map yv3.map +-Map yvo.map +-Map yvt.map +-Map arevvn.map +-Map chartervn.map +-Map cmbrightvn.map +-Map concretevn.map +-Map grotesqvn.map +-Map txttvn.map +-Map urwvn.map +-MixedMap vnrother.map +-MixedMap vnrtext.map +-Map vntopia.map +-Map dgj.map +-Map dmj.map +-Map mc2j.map +-Map mcj.map +-Map mr2j.map +-Map mrj.map +-MixedMap wasy.map +-MixedMap xypic.map +-MixedMap yhmath.map +Index: Master/texmf-dist/web2c/updmap.cfg +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ Master/texmf-dist/web2c/updmap.cfg 2012-01-12 12:56:10.000000000 +0900 +@@ -0,0 +1,230 @@ ++# ++# updmap.cfg ++# TEXMFDIST ++# only contains the actual maps ++# settings are in TEXMFMAIN ++ ++################################################################ ++# Map files. ++################################################################ ++# ++# There are two possible entries: Map and MixedMap. Both have one additional ++# argument: the filename of the map file. MixedMap ("mixed" means that ++# the font is available as bitmap and as outline) lines will not be used ++# in the default map of dvips if dvipsPreferOutline is false. Inactive ++# Map files should be marked by "#! " (without the quotes), not just #. ++# ++ ++Map OrnementsADF.map ++Map ArrowsADF.map ++Map BulletsADF.map ++MixedMap allrunes.map ++Map euler.map ++MixedMap cm.map ++MixedMap cmextra.map ++MixedMap cyrillic.map ++MixedMap latxfont.map ++MixedMap symbols.map ++Map uaq.map ++Map antt.map ++Map arabi.map ++MixedMap arabtex.map ++Map archaicprw.map ++Map arev.map ++Map bkaiu.map ++Map bsmiu.map ++Map gbsnu.map ++Map gkaiu.map ++Map ascii.map ++Map augie.map ++Map auncial.map ++Map aurical.map ++Map ybv.map ++MixedMap bbold.map ++Map belleek.map ++Map bera.map ++Map ybd.map ++Map sqrcaps.map ++Map boondox.map ++Map pbsi.map ++Map burmese.map ++Map calligra.map ++Map cantarell.map ++Map cmin.map ++MixedMap cbgreek-full.map ++MixedMap ccpl.map ++Map ccicons.map ++Map clm.map ++Map chemarrow.map ++Map cjhebrew.map ++MixedMap cmtext-bsr-interpolated.map ++Map cm-lgc.map ++MixedMap cm-super-t1.map ++MixedMap cm-super-t2a.map ++MixedMap cm-super-t2b.map ++MixedMap cm-super-t2c.map ++MixedMap cm-super-ts1.map ++MixedMap cm-super-x2.map ++Map cmcyr.map ++MixedMap cmll.map ++Map comfortaa.map ++Map original-context-symbol.map ++MixedMap csother.map ++MixedMap cstext.map ++Map cyklop.map ++Map dejavu-type1.map ++Map dictsym.map ++Map dstroke.map ++Map droid.map ++Map dutchcal.map ++Map yes.map ++Map epigrafica.map ++Map epiolmec.map ++MixedMap esint.map ++Map ESSTIX.map ++Map esvect.map ++MixedMap ethiop.map ++MixedMap eurosym.map ++Map fdsymbol.map ++Map fge.map ++Map foekfont.map ++Map fonetika.map ++Map fourier-utopia-expert.map ++Map fourier.map ++Map frcursive.map ++Map garuda-c90.map ++Map gfsartemisia.map ++Map gfsbaskerville.map ++Map gfsbodoni.map ++Map gfscomplutum.map ++Map gfsdidot.map ++Map gfsneohellenic.map ++Map gfsporson.map ++Map gfssolomos.map ++Map yfrak.map ++Map ugq.map ++Map grverb.map ++MixedMap hfbright.map ++MixedMap iby.map ++Map fi4.map ++Map Acorn.map ++Map AnnSton.map ++Map ArtNouv.map ++Map ArtNouvc.map ++Map Carrickc.map ++Map Eichenla.map ++Map Eileen.map ++Map EileenBl.map ++Map Elzevier.map ++Map GotIn.map ++Map GoudyIn.map ++Map Kinigcap.map ++Map Konanur.map ++Map Kramer.map ++Map MorrisIn.map ++Map Nouveaud.map ++Map Romantik.map ++Map Rothdn.map ++Map RoyalIn.map ++Map Sanremo.map ++Map Starburst.map ++Map Typocaps.map ++Map Zallman.map ++Map iwona.map ++KanjiMap otf-@kanjiEmbed@.map ++KanjiMap otf-cktx.map ++Map kerkis.map ++Map knitfont.map ++Map kpfonts.map ++Map kurier.map ++Map lato.map ++Map libertine.map ++Map yly.map ++Map linearA.map ++Map l7x-urwvn.map ++Map lm.map ++MixedMap lxfonts.map ++MixedMap manfnt.map ++Map marvosym.map ++Map mathabx.map ++Map mdbch.map ++Map mdput.map ++Map mdugm.map ++Map mdsymbol.map ++Map troff-updmap.map ++MixedMap mflogo.map ++Map MnSymbol.map ++MixedMap mongolian.map ++MixedMap musix.map ++Map norasi-c90.map ++Map cherokee.map ++Map ocrb.map ++Map oinuit.map ++Map omega.map ++Map opensans.map ++Map paratype-type1.map ++Map phaistos.map ++MixedMap pigpen.map ++MixedMap plother.map ++MixedMap pltext.map ++Map ap.map ++Map prodint.map ++Map charter.map ++Map fpls.map ++Map pazo.map ++Map utopia.map ++KanjiMap morisawa.map ++KanjiMap ptex-@kanjiEmbed@.map ++Map pxfonts.map ++Map pxtx.map ++Map recycle.map ++Map yrd.map ++MixedMap rsfs.map ++Map rsfso.map ++Map skt.map ++MixedMap semaf.map ++Map SkakNew.map ++Map starfont.map ++Map icelandic.map ++MixedMap stmaryrd.map ++Map tabvar.map ++Map mathpple.map ++Map qag.map ++Map qbk.map ++Map qcr.map ++Map qcs.map ++Map qhv.map ++Map qpl.map ++Map qtm.map ++Map qzc.map ++Map tfrupee.map ++MixedMap tipa.map ++MixedMap trajan.map ++Map txfonts.map ++Map gptimes.map ++Map umj.map ++MixedMap dvng.map ++Map yv1.map ++Map yv2.map ++Map yv3.map ++Map yvo.map ++Map yvt.map ++Map arevvn.map ++Map chartervn.map ++Map cmbrightvn.map ++Map concretevn.map ++Map grotesqvn.map ++Map txttvn.map ++Map urwvn.map ++MixedMap vnrother.map ++MixedMap vnrtext.map ++Map vntopia.map ++Map dgj.map ++Map dmj.map ++Map mc2j.map ++Map mcj.map ++Map mr2j.map ++Map mrj.map ++MixedMap wasy.map ++MixedMap xypic.map ++MixedMap yhmath.map +Index: Master/texmf/scripts/texlive/tlmgr.pl +=================================================================== +--- Master.orig/texmf/scripts/texlive/tlmgr.pl 2012-01-12 12:54:40.000000000 +0900 ++++ Master/texmf/scripts/texlive/tlmgr.pl 2012-01-12 13:42:40.000000000 +0900 +@@ -624,47 +624,21 @@ + chomp(my $TEXMFSYSVAR = `kpsewhich -var-value=TEXMFSYSVAR`); + chomp(my $TEXMFSYSCONFIG = `kpsewhich -var-value=TEXMFSYSCONFIG`); + chomp(my $TEXMFLOCAL = `kpsewhich -var-value=TEXMFLOCAL`); ++ chomp(my $TEXMFDIST = `kpsewhich -var-value=TEXMFDIST`); + + # + # maps handling +- # if enabled and disabled -> do nothing +- # if only enabled -> enable it +- # if only disabled -> disable it +- # if the option "generate_updmap" is set, then simply ignore all that +- # and run the equivalent of tlmgr generate updmap + { + my $updmap_run_needed = 0; +- my %do_enable; +- my %do_disable; + for my $m (keys %{$::execute_actions{'enable'}{'maps'}}) { + $updmap_run_needed = 1; +- $do_enable{$m} = 1; + } + for my $m (keys %{$::execute_actions{'disable'}{'maps'}}) { + $updmap_run_needed = 1; +- if (defined($do_enable{$m})) { +- # we are upgrading because it is disabled and enabled, so +- # delete the entry in do_enable, it is already +- delete $do_enable{$m}; +- } else { +- # not new installed, so simply removed +- $do_disable{$m} = 1; +- } +- } +- if ($updmap_run_needed && $localtlpdb->option("generate_updmap")) { +- my $dest = "$TEXMFSYSCONFIG/web2c/updmap.cfg"; +- my $localcfg = "$TEXMFLOCAL/web2c/updmap-local.cfg"; +- info("tlmgr: generate_updmap writing new $dest\n"); +- TeXLive::TLUtils::create_updmap($localtlpdb, $dest, $localcfg); +- } else { +- for my $m (keys %do_disable) { +- $errors += do_cmd_and_check("updmap-sys --nomkmap --nohash --disable $m"); +- } +- for my $m (keys %do_enable) { +- my $str = "updmap-sys --nomkmap --nohash --enable " . +- $::execute_actions{'enable'}{'maps'}{$m} . "=$m"; +- $errors += do_cmd_and_check($str); +- } ++ } ++ if ($updmap_run_needed) { ++ my $dest = "$TEXMFDIST/web2c/updmap.cfg"; ++ TeXLive::TLUtils::create_updmap($localtlpdb, $dest); + } + $errors += do_cmd_and_check("updmap-sys") if $updmap_run_needed; + } +@@ -3918,17 +3892,15 @@ + init_local_db(); + + # we create fmtutil.cnf, language.dat, language.def in TEXMFSYSVAR and +- # updmap.cfg in TEXMFSYSCONFIG. The reason is that calls to +- # updmap-sys (as is done by the tlmgr update call when packages with +- # maps are installed) will create the updmap.cfg file in +- # TEXMFSYSCONFIG. It would start from the version in TEXMFSYSVAR, but +- # after that the TEXMFSYSCONFIG takes precedence and thus the +- # mechanism explained in updmap.cfg header would not work. We don't +- # want that. So just use TEXMFSYSCONFIG from the start. ++ # updmap.cfg in TEXMFDIST. The reason is that we are now using an ++ # implementation of updmap that supports multiple updmap files. ++ # Local adaptions should not be made there, but only in TEXMFLOCAL ++ # or TEXMF(SYS)CONFIG updmap.cfg + # + chomp (my $TEXMFSYSVAR = `kpsewhich -var-value=TEXMFSYSVAR`); + chomp (my $TEXMFSYSCONFIG = `kpsewhich -var-value=TEXMFSYSCONFIG`); + chomp (my $TEXMFLOCAL = `kpsewhich -var-value=TEXMFLOCAL`); ++ chomp (my $TEXMFDIST = `kpsewhich -var-value=TEXMFDIST`); + + # we do generate all config files, treat $opts{"dest"} as pattern + # and make it append the respective extensions +@@ -4006,10 +3978,9 @@ + } + + } elsif ($what =~ m/^updmap$/i) { +- my $dest = $opts{"dest"} || "$TEXMFSYSCONFIG/web2c/updmap.cfg"; +- my $localcfg = $opts{"localcfg"} || "$TEXMFLOCAL/web2c/updmap-local.cfg"; ++ my $dest = $opts{"dest"} || "$TEXMFDIST/web2c/updmap.cfg"; + debug("$0: writing new updmap.cfg to $dest\n"); +- TeXLive::TLUtils::create_updmap($localtlpdb, $dest, $localcfg); ++ TeXLive::TLUtils::create_updmap($localtlpdb, $dest); + + if ($opts{"rebuild-sys"}) { + do_cmd_and_check("updmap-sys"); +@@ -6110,7 +6081,6 @@ + sys_bin (directory to which executables are linked by the path action) + sys_man (directory to which man pages are linked by the path action) + sys_info (directory to which Info files are linked by the path action) +- generate_updmap (run the equivalent of tlmgr generate updmap on changes) + desktop_integration (Windows-only: create Start menu shortcuts) + fileassocs (Windows-only: change file associations) + multiuser (Windows-only: install for all users) +@@ -6166,9 +6136,6 @@ + Unix-like systems to control the generation of links for executables, + info files and man pages. See the C<path> action for details. + +-For the C<generate_updmap> option, see the C<updmap> section in +-L<generate|/"generate [I<option>]... I<what>">. +- + The last three options control behaviour on Windows installations. If + C<desktop_integration> is set, then some packages will install items in + a sub-folder of the Start menu for C<tlmgr gui>, documentation, etc. If +@@ -6558,31 +6525,20 @@ + =back + + The C<generate> action overwrites any manual changes made in the +-respective files: it recreates them from scratch. ++respective files: it recreates them from scratch based on the ++information of the installed packages, plus local adaptions. + +-For C<fmtutil> and the language files, this is normal, and both the TeX +-Live installer and C<tlmgr> routinely call C<generate> for them. ++The TeX Live installer and C<tlmgr> routinely call C<generate> for ++all of these files. + +-For C<updmap>, however, C<tlmgr> does I<not> use C<generate> by default, +-because the result would be to disable all maps which have been manually +-installed via S<C<updmap-sys --enable>>, e.g., for proprietary or local +-fonts, which has been the standard method for adding fonts to TeX +-installations for years. Rather, the C<generate> action only +-incorporates the changes in the C<--localcfg> file mentioned below. +- +-Notwithstanding the above, if you only use the fonts and font packages +-within TeX Live, and rigorously maintain your local fonts (if any) using +-C<updmap-local.cfg>, there is nothing wrong with using C<generate +-updmap>. It can be helpful in moving from release to release, +-especially. We use it ourselves to generate the C<updmap.cfg> file in +-the live source repository. If you want to commit yourself to using +-C<updmap-local.cfg>, you can set the C<generate_updmap> option and +-C<tlmgr> will run C<generate updmap> for you on update. +- +-In any case, C<tlmgr> updates and maintains the final C<updmap.cfg> in +-C<TEXMFSYSCONFIG> (while the other generated files are in +-C<TEXMFSYSVAR>), because that is the location that C<updmap-sys> (via +-C<tcfmgr>) historically uses. ++For managing your own fonts, please see the documentation of ++updmap, which supports multiple updmap.cfg files. So by simply ++editing TEXMFLOCAL's updmap.cfg they will be accounted for. ++ ++In any case, C<tlmgr> updates and maintains C<updmap.cfg> in ++C<TEXMFDIST> (while the other generated files are in ++C<TEXMFSYSVAR>), because that is the location where the fonts ++are installed. + + In more detail: C<generate> remakes any of the five config files + C<language.dat>, C<language.def>, C<language.dat.lua>, C<fmtutil.cnf>, +@@ -6590,26 +6546,27 @@ + locally-maintained files. + + The locally-maintained files are C<language-local.dat>, +-C<language-local.def>, C<language-local.dat.lua>, C<fmtutil-local.cnf>, +-or C<updmap-local.cfg>, searched for in C<TEXMFLOCAL> in the respective +-directories. If they are present, the final file is made by starting ++C<language-local.def>, C<language-local.dat.lua>, or C<fmtutil-local.cnf>, ++searched for in C<TEXMFLOCAL> in the respective directories. ++The formerly supported C<updmap-local.cfg> is not supported anymore, ++since C<updmap> now supports multiple updmap.cfg files, so local ++additions can be put into an updmap.cfg file in TEXMFLOCAL. ++If local additions are present, the final file is made by starting + with the main file, omitting any entries that the local file specifies + to be disabled, and finally appending the local file. + + Local files specify entries to be disabled with a comment line, namely + one of these: + +- #!NAME + %!NAME + --!NAME + +-where C<fmtutil.cnf> and C<updmap.cfg> use C<#>, C<language.dat> and ++where C<fmtutil.cnf> uses C<#>, C<language.dat> and + C<language.def> use C<%>, and C<language.dat.lua> use C<-->. In any +-case, the I<name> is the respective format name, map file name (include +-the C<.map> extension), or hyphenation pattern identifier. Examples: ++case, the I<name> is the respective format name, or hyphenation pattern ++identifier. Examples: + + #!pdflatex +- #!lm.map + %!german + --!usenglishmax + +@@ -6622,20 +6579,9 @@ + syntax as the master files. + + The form C<generate language> recreates both the C<language.dat>, the +-C<language.def> and the C<language.dat.lua>files, while the forms with ++C<language.def> and the C<language.dat.lua> files, while the forms with + extension recreates only the given language file. + +-Special consideration for updmap.cfg: in addition to font map files, +-this file specifies the setting of five options: C<dvipsPreferOutline>, +-C<LW35>, C<dvipsDownloadBase35>, C<pdftexDownloadBase14>, and +-C<dvipdfmDownloadBase14>. The defaults for these as set in +-C<updmap-hdr.cfg> are usually fine. If you want to change them, you can +-include changed settings for any or all of these five options in your +-C<updmap-local.cfg> file and they will be respected by C<generate +-updmap>. For example: +- +- dvipsDownloadBase35 true +- + Options: + + =over 4 +@@ -6643,7 +6589,7 @@ + =item B<--dest> I<output_file> + + specifies the output file (defaults to the respective location in +-C<TEXMFSYSVAR> for C<language*> and C<fmtutil>, and C<TEXMFSYSCONFIG> ++C<TEXMFSYSVAR> for C<language*> and C<fmtutil>, and C<TEXMFSYSDIST> + for C<updmap>). If C<--dest> is given to C<generate language>, it serves + as a basename onto which C<.dat> will be appended for the name of the + C<language.dat> output file, C<.def> will be +@@ -6681,13 +6627,6 @@ + web2c/fmtutil.cnf (and fmtutil-local.cnf); + web2c/updmap.cfg (and updmap-local.cfg). + +-Final repetition: as explained above, C<tlmgr> does I<not> use +-C<generate updmap> for font map files. Therefore, if you want to make +-use of C<updmap-local.cfg>, you must run C<tlmgr generate updmap> +-and C<updmap-sys> yourself after making any local changes. If you +-make yourself responsible for rigorously using C<updmap-local.cfg>), set +-C<option generate_updmap>). +- + + =head1 CONFIGURATION FILE + +Index: Master/texmf/web2c/updmap-hdr.cfg +=================================================================== +--- Master.orig/texmf/web2c/updmap-hdr.cfg 2011-10-26 10:07:22.000000000 +0900 ++++ Master/texmf/web2c/updmap-hdr.cfg 2012-01-12 13:42:09.000000000 +0900 +@@ -1,8 +1,8 @@ + # $Id: updmap-hdr.cfg 24398 2011-10-26 01:07:22Z preining $ + # +-# The full updmap.cfg is generated by concatenating updmap-hdr.cfg with +-# all the Map and MixedMap lines from an installation, possibly +-# appending a local configuration file. ++# The updmap.cfg in this tree (TEXMFDIST) is generated by tlmgr by ++# concatenating updmap-hdr.cfg with all the Map and MixedMap lines ++# from an installation. + # + # To make local customizations to the map files, please use of the + # following methods: +@@ -11,102 +11,11 @@ + # updmap-sys --enable Map=foo.map + # for each map file. (Or MixedMap instead of Map, if your font has + # both Metafont and outline definitions.) See the updmap --help +-# documentation. ++# documentation. This will add lines to the updmap.cfg file in ++# TEXMFSYSCONFIG (creating it if necessary). + # +-# 2) add your local map entries to the file +-# TEXMFLOCAL/web2c/updmap-local.cfg +-# and then call +-# tlmgr generate updmap +-# which will concatenate updmap-local.cfg to the end of the final +-# updmap.cfg. (You can override the local.cfg file location with the +-# --localcfg option; see tlmgr --help.) ++# 2) put all your additional fonts into TEXMFLOCAL and edit ++# TEXMFLOCAL/web2c/updmap.cfg. + # +-# If you use either of these methods, your local adaptations will be +-# preserved when tlmgr updates the installation or this config file. +-# Manual edits to updmap.cfg may be lost on update. +- +- +-################################################################ +-# OPTIONS +-################################################################ +- ++# Manual edits to this updmap.cfg will be lost on update. + # +-# dvipsPreferOutline +-# +-# Should dvips (by default) prefer bitmap fonts or outline fonts +-# if both are available? Independent of this setting, outlines +-# can be forced by putting "p psfonts_t1.map" into a config file +-# that dvips reads. Bitmaps (for the fonts in question) can +-# be forced by putting "p psfonts_pk.map" into a config file. +-# We provide such config files which can be enabled via +-# dvips -Poutline ... resp. dvips -Ppk ... +-# +-# Valid settings for dvipsPreferOutline are true / false: +-dvipsPreferOutline true +- +-# +-# LW35 +-# +-# Which fonts for the "Basic 35 Laserwriter Fonts" do you want to use and +-# how are the filenames chosen? Valid settings: +-# URW: URW fonts with "vendor" filenames (e.g. n019064l.pfb) +-# URWkb: URW fonts with "berry" filenames (e.g. uhvbo8ac.pfb) +-# ADOBE: Adobe fonts with "vendor" filenames (e.g. hvnbo___.pfb) +-# ADOBEkb: Adobe fonts with "berry" filenames (e.g. phvbo8an.pfb) +-LW35 URWkb +- +-# +-# dvipsDownloadBase35 +-# +-# Should dvips (by default) download the standard 35 LaserWriter fonts +-# with the document (then set dvipsDownloadBase35 true) or should these +-# fonts be used from the ps interpreter / printer? +-# Whatever the default is, the user can override it by specifying +-# dvips -Pdownload35 ... resp. dvips -Pbuiltin35 ... to either download +-# the LW35 fonts resp. use the built-in fonts. +-# +-# Valid settings are true / false: +-dvipsDownloadBase35 true +- +-# +-# pdftexDownloadBase14 +-# +-# Should pdftex 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. +-# Valid settings are true (download the fonts) or false (don't download +-# the fonts). Adobe recommends embedding all fonts. +-pdftexDownloadBase14 true +- +-# +-# dvipdfmDownloadBase14 +-# +-# Should dvipdfm 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. +-# Valid settings are true (download the fonts) or false (don't download +-# the fonts). +-dvipdfmDownloadBase14 true +- +-# +-# kanjiEmbed +-# +-# updmap generates a file kanjix.map for usage with dvipdfmx. Using this +-# option one can switch between not embedding any kanji font, and several +-# available. +-# Valid setting is any string. At updmap run time the @kanjiEmbed@ substring +-# in a map file name will be replaced with this settings, and the respective +-# map file used. +-kanjiEmbed noEmbed +- +-################################################################ +-# Map files. +-################################################################ +-# +-# There are two possible entries: Map and MixedMap. Both have one additional +-# argument: the filename of the map file. MixedMap ("mixed" means that +-# the font is available as bitmap and as outline) lines will not be used +-# in the default map of dvips if dvipsPreferOutline is false. Inactive +-# Map files should be marked by "#! " (without the quotes), not just #. +-# +- +Index: Master/tlpkg/TeXLive/TLUtils.pm +=================================================================== +--- Master.orig/tlpkg/TeXLive/TLUtils.pm 2012-01-05 11:07:33.000000000 +0900 ++++ Master/tlpkg/TeXLive/TLUtils.pm 2012-01-12 13:04:16.000000000 +0900 +@@ -2575,67 +2575,10 @@ + } + + sub create_updmap { +- my ($tlpdb,$dest,$localconf) = @_; +- my @tlpdblines = $tlpdb->updmap_cfg_lines( +- get_disabled_local_configs($localconf, '#')); +- # we do not use _create_config_files here because we want to +- # parse the $localconf file for the five options in updmap.cfg +- #_create_config_files($tlpdb, "texmf/web2c/updmap-hdr.cfg", $dest, +- # $localconf, 0, '#', \@tlpdblines); +- my $headfile = "texmf/web2c/updmap-hdr.cfg"; +- my $root = $tlpdb->root; +- my @lines; +- my @localconflines; +- my %configs; +- if (-r "$localconf") { +- # +- # this should be done more intelligently, but for now only add those +- # lines without any duplication check ... +- open FOO, "<$localconf" +- or die "strange, -r ok but cannot open $localconf: $!"; +- my @bla = <FOO>; +- close(FOO); +- for my $l (@bla) { +- my ($k, $v, @rest) = split(' ', $l); +- if (check_updmap_config_value($k, $v, $localconf)) { +- $configs{$k} = $v; +- } else { +- push @localconflines, $l; +- } +- } +- } +- # +- # read the -hdr file and replace the options if given in the local +- # config file +- open(INFILE,"<$root/$headfile") or die("Cannot open $root/$headfile"); +- for my $l (<INFILE>) { +- my ($k, $v, @rest) = split(' ', $l); +- if (check_updmap_config_value($k, $v, "$root/$headfile")) { +- if (defined($configs{$k})) { +- push @lines, "$k $configs{$k}\n"; +- } else { +- push @lines, $l; +- } +- } else { +- push @lines, $l; +- } +- } +- close (INFILE); +- +- # add the lines from the tlpdb +- push @lines, @tlpdblines; +- +- # add additional local config lines +- push @lines, @localconflines; +- +- if ($#lines >= 0) { +- open(OUTFILE,">$dest") +- or die("Cannot open $dest for writing: $!"); +- +- printf OUTFILE "# Generated by %s on %s\n", "$0", scalar localtime; +- print OUTFILE @lines; +- close(OUTFILE) || warn "close(>$dest) failed: $!"; +- } ++ my ($tlpdb,$dest) = @_; ++ my @tlpdblines = $tlpdb->updmap_cfg_lines(); ++ _create_config_files($tlpdb, "texmf/web2c/updmap-hdr.cfg", $dest, ++ undef, 0, '#', \@tlpdblines); + } + + sub check_updmap_config_value { +@@ -2703,7 +2646,7 @@ + my @lines = <INFILE>; + push @lines, @$tlpdblinesref; + close (INFILE); +- if (-r "$localconf") { ++ if (defined($localconf) && -r $localconf) { + # + # this should be done more intelligently, but for now only add those + # lines without any duplication check ... +Index: Master/install-tl +=================================================================== +--- Master.orig/install-tl 2011-10-07 07:50:55.000000000 +0900 ++++ Master/install-tl 2012-01-12 13:27:39.000000000 +0900 +@@ -861,11 +861,10 @@ + "$TEXMFSYSVAR/web2c/fmtutil.cnf", + "$TEXMFLOCAL/web2c/fmtutil-local.cnf"); + +- mkdirhier "$vars{'TEXMFSYSCONFIG'}/web2c"; +- info("writing updmap.cfg to $TEXMFSYSCONFIG/web2c/updmap.cfg\n"); ++ mkdirhier "$TEXDIR/texmf-dist/web2c"; ++ info("writing updmap.cfg to $TEXDIR/texmf-dist/web2c/updmap.cfg\n"); + TeXLive::TLUtils::create_updmap ($usedtlpdb, +- "$TEXMFSYSCONFIG/web2c/updmap.cfg", +- "$TEXMFLOCAL/web2c/updmap-local.cfg"); ++ "$TEXDIR/texmf-dist/web2c/updmap.cfg"); + + info("writing language.dat to $TEXMFSYSVAR/tex/generic/config/language.dat\n"); + TeXLive::TLUtils::create_language_dat($usedtlpdb, |