From 457d3a2e5c6f29587a9272de6bb3a4853d1a0d3d Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 31 Mar 2015 18:25:49 +0000 Subject: prepare for (but do not install) new latex2e release git-svn-id: svn://tug.org/texlive/trunk@36689 c570f23f-e606-0410-a88d-b1316a301751 --- Master/tlpkg/bin/tlpkginfo | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'Master/tlpkg/bin/tlpkginfo') diff --git a/Master/tlpkg/bin/tlpkginfo b/Master/tlpkg/bin/tlpkginfo index 2bde3b9d208..b2e93fbcf70 100755 --- a/Master/tlpkg/bin/tlpkginfo +++ b/Master/tlpkg/bin/tlpkginfo @@ -15,7 +15,7 @@ sub main { || die "$0: TEX_CATALOGUE ($CATALOGUE) must point to entries/ subdir" . " of a TeX Catalogue checkout.\n"; - # erroneous or problematic tds files (when new, tell RobinF and author) + # erroneous or problematic tds files (when new, tell CTAN and author) $erroneous_tds = join ("|", qw(countriesofeurope dad ebproof engpron gost hacm he-she hobby imtekda mathdesign spanish sttools), @@ -29,7 +29,7 @@ sub main { #$amsfonts_tds_pkgs = "amsfonts"; # (amstex and amsfonts handled from the original.) $latex_tds_pkgs = "latex-tds"; - $latex_tds_pkgs .= "|cyrillic|graphics|latex|psnfss|tools"; # latex + $latex_tds_pkgs .= "|psnfss"; # cyrillic|graphics|latex|tools on their own $latex_tds_pkgs .= "|knuth"; # other $latex_tds_dir = "$CTAN/macros/latex/contrib/latex-tds"; @@ -322,6 +322,9 @@ sub prepare { } elsif ($pkg eq "hfoldsty") { $tds_path = glob ("$CTAN/fonts/hfoldsty/hfoldsty-v*.zip"); + } elsif ($pkg eq "latex") { + $tds_path = "$CTAN/install/macros/latex/latex-base.tds.zip"; + } elsif ($pkg eq "pgf") { $tds_path = "$CTAN/install/graphics/pgf/base/pgf.tds.zip"; @@ -331,14 +334,7 @@ sub prepare { # ...and except for files in latex-tds... } elsif ($pkg =~ /^($latex_tds_pkgs)$/) { - if ($pkg =~ /^($amslatex_tds_pkgs)$/) { - $tds_path = "$latex_tds_dir/amslatex.tds.zip" ; - } else { - $tds_path = "$latex_tds_dir/$pkg.tds.zip"; - } - # and more latex exceptions to the latex exceptions: - $tds_path = "$latex_tds_dir/source.tds.zip" if $pkg eq "latex-tds"; - $tds_path = "$latex_tds_dir/base.tds.zip" if $pkg eq "latex"; + $tds_path = "$latex_tds_dir/$pkg.tds.zip"; } return $ctan_loc unless (-s $tds_path); -- cgit v1.2.3