latex2e (1apr16), now including amsmath

git-svn-id: svn://tug.org/texlive/trunk@40218 c570f23f-e606-0410-a88d-b1316a301751

6 files changed, 12 insertions, 7 deletions

diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index 6d386c2079b..b56db9aedfa 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -196,7 +196,8 @@ my @TLP_working = qw(
     dickimaw dictsym digiconfigs din1505
     dinat dinbrief dingbat directory dirtree dirtytalk disser dithesis
     dk-bib dlfltxb
-    dnaseq dnp doc-pictex docbytex doclicense docmfp docmute doctools documentation
+    dnaseq dnp doc-pictex docbytex doclicense
+    docmfp docmute doctools documentation
     doi doipubmed
     dosepsbin dot2texi dotarrow dotseqn dottex
     doublestroke dowith download dox dozenal dpfloat dprogress drac draftcopy
diff --git a/Master/tlpkg/bin/tlpkginfo b/Master/tlpkg/bin/tlpkginfo
index 2dca9760444..ca7037b536f 100755
--- a/Master/tlpkg/bin/tlpkginfo
+++ b/Master/tlpkg/bin/tlpkginfo
@@ -70,7 +70,7 @@ sub ctaninfo {
   
   # erroneous or problematic tds files (when new, tell CTAN and author)
   $erroneous_tds = join ("|",
-    qw(alertmessage babel countriesofeurope dad ebproof engpron gost
+    qw(alertmessage countriesofeurope dad ebproof engpron gost
        hacm imtekda mathdesign tufte-latex xassoccnt),
     );
   
@@ -79,8 +79,8 @@ sub ctaninfo {
 
   # special packages from latex-tds project; used by prepare()
   $latex_tds_pkgs  = "latex-tds";
-  $latex_tds_pkgs .= "|psnfss"; # cyrillic|graphics|latex|tools on their own
-  $latex_tds_pkgs .= "|knuth";             		      # other
+  $latex_tds_pkgs .= "|psnfss"; # amsmath|cyrillic|graphics|latex|tools on own
+  $latex_tds_pkgs .= "|knuth";  # other
   $latex_tds_dir = "$CTAN/macros/latex/contrib/latex-tds";
   
   # the CJK material is split into several packages.
@@ -384,9 +384,8 @@ sub prepare {
   } elsif ($pkg eq "latex") {
     $tds_path = "$CTAN/install/macros/latex/latex-base.tds.zip";
 
-# except the babel.tds.zip is useless at present
-#  } elsif ($pkg eq "babel") {
-#    $tds_path = "$CTAN/install/macros/latex/required/babel.tds.zip";
+  } elsif ($pkg =~ /^(amsmath|cyrillic|graphics|tools)$/) {
+    $tds_path = "$CTAN/install/macros/latex/required/latex-$pkg.tds.zip";
 
   } elsif ($pkg eq "pgf") {
     $tds_path = "$CTAN/install/graphics/pgf/base/pgf.tds.zip";
diff --git a/Master/tlpkg/tlpsrc/amsmath.tlpsrc b/Master/tlpkg/tlpsrc/amsmath.tlpsrc
index e69de29bb2d..50f74012eb4 100644
--- a/Master/tlpkg/tlpsrc/amsmath.tlpsrc
+++ b/Master/tlpkg/tlpsrc/amsmath.tlpsrc
@@ -0,0 +1 @@
+catalogue latex-amsmath
diff --git a/Master/tlpkg/tlpsrc/cyrillic.tlpsrc b/Master/tlpkg/tlpsrc/cyrillic.tlpsrc
index 3fe15072463..5e291a5cd5b 100644
--- a/Master/tlpkg/tlpsrc/cyrillic.tlpsrc
+++ b/Master/tlpkg/tlpsrc/cyrillic.tlpsrc
@@ -1,3 +1,5 @@
+catalogue latex-cyrillic
+#
 runpattern +!d texmf-dist/fonts/afm/public/amsfonts/cyrillic
 runpattern +!d texmf-dist/fonts/source/public/amsfonts/cyrillic
 runpattern +!d texmf-dist/fonts/tfm/public/amsfonts/cyrillic
diff --git a/Master/tlpkg/tlpsrc/graphics.tlpsrc b/Master/tlpkg/tlpsrc/graphics.tlpsrc
index 989c7b5a405..29410423e5b 100644
--- a/Master/tlpkg/tlpsrc/graphics.tlpsrc
+++ b/Master/tlpkg/tlpsrc/graphics.tlpsrc
@@ -1,3 +1,4 @@
+catalogue latex-graphics
 runpattern +!d texmf-dist/scripts/context/ruby/graphics
 #
 docpattern +!d texmf-dist/doc/latex/tufte-latex/graphics
diff --git a/Master/tlpkg/tlpsrc/tools.tlpsrc b/Master/tlpkg/tlpsrc/tools.tlpsrc
index 65ad91b9cdf..df2c7db00d2 100644
--- a/Master/tlpkg/tlpsrc/tools.tlpsrc
+++ b/Master/tlpkg/tlpsrc/tools.tlpsrc
@@ -1,3 +1,4 @@
+catalogue latex-tools
 # lots of other packages have subdirectories named "tools".
 # instead of laboriously excluding them all explicitly, override the
 # autopatterns and look only for our own directories.