latex-dev (15sep19)

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

8 files changed, 36 insertions, 23 deletions

diff --git a/Master/tlpkg/bin/c2l3 b/Master/tlpkg/bin/c2lx
index 44388f30f2d..5e7bed389e1 100755
--- a/Master/tlpkg/bin/c2l3
+++ b/Master/tlpkg/bin/c2lx
@@ -1,32 +1,42 @@
-#!/bin/sh
+#!/bin/sh 
 # $Id$
 # Originally written by Karl Berry. Public domain.
 # 
 # Front-front-end script for c2l to update LaTeX3,
-# or (with first arg "e") LaTeX2e, both of which comprise several
+# or (with first arg "e") LaTeX2e,
+# or (with first arg "dev") latex-dev,
+# each of which is comprised of several
 # packages that should be updated together. Look at the end of the output
 # for the summarized results for each package, e.g., to see if any files
 # ended up getting misplaced.
 # 
-# Argument "p" run place.
+# Additional argument "p" runs place also (same as c2l --place).
 
 dirsfile=/tmp/`id -u`.tlplace.dirs
 cp /dev/null $dirsfile.tmp
 cp /dev/null /tmp/first
 
-if test "x$1" = e; then
+if test "x$1" = xe; then
   shift
   label=l2e
   pkgs="amsmath cyrillic graphics tools latex"
   # latex-tds still has knuth psnfss; babel is separate
-else
+elif test "x$1" = xdev; then
+  shift
+  label=ldev
+  pkgs="latex-amsmath-dev latex-graphics-dev latex-tools-dev latex-base-dev"
+  # latex-tds still has knuth psnfss; babel is separate
+elif test "x$1" = x3; then
   label=l3
   pkgs="l3kernel l3packages l3experimental l3build l3backend"
+else
+  echo "$0: unknown latex type: $1 (one of: e dev 3)" >&2
+  exit 1
 fi
 
 for p in $pkgs; do
