latex-tds update (13dec09)

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

7 files changed, 25 insertions, 278 deletions

diff --git a/Master/texmf-dist/source/latex/latex-tds/build.pl b/Master/texmf-dist/source/latex/latex-tds/build.pl
index fadc6b94f45..a0a2141e449 100755
--- a/Master/texmf-dist/source/latex/latex-tds/build.pl
+++ b/Master/texmf-dist/source/latex/latex-tds/build.pl
@@ -4,8 +4,8 @@ $^W=1;
 
 my $prj     = 'latex-tds';
 my $file    = 'build.pl';
-my $version = cvs('$Revision: 1.149 $');
-my $date    = cvs('$Date: 2009/09/25 16:44:47 $');
+my $version = cvs('$Revision: 1.150 $');
+my $date    = cvs('$Date: 2009/12/07 13:18:23 $');
 my $author  = 'Heiko Oberdiek';
 my $copyright = "Copyright 2006-2009 $author";
 chomp(my $license = <<"END_LICENSE");
@@ -50,8 +50,7 @@ my @pkg_list = (
     $prj,
     'source',
     'tds',
-    'knuth',
-    'latex3'
+    'knuth'
 );
 
 my $zip_comment = <<'END_ZIP_COMMENT';
@@ -96,6 +95,7 @@ my $prg_epstopdf    = 'epstopdf';
 my $prg_find        = 'find';
 my $prg_java        = '/work/java-1.5.0/bin/java';
    # java 1.6 don't work with the used version of Multivalent
+my $prg_kpsewhich   = 'kpsewhich';
 my $prg_ls          = "ls";
 my $prg_makeindex   = 'makeindex';
 my $prg_mkdir       = 'mkdir';
@@ -236,8 +236,9 @@ if (@list_modules > 0) {
     download_ctan('tex',           'systems/knuth/dist');
     download_ctan('mf',            'systems/knuth/dist');
     download_ctan('errata',        'systems/knuth/dist');
-    download_ctan('expl3.tds',     'install/macros/latex/contrib');
-    download_ctan('xpackages.tds', 'install/macros/latex/contrib');
+    download_ams('amscls',         '');
+    download_ams('amsmath',        '');
+    # download_ams('amsrefs',        '');
     download_ams('amslatex',       '');
     download_ams('amsrefs-tds',    'amslatex/amsrefs');
     download_ams('amsrefs-ctan',   'amslatex/amsrefs');
@@ -301,17 +302,6 @@ section('Unpacking');
         $modules{$pkg} or return 1;
         run("$prg_unzip -j $zipfile -d$dir");
     }
-    sub unpack_latex3 ($) {
-        my $pkg = 'latex3';
-        my $file = shift;
-        my $dir = "$dir_build/$pkg";
-        my $dir_tds = "$dir/texmf";
-        my $zipfile = "$dir_incoming_ctan/$file.tds.zip";
-        $modules{$pkg} or return 1;
-        ensure_directory($dir_tds);
-        run("$prg_unzip $zipfile -d$dir_tds");
-        run("$prg_unzip -j $zipfile source/* -d$dir");
-    }
 
     ensure_directory($dir_build);
     unpack_ctan('base');
@@ -345,6 +335,13 @@ section('Unpacking');
                 run("$prg_unzip -j $dir_incoming_ams/amslatex.zip"
                     . " source/latex/amscls/instr-l.tex"
                     . " -d $dir_build/amslatex/classes/");
+        run("$prg_rm -rf $texmf_ams/{doc,source,tex}/latex/amscls");
+        run("$prg_rm -rf $texmf_ams/bibtex/bst/ams");
+        unpack_ams('amscls');
+        run("$prg_cp $dir_build/amslatex/classes/amsmidx.{dtx,ins}"
+            . " $texmf_ams/source/latex/amscls/");
+        run("$prg_cp $dir_build/amslatex/classes/amsmidx.sty"
+            . " $texmf_ams/tex/latex/amscls/");
     }
     unpack_psnfss('lw35nfss');
     unpack_psnfss('freenfss');
@@ -356,8 +353,6 @@ section('Unpacking');
     unpack_knuth('tex');
     unpack_knuth('mf');
     unpack_knuth('errata');
-    unpack_latex3('expl3');
-    unpack_latex3('xpackages');
 }
 
 ### Patches
@@ -1381,82 +1376,6 @@ if ($modules{'knuth'}) {
     chdir $cwd;
 }
 
