latex-tds 2012/05/12 (14may12)

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

4 files changed, 45 insertions, 36 deletions

diff --git a/Master/texmf-dist/source/latex/latex-tds/readme.txt b/Master/texmf-dist/source/latex/latex-tds/README
index 6ed7bd5b6a3..1d8554adae7 100644
--- a/Master/texmf-dist/source/latex/latex-tds/readme.txt
+++ b/Master/texmf-dist/source/latex/latex-tds/README
@@ -1,4 +1,4 @@
-readme.txt for project latex-tds, 2011/11/16
+readme.txt for project latex-tds, 2012/05/12
 
 TABLE OF CONTENTS
 =================
@@ -69,11 +69,10 @@ Module list
 * tools     CTAN:macros/latex/required/tools.zip
 * cyrillic  CTAN:macros/latex/required/cyrillic.zip
 * amslatex  CTAN:install/macros/latex/required/amscls.tds.zip
-            CTAN:install/macros/latex/contrib/amsrefs.tds.zip
-            CTAN:macros/latex/required/amslatex.zip
             CTAN:macros/latex/contrib/amsrefs.zip
+            CTAN:macros/latex/required/amslatex.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/amsrefs/amsrefs.zip
             ftp://ftp.ams.org/pub/tex/amscls.zip
             ftp://ftp.ams.org/pub/tex/amsmath.zip
 * psnfss    CTAN:macros/latex/required/psnfss.zip
@@ -86,7 +85,7 @@ Module list
             CTAN:systems/knuth/dist/web.zip
             CTAN:systems/knuth/dist/tex.zip
             CTAN:systems/knuth/dist/mf.zip
-*
+* etex      CTAN:systems/e-tex/v2.1/etex_doc.zip
 
 Author
 ------
@@ -167,13 +166,6 @@ Hints
 [graphics]
   * Module graphics doesn't provide all driver files, because some are
     developed independently (pdftex.def, ...).
-[latex3]
-  * The changes of latex-tds are merged into the official sources
-    of expl3. Also expl3 is provided as TDS package:
-    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 happened to xpackages, thus the whole module is removed.
 
 
 D. COPYRIGHT, LICENSE
@@ -612,3 +604,7 @@ I. HISTORY
   * Update of tools (varioref).
 2011/11/16
   * Update of babel.
+2012/05/12
+  * Update of amslatex (amsrefs).
+  * Update of readme.txt that is renamed to README (CTAN convention).
+  * Update of tlc2.err.
diff --git a/Master/texmf-dist/source/latex/latex-tds/build.pl b/Master/texmf-dist/source/latex/latex-tds/build.pl
index 547c78e1d1c..21a5cada682 100755
--- a/Master/texmf-dist/source/latex/latex-tds/build.pl
+++ b/Master/texmf-dist/source/latex/latex-tds/build.pl
@@ -4,10 +4,10 @@ $^W=1;
 
 my $prj     = 'latex-tds';
 my $file    = 'build.pl';
-my $version = cvs('$Revision: 1.168 $');
-my $date    = cvs('$Date: 2011/11/14 02:55:08 $');
+my $version = cvs('$Revision: 1.172 $');
+my $date    = cvs('$Date: 2012/05/12 11:13:32 $');
 my $author  = 'Heiko Oberdiek';
-my $copyright = "Copyright 2006-2011 $author";
+my $copyright = "Copyright 2006-2012 $author";
 chomp(my $license = <<"END_LICENSE");
 % $copyright
 %
@@ -25,7 +25,7 @@ chomp(my $license = <<"END_LICENSE");
 %
 % The Current Maintainer of this work is Heiko Oberdiek.
 %
