From e8d91b42178070fb0451ef3490d3d570da269183 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 20 Apr 2011 23:12:15 +0000 Subject: latex-tds (19apr11) git-svn-id: svn://tug.org/texlive/trunk@22144 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/source/latex/latex-tds/build.pl | 50 ++++++++++++++++++-- .../source/latex/latex-tds/lib/adjust_checksum.pl | 9 ++-- .../source/latex/latex-tds/lib/ziptimetree.pl | 11 +++-- .../source/latex/latex-tds/patch/lppl.tex.diff | 54 ++++++++++++++++++++++ .../texmf-dist/source/latex/latex-tds/readme.txt | 15 +++++- .../source/latex/latex-tds/tex/tools.tex | 4 +- 6 files changed, 127 insertions(+), 16 deletions(-) create mode 100644 Master/texmf-dist/source/latex/latex-tds/patch/lppl.tex.diff (limited to 'Master/texmf-dist/source') diff --git a/Master/texmf-dist/source/latex/latex-tds/build.pl b/Master/texmf-dist/source/latex/latex-tds/build.pl index 86580737003..e2921134776 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.154 $'); -my $date = cvs('$Date: 2010/10/27 04:46:52 $'); +my $version = cvs('$Revision: 1.157 $'); +my $date = cvs('$Date: 2011/04/18 20:00:10 $'); my $author = 'Heiko Oberdiek'; -my $copyright = "Copyright 2006-2010 $author"; +my $copyright = "Copyright 2006-2011 $author"; chomp(my $license = <<"END_LICENSE"); % $copyright % @@ -73,6 +73,7 @@ my $dir_license = 'license'; my $dir_tex = 'tex'; my $dir_patch = 'patch'; my $dir_distrib = 'distrib'; +my $dir_texmf = "texmf"; chomp(my $cwd = `pwd`); my $jar_pdfbox_rewrite = "$cwd/$dir_lib/pdfbox-rewrite.jar"; @@ -110,6 +111,7 @@ my $prg_rm = "rm"; my $prg_rsync = "rsync"; my $prg_sed = "sed"; my $prg_sort = "sort"; +my $prg_texhash = "texhash"; my $prg_unzip = 'unzip'; my $prg_weave = 'weave'; my $prg_wget = 'wget'; @@ -121,6 +123,12 @@ $ENV{'BSTINPUTS'} = '.:texmf/bibtex//:'; # amslatex $ENV{'TFMFONTS'} = 'texmf/fonts/tfm//:'; # psnfss $ENV{'VFFONTS'} = 'texmf/fonts/vf//:'; # psnfss $ENV{'INDEXSTYLE'} = '.:texmf/makeindex//:'; # babel +if ($ENV{'TEXMFHOME'}) { + $ENV{'TEXMFHOME'} = "$cwd/$dir_texmf:${'TEXMFHOME'}"; +} +else { + $ENV{'TEXMFHOME'} = "$cwd/$dir_texmf:"; +} sub install ($@); sub final_begin (); @@ -253,6 +261,7 @@ if (@list_modules > 0) { download_err('lb2'); download_err('lgc2'); download_err('tlc2'); + download_ctan_file('armtex.zip', 'language/armenian'); } ### Remove previous build @@ -338,6 +347,9 @@ section('Unpacking'); "$dir_incoming_ctan/doc.zip", "$dir_build/base"); run("$prg_cp -p $dir_build/base/doc/*.tex $dir_build/base/"); + unpacking('base', + "$dir_incoming_ctan/armtex.zip", + "$dir_build/base"); } map { unpack_ctan($_); } @required_list; if ($modules{'amslatex'}) { @@ -578,6 +590,7 @@ section('Patches after source install'); patch('base/encguide.tex'); patch('base/source2e.tex'); patch('base/utf8ienc.dtx'); + patch('base/lppl.tex'); } if ($modules{'knuth'}) { @@ -617,6 +630,13 @@ section('Docstrip'); docstrip('graphics', 'graphics-drivers'); docstrip('tools', 'tools'); docstrip('babel', 'babel'); + + # patch for amsthm.sty, part 1/2 + if ($modules{'amslatex'}) { + chdir "$dir_build/amslatex/amscls"; + run("$prg_docstrip ams-c1.ins"); + chdir $cwd; + } } section('TDS cleanup'); @@ -793,6 +813,15 @@ section('Install tex doc'); ]); chdir $cwd; } + + # patch for amsthm.sty, part 2/2 + if ($modules{'amslatex'}) { + chdir "$dir_build/amslatex/amscls"; + my $dest_dir = '../texmf/tex/latex/amscls'; + ensure_directory($dest_dir); + install($dest_dir, 'amsthm.sty'); + chdir $cwd; + } my $dummy = <<'END_DUMMY'; if ($modules{'babel'}) { @@ -812,6 +841,21 @@ my $dummy = <<'END_DUMMY'; END_DUMMY } +### Preparation for documentation +if ($modules{'base'}) { + my $dir_src = "$dir_build/base/armtex"; + my $tds_mf = "$dir_texmf/fonts/source/public/armtex"; + my $tds_tfm = "$dir_texmf/fonts/tfm/public/armtex"; + my $tds_latex = "$dir_texmf/tex/latex/armtex"; + my @tds_mf = map {chomp;$_} glob "$dir_src/mf/*.mf"; + my @tds_tfm = map {chomp;$_} glob "$dir_src/tfm/*.tfm"; + my @tds_latex = map {chomp;$_} glob "$dir_src/latex/*.*"; + install($tds_mf, @tds_mf); + install($tds_tfm, @tds_tfm); + install($tds_latex, @tds_latex); + run("$prg_texhash $dir_texmf"); +} + ### Generate documentation for base if ($modules{'base'}) { section('Documenation: base'); diff --git a/Master/texmf-dist/source/latex/latex-tds/lib/adjust_checksum.pl b/Master/texmf-dist/source/latex/latex-tds/lib/adjust_checksum.pl index e9c2903699e..c62525391c0 100755 --- a/Master/texmf-dist/source/latex/latex-tds/lib/adjust_checksum.pl +++ b/Master/texmf-dist/source/latex/latex-tds/lib/adjust_checksum.pl @@ -5,7 +5,7 @@ $^W=1; # turn warning on # # adjust_checksum.pl # -# Copyright (C) 2006-2008 by Heiko Oberdiek +# Copyright (C) 2006-2011 by Heiko Oberdiek # # This work may be distributed and/or modified under the # conditions of the LaTeX Project Public License, either @@ -26,10 +26,10 @@ $^W=1; # turn warning on # my $file = "adjust_checksum.pl"; my $program = uc($&) if $file =~ /^\w+/; -my $version = "1.4"; -my $date = "2008/07/16"; +my $version = "1.5"; +my $date = "2011/04/15"; my $author = "Heiko Oberdiek"; -my $copyright = "Copyright (c) 2002, 2006-2008 by $author."; +my $copyright = "Copyright (c) 2002, 2006-2011 by $author."; # # Reqirements: Perl5, Linux # History: @@ -38,6 +38,7 @@ my $copyright = "Copyright (c) 2002, 2006-2008 by $author."; # 2007/06/15 v1.2: -draftmode added. # 2007/09/25 v1.3: ltxdoc.cfg added to speed up. # 2008/07/16 v1.4: Use of package `syntonly' for speed. +# 2011/04/15 v1.5: Email address updated. # my $prg_latex = 'latex -draftmode'; diff --git a/Master/texmf-dist/source/latex/latex-tds/lib/ziptimetree.pl b/Master/texmf-dist/source/latex/latex-tds/lib/ziptimetree.pl index 29633055da6..9bc2c4ef99d 100755 --- a/Master/texmf-dist/source/latex/latex-tds/lib/ziptimetree.pl +++ b/Master/texmf-dist/source/latex/latex-tds/lib/ziptimetree.pl @@ -8,7 +8,7 @@ $^W=1; # turn warning on # Packs a directory tree into a ZIP file with sorted entries # and corrects file permissions and directory dates. # -# Copyright 2006 Heiko Oberdiek. +# Copyright 2006, 2011 Heiko Oberdiek. # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -25,19 +25,20 @@ $^W=1; # turn warning on # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, # MA 02110-1301 USA # -# Address: oberdiek at uni-freiburg.de +# Address: heiko.oberdiek at googlemail.com # my $file = 'ziptimetree'; my $program = 'ZIP-TimeTree'; -my $version = '1.2'; -my $date = '2006/06/15'; +my $version = '1.3'; +my $date = '2011/04/15'; my $author = 'Heiko Oberdiek'; -my $copyright = "Copyright (C) 2006 by $author."; +my $copyright = "Copyright (C) 2006, 2011 by $author."; # # History: # 2006/06/04 v1.0: First release. # 2006/06/07 v1.1: License LGPL. # 2006/06/15 v1.2: Small correction in option code. +# 2011/04/15 v1.3: Email address updated. ### program identification my $title = "$program $version, $date - $copyright\n"; diff --git a/Master/texmf-dist/source/latex/latex-tds/patch/lppl.tex.diff b/Master/texmf-dist/source/latex/latex-tds/patch/lppl.tex.diff new file mode 100644 index 00000000000..925431efda2 --- /dev/null +++ b/Master/texmf-dist/source/latex/latex-tds/patch/lppl.tex.diff @@ -0,0 +1,54 @@ +*** lppl.tex.org 2009-02-17 12:41:18.000000000 +0100 +--- lppl.tex 2011-03-10 16:12:27.000000000 +0100 +*************** +*** 213,219 **** + modified version of this component to the user when used + interactively with that Base Interpreter. + +! \item Every component of the Derived Work contains prominent + notices detailing the nature of the changes to that component, + or a prominent reference to another file that is distributed as + part of the Derived Work and that contains a complete and +--- 213,219 ---- + modified version of this component to the user when used + interactively with that Base Interpreter. + +! \item\label{LPPL:item:changelog} Every component of the Derived Work contains prominent + notices detailing the nature of the changes to that component, + or a prominent reference to another file that is distributed as + part of the Derived Work and that contains a complete and +*************** +*** 226,232 **** + of the Derived Work unless those persons have stated explicitly + that they do provide such support for the Derived Work. + +! \item You distribute at least one of the following with the Derived Work: + \begin{enumerate} + \item A complete, unmodified copy of the Work; if your + distribution of a modified component is made by offering +--- 226,232 ---- + of the Derived Work unless those persons have stated explicitly + that they do provide such support for the Derived Work. + +! \item\label{LPPL:item:unmodifiedcopy} You distribute at least one of the following with the Derived Work: + \begin{enumerate} + \item A complete, unmodified copy of the Work; if your + distribution of a modified component is made by offering +*************** +*** 482,488 **** + themselves with the case that a Derived Work is intended to be used + as a (compatible or incompatible) replacement of the original + Work. If this is not the case (e.g., if a few lines of code are +! reused for a completely different task), then clauses 6b and 6d + shall not apply. + + \LPPLsubsubsection{Important Recommendations} +--- 482,489 ---- + themselves with the case that a Derived Work is intended to be used + as a (compatible or incompatible) replacement of the original + Work. If this is not the case (e.g., if a few lines of code are +! reused for a completely different task), then clauses +! \ref{LPPL:item:changelog} and \ref{LPPL:item:unmodifiedcopy} + shall not apply. + + \LPPLsubsubsection{Important Recommendations} diff --git a/Master/texmf-dist/source/latex/latex-tds/readme.txt b/Master/texmf-dist/source/latex/latex-tds/readme.txt index d2a0cc96090..be3b294e605 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, 2010/10/27 +readme.txt for project latex-tds, 2011/04/18 TABLE OF CONTENTS ================= @@ -179,7 +179,7 @@ Hints D. COPYRIGHT, LICENSE ===================== -Copyright 2006-2009 Heiko Oberdiek. +Copyright 2006-2011 Heiko Oberdiek. License is LPPL 1.3c: @@ -264,6 +264,7 @@ Patches patch/amsldoc.tex.diff patch for amslatex/amsldoc.tex patch/encguide.tex.diff patch for base/encguide.tex patch/logmac.tex.diff patch for knuth/errata/logmac.tex + patch/lppl.tex.diff patch for base/lppl.tex patch/source2e.tex.diff patch for base/source2e.tex patch/tripman.tex.diff patch for knuth/tex/tripman.tex patch/trapman.tex.diff patch for knuth/mf/trapman.tex @@ -304,6 +305,8 @@ Base * source2e.pdf is used instead of many single lt*.pdf files. * ltnews.pdf is introduced to avoid cluttering the doc directory with many single sheet ltnews*.pdf files. +* The patch for lppl.tex only replaces the explicite references + "6b" and "6d" by \label and \ref. * ... Tools @@ -550,3 +553,11 @@ I. HISTORY * Module amslatex: amscls and amsrefs updated. * Module etex added (only for etex_man). * Erratas updated. +2011/03/10 + * Module base: patch for latex/4148 (Missing \label and \ref in lppl.tex'') +2011/04/18 + * Module amslatex: There is an outdated version of amsthm.sty in + CTAN:install/macros/latex/required/amslatex/amscls.tds.zip. + The package amsthm.sty is now generated from the source. + * Using TDS tree for missing packages that are not part of TeX Live. + Module base: CTAN:language/armenian/armtex.zip 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 e1be214e3a2..0e946bb82b5 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}% - [2010/10/27 Tools overview (HO)] -% Copyright 2006-2010 Heiko Oberdiek + [2011/04/18 Tools overview (HO)] +% Copyright 2006-2011 Heiko Oberdiek % % This file is part of project `latex-tds'. % -- cgit v1.2.3