-### Generate documentation for latex3
-if ($modules{'latex3'}) {
-    section('Documentation: latex3');
-
-    chdir "$dir_build/latex3";
-
-    # tex/<name>.drv for <name>.tex
-    # install as TDS:doc/latex/<pkg>/<name>.pdf
-    sub simple3_doc ($$$) {
-        my $pkg = shift;
-        my $name = shift;
-        my $ext = shift;
-        $ext = ".$ext" if $ext;
-        my $file = "$name$ext";
-        run("$prg_pdflatextds -draftmode $file");
-        run("$prg_pdflatextds -draftmode $file");
-        run("$prg_pdflatextds $file");
-        install_pdf($pkg, $name);
-    }
-    sub latex3_doc ($$$$) {
-        my $pkg = shift;
-        my $name = shift;
-        my $ext = shift;
-        my $style = shift;
-        $ext = ".$ext" if $ext;
-        my $file = "$name$ext";
-        run("$prg_pdflatextds -draftmode $file");
-        run("$prg_makeindex -s $style -o $name.ind $name.idx");
-        run("$prg_pdflatextds -draftmode $file");
-        run("$prg_makeindex -s $style -o $name.ind $name.idx");
-        run("$prg_pdflatextds $file");
-        install_pdf($pkg, $name);
-    }
-    sub source3_doc($$) {
-        my $pkg = shift;
-        my $name = shift;
-        my $drv = "$cwd/$dir_tex/$name.drv";
-        run("$prg_pdflatextds -draftmode $name.drv");
-        run_makeindex("$name.idx", "$name.ist");
-        run_makeindex("$name.glo", 'gglo.ist', "$name.gls");
-        run("$prg_pdflatextds -draftmode $name.drv");
-        run_makeindex("$name.idx", "$name.ist");
-        run_makeindex("$name.glo", 'gglo.ist', "$name.gls");
-        run("$prg_pdflatextds -draftmode $name.drv");
-        run("$prg_pdflatextds $name.drv"); # hypdestopt
-        install_pdf($pkg, $name);
-    }
-
-    # simple3_doc('expl3', 'expl3',    'drv');
-    # simple3_doc('expl3', 'l32eproc', 'drv');
-    # source3_doc('expl3', 'source3');
-
-    my $file_style_l3doc = 'texmf/makeindex/expl3/l3doc.ist';
-    open(IN, '<', $file_style_l3doc)
-            or die "$error Cannot open `$file_style_l3doc'!\n";
-    open(OUT, '>', 'xparse.ist')
-            or die "$error Cannot write `xparse.ist'!\n";
-    print OUT "level '#'\n";
-    while (<IN>) {
-        next if /^level/;
-        print OUT;
-    }
-    close(IN);
-    close(OUT);
-
-    simple3_doc('xpackages/xbase', 'ldcsetup', 'dtx');
-    simple3_doc('xpackages/xbase', 'template', 'dtx');
-    latex3_doc('xpackages/xbase',  'xparse',   'drv', 'xparse.ist');
-    latex3_doc('xpackages/xtras',  'l3keys2e', 'dtx', 'l3doc.ist');
-    # simple3_doc('xpackages', 'xtheorem', 'dtx');
-
-    run("$prg_rm -rf texmf/{doc,source,tex}/latex/expl3 texmf/makeindex");
-
-    chdir $cwd;
-}
-
 ### Module source
 if ($modules{'source'}) {
     section('Module source');
diff --git a/Master/texmf-dist/source/latex/latex-tds/readme.txt b/Master/texmf-dist/source/latex/latex-tds/readme.txt
index 7dd4a743f77..06757084c44 100644
--- a/Master/texmf-dist/source/latex/latex-tds/readme.txt
+++ b/Master/texmf-dist/source/latex/latex-tds/readme.txt
@@ -1,4 +1,4 @@
-readme.txt for project latex-tds, 2009/09/25
+readme.txt for project latex-tds, 2009/12/07
 
 TABLE OF CONTENTS
 =================
@@ -72,7 +72,8 @@ Module list
             CTAN:macros/latex/contrib/amsrefs.zip
             ftp://ftp.ams.org/pub/tex/amslatex.zip
             ftp://ftp.ams.org/pub/tex/amslatex/amsrefs-tds.zip
-            ftp://ftp.ams.org/pub/tex/amslatex/amsrefs-ctan.zip
+            ftp://ftp.ams.org/pub/tex/amscls.zip
+            ftp://ftp.ams.org/pub/tex/amsmath.zip
 * psnfss    CTAN:macros/latex/required/psnfss.zip
 * babel     CTAN:macros/latex/required/babel.zip
 * tds       CTAN:tds.zip
@@ -83,7 +84,6 @@ Module list
             CTAN:systems/knuth/dist/web.zip
             CTAN:systems/knuth/dist/tex.zip
             CTAN:systems/knuth/dist/mf.zip
-* latex3    CTAN:install/macros/latex/contrib/xpackages.tds.zip
 
 Author
 ------
@@ -170,6 +170,7 @@ Hints
     CTAN:install/macros/latex/contrib/expl3.tds.zip
     There is nothing left for latex-tds to do. Therefore
     expl3 is removed from module latex3.
+  * The same happend to xpackages, thus the whole module is removed.
 
 
 D. COPYRIGHT, LICENSE
@@ -244,18 +245,14 @@ Documentation driver
   tex/errata.all            doc driver for knuth/errata/errata.pdf
   tex/errata.drv            doc driver for knuth/errata/errata_*.pdf
   tex/errorlog.drv          doc driver for knuth/errata/errorlog.tex
-  tex/expl3.drv             doc driver for latex3/expl3/expl3.tex
   tex/greek-usage.tex       doc driver with patches for babel/usage.tex
   tex/knuth.drv             doc driver for knuth/{texware,mfware,etc}/*.web
-  tex/l32eproc.drv          doc driver for latex3/expl3/l32eproc.tex
   tex/ltnews.tex            master file that merges all base/ltnews*.tex
   tex/ltxcheck.drv          doc driver with patches for ltxcheck.tex
   tex/psnfss2e.drv          doc driver with patches for psnfss2e.tex
-  tex/source3.drv           doc driver for latex3/expl/source3.tex
   tex/tools-overview.cls    class for tools.tex
   tex/tools.tex             master file for tools overview, generated
                             by the build.pl script from tools/manifest.txt
-  tex/xparse.drv            doc driver for latex3/xpackages/xbase/xparse.dtx
 
 Patches
 -------
@@ -538,3 +535,9 @@ I. HISTORY
   * Module amslatex: updated.
   * Module babel: updated.
   * Update of LaTeX, release 2009/09/24.
+2009/12/07
+  * Module amslatex: Unhappily the .zip files are quite a mess,
+    because they contain a mixup of old and new versions.
+    Tried to sort this out and fix the last update.
+  * Module latex3: xpackages removed, because nothing to do.
+  * Module latex3 removed, nothing left to do.
diff --git a/Master/texmf-dist/source/latex/latex-tds/tex/expl3.drv b/Master/texmf-dist/source/latex/latex-tds/tex/expl3.drv
deleted file mode 100644
index 98a9c3489e7..00000000000
--- a/Master/texmf-dist/source/latex/latex-tds/tex/expl3.drv
+++ /dev/null
@@ -1,47 +0,0 @@
-% expl3.drv
-% 2008/08/10 v1.0 Driver file for `latex/expl3/expl3.tex'
-% Copyright 2008 Heiko Oberdiek.
-%
-% This file is part of project `latex-tds'.
-%
-% It may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either version 1.3
-% of this license or (at your option) any later version.
-% The latest version of this license is in
-%   http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX
-% version 2005/12/01 or later.
-%
-% This work has the LPPL maintenance status `maintained'.
-%
-% The Current Maintainer of this work is Heiko Oberdiek.
-%
-% See `readme.txt' for a list of all files belonging to the
-% project `latex-tds' and additional information.
-%
-% 2008/08/10 v1.0
-%
-\let\ORGdocumentclass\documentclass
-\def\documentclass#1{%
-  \ORGdocumentclass{#1}\relax
-  \usepackage[
-    colorlinks,
-  ]{hyperref}\relax
-  \hypersetup{%
-    pdftitle={The LaTeX3 Programming Language},
-    pdfsubject={A proposed system for TeX macro programming},
-    pdfauthor={%
-      David Carlisle, %
-      Chris Rowley, %
-      Frank Mittelbach, %
-      LaTeX3 project <latex-l@urz.uni-heidelberg.de>%
-    }%
-  }%
-  \usepackage[
-    numbered,
-    open,
-    openlevel=2,
-  ]{bookmark}\relax
-}
-\input{\jobname}
-\endinput
diff --git a/Master/texmf-dist/source/latex/latex-tds/tex/l32eproc.drv b/Master/texmf-dist/source/latex/latex-tds/tex/l32eproc.drv
deleted file mode 100644
index 2fa49ee24db..00000000000
--- a/Master/texmf-dist/source/latex/latex-tds/tex/l32eproc.drv
+++ /dev/null
@@ -1,44 +0,0 @@
-% l32eproc.drv
-% 2008/08/10 v1.0 Driver file for `latex/expl3/l32eproc.tex'
-% Copyright 2008 Heiko Oberdiek.
-%
-% This file is part of project `latex-tds'.
-%
-% It may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either version 1.3
-% of this license or (at your option) any later version.
-% The latest version of this license is in
-%   http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX
-% version 2005/12/01 or later.
-%
-% This work has the LPPL maintenance status `maintained'.
-%
-% The Current Maintainer of this work is Heiko Oberdiek.
-%
-% See `readme.txt' for a list of all files belonging to the
-% project `latex-tds' and additional information.
-%
-% 2008/08/10 v1.0
-%
-\let\ORGdocumentclass\documentclass
-\def\documentclass#1{%
-  \ORGdocumentclass{#1}\relax
-  \usepackage[
-    colorlinks,
-  ]{hyperref}\relax
-  \hypersetup{%
-    pdftitle={The LaTeX3 Programming Language},
-    pdfsubject={A syntax proposal for TeX macro programming},
-    pdfauthor={%
-      The LaTeX3 project <latex-l@urz.uni-heidelberg.de>%
-    }%
-  }%
-  \usepackage[
-    numbered,
-    open,
-    openlevel=2,
-  ]{bookmark}\relax
-}
-\input{\jobname}
-\endinput
diff --git a/Master/texmf-dist/source/latex/latex-tds/tex/source3.drv b/Master/texmf-dist/source/latex/latex-tds/tex/source3.drv
deleted file mode 100644
index 8099bcf3b4a..00000000000
--- a/Master/texmf-dist/source/latex/latex-tds/tex/source3.drv
+++ /dev/null
@@ -1,54 +0,0 @@
-% source3.drv
-% 2008/08/10 v1.0 Driver file for `latex/expl3/source3.tex'
-% Copyright 2008 Heiko Oberdiek.
-%
-% This file is part of project `latex-tds'.
-%
-% It may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either version 1.3
-% of this license or (at your option) any later version.
-% The latest version of this license is in
-%   http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX
-% version 2005/12/01 or later.
-%
-% This work has the LPPL maintenance status `maintained'.
-%
-% The Current Maintainer of this work is Heiko Oberdiek.
-%
-% See `readme.txt' for a list of all files belonging to the
-% project `latex-tds' and additional information.
-%
-% 2008/08/10 v1.0
-%
-\PassOptionsToClass{a4paper,full}{l3doc}
-%
-\let\ORGdocumentclass\documentclass
-\makeatletter
-\def\documentclass#1{%
-  \ORGdocumentclass{#1}\relax
-  \usepackage{hypdoc}\relax
-  \pdfstringdefDisableCommands{%
-    \def\thanks##1{ (##1)}%
-  }%
-  % fix catcode mess of l3 commands
-  \AtBeginDocument{\catcode`\_=11\relax}%
-  \def\SpecialMainIndexB##1{%
-    \index{%
-      \@gobble##1%
-      \actualchar
-      \string\verb\quotechar*\verbatimchar##1\verbatimchar
-      \encapchar
-      hdpgindex{\thepage}{usage}%
-    }%
-  }%
-}
-\def\hdpgindex#1#2#3{%
-  \csname\ifx\\#2\\relax\else#2\fi\endcsname{%
-    \hyperlink{page.#1}{#3}%
-  }%
-}
-
-\makeatother
-\input{\jobname}
-\endinput
diff --git a/Master/texmf-dist/source/latex/latex-tds/tex/tools.tex b/Master/texmf-dist/source/latex/latex-tds/tex/tools.tex
index f964f785d82..7c8123bf870 100644
--- a/Master/texmf-dist/source/latex/latex-tds/tex/tools.tex
+++ b/Master/texmf-dist/source/latex/latex-tds/tex/tools.tex
@@ -1,6 +1,6 @@
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{tools.tex}%
-  [2009/09/25 Tools overview (HO)]
+  [2009/12/07 Tools overview (HO)]
 % Copyright 2006-2009 Heiko Oberdiek
 %
 % This file is part of project `latex-tds'.
diff --git a/Master/texmf-dist/source/latex/latex-tds/tex/xparse.drv b/Master/texmf-dist/source/latex/latex-tds/tex/xparse.drv
deleted file mode 100644
index 0f5c260898b..00000000000
--- a/Master/texmf-dist/source/latex/latex-tds/tex/xparse.drv
+++ /dev/null
@@ -1,30 +0,0 @@
-\def\verbatimchar{&}
-\input{xparse.dtx}
-\endinput
-% xparse.drv
-% 2009/09/05 v1.0 Driver file for `latex/xpackages/xbase/xparse.dtx'
-% Copyright 2009 Heiko Oberdiek.
-%
-% This file is part of project `latex-tds'.
-%
-% It may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either version 1.3
-% of this license or (at your option) any later version.
-% The latest version of this license is in
-%   http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX
-% version 2005/12/01 or later.
-%
-% This work has the LPPL maintenance status `maintained'.
-%
-% The Current Maintainer of this work is Heiko Oberdiek.
-%
-% See `readme.txt' for a list of all files belonging to the
-% project `latex-tds' and additional information.
-%
-% 2008/09/05 v1.0
-%
-\def\verbatimchar{&}
-\def\levelchar{#}
-\input{xparse.dtx}
-\endinput