diff options
6 files changed, 112 insertions, 35 deletions
diff --git a/Master/texmf-dist/source/latex/latex-tds/build.pl b/Master/texmf-dist/source/latex/latex-tds/build.pl index 346fb7f25ad..c8b10439425 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.141 $'); -my $date = cvs('$Date: 2008/09/10 14:22:05 $'); +my $version = cvs('$Revision: 1.145 $'); +my $date = cvs('$Date: 2009/09/09 07:40:24 $'); my $author = 'Heiko Oberdiek'; -my $copyright = "Copyright 2006-2008 $author"; +my $copyright = "Copyright 2006-2009 $author"; chomp(my $license = <<"END_LICENSE"); % $copyright % @@ -393,7 +393,7 @@ section('Patches'); if ($modules{'amslatex'}) { patch("amslatex/math/amsldoc.tex"); } - + # if ($modules{'babel'}) { # map { patch("babel/$_"); } qw[ # ]; @@ -590,6 +590,10 @@ section('Patches after source install'); } } + + if ($modules{'amslatex'}) { + patch("amslatex/classes/amsclass.dtx"); + } } ### Docstrip @@ -1397,6 +1401,20 @@ if ($modules{'latex3'}) { 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; @@ -1412,14 +1430,30 @@ if ($modules{'latex3'}) { install_pdf($pkg, $name); } - simple3_doc('expl3', 'expl3', 'drv'); - simple3_doc('expl3', 'l32eproc', 'drv'); - source3_doc('expl3', 'source3'); + # 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'); - simple3_doc('xpackages', 'ldcsetup', 'dtx'); - simple3_doc('xpackages', 'template', 'dtx'); - simple3_doc('xpackages', 'xparse', 'dtx'); - simple3_doc('xpackages', 'xtheorem', 'dtx'); + run("$prg_rm -rf texmf/{doc,source,tex}/latex/expl3 texmf/makeindex"); chdir $cwd; } diff --git a/Master/texmf-dist/source/latex/latex-tds/patch/amsclass.dtx.diff b/Master/texmf-dist/source/latex/latex-tds/patch/amsclass.dtx.diff new file mode 100644 index 00000000000..410886004c3 --- /dev/null +++ b/Master/texmf-dist/source/latex/latex-tds/patch/amsclass.dtx.diff @@ -0,0 +1,19 @@ +*** amsclass.dtx.org 2009-07-02 18:05:00.000000000 +0200 +--- amsclass.dtx 2009-09-05 03:09:04.000000000 +0200 +*************** +*** 36,42 **** + \author{American Mathematical Society\\Michael Downes\\ + updated by Barbara Beeton} + \date{Version \fileversion, \filedate} +! \hDocInput{amsclass.dtx} + \end{document} + %</driver> + % \fi +--- 36,42 ---- + \author{American Mathematical Society\\Michael Downes\\ + updated by Barbara Beeton} + \date{Version \fileversion, \filedate} +! \DocInput{amsclass.dtx} + \end{document} + %</driver> + % \fi diff --git a/Master/texmf-dist/source/latex/latex-tds/readme.txt b/Master/texmf-dist/source/latex/latex-tds/readme.txt index 1359c72317e..dbe430e5193 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/09/10 +readme.txt for project latex-tds, 2009/09/05 TABLE OF CONTENTS ================= @@ -164,12 +164,18 @@ 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. D. COPYRIGHT, LICENSE ===================== -Copyright 2006-2008 Heiko Oberdiek. +Copyright 2006-2009 Heiko Oberdiek. License is LPPL 1.3c: @@ -249,9 +255,12 @@ Documentation driver 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 ------- + patch/amsclass.dtx.diff patch for amslatex/amsclass.dtx + patch/amsldoc.tex.diff patch for amslatex/amsldoc.tex 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 @@ -518,8 +527,12 @@ I. HISTORY 2008/09/06 * Module base: * Using uptodate versions from LaTeX project page for errata lists. - * lgc2.err added (LaTeX Graphics Companiong, 2. ed.). + * lgc2.err added (LaTeX Graphics Companion, 2. ed.). * Various fixes in errata lists. * Module tools/array.dtx: documentation fixed (tools/4044). 2008/09/10 * Module base: Missing title date for utf8ienc.pdf fixed. +2009/09/05 + * Module amslatex: updated. + * Module latex3: xpackages updated. + * Module latex3: expl3 removed, because nothing to do. diff --git a/Master/texmf-dist/source/latex/latex-tds/tex/texput.log b/Master/texmf-dist/source/latex/latex-tds/tex/texput.log deleted file mode 100644 index 77b351ab864..00000000000 --- a/Master/texmf-dist/source/latex/latex-tds/tex/texput.log +++ /dev/null @@ -1,19 +0,0 @@ -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 c966873b3b8..e4b1471ec87 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}% - [2008/09/10 Tools overview (HO)] -% Copyright 2006-2008 Heiko Oberdiek + [2009/09/09 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 new file mode 100644 index 00000000000..0f5c260898b --- /dev/null +++ b/Master/texmf-dist/source/latex/latex-tds/tex/xparse.drv @@ -0,0 +1,30 @@ +\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 |