latex-tds (16may14)

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

6 files changed, 123 insertions, 17 deletions

diff --git a/Master/texmf-dist/source/latex/latex-tds/README.asciidoc b/Master/texmf-dist/source/latex/latex-tds/README.asciidoc
index c752b274ba8..d43c5590600 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/15
+:revdate:       2014/05/16
 :lang:          en
 :toc:
 :numbered:
@@ -261,13 +261,15 @@ Scripts
 ~~~~~~~
 [cols=".3literal,.7", frame="topbot", grid="rows"]
 |===
-|build.pl                  |main script for building the distribution
-|lib/adjust_checksum.pl    |Perl script that runs a DTX file through
-                            LaTeX and corrects its +\Checksum+ if necessary
-|lib/check-ascii.pl        |Perl script that looks for non-ASCII characters
-|lib/check-eolspaces.pl    |Perl script that looks for trailing spaces
-|lib/ziptimetree.pl        |Perl script that generates a ZIP file from
-                            a directory tree with sorted entries (LGPL)
+|build.pl                      |main script for building the distribution
+|lib/adjust_checksum.pl        |Perl script that runs a DTX file through
+                                LaTeX and corrects its +\Checksum+ if necessary
+|lib/check-ascii.pl            |Perl script that looks for non-ASCII characters
+|lib/check-eolspaces.pl        |Perl script that looks for trailing spaces
+|lib/check-tds-installation.pl |Perl script that compares a module with
+                                an installation inside a TDS tree.
+|lib/ziptimetree.pl            |Perl script that generates a ZIP file from
+                                a directory tree with sorted entries (LGPL)
 |===
 
 Configuration
@@ -276,6 +278,7 @@ Configuration
 |===
 |tex/docstrip.cfg          |enables TDS feature and creates directories
 |tex/errata.cfg            |for errata lists of latex/base
+|tex/fix-expl3-lua.ini     |fix for expl3, if used in format file
 |tex/hyperref.cfg          |hyperref configuration file
 |tex/ltnews.cfg            |for LaTeX News of latex/base
 |tex/ltugboat.cls          |setup for class ltugboat
@@ -685,3 +688,8 @@ History
   * 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//+.
+2014/05/16::
+  * Module base: Formatting of +ltnews.pdf+ fixed.
+  * +fix-expl3-lua.ini+ added to support putting package expl into a format.
+  * Script +check-tds-installation.pl+ added.
+  * Module amslatex: +TDS:bibtex/bst/ams+ renamed to +TDS:bibtex/bst/amscls+.
diff --git a/Master/texmf-dist/source/latex/latex-tds/build.pl b/Master/texmf-dist/source/latex/latex-tds/build.pl
index b75bcea778b..eb18d87d58a 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.188';
-my $date    = '2014-05-15';
+my $version = '1.190';
+my $date    = '2014-05-16';
 my $author  = 'Heiko Oberdiek';
 my $copyright = "Copyright 2006-2014 $author";
 chomp(my $license = <<"END_LICENSE");
@@ -78,7 +78,9 @@ my $dir_distrib = 'distrib';
 my $dir_build_distrib = "$dir_build/distrib";
 my $dir_build_distrib_data = "$dir_build_distrib/$prj";
 my $dir_texmf = 'texmf';
-chomp(my $cwd = `pwd`);
+
+my $prg_pwd = 'pwd';
+chomp(my $cwd = `$prg_pwd`);
 
 # cache directory
 use File::HomeDir;
