From f6b5ab0af6b940fc3264506cd6b91e2746c9911e Mon Sep 17 00:00:00 2001 From: Manuel Pégourié-Gonnard Date: Mon, 31 May 2010 17:37:39 +0000 Subject: Remove addLuaMap support and usage, not needed any more. (Undo commits 18217, 18214 and 18212.) git-svn-id: svn://tug.org/texlive/trunk@18651 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf/scripts/texlive/tlmgr.pl | 17 ----------------- Master/tlpkg/TeXLive/TLPSRC.pm | 5 ----- Master/tlpkg/TeXLive/TLUtils.pm | 2 -- Master/tlpkg/tlpsrc/Asana-Math.tlpsrc | 1 - Master/tlpkg/tlpsrc/antt.tlpsrc | 1 - Master/tlpkg/tlpsrc/belleek.tlpsrc | 1 - Master/tlpkg/tlpsrc/cyklop.tlpsrc | 1 - Master/tlpkg/tlpsrc/gentium.tlpsrc | 1 - Master/tlpkg/tlpsrc/gfsartemisia.tlpsrc | 1 - Master/tlpkg/tlpsrc/gfsbaskerville.tlpsrc | 1 - Master/tlpkg/tlpsrc/gfsbodoni.tlpsrc | 1 - Master/tlpkg/tlpsrc/gfscomplutum.tlpsrc | 1 - Master/tlpkg/tlpsrc/gfsdidot.tlpsrc | 1 - Master/tlpkg/tlpsrc/gfsneohellenic.tlpsrc | 1 - Master/tlpkg/tlpsrc/gfsporson.tlpsrc | 1 - Master/tlpkg/tlpsrc/gfssolomos.tlpsrc | 1 - Master/tlpkg/tlpsrc/gnu-freefont.tlpsrc | 1 - Master/tlpkg/tlpsrc/inconsolata.tlpsrc | 1 - Master/tlpkg/tlpsrc/itrans.tlpsrc | 1 - Master/tlpkg/tlpsrc/iwona.tlpsrc | 1 - Master/tlpkg/tlpsrc/junicode.tlpsrc | 1 - Master/tlpkg/tlpsrc/kurier.tlpsrc | 1 - Master/tlpkg/tlpsrc/libertine.tlpsrc | 1 - Master/tlpkg/tlpsrc/libris.tlpsrc | 1 - Master/tlpkg/tlpsrc/lm.tlpsrc | 1 - Master/tlpkg/tlpsrc/lmextra.tlpsrc | 1 - Master/tlpkg/tlpsrc/mnsymbol.tlpsrc | 1 - Master/tlpkg/tlpsrc/phaistos.tlpsrc | 1 - Master/tlpkg/tlpsrc/philokalia.tlpsrc | 1 - Master/tlpkg/tlpsrc/semaphor.tlpsrc | 1 - Master/tlpkg/tlpsrc/skaknew.tlpsrc | 1 - Master/tlpkg/tlpsrc/tex-gyre.tlpsrc | 1 - Master/tlpkg/tlpsrc/umtypewriter.tlpsrc | 1 - Master/tlpkg/tlpsrc/venturisadf.tlpsrc | 1 - 34 files changed, 55 deletions(-) (limited to 'Master') diff --git a/Master/texmf/scripts/texlive/tlmgr.pl b/Master/texmf/scripts/texlive/tlmgr.pl index fe8401feae2..0055cd2ecdf 100755 --- a/Master/texmf/scripts/texlive/tlmgr.pl +++ b/Master/texmf/scripts/texlive/tlmgr.pl @@ -552,21 +552,6 @@ sub handle_execute_actions $::files_changed = 0; } - # - # addLuaMap handling - # if defined simply run the magic script - { - if (defined($::execute_actions{'enable'}{'luamaps'}{'run'}) - || defined($::execute_actions{'disable'}{'luamaps'}{'run'})) { - # check for the existence, the PATH should be set up already - if (TeXLive::TLUtils::which("mkluatexfontdb-sys")) { - $errors += do_cmd_and_check("mkluatexfontdb-sys"); - } else { - log("tlmgr addLuaMap handling: mkluatexfontdb-sys not found, not running it.\n"); - } - } - } - # # maps handling # if enabled and disabled -> do nothing @@ -3749,8 +3734,6 @@ sub check_executes { my $foo = $1; chomp($foo); push @{$langcodes{$foo}}, $pkg; - } elsif ($e =~ m/addLuaMap\s*$/) { - # nothing to check here } else { warn "$pkg: unmatched execute: $e\n"; } diff --git a/Master/tlpkg/TeXLive/TLPSRC.pm b/Master/tlpkg/TeXLive/TLPSRC.pm index 327db379b47..a030f7bd53f 100644 --- a/Master/tlpkg/TeXLive/TLPSRC.pm +++ b/Master/tlpkg/TeXLive/TLPSRC.pm @@ -782,11 +782,6 @@ enables the font map file IC<.map> in the C file. enables the font map file IC<.map> for Mixed mode in the C file. -=item C - -triggers a call to mkluatexfontdb-sys (if available) which updates -the font cache for luatex. - =item C file=I [I...]> activates the hyphenation pattern with name I and load the file diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm index 6c63a8da3c8..3658689b808 100644 --- a/Master/tlpkg/TeXLive/TLUtils.pm +++ b/Master/tlpkg/TeXLive/TLUtils.pm @@ -1746,8 +1746,6 @@ sub announce_execute_actions { foreach my $e ($tlp->executes) { if ($e =~ m/^add((Mixed)?Map)\s+([^\s]+)\s*$/) { $::execute_actions{$type}{'maps'}{$3} = "$1"; - } elsif ($e =~ m/^addLuaMap\s*$/) { - $::execute_actions{$type}{'luamaps'}{'run'} = 1; } elsif ($e =~ m/^AddFormat\s+(.*)\s*$/) { my %r = TeXLive::TLUtils::parse_AddFormat_line("$1"); if (defined($r{"error"})) { diff --git a/Master/tlpkg/tlpsrc/Asana-Math.tlpsrc b/Master/tlpkg/tlpsrc/Asana-Math.tlpsrc index d643c0ff45f..e69de29bb2d 100644 --- a/Master/tlpkg/tlpsrc/Asana-Math.tlpsrc +++ b/Master/tlpkg/tlpsrc/Asana-Math.tlpsrc @@ -1 +0,0 @@ -execute addLuaMap diff --git a/Master/tlpkg/tlpsrc/antt.tlpsrc b/Master/tlpkg/tlpsrc/antt.tlpsrc index 119b7e26dd7..88b6cef9f58 100644 --- a/Master/tlpkg/tlpsrc/antt.tlpsrc +++ b/Master/tlpkg/tlpsrc/antt.tlpsrc @@ -1,2 +1 @@ execute addMap antt.map -execute addLuaMap diff --git a/Master/tlpkg/tlpsrc/belleek.tlpsrc b/Master/tlpkg/tlpsrc/belleek.tlpsrc index a1bf249e8f6..80c6743a0c6 100644 --- a/Master/tlpkg/tlpsrc/belleek.tlpsrc +++ b/Master/tlpkg/tlpsrc/belleek.tlpsrc @@ -1,2 +1 @@ execute addMap belleek.map -execute addLuaMap diff --git a/Master/tlpkg/tlpsrc/cyklop.tlpsrc b/Master/tlpkg/tlpsrc/cyklop.tlpsrc index 7929016729b..98f3796c088 100644 --- a/Master/tlpkg/tlpsrc/cyklop.tlpsrc +++ b/Master/tlpkg/tlpsrc/cyklop.tlpsrc @@ -1,2 +1 @@ execute addMap cyklop.map -execute addLuaMap diff --git a/Master/tlpkg/tlpsrc/gentium.tlpsrc b/Master/tlpkg/tlpsrc/gentium.tlpsrc index d643c0ff45f..e69de29bb2d 100644 --- a/Master/tlpkg/tlpsrc/gentium.tlpsrc +++ b/Master/tlpkg/tlpsrc/gentium.tlpsrc @@ -1 +0,0 @@ -execute addLuaMap diff --git a/Master/tlpkg/tlpsrc/gfsartemisia.tlpsrc b/Master/tlpkg/tlpsrc/gfsartemisia.tlpsrc index adaacd2b607..4eaf26d7faa 100644 --- a/Master/tlpkg/tlpsrc/gfsartemisia.tlpsrc +++ b/Master/tlpkg/tlpsrc/gfsartemisia.tlpsrc @@ -1,2 +1 @@ execute addMap gfsartemisia.map -execute addLuaMap diff --git a/Master/tlpkg/tlpsrc/gfsbaskerville.tlpsrc b/Master/tlpkg/tlpsrc/gfsbaskerville.tlpsrc index 4fd9cbdc875..ae0874b3914 100644 --- a/Master/tlpkg/tlpsrc/gfsbaskerville.tlpsrc +++ b/Master/tlpkg/tlpsrc/gfsbaskerville.tlpsrc @@ -1,2 +1 @@ execute addMap gfsbaskerville.map -execute addLuaMap diff --git a/Master/tlpkg/tlpsrc/gfsbodoni.tlpsrc b/Master/tlpkg/tlpsrc/gfsbodoni.tlpsrc index 95dcaa47f6b..675fc6f3318 100644 --- a/Master/tlpkg/tlpsrc/gfsbodoni.tlpsrc +++ b/Master/tlpkg/tlpsrc/gfsbodoni.tlpsrc @@ -1,2 +1 @@ execute addMap gfsbodoni.map -execute addLuaMap diff --git a/Master/tlpkg/tlpsrc/gfscomplutum.tlpsrc b/Master/tlpkg/tlpsrc/gfscomplutum.tlpsrc index 59722ba5d71..c8f268f43ea 100644 --- a/Master/tlpkg/tlpsrc/gfscomplutum.tlpsrc +++ b/Master/tlpkg/tlpsrc/gfscomplutum.tlpsrc @@ -1,2 +1 @@ execute addMap gfscomplutum.map -execute addLuaMap diff --git a/Master/tlpkg/tlpsrc/gfsdidot.tlpsrc b/Master/tlpkg/tlpsrc/gfsdidot.tlpsrc index ec0e8389549..a456140dcb3 100644 --- a/Master/tlpkg/tlpsrc/gfsdidot.tlpsrc +++ b/Master/tlpkg/tlpsrc/gfsdidot.tlpsrc @@ -1,2 +1 @@ execute addMap gfsdidot.map -execute addLuaMap diff --git a/Master/tlpkg/tlpsrc/gfsneohellenic.tlpsrc b/Master/tlpkg/tlpsrc/gfsneohellenic.tlpsrc index 085575695be..d7732e5eb57 100644 --- a/Master/tlpkg/tlpsrc/gfsneohellenic.tlpsrc +++ b/Master/tlpkg/tlpsrc/gfsneohellenic.tlpsrc @@ -1,2 +1 @@ execute addMap gfsneohellenic.map -execute addLuaMap diff --git a/Master/tlpkg/tlpsrc/gfsporson.tlpsrc b/Master/tlpkg/tlpsrc/gfsporson.tlpsrc index 20945fea48e..8dde8c896fd 100644 --- a/Master/tlpkg/tlpsrc/gfsporson.tlpsrc +++ b/Master/tlpkg/tlpsrc/gfsporson.tlpsrc @@ -1,2 +1 @@ execute addMap gfsporson.map -execute addLuaMap diff --git a/Master/tlpkg/tlpsrc/gfssolomos.tlpsrc b/Master/tlpkg/tlpsrc/gfssolomos.tlpsrc index 4a5181b9d1a..f5f9fb2eaed 100644 --- a/Master/tlpkg/tlpsrc/gfssolomos.tlpsrc +++ b/Master/tlpkg/tlpsrc/gfssolomos.tlpsrc @@ -1,2 +1 @@ execute addMap gfssolomos.map -execute addLuaMap diff --git a/Master/tlpkg/tlpsrc/gnu-freefont.tlpsrc b/Master/tlpkg/tlpsrc/gnu-freefont.tlpsrc index d643c0ff45f..e69de29bb2d 100644 --- a/Master/tlpkg/tlpsrc/gnu-freefont.tlpsrc +++ b/Master/tlpkg/tlpsrc/gnu-freefont.tlpsrc @@ -1 +0,0 @@ -execute addLuaMap diff --git a/Master/tlpkg/tlpsrc/inconsolata.tlpsrc b/Master/tlpkg/tlpsrc/inconsolata.tlpsrc index 81debd22087..c5d87704423 100644 --- a/Master/tlpkg/tlpsrc/inconsolata.tlpsrc +++ b/Master/tlpkg/tlpsrc/inconsolata.tlpsrc @@ -1,2 +1 @@ execute addMap fi4.map -execute addLuaMap diff --git a/Master/tlpkg/tlpsrc/itrans.tlpsrc b/Master/tlpkg/tlpsrc/itrans.tlpsrc index fe39256c00b..020227bbeea 100644 --- a/Master/tlpkg/tlpsrc/itrans.tlpsrc +++ b/Master/tlpkg/tlpsrc/itrans.tlpsrc @@ -1,2 +1 @@ catalogue itrans-processor -execute addLuaMap diff --git a/Master/tlpkg/tlpsrc/iwona.tlpsrc b/Master/tlpkg/tlpsrc/iwona.tlpsrc index 18ebcb4d1a7..2e6c18db57a 100644 --- a/Master/tlpkg/tlpsrc/iwona.tlpsrc +++ b/Master/tlpkg/tlpsrc/iwona.tlpsrc @@ -1,2 +1 @@ execute addMap iwona.map -execute addLuaMap diff --git a/Master/tlpkg/tlpsrc/junicode.tlpsrc b/Master/tlpkg/tlpsrc/junicode.tlpsrc index d643c0ff45f..e69de29bb2d 100644 --- a/Master/tlpkg/tlpsrc/junicode.tlpsrc +++ b/Master/tlpkg/tlpsrc/junicode.tlpsrc @@ -1 +0,0 @@ -execute addLuaMap diff --git a/Master/tlpkg/tlpsrc/kurier.tlpsrc b/Master/tlpkg/tlpsrc/kurier.tlpsrc index 41413b8d2d0..d7efc59208c 100644 --- a/Master/tlpkg/tlpsrc/kurier.tlpsrc +++ b/Master/tlpkg/tlpsrc/kurier.tlpsrc @@ -1,2 +1 @@ execute addMap kurier.map -execute addLuaMap diff --git a/Master/tlpkg/tlpsrc/libertine.tlpsrc b/Master/tlpkg/tlpsrc/libertine.tlpsrc index 878c3bf0e1f..e9f00bf9106 100644 --- a/Master/tlpkg/tlpsrc/libertine.tlpsrc +++ b/Master/tlpkg/tlpsrc/libertine.tlpsrc @@ -1,2 +1 @@ execute addMap libertine.map -execute addLuaMap diff --git a/Master/tlpkg/tlpsrc/libris.tlpsrc b/Master/tlpkg/tlpsrc/libris.tlpsrc index dcc1d0ff130..38a292f8d86 100644 --- a/Master/tlpkg/tlpsrc/libris.tlpsrc +++ b/Master/tlpkg/tlpsrc/libris.tlpsrc @@ -1,2 +1 @@ execute addMap yly.map -execute addLuaMap diff --git a/Master/tlpkg/tlpsrc/lm.tlpsrc b/Master/tlpkg/tlpsrc/lm.tlpsrc index 8c30d69f7c1..903b2337492 100644 --- a/Master/tlpkg/tlpsrc/lm.tlpsrc +++ b/Master/tlpkg/tlpsrc/lm.tlpsrc @@ -1,2 +1 @@ execute addMap lm.map -execute addLuaMap diff --git a/Master/tlpkg/tlpsrc/lmextra.tlpsrc b/Master/tlpkg/tlpsrc/lmextra.tlpsrc index d643c0ff45f..e69de29bb2d 100644 --- a/Master/tlpkg/tlpsrc/lmextra.tlpsrc +++ b/Master/tlpkg/tlpsrc/lmextra.tlpsrc @@ -1 +0,0 @@ -execute addLuaMap diff --git a/Master/tlpkg/tlpsrc/mnsymbol.tlpsrc b/Master/tlpkg/tlpsrc/mnsymbol.tlpsrc index 545a523bbe0..f73f16f05d6 100644 --- a/Master/tlpkg/tlpsrc/mnsymbol.tlpsrc +++ b/Master/tlpkg/tlpsrc/mnsymbol.tlpsrc @@ -1,2 +1 @@ execute addMap MnSymbol.map -execute addLuaMap diff --git a/Master/tlpkg/tlpsrc/phaistos.tlpsrc b/Master/tlpkg/tlpsrc/phaistos.tlpsrc index 1fceb6c6d65..d438af4b444 100644 --- a/Master/tlpkg/tlpsrc/phaistos.tlpsrc +++ b/Master/tlpkg/tlpsrc/phaistos.tlpsrc @@ -1,2 +1 @@ execute addMap phaistos.map -execute addLuaMap diff --git a/Master/tlpkg/tlpsrc/philokalia.tlpsrc b/Master/tlpkg/tlpsrc/philokalia.tlpsrc index d643c0ff45f..e69de29bb2d 100644 --- a/Master/tlpkg/tlpsrc/philokalia.tlpsrc +++ b/Master/tlpkg/tlpsrc/philokalia.tlpsrc @@ -1 +0,0 @@ -execute addLuaMap diff --git a/Master/tlpkg/tlpsrc/semaphor.tlpsrc b/Master/tlpkg/tlpsrc/semaphor.tlpsrc index 4ca3f0e8479..eee72c861f9 100644 --- a/Master/tlpkg/tlpsrc/semaphor.tlpsrc +++ b/Master/tlpkg/tlpsrc/semaphor.tlpsrc @@ -1,2 +1 @@ execute addMixedMap semaf.map -execute addLuaMap diff --git a/Master/tlpkg/tlpsrc/skaknew.tlpsrc b/Master/tlpkg/tlpsrc/skaknew.tlpsrc index 136f99444c0..e5da190e98a 100644 --- a/Master/tlpkg/tlpsrc/skaknew.tlpsrc +++ b/Master/tlpkg/tlpsrc/skaknew.tlpsrc @@ -1,3 +1,2 @@ execute addMap SkakNew.map runpattern +!f texmf-dist/fonts/map/vtex/skaknew/SkakNew.ali -execute addLuaMap diff --git a/Master/tlpkg/tlpsrc/tex-gyre.tlpsrc b/Master/tlpkg/tlpsrc/tex-gyre.tlpsrc index 3ef1ad1c67d..e11caead019 100644 --- a/Master/tlpkg/tlpsrc/tex-gyre.tlpsrc +++ b/Master/tlpkg/tlpsrc/tex-gyre.tlpsrc @@ -6,4 +6,3 @@ execute addMap qhv.map execute addMap qpl.map execute addMap qtm.map execute addMap qzc.map -execute addLuaMap diff --git a/Master/tlpkg/tlpsrc/umtypewriter.tlpsrc b/Master/tlpkg/tlpsrc/umtypewriter.tlpsrc index d643c0ff45f..e69de29bb2d 100644 --- a/Master/tlpkg/tlpsrc/umtypewriter.tlpsrc +++ b/Master/tlpkg/tlpsrc/umtypewriter.tlpsrc @@ -1 +0,0 @@ -execute addLuaMap diff --git a/Master/tlpkg/tlpsrc/venturisadf.tlpsrc b/Master/tlpkg/tlpsrc/venturisadf.tlpsrc index 74d8de59879..8c0caf702d4 100644 --- a/Master/tlpkg/tlpsrc/venturisadf.tlpsrc +++ b/Master/tlpkg/tlpsrc/venturisadf.tlpsrc @@ -7,4 +7,3 @@ execute addMap yv2.map execute addMap yv3.map execute addMap yvo.map execute addMap yvt.map -execute addLuaMap -- cgit v1.2.3