-  echo "${label}pkg $p" >&2 # progress of a sort
-  printf "\f ${label}pkg $p\n"
+  echo "${label} pkg $p" >&2 # progress report of a sort
+  printf "\f ${label} pkg $p\n"
   c2l "$@" $p | tee /tmp/c2l.out
   sed -n "1,/`printf \f`/p" /tmp/c2l.out >>/tmp/first
   echo >>/tmp/first
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index e26e7f4d486..e8d7254309c 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -388,12 +388,13 @@ my @TLP_working = qw(
     labbook labels labels4easylist labelschanged
     labyrinth ladder lambda-lists langcode langsci
     lapdf lastpackage lastpage
-    latex latex-base-dev latex-bib-ex latex-bib2-ex latex-brochure
+    latex latex-amsmath-dev latex-base-dev
+    latex-bib-ex latex-bib2-ex latex-brochure
     latex-course latex-doc-ptr latex-fonts
     latex-git-log latex-graphics-companion latex-graphics-dev
     latex-make latex-mr latex-notes-zh-cn
     latex-papersize latex-referenz latex-refsheet latex-tabellen
-    latex-tds latex-uni8
+    latex-tds latex-tools-dev latex-uni8
     latex-veryshortguide latex-via-exemplos latex-web-companion
     latex2e-help-texinfo latex2e-help-texinfo-fr
     latex2e-help-texinfo-spanish latex2man latex2nemeth
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 5c8d4edb0e2..ada581fdc32 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -652,7 +652,7 @@ chomp (my $ctan_root = `tlpkginfo --ctan-root`);
  'lamstex-index',       "die 'skipping, old'",
  'lastbib',             "die 'skipping, nonfree'",
  'latex-base',  	"die 'skipping, use latex'",
- 'latex-dev',		"die 'skipping, use latex-base-dev'",
+ 'latex-dev',		"die 'skipping, use latex-base-dev (and more)'",
  'latex-doc',	  	"die 'skipping, use latex'",
  'latex-doc-dev',	"die 'skipping, use latex-base-dev'",
  'latex-essential',     "die 'skipping, nonfree'",
@@ -6347,16 +6347,6 @@ sub POSTlatex2html {
 }
 
 sub POSTlatex_base_dev {
-  my $tds_basename = "latex-doc-dev.tds.zip";
-  print "POST$package - also include $tds_basename\n";
-  # latex-base-dev and latex-doc-dev both unpack (different files) into
-  # the same directories. We don't want to explicitly list the
-  # individual files that belong to each package, so just always do
-  # latex-doc-dev if we're doing latex-base-dev. Since a .tds.zip is
-  # provided, this is easy.
-  my $docdev_tds_zip = "$ctan_root/install/macros/latex-dev/$tds_basename";
-  &xsystem ("unzip -q -d $DEST $docdev_tds_zip");
-  #
   &SYSTEM ("rm -rf $DEST/makeindex"); # won't be uploaded later
 }
 
diff --git a/Master/tlpkg/tlpsrc/amsmath.tlpsrc b/Master/tlpkg/tlpsrc/amsmath.tlpsrc
index 50f74012eb4..9d2ecc7b336 100644
--- a/Master/tlpkg/tlpsrc/amsmath.tlpsrc
+++ b/Master/tlpkg/tlpsrc/amsmath.tlpsrc
@@ -1 +1,5 @@
 catalogue latex-amsmath
+
+runpattern +!d texmf-dist/tex/latex-dev/amsmath
+srcpattern +!d texmf-dist/source/latex-dev/amsmath
+docpattern +!d texmf-dist/doc/latex-dev/amsmath
diff --git a/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc b/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc
index a3b001481d8..21937b813ca 100644
--- a/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc
@@ -626,7 +626,12 @@ depend labels4easylist
 depend labelschanged
 depend lastpackage
 depend lastpage
+depend latex-amsmath-dev
+depend latex-base-dev
+depend latex-bin-dev
+depend latex-graphics-dev
 depend latex-tds
+depend latex-tools-dev
 depend latex-uni8
 depend latexcolors
 depend latexdemo
diff --git a/Master/tlpkg/tlpsrc/collection-latexrecommended.tlpsrc b/Master/tlpkg/tlpsrc/collection-latexrecommended.tlpsrc
index 169b888caf8..9f8313737b8 100644
--- a/Master/tlpkg/tlpsrc/collection-latexrecommended.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-latexrecommended.tlpsrc
@@ -32,9 +32,6 @@ depend fp
 depend index
 depend jknapltx
 depend koma-script
-depend latex-base-dev
-depend latex-bin-dev
-depend latex-graphics-dev
 depend latexbug
 depend l3backend
 depend l3experimental
diff --git a/Master/tlpkg/tlpsrc/latex-amsmath-dev.tlpsrc b/Master/tlpkg/tlpsrc/latex-amsmath-dev.tlpsrc
new file mode 100644
index 00000000000..19a2450f49d
--- /dev/null
+++ b/Master/tlpkg/tlpsrc/latex-amsmath-dev.tlpsrc
@@ -0,0 +1,3 @@
+runpattern d texmf-dist/tex/latex-dev/amsmath
+srcpattern d texmf-dist/source/latex-dev/amsmath
+docpattern d texmf-dist/doc/latex-dev/amsmath
diff --git a/Master/tlpkg/tlpsrc/latex-tools-dev.tlpsrc b/Master/tlpkg/tlpsrc/latex-tools-dev.tlpsrc
new file mode 100644
index 00000000000..ac6f66883fe
--- /dev/null
+++ b/Master/tlpkg/tlpsrc/latex-tools-dev.tlpsrc
@@ -0,0 +1,3 @@
+runpattern d texmf-dist/tex/latex-dev/tools
+srcpattern d texmf-dist/source/latex-dev/tools
+docpattern d texmf-dist/doc/latex-dev/tools