@@ -488,6 +490,11 @@ section('Unpacking');
 
     if ($modules{'amslatex'}) {
         unpack_ams('amscls', "$dir_incoming_ctan/amscls.tds.zip");
+        # Rename TDS:bibtex/bst/ams -> TDS:bibtex/bst/amscls
+        my $dir_bibtex_ams = "$dir_build/amslatex/texmf/bibtex/bst/ams";
+        my $dir_bibtex_amscls = "${dir_bibtex_ams}cls";
+        run("$prg_mv $dir_bibtex_ams $dir_bibtex_amscls") if
+                -d $dir_bibtex_ams and not -d $dir_bibtex_amscls;
         unpack_ams('amsrefs', "$dir_incoming_ctan/amsrefs.tds.zip");
         unpack_ams('amsmath', "$dir_incoming/ctan/math.tds.zip");
         #unpack_ams('amsrefs', "$dir_incoming_ams/amsrefs.zip");
diff --git a/Master/texmf-dist/source/latex/latex-tds/tex/fix-expl3-lua.ini b/Master/texmf-dist/source/latex/latex-tds/tex/fix-expl3-lua.ini
new file mode 100644
index 00000000000..8b0deb04fbf
--- /dev/null
+++ b/Master/texmf-dist/source/latex/latex-tds/tex/fix-expl3-lua.ini
@@ -0,0 +1,42 @@
+% fix-expl3-lua.ini
+% 2014/05/15 v1.0
+% Copyright 2014 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' for a list of all files belonging to the
+% project `latex-tds' and additional information.
+%
+% 2015/05/15 v1.0:
+%  * First version.
+%
+\newcommand*{\FixExplThreeLua}{%
+  \directlua{%
+    if not l3kernel or not l3kernel.strcmp then %
+      l3kernel = { }%
+      function l3kernel.strcmp (A, B)%
+        if A == B then %
+          tex.write ("0")%
+        elseif A < B then %
+          tex.write ("-1")%
+        else %
+          tex.write ("1")%
+        end %
+      end %
+    end%
+  }%
+}
+\everyjob=\expandafter{\the\everyjob\FixExplThreeLua}%
+\endinput
diff --git a/Master/texmf-dist/source/latex/latex-tds/tex/ltnews.tex b/Master/texmf-dist/source/latex/latex-tds/tex/ltnews.tex
index ed54c679903..b3be2b21235 100644
--- a/Master/texmf-dist/source/latex/latex-tds/tex/ltnews.tex
+++ b/Master/texmf-dist/source/latex/latex-tds/tex/ltnews.tex
@@ -1,8 +1,8 @@
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{ltnews.tex}%
-  [2009/09/25 v1.1 Master file for ltnews*.tex (HO)]
+  [2014/05/15 v1.4 Master file for ltnews*.tex (HO)]
 %
-% Copyright 2006, 2009 Heiko Oberdiek
+% Copyright 2006, 2009, 2011, 2014 Heiko Oberdiek
 %
 % This file is part of project `latex-tds'.
 %
@@ -27,6 +27,8 @@
 % 2014/02/30 v1.3:
 %  * Update for LaTeX 2014/05/01.
 %  * Fix for anchor positions of issue titles.
+% 2014/05/15 v1.4:
+%  * Updates for ltnews21.tex.
 %
 \providecommand*{\lastissue}{20}
 \InputIfFileExists{ltnews-lastissue.cfg}{}{}
@@ -64,6 +66,7 @@
 
 \RequirePackage{hyperref}
 \hypersetup{colorlinks}
+\RequirePackage{bookmark}
 
 \makeatletter
 
@@ -158,6 +161,43 @@
   \let\org@twocolumn\twocolumn
   \renewenvironment{document}{%
     \clearpage
+    \ifnum\@issue=20 %
+      \addtocontents{toc}{\protect\setcounter{tocdepth}{5}}%
+      \addtocontents{toc}{%
+        \protect\makeatletter
+       }%
+       \addtocontents{toc}{%
+         \let\protect\saved@l@paragraph\protect\l@paragraph
+       }%
+       \addtocontents{toc}{%
+         \let\protect\l@paragraph\protect\l@subsection
+       }%
+    \fi
+    \ifnum\@issue=21 %
+      \addtocontents{toc}{%
+        \let\protect\l@paragraph\protect\saved@l@paragraph
+      }%
+      \def\toclevel@subsection{1}%
+      \def\toclevel@subsubsection{2}%
+      \addtocontents{toc}{\protect\setcounter{tocdepth}{4}}%
+      \renewcommand*{\tableofcontents}{%
+        \section*{\contentsname}%
+        \@starttoc{toc21}%
+      }%
+      \let\saved@addtocontents\addtocontents
+      \renewcommand*{\addtocontents}[2]{%
+        \saved@addtocontents{##1}{##2}%
+        \def\temp@toc{toc}%
+        \def\temp@param{##1}%
+        \ifx\temp@toc\temp@param
+          \saved@addtocontents{toc21}{##2}%
+        \fi
+      }%
+      \let\l@subsubsection\l@subsection
+      \let\l@subsection\l@section
+      \let\l@section\l@part
+      \let\l@part\@gobbletwo
+    \fi
     \def\twocolumn[{%
       \let\twocolumn\org@twocolumn
       \org@twocolumn[%
@@ -166,6 +206,9 @@
       }%
       \begingroup
         \let\WriteBookmarks\relax
+        \@firstofone{% inside opt. arg. of \twocolumn: protect "]"
+          \renewcommand*{\Hy@writebookmark}[5]{}%
+        }%
         \phantomsection
         \addcontentsline{toc}{part}{\printissue}%
       \endgroup
diff --git a/Master/texmf-dist/source/latex/latex-tds/tex/lualatex-tds.ini b/Master/texmf-dist/source/latex/latex-tds/tex/lualatex-tds.ini
index 8c2e40f20a5..b7e2b124c13 100644
--- a/Master/texmf-dist/source/latex/latex-tds/tex/lualatex-tds.ini
+++ b/Master/texmf-dist/source/latex/latex-tds/tex/lualatex-tds.ini
@@ -1,6 +1,6 @@
 % lualatex-tds.ini
-% 2013/02/13 v1.6
-% Copyright 2007, 2008, 2011, 2013 Heiko Oberdiek
+% 2014/05/15 v1.9
+% Copyright 2007, 2008, 2011, 2013, 2014 Heiko Oberdiek
 %
 % This file is part of project `latex-tds'.
 %
@@ -34,6 +34,8 @@
 %  * Patch for `inputenc' 2014/04/20 v1.2a.
 % 2014/04/30 v1.8
 %  * Patch for `inputenc' 2014/04/30 v1.2b no longer needed.
+% 2014/05/15 v1.9
+%  * Patch for `expl3': Put `\directlua' in `\everyjob'.
 %
 \input lualatexiniconfig.tex
 \input pdftexconfig %
@@ -108,6 +110,7 @@
 \RequirePackage{expl3}%
 \RequirePackage{xparse}%
 \RequirePackage{calc}%
+\input{fix-expl3-lua.ini}%
 \let\dump\SavedDump
 \let\SavedDump\UNDEFINED
 \dump
diff --git a/Master/texmf-dist/source/latex/latex-tds/tex/lualatex-tds2.ini b/Master/texmf-dist/source/latex/latex-tds/tex/lualatex-tds2.ini
index f35f3b57377..f98717f59fb 100644
--- a/Master/texmf-dist/source/latex/latex-tds/tex/lualatex-tds2.ini
+++ b/Master/texmf-dist/source/latex/latex-tds/tex/lualatex-tds2.ini
@@ -1,6 +1,6 @@
 % lualatex-tds.ini
-% 2011/07/25 v1.0
-% Copyright 2011 Heiko Oberdiek
+% 2014/05/15 v1.9
+% Copyright 2011, 2014 Heiko Oberdiek
 %
 % This file is part of project `latex-tds'.
 %
@@ -25,6 +25,8 @@
 %  * Patch for `inputenc' 2014/04/20 v1.2a.
 % 2014/04/30 v1.8:
 %  * Patch for `inputenc' 2014/04/30 v1.2b no longer needed.
+% 2014/05/15 v1.9
+%  * Patch for `expl3': Put `\directlua' in `\everyjob'.
 %
 \input lualatexiniconfig.tex
 \input pdftexconfig %
@@ -95,6 +97,7 @@
 \RequirePackage{expl3}%
 \RequirePackage{xparse}%
 \RequirePackage{calc}%
+\input{fix-expl3-lua.ini}%
 \let\dump\SavedDump
 \let\SavedDump\UNDEFINED
 \dump