diff options
author | Karl Berry <karl@freefriends.org> | 2006-11-08 01:23:08 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2006-11-08 01:23:08 +0000 |
commit | 3e3506eba574499faeaac29e50900d2634e5ae57 (patch) | |
tree | 2a899760be6dd70784cee492d6e4231e8e33db9a /Build | |
parent | 5797ee8b5da5c75ddb5b90f77b753af2b12c4ab8 (diff) |
remove amsfonts exception, we'll just use ams.tpm.
add context/pgf exception.
git-svn-id: svn://tug.org/texlive/trunk@2401 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r-- | Build/tools/Tpm.pm | 44 |
1 files changed, 20 insertions, 24 deletions
diff --git a/Build/tools/Tpm.pm b/Build/tools/Tpm.pm index 5e306bfdaff..c9d3c88f680 100644 --- a/Build/tools/Tpm.pm +++ b/Build/tools/Tpm.pm @@ -1293,9 +1293,10 @@ sub buildPatternsPackage { push @run_patterns, ( $texmf . "/$e/${name}/base/*", $texmf . "/$e/${name}/config/*", ); - push @run_patterns, $texmf . "/$e/${name}/*" if ($_ ne 'tex' && $_ ne 'omega'); + push @run_patterns, $texmf . "/$e/${name}/*" + unless ($_ eq 'tex' || $_ eq 'omega') } @engines; - + map { push @run_patterns, $texmf . "/tex/$_/${name}/*"; } @formats; @@ -1327,32 +1328,20 @@ sub buildPatternsPackage { map { my $e = $_; map { + warn " format $_\n"; push @run_patterns, $texmf . "/$e/$_/${name}/*" - unless $name eq "misc" && $_ eq "fontinst"; - # keep fontinst/misc in fontinst. + # keep fontinst/misc in fontinst: + unless ($name eq "misc" && $_ eq "fontinst"); } @formats; } @engines; - # Exception for amsfonts -- te/staw decided in June 2005 to use ams - # for the directory name within fonts, but amsfonts elsehwere. - if (${name} eq 'amsfonts') { - push @run_patterns, - ( $texmf . "/dvips/ams/config.*", - $texmf . "/fonts/map/*/ams/*", - $texmf . "/fonts/*/bluesky/ams/*", - $texmf . "/fonts/*/public/ams/*", - ); - push @source_patterns, - ( $texmf . "/source/latex/amsfonts/*" ); - } - # Exception for lh: also have source/latex/lh. push @source_patterns, ( $texmf . "/source/latex/$name/*" ); # lh - # Exception for mathdesign -- doc is in doc/latex instead of doc/fonts. + # Exception for mathdesign: doc is in doc/latex instead of doc/fonts. push @doc_patterns, ( $texmf . "/doc/latex/$name/*" ); # mathdesign - # Exception for vntex -- doc is in doc/generic instead of doc/fonts. + # Exception for vntex: doc is in doc/generic instead of doc/fonts. push @doc_patterns, ( $texmf . "/doc/generic/$name/*" ); # vntex } else { @@ -1363,13 +1352,19 @@ sub buildPatternsPackage { push @doc_patterns, $texmf . "/doc/$e/${name}/*"; push @source_patterns, $texmf . "/source/$e/${name}/*"; map { - push @run_patterns, $texmf . "/$e/$_/${name}/*"; + push @run_patterns, $texmf . "/$e/$_/${name}/*" + # keep tex/context/pgf in context. + unless $name eq "pgf" && $_ eq "context" && $e eq "tex"; } @formats; - + #warn "run_patterns after engine $e = @run_patterns\n"; } @engines; - + map { - push @run_patterns, $texmf . "/tex/$_/${name}/*"; + push @run_patterns, $texmf . "/tex/$_/${name}/*" + # keep tex/context/pgf in context. + unless $name eq "pgf" && $_ eq "context"; + #warn "run_patterns after format $_ = @run_patterns\n"; + push @doc_patterns, $texmf . "/doc/$_/${name}/*"; push @source_patterns, $texmf . "/source/$_/${name}/*"; } @formats; @@ -1377,7 +1372,7 @@ sub buildPatternsPackage { push @doc_patterns, $texmf . "/doc/${name}/*"; push @source_patterns, $texmf . "/source/${name}/*"; - # one more special case, fontname has its own odd map files. + # Exception for fontname: it has its own odd map files. if ($name eq 'fontname') { push @run_patterns, $texmf . "/fonts/map/${name}/*"; } @@ -1422,6 +1417,7 @@ sub buildPatternsPackage { push @source_patterns, $texmf . "/source/fonts/${name}/*"; push @run_patterns, $texmf. "/tpm/$name.tpm"; + #warn "final run_patterns for $name: @run_patterns\n"; $self->setList("RunPatterns", @run_patterns); $self->setList("DocPatterns", @doc_patterns); $self->setList("SourcePatterns", @source_patterns); |