From 96a46118adf4860be66ada6b0bf29cb164f422d9 Mon Sep 17 00:00:00 2001 From: Manuel Pégourié-Gonnard Date: Tue, 9 Sep 2008 20:25:15 +0000 Subject: latex-tds 2008/09/06 git-svn-id: svn://tug.org/texlive/trunk@10527 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/source/latex/latex-tds/build.pl | 36 +++++++++++++-- .../source/latex/latex-tds/patch/array.dtx.diff | 34 ++++++++++++++ .../texmf-dist/source/latex/latex-tds/readme.txt | 13 +++++- .../source/latex/latex-tds/tex/errata.cfg | 52 +++++++++++++++++++++- .../source/latex/latex-tds/tex/manual.cfg | 24 +++++++--- .../source/latex/latex-tds/tex/texput.log | 19 ++++++++ .../source/latex/latex-tds/tex/tools.tex | 2 +- 7 files changed, 166 insertions(+), 14 deletions(-) create mode 100644 Master/texmf-dist/source/latex/latex-tds/patch/array.dtx.diff create mode 100644 Master/texmf-dist/source/latex/latex-tds/tex/texput.log (limited to 'Master') diff --git a/Master/texmf-dist/source/latex/latex-tds/build.pl b/Master/texmf-dist/source/latex/latex-tds/build.pl index cbee38a35a5..a8e1e617026 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.138 $'); -my $date = cvs('$Date: 2008/08/10 19:15:42 $'); +my $version = cvs('$Revision: 1.140 $'); +my $date = cvs('$Date: 2008/09/06 12:58:57 $'); my $author = 'Heiko Oberdiek'; my $copyright = "Copyright 2006-2008 $author"; chomp(my $license = <<"END_LICENSE"); @@ -34,6 +34,7 @@ my $time_start = time; my $url_ctan = 'ftp://dante.ctan.org/tex-archive'; my $url_ams = 'ftp://ftp.ams.org/pub/tex'; +my $url_ltxprj = 'http://www.latex-project.org/'; my @required_list = ( 'amslatex', @@ -65,6 +66,7 @@ my $error = "!!! Error:"; my $dir_incoming = 'incoming'; my $dir_incoming_ctan = "$dir_incoming/ctan"; my $dir_incoming_ams = "$dir_incoming/ams"; +my $dir_incoming_ltxprj = "$dir_incoming/ltxprj"; my $dir_build = 'build'; my $dir_lib = 'lib'; my $dir_license = 'license'; @@ -195,6 +197,12 @@ if (@list_modules > 0) { download("$dir_incoming_ams/$file.zip", "$url_ams/$ams_path$file.zip"); } + sub download_err ($) { + my $name = shift; + ensure_directory($dir_incoming_ltxprj); + download("$dir_incoming_ltxprj/$name.err", + "$url_ltxprj/guides/$name.err"); + } sub download ($$) { my $file = shift; my $url = shift; @@ -209,7 +217,7 @@ if (@list_modules > 0) { run($cmd); -f $file or die "$error Download failed ($url)!\n"; } - + download_ctan('base', 'macros/latex'); download_ctan('tools', 'macros/latex/required'); download_ctan('graphics', 'macros/latex/required'); @@ -231,6 +239,10 @@ if (@list_modules > 0) { download_ams('amslatex', ''); download_ams('amsrefs-tds', 'amslatex/amsrefs'); download_ams('amsrefs-ctan', 'amslatex/amsrefs'); + download_err('manual'); + download_err('lb2'); + download_err('lgc2'); + download_err('tlc2'); } ### Remove previous build @@ -301,6 +313,17 @@ section('Unpacking'); ensure_directory($dir_build); unpack_ctan('base'); + # replace .err files + foreach my $name (qw[ + lb2 + lgc2 + manual + tlc2 + ]) { + my $file = "$dir_incoming_ltxprj/$name.err"; + my $dest = "$dir_build/base/$name.err"; + run("$prg_cp $file $dest"); + } map { unpack_ctan($_); } @required_list; if ($modules{'amslatex'}) { unpack_ams('amsrefs-tds'); @@ -336,6 +359,10 @@ section('Patches'); if ($modules{'base'}) { patch("base/classes.dtx"); } + + if ($modules{'tools'}) { + patch("tools/array.dtx"); + } if ($modules{'psnfss'}) { chdir "$dir_build/psnfss"; @@ -509,7 +536,7 @@ section('Install source'); } ### Patch source files after source install -section('Paches after source install'); +section('Patches after source install'); { if ($modules{'base'}) { chdir "$dir_build/base"; @@ -863,6 +890,7 @@ if ($modules{'base'}) { map { book_err $_ } qw[ tlc2 lb2 + lgc2 grphcomp webcomp webcompg diff --git a/Master/texmf-dist/source/latex/latex-tds/patch/array.dtx.diff b/Master/texmf-dist/source/latex/latex-tds/patch/array.dtx.diff new file mode 100644 index 00000000000..4d85217928e --- /dev/null +++ b/Master/texmf-dist/source/latex/latex-tds/patch/array.dtx.diff @@ -0,0 +1,34 @@ +*** array.dtx.org 2006-05-21 19:28:12.000000000 +0200 +--- array.dtx 2008-09-06 02:37:03.000000000 +0200 +*************** +*** 27,32 **** +--- 27,36 ---- + %<+package>\ProvidesPackage{array} + %<+package> [2005/08/23 v2.4b Tabular extension package (FMi)] + % ++ % *** 2008/09/06 Heiko Oberdiek, project `latex-tds': *** ++ % *** The description of \arraybackslash is fixed, *** ++ % *** see LaTeX bug report `tools/4044'. *** ++ % + % \fi + % + % \CheckSum{1115} +*************** +*** 1939,1946 **** + % + % \begin{macro}{\arraybackslash} + % \changes{v2.4a}{2003/12/17}{(DPC) Macro added (from tabularx)} +! % Restore |\\| for use in array and tabular environment (after +! % |\raggedright| etc.). + % \begin{macrocode} + \def\arraybackslash{\let\\\tabularnewline} + % \end{macrocode} +--- 1943,1950 ---- + % + % \begin{macro}{\arraybackslash} + % \changes{v2.4a}{2003/12/17}{(DPC) Macro added (from tabularx)} +! % Restore =\\= for use in array and tabular environment (after +! % =\raggedright= etc.). + % \begin{macrocode} + \def\arraybackslash{\let\\\tabularnewline} + % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/latex-tds/readme.txt b/Master/texmf-dist/source/latex/latex-tds/readme.txt index 9234c6e2900..eb4966270d2 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, 2008/08/10 +readme.txt for project latex-tds, 2008/09/06 TABLE OF CONTENTS ================= @@ -61,6 +61,10 @@ In the following I will use the term `module' for a package bundle. Module list ----------- * base CTAN:macros/latex/base.zip + http://www.latex-project.org/guides/lb2.err + http://www.latex-project.org/guides/lgc2.err + http://www.latex-project.org/guides/manual.err + http://www.latex-project.org/guides/tlc2.err * tools CTAN:macros/latex/required/tools.zip * cyrillic CTAN:macros/latex/required/cyrillic.zip * amslatex CTAN:macros/latex/required/amslatex.zip @@ -248,6 +252,7 @@ Documentation driver Patches ------- + patch/array.dtx.diff patch for tools/array.dtx patch/classes.dtx.diff patch for base/classes.dtx patch/encguide.tex.diff patch for base/encguide.tex patch/logmac.tex.diff patch for knuth/errata/logmac.tex @@ -509,3 +514,9 @@ I. HISTORY * Module base: CTAN hyperlinks fixed. * Module amslatex: Outdated URL fixed in amsldoc.tex. * Module babel: Problem with already defined \meta in tb1604.tex fixed. +2008/09/06 + * Module base: + * Using uptodate versions from LaTeX project page for errata lists. + * lgc2.err added (LaTeX Graphics Companiong, 2. ed.). + * Various fixes in errata lists. + * Module tools/array.dtx: documentation fixed (tools/4044). diff --git a/Master/texmf-dist/source/latex/latex-tds/tex/errata.cfg b/Master/texmf-dist/source/latex/latex-tds/tex/errata.cfg index ed7f481a76f..8c215d78d57 100644 --- a/Master/texmf-dist/source/latex/latex-tds/tex/errata.cfg +++ b/Master/texmf-dist/source/latex/latex-tds/tex/errata.cfg @@ -1,8 +1,8 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesFile{errata.cfg}% - [2006/06/02 v1.0 latex-tds: errata.cls configuration (HO)] + [2008/09/06 v1.1 latex-tds: errata.cls configuration (HO)] % -% Copyright 2006 Heiko Oberdiek +% Copyright 2006, 2008 Heiko Oberdiek % % This file is part of project `latex-tds'. % @@ -43,6 +43,54 @@ \hypersetup{% pdfsubject={Errata list}% }% +} +\AtBeginDocument{% \showallerrors + \renewcommand*{\myprinting}{1}% } +\begingroup + \edef\x{\jobname}% + \edef\y{\detokenize{lb2}}% +\expandafter\endgroup +\ifx\x\y + \AtBeginDocument{% + \renewcommand*{\printedentries}{bis zum}% + \hypersetup{% + pdftitle={Der LaTeX Begleiter, 2. Auflage}% + }% + \renewcommand\erratatitle[2]{% + \begin{center}\LARGE\bfseries + Errataliste für #1\\[5pt](\myprinting.\ Druck)\\[10pt]% + \small Enthält alle Einträge, die \printedentries\space #2 % + gemeldet wurden\\ + (Für andere Zeiträume/Druckausgaben ändert man die \texttt{.cfg} % + Datei und formatiert erneut.) + \end{center}% + \markright{Errata für #1 (\printedentries\space #2)}% + \thispagestyle{plain}% + \vspace{20pt}% + }% + }% +\fi +\begingroup + \edef\x{\jobname}% + \edef\y{\detokenize{webcompg}}% +\expandafter\endgroup +\ifx\x\y + \AtBeginDocument{% + \renewcommand*{\printedentries}{bis zum}% + }% + \AtEndOfClass{% + \renewcommand*{\erratatitle}[2]{% + \begin{center}\LARGE\bfseries + Errata list f\"ur #1\\[5pt](\myprinting.\ Druck)\\[10pt] + \large Enth\"alt alle Eintr\"age, die \printedentries\space #2 % + gemeldet wurden % + \end{center}% + \markright{Errata f\"ur #1 (\printedentries\space #2)}% + \thispagestyle{plain}% + \vspace{20pt}% + }% + }% +\fi \endinput diff --git a/Master/texmf-dist/source/latex/latex-tds/tex/manual.cfg b/Master/texmf-dist/source/latex/latex-tds/tex/manual.cfg index e508a715000..d3bfbf83432 100644 --- a/Master/texmf-dist/source/latex/latex-tds/tex/manual.cfg +++ b/Master/texmf-dist/source/latex/latex-tds/tex/manual.cfg @@ -1,8 +1,8 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesFile{manual.cfg}% - [2006/06/02 v1.0 latex-tds: manual.err configuration (HO)] + [2008/09/06 v1.1 latex-tds: manual.err configuration (HO)] % -% Copyright 2006 Heiko Oberdiek +% Copyright 2006, 2008 Heiko Oberdiek % % This file is part of project `latex-tds'. % @@ -29,15 +29,27 @@ \renewcommand*{\subsection}{% \@ifstar\ERR@subsection\ERR@subsection } +\def\ERR@all{Errors in All Printings} \newcommand*{\ERR@subsection}[1]{% - \SAVED@subsection{% - \texorpdfstring{#1}{% - \ERR@strip #1\@nil + \def\ERR@string{#1}% + \ifx\ERR@string\ERR@all + \SAVED@subsection{% + \texorpdfstring{#1}{All Printings}% }% - }% + \else + \SAVED@subsection{% + \texorpdfstring{#1}{% + \ERR@strip #1\@nil + }% + }% + \fi } \def\ERR@strip Error#1 Corrected in the #2\@nil{#2} \renewcommand*{\subsubsection}{% \@ifstar\SAVED@subsubsection\SAVED@subsubsection } +\AtBeginDocument{% + \def\xpmd Last modified % + on #1 #2 #3 #4 at #5:#6:#7 #8 by #9 endypmd{#3 #2, #4}% +} \endinput diff --git a/Master/texmf-dist/source/latex/latex-tds/tex/texput.log b/Master/texmf-dist/source/latex/latex-tds/tex/texput.log new file mode 100644 index 00000000000..77b351ab864 --- /dev/null +++ b/Master/texmf-dist/source/latex/latex-tds/tex/texput.log @@ -0,0 +1,19 @@ +This is pdfTeX, Version 3.1415926-1.40.9 (Web2C 7.5.7) (format=pdflatex 2008.7.11) 6 SEP 2008 01:38 +entering extended mode +**tlc2.err + +! Emergency stop. +<*> tlc2.err + +End of file on the terminal! + + +Here is how much of TeX's memory you used: + 4 strings out of 94836 + 99 string characters out of 1179934 + 47734 words of memory out of 2000000 + 3310 multiletter control sequences out of 10000+50000 + 3640 words of font info for 14 fonts, out of 500000 for 1000 + 198 hyphenation exceptions out of 1000 + 0i,0n,0p,1b,6s stack positions out of 1500i,500n,5000p,200000b,5000s +! ==> Fatal error occurred, no output PDF file produced! 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 5d64acd0e36..26def841c04 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}% - [2008/08/10 Tools overview (HO)] + [2008/09/06 Tools overview (HO)] % Copyright 2006-2008 Heiko Oberdiek % % This file is part of project `latex-tds'. -- cgit v1.2.3