-% See `readme.txt' for a list of all files belonging to the
+% See `README' for a list of all files belonging to the
 % project `$prj' and additional information.
 %
 END_LICENSE
@@ -55,10 +55,10 @@ my @pkg_list = (
 );
 
 my $zip_comment = <<'END_ZIP_COMMENT';
-**************************************************
-* This file is part of project 'latex-tds', see  *
-* CTAN:macros/latex/contrib/latex-tds/readme.txt *
-**************************************************
+*************************************************
+* This file is part of project 'latex-tds', see *
+* CTAN:macros/latex/contrib/latex-tds/README    *
+*************************************************
 END_ZIP_COMMENT
 
 my $error = "!!! Error:";
@@ -253,7 +253,7 @@ if (@list_modules > 0) {
     download_ctan('babel',         'macros/latex/required');
     download_ctan('amslatex',      'macros/latex/required');
     download_ctan('amsrefs',       'macros/latex/contrib');
-    download_ctan('amsrefs.tds',   'install/macros/latex/contrib');
+    # download_ctan('amsrefs.tds',   'install/macros/latex/contrib');
     download_ctan('amscls.tds',    'install/macros/latex/required/amslatex');
     download_ctan('psnfss',        'macros/latex/required');
     download_ctan('tds',           '');
@@ -272,6 +272,7 @@ if (@list_modules > 0) {
     # download_ams('amslatex',       '');
     # download_ams('amsrefs-tds',    'amslatex/amsrefs');
     # download_ams('amsrefs-ctan',   'amslatex/amsrefs');
+    download_ams('amsrefs', 'amsrefs');
     download_err('manual');
     download_err('lb2');
     download_err('lgc2');
@@ -369,16 +370,19 @@ section('Unpacking');
     map { unpack_ctan($_); } @required_list;
     if ($modules{'amslatex'}) {
         unpack_ams('amscls', "$dir_incoming_ctan/amscls.tds.zip");
-        unpack_ams('amsrefs', "$dir_incoming_ctan/amsrefs.tds.zip");
+        #unpack_ams('amsrefs', "$dir_incoming_ctan/amsrefs.tds.zip");
+        unpack_ams('amsrefs', "$dir_incoming_ams/amsrefs.zip");
         unpack_ams('amsmath', "$dir_incoming_ams/amsmath.zip");
         # because of 00readme.txt and amsrefs.dtx
+        # 2012-05-08: 00readme.txt is renamed to README.
+        # 2012-05-08: amsrefs.dtx is fixed on CTAN.
         unpacking('amslatex',
                   "$dir_incoming_ctan/amsrefs.zip",
                   "$dir_build/amslatex/ctan");
-        run("$prg_cp $dir_build/amslatex/ctan/amsrefs/00readme.txt "
-                . "$dir_build/amslatex/texmf/source/latex/amsrefs/00readme.txt");
-        run("$prg_cp $dir_build/amslatex/ctan/amsrefs/amsrefs.dtx "
-                . "$dir_build/amslatex/texmf/source/latex/amsrefs/amsrefs.dtx");
+        run("$prg_cp $dir_build/amslatex/ctan/amsrefs/README "
+                . "$dir_build/amslatex/texmf/source/latex/amsrefs/README");
+        # run("$prg_cp $dir_build/amslatex/ctan/amsrefs/amsrefs.dtx "
+        #         . "$dir_build/amslatex/texmf/source/latex/amsrefs/amsrefs.dtx");
     }
     unpack_psnfss('lw35nfss');
     unpack_psnfss('freenfss');
@@ -608,6 +612,10 @@ section('Patches after source install');
             close(IN);
         }
 
+        # fix CR/LF line endings of tlc2.err (2012-05-12)
+        run("$prg_zip -ll tlc2.zip tlc2.err");
+        run("$prg_unzip -o tlc2.zip");
+
         chdir $cwd;
 
         patch('base/encguide.tex');
@@ -636,7 +644,7 @@ section('Patches after source install');
         patch("amslatex/amsrefs/changes.tex");
         run("$prg_recode latin1..utf8 $dir_build/amslatex/amsrefs/changes.tex");
     }
-    
+
     if ($modules{'babel'}) {
         patch("babel/hebrew.fdd");
     }
@@ -1696,7 +1704,7 @@ if ($modules{'source'}) {
 
     install $dir_dest, qw[
         build.pl
-        readme.txt
+        README
     ];
     install "$dir_dest/tex", glob("$dir_tex/*.*");
     install "$dir_dest/patch", glob("$dir_patch/*.*");
@@ -1704,7 +1712,7 @@ if ($modules{'source'}) {
     install "$dir_dest/lib", $file_adjust_checksum;
     install "$dir_dest/license", "$dir_license/lppl.txt";
     install "$dir_dest/license/ziptimetree", "$dir_license/ziptimetree/lgpl.txt";
-    install $dir_distrib, 'readme.txt';
+    install $dir_distrib, 'README';
 }
 
 ### Module latex-tds
@@ -1753,7 +1761,7 @@ section('Distrib');
 
     if ($opt_all) {
         chdir $dir_distrib;
-        my $cmd = "$prg_zip -0 $file_ctan_distrib readme.txt";
+        my $cmd = "$prg_zip -0 $file_ctan_distrib README";
         for my $pkg (sort @pkg_list) {
             $cmd .= " $pkg.tds.zip";
         }
@@ -1775,7 +1783,7 @@ END_CACHE
         my $file = "$dir_distrib/$pkg.tds.zip";
         if (-f $file) {
             system("$prg_ls -l $file");
-            system("$prg_ls -l $dir_distrib/readme.txt")if $pkg eq 'source';
+            system("$prg_ls -l $dir_distrib/README")if $pkg eq 'source';
         }
         else {
             print "!!! Warning: Missing distribution for `$pkg'!\n";
diff --git a/Master/texmf-dist/source/latex/latex-tds/tex/ams.drv b/Master/texmf-dist/source/latex/latex-tds/tex/ams.drv
index 4768dfe82f1..2c849d31ae3 100644
--- a/Master/texmf-dist/source/latex/latex-tds/tex/ams.drv
+++ b/Master/texmf-dist/source/latex/latex-tds/tex/ams.drv
@@ -1,6 +1,6 @@
 % ams.drv
-% 2010/10/27 v1.3 Driver file for amslatex documentation files
-% Copyright 2006-2010 Heiko Oberdiek.
+% 2012/05/12 v1.4 Driver file for amslatex documentation files
+% Copyright 2006-2012 Heiko Oberdiek.
 %
 % This file is part of project `latex-tds'.
 %
@@ -26,6 +26,8 @@
 %   * Update/fix for instr-l.tex.
 %   * Adding missing macro definitions for amsrefs.dtx.
 %   * Fix for changes.tex.
+% 2012/05/12 v1.4
+%   * Update for ForestGreen, option `dvipsnames' also added for xcolor.
 %
 \NeedsTeXFormat{LaTeX2e}
 \makeatletter
@@ -133,6 +135,9 @@
 \expandafter\endgroup
 \ifx\x\y
   \PassOptionsToPackage{dvipsnames,usenames}{color}%
+  \PassOptionsToPackage{dvipsnames}{xcolor}%
+  \RequirePackage{color}%
+  \definecolor{ForestGreen}{cmyk}{0.91,0,0.88,0.12}%
   \PassOptionsToPackage{%
     pdfusetitle,%
     pdftex,breaklinks=true,colorlinks,%
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 6ca71552f9a..9b99e85d558 100644
--- a/Master/texmf-dist/source/latex/latex-tds/tex/tools.tex
+++ b/Master/texmf-dist/source/latex/latex-tds/tex/tools.tex
@@ -1,7 +1,7 @@
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{tools.tex}%
-  [2011/11/16 Tools overview (HO)]
-% Copyright 2006-2011 Heiko Oberdiek
+  [2012/05/12 Tools overview (HO)]
+% Copyright 2006-2012 Heiko Oberdiek
 %
 % This file is part of project `latex-tds'.
 %
@@ -17,7 +17,7 @@
 %
 % The Current Maintainer of this work is Heiko Oberdiek.
 %
-% See `readme.txt' for a list of all files belonging to the
+% See `README' for a list of all files belonging to the
 % project `latex-tds' and additional information.
 %
 \documentclass{tools-overview}