From 51394b9d9d598fd9903dd1d4c823f311000ad4cb Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Thu, 12 Jan 2012 05:26:31 +0000 Subject: rename quilt patch to dev.mupdmap-integration, it does NOT contain the actual mupdmap patch git-svn-id: svn://tug.org/texlive/trunk@25080 c570f23f-e606-0410-a88d-b1316a301751 --- Master/tlpkg/dev/quilt-patches/dev.multi-updmap | 4209 -------------------- .../dev/quilt-patches/dev.mupdmap-integration | 976 +++++ Master/tlpkg/dev/quilt-patches/series | 2 +- 3 files changed, 977 insertions(+), 4210 deletions(-) delete mode 100644 Master/tlpkg/dev/quilt-patches/dev.multi-updmap create mode 100644 Master/tlpkg/dev/quilt-patches/dev.mupdmap-integration (limited to 'Master/tlpkg/dev') diff --git a/Master/tlpkg/dev/quilt-patches/dev.multi-updmap b/Master/tlpkg/dev/quilt-patches/dev.multi-updmap deleted file mode 100644 index 551bb33f852..00000000000 --- a/Master/tlpkg/dev/quilt-patches/dev.multi-updmap +++ /dev/null @@ -1,4209 +0,0 @@ ---- - install-tl | 7 - texmf-dist/web2c/updmap.cfg | 230 +++ - texmf/scripts/tetex/updmap.pl | 3017 ++++++++++++++++++++++++----------------- - 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 action for details. - --For the C option, see the C section in --L]... I">. -- - The last three options control behaviour on Windows installations. If - C is set, then some packages will install items in - a sub-folder of the Start menu for C, documentation, etc. If -@@ -6558,31 +6525,20 @@ - =back - - The C 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 and the language files, this is normal, and both the TeX --Live installer and C routinely call C for them. -+The TeX Live installer and C routinely call C for -+all of these files. - --For C, however, C does I use C by default, --because the result would be to disable all maps which have been manually --installed via S>, e.g., for proprietary or local --fonts, which has been the standard method for adding fonts to TeX --installations for years. Rather, the C 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, there is nothing wrong with using C. It can be helpful in moving from release to release, --especially. We use it ourselves to generate the C file in --the live source repository. If you want to commit yourself to using --C, you can set the C option and --C will run C for you on update. -- --In any case, C updates and maintains the final C in --C (while the other generated files are in --C), because that is the location that C (via --C) 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 updates and maintains C in -+C (while the other generated files are in -+C), because that is the location where the fonts -+are installed. - - In more detail: C remakes any of the five config files - C, C, C, C, -@@ -6590,26 +6546,27 @@ - locally-maintained files. - - The locally-maintained files are C, --C, C, C, --or C, searched for in C in the respective --directories. If they are present, the final file is made by starting -+C, C, or C, -+searched for in C in the respective directories. -+The formerly supported C is not supported anymore, -+since C 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 and C use C<#>, C and -+where C uses C<#>, C and - C use C<%>, and C use C<-->. In any --case, the I is the respective format name, map file name (include --the C<.map> extension), or hyphenation pattern identifier. Examples: -+case, the I 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 recreates both the C, the --C and the Cfiles, while the forms with -+C and the C 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, --C, C, C, and --C. The defaults for these as set in --C 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 file and they will be respected by C. For example: -- -- dvipsDownloadBase35 true -- - Options: - - =over 4 -@@ -6643,7 +6589,7 @@ - =item B<--dest> I - - specifies the output file (defaults to the respective location in --C for C and C, and C -+C for C and C, and C - for C). If C<--dest> is given to C, it serves - as a basename onto which C<.dat> will be appended for the name of the - C 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 does I use --C for font map files. Therefore, if you want to make --use of C, you must run C --and C yourself after making any local changes. If you --make yourself responsible for rigorously using C), set --C