latex2e via latex-tds

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

2 files changed, 49 insertions, 10 deletions

diff --git a/Master/texmf-dist/source/latex/latex-tds/README.asciidoc b/Master/texmf-dist/source/latex/latex-tds/README.asciidoc
index 968481f9067..c752b274ba8 100644
--- a/Master/texmf-dist/source/latex/latex-tds/README.asciidoc
+++ b/Master/texmf-dist/source/latex/latex-tds/README.asciidoc
@@ -1,7 +1,7 @@
 README for project latex-tds
 ============================
 :author:        Heiko Oberdiek
-:revdate:       2014/05/08
+:revdate:       2014/05/15
 :lang:          en
 :toc:
 :numbered:
@@ -678,3 +678,10 @@ History
   * Update of base and graphics.
   * +README.html+ with Unix line ends.
   * ZIP file for CTAN upload with top level directory +latex-tds+.
+2014/05/10::
+  * Module cyrillic: Missing ++00readme.txt++ added.
+2014/05/15::
+  * Module base: +fix-cm+ updated (2014/05/13 v1.1q).
+  * Module tools: +tabularx+ updated (2014/05/13 v2.10).
+  * Module tools: +readme.txt+ renamed to +00readme.txt++.
+  * Module knuth: +.web+ files are put below +TDS:web/knuth//+.
diff --git a/Master/texmf-dist/source/latex/latex-tds/build.pl b/Master/texmf-dist/source/latex/latex-tds/build.pl
index d1dbf8fe08e..b75bcea778b 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 = '1.185';
-my $date    = '2014-05-08';
+my $version = '1.188';
+my $date    = '2014-05-15';
 my $author  = 'Heiko Oberdiek';
 my $copyright = "Copyright 2006-2014 $author";
 chomp(my $license = <<"END_LICENSE");
@@ -586,6 +586,15 @@ section('Install source');
         install "texmf/source/$dir", @list;
         cd $cwd;
     }
+    sub install_web_knuth ($@) {
+        my $pkg = 'knuth';
+        my $dir = shift;
+        my @list = @_;
+        $modules{$pkg} or return 1;
+        cd "$dir_build/$pkg";
+        install "texmf/web/$pkg/$dir", @list;
+        cd $cwd;
+    }
     sub install_source ($@) {
         my $pkg = shift;
         my @list = @_;
@@ -629,30 +638,34 @@ section('Install source');
         tds.sed
         tds.tex
     ]);
-    install_generic_source('knuth', 'knuth/texware', qw[
+    install_web_knuth('texware', qw[
         dvitype.web
         pltotf.web
         pooltype.web
         tftopl.web
     ]);
-    install_generic_source('knuth', 'knuth/mfware', qw[
+    install_web_knuth('mfware', qw[
         gftodvi.web
         gftype.web
         gftopk.web
         mft.web
     ]);
-    install_generic_source('knuth', 'knuth/etc', qw[
+    install_web_knuth('etc', qw[
         vptovf.web
         vftovp.web
     ]);
-    install_generic_source('knuth', 'knuth/web', qw[
+    install_web_knuth('web', qw[
         tangle.web
         weave.web
+    ]);
+    install_generic_source('knuth', 'knuth/web', qw[
         webman.tex
     ]);
-    install_generic_source('knuth', 'knuth/tex', qw[
+    install_web_knuth('tex', qw[
         glue.web
         tex.web
+    ]);
+    install_generic_source('knuth', 'knuth/tex', qw[
         trip.fot
         tripin.log
         trip.log
@@ -662,8 +675,10 @@ section('Install source');
         trip.tex
         trip.typ
     ]);
-    install_generic_source('knuth', 'knuth/mf', qw[
+    install_web_knuth('mf', qw[
         mf.web
+    ]);
+    install_generic_source('knuth', 'knuth/mf', qw[
         trap.fot
         trapin.log
         trap.log
@@ -826,8 +841,22 @@ section('TDS cleanup');
 ### Install TDS/tex, TDS/doc files
 section('Install tex doc');
 {
+    sub check_readme ($) {
+        my $module = shift;
+        # my $readme = $module eq 'tools' ? 'readme.txt' : '00readme.txt';
+        my $readme = '00readme.txt'; # since LaTeX revision 307
+        if (-f "README" and not -f $readme) {
+            run("$prg_cp README $readme");
+        }
+        -f $readme or
+                die "!!! Errror($module): Missing readme!\n";
+        -f "readme.txt" and -f "00readme.txt" and
+                die "!!! Error($module): Duplicate readme!\n";
+    }
+
     if ($modules{'base'}) {
         cd "$dir_build/base";
+        check_readme 'base';
         install 'texmf/doc/latex/base', qw[
             00readme.txt
             autoload.txt
@@ -858,16 +887,18 @@ section('Install tex doc');
 
     if ($modules{'tools'}) {
         cd "$dir_build/tools";
+        check_readme 'tools';
         install 'texmf/doc/latex/tools', qw[
             changes.txt
             manifest.txt
-            readme.txt
+            00readme.txt
         ];
         cd $cwd;
     }
 
     if ($modules{'graphics'}) {
         cd "$dir_build/graphics";
+        check_readme 'graphics';
         install('texmf/doc/latex/graphics',
             '*.txt'
         );
@@ -879,6 +910,7 @@ section('Install tex doc');
 
     if ($modules{'cyrillic'}) {
         cd "$dir_build/cyrillic";
+        check_readme 'cyrillic';
         install('texmf/doc/latex/cyrillic',
             '*.txt'
         );