summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xBuild/cdbuild/ctan2tds.pl33
-rwxr-xr-xBuild/tools/tpm-ctan-check2
-rw-r--r--Master/texmf-dist/doc/latex/tools/afterpage.pdfbin99206 -> 91600 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tools/array.pdfbin281823 -> 394069 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tools/bm.pdfbin191604 -> 176662 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tools/calc.pdfbin192036 -> 207907 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tools/changes.txt113
-rw-r--r--Master/texmf-dist/doc/latex/tools/dcolumn.pdfbin108119 -> 100257 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tools/delarray.pdfbin91713 -> 85098 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tools/enumerate.pdfbin101899 -> 94727 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tools/fileerr.pdfbin92763 -> 87844 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tools/fontsmpl.pdfbin76812 -> 71951 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tools/ftnright.pdfbin200147 -> 202204 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tools/hhline.pdfbin95510 -> 89325 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tools/indentfirst.pdfbin64722 -> 59758 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tools/layout.pdfbin144553 -> 132827 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tools/longtable.pdfbin232453 -> 220792 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tools/manifest.txt8
-rw-r--r--Master/texmf-dist/doc/latex/tools/multicol.pdfbin303993 -> 343284 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tools/rawfonts.pdfbin67548 -> 61808 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tools/readme.txt8
-rw-r--r--Master/texmf-dist/doc/latex/tools/showkeys.pdfbin138465 -> 131251 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tools/somedefs.pdfbin77163 -> 70716 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tools/tabularx.pdfbin160332 -> 149967 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tools/theorem.pdfbin198616 -> 202453 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tools/tools.pdfbin0 -> 45005 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tools/trace.pdfbin128514 -> 119640 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tools/varioref.pdfbin196619 -> 211460 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tools/verbatim.pdfbin211266 -> 195884 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tools/xr.pdfbin80913 -> 75447 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tools/xspace.pdfbin85580 -> 117213 bytes
-rw-r--r--Master/texmf-dist/source/latex/tools/afterpage.dtx8
-rw-r--r--Master/texmf-dist/source/latex/tools/array.dtx15
-rw-r--r--Master/texmf-dist/source/latex/tools/bm.dtx8
-rw-r--r--Master/texmf-dist/source/latex/tools/calc.dtx583
-rw-r--r--Master/texmf-dist/source/latex/tools/dcolumn.dtx8
-rw-r--r--Master/texmf-dist/source/latex/tools/delarray.dtx8
-rw-r--r--Master/texmf-dist/source/latex/tools/enumerate.dtx8
-rw-r--r--Master/texmf-dist/source/latex/tools/fileerr.dtx8
-rw-r--r--Master/texmf-dist/source/latex/tools/fontsmpl.dtx8
-rw-r--r--Master/texmf-dist/source/latex/tools/ftnright.dtx8
-rw-r--r--Master/texmf-dist/source/latex/tools/hhline.dtx8
-rw-r--r--Master/texmf-dist/source/latex/tools/indentfirst.dtx8
-rw-r--r--Master/texmf-dist/source/latex/tools/layout.dtx8
-rw-r--r--Master/texmf-dist/source/latex/tools/longtable.dtx8
-rw-r--r--Master/texmf-dist/source/latex/tools/multicol.dtx30
-rw-r--r--Master/texmf-dist/source/latex/tools/rawfonts.dtx8
-rw-r--r--Master/texmf-dist/source/latex/tools/showkeys.dtx207
-rw-r--r--Master/texmf-dist/source/latex/tools/somedefs.dtx8
-rw-r--r--Master/texmf-dist/source/latex/tools/tabularx.dtx8
-rw-r--r--Master/texmf-dist/source/latex/tools/theorem.dtx8
-rw-r--r--Master/texmf-dist/source/latex/tools/tools.ins16
-rw-r--r--Master/texmf-dist/source/latex/tools/trace.dtx8
-rw-r--r--Master/texmf-dist/source/latex/tools/varioref.dtx224
-rw-r--r--Master/texmf-dist/source/latex/tools/verbatim.dtx8
-rw-r--r--Master/texmf-dist/source/latex/tools/xr.dtx8
-rw-r--r--Master/texmf-dist/source/latex/tools/xspace.dtx481
-rw-r--r--Master/texmf-dist/tex/latex/tools/.tex8
-rw-r--r--Master/texmf-dist/tex/latex/tools/afterpage.sty8
-rw-r--r--Master/texmf-dist/tex/latex/tools/array.sty12
-rw-r--r--Master/texmf-dist/tex/latex/tools/bm.sty8
-rw-r--r--Master/texmf-dist/tex/latex/tools/calc.sty179
-rw-r--r--Master/texmf-dist/tex/latex/tools/dcolumn.sty8
-rw-r--r--Master/texmf-dist/tex/latex/tools/delarray.sty8
-rw-r--r--Master/texmf-dist/tex/latex/tools/e.tex8
-rw-r--r--Master/texmf-dist/tex/latex/tools/enumerate.sty8
-rw-r--r--Master/texmf-dist/tex/latex/tools/fontsmpl.sty8
-rw-r--r--Master/texmf-dist/tex/latex/tools/fontsmpl.tex8
-rw-r--r--Master/texmf-dist/tex/latex/tools/ftnright.sty8
-rw-r--r--Master/texmf-dist/tex/latex/tools/h.tex8
-rw-r--r--Master/texmf-dist/tex/latex/tools/hhline.sty8
-rw-r--r--Master/texmf-dist/tex/latex/tools/indentfirst.sty8
-rw-r--r--Master/texmf-dist/tex/latex/tools/layout.sty8
-rw-r--r--Master/texmf-dist/tex/latex/tools/longtable.sty8
-rw-r--r--Master/texmf-dist/tex/latex/tools/multicol.sty15
-rw-r--r--Master/texmf-dist/tex/latex/tools/q.tex8
-rw-r--r--Master/texmf-dist/tex/latex/tools/r.tex8
-rw-r--r--Master/texmf-dist/tex/latex/tools/rawfonts.sty8
-rw-r--r--Master/texmf-dist/tex/latex/tools/s.tex8
-rw-r--r--Master/texmf-dist/tex/latex/tools/showkeys.sty130
-rw-r--r--Master/texmf-dist/tex/latex/tools/somedefs.sty8
-rw-r--r--Master/texmf-dist/tex/latex/tools/tabularx.sty8
-rw-r--r--Master/texmf-dist/tex/latex/tools/thb.sty8
-rw-r--r--Master/texmf-dist/tex/latex/tools/thc.sty8
-rw-r--r--Master/texmf-dist/tex/latex/tools/thcb.sty8
-rw-r--r--Master/texmf-dist/tex/latex/tools/theorem.sty8
-rw-r--r--Master/texmf-dist/tex/latex/tools/thm.sty8
-rw-r--r--Master/texmf-dist/tex/latex/tools/thmb.sty8
-rw-r--r--Master/texmf-dist/tex/latex/tools/thp.sty8
-rw-r--r--Master/texmf-dist/tex/latex/tools/trace.sty8
-rw-r--r--Master/texmf-dist/tex/latex/tools/varioref.sty153
-rw-r--r--Master/texmf-dist/tex/latex/tools/verbatim.sty8
-rw-r--r--Master/texmf-dist/tex/latex/tools/verbtest.tex8
-rw-r--r--Master/texmf-dist/tex/latex/tools/x.tex8
-rw-r--r--Master/texmf-dist/tex/latex/tools/xr.sty8
-rw-r--r--Master/texmf-dist/tex/latex/tools/xspace.sty136
-rw-r--r--Master/texmf-dist/tpm/tools.tpm9
-rw-r--r--Master/texmf/lists/tools1
98 files changed, 2025 insertions, 746 deletions
diff --git a/Build/cdbuild/ctan2tds.pl b/Build/cdbuild/ctan2tds.pl
index e18dc521dc1..beb3143c1bc 100755
--- a/Build/cdbuild/ctan2tds.pl
+++ b/Build/cdbuild/ctan2tds.pl
@@ -221,7 +221,7 @@ chdir $startdir || die "chdir($startdir) failed: $!";
'prosper', '&MAKEflatten',
'psfragx', "&MAKEflatten",
'pslatex', "&MAKEpslatex",
- 'psnfss', "&MAKEcopy", # we use latex-tds/psnfss.zip
+ 'psnfss', "&MAKEpsnfss", # we use latex-tds/psnfss.zip
'psnfss-addons', "print \"Not installing psnfss-addons \n\"",
'psnfssx', "&MAKEflatten",
'pst-3dplot', "&MAKEpst",
@@ -1041,11 +1041,6 @@ sub MAKEcopy {
# Ditto CHANGELOG for stellenbosch.
-f "$dest/CHANGELOG"
&& &SYSTEM ("mv $dest/CHANGELOG $dest/doc/$whichdocformat/$package/");
-
- # For latex, we have the complication of the makeindex files. Until
- # Heiko fixes, I guess.
- $package eq "latex"
- && &SYSTEM ("mv $dest/makeindex/base $dest/makeindex/latex");
}
@@ -2575,20 +2570,24 @@ chdir("$packagedir");
}
sub MAKEpsnfss {
-chdir("$packagedir");
-&runjob("mkdir -p $DEST/doc/latex/psnfss");
-&runjob("mkdir -p $DEST/fonts/map/dvips/psnfss");
-&runjob("mkdir -p $DEST/source/latex/psnfss");
-&runjob("$CP *.tex *.txt *.pdf $DEST/doc/latex/psnfss");
-&runjob("$CP *.enc *.dtx *.ins $DEST/source/latex/psnfss");
-&runjob("$CP *.map $DEST/fonts/map/dvips/psnfss");
-&runjob("unzip lw35nfss; unzip freenfss; mv tex fonts $DEST");
-&runjob("latex psfonts.ins; mv *sty $DEST/tex/latex/psnfss ");
+ # we use the psnfss.zip from the latex-tds project.
+ # But we don't want the actual tfm/vf; TL has many more tfm's (in
+ # different packages), and we don't want to mess with that. So just
+ # remove the fonts subdir -- except for the map files, which we do want.
+ #
+ print "\t SPECIAL omit fonts from latex-tds $package\n";
+
+ # Start with the usual straight copy.
+ &MAKEcopy ();
+
+ # Then remove the entire fonts tree.
+ &xchdir ("$DEST/fonts");
+ &SYSTEM ("rm -rf enc tfm vf");
}
-# tds zip file provided, unzip and copy.
-#
sub MAKEkoma {
+ # tds zip file provided, unzip and copy.
+ #
&xchdir ($packagedir);
#
print "\t SPECIAL $package unzip and copy\n";
diff --git a/Build/tools/tpm-ctan-check b/Build/tools/tpm-ctan-check
index c03c8910e8f..6958d7f3af2 100755
--- a/Build/tools/tpm-ctan-check
+++ b/Build/tools/tpm-ctan-check
@@ -86,7 +86,7 @@ sub main
t-angles tabulary tabvar talk tamethebeast tengwarscript tex-refs
texmate texshade
textcase textpos thesis-titlepage-fhac thumbpdf
- titlesec tokenizer totpages trajan tugboat
+ titlesec tokenizer tools totpages trajan tugboat
twoup typedref
vancouver velthuis verse vhistory visualfaq volumes vpe
wordlike wrapfig
diff --git a/Master/texmf-dist/doc/latex/tools/afterpage.pdf b/Master/texmf-dist/doc/latex/tools/afterpage.pdf
index 0b0f697ee9f..614d5b20e7a 100644
--- a/Master/texmf-dist/doc/latex/tools/afterpage.pdf
+++ b/Master/texmf-dist/doc/latex/tools/afterpage.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tools/array.pdf b/Master/texmf-dist/doc/latex/tools/array.pdf
index 5f358bc1e66..a5334788f37 100644
--- a/Master/texmf-dist/doc/latex/tools/array.pdf
+++ b/Master/texmf-dist/doc/latex/tools/array.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tools/bm.pdf b/Master/texmf-dist/doc/latex/tools/bm.pdf
index da23bf57f86..c5c2779f1fb 100644
--- a/Master/texmf-dist/doc/latex/tools/bm.pdf
+++ b/Master/texmf-dist/doc/latex/tools/bm.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tools/calc.pdf b/Master/texmf-dist/doc/latex/tools/calc.pdf
index 848ab957829..74f382597b2 100644
--- a/Master/texmf-dist/doc/latex/tools/calc.pdf
+++ b/Master/texmf-dist/doc/latex/tools/calc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tools/changes.txt b/Master/texmf-dist/doc/latex/tools/changes.txt
index c48f4d1168f..ac509a7f8ac 100644
--- a/Master/texmf-dist/doc/latex/tools/changes.txt
+++ b/Master/texmf-dist/doc/latex/tools/changes.txt
@@ -9,6 +9,119 @@ are not part of the distribution.
=======================================================================
+2006-05-14 Frank Mittelbach <latex-bugs@latex-project.org>
+
+ * varioref.dtx: support for croatian added.
+
+2006-05-08 Morten Hoegholm <latex-bugs@latex-project.org>
+
+ * xspace.dtx: Bug fix for verbatim in output routine.
+
+2006-02-23 Frank Mittelbach <latex-bugs@latex-project.org>
+
+ * multicol.dtx: Added \@minipagefalse to \end@dblfloat. Otherwise
+ that switch may end up being true after a figure* has ended,
+ messing up spacing afterwards randomly.
+
+2006-02-12 Morten Hoegholm <latex-bugs@latex-project.org>
+
+ * xspace.dtx: Modified so the \@let@token can be \outer. Avoid
+ re-doing eTeX setup step multiple times for the original call of
+ \xspace.
+
+2006-01-09 Morten Hoegholm <latex-bugs@latex-project.org>
+
+ * showkeys.dtx: Make \tag* and starred AMS environments work
+ (pr/3693). Fix varioref support so \vref* also works
+ (pr/3373). Added \showkeyslabelformat to avoid hard-wiring the
+ label format.
+
+2005-12-02 Frank Mittelbach <latex-bugs@latex-project.org>
+
+ * varioref.dtx: Bahasa Malaysia defaults added.
+
+2005-11-26 Frank Mittelbach <latex-bugs@latex-project.org>
+
+ * varioref.dtx: Single hyphen rather than -- in range for spanish
+ an galician.
+
+2005-11-10 Frank Mittelbach <latex-bugs@latex-project.org>
+
+ * varioref.dtx: Added a few more brazil strings
+ Added a few more finnish strings
+ Added further galician defaults (and corrected spelling)
+ Corrections in italian strings
+
+2005-10-04 Morten Hoegholm <latex-bugs@latex-project.org>
+
+ * xspace.dtx: Improved expansion method. Added use of higher level
+ functions for conditional processing. Simplified the code so that
+ difference between eTeX and non-eTeX is minimal.
+
+2005-09-27 Frank Mittelbach <latex-bugs@latex-project.org>
+
+ * varioref.dtx: corrected typo in documentation
+
+2005-09-14 Frank Mittelbach <latex-bugs@latex-project.org>
+
+ * varioref.dtx: corrected one default for polish
+
+2005-08-23 Morten Hoegholm <latex-bugs@latex-project.org>
+
+ * array.dtx: Removed spurious space.
+
+2005-08-06 Morten Hoegholm <latex-bugs@latex-project.org>
+
+ * calc.dtx: Improved expansion of arguments, added new
+ commands \maxof, \minof, \totalheightof and
+ \settototalheight.
+
+2005-07-26 Morten Hoegholm <latex-bugs@latex-project.org>
+
+ * xspace.dtx: Improve test by exiting if \@let@token is a
+ letter. Add \xspaceremoveexception.
+
+2005-07-24 Frank Mittelbach <latex-bugs@latex-project.org>
+
+ * varioref.dtx: small change in italian.
+ small fix in german and ngerman (pr/3793)
+
+2005-06-09 Frank Mittelbach <latex-bugs@latex-project.org>
+
+ * varioref.dtx: fixed bug in Dutch localization (pr/3791)
+ added localization for romanian (pr/3790)
+
+2005-05-07 Morten Hoegholm <latex-bugs@latex-project.org>
+
+ * xspace.dtx: Improve handling of active characters.
+
+2005-04-24 Frank Mittelbach <latex-bugs@latex-project.org>
+
+ * varioref.dtx: Ukranian defaults added (by Mykola Lyakhovych)
+
+2005-04-09 Frank Mittelbach <latex-bugs@latex-project.org>
+
+ * varioref.dtx: Basque defaults added (by I\~naki Larra\~naga
+ Murgoitio)
+
+2004-12-07 Morten Hoegholm <latex-bugs@latex-project.org>
+
+ * xspace.dtx: Make extensible (tools/3712), fix active
+ characters (tools/3747) and update documentation.
+
+2004-10-30 Frank Mittelbach <latex-bugs@latex-project.org>
+
+ * varioref.dtx: Added missing defaults for italian (by Lapo Mori)
+
+2004-07-03 Frank Mittelbach <latex-bugs@latex-project.org>
+
+ * multicol.dtx: fixing errors that happen only if multicol is
+ compiled with a special combination of docstrip modules.
+
+2004-05-08 Frank Mittelbach <latex-bugs@latex-project.org>
+
+ * varioref.dtx: Use \@nil for testing in \is@pos@num
+
2004-02-27 Frank Mittelbach <latex-bugs@latex-project.org>
* varioref.dtx: fixed a bug in magyar option
diff --git a/Master/texmf-dist/doc/latex/tools/dcolumn.pdf b/Master/texmf-dist/doc/latex/tools/dcolumn.pdf
index 51b56f34272..31063671849 100644
--- a/Master/texmf-dist/doc/latex/tools/dcolumn.pdf
+++ b/Master/texmf-dist/doc/latex/tools/dcolumn.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tools/delarray.pdf b/Master/texmf-dist/doc/latex/tools/delarray.pdf
index ca8d6bf3f8c..3b466b81b08 100644
--- a/Master/texmf-dist/doc/latex/tools/delarray.pdf
+++ b/Master/texmf-dist/doc/latex/tools/delarray.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tools/enumerate.pdf b/Master/texmf-dist/doc/latex/tools/enumerate.pdf
index 0d9b6731535..9aff8f204c2 100644
--- a/Master/texmf-dist/doc/latex/tools/enumerate.pdf
+++ b/Master/texmf-dist/doc/latex/tools/enumerate.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tools/fileerr.pdf b/Master/texmf-dist/doc/latex/tools/fileerr.pdf
index 0f9c5efde89..0df6913754d 100644
--- a/Master/texmf-dist/doc/latex/tools/fileerr.pdf
+++ b/Master/texmf-dist/doc/latex/tools/fileerr.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tools/fontsmpl.pdf b/Master/texmf-dist/doc/latex/tools/fontsmpl.pdf
index 219e0f28a34..adec103dc4d 100644
--- a/Master/texmf-dist/doc/latex/tools/fontsmpl.pdf
+++ b/Master/texmf-dist/doc/latex/tools/fontsmpl.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tools/ftnright.pdf b/Master/texmf-dist/doc/latex/tools/ftnright.pdf
index a3908e47f06..fb477ac1954 100644
--- a/Master/texmf-dist/doc/latex/tools/ftnright.pdf
+++ b/Master/texmf-dist/doc/latex/tools/ftnright.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tools/hhline.pdf b/Master/texmf-dist/doc/latex/tools/hhline.pdf
index 4c3756da9e4..d9ffa753e2c 100644
--- a/Master/texmf-dist/doc/latex/tools/hhline.pdf
+++ b/Master/texmf-dist/doc/latex/tools/hhline.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tools/indentfirst.pdf b/Master/texmf-dist/doc/latex/tools/indentfirst.pdf
index 88b6c152c82..2ef4f60f102 100644
--- a/Master/texmf-dist/doc/latex/tools/indentfirst.pdf
+++ b/Master/texmf-dist/doc/latex/tools/indentfirst.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tools/layout.pdf b/Master/texmf-dist/doc/latex/tools/layout.pdf
index 01a73575e84..f484475c9b9 100644
--- a/Master/texmf-dist/doc/latex/tools/layout.pdf
+++ b/Master/texmf-dist/doc/latex/tools/layout.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tools/longtable.pdf b/Master/texmf-dist/doc/latex/tools/longtable.pdf
index 8a10d97a241..b1298bc8cef 100644
--- a/Master/texmf-dist/doc/latex/tools/longtable.pdf
+++ b/Master/texmf-dist/doc/latex/tools/longtable.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tools/manifest.txt b/Master/texmf-dist/doc/latex/tools/manifest.txt
index e16b78aafdf..e857d827375 100644
--- a/Master/texmf-dist/doc/latex/tools/manifest.txt
+++ b/Master/texmf-dist/doc/latex/tools/manifest.txt
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003
+% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
%
@@ -8,12 +8,12 @@
% -------------------------------------------------------
%
% It may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either version 1.3
+% conditions of the LaTeX Project Public License, either version 1.3c
% 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.3 or later is part of all distributions of LaTeX
-% version 2003/12/01 or later.
+% and version 1.3c or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
%
% The list of all files belonging to the LaTeX `Tools Bundle' is
% given in the file `manifest.txt'.
diff --git a/Master/texmf-dist/doc/latex/tools/multicol.pdf b/Master/texmf-dist/doc/latex/tools/multicol.pdf
index b5d32cb8f23..6d09ee44fa3 100644
--- a/Master/texmf-dist/doc/latex/tools/multicol.pdf
+++ b/Master/texmf-dist/doc/latex/tools/multicol.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tools/rawfonts.pdf b/Master/texmf-dist/doc/latex/tools/rawfonts.pdf
index a5209a5ab96..3218293b09c 100644
--- a/Master/texmf-dist/doc/latex/tools/rawfonts.pdf
+++ b/Master/texmf-dist/doc/latex/tools/rawfonts.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tools/readme.txt b/Master/texmf-dist/doc/latex/tools/readme.txt
index 9a07b788557..c3b689ef873 100644
--- a/Master/texmf-dist/doc/latex/tools/readme.txt
+++ b/Master/texmf-dist/doc/latex/tools/readme.txt
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003
+% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
%
@@ -8,12 +8,12 @@
% -------------------------------------------------------
%
% It may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either version 1.3
+% conditions of the LaTeX Project Public License, either version 1.3c
% 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.3 or later is part of all distributions of LaTeX
-% version 2003/12/01 or later.
+% and version 1.3c or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
%
% The list of all files belonging to the LaTeX `Tools Bundle' is
% given in the file `manifest.txt'.
diff --git a/Master/texmf-dist/doc/latex/tools/showkeys.pdf b/Master/texmf-dist/doc/latex/tools/showkeys.pdf
index d321b524f8e..012135141fd 100644
--- a/Master/texmf-dist/doc/latex/tools/showkeys.pdf
+++ b/Master/texmf-dist/doc/latex/tools/showkeys.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tools/somedefs.pdf b/Master/texmf-dist/doc/latex/tools/somedefs.pdf
index 5bcc1560416..6ac4037cc36 100644
--- a/Master/texmf-dist/doc/latex/tools/somedefs.pdf
+++ b/Master/texmf-dist/doc/latex/tools/somedefs.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tools/tabularx.pdf b/Master/texmf-dist/doc/latex/tools/tabularx.pdf
index 41323480b07..737f28066a3 100644
--- a/Master/texmf-dist/doc/latex/tools/tabularx.pdf
+++ b/Master/texmf-dist/doc/latex/tools/tabularx.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tools/theorem.pdf b/Master/texmf-dist/doc/latex/tools/theorem.pdf
index 4fe630151c5..9184833a999 100644
--- a/Master/texmf-dist/doc/latex/tools/theorem.pdf
+++ b/Master/texmf-dist/doc/latex/tools/theorem.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tools/tools.pdf b/Master/texmf-dist/doc/latex/tools/tools.pdf
new file mode 100644
index 00000000000..d5596fc2599
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/tools/tools.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tools/trace.pdf b/Master/texmf-dist/doc/latex/tools/trace.pdf
index 382cb3d0ebe..3f0f40cf7dd 100644
--- a/Master/texmf-dist/doc/latex/tools/trace.pdf
+++ b/Master/texmf-dist/doc/latex/tools/trace.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tools/varioref.pdf b/Master/texmf-dist/doc/latex/tools/varioref.pdf
index d644677d1f1..da54c2564cb 100644
--- a/Master/texmf-dist/doc/latex/tools/varioref.pdf
+++ b/Master/texmf-dist/doc/latex/tools/varioref.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tools/verbatim.pdf b/Master/texmf-dist/doc/latex/tools/verbatim.pdf
index 0fc2dc2eff5..34b10b1e734 100644
--- a/Master/texmf-dist/doc/latex/tools/verbatim.pdf
+++ b/Master/texmf-dist/doc/latex/tools/verbatim.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tools/xr.pdf b/Master/texmf-dist/doc/latex/tools/xr.pdf
index 68f2cafded2..1c7b541c237 100644
--- a/Master/texmf-dist/doc/latex/tools/xr.pdf
+++ b/Master/texmf-dist/doc/latex/tools/xr.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tools/xspace.pdf b/Master/texmf-dist/doc/latex/tools/xspace.pdf
index 82a690855f7..92565ddb39d 100644
--- a/Master/texmf-dist/doc/latex/tools/xspace.pdf
+++ b/Master/texmf-dist/doc/latex/tools/xspace.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/tools/afterpage.dtx b/Master/texmf-dist/source/latex/tools/afterpage.dtx
index 4c4d67b8c60..284b5b16749 100644
--- a/Master/texmf-dist/source/latex/tools/afterpage.dtx
+++ b/Master/texmf-dist/source/latex/tools/afterpage.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003
+% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
%
@@ -8,12 +8,12 @@
% -------------------------------------------------------
%
% It may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either version 1.3
+% conditions of the LaTeX Project Public License, either version 1.3c
% 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.3 or later is part of all distributions of LaTeX
-% version 2003/12/01 or later.
+% and version 1.3c or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
%
% The list of all files belonging to the LaTeX `Tools Bundle' is
% given in the file `manifest.txt'.
diff --git a/Master/texmf-dist/source/latex/tools/array.dtx b/Master/texmf-dist/source/latex/tools/array.dtx
index b6641457103..f86accccbbc 100644
--- a/Master/texmf-dist/source/latex/tools/array.dtx
+++ b/Master/texmf-dist/source/latex/tools/array.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003
+% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
%
@@ -8,12 +8,12 @@
% -------------------------------------------------------
%
% It may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either version 1.3
+% conditions of the LaTeX Project Public License, either version 1.3c
% 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.3 or later is part of all distributions of LaTeX
-% version 2003/12/01 or later.
+% and version 1.3c or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
%
% The list of all files belonging to the LaTeX `Tools Bundle' is
% given in the file `manifest.txt'.
@@ -25,11 +25,11 @@
%% Copyright (C) 1989-1998 Frank Mittelbach, all rights reserved.
%<+package>\NeedsTeXFormat{LaTeX2e}[1995/06/01]
%<+package>\ProvidesPackage{array}
-%<+package> [2003/12/17 v2.4a Tabular extension package (FMi)]
+%<+package> [2005/08/23 v2.4b Tabular extension package (FMi)]
%
% \fi
%
-% \CheckSum{1114}
+% \CheckSum{1115}
%% \CharacterTable
%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
@@ -2481,6 +2481,7 @@
% \advance\count@ by -1 #2*{\count@}{#2}\fi}
% \end{verbatim}
% \begin{macro}{\NC@rewrite@*}\label{NC@rewrite@*}
+% \changes{v2.4b}{2005/08/23}{Fix occasional spurious space (PR/3755)}
% This does not work however as "\newcolumntype" takes great care not
% to expand anything in the preamble, and so the "\if" is never
% expanded. "\newcolumntype" sets up various other parts of the
@@ -2499,7 +2500,7 @@
% \end{macrocode}
% Store the number.
% \begin{macrocode}
- \count@#1
+ \count@#1\relax
% \end{macrocode}
% Put "#1" copies of "#2" in the token register.
% \begin{macrocode}
diff --git a/Master/texmf-dist/source/latex/tools/bm.dtx b/Master/texmf-dist/source/latex/tools/bm.dtx
index 41eb25c8a79..c8e163fb4c0 100644
--- a/Master/texmf-dist/source/latex/tools/bm.dtx
+++ b/Master/texmf-dist/source/latex/tools/bm.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003
+% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
%
@@ -8,12 +8,12 @@
% -------------------------------------------------------
%
% It may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either version 1.3
+% conditions of the LaTeX Project Public License, either version 1.3c
% 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.3 or later is part of all distributions of LaTeX
-% version 2003/12/01 or later.
+% and version 1.3c or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
%
% The list of all files belonging to the LaTeX `Tools Bundle' is
% given in the file `manifest.txt'.
diff --git a/Master/texmf-dist/source/latex/tools/calc.dtx b/Master/texmf-dist/source/latex/tools/calc.dtx
index a96821e3c3f..b49f228f192 100644
--- a/Master/texmf-dist/source/latex/tools/calc.dtx
+++ b/Master/texmf-dist/source/latex/tools/calc.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003
+% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
%
@@ -8,12 +8,12 @@
% -------------------------------------------------------
%
% It may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either version 1.3
+% conditions of the LaTeX Project Public License, either version 1.3c
% 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.3 or later is part of all distributions of LaTeX
-% version 2003/12/01 or later.
+% and version 1.3c or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
%
% The list of all files belonging to the LaTeX `Tools Bundle' is
% given in the file `manifest.txt'.
@@ -23,7 +23,7 @@
%% File `calc.dtx'.
%% Copyright (C) 1992--1995
%% Kresten Krab Thorup and Frank Jensen.
-%% Copyright (C) 1997--1998
+%% Copyright (C) 1997--2005
%% Kresten Krab Thorup, Frank Jensen and the LaTeX3 Project.
%%
%% The original authors (fj@hugin.dk and krab@daimi.aau.dk) have
@@ -39,11 +39,13 @@
%<driver> \ProvidesFile{calc.drv}
% \fi
% \ProvidesFile{calc.dtx}
- [1998/07/07 v4.1b Infix arithmetic (KKT,FJ)]
+ [2005/08/06 v4.2 Infix arithmetic (KKT,FJ)]
%
% \iffalse
%<*driver>
\documentclass{ltxdoc}
+\EnableCrossrefs
+\RecordChanges
\usepackage{calc}
\begin{document}
\DocInput{calc.dtx}
@@ -52,7 +54,7 @@
% \fi
%
% \GetFileInfo{calc.dtx}
-% \CheckSum{426}
+% \CheckSum{667}
%
% \title{The \texttt{calc} package\\Infix notation
% arithmetic in \LaTeX\thanks{We thank Frank Mittelbach for his
@@ -110,9 +112,9 @@
%
% The infix expressions can be used in arguments to macros (the
% \texttt{calc} package doesn't employ category code changes to
-% achieve its goals)\footnote{However, it therefore assumes that the
+% achieve its goals).\footnote{However, it therefore assumes that the
% category codes of the special characters, such as \texttt{(*/)}
-% in its syntax do not change.}.
+% in its syntax do not change.}
%
% \section{Informal description}
%
@@ -151,7 +153,7 @@
% commands take a length argument. After loading this package, most of
% these commands will accept a \<glue expression>. This includes
% the optional width argument of |\makebox|, the width argument of
-% |\parbox|, |minipage|, and a |tabluar| |p|-column, and many similar
+% |\parbox|, |minipage|, and a |tabular| |p|-column, and many similar
% constructions. (This package does not redefine any of these commands,
% but they are defined by default to read their arguments by |\setlength|
% and so automatically benefit from the enhanced |\setlength| command
@@ -230,6 +232,16 @@
% These calculate the natural sizes of the \<text> in exactly the
% same way as is done for the commands |\settowidth| etc.~on
% Page~216 of the manual~\cite{latexman}.
+% In August 2005 the package was further extended to provide the command
+%\begin{quote}
+% |\totalheightof{|\<text>|}|
+%\end{quote}
+% This command does exactly what you'd expect from its name.
+% Additionally the package also provides the command
+%\begin{quote}
+% |\settototalheight{|\<cmd>|}{|\<text>|}|
+%\end{quote}
+%
%
% Note that there is a small difference in the usage of these two
% methods of accessing text dimensions. After
@@ -277,6 +289,33 @@
% \setlength{\newYsize}{\Ysize*\ratio{\textwidth}{\Xsize}}
%\end{verbatim}
%
+%
+%
+% Another new feature introduced in August 2005 was $\max$ and $\min$
+% operations with associated macros
+%\begin{quote}
+% |\maxof{|\<\textit{type} expression>|}{|\<\textit{type} expression>|}|
+% \\
+% |\minof{|\<\textit{type} expression>|}{|\<\textit{type} expression>|}|
+%\end{quote}
+% When \textit{type} is either \meta{glue} or \meta{dimen} these macros
+% are allowed only as part of addition or subtraction but when
+% \textit{type} is \meta{integer} they can also be used when
+% multiplying and dividing. In the latter case they follow the
+% same syntax rules as |\ratio| and |\real| which means they must come
+% after the |*| or the |/|. Thus
+%\begin{verbatim}
+% \setcounter{x}{3*\maxof{4+5}{3*4}+\minof{2*\real{1.6}}{5-1}}
+%\end{verbatim}
+% will assign $3\times\max(9,12)+\min(3,4)=39$ to |x|. Similarly
+%\begin{verbatim}
+% \setlength{\parindent}{%
+% \minof{3pt}{\parskip}*\real{1.5}*\maxof{2*\real{1.6}}{2-1}}
+%\end{verbatim}
+% will assign $\min(13.5\textrm{pt},4.5\cs{parskip})$ to \cs{parindent}
+%
+%
+%
% \section{Formal syntax}
%
% The syntax is described by the following set of rules.
@@ -287,46 +326,93 @@
% We use \textit{type} as a meta-variable, standing for
% `integer', `dimen', and `glue'.\footnote{This version of the
% \texttt{calc} package doesn't support evaluation of muglue expressions.}
+%
% \begin{calc-syntax}
-% \<\textit{type} expression>
-% \is \<\textit{type} term>
+% \<\textit{type} expression>^^A
+% \is \<\textit{type} term>^^A
% \alt \<\textit{type} expression> \<plus or minus> \<\textit{type} term>
%
-% \<\textit{type} term>
-% \is \<\textit{type} factor>
-% \alt \<\textit{type} term> \<multiply or divide> \<integer factor>
-% \alt \<\textit{type} term> \<multiply or divide> \<real number>
-%
-% \<\textit{type} factor>
-% \is \<\textit{type}>
-% \alt \<text dimen factor>
+% \<\textit{type} term>^^A
+% \is \<\textit{type} factor>^^A
+% \alt \<\textit{type} term> \<multiply or divide> \<integer>^^A
+% \alt \<\textit{type} term> \<multiply or divide> \<real number>^^A
+% \alt \<\textit{type} term> \<multiply or divide>^^A
+% \<$\max$ or $\min$ integer>
+%
+% \<\textit{type} factor>^^A
+% \is \<\textit{type}>^^A
+% \alt \<text dimen factor>^^A
+% \alt \<$\max$ or $\min$ \textit{type}>^^A
% \alt |(|$_{12}$ \<\textit{type} expression> |)|$_{12}$
%
% \<integer> \is \<number>
%
-% \<text dimen factor>
+% \<$\max$ or $\min$ \textit{type}> \is \<$\max$ or $\min$ command>^^A
+% |{| \<\textit{type} expression> |}|^^A
+% |{| \<\textit{type} expression> |}|
+%
+% \<$\max$ or $\min$ command> \is |\maxof|^^A
+% \alt |\minof|
+%
+% \<text dimen factor>^^A
% \is \<text dimen command>|{| \<text> |}|
%
-% \<text dimen command>
-% \is |\widthof|
-% \alt |\heightof|
-% \alt |\depthof|
+% \<text dimen command>^^A
+% \is |\widthof|^^A
+% \alt |\heightof|^^A
+% \alt |\depthof|^^A
+% \alt |\totalheightof|^^A
%
-% \<multiply or divide>
-% \is |*|$_{12}$
+% \<multiply or divide>^^A
+% \is |*|$_{12}$^^A
% \alt |/|$_{12}$
%
-% \<real number>
-% \is |\ratio{| \<dimen expression> |}{| \<dimen expression> |}|
-% \alt |\real{| \<decimal constant> |}|
+% \<real number>^^A
+% \is |\ratio{| \<dimen expression> |}{| \<dimen expression> |}|^^A
+% \alt |\real{| \<optional signs> \<decimal constant> |}|
+%
+% \<plus or minus>^^A
+% \is |+|$_{12}$^^A
+% \alt |-|$_{12}$
+%
+% \<decimal constant>^^A
+% \is |.|$_{12}$^^A
+% \alt |,|$_{12}$^^A
+% \alt \<digit> \<decimal constant>^^A
+% \alt \<decimal constant> \<digit>
+%
+% \<digit>^^A
+% \is |0|$_{12}$^^A
+% \alt |1|$_{12}$^^A
+% \alt |2|$_{12}$^^A
+% \alt |3|$_{12}$^^A
+% \alt |4|$_{12}$^^A
+% \alt |5|$_{12}$^^A
+% \alt |6|$_{12}$^^A
+% \alt |7|$_{12}$^^A
+% \alt |8|$_{12}$^^A
+% \alt |9|$_{12}$
+%
+% \<optional signs>^^A
+% \is \<optional spaces>^^A
+% \alt \<optional signs> \<plus or minus> \<optional spaces>
+%
% \end{calc-syntax}
%
-% Note that during most of the parsing of calc expressions, no
-% expansion happens; thus the above syntax must be
-% explicit\footnote{Two exceptions to this are: the first token
-% is expanded one-level (thus the whole expression can be put into a
-% macro); wherever a \<decimal constant> or \<\texttt{type}> is
-% expected.}.
+%
+% Relying heavily on \TeX\ to do the underlying assignments, it is
+% only natural for \texttt{calc} to simulate \TeX's parsing machinery
+% for these quantities. Therefore it a)~imposes the same restrictions
+% on the catcode of syntax characters as \TeX\ and b)~tries to expand
+% its argument fully. a)~means that implicit characters for the tokens
+% |*|$_{12}$, |/|$_{12}$, |(|$_{12}$, and |)|$_{12}$ will not
+% work\footnote{e\TeX\ also assumes these catcodes when parsing a
+% \cs{numexpr}, \cs{dimexpr}, \cs{glueexpr}, or \cs{muglueexpr} and
+% does not allow implicit characters.} but because of~b), the
+% expansion should allow you to use macros that expand to explicit
+% syntax characters.
+%
+%
% \StopEventually{
% \begin{thebibliography}{1}
% \bibitem{texbook}
@@ -339,6 +425,7 @@
% \newblock Addison-Wesley, Reading, Massachusetts, Second
% edition 1994/1985.
% \end{thebibliography}
+% \PrintChanges
% }
%
% \section{The evaluation scheme}
@@ -480,7 +567,7 @@
% \subsection{Getting started}
%
% Now we have enough insight to do the actual implementation in \TeX.
-% First, we announce the macro package\footnote{Code moved to top of file}.
+% First, we announce the macro package.\footnote{Code moved to top of file}
% \begin{macrocode}
%<*package>
%\NeedsTeXFormat{LaTeX2e}
@@ -490,6 +577,7 @@
% \subsection{Assignment macros}
%
% \begin{macro}{\calc@assign@generic}
+% \changes{v4.2}{2005/08/06}{Removed a few redundant \cs{expandafter}s}
% The |\calc@assign@generic| macro takes four arguments: (1~and~2) the
% registers to be used
% for global and local manipulations, respectively; (3)~the lvalue
@@ -520,14 +608,12 @@
% tokens of this expansion are inserted explicitly, except that the
% last assignment has been replaced by the lvalue part (i.e.,
% argument~|#3| of |\calc@assign@generic|) followed by |\calc@B|.
-% \end{macro}
% \begin{macrocode}
\def\calc@assign@generic#1#2#3#4{\let\calc@A#1\let\calc@B#2%
- \expandafter\calc@open\expandafter(#4!%
+ \calc@open(#4!%
\global\calc@A\calc@B\endgroup#3\calc@B}
% \end{macrocode}
-% (The |\expandafter| tokens allow the user to use expressions stored
-% one-level deep in a macro as arguments in assignment commands.)
+% \end{macro}
%
% \begin{macro}{\calc@assign@count}
% \begin{macro}{\calc@assign@dimen}
@@ -551,14 +637,50 @@
%
% \subsection{The \LaTeX\ interface}
%
+% \begin{macro}{\setcounter}
+% \begin{macro}{\addtocounter}
+% \changes{v4.2}{2005/08/06}
+% {Fix to make \cs{addtocounter} work with \texttt{amstext}}
+% \begin{macro}{\steptocounter}
+% \changes{v4.2}{2005/08/06}
+% {Avoid redundant processing. PR/3795}
+% \begin{macro}{\setlength}
+% \begin{macro}{\addtolength}
% As promised, we redefine the following standard \LaTeX\ commands:
% |\setcounter|,
% |\addtocounter|, |\setlength|, and |\addtolength|.
% \begin{macrocode}
\def\setcounter#1#2{\@ifundefined{c@#1}{\@nocounterr{#1}}%
{\calc@assign@count{\global\csname c@#1\endcsname}{#2}}}
-\def\addtocounter#1#2{\@ifundefined{c@#1}{\@nocounterr{#1}}%
- {\calc@assign@count{\global\advance\csname c@#1\endcsname}{#2}}}
+% \end{macrocode}
+% \begin{macrocode}
+ \def\addtocounter#1#2{\@ifundefined{c@#1}{\@nocounterr{#1}}%
+ {\calc@assign@count{\global\advance\csname c@#1\endcsname}{#2}}}%
+% \end{macrocode}
+% We also fix \cs{stepcounter} to not go through the whole \texttt{calc}
+% process.
+% \begin{macrocode}
+ \def\stepcounter#1{\@ifundefined {c@#1}%
+ {\@nocounterr {#1}}%
+ {\global\advance\csname c@#1\endcsname \@ne
+ \begingroup
+ \let\@elt\@stpelt \csname cl@#1\endcsname
+ \endgroup}}%
+% \end{macrocode}
+% If the \texttt{amstext} package is loaded we must add the
+% |\iffirstchoice@| switch as well. We patch the commands this
+% way since it's good practice when we know how many arguments they take.
+% \begin{macrocode}
+\@ifpackageloaded{amstext}{%
+ \expandafter\def\expandafter\stepcounter
+ \expandafter#\expandafter1\expandafter{%
+ \expandafter\iffirstchoice@\stepcounter{#1}\fi
+ }
+ \expandafter\def\expandafter\addtocounter
+ \expandafter#\expandafter1\expandafter#\expandafter2\expandafter{%
+ \expandafter\iffirstchoice@\addtocounter{#1}{#2}\fi
+ }
+}{}
% \end{macrocode}
% \begin{macrocode}
\DeclareRobustCommand\setlength{\calc@assign@skip}
@@ -566,6 +688,11 @@
% \end{macrocode}
% (|\setlength| and |\addtolength| are robust according to
% \cite{latexman}.)
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
%
% \subsection{The scanner}
%
@@ -576,7 +703,11 @@
% |\calc@post@scan|; |\calc@pre@scan| consumes left parentheses, and
% |\calc@post@scan| consumes binary operator, |\real|, |\ratio|, and
% right parenthesis tokens.
+%
% \begin{macro}{\calc@pre@scan}
+% \begin{macro}{\@calc@pre@scan}
+% \changes{v4.2}{2005/08/06}
+% {Added macro and force expansion}
%
% Note that this is called at least once on every use of calc
% processing, even when none of the extended syntax is present; it
@@ -592,26 +723,46 @@
% illegal will simply generate a \TeX-level error, often a
% reasonably comprehensible one!
%
+% The |\romannumeral-`\a| part is a little trick which forces expansion
+% in case |#1| is a normal macro, something that occurs from time to
+% time. A conditional test inside will possibly leave a trailing
+% \cs{fi} but this remnant is removed later when \cs{calc@post@scan}
+% performs the same trick.
+%
% The many |\expandafter|s are needed to efficiently end the nested
-% conditionals so that |\calc@textsize| can process its argument.
+% conditionals so that |\calc@textsize| and |\calc@maxmin@addsub| can
+% process their argument.
% \changes{v4.1a}{1998/06/07}
% {Added code for text sizes: CAR}
% \changes{v4.1b}{1998/07/07}
% {Correction to ifx true case}
+% \changes{v4.2}{2005/08/06}
+% {Added \cs{maxof} and \cs{minof} operations}
% \begin{macrocode}
\def\calc@pre@scan#1{%
- \ifx(#1%
- \expandafter\calc@open
- \else
- \ifx\widthof#1%
- \expandafter\expandafter\expandafter\calc@textsize
- \else
- \calc@numeric% no \expandafter needed for this one.
- \fi
- \fi
- #1}
+ \expandafter\@calc@pre@scan\romannumeral-`\a#1}
+\def\@calc@pre@scan#1{%
+ \ifx(#1%
+ \expandafter\calc@open
+ \else
+ \ifx\widthof#1%
+ \expandafter\expandafter\expandafter\calc@textsize
+ \else
+ \ifx\maxof#1%
+ \expandafter\expandafter\expandafter\expandafter
+ \expandafter\expandafter\expandafter\calc@maxmin@addsub
+ \else
+ \calc@numeric% no \expandafter needed for this one.
+ \fi
+ \fi
+ \fi
+ #1}
% \end{macrocode}
% \end{macro}
+% \end{macro}
+%
+% \begin{macro}{\calc@open}
+% \begin{macro}{\calc@initB}
% |\calc@open| is used when there is a left parenthesis right ahead.
% This parenthesis is replaced by \TeX\ code corresponding to the code
% sequence ``$\{\savecode{B\lassign A}\{\savecode{B\lassign A}$''
@@ -624,49 +775,76 @@
\calc@pre@scan}
\def\calc@initB{\calc@B\calc@A}
% \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \begin{macro}{\calc@numeric}
% |\calc@numeric| assigns the following value to |\calc@A| and then
% transfers control to |\calc@post@scan|.
% \begin{macrocode}
\def\calc@numeric{\afterassignment\calc@post@scan \global\calc@A}
% \end{macrocode}
+% \end{macro}
%
% \begin{macro}{\widthof}
% \begin{macro}{\heightof}
% \begin{macro}{\depthof}
% \changes{v4.1a}{1998/06/07}
% {Added macros: CAR}
+% \begin{macro}{\totalheightof}
+% \changes{v4.2}{2005/08/06}
+% {Added macro}
+% \changes{v4.2}{2005/08/06}
+% {Added informative message for reserved macros}
%
% These do not need any particular definition when they are scanned
% so, for efficiency and robustness, we make them all equivalent to
-% the same harmless (I hope) unexpandable command\footnote{If this
+% the same harmless (I hope) unexpandable command.\footnote{If this
% level of safety is not needed then the code can be speeded up:
-% CAR.}. Thus the test in |\calc@pre@scan| finds any of them.
-% They are first defined using |\newcommand| so that they appear to
-% be normal user commands to a \LaTeX{} user\footnote{Is this
-% necessary, CAR?}.
+% CAR.} Thus the test in |\@calc@pre@scan| finds any of them.
+%
+% As we have to check for these commands explicitly we must ensure
+% that our definition wins. Using \cs{newcommand} gives an error when
+% loading \texttt{calc} and may be mildly surprising. This should be
+% a little more informative.
% \begin{macrocode}
-\newcommand\widthof{}
+\@for\reserved@a:=widthof,heightof,depthof,totalheightof,maxof,minof\do
+{\@ifundefined{\reserved@a}{}{%
+ \PackageError{calc}{%
+ The\space calc\space package\space reserves\space the\space
+ command\space name\space `\@backslashchar\reserved@a'\MessageBreak
+ but\space it\space has\space already\space been\space defined\space
+ with\space the\space meaning\MessageBreak
+ `\expandafter\meaning\csname\reserved@a\endcsname'.\MessageBreak
+ This\space original\space definition\space will\space be\space lost}%
+ {If\space you\space need\space a\space command\space with\space
+ this\space definition,\space you\space must\space use\space a\space
+ different\space name.}}%
+}
\let\widthof\ignorespaces
-\newcommand\heightof{}
\let\heightof\ignorespaces
-\newcommand\depthof{}
\let\depthof\ignorespaces
+\let\totalheightof\ignorespaces
% \end{macrocode}
% \end{macro}
% \end{macro}
% \end{macro}
+% \end{macro}
%
% \begin{macro}{\calc@textsize}
% \changes{v4.1a}{1998/06/07}
% {Added macro: CAR}
-% The presence of the above three commands invokes this code, where
+% \changes{v4.1a}{1998/06/07}
+% {Added macro: CAR}
+% \changes{v4.2}{2005/08/06}
+% {Extended macro with \cs{totalheightof}}
+% The presence of the above four commands invokes this code, where
% we must distinguish them from each other.
% This implementation is somewhat optimized by using low-level
-% code from the commands |\settowidth|, etc\footnote{It is based on
-% suggestions by Donald Arsenau and David Carlisle.}.
+% code from the commands |\settowidth|, etc.\footnote{It is based on
+% suggestions by Donald Arseneau and David Carlisle.}
%
% Within the text argument we must restore the normal meanings of
-% the three user-level commands since arbitrary material can appear
+% the four user-level commands since arbitrary material can appear
% in here, including further uses of calc.
% \begin{macrocode}
\def\calc@textsize #1#2{%
@@ -674,12 +852,18 @@
\let\widthof\wd
\let\heightof\ht
\let\depthof\dp
- \@settodim #1%
+ \def\totalheightof{\ht\dp}%
+% \end{macrocode}
+% We must expand the argument one level if it's \cs{totalheightof}
+% and it doesn't hurt the other three.
+% \begin{macrocode}
+ \expandafter\@settodim\expandafter{#1}%
{\global\calc@A}%
{%
\let\widthof\ignorespaces
\let\heightof\ignorespaces
\let\depthof\ignorespaces
+ \let\totalheightof\ignorespaces
#2}%
\endgroup
\calc@post@scan}
@@ -687,10 +871,12 @@
% \end{macro}
%
% \begin{macro}{\calc@post@scan}
+% \begin{macro}{\@calc@post@scan}
+% \changes{v4.2}{2005/08/06}{Added macro and force expansion}
% The macro |\calc@post@scan| is called right after a value has been
% read. At this point, a binary operator, a sequence of right
% parentheses, and the end-of-expression mark (`|!|') is
-% allowed\footnote{Is \texttt{!} a good choice, CAR?}.
+% allowed.\footnote{Is \texttt{!} a good choice, CAR?}
% Depending on our findings, we call a suitable macro to generate the
% corresponding \TeX\ code (except when we detect the
% end-of-expression marker: then scanning ends, and
@@ -702,25 +888,34 @@
% to be performed if the expression consists of a single \<numeric>.
% This ensures that documents that do not use the extra expressive
% power provided by the \texttt{calc} package only suffer a minimum
-% slowdown in processing time.
-% \end{macro}
+% slowdown in processing time.
% \begin{macrocode}
\def\calc@post@scan#1{%
- \ifx#1!\let\calc@next\endgroup \else
+ \expandafter\@calc@post@scan\romannumeral-`\a#1}
+\def\@calc@post@scan#1{%
+ \ifx#1!\let\calc@next\endgroup \else
\ifx#1+\let\calc@next\calc@add \else
- \ifx#1-\let\calc@next\calc@subtract \else
- \ifx#1*\let\calc@next\calc@multiplyx \else
- \ifx#1/\let\calc@next\calc@dividex \else
- \ifx#1)\let\calc@next\calc@close \else \calc@error#1%
+ \ifx#1-\let\calc@next\calc@subtract \else
+ \ifx#1*\let\calc@next\calc@multiplyx \else
+ \ifx#1/\let\calc@next\calc@dividex \else
+ \ifx#1)\let\calc@next\calc@close \else
+ \calc@error#1%
+ \fi
+ \fi
\fi
- \fi
\fi
- \fi
\fi
- \fi
- \calc@next}
+ \fi
+ \calc@next}
% \end{macrocode}
+% \end{macro}
+% \end{macro}
%
+% \begin{macro}{\calc@add}
+% \begin{macro}{\calc@subtract}
+% \begin{macro}{\calc@generic@add}
+% \begin{macro}{\calc@addAtoB}
+% \begin{macro}{\calc@subtractAfromB}
% The replacement code for the binary operators `\texttt{+}' and
% `\texttt{-}' follow a common pattern; the only difference is the
% token that is stored away by |\aftergroup|. After this replacement
@@ -734,12 +929,22 @@
\def\calc@addAtoB{\advance\calc@B\calc@A}
\def\calc@subtractAfromB{\advance\calc@B-\calc@A}
% \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
%
% \begin{macro}{\real}
% \begin{macro}{\ratio}
+% \begin{macro}{\calc@ratio@x}
+% \begin{macro}{\calc@real@x}
% The multiplicative operators, `\texttt{*}' and `\texttt{/}', may be
-% followed by a |\real| or a |\ratio| token. Those control sequences
-% are not defined (at least not by the \texttt{calc} package); this,
+% followed by a |\real|, |\ratio|, |\minof|, or |\maxof| token. The
+% last two of these control sequences are defined by \texttt{calc} as
+% they are needed by the scanner for addition or subtraction while the
+% first two are not defined (at least not by the \texttt{calc}
+% package); this,
% unfortunately, leaves them highly non-robust. We therefore
% equate them to |\relax| but only if they have not already been
% defined\footnote{Suggested code from David Carlisle.}
@@ -752,31 +957,52 @@
\ifx\real\@undefined\let\real\relax\fi
\ifx\ratio\@undefined\let\ratio\relax\fi
% \end{macrocode}
-% In order to test for them, we define these two\footnote{May not
-% need the extra names, CAR?}.
+% In order to test for |\real| or |\ratio|, we define these
+% two.\footnote{May not need the extra names, CAR?}
% \begin{macrocode}
\def\calc@ratio@x{\ratio}
\def\calc@real@x{\real}
% \end{macrocode}
% \end{macro}
% \end{macro}
-%
+% \end{macro}
+% \end{macro}
+% \begin{macro}{\calc@multiplyx}
+% \changes{v4.2}{2005/08/06}
+% {Added $\protect\max$ and $\protect\min$ operations}
+% \begin{macro}{\calc@dividex}
+% \changes{v4.2}{2005/08/06}
+% {Added $\protect\max$ and $\protect\min$ operations}
+% Test which operator followed |*| or |/|. If none followed it's just
+% a standard multiplication or division.
% \begin{macrocode}
\def\calc@multiplyx#1{\def\calc@tmp{#1}%
- \ifx\calc@tmp\calc@ratio@x \let\calc@next\calc@ratio@multiply \else
- \ifx\calc@tmp\calc@real@x \let\calc@next\calc@real@multiply \else
- \let\calc@next\calc@multiply
+ \ifx\calc@tmp\calc@ratio@x \let\calc@next\calc@ratio@multiply \else
+ \ifx\calc@tmp\calc@real@x \let\calc@next\calc@real@multiply \else
+ \ifx\maxof#1\let\calc@next\calc@maxmin@multiply \else
+ \let\calc@next\calc@multiply
\fi
- \fi
- \calc@next#1}
+ \fi
+ \fi
+ \calc@next#1}
\def\calc@dividex#1{\def\calc@tmp{#1}%
- \ifx\calc@tmp\calc@ratio@x \let\calc@next\calc@ratio@divide \else
- \ifx\calc@tmp\calc@real@x \let\calc@next\calc@real@divide \else
- \let\calc@next\calc@divide
+ \ifx\calc@tmp\calc@ratio@x \let\calc@next\calc@ratio@divide \else
+ \ifx\calc@tmp\calc@real@x \let\calc@next\calc@real@divide \else
+ \ifx\maxof#1\let\calc@next\calc@maxmin@divide \else
+ \let\calc@next\calc@divide
\fi
- \fi
- \calc@next#1}
+ \fi
+ \fi
+ \calc@next#1}
% \end{macrocode}
+% \end{macro}
+% \end{macro}
+%
+% \begin{macro}{\calc@multiply}
+% \begin{macro}{\calc@divide}
+% \begin{macro}{\calc@generic@multiply}
+% \begin{macro}{\calc@multiplyBbyA}
+% \begin{macro}{\calc@divideBbyA}
% The binary operators `\texttt{*}' and `\texttt{/}' also insert code
% as determined above. Moreover, the meaning of |\calc@A| and
% |\calc@B| is changed as factors following a multiplication and
@@ -795,7 +1021,13 @@
% Since the value to use in the multiplication/division operation is
% stored in the |\calc@Acount| register, the |\calc@multiplyBbyA| and
% |\calc@divideBbyA| macros use this register.
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
%
+% \begin{macro}{\calc@close}
% |\calc@close| generates code for a right parenthesis (which was
% derived to be ``$\}A\gassign B\}A\gassign B$'' in
% Section~\ref{evaluation:scheme}). After this code, the control is
@@ -808,9 +1040,12 @@
\endgroup\global\calc@A\calc@B
\calc@post@scan}
% \end{macrocode}
+% \end{macro}
%
% \subsection{Calculating a ratio}
%
+% \begin{macro}{\calc@ratio@multiply}
+% \begin{macro}{\calc@ratio@divide}
% When |\calc@post@scan| encounters a |\ratio| control sequence, it hands
% control to one of the macros |\calc@ratio@multiply| or |\calc@ratio@divide|,
% depending on the preceding character. Those macros both forward the
@@ -826,13 +1061,23 @@
\def\calc@ratio@multiply\ratio{\calc@ratio@evaluate}
\def\calc@ratio@divide\ratio#1#2{\calc@ratio@evaluate{#2}{#1}}
% \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \begin{macro}{\calc@Ccount}
+% \begin{macro}{\calc@numerator}
+% \begin{macro}{\calc@denominator}
% We shall need two registers for temporary usage in the
% calculations. We can save one register since we can reuse
% |\calc@Bcount|.
% \begin{macrocode}
+\newcount\calc@Ccount
\let\calc@numerator=\calc@Bcount
-\newcount\calc@denominator
+\let\calc@denominator=\calc@Ccount
% \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \begin{macro}{\calc@ratio@evaluate}
% Here is the macro that handles the actual evaluation of ratios. The
% procedure is
% this: First, the two expressions are evaluated and coerced to
@@ -885,9 +1130,11 @@
\begingroup
\calc@post@scan}
% \end{macrocode}
+% \end{macro}
% The |\begingroup| inserted before the |\calc@post@scan| will be
% matched by the |\endgroup| generated as part of the replacement of a
% subsequent binary operator or right parenthesis.
+% \begin{macro}{\calc@next@digit}
% \begin{macrocode}
\def\calc@next@digit{%
\multiply\calc@Acount\calc@denominator
@@ -897,6 +1144,8 @@
\divide\calc@Acount\calc@denominator
\xdef\calc@the@ratio{\calc@the@ratio\number\calc@Acount}}
% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\calc@multiply@by@real}
% In the following code, it is important that we first assign the
% result to a dimen register. Otherwise, \TeX\ won't allow us to
% multiply with a real number.
@@ -912,9 +1161,12 @@
% expressions can appear as part of a muglue expression, it would be
% necessary to determine the correct register to use each time a
% multiplication is made.)
+% \end{macro}
%
% \subsection{Multiplication by real numbers}
%
+% \begin{macro}{\calc@real@multiply}
+% \begin{macro}{\calc@real@divide}
% This is similar to the |\calc@ratio@evaluate| macro above, except that
% it is considerably simplified since we don't need to calculate the
% factor explicitly.
@@ -924,9 +1176,115 @@
\calc@post@scan}
\def\calc@real@divide\real#1{\calc@ratio@evaluate{1pt}{#1pt}}
% \end{macrocode}
+% \end{macro}
+% \end{macro}
+%
+% \subsection{$\max$ and $\min$ operations}
+%
+% \begin{macro}{\maxof}
+% \begin{macro}{\minof}
+% \changes{v4.2}{2005/08/06}
+% {Added macros}
+% With version 4.2, the $\max$ and $\min$ operators were
+% added to \texttt{calc}. The user functions for them are \cs{maxof} and
+% \cs{minof} respectively.
+% These macros are internally similar to \cs{widthof} etc.\ in that they
+% are unexpandable and easily recognizable by the scanner.
+% \begin{macrocode}
+\let\maxof\@@italiccorr
+\let\minof\@@italiccorr
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
%
-% \section{Reporting errors}
%
+% \begin{macro}{\calc@Cskip}
+% \begin{macro}{\ifcalc@count@}
+% The $\max$ and $\min$ operations take two arguments so we need an extra
+% \<skip> register. We also add a switch for determining when to perform
+% a \<skip> or a \<count> assignment.
+% \begin{macrocode}
+\newskip\calc@Cskip
+\newif\ifcalc@count@
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \begin{macro}{\calc@maxmin@addsub}
+% \begin{macro}{\calc@maxmin@generic}
+% \changes{v4.2}{2005/08/06}{Macros added}
+% When doing addition or subtraction with a $\max$ or $\min$ operator, we
+% first check if |\calc@A| is a \<count> register or not and then set the
+% switch. Then call the real function which sets |\calc@A| to the desired
+% value and continue as usual with |\calc@post@scan|.
+% \begin{macrocode}
+\def\calc@maxmin@addsub#1#2#3{\begingroup
+ \ifx\calc@A\calc@Acount%
+ \calc@count@true
+ \else
+ \calc@count@false
+ \fi
+ \calc@maxmin@generic#1{#2}{#3}%
+ \endgroup
+ \calc@post@scan
+}
+% \end{macrocode}
+% Check the switch and do either \<count> or \<skip> assignments. Note that
+% |\maxof| and |\minof| are not set to |>| and |<| until after the
+% assignments, which ensures we can nest them without problems. Then set
+% |\calc@A| to the correct one.
+% \begin{macrocode}
+\def\calc@maxmin@generic#1#2#3{%
+ \begingroup
+ \ifcalc@count@
+ \calc@assign@count\calc@Ccount{#2}%
+ \calc@assign@count\calc@Bcount{#3}%
+ \def\minof{<}\def\maxof{>}%
+ \global\calc@A\ifnum\calc@Ccount#1\calc@Bcount
+ \calc@Ccount\else\calc@Bcount\fi
+ \else
+ \calc@assign@skip\calc@Cskip{#2}%
+ \calc@assign@skip\calc@Bskip{#3}%
+ \def\minof{<}\def\maxof{>}%
+ \global\calc@A\ifdim\calc@Cskip#1\calc@Bskip
+ \calc@Cskip\else\calc@Bskip\fi
+ \fi
+ \endgroup
+}
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+%
+% \begin{macro}{\calc@maxmin@divmul}
+% \begin{macro}{\calc@maxmin@multiply}
+% \begin{macro}{\calc@maxmin@divide}
+% \changes{v4.2}{2005/08/06}{Macros added}
+% When doing division or multiplication we must be using \<count> registers
+% so we set the switch. Other than that it is almost business as usual when
+% multiplying or dividing. |#1| is the instruction to either multiply or
+% divide |\calc@B| by |\calc@A|, |#2| is either |\maxof| or |\minof| which
+% is waiting in the input stream and |#3| and |#4| are the calc expressions.
+% We end it all as usual by calling |\calc@post@scan|.
+% \begin{macrocode}
+\def\calc@maxmin@divmul#1#2#3#4{%
+ \endgroup\begingroup
+ \calc@count@true
+ \aftergroup#1%
+ \calc@maxmin@generic#2{#3}{#4}%
+ \endgroup\begingroup
+ \calc@post@scan
+}
+% \end{macrocode}
+% The two functions called when seeing a |*| or a |/|.
+% \begin{macrocode}
+\def\calc@maxmin@multiply{\calc@maxmin@divmul\calc@multiplyBbyA}
+\def\calc@maxmin@divide {\calc@maxmin@divmul\calc@divideBbyA}
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+%
+% \section{Reporting errors}
+% \begin{macro}{\calc@error}
% \changes{v4.0d}{1997/11/08}
% {Use \cs{PackageError} for error messages (DPC)}
% \changes{v4.0e}{1997/11/11}
@@ -942,6 +1300,39 @@
\PackageError{calc}%
{`#1' invalid at this point}%
{I expected to see one of: + - * / )}}
+% \end{macrocode}
+% \end{macro}
+%
+% \section{Other additions}
+% \begin{macro}{\@settodim}
+% \changes{v4.2}{2005/08/06}
+% {Changed kernel macro}
+% \begin{macro}{\settototalheight}
+% \changes{v4.2}{2005/08/06}
+% {Added macro}
+% The kernel macro \cs{@settodim} is changed so that it runs through a list
+% containing \cs{ht}, \cs{wd}, and \cs{dp} and than advance the length
+% one step at a time. We just have to use a scratch register in case the
+% user decides to put in a \cs{global} prefix on the length register.
+% A search on the internet confirmed that some people do that kind of thing.
+% \begin{macrocode}
+\def\@settodim#1#2#3{%
+ \setbox\@tempboxa\hbox{{#3}}%
+ \dimen@ii=\z@
+ \@tf@r\reserved@a #1\do{%
+ \advance\dimen@ii\reserved@a\@tempboxa}%
+ #2=\dimen@ii
+ \setbox\@tempboxa\box\voidb@x}
+% \end{macrocode}
+% Now the user level macro is straightforward.
+% \begin{macrocode}
+\def\settototalheight{\@settodim{\ht\dp}}
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+%
+% That's the end of the package.
+% \begin{macrocode}
%</package>
% \end{macrocode}
%
diff --git a/Master/texmf-dist/source/latex/tools/dcolumn.dtx b/Master/texmf-dist/source/latex/tools/dcolumn.dtx
index e8d4720819d..f5a9c33aaaf 100644
--- a/Master/texmf-dist/source/latex/tools/dcolumn.dtx
+++ b/Master/texmf-dist/source/latex/tools/dcolumn.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003
+% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
%
@@ -8,12 +8,12 @@
% -------------------------------------------------------
%
% It may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either version 1.3
+% conditions of the LaTeX Project Public License, either version 1.3c
% 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.3 or later is part of all distributions of LaTeX
-% version 2003/12/01 or later.
+% and version 1.3c or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
%
% The list of all files belonging to the LaTeX `Tools Bundle' is
% given in the file `manifest.txt'.
diff --git a/Master/texmf-dist/source/latex/tools/delarray.dtx b/Master/texmf-dist/source/latex/tools/delarray.dtx
index 2754b070969..9134459cd90 100644
--- a/Master/texmf-dist/source/latex/tools/delarray.dtx
+++ b/Master/texmf-dist/source/latex/tools/delarray.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003
+% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
%
@@ -8,12 +8,12 @@
% -------------------------------------------------------
%
% It may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either version 1.3
+% conditions of the LaTeX Project Public License, either version 1.3c
% 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.3 or later is part of all distributions of LaTeX
-% version 2003/12/01 or later.
+% and version 1.3c or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
%
% The list of all files belonging to the LaTeX `Tools Bundle' is
% given in the file `manifest.txt'.
diff --git a/Master/texmf-dist/source/latex/tools/enumerate.dtx b/Master/texmf-dist/source/latex/tools/enumerate.dtx
index e2a006af788..54fc8b6613b 100644
--- a/Master/texmf-dist/source/latex/tools/enumerate.dtx
+++ b/Master/texmf-dist/source/latex/tools/enumerate.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003
+% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
%
@@ -8,12 +8,12 @@
% -------------------------------------------------------
%
% It may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either version 1.3
+% conditions of the LaTeX Project Public License, either version 1.3c
% 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.3 or later is part of all distributions of LaTeX
-% version 2003/12/01 or later.
+% and version 1.3c or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
%
% The list of all files belonging to the LaTeX `Tools Bundle' is
% given in the file `manifest.txt'.
diff --git a/Master/texmf-dist/source/latex/tools/fileerr.dtx b/Master/texmf-dist/source/latex/tools/fileerr.dtx
index d44b4bc05ed..dc5a90e1a83 100644
--- a/Master/texmf-dist/source/latex/tools/fileerr.dtx
+++ b/Master/texmf-dist/source/latex/tools/fileerr.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003
+% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
%
@@ -8,12 +8,12 @@
% -------------------------------------------------------
%
% It may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either version 1.3
+% conditions of the LaTeX Project Public License, either version 1.3c
% 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.3 or later is part of all distributions of LaTeX
-% version 2003/12/01 or later.
+% and version 1.3c or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
%
% The list of all files belonging to the LaTeX `Tools Bundle' is
% given in the file `manifest.txt'.
diff --git a/Master/texmf-dist/source/latex/tools/fontsmpl.dtx b/Master/texmf-dist/source/latex/tools/fontsmpl.dtx
index 31f085a75f1..532eb28f14e 100644
--- a/Master/texmf-dist/source/latex/tools/fontsmpl.dtx
+++ b/Master/texmf-dist/source/latex/tools/fontsmpl.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003
+% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
%
@@ -8,12 +8,12 @@
% -------------------------------------------------------
%
% It may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either version 1.3
+% conditions of the LaTeX Project Public License, either version 1.3c
% 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.3 or later is part of all distributions of LaTeX
-% version 2003/12/01 or later.
+% and version 1.3c or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
%
% The list of all files belonging to the LaTeX `Tools Bundle' is
% given in the file `manifest.txt'.
diff --git a/Master/texmf-dist/source/latex/tools/ftnright.dtx b/Master/texmf-dist/source/latex/tools/ftnright.dtx
index a8282d85816..915d96bd5d4 100644
--- a/Master/texmf-dist/source/latex/tools/ftnright.dtx
+++ b/Master/texmf-dist/source/latex/tools/ftnright.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003
+% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
%
@@ -8,12 +8,12 @@
% -------------------------------------------------------
%
% It may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either version 1.3
+% conditions of the LaTeX Project Public License, either version 1.3c
% 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.3 or later is part of all distributions of LaTeX
-% version 2003/12/01 or later.
+% and version 1.3c or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
%
% The list of all files belonging to the LaTeX `Tools Bundle' is
% given in the file `manifest.txt'.
diff --git a/Master/texmf-dist/source/latex/tools/hhline.dtx b/Master/texmf-dist/source/latex/tools/hhline.dtx
index f539e1669a9..b08e9dbdbac 100644
--- a/Master/texmf-dist/source/latex/tools/hhline.dtx
+++ b/Master/texmf-dist/source/latex/tools/hhline.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003
+% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
%
@@ -8,12 +8,12 @@
% -------------------------------------------------------
%
% It may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either version 1.3
+% conditions of the LaTeX Project Public License, either version 1.3c
% 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.3 or later is part of all distributions of LaTeX
-% version 2003/12/01 or later.
+% and version 1.3c or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
%
% The list of all files belonging to the LaTeX `Tools Bundle' is
% given in the file `manifest.txt'.
diff --git a/Master/texmf-dist/source/latex/tools/indentfirst.dtx b/Master/texmf-dist/source/latex/tools/indentfirst.dtx
index 765517a1a8a..afb0c136891 100644
--- a/Master/texmf-dist/source/latex/tools/indentfirst.dtx
+++ b/Master/texmf-dist/source/latex/tools/indentfirst.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003
+% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
%
@@ -8,12 +8,12 @@
% -------------------------------------------------------
%
% It may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either version 1.3
+% conditions of the LaTeX Project Public License, either version 1.3c
% 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.3 or later is part of all distributions of LaTeX
-% version 2003/12/01 or later.
+% and version 1.3c or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
%
% The list of all files belonging to the LaTeX `Tools Bundle' is
% given in the file `manifest.txt'.
diff --git a/Master/texmf-dist/source/latex/tools/layout.dtx b/Master/texmf-dist/source/latex/tools/layout.dtx
index dc404c3f306..f14eb73ed99 100644
--- a/Master/texmf-dist/source/latex/tools/layout.dtx
+++ b/Master/texmf-dist/source/latex/tools/layout.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003
+% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
%
@@ -8,12 +8,12 @@
% -------------------------------------------------------
%
% It may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either version 1.3
+% conditions of the LaTeX Project Public License, either version 1.3c
% 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.3 or later is part of all distributions of LaTeX
-% version 2003/12/01 or later.
+% and version 1.3c or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
%
% The list of all files belonging to the LaTeX `Tools Bundle' is
% given in the file `manifest.txt'.
diff --git a/Master/texmf-dist/source/latex/tools/longtable.dtx b/Master/texmf-dist/source/latex/tools/longtable.dtx
index 81136b5cbae..4367911193d 100644
--- a/Master/texmf-dist/source/latex/tools/longtable.dtx
+++ b/Master/texmf-dist/source/latex/tools/longtable.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003
+% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
%
@@ -8,12 +8,12 @@
% -------------------------------------------------------
%
% It may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either version 1.3
+% conditions of the LaTeX Project Public License, either version 1.3c
% 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.3 or later is part of all distributions of LaTeX
-% version 2003/12/01 or later.
+% and version 1.3c or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
%
% The list of all files belonging to the LaTeX `Tools Bundle' is
% given in the file `manifest.txt'.
diff --git a/Master/texmf-dist/source/latex/tools/multicol.dtx b/Master/texmf-dist/source/latex/tools/multicol.dtx
index 4575bb41be0..26b3b50355b 100644
--- a/Master/texmf-dist/source/latex/tools/multicol.dtx
+++ b/Master/texmf-dist/source/latex/tools/multicol.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003
+% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
%
@@ -8,12 +8,12 @@
% -------------------------------------------------------
%
% It may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either version 1.3
+% conditions of the LaTeX Project Public License, either version 1.3c
% 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.3 or later is part of all distributions of LaTeX
-% version 2003/12/01 or later.
+% and version 1.3c or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
%
% The list of all files belonging to the LaTeX `Tools Bundle' is
% given in the file `manifest.txt'.
@@ -23,7 +23,7 @@
% \iffalse This is a METACOMMENT
%
%% Package `multicol' to use with LaTeX2e
-%% Copyright 1989-2003 Frank Mittelbach
+%% Copyright 1989-2005 Frank Mittelbach
%%
%% In addition to the terms of LPPL any distributed version
%% (unchanged or modified) of multicol has to keep the statement
@@ -94,10 +94,10 @@
%<driver> \ProvidesFile{multicol.drv}
% \fi
% \ProvidesFile{multicol.dtx}
- [2004/02/14 v1.6e multicolumn formatting (FMi)]
+ [2006/05/18 v1.6g multicolumn formatting (FMi)]
%
%
-%% \CheckSum{1561}
+%% \CheckSum{1562}
%% \CharacterTable
%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
@@ -485,7 +485,7 @@
% argument, but {\tt h} doesn't work because the first possible place
% is the top of the next page. One should also note, that this means
% that their placement behavior is determined by the values of
-% |\topfraction|, etc.\ rather then by |\dbl...|.
+% |\topfraction|, etc.\ rather than by |\dbl...|.
%
%
% \subsection{Warnings}
@@ -1954,7 +1954,7 @@
\rlap{\phantom p}%
}%
% \end{macrocode}
-% Now after typesetting the box we mack up to its baseline by using
+% Now after typesetting the box we back up to its baseline by using
% the value stored in |\dimen2|.
% \changes{v1.6a}{2003/03/15}{Now adjusting \cs{prevdepth}}
% \begin{macrocode}
@@ -2741,12 +2741,13 @@
% Some tracing code that we don't compile into the production version
% unless asked for. It will produce huge listings of the boxes
% involved in balancing in the transcript file.
+% \changes{v1.6f}{2004/07/03}{need to use \cs{mult@grightbox} in the loop}
% \begin{macrocode}
%<*debug>
\ifnum\c@tracingmulticols>4
{\showoutput
\batchmode
- \process@cols\@ne
+ \process@cols\mult@grightbox
{\showbox\count@}}%
\errorstopmode
\fi
@@ -2826,6 +2827,7 @@
% \end{macrocode}
% If |\@tempboxa| above was not void our trial was unsuccessful and
% we report this fact and try again.
+% \changes{v1.6f}{2004/07/03}{\texttt{/colbreak} guard in the wrong position}
% \begin{macrocode}
%<*colbreak>
\else
@@ -2835,8 +2837,8 @@
forced break(s) in last column!}%
\fi
\fi
- \fi
%</colbreak>
+ \fi
% \end{macrocode}
% If the natural height of the first box is smaller than the
% current trial size but is larger than the previous trial size it
@@ -2989,7 +2991,8 @@
% \changes{v1.2a}{1990/02/05}{Macro added.}
% \changes{v1.5g}{1994/06/07}{Updated since floats have changed}
% \changes{v1.5j}{1994/06/07}{Updated since floats have changed again}
-% \changes{v1.5l}{1995/10/19}{Added \cmd{@largefloatcheck}}
+% \changes{v1.5l}{1995/10/19}{Added \cs{@largefloatcheck}}
+% \changes{v1.6g}{2006/02/23}{Added \cs{@minipagefalse}}
% Even if this should be used as a hook we use a |@| in the
% name since it is more for experts.
% \begin{macrocode}
@@ -2997,6 +3000,7 @@
\let\@dblfloat\@dbflt
\def\end@dblfloat{\par
\vskip\z@
+ \@minipagefalse
\egroup
\color@endbox
\@largefloatcheck
@@ -3322,7 +3326,7 @@
% \changes{v1.5r}{1998/08/17}{Macro removed again.}
% If we store the current column width in |\columnwidth| we have
% to redefine the internal |\@footnotetext| macro to use |\textwidth|
-% for the width of the footnotes rather then using the original
+% for the width of the footnotes rather than using the original
% definition.
%
% Starting with version v1.5r this is now done in a way that the original
diff --git a/Master/texmf-dist/source/latex/tools/rawfonts.dtx b/Master/texmf-dist/source/latex/tools/rawfonts.dtx
index b34e5a2d6cd..e9305912c66 100644
--- a/Master/texmf-dist/source/latex/tools/rawfonts.dtx
+++ b/Master/texmf-dist/source/latex/tools/rawfonts.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003
+% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
%
@@ -8,12 +8,12 @@
% -------------------------------------------------------
%
% It may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either version 1.3
+% conditions of the LaTeX Project Public License, either version 1.3c
% 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.3 or later is part of all distributions of LaTeX
-% version 2003/12/01 or later.
+% and version 1.3c or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
%
% The list of all files belonging to the LaTeX `Tools Bundle' is
% given in the file `manifest.txt'.
diff --git a/Master/texmf-dist/source/latex/tools/showkeys.dtx b/Master/texmf-dist/source/latex/tools/showkeys.dtx
index e64dbda0956..9a3c1fcc5c8 100644
--- a/Master/texmf-dist/source/latex/tools/showkeys.dtx
+++ b/Master/texmf-dist/source/latex/tools/showkeys.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003
+% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
%
@@ -8,12 +8,12 @@
% -------------------------------------------------------
%
% It may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either version 1.3
+% conditions of the LaTeX Project Public License, either version 1.3c
% 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.3 or later is part of all distributions of LaTeX
-% version 2003/12/01 or later.
+% and version 1.3c or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
%
% The list of all files belonging to the LaTeX `Tools Bundle' is
% given in the file `manifest.txt'.
@@ -21,6 +21,7 @@
% \fi
% \iffalse
%% File: showkeys.dtx Copyright (C) 1992-1997 David Carlisle
+%% File: showkeys.dtx Copyright (C) 2006 David Carlisle, LaTeX3 Project
%
%<*dtx>
\ProvidesFile{showkeys.dtx}
@@ -30,7 +31,7 @@
%<driver> \ProvidesFile{showkeys.drv}
% \fi
% \ProvidesFile{showkeys.dtx}
- [1997/06/12 v3.12 Show cite and label keys (DPC)]
+ [2006/01/09 v3.13 Show cite and label keys (DPC)]
%
% \iffalse
%<*driver>
@@ -56,7 +57,7 @@
%
% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% \CheckSum{516}
+% \CheckSum{592}
%
%
% \changes{v1.01}{1992/08/25}{Initial version}
@@ -134,6 +135,17 @@
% to honour an informal convention that packages have these options in
% pairs.
%
+% You can also control the appearance of the typeset label with the
+% command |\showkeyslabelformat|, which takes one argument. The default is
+% \begin{verbatim}
+% \providecommand*\showkeyslabelformat[1]{%
+% \fbox{\normalfont\small\ttfamily#1}}
+% \end{verbatim}
+% The command is called inside a group so you can put in local
+% modifications of |\fboxsep|, for instance, without them leaking to
+% the rest of the document.
+%
+%
% \section{More Examples}\label{examples}
% The only other similar package that I could find in the macro index,
% \cite{DMJ:mi}, was |showlabels.sty|, \cite{GN:sl}. After the first
@@ -361,7 +373,17 @@
% \end{macrocode}
% \end{macro}
%
+%
+%
+% \begin{macro}{\showkeyslabelformat}
+% \changes{v3.13}{2006/01/09}{Added command}
+% \begin{macrocode}
+\providecommand*\showkeyslabelformat[1]{%
+ \fbox{\normalfont\small\ttfamily#1}}
+% \end{macrocode}
+% \end{macro}
% \begin{macro}{\SK@@label}
+% \changes{v3.13}{2006/01/09}{Do not hardwire label format}
% Strip off the initial segment of the |\meaning| output, and then put
% the rest either in a |\marginpar| or in a box of size 0pt,
% hopefully not disturbing the surrounding text.
@@ -372,8 +394,7 @@
% the counter will be printed in a different group to the |\label|
% command.
% \begin{macrocode}
- \gdef\SK@lab{\smash{\SK@labelcolor\fbox{%
- \normalfont\small\ttfamily#2}}}%
+ \gdef\SK@lab{\smash{\SK@labelcolor\showkeyslabelformat{#2}}}%
\ifvmode
\if@inlabel
% \end{macrocode}
@@ -495,59 +516,99 @@
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\iftagsleft@}
-% Make sure that this AMS\LaTeX\ command really is an |\if..|
+% \begin{macro}{\tagform@}
% \changes{v2.00}{1992/01/31}
% {Defer tests to begin document}
+% \changes{v3.02}{1995/03/17}
+% {Support new AMS files}
+% \begin{macro}{\@eqnnum}
+% \changes{v3.13}{2006/01/09}
+% {Change to also work correctly for \texttt{leqno} option.}
+% \begin{macro}{\maketag@@@}
+% \changes{v3.13}{2006/01/09}
+% {Support for \cs{tag*} tools/3693.}
+% Firstly we grab |\@eqnnum|.
% \begin{macrocode}
\AtBeginDocument{%
\let\SK@eqnnum\@eqnnum
- \def\@tempa{\let\iftagsleft@\iffalse}%
- \ifx\iftagsleft@\undefined\@tempa\fi%
% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\tag@form@}
-% \changes{v3.02}{1995/03/17}
-% {Support new AMS files}
-% \begin{macro}{\eqnnum}
-% Perhaps if |leqno| is operative, I should define |\@eqnnum| with the
-% `left' version, but it does not really matter.
-% \begin{macrocode}
- \let\SK@tagform@\tagform@
- \iftagsleft@
- \def\tagform@#1{%
- \ifx\df@label\@empty
- \SK@lab@relax
- \else
- \expandafter\SK@@label\meaning\df@label\SK@
- \fi
- \llap{\SK@lab\kern\marginparsep}%
- \SK@lab@relax\SK@tagform@{#1}}%
- \def\@eqnnum{%
- \llap{\SK@lab\kern\displaywidth\kern\marginparsep}%
- \SK@lab@relax\SK@eqnnum}%
+% Then check for \textsf{amsmath} where we grab the internal commands
+% |\tagform@| and |\maketag@@@|. Redefine them and redefine |\@eqnnum|
+% as well.
+% \begin{macrocode}
+ \@ifpackageloaded{amsmath}{%
+ \let\SK@tagform@\tagform@
+ \let\SK@maketag@@@\maketag@@@
+ \iftagsleft@
+ \def\tagform@#1{%
+ \ifx\df@label\@empty
+ \SK@lab@relax
+ \else
+ \expandafter\SK@@label\meaning\df@label\SK@
+ \fi
+ \llap{\SK@lab\kern\marginparsep}%
+ \SK@lab@relax\SK@tagform@{#1}}%
+ \def\maketag@@@#1{%
+ \ifx\df@label\@empty
+ \SK@lab@relax
+ \else
+ \expandafter\SK@@label\meaning\df@label\SK@
+ \fi
+ \llap{\SK@lab\kern\marginparsep}\SK@lab@relax
+ \SK@maketag@@@{#1}%
+ }%
+ \def\@eqnnum{%
+ \llap{\SK@lab\kern\displaywidth\kern\marginparsep}%
+ \SK@lab@relax\SK@eqnnum}%
+ \else
% \end{macrocode}
-%
+% Almost the same for tags on the right, except we use |\rlap| and
+% typeset it after the tag.
% \begin{macrocode}
- \else
- \def\tagform@#1{%
- \ifx\df@label\@empty
- \SK@lab@relax
- \else
- \expandafter\SK@@label\meaning\df@label\SK@
- \fi
+ \def\tagform@#1{%
+ \ifx\df@label\@empty
+ \SK@lab@relax
+ \else
+ \expandafter\SK@@label\meaning\df@label\SK@
+ \fi
% \end{macrocode}
% \changes{v3.08}{1996/07/10}{Missing percent added. /2215}
% \begin{macrocode}
- \SK@tagform@{#1}%
- \rlap{\kern\marginparsep\SK@lab}\SK@lab@relax}%
- \def\@eqnnum{\SK@eqnnum\rlap{\kern\marginparsep\SK@lab}%
- \SK@lab@relax}%
- \fi}
+ \SK@tagform@{#1}%
+ \rlap{\kern\marginparsep\SK@lab}\SK@lab@relax}%
+ \def\maketag@@@#1{%
+ \ifx\df@label\@empty
+ \SK@lab@relax
+ \else
+ \expandafter\SK@@label\meaning\df@label\SK@
+ \fi
+ \SK@maketag@@@{#1}%
+ \rlap{\kern\marginparsep\SK@lab}\SK@lab@relax
+ }%
+ \def\@eqnnum{\SK@eqnnum\rlap{\kern\marginparsep\SK@lab}%
+ \SK@lab@relax}%
+ \fi
+ }%
+% \end{macrocode}
+% If \textsf{amsmath} wasn't loaded we check explicitly if the
+% \texttt{leqno} option was used in |\documentclass| and redefine
+% accordingly.
+% \begin{macrocode}
+ {%
+ \@ifundefined{ver@leqno.clo}{%
+ \def\@eqnnum{\SK@eqnnum\rlap{\kern\marginparsep\SK@lab}%
+ \SK@lab@relax}%
+ }{%
+ \def\@eqnnum{%
+ \llap{\SK@lab\kern\displaywidth\kern\marginparsep}%
+ \SK@lab@relax\SK@eqnnum}%
+ }%
+ }%
+}
% \end{macrocode}
% \end{macro}
% \end{macro}
+% \end{macro}
%
% \begin{macro}{\SK@labx}
% Print the label, and then globally reset the print command to
@@ -620,6 +681,30 @@
% \end{macro}
% \end{macro}
%
+% \begin{macro}{\SK@align*}
+% \begin{macro}{\SK@alignat*}
+% \begin{macro}{\SK@flalign*}
+% \begin{macro}{\SK@gather*}
+% \begin{macro}{\SK@multline*}
+% \begin{macro}{\SK@equation*}
+% \changes{v3.13}{2006/01/09}
+% {Add the starred AMS environments for tools/3697.}
+% Starred versions of the AMS environments.
+% \begin{macrocode}
+\expandafter\let\csname SK@align*\endcsname\SK@equationtrue
+\expandafter\let\csname SK@alignat*\endcsname\SK@equationtrue
+\expandafter\let\csname SK@flalign*\endcsname\SK@equationtrue
+\expandafter\let\csname SK@gather*\endcsname\SK@equationtrue
+\expandafter\let\csname SK@multline*\endcsname\SK@equationtrue
+\expandafter\let\csname SK@equation*\endcsname\SK@equationtrue
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+%
% \begin{macro}{\SK@def}
% \changes{v3.05}{1995/11/09}
% {Macro added}
@@ -652,18 +737,21 @@
% Even if \texttt{notref} option is used, need to fudge the
% \textsf{varioref} commands as they use |\label| internally.
% \changes{v3.04}{1995/10/30}
-% {improve varioref support in notref option case, for tools/1744}
+% {improve varioref support in notref option case, for
+% tools/1744}
+% \changes{v3.13}{2006/01/09}{Updated varioref support, for latex/3373}
% \begin{macrocode}
\AtBeginDocument{%
- \ifx\vpageref\@undefined\else
+ \@ifpackageloaded{varioref}{%
\SK@def\@@vpageref#1[#2]#3{{%
\let\label\SK@label
\SK@@@vpageref#1[#2]{#3}}}%
- \DeclareRobustCommand\vref[1]{%
- \unskip~\ref{#1}%
+ \def\vr@f#1{%
+ \leavevmode\unskip\vref@space
+ \ref{#1}%
{\let\label\SK@label
- \SK@@@vpageref\unskip[\unskip\space]{#1}}}%
- \fi}
+ \vpageref[\unskip]{#1}}}%
+ }{}}
\else
% \end{macrocode}
%
@@ -680,18 +768,19 @@
\AtBeginDocument{%
\SK@def\ref#1{\SK@\SK@@ref{#1}\SK@ref{#1}}%
\SK@def\pageref#1{\SK@\SK@@ref{#1}\SK@pageref{#1}}%
- \ifx\vpageref\@undefined\else
% \end{macrocode}
% varioref support.
% \begin{macrocode}
+ \@ifpackageloaded{varioref}{%
\SK@def\@@vpageref#1[#2]#3{{%
\let\label\SK@label\let\ref\SK@ref\let\pageref\SK@pageref
\leavevmode\unskip\SK@\SK@@ref{#3}\SK@@@vpageref#1[#2]{#3}}}%
- \DeclareRobustCommand\vref[1]{%
- \unskip~\ref{#1}%
- {\let\label\SK@label\let\ref\SK@ref\let\pageref\SK@pageref
- \SK@@@vpageref\unskip[\unskip\space]{#1}}}%
- \fi}
+ \def\vr@f#1{%
+ \leavevmode\unskip\vref@space
+ \ref{#1}%
+ \let\label\SK@label\let\ref\SK@ref\let\pageref\SK@pageref
+ \vpageref[\unskip]{#1}}%
+ }{}}
% \end{macrocode}
%
% \begin{macrocode}
diff --git a/Master/texmf-dist/source/latex/tools/somedefs.dtx b/Master/texmf-dist/source/latex/tools/somedefs.dtx
index 80fa373498d..86fc96cdef8 100644
--- a/Master/texmf-dist/source/latex/tools/somedefs.dtx
+++ b/Master/texmf-dist/source/latex/tools/somedefs.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003
+% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
%
@@ -8,12 +8,12 @@
% -------------------------------------------------------
%
% It may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either version 1.3
+% conditions of the LaTeX Project Public License, either version 1.3c
% 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.3 or later is part of all distributions of LaTeX
-% version 2003/12/01 or later.
+% and version 1.3c or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
%
% The list of all files belonging to the LaTeX `Tools Bundle' is
% given in the file `manifest.txt'.
diff --git a/Master/texmf-dist/source/latex/tools/tabularx.dtx b/Master/texmf-dist/source/latex/tools/tabularx.dtx
index 502ca409970..e52b4a32b89 100644
--- a/Master/texmf-dist/source/latex/tools/tabularx.dtx
+++ b/Master/texmf-dist/source/latex/tools/tabularx.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003
+% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
%
@@ -8,12 +8,12 @@
% -------------------------------------------------------
%
% It may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either version 1.3
+% conditions of the LaTeX Project Public License, either version 1.3c
% 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.3 or later is part of all distributions of LaTeX
-% version 2003/12/01 or later.
+% and version 1.3c or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
%
% The list of all files belonging to the LaTeX `Tools Bundle' is
% given in the file `manifest.txt'.
diff --git a/Master/texmf-dist/source/latex/tools/theorem.dtx b/Master/texmf-dist/source/latex/tools/theorem.dtx
index a117647fadb..31f8386f539 100644
--- a/Master/texmf-dist/source/latex/tools/theorem.dtx
+++ b/Master/texmf-dist/source/latex/tools/theorem.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003
+% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
%
@@ -8,12 +8,12 @@
% -------------------------------------------------------
%
% It may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either version 1.3
+% conditions of the LaTeX Project Public License, either version 1.3c
% 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.3 or later is part of all distributions of LaTeX
-% version 2003/12/01 or later.
+% and version 1.3c or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
%
% The list of all files belonging to the LaTeX `Tools Bundle' is
% given in the file `manifest.txt'.
diff --git a/Master/texmf-dist/source/latex/tools/tools.ins b/Master/texmf-dist/source/latex/tools/tools.ins
index b01195e3426..f67c2d923ab 100644
--- a/Master/texmf-dist/source/latex/tools/tools.ins
+++ b/Master/texmf-dist/source/latex/tools/tools.ins
@@ -3,7 +3,7 @@
%% driver files from the doc files in this package when run through
%% LaTeX or TeX.
%%
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
%% The LaTeX3 Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -11,12 +11,12 @@
%% -------------------------------------------------------
%%
%% It may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
%% 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.3 or later is part of all distributions of LaTeX
-%% version 2003/12/01 or later.
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
%%
%% In particular, NO PERMISSION is granted to modify the contents of this
%% file since it contains the legal notices that are placed in the files
@@ -41,7 +41,7 @@
This is a generated file.
-Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003
+Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
The LaTeX3 Project and any individual authors listed elsewhere
in this file.
@@ -49,12 +49,12 @@ This file was generated from file(s) of the Standard LaTeX `Tools Bundle'.
--------------------------------------------------------------------------
It may be distributed and/or modified under the
-conditions of the LaTeX Project Public License, either version 1.3
+conditions of the LaTeX Project Public License, either version 1.3c
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.3 or later is part of all distributions of LaTeX
-version 2003/12/01 or later.
+and version 1.3c or later is part of all distributions of LaTeX
+version 2005/12/01 or later.
This file may only be distributed together with a copy of the LaTeX
`Tools Bundle'. You may however distribute the LaTeX `Tools Bundle'
diff --git a/Master/texmf-dist/source/latex/tools/trace.dtx b/Master/texmf-dist/source/latex/tools/trace.dtx
index 71c3494d773..013fb03bd51 100644
--- a/Master/texmf-dist/source/latex/tools/trace.dtx
+++ b/Master/texmf-dist/source/latex/tools/trace.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003
+% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
%
@@ -8,12 +8,12 @@
% -------------------------------------------------------
%
% It may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either version 1.3
+% conditions of the LaTeX Project Public License, either version 1.3c
% 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.3 or later is part of all distributions of LaTeX
-% version 2003/12/01 or later.
+% and version 1.3c or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
%
% The list of all files belonging to the LaTeX `Tools Bundle' is
% given in the file `manifest.txt'.
diff --git a/Master/texmf-dist/source/latex/tools/varioref.dtx b/Master/texmf-dist/source/latex/tools/varioref.dtx
index 1a30d6742d3..9f1ec820a4c 100644
--- a/Master/texmf-dist/source/latex/tools/varioref.dtx
+++ b/Master/texmf-dist/source/latex/tools/varioref.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003
+% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
%
@@ -8,12 +8,12 @@
% -------------------------------------------------------
%
% It may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either version 1.3
+% conditions of the LaTeX Project Public License, either version 1.3c
% 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.3 or later is part of all distributions of LaTeX
-% version 2003/12/01 or later.
+% and version 1.3c or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
%
% The list of all files belonging to the LaTeX `Tools Bundle' is
% given in the file `manifest.txt'.
@@ -21,7 +21,7 @@
% \fi
% \iffalse
%% Package varioref to use with LaTeX2e
-%% Copyright (C) 1992-2004 Frank Mittelbach, all rights reserved.
+%% Copyright (C) 1992-2006 Frank Mittelbach, all rights reserved.
%%
%% For additions or updates to the language options please contact
%% the author at
@@ -33,10 +33,10 @@
%
%<package>\NeedsTeXFormat{LaTeX2e}[1995/05/16]
%<package>\ProvidesPackage{varioref}
-%<package> [2004/02/27 v1.4i package for extended references (FMi)]
+%<package> [2006/05/13 v1.4p package for extended references (FMi)]
% \fi
%
-% \CheckSum{1683}
+% \CheckSum{1899}
%% \CharacterTable
%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
@@ -244,7 +244,7 @@
% \DescribeMacro{\vref*}
% \DescribeMacro{\vpageref*}
% \DescribeMacro{\vpagerefrange*}
-% Since it is to late to change the default behaviour I've added star
+% Since it is too late to change the default behaviour I've added star
% versions of the macros which do not add any space before the
% generated text (they do nevertheless remove space at the left).
%
@@ -336,7 +336,7 @@
% use of |\pageref| in its replacement text.
%
%
-%\DescribeMacro\vreftextvario To allow a bit random variation in the
+%\DescribeMacro\reftextvario To allow a bit random variation in the
% generated strings one can use the command |\reftextvario| inside the
% string macros. It takes two arguments and selects one or the other
% for printing depending on the number of already seens |\vref| or
@@ -538,7 +538,7 @@
% \begin{macro}{\reftextafter}
% \begin{macro}{\reftextbefore}
% \begin{macro}{\reftextcurrent}
-% \label{reftextbefore} The options do set the the macros that
+% \label{reftextbefore} The options do set the macros that
% generate the textual strings. Note, that they do not start with a
% space, the space is already added in the main macro below.
% \changes{v1.2a}{1998/08/22}{Added american defaults for
@@ -611,10 +611,52 @@
\def\reftextlabelrange#1#2{\ref{#1} bis~\ref{#2}}%
}}
% \end{macrocode}
+% Text for basque defaults was contributed by
+% I\~naki Larra\~naga Murgoitio (aka dooteo)
+% (|<dooteo@euskalgnu.org>|).
+% \changes{v1.4k}{2005/04/09}{Basque defaults added.}
+% \begin{macrocode}
+\DeclareOption{basque}
+ {\vref@addto\extrasbasque{%
+ \def\reftextfaceafter {hurrengo orrialdean}%
+ \def\reftextfacebefore{aurreko orrialdean}%
+ \let\reftextafter \reftextfaceafter
+ \let\reftextbefore \reftextfacebefore
+ \def\reftextcurrent {uneko orrialdean}%
+ \def\reftextfaraway#1{~\pageref{#1}. orrialdean}%
+ \def\reftextpagerange#1#2{~\pageref{#1}--\pageref{#2} orrialdeetan}%
+ \def\reftextlabelrange#1#2{\ref{#1}.etik \ref{#2}.eraino}%
+ }}
+% \end{macrocode}
+% Text for the Bahasa Malaysia defaults was contributed by
+% Bob Margolis 2005-12-02.
+%
+% Notes: pada muka surat translates as ``on the page'' though BM has no
+% definite (or indefinite) article; adjectives and other modifiers follow
+% the noun (clause); bertentangan is ``opposite'' in the sense of
+% ``facing''; berikutnya is ``next'' (in this context - actually
+% next-to-this, literally); berikutnya also translates as ``following
+% this'' sebelumnya is ``preceding''; also ``previous'' ``ini'' translates,
+% literally, as ``this'' but is also used in the sense of current page.
+% \changes{v1.4o}{2005/12/02}{Bahasa Malaysia defaults added.}
+% \begin{macrocode}
+\DeclareOption{bahasam}
+ {\vref@addto\extrasbahasam{%
+ \def\reftextfaceafter {pada muka surat \reftextvario{bertentangan}{berikutnya}}%
+ \def\reftextfacebefore{pada muka surat \reftextvario{bertentangan}{sebelumnya} }%
+ \def\reftextafter {pada muka surat berikutnya}%
+ \def\reftextbefore {pada muka surat sebelumnya}%
+ \def\reftextcurrent {pada muka surat ini}%
+ \def\reftextfaraway#1{pada muka surat~\pageref{#1}}%
+ \def\reftextpagerange#1#2{pada muka surat~\pageref{#1}--\pageref{#2}}%
+ \def\reftextlabelrange#1#2{\ref{#1}--\ref{#2}}%
+ }}
+% \end{macrocode}
% Text for brazil defaults was contributed by
% Alcino Dall Igna Junior\\
% (|adij@di.ufpe.br|).
% \changes{v1.0g}{1994/05/18}{Brazil defaults added.}
+% \changes{v1.4o}{2005/11/07}{Added a few more brazil strings}
% \begin{macrocode}
\DeclareOption{brazil}
{\vref@addto\extrabrazil{%
@@ -627,10 +669,8 @@
\def\reftextcurrent {\reftextvario{nesta p\'agina}{na p\'agina
corrente}}%
\def\reftextfaraway#1{na p\'agina~\pageref{#1}}%
- \def\reftextpagerange#1#2{\vref@stringwarning\reftextpagerange
- on pages~\pageref{#1}--\pageref{#2}}%
- \def\reftextlabelrange#1#2{\vref@stringwarning\reflabelpagerange
- \ref{#1} to~\ref{#2}}%
+ \def\reftextpagerange#1#2{nas p\'aginas~\pageref{#1}--\pageref{#2}}%
+ \def\reftextlabelrange#1#2{\ref{#1} a~\ref{#2}}%
}}
% \end{macrocode}
% Text for Breton defaults was contributed by
@@ -671,19 +711,22 @@
p\`agines~\pageref{#1}--\pageref{#2}}%
\def\reftextlabelrange#1#2{\ref{#1} a~\ref{#2}}%
}}
+% \end{macrocode}
+% Text for croatian defaults was contributed by Sime Ungar
+% (\verb=ungar@math.hr=).
+% \changes{v1.4p}{2006/05/13}{Added defaults for croatian}
+% \begin{macrocode}
\DeclareOption{croatian}
- {\vref@excuse{croatian}%
- \vref@addto\extrascroatian{%
- \def\reftextfaceafter {on the \reftextvario{facing}{next} page}%
- \def\reftextfacebefore{on the \reftextvario{facing}{preceding}
- page}%
- \def\reftextafter {on the \reftextvario{following}{next} page}%
- \def\reftextbefore {on the \reftextvario{preceding}{previous} page}%
- \def\reftextcurrent {on \reftextvario{this}{the current} page}%
- \def\reftextfaraway#1{on page~\pageref{#1}}%
- \def\reftextpagerange#1#2{on pages~\pageref{#1}--\pageref{#2}}%
- \def\reftextlabelrange#1#2{\ref{#1} to~\ref{#2}}%
- }}
+ {\vref@addto\extrascroatian{%
+ \def\reftextfaceafter {na sljede\'coj stranici}%
+ \def\reftextfacebefore{na prethodnoj stranici}%
+ \let\reftextafter \reftextfaceafter
+ \let\reftextbefore \reftextfacebefore
+ \def\reftextcurrent {na ovoj stranici}%
+ \def\reftextfaraway#1{na stranici~\pageref{#1}}%
+ \def\reftextpagerange#1#2{na stranicama~\pageref{#1}--\pageref{#2}}%
+ \def\reftextlabelrange#1#2{\ref{#1} do~\ref{#2}}%
+ }}
% \end{macrocode}
% Defaults for the Czech option provided by Milan Vancura
% \verb=<milan@suse.cz>=.
@@ -757,9 +800,10 @@
% would either use `--' or `tot en met' (the abbreviation written
% out). ''
% \changes{v1.4d}{2002/11/11}{Changed default for \cs{reftextlabelrange}}
+% \changes{v1.4m}{2005/06/09}{Fixed \cs{reftextlabelrange} (pr/3791)}
% \begin{macrocode}
\def\reftextpagerange#1#2{op pagina's~\pageref{#1}--\pageref{#2}}%
- \def\reftextlabelrange#1#2{\ref#1--\ref{#2}}%
+ \def\reftextlabelrange#1#2{\ref{#1}--\ref{#2}}%
}}
% \end{macrocode}
% \changes{v1.2a}{1998/08/22}{Added english defaults for
@@ -793,8 +837,10 @@
}}
% \end{macrocode}
% The finnish strings were suggested by Matti Rintala
-% (\verb=bitti@cs.tut.fi=).
+% (\verb=bitti@cs.tut.fi=) and Hillevi Gavel
+% \verb=Hillevi.Gavel@mdh.se=.
% \changes{v1.0m}{1994/09/23}{Added finnish strings}
+% \changes{v1.4o}{2005/11/07}{Added a few more finnish strings}
% \begin{macrocode}
\DeclareOption{finnish}
{\vref@addto\extrasfinnish{%
@@ -806,10 +852,11 @@
\def\reftextbefore {edellisell\"a sivulla}%
\def\reftextcurrent {t\"all\"a sivulla}%
\def\reftextfaraway#1{sivulla~\pageref{#1}}%
- \def\reftextpagerange#1#2{\vref@stringwarning\reftextpagerange
- on pages~\pageref{#1}--\pageref{#2}}%
- \def\reftextlabelrange#1#2{\vref@stringwarning\reflabelpagerange
- \ref{#1} to~\ref{#2}}%
+ \def\reftextpagerange#1#2{sivuilla~\pageref{#1}--\pageref{#2}}%
+% \end{macrocode}
+% Can't combine numbers with the necessary suffix well.
+% \begin{macrocode}
+ \def\reftextlabelrange#1#2{\ref{#1}--\ref{#2}}%
}}
% \end{macrocode}
% French defaults are provided by Daniel Flippo
@@ -834,20 +881,20 @@
% Galician defaults are provided by Matthias Moebius\\
% (\texttt{Matthias.Moebius@uni-konstanz.de}).
% \changes{v1.1f}{1998/04/25}{Added galician defaults}
+% \changes{v1.4o}{2005/11/10}{Added further galician defaults}
+% \changes{v1.4o}{2005/11/26}{Some further corrections}
% \begin{macrocode}
\DeclareOption{galician}
- {\vref@excuse{galician}%
- \vref@addto\extrasgalician{%
- \def\reftextfaceafter {na seguinte p\'axina}%
- \def\reftextfacebefore{na p\'agina anterior}%
- \let\reftextafter \reftextfaceafter
- \let\reftextbefore \reftextfacebefore
+ {\vref@addto\extrasgalician{%
+ \def\reftextfaceafter {na p\'axina oposta}%
+ \def\reftextfacebefore\reftextfaceafter
+ \let\reftextafter {na p\'axina seguinte}%
+ \let\reftextbefore {na p\'axina anterior}%
\def\reftextcurrent {nesta p\'axina}%
\def\reftextfaraway#1{na p\'axina~\pageref{#1}}%
- \def\reftextpagerange#1#2{\vref@stringwarning\reftextpagerange
- on pages~\pageref{#1}--\pageref{#2}}%
- \def\reftextlabelrange#1#2{\vref@stringwarning\reflabelpagerange
- \ref{#1} to~\ref{#2}}%
+ \def\reftextpagerange#1#2{%
+ nas p\'axinas~\pageref{#1}-\pageref{#2}}%
+ \def\reftextlabelrange#1#2{\ref{#1} a~\ref{#2}}%
}}
% \end{macrocode}
% There are no good variants for German (I think and still think but
@@ -870,6 +917,7 @@
% \def\reftextcurrent {\reftextvario
% {auf dieser}{diese} Seite}%
%\end{verbatim}
+% \changes{v1.4n}{2005/07/24}{Small change}
% \begin{macrocode}
\DeclareOption{german}
{\vref@addto\extrasgerman{%
@@ -879,11 +927,12 @@
\let\reftextbefore \reftextfacebefore
\def\reftextcurrent {auf dieser Seite}%
\def\reftextfaraway#1{auf Seite~\pageref{#1}}%
- \def\reftextpagerange#1#2{auf Seiten~\pageref{#1}--\pageref{#2}}%
+ \def\reftextpagerange#1#2{auf den Seiten~\pageref{#1}--\pageref{#2}}%
\def\reftextlabelrange#1#2{\ref{#1} bis~\ref{#2}}%
}}
% \end{macrocode}
% \changes{v1.2d}{2000/01/11}{Added ngerman defaults (identical to german)}
+% \changes{v1.4n}{2005/07/24}{Small change}
% The ngerman defaults are the same but needed for ``Neue Rechtschreibung''
% (i.e., a different set of hyphenation patterns).
% \begin{macrocode}
@@ -895,7 +944,7 @@
\let\reftextbefore \reftextfacebefore
\def\reftextcurrent {auf dieser Seite}%
\def\reftextfaraway#1{auf Seite~\pageref{#1}}%
- \def\reftextpagerange#1#2{auf Seiten~\pageref{#1}--\pageref{#2}}%
+ \def\reftextpagerange#1#2{auf den Seiten~\pageref{#1}--\pageref{#2}}%
\def\reftextlabelrange#1#2{\ref{#1} bis~\ref{#2}}%
}}
% \end{macrocode}
@@ -922,6 +971,8 @@
% (\verb=pensa@dsi.unimi.it=) with i{\TeX}nici.
% \changes{v1.1b}{1995/10/19}{Added defaults for Italian}
% \changes{v1.2a}{1998/08/22}{Removed incorrect warning}
+% \changes{v1.4k}{2004/10/30}{Added missing defaults supplied by Lapo Mori}
+% \changes{v1.4n}{2005/07/24}{Small change}
% \begin{macrocode}
\DeclareOption{italian}
{\vref@addto\extrasitalian{%
@@ -933,18 +984,16 @@
{successiva}}%
\def\reftextbefore {nella pagina precedente}%
\def\reftextcurrent {in questa pagina}%
- \def\reftextfaraway#1{a pagina~\pageref{#1}}%
- \def\reftextpagerange#1#2{\vref@stringwarning\reftextpagerange
- on pages~\pageref{#1}--\pageref{#2}}%
- \def\reftextlabelrange#1#2{\vref@stringwarning\reflabelpagerange
- \ref{#1} to~\ref{#2}}%
+ \def\reftextfaraway#1{nella pagina~\pageref{#1}}%
+ \def\reftextpagerange#1#2{nelle pagine~\pageref{#1}--\pageref{#2}}%
+ \def\reftextlabelrange#1#2{da~\ref{#1} a~\ref{#2}}%
}}
% \end{macrocode}
% Defaults for Hungarian by Jeff Goldberg
% (\verb=jeffrey@goldmark.org=).
% There is a problem with the use of the definite article
% \textit{a} or \textit{az} in Hungarian before expansions
-% of |\vref| or |\ref|. The problem is that the the word
+% of |\vref| or |\ref|. The problem is that the word
% should be \textit{az} if the number following would begin with
% a vowel if spelled out, and \textit{a} if the number would begin
% with a consonant.
@@ -954,11 +1003,13 @@
% old but unfortunately never made it into varioref. In case any work
% has been undertaken to resolve this please inform the author about it.}
% \changes{v1.2a}{1998/08/22}{Added defaults for magyar}
+% \changes{v1.4j}{2005/01/22}{Defined \cs{reftextfaceafter} and
+% \cs{reftextfacebefore} instead of \cs{reftextafter} and \cs{reftextbefore}}
% \begin{macrocode}
\DeclareOption{magyar}
{\vref@addto\extrasmagyar{%
- \def\reftextfaceafter {a k\"o\-vet\-kez\H{o} ol\-da\-lon}%
- \def\reftextfacebefore{az el\H{o}\-z\H{o} ol\-da\-lon}%
+ \def\reftextafter {a k\"o\-vet\-kez\H{o} ol\-da\-lon}%
+ \def\reftextbefore{az el\H{o}\-z\H{o} ol\-da\-lon}%
\def\reftextfaceafter {\reftextvario{a t\'ul\-ol\-da\-lon}%
{a k\"o\-vet\-kez\H{o} ol\-da\-lon}}%
\def\reftextfacebefore{\reftextvario{a t\'ul\-ol\-da\-lon}%
@@ -1043,6 +1094,7 @@
% \changes{v1.1d}{1997/12/06}{Added defaults for polish}
% \changes{v1.2a}{1998/08/22}{Added polish defaults for
% \cs{reftextpagerange} and \cs{reftextlabelrange}}
+% \changes{v1.4n}{2005/09/14}{Changed default for \cs{reftextfaraway}}
% \begin{macrocode}
\DeclareOption{polish}
{\vref@addto\extraspolish{%
@@ -1054,7 +1106,7 @@
\def\reftextbefore {na poprzedniej stronie}%
\def\reftextcurrent {na \reftextvario{tej
samej}{bie\zkb{}\aob{}cej} stronie}%
- \def\reftextfaraway#1{na \pageref{#1}~stronie}%
+ \def\reftextfaraway#1{na stronie~\pageref{#1}}%
\def\reftextpagerange#1#2{na stronach~\pageref{#1}--\pageref{#2}}%
\def\reftextlabelrange#1#2{od~\ref{#1} do~\ref{#2}}%
}}
@@ -1078,17 +1130,16 @@
\def\reftextlabelrange#1#2{\ref{#1} a~\ref{#2}}%
}}
\DeclareOption{romanian}
- {\vref@excuse{romanian}%
- \vref@addto\extrasromanian{%
- \def\reftextfaceafter {on the \reftextvario{facing}{next} page}%
- \def\reftextfacebefore{on the \reftextvario{facing}{preceding}
- page}%
- \def\reftextafter {on the \reftextvario{following}{next} page}%
- \def\reftextbefore {on the \reftextvario{preceding}{previous} page}%
- \def\reftextcurrent {on \reftextvario{this}{the current} page}%
- \def\reftextfaraway#1{on page~\pageref{#1}}%
- \def\reftextpagerange#1#2{on pages~\pageref{#1}--\pageref{#2}}%
- \def\reftextlabelrange#1#2{\ref{#1} to~\ref{#2}}%
+ {\vref@addto\extrasromanian{%
+ \def\reftextfaceafter {pe pagina \reftextvario{opus\u{a}}{urm\u{a}toarei}}%
+ \def\reftextfacebefore{pe pagina \reftextvario{opus\u{a}}{precedentei}}%
+ \def\reftextafter {pe pagina \reftextvario{dup\u{a}}{urm\u{a}toarea}}%
+ \def\reftextbefore {pe pagina \reftextvario{dinaintea}{
+ precedentei}}%
+ \def\reftextcurrent {pe aceast\u{a} pagin\u{a}}%
+ \def\reftextfaraway#1{pe pagina~\pageref{#1}}%
+ \def\reftextpagerange#1#2{pe paginile~\pageref{#1}--\pageref{#2}}%
+ \def\reftextlabelrange#1#2{\ref{#1} la~\ref{#2}}%
}}
% \end{macrocode}
% The text for russian was taken from the book in Russian by
@@ -1165,6 +1216,7 @@
% \changes{v1.0f}{1994/03/16}{Inserted missing hash mark}
% \changes{v1.0k}{1994/06/05}{Corrected misspelled cmd `extrasspanish}
% \changes{v1.4a}{2002/03/05}{Missing defaults added}
+% \changes{v1.4o}{2005/11/26}{Single hyphen in range}
% \begin{macrocode}
\DeclareOption{spanish}
{\vref@addto\extrasspanish{%
@@ -1175,7 +1227,7 @@
\def\reftextcurrent {en esta p\'agina}%
\def\reftextfaraway#1{en la p\'agina~\pageref{#1}}%
\def\reftextpagerange#1#2{en las p\'aginas~\pageref{#1}%
- --\pageref{#2}}%
+ -\pageref{#2}}%
\def\reftextlabelrange#1#2{\ref{#1} a~\ref{#2}}%
}}
% \end{macrocode}
@@ -1214,6 +1266,33 @@
\def\reftextlabelrange#1#2{\ref{#1} to~\ref{#2}}%
}}
% \end{macrocode}
+% The text for Ukrainian defaults was contributed by Mykola Lyakhovych
+% (\verb=<lyakhovych@mail.ru>=).
+% \changes{v1.4l}{2005/04/24}{Contributed defaults added}
+% \begin{macrocode}
+\DeclareOption{ukrainian}
+ {\vref@addto\extrasukrainian{%
+ \def\reftextfaceafter{\cyrn\cyra\ \reftextvario{\cyrp\cyrr\cyro
+ \cyrt\cyri\cyrl\cyre\cyrzh\cyrn\cyrii\cyrishrt}%
+ {\cyrn\cyra\cyrs\cyrt\cyru\cyrp\cyrn\cyrii\cyrishrt}\ \cyrs\cyrt
+ \cyro\cyrr\cyri\cyrn\cyrc\cyrii}%
+ \def\reftextfacebefore{\cyrn\cyra\ \reftextvario{\cyrp\cyrr\cyro
+ \cyrt\cyri\cyrl\cyre\cyrzh\cyrn\cyrii\cyrishrt}%
+ {\cyrp\cyro\cyrp\cyre\cyrr\cyre\cyrd\cyrn\cyrii\cyrishrt}\
+ \cyrs\cyrt\cyro\cyrr\cyrii\cyrn\cyrc\cyrii}%
+ \def\reftextafter{\cyrn\cyra\ \cyrn\cyra\cyrs\cyrt\cyru\cyrp\cyrn
+ \cyrii\cyrishrt\ \cyrs\cyrt\cyro\cyrr\cyrii\cyrn\cyrc\cyrii}%
+ \def\reftextbefore{\cyrn\cyra\ \cyrp\cyro\cyrp\cyre\cyrr\cyre\cyrd
+ \cyrn\cyrii\cyrishrt\ \cyrs\cyrt\cyro\cyrr\cyrii\cyrn\cyrc\cyrii}%
+ \def\reftextcurrent{\cyrn\cyra\ \reftextvario{\cyrc\cyrii\cyrishrt}%
+ {\cyrd\cyra\cyrn\cyrii\cyrishrt}\ \cyrs\cyrt\cyro\cyrr\cyrii\cyrn
+ \cyrc\cyrii}%
+ \def\reftextfaraway#1{\cyrn\cyra\ \cyrs.~\pageref{#1}}%
+ \def\reftextpagerange#1#2{\cyrn\cyra\ \cyrs\cyrt\cyro\cyrr\cyrii
+ \cyrn\cyrk\cyra\cyrh~\pageref{#1}--\pageref{#2}}%
+ \def\reftextlabelrange#1#2{\cyrz~\ref{#1}\ \cyrd\cyro~\ref{#2}}%
+ }}
+% \end{macrocode}
% We support francais as an alternative to french since people
% might be used to it, but we discurrage it.
% \begin{macrocode}
@@ -1341,7 +1420,7 @@
% \end{macrocode}
% Then it checks if for the current value of |\c@vrcnt| a label
% command was issued in the last run. If not it pretends that there
-% was one with the value |{??}{??}|. Thereafter it stores the the
+% was one with the value |{??}{??}|. Thereafter it stores the
% pageref value for this label in the macro |\@tempa|.
% \begin{macrocode}
\vref@pagenum\@tempa{\the\c@vrcnt @vr}%
@@ -1662,12 +1741,12 @@
%
% \begin{macro}{\is@pos@number}
% The utility macro |\is@pos@number| takes three arguments: a
-% string that is tested for being a valid integer and the actions
-% to be taken in case the test comes out true or false.
+% string that is tested for being a valid non-negative integer and the
+% actions to be taken in case the test comes out true or false.
%
% We start by passing the string to the macro |\is@pos@num| after
% prefixing it with a \texttt{0} and adding a space after it. To have
-% a well defined ending point we also add |\@nil| at the end.
+% a well-defined ending point we also add |\@nil| at the end.
%\label{isposnumber}
% \begin{macrocode}
\def\is@pos@number#1{\is@pos@num0#1\space\@nil}
@@ -1695,10 +1774,11 @@
\def\is@pos@num@#1\@nil{%
% \end{macrocode}
% Now we have to check if the argument is empty. We can do this
-% with an |\if| test (i.e., in an expandable way) since we know for
-% sure that it can not start with a digit
+% with an |\ifx| (i.e., in an expandable way) since we know for
+% sure that it can not start with |\@nil|.
+% \changes{v1.4j}{2004/05/08}{Use \cs{@nil} for testing}
% \begin{macrocode}
- \if0#10%
+ \ifx\@nil#1\@nil
% \end{macrocode}
% Depending on the result we execute the second or third argument
% of the command |\is@pos@number| using a technique that removes
diff --git a/Master/texmf-dist/source/latex/tools/verbatim.dtx b/Master/texmf-dist/source/latex/tools/verbatim.dtx
index 29edcb61239..f9d427c0aeb 100644
--- a/Master/texmf-dist/source/latex/tools/verbatim.dtx
+++ b/Master/texmf-dist/source/latex/tools/verbatim.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003
+% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
%
@@ -8,12 +8,12 @@
% -------------------------------------------------------
%
% It may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either version 1.3
+% conditions of the LaTeX Project Public License, either version 1.3c
% 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.3 or later is part of all distributions of LaTeX
-% version 2003/12/01 or later.
+% and version 1.3c or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
%
% The list of all files belonging to the LaTeX `Tools Bundle' is
% given in the file `manifest.txt'.
diff --git a/Master/texmf-dist/source/latex/tools/xr.dtx b/Master/texmf-dist/source/latex/tools/xr.dtx
index de50c9f674c..cabfa624c93 100644
--- a/Master/texmf-dist/source/latex/tools/xr.dtx
+++ b/Master/texmf-dist/source/latex/tools/xr.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003
+% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
%
@@ -8,12 +8,12 @@
% -------------------------------------------------------
%
% It may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either version 1.3
+% conditions of the LaTeX Project Public License, either version 1.3c
% 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.3 or later is part of all distributions of LaTeX
-% version 2003/12/01 or later.
+% and version 1.3c or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
%
% The list of all files belonging to the LaTeX `Tools Bundle' is
% given in the file `manifest.txt'.
diff --git a/Master/texmf-dist/source/latex/tools/xspace.dtx b/Master/texmf-dist/source/latex/tools/xspace.dtx
index 1d3c2ff1642..5cb3b7cb2f1 100644
--- a/Master/texmf-dist/source/latex/tools/xspace.dtx
+++ b/Master/texmf-dist/source/latex/tools/xspace.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003
+% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
%
@@ -8,19 +8,21 @@
% -------------------------------------------------------
%
% It may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either version 1.3
+% conditions of the LaTeX Project Public License, either version 1.3c
% 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.3 or later is part of all distributions of LaTeX
-% version 2003/12/01 or later.
+% and version 1.3c or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
%
% The list of all files belonging to the LaTeX `Tools Bundle' is
% given in the file `manifest.txt'.
%
% \fi
% \iffalse
-%% File: xspace.dtx Copyright (C) 1991-1996 David Carlisle
+%% File: xspace.dtx Copyright (C) 1991-1997 David Carlisle
+%% File: xspace.dtx Copyright (C) 2004-2006 David Carlisle,
+%% Morten H\o gholm
%
%<*dtx>
\ProvidesFile{xspace.dtx}
@@ -30,12 +32,17 @@
%<driver>\ProvidesFile{xspace.drv}
% \fi
% \ProvidesFile{xspace.dtx}
- [1997/10/13 v1.06 Space after command names (DPC)]
+ [2006/05/08 v1.12 Space after command names (DPC,MH)]
%
% \iffalse
%<*driver>
\documentclass{ltxdoc}
-\usepackage{xspace}
+\makeatletter
+\providecommand*\eTeX{{%
+ \if b\expandafter\@car\f@series\@nil\boldmath\fi$\m@th
+ \varepsilon$-\TeX}}
+\makeatother
+\usepackage{xspace}[2006/05/08]
\begin{document}
\DocInput{xspace.dtx}
\end{document}
@@ -46,49 +53,161 @@
% \title{The \textsf{xspace} package\thanks{This file
% has version number \fileversion, last
% revised \filedate.}}
-% \author{David Carlisle}
+% \author{David Carlisle \and Morten H\o gholm}
% \date{\filedate}
% \maketitle
%
% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% \CheckSum{87}
+% \CheckSum{209}
%
% \changes{v1.00}{1991/08/30}{Initial version}
% \changes{v1.01}{1992/06/26}{Re-issue for the new doc and docstrip}
-% \changes{v1.02}{1994/01/31}{Re-issue for LaTeX2e (no change to code)}
+% \changes{v1.02}{1994/01/31}{Re-issue for LaTeX2e (no change to
+% code)}
+% \changes{v1.07}{2004/12/07}{Make extensible. tools/3712}
+% \changes{v1.07}{2004/12/07}{Fix active characters. tools/3747}
+% \changes{v1.07}{2004/12/07}{Update documentation}
+% \changes{v1.08}{2005/05/07}{Better fix for active characters}
+% \changes{v1.09}{2005/07/26}{Improve test by exiting if
+% \cs{@let@token} is a letter}
+% \changes{v1.10}{2005/10/04}{Use higher level functions for
+% conditional processing}
+% \changes{v1.10}{2005/10/04}{Improve expansion method}
%
% \begin{abstract}
-% |\xspace| should be used at the end of a macro designed to be used
-% mainly in text. It adds a space unless the macro is followed by
-% certain punctuation characters.
+% |\xspace| should be used at the end of a macro designed to
+% be used mainly in text. It adds a space unless the macro is
+% followed by certain punctuation characters.
% \end{abstract}
%
% \section{Introduction}
-% After |\newcommand{\gb}{Great Britain\xspace}|\\
-% \newcommand{\gb}{Great Britain\xspace}
-% |\gb is a very nice place to live.|\\
-% \gb is a very nice place to live.\\
-% |\gb, a small island off the coast of France.|\\
-% \gb, a small island off the coast of France.
-%
-% |\xspace| saves the user from having to type \verb*+\ + or |{}| after
-% most occurrences of a macro name in text. However if either of these
-% constructions follows |\xspace|, a space is not added by |\xspace|.
-% This means that it is safe to add |\xspace| to the end of an existing
-% macro without making too many changes in your document.
-%
-% Sometimes |\xspace| may make the wrong decision, and add a space when
-% it is not required. In these cases follow the macro with |{}|, as this
-% has the effect of suppressing the space.
-%
-% Note that this package must be loaded \emph{after} any language (or
-% other) packages that make punctuation characters `active'.
+% \newcommand{\gb}{Great Britain\xspace}\DescribeMacro{\xspace}
+% After defining |\newcommand{\gb}{Great Britain\xspace}|,
+% the command |\gb| will determine when to insert a space
+% after itself and when not. Thus the input
+% \begin{quote}
+% |\gb is a very nice place to live.\\| \\
+% |\gb, a small island off the coast of France.\\|\\
+% |\gb\footnote{The small island off the coast of France.}|\\
+% |is a very nice place to live.|
+% \end{quote}
+% results in the output
+% \begin{quote}
+% \gb is a very nice place to live. \\
+% \gb, a small island off the coast of France.\\
+% \gb\footnote{The small island off the coast of France.}
+% is a very nice place to live.
+% \end{quote}
+% |\xspace| saves the user from having to type \verb*+\ + or
+% |{}| after most occurrences of a macro name in text.
+% However if either of these constructions follows |\xspace|,
+% a space is not added by |\xspace|. This means that it is
+% safe to add |\xspace| to the end of an existing macro
+% without making too many changes in your document. In particular,
+% |\xspace| will always insert a space if the thing following it is
+% a normal letter which is the usual case.
+%
+% Sometimes |\xspace| may make the wrong decision, and add a
+% space when it is not required. There may be different
+% reasons for this behavior but it can always be handled by
+% following the macro with |{}|, as this has the effect of
+% suppressing the space.
+%
+%
+% \subsection{Adding new exceptions}
+%
+% One of the most common reasons for |\xspace| to add an
+% unwanted space is when it is followed by a macro not on its
+% list of exceptions.
+% \DescribeMacro{\xspaceaddexceptions}%
+% With |\xspaceaddexceptions| you can add new commands or
+% characters to be recognized by |\xspace|'s scanning
+% mechanism. Users of advanced footnote packages like
+% \textsf{manyfoot} will often define new footnote macros
+% that should not cause a command ``enhanced'' with |\xspace|
+% to insert a space. If you define the additional footnote
+% macros |\footnoteA| and |\footnoteB|, simply add the
+% following line to your preamble:
+% \begin{quote}
+% |\xspaceaddexceptions{\footnoteA \footnoteB}|
+% \end{quote}
+%
+%
+% \subsection{Support for active characters}
+%
+%
+% The other common instance of |\xspace| not working quite right
+% happens with active characters. Generally this package must be
+% loaded \emph{after} any language (or other) packages that make
+% punctuation characters `active'. This makes it difficult for
+% \textsf{xspace} to work flawlessly with the popular \textsf{babel}
+% package especially since the punctuation characters can switch
+% between being `active' and `other'. Starting at \textsf{xspace}
+% version~1.08 there are two different ways to handle this depending
+% on which engine your \LaTeX-format uses:
+% \begin{description}
+% \item[\TeX] The punctuation characters are added to the
+% exception list in both their normal and active states thus
+% ensuring that they are always recognized.
+% \item[\eTeX] The characters are re-read when going through
+% the exception list which means the internal comparison will test
+% against the current state of the character. This works for
+% whatever category code tricks some packages may use.
+% \end{description}
+%
+% At the time of writing all major \TeX\ distributions are using
+% \eTeX\ as engine for \LaTeX\ so usually everything should work out
+% of the box. If you find that you're running normal \TeX\ and
+% |\xspace| seems to be making the wrong choice then either use |{}|
+% as described above to fix it or add the character to the list but
+% with the desired category code. See the implementation for an example
+% of how to do that.
+%
+% \subsection{Still not satisfied?}
+%
+% Some people don't like the default list of exceptions so they can
+% remove one item at a time with the command
+% \DescribeMacro{\xspaceremoveexception}^^A
+% \cs{xspaceremoveexception}\marg{token}. Furthermore the command
+% \DescribeMacro{\@xspace@hook}\cs{@xspace@hook} can be redefined to
+% scan forward in the input stream in case you want to check more
+% tokens. It is called after \cs{xspace} has determined if it needed
+% to insert a space or if an exception was found (the default
+% definition is for \cs{@xspace@hook} to be empty). Hence you can use
+% \cs{unskip} to remove the space inserted if \cs{@let@token} matches
+% something special. Below is an example of how one can make sure an
+% endash gets a space inserted before it but a single dash not.
+% \begin{verbatim}
+% \xspaceremoveexception{-}
+% \makeatletter
+% \renewcommand*\@xspace@hook{%
+% \ifx\@let@token-%
+% \expandafter\@xspace@dash@i
+% \fi
+% }
+% \def\@xspace@dash@i-{\futurelet\@let@token\@xspace@dash@ii}
+% \def\@xspace@dash@ii{%
+% \ifx\@let@token-%
+% \else
+% \unskip
+% \fi
+% -%
+% }
+% \makeatother
+% \end{verbatim}
+%
%
% \StopEventually{}
%
% \section{The Macros}
%
+% |\xspace| peeks ahead for the next token. If the token is in our
+% exception list we break the loop and do nothing; else we try to
+% expand the token once and start over again. If this leads us to an
+% unexpandable token without finding one of the exceptions we insert a
+% space.
+%
% \begin{macrocode}
%<*package>
% \end{macrocode}
@@ -97,48 +216,282 @@
% |\xspace| just looks ahead, and then calls |\@xspace|.
% \changes{v1.03}{1994/11/15}{Make robust}
% \begin{macrocode}
-\DeclareRobustCommand\xspace{\futurelet\@let@token\@xspace}
+\DeclareRobustCommand\xspace{\@xspace@firsttrue
+ \futurelet\@let@token\@xspace}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\if@xspace@first}
+% \changes{v1.11}{2006/02/12}{Added macro}
+% \begin{macro}{\@xspace@simple}
+% \changes{v1.11}{2006/02/12}{Added macro}
+% Some helpers to avoid multiple calls of |\@xspace@eTeX@setup|.
+% \begin{macrocode}
+\newif\if@xspace@first
+\def\@xspace@simple{\futurelet\@let@token\@xspace}
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+%
+% \begin{macro}{\@xspace@exceptions@tlp}
+% \changes{v1.07}{2004/12/07}{Added macro}
+% The exception list. If the scanning mechanism finds one of
+% these, it won't insert a space after the command. The
+% \texttt{tlp} in the name means `token list pointer.'
+% \begin{macrocode}
+\def\@xspace@exceptions@tlp{%
+ ,.'/?;:!~-)\ \/\bgroup\egroup\@sptoken\space\@xobeysp
+ \footnote\footnotemark
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\xspaceaddexceptions}
+% \changes{v1.07}{2004/12/07}{Added macro}
+% The user command, which just adds tokens to the list.
+% \begin{macrocode}
+\newcommand*\xspaceaddexceptions{%
+ \g@addto@macro\@xspace@exceptions@tlp
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\xspaceremoveexception}
+% \changes{v1.10}{2005/10/04}{Use higher level functions for
+% conditional processing}
+% This command removes an exception globally.
+% \begin{macrocode}
+\newcommand*\xspaceremoveexception[1]{%
+% \end{macrocode}
+% First check that it is in the list at all.
+% \begin{macrocode}
+ \def\reserved@a##1#1##2##3\@@{%
+ \@xspace@if@q@nil@NF##2{%
+% \end{macrocode}
+% It's in the list, remove it.
+% \begin{macrocode}
+ \def\reserved@a####1#1####2\@@{%
+ \gdef\@xspace@exceptions@tlp{####1####2}}%
+ \expandafter\reserved@a\@xspace@exceptions@tlp\@@
+ }%
+ }%
+ \expandafter\reserved@a\@xspace@exceptions@tlp#1\@xspace@q@nil\@@
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@xspace@break@loop}
+% \changes{v1.08}{2005/04/28}{Added macro}
+% \changes{v1.10}{2005/10/04}{Use quark instead}
+% To stop the loop.
+% \begin{macrocode}
+\def\@xspace@break@loop#1\@nil{}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@xspace@hook}
+% \changes{v1.09}{2005/07/26}{Added macro}
+% A hook for users with special needs.
+% \begin{macrocode}
+\providecommand*\@xspace@hook{}
+% \end{macrocode}
+% \end{macro}
+%
+% Now we check if we're running \eTeX. We can't use \cs{@ifundefined}
+% as that will lock catcodes and we need to change some of those.
+% As there is a small risk that someone already set \cs{eTeXversion}
+% to \cs{relax} by accident we make sure we check for that case but
+% without setting it to \cs{relax} if it wasn't already.
+% \begin{macrocode}
+\begingroup\expandafter\expandafter\expandafter\endgroup
+ \expandafter\ifx\csname eTeXversion\endcsname\relax
+% \end{macrocode}
+% If we are running normal \TeX\ we add the most common cases of active
+% punctuation characters. First we make them active.
+% \begin{macrocode}
+ \begingroup
+ \catcode`\;=\active \catcode`\:=\active
+ \catcode`\?=\active \catcode`\!=\active
+% \end{macrocode}
+% The \texttt{alltt} environment also makes |,|, |'|, and |-| active
+% so we add them as well.
+% \begin{macrocode}
+ \catcode`\,=\active \catcode`\'=\active \catcode`\-=\active
+ \xspaceaddexceptions{;:?!,'-}
+ \endgroup
+ \let\@xspace@eTeX@setup\relax
+% \end{macrocode}
+% \begin{macro}{\@xspace@eTeX@setup}
+% \changes{v1.10}{2005/10/04}{Added macro}
+% \changes{v1.12}{2006/05/08}{Bug fix for verbatim in output routine}
+% When we're running \eTeX, we have the advantage of \cs{scantokens}
+% which will rescan tokens with current catcodes. This little
+% expansion trick makes sure that the exception list is redefined to
+% itself but with the contents of it exposed to the current catcode
+% regime. That is why we must make sure the catcode of space is 10,
+% since we have a \verb*|\ | inside the list.
+% \begin{macrocode}
+\else
+ \def\@xspace@eTeX@setup{%
+ \begingroup
+ \everyeof{}%
+ \endlinechar=-1\relax
+ \catcode`\ =10\relax
+ \makeatletter
+% \end{macrocode}
+% We may also be so unfortunate that the re-reading of the list takes
+% place when the catcodes of |\|, |{| and |}| are ``other,'' e.g., if
+% it takes place in a header and the output routine was called in the
+% middle of a \texttt{verbatim} environment.
+% \begin{macrocode}
+ \catcode`\\\z@
+ \catcode`\{\@ne
+ \catcode`\}\tw@
+ \scantokens\expandafter{\expandafter\gdef
+ \expandafter\@xspace@exceptions@tlp
+ \expandafter{\@xspace@exceptions@tlp}}%
+ \endgroup
+ }
+\fi
% \end{macrocode}
% \end{macro}
% \begin{macro}{\@xspace}
-% If the next token is one of a specified list of characters, do
-% nothing, otherwise add a space. If you often use a different
-% punctuation character, add the appropriate line (do not forget the
-% |\fi| at the end!)
% \changes{v1.03}{1994/11/15}{Add exclamation mark}
% \changes{v1.04}{1996/05/17}{Add slash}
% \changes{v1.05}{1996/12/06}{Add space for alltt etc. tools/2322}
% \changes{v1.06}{1997/10/13}{Add normal space. tools/2632}
+% \changes{v1.07}{2004/12/07}{Now runs through a list of exceptions}
+% \changes{v1.07}{2004/12/07}{Added \cs{footnote} and
+% \cs{footnotemark}}
+% \changes{v1.08}{2005/05/07}{Use recursive loop instead of \cs{@tfor}}
+% \changes{v1.09}{2005/07/26}{Only check non-letters and add hook}
+% \changes{v1.10}{2005/10/04}{Use higher level functions for
+% conditional processing}
+% \changes{v1.10}{2005/10/04}{Improve expansion method}
+% If the next token is one of a specified list of characters,
+% do nothing, otherwise add a space. With version~1.07 the
+% approach was altered dramatically to run through the
+% exception list |\@xspace@exceptions@tlp| and check each
+% token one at a time.
% \begin{macrocode}
\def\@xspace{%
- \ifx\@let@token\bgroup\else
- \ifx\@let@token\egroup\else
- \ifx\@let@token\/\else
- \ifx\@let@token\ \else
- \ifx\@let@token~\else
- \ifx\@let@token.\else
- \ifx\@let@token!\else
- \ifx\@let@token,\else
- \ifx\@let@token:\else
- \ifx\@let@token;\else
- \ifx\@let@token?\else
- \ifx\@let@token/\else
- \ifx\@let@token'\else
- \ifx\@let@token)\else
- \ifx\@let@token-\else
- \ifx\@let@token\@xobeysp\else
- \ifx\@let@token\space\else
- \ifx\@let@token\@sptoken\else
- \space
-% \end{macrocode}
-% When I first wrote this there were about half a dozen |\fi| here,
-% and I thought that was bad enough.
-% \begin{macrocode}
- \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi}
-%</package>
+% \end{macrocode}
+% Before we start checking the exception list it makes sense to
+% performe a quick check on the token in question. Most of the time
+% \cs{xspace} is used in regular text so \cs{@let@token} is set equal
+% to a letter. In that case there is no point in checking the list
+% because it will definitely not contain any tokens with catcode~11.
+%
+% You may wonder why there are special functions here instead of
+% simpler \cs{ifx} conditionals. The reason is that a)~this way we
+% don't have to add many, many \cs{expandafter}s to get the nesting
+% right and b)~we don't get into trouble when \cs{@let@token} has been
+% let equal to \cs{if} etc.
+% \begin{macrocode}
+ \@xspace@lettoken@if@letter@TF \space{%
+% \end{macrocode}
+% Otherwise we start testing after setting up a few things. If running
+% \eTeX{} we rescan the catcodes but only the first time around.
+% \begin{macrocode}
+ \if@xspace@first
+ \@xspace@firstfalse
+ \let\@xspace@maybespace\space
+ \@xspace@eTeX@setup
+ \fi
+ \expandafter\@xspace@check@token
+ \@xspace@exceptions@tlp\@xspace@q@nil\@nil
+% \end{macrocode}
+% If an exception was found \cs{@xspace@maybespace} is let to
+% \cs{relax} and we do nothing.
+% \begin{macrocode}
+ \@xspace@token@if@equal@NNT \space \@xspace@maybespace
+% \end{macrocode}
+% Otherwise we check to see if we found something expandable and try
+% again with that token one level expanded. If no expandable token is
+% found we insert a space and then execute the hook.
+% \begin{macrocode}
+ {%
+ \@xspace@lettoken@if@expandable@TF
+ {\expandafter\@xspace@simple}%
+ {\@xspace@maybespace\@xspace@hook}%
+ }%
+ }%
+}
% \end{macrocode}
% \end{macro}
%
-% \Finale
+% \begin{macro}{\@xspace@check@token}
+% \changes{v1.07}{2004/12/07}{Added macro}
+% \changes{v1.08}{2005/05/07}{Made function recursive}
+% \changes{v1.10}{2005/10/04}{Use higher level functions for
+% conditional processing}
+% \changes{v1.11}{2006/02/12}{Modified so the \cs{@let@token} can be
+% \cs{outer}}
+% This macro just checks the current item in the exception list
+% against the \cs{@let@token}. If they are equal we make sure that no
+% space is inserted and break the loop.
+% \begin{macrocode}
+\def\@xspace@check@token #1{%
+ \ifx\@xspace@q@nil#1%
+ \expandafter\@xspace@break@loop
+ \fi
+ \expandafter\ifx\csname @let@token\endcsname#1%
+ \let\@xspace@maybespace\relax
+ \expandafter\@xspace@break@loop
+ \fi
+ \@xspace@check@token
+}
+% \end{macrocode}
+% \end{macro}
+%
+% That's all, folks! That is, if we were running \LaTeX3. In that case
+% we would have had nice functions for all the conditionals but here
+% we must define them ourselves. We also optimize them here as
+% \cs{@let@token} will always be the argument in some cases.
+%
+% \begin{macro}{\@xspace@if@lettoken@letter@TF}
+% \begin{macro}{\@xspace@if@lettoken@expandable@TF}
+% \begin{macro}{\@xspace@cs@if@equal@NNF}
+% First a few comparisons.
+% \begin{macrocode}
+\def\@xspace@lettoken@if@letter@TF{%
+ \ifcat\noexpand\@let@token @% letter
+ \expandafter\@firstoftwo
+ \else
+ \expandafter\@secondoftwo
+ \fi}
+\def\@xspace@lettoken@if@expandable@TF{%
+ \expandafter\ifx\noexpand\@let@token\@let@token%
+ \expandafter\@secondoftwo
+ \else
+ \expandafter\@firstoftwo
+ \fi
+}
+\def\@xspace@token@if@equal@NNT#1#2{%
+ \ifx#1#2%
+ \expandafter\@firstofone
+ \else
+ \expandafter\@gobble
+ \fi}
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \begin{macro}{\@xspace@q@nil}
+% \begin{macro}{\@xspace@if@q@nil@NF}
+% Some macros dealing with quarks.
+% \begin{macrocode}
+\def\@xspace@q@nil{\@xspace@q@nil}
+\def\@xspace@if@q@nil@NF#1{%
+ \ifx\@xspace@q@nil#1%
+ \expandafter\@gobble
+ \else
+ \expandafter\@firstofone
+ \fi}
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \begin{macrocode}
+%</package>
+% \end{macrocode}
%
-
+% \Finale
diff --git a/Master/texmf-dist/tex/latex/tools/.tex b/Master/texmf-dist/tex/latex/tools/.tex
index 4998f4bc9e1..f9e67ba76bf 100644
--- a/Master/texmf-dist/tex/latex/tools/.tex
+++ b/Master/texmf-dist/tex/latex/tools/.tex
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
%% The LaTeX3 Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -16,12 +16,12 @@
%% --------------------------------------------------------------------------
%%
%% It may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
%% 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.3 or later is part of all distributions of LaTeX
-%% version 2003/12/01 or later.
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
%%
%% This file may only be distributed together with a copy of the LaTeX
%% `Tools Bundle'. You may however distribute the LaTeX `Tools Bundle'
diff --git a/Master/texmf-dist/tex/latex/tools/afterpage.sty b/Master/texmf-dist/tex/latex/tools/afterpage.sty
index 90634f67ef2..9fa2ef2dee2 100644
--- a/Master/texmf-dist/tex/latex/tools/afterpage.sty
+++ b/Master/texmf-dist/tex/latex/tools/afterpage.sty
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
%% The LaTeX3 Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -16,12 +16,12 @@
%% --------------------------------------------------------------------------
%%
%% It may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
%% 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.3 or later is part of all distributions of LaTeX
-%% version 2003/12/01 or later.
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
%%
%% This file may only be distributed together with a copy of the LaTeX
%% `Tools Bundle'. You may however distribute the LaTeX `Tools Bundle'
diff --git a/Master/texmf-dist/tex/latex/tools/array.sty b/Master/texmf-dist/tex/latex/tools/array.sty
index 494fad002df..43d268bc937 100644
--- a/Master/texmf-dist/tex/latex/tools/array.sty
+++ b/Master/texmf-dist/tex/latex/tools/array.sty
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
%% The LaTeX3 Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -16,12 +16,12 @@
%% --------------------------------------------------------------------------
%%
%% It may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
%% 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.3 or later is part of all distributions of LaTeX
-%% version 2003/12/01 or later.
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
%%
%% This file may only be distributed together with a copy of the LaTeX
%% `Tools Bundle'. You may however distribute the LaTeX `Tools Bundle'
@@ -34,7 +34,7 @@
%% Copyright (C) 1989-1998 Frank Mittelbach, all rights reserved.
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{array}
- [2003/12/17 v2.4a Tabular extension package (FMi)]
+ [2005/08/23 v2.4b Tabular extension package (FMi)]
%% \CharacterTable
%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
@@ -285,7 +285,7 @@
\newtoks\NC@list
\newcolumntype{*}[2]{}
\long\@namedef{NC@rewrite@*}#1#2{%
- \count@#1
+ \count@#1\relax
\loop
\ifnum\count@>\z@
\advance\count@\m@ne
diff --git a/Master/texmf-dist/tex/latex/tools/bm.sty b/Master/texmf-dist/tex/latex/tools/bm.sty
index bd95bc12b8a..b698e6a1d5f 100644
--- a/Master/texmf-dist/tex/latex/tools/bm.sty
+++ b/Master/texmf-dist/tex/latex/tools/bm.sty
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
%% The LaTeX3 Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -16,12 +16,12 @@
%% --------------------------------------------------------------------------
%%
%% It may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
%% 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.3 or later is part of all distributions of LaTeX
-%% version 2003/12/01 or later.
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
%%
%% This file may only be distributed together with a copy of the LaTeX
%% `Tools Bundle'. You may however distribute the LaTeX `Tools Bundle'
diff --git a/Master/texmf-dist/tex/latex/tools/calc.sty b/Master/texmf-dist/tex/latex/tools/calc.sty
index d0b1a78fed9..cf08c19eb48 100644
--- a/Master/texmf-dist/tex/latex/tools/calc.sty
+++ b/Master/texmf-dist/tex/latex/tools/calc.sty
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
%% The LaTeX3 Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -16,12 +16,12 @@
%% --------------------------------------------------------------------------
%%
%% It may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
%% 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.3 or later is part of all distributions of LaTeX
-%% version 2003/12/01 or later.
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
%%
%% This file may only be distributed together with a copy of the LaTeX
%% `Tools Bundle'. You may however distribute the LaTeX `Tools Bundle'
@@ -33,7 +33,7 @@
%% File `calc.dtx'.
%% Copyright (C) 1992--1995
%% Kresten Krab Thorup and Frank Jensen.
-%% Copyright (C) 1997--1998
+%% Copyright (C) 1997--2005
%% Kresten Krab Thorup, Frank Jensen and the LaTeX3 Project.
%%
%% The original authors (fj@hugin.dk and krab@daimi.aau.dk) have
@@ -42,9 +42,9 @@
%% the normal LaTeX bug report address.
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{calc}
- [1998/07/07 v4.1b Infix arithmetic (KKT,FJ)]
+ [2005/08/06 v4.2 Infix arithmetic (KKT,FJ)]
\def\calc@assign@generic#1#2#3#4{\let\calc@A#1\let\calc@B#2%
- \expandafter\calc@open\expandafter(#4!%
+ \calc@open(#4!%
\global\calc@A\calc@B\endgroup#3\calc@B}
\def\calc@assign@count{\calc@assign@generic\calc@Acount\calc@Bcount}
\def\calc@assign@dimen{\calc@assign@generic\calc@Adimen\calc@Bdimen}
@@ -54,60 +54,99 @@
\newskip\calc@Askip \newskip\calc@Bskip
\def\setcounter#1#2{\@ifundefined{c@#1}{\@nocounterr{#1}}%
{\calc@assign@count{\global\csname c@#1\endcsname}{#2}}}
-\def\addtocounter#1#2{\@ifundefined{c@#1}{\@nocounterr{#1}}%
- {\calc@assign@count{\global\advance\csname c@#1\endcsname}{#2}}}
+ \def\addtocounter#1#2{\@ifundefined{c@#1}{\@nocounterr{#1}}%
+ {\calc@assign@count{\global\advance\csname c@#1\endcsname}{#2}}}%
+ \def\stepcounter#1{\@ifundefined {c@#1}%
+ {\@nocounterr {#1}}%
+ {\global\advance\csname c@#1\endcsname \@ne
+ \begingroup
+ \let\@elt\@stpelt \csname cl@#1\endcsname
+ \endgroup}}%
+\@ifpackageloaded{amstext}{%
+ \expandafter\def\expandafter\stepcounter
+ \expandafter#\expandafter1\expandafter{%
+ \expandafter\iffirstchoice@\stepcounter{#1}\fi
+ }
+ \expandafter\def\expandafter\addtocounter
+ \expandafter#\expandafter1\expandafter#\expandafter2\expandafter{%
+ \expandafter\iffirstchoice@\addtocounter{#1}{#2}\fi
+ }
+}{}
\DeclareRobustCommand\setlength{\calc@assign@skip}
\DeclareRobustCommand\addtolength[1]{\calc@assign@skip{\advance#1}}
\def\calc@pre@scan#1{%
- \ifx(#1%
- \expandafter\calc@open
- \else
- \ifx\widthof#1%
- \expandafter\expandafter\expandafter\calc@textsize
- \else
- \calc@numeric% no \expandafter needed for this one.
- \fi
- \fi
- #1}
+ \expandafter\@calc@pre@scan\romannumeral-`\a#1}
+\def\@calc@pre@scan#1{%
+ \ifx(#1%
+ \expandafter\calc@open
+ \else
+ \ifx\widthof#1%
+ \expandafter\expandafter\expandafter\calc@textsize
+ \else
+ \ifx\maxof#1%
+ \expandafter\expandafter\expandafter\expandafter
+ \expandafter\expandafter\expandafter\calc@maxmin@addsub
+ \else
+ \calc@numeric% no \expandafter needed for this one.
+ \fi
+ \fi
+ \fi
+ #1}
\def\calc@open({\begingroup\aftergroup\calc@initB
\begingroup\aftergroup\calc@initB
\calc@pre@scan}
\def\calc@initB{\calc@B\calc@A}
\def\calc@numeric{\afterassignment\calc@post@scan \global\calc@A}
-\newcommand\widthof{}
+\@for\reserved@a:=widthof,heightof,depthof,totalheightof,maxof,minof\do
+{\@ifundefined{\reserved@a}{}{%
+ \PackageError{calc}{%
+ The\space calc\space package\space reserves\space the\space
+ command\space name\space `\@backslashchar\reserved@a'\MessageBreak
+ but\space it\space has\space already\space been\space defined\space
+ with\space the\space meaning\MessageBreak
+ `\expandafter\meaning\csname\reserved@a\endcsname'.\MessageBreak
+ This\space original\space definition\space will\space be\space lost}%
+ {If\space you\space need\space a\space command\space with\space
+ this\space definition,\space you\space must\space use\space a\space
+ different\space name.}}%
+}
\let\widthof\ignorespaces
-\newcommand\heightof{}
\let\heightof\ignorespaces
-\newcommand\depthof{}
\let\depthof\ignorespaces
+\let\totalheightof\ignorespaces
\def\calc@textsize #1#2{%
\begingroup
\let\widthof\wd
\let\heightof\ht
\let\depthof\dp
- \@settodim #1%
+ \def\totalheightof{\ht\dp}%
+ \expandafter\@settodim\expandafter{#1}%
{\global\calc@A}%
{%
\let\widthof\ignorespaces
\let\heightof\ignorespaces
\let\depthof\ignorespaces
+ \let\totalheightof\ignorespaces
#2}%
\endgroup
\calc@post@scan}
\def\calc@post@scan#1{%
- \ifx#1!\let\calc@next\endgroup \else
+ \expandafter\@calc@post@scan\romannumeral-`\a#1}
+\def\@calc@post@scan#1{%
+ \ifx#1!\let\calc@next\endgroup \else
\ifx#1+\let\calc@next\calc@add \else
- \ifx#1-\let\calc@next\calc@subtract \else
- \ifx#1*\let\calc@next\calc@multiplyx \else
- \ifx#1/\let\calc@next\calc@dividex \else
- \ifx#1)\let\calc@next\calc@close \else \calc@error#1%
+ \ifx#1-\let\calc@next\calc@subtract \else
+ \ifx#1*\let\calc@next\calc@multiplyx \else
+ \ifx#1/\let\calc@next\calc@dividex \else
+ \ifx#1)\let\calc@next\calc@close \else
+ \calc@error#1%
+ \fi
+ \fi
\fi
- \fi
\fi
- \fi
\fi
- \fi
- \calc@next}
+ \fi
+ \calc@next}
\def\calc@add{\calc@generic@add\calc@addAtoB}
\def\calc@subtract{\calc@generic@add\calc@subtractAfromB}
\def\calc@generic@add#1{\endgroup\global\calc@A\calc@B\endgroup
@@ -120,19 +159,23 @@
\def\calc@ratio@x{\ratio}
\def\calc@real@x{\real}
\def\calc@multiplyx#1{\def\calc@tmp{#1}%
- \ifx\calc@tmp\calc@ratio@x \let\calc@next\calc@ratio@multiply \else
- \ifx\calc@tmp\calc@real@x \let\calc@next\calc@real@multiply \else
- \let\calc@next\calc@multiply
+ \ifx\calc@tmp\calc@ratio@x \let\calc@next\calc@ratio@multiply \else
+ \ifx\calc@tmp\calc@real@x \let\calc@next\calc@real@multiply \else
+ \ifx\maxof#1\let\calc@next\calc@maxmin@multiply \else
+ \let\calc@next\calc@multiply
\fi
- \fi
- \calc@next#1}
+ \fi
+ \fi
+ \calc@next#1}
\def\calc@dividex#1{\def\calc@tmp{#1}%
- \ifx\calc@tmp\calc@ratio@x \let\calc@next\calc@ratio@divide \else
- \ifx\calc@tmp\calc@real@x \let\calc@next\calc@real@divide \else
- \let\calc@next\calc@divide
+ \ifx\calc@tmp\calc@ratio@x \let\calc@next\calc@ratio@divide \else
+ \ifx\calc@tmp\calc@real@x \let\calc@next\calc@real@divide \else
+ \ifx\maxof#1\let\calc@next\calc@maxmin@divide \else
+ \let\calc@next\calc@divide
\fi
- \fi
- \calc@next#1}
+ \fi
+ \fi
+ \calc@next#1}
\def\calc@multiply{\calc@generic@multiply\calc@multiplyBbyA}
\def\calc@divide{\calc@generic@multiply\calc@divideBbyA}
\def\calc@generic@multiply#1{\endgroup\begingroup
@@ -146,8 +189,9 @@
\calc@post@scan}
\def\calc@ratio@multiply\ratio{\calc@ratio@evaluate}
\def\calc@ratio@divide\ratio#1#2{\calc@ratio@evaluate{#2}{#1}}
+\newcount\calc@Ccount
\let\calc@numerator=\calc@Bcount
-\newcount\calc@denominator
+\let\calc@denominator=\calc@Ccount
\def\calc@ratio@evaluate#1#2{%
\endgroup\begingroup
\calc@assign@dimen\calc@numerator{#1}%
@@ -180,10 +224,59 @@
\calc@multiply@by@real{#1}\begingroup
\calc@post@scan}
\def\calc@real@divide\real#1{\calc@ratio@evaluate{1pt}{#1pt}}
+\let\maxof\@@italiccorr
+\let\minof\@@italiccorr
+\newskip\calc@Cskip
+\newif\ifcalc@count@
+\def\calc@maxmin@addsub#1#2#3{\begingroup
+ \ifx\calc@A\calc@Acount%
+ \calc@count@true
+ \else
+ \calc@count@false
+ \fi
+ \calc@maxmin@generic#1{#2}{#3}%
+ \endgroup
+ \calc@post@scan
+}
+\def\calc@maxmin@generic#1#2#3{%
+ \begingroup
+ \ifcalc@count@
+ \calc@assign@count\calc@Ccount{#2}%
+ \calc@assign@count\calc@Bcount{#3}%
+ \def\minof{<}\def\maxof{>}%
+ \global\calc@A\ifnum\calc@Ccount#1\calc@Bcount
+ \calc@Ccount\else\calc@Bcount\fi
+ \else
+ \calc@assign@skip\calc@Cskip{#2}%
+ \calc@assign@skip\calc@Bskip{#3}%
+ \def\minof{<}\def\maxof{>}%
+ \global\calc@A\ifdim\calc@Cskip#1\calc@Bskip
+ \calc@Cskip\else\calc@Bskip\fi
+ \fi
+ \endgroup
+}
+\def\calc@maxmin@divmul#1#2#3#4{%
+ \endgroup\begingroup
+ \calc@count@true
+ \aftergroup#1%
+ \calc@maxmin@generic#2{#3}{#4}%
+ \endgroup\begingroup
+ \calc@post@scan
+}
+\def\calc@maxmin@multiply{\calc@maxmin@divmul\calc@multiplyBbyA}
+\def\calc@maxmin@divide {\calc@maxmin@divmul\calc@divideBbyA}
\def\calc@error#1{%
\PackageError{calc}%
{`#1' invalid at this point}%
{I expected to see one of: + - * / )}}
+\def\@settodim#1#2#3{%
+ \setbox\@tempboxa\hbox{{#3}}%
+ \dimen@ii=\z@
+ \@tf@r\reserved@a #1\do{%
+ \advance\dimen@ii\reserved@a\@tempboxa}%
+ #2=\dimen@ii
+ \setbox\@tempboxa\box\voidb@x}
+\def\settototalheight{\@settodim{\ht\dp}}
\endinput
%%
%% End of file `calc.sty'.
diff --git a/Master/texmf-dist/tex/latex/tools/dcolumn.sty b/Master/texmf-dist/tex/latex/tools/dcolumn.sty
index 66b4bc82dc5..bac6c735765 100644
--- a/Master/texmf-dist/tex/latex/tools/dcolumn.sty
+++ b/Master/texmf-dist/tex/latex/tools/dcolumn.sty
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
%% The LaTeX3 Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -16,12 +16,12 @@
%% --------------------------------------------------------------------------
%%
%% It may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
%% 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.3 or later is part of all distributions of LaTeX
-%% version 2003/12/01 or later.
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
%%
%% This file may only be distributed together with a copy of the LaTeX
%% `Tools Bundle'. You may however distribute the LaTeX `Tools Bundle'
diff --git a/Master/texmf-dist/tex/latex/tools/delarray.sty b/Master/texmf-dist/tex/latex/tools/delarray.sty
index 670334cdbc1..58ab25a8cea 100644
--- a/Master/texmf-dist/tex/latex/tools/delarray.sty
+++ b/Master/texmf-dist/tex/latex/tools/delarray.sty
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
%% The LaTeX3 Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -16,12 +16,12 @@
%% --------------------------------------------------------------------------
%%
%% It may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
%% 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.3 or later is part of all distributions of LaTeX
-%% version 2003/12/01 or later.
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
%%
%% This file may only be distributed together with a copy of the LaTeX
%% `Tools Bundle'. You may however distribute the LaTeX `Tools Bundle'
diff --git a/Master/texmf-dist/tex/latex/tools/e.tex b/Master/texmf-dist/tex/latex/tools/e.tex
index 5798b901f85..3e87201abb9 100644
--- a/Master/texmf-dist/tex/latex/tools/e.tex
+++ b/Master/texmf-dist/tex/latex/tools/e.tex
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
%% The LaTeX3 Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -16,12 +16,12 @@
%% --------------------------------------------------------------------------
%%
%% It may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
%% 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.3 or later is part of all distributions of LaTeX
-%% version 2003/12/01 or later.
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
%%
%% This file may only be distributed together with a copy of the LaTeX
%% `Tools Bundle'. You may however distribute the LaTeX `Tools Bundle'
diff --git a/Master/texmf-dist/tex/latex/tools/enumerate.sty b/Master/texmf-dist/tex/latex/tools/enumerate.sty
index 3201b804f97..3fc9859364d 100644
--- a/Master/texmf-dist/tex/latex/tools/enumerate.sty
+++ b/Master/texmf-dist/tex/latex/tools/enumerate.sty
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
%% The LaTeX3 Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -16,12 +16,12 @@
%% --------------------------------------------------------------------------
%%
%% It may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
%% 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.3 or later is part of all distributions of LaTeX
-%% version 2003/12/01 or later.
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
%%
%% This file may only be distributed together with a copy of the LaTeX
%% `Tools Bundle'. You may however distribute the LaTeX `Tools Bundle'
diff --git a/Master/texmf-dist/tex/latex/tools/fontsmpl.sty b/Master/texmf-dist/tex/latex/tools/fontsmpl.sty
index 95d4bc6e4bd..7d39bcd7e29 100644
--- a/Master/texmf-dist/tex/latex/tools/fontsmpl.sty
+++ b/Master/texmf-dist/tex/latex/tools/fontsmpl.sty
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
%% The LaTeX3 Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -16,12 +16,12 @@
%% --------------------------------------------------------------------------
%%
%% It may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
%% 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.3 or later is part of all distributions of LaTeX
-%% version 2003/12/01 or later.
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
%%
%% This file may only be distributed together with a copy of the LaTeX
%% `Tools Bundle'. You may however distribute the LaTeX `Tools Bundle'
diff --git a/Master/texmf-dist/tex/latex/tools/fontsmpl.tex b/Master/texmf-dist/tex/latex/tools/fontsmpl.tex
index a3aa50b8874..5ad1e0bbe5d 100644
--- a/Master/texmf-dist/tex/latex/tools/fontsmpl.tex
+++ b/Master/texmf-dist/tex/latex/tools/fontsmpl.tex
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
%% The LaTeX3 Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -16,12 +16,12 @@
%% --------------------------------------------------------------------------
%%
%% It may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
%% 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.3 or later is part of all distributions of LaTeX
-%% version 2003/12/01 or later.
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
%%
%% This file may only be distributed together with a copy of the LaTeX
%% `Tools Bundle'. You may however distribute the LaTeX `Tools Bundle'
diff --git a/Master/texmf-dist/tex/latex/tools/ftnright.sty b/Master/texmf-dist/tex/latex/tools/ftnright.sty
index 75ad5392f1e..1d3a884358f 100644
--- a/Master/texmf-dist/tex/latex/tools/ftnright.sty
+++ b/Master/texmf-dist/tex/latex/tools/ftnright.sty
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
%% The LaTeX3 Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -16,12 +16,12 @@
%% --------------------------------------------------------------------------
%%
%% It may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
%% 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.3 or later is part of all distributions of LaTeX
-%% version 2003/12/01 or later.
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
%%
%% This file may only be distributed together with a copy of the LaTeX
%% `Tools Bundle'. You may however distribute the LaTeX `Tools Bundle'
diff --git a/Master/texmf-dist/tex/latex/tools/h.tex b/Master/texmf-dist/tex/latex/tools/h.tex
index 3e42e2cf9f1..c30e9d415aa 100644
--- a/Master/texmf-dist/tex/latex/tools/h.tex
+++ b/Master/texmf-dist/tex/latex/tools/h.tex
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
%% The LaTeX3 Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -16,12 +16,12 @@
%% --------------------------------------------------------------------------
%%
%% It may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
%% 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.3 or later is part of all distributions of LaTeX
-%% version 2003/12/01 or later.
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
%%
%% This file may only be distributed together with a copy of the LaTeX
%% `Tools Bundle'. You may however distribute the LaTeX `Tools Bundle'
diff --git a/Master/texmf-dist/tex/latex/tools/hhline.sty b/Master/texmf-dist/tex/latex/tools/hhline.sty
index 0f5248c1198..ee0934e144a 100644
--- a/Master/texmf-dist/tex/latex/tools/hhline.sty
+++ b/Master/texmf-dist/tex/latex/tools/hhline.sty
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
%% The LaTeX3 Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -16,12 +16,12 @@
%% --------------------------------------------------------------------------
%%
%% It may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
%% 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.3 or later is part of all distributions of LaTeX
-%% version 2003/12/01 or later.
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
%%
%% This file may only be distributed together with a copy of the LaTeX
%% `Tools Bundle'. You may however distribute the LaTeX `Tools Bundle'
diff --git a/Master/texmf-dist/tex/latex/tools/indentfirst.sty b/Master/texmf-dist/tex/latex/tools/indentfirst.sty
index 6b2bbe2456d..c2b1e679ce0 100644
--- a/Master/texmf-dist/tex/latex/tools/indentfirst.sty
+++ b/Master/texmf-dist/tex/latex/tools/indentfirst.sty
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
%% The LaTeX3 Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -16,12 +16,12 @@
%% --------------------------------------------------------------------------
%%
%% It may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
%% 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.3 or later is part of all distributions of LaTeX
-%% version 2003/12/01 or later.
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
%%
%% This file may only be distributed together with a copy of the LaTeX
%% `Tools Bundle'. You may however distribute the LaTeX `Tools Bundle'
diff --git a/Master/texmf-dist/tex/latex/tools/layout.sty b/Master/texmf-dist/tex/latex/tools/layout.sty
index c571140eb26..9c85bbd289b 100644
--- a/Master/texmf-dist/tex/latex/tools/layout.sty
+++ b/Master/texmf-dist/tex/latex/tools/layout.sty
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
%% The LaTeX3 Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -16,12 +16,12 @@
%% --------------------------------------------------------------------------
%%
%% It may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
%% 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.3 or later is part of all distributions of LaTeX
-%% version 2003/12/01 or later.
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
%%
%% This file may only be distributed together with a copy of the LaTeX
%% `Tools Bundle'. You may however distribute the LaTeX `Tools Bundle'
diff --git a/Master/texmf-dist/tex/latex/tools/longtable.sty b/Master/texmf-dist/tex/latex/tools/longtable.sty
index 4f56f4d0c5a..d3bc4c54952 100644
--- a/Master/texmf-dist/tex/latex/tools/longtable.sty
+++ b/Master/texmf-dist/tex/latex/tools/longtable.sty
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
%% The LaTeX3 Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -16,12 +16,12 @@
%% --------------------------------------------------------------------------
%%
%% It may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
%% 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.3 or later is part of all distributions of LaTeX
-%% version 2003/12/01 or later.
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
%%
%% This file may only be distributed together with a copy of the LaTeX
%% `Tools Bundle'. You may however distribute the LaTeX `Tools Bundle'
diff --git a/Master/texmf-dist/tex/latex/tools/multicol.sty b/Master/texmf-dist/tex/latex/tools/multicol.sty
index 74824bff64f..d780d1fd569 100644
--- a/Master/texmf-dist/tex/latex/tools/multicol.sty
+++ b/Master/texmf-dist/tex/latex/tools/multicol.sty
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
%% The LaTeX3 Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -16,12 +16,12 @@
%% --------------------------------------------------------------------------
%%
%% It may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
%% 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.3 or later is part of all distributions of LaTeX
-%% version 2003/12/01 or later.
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
%%
%% This file may only be distributed together with a copy of the LaTeX
%% `Tools Bundle'. You may however distribute the LaTeX `Tools Bundle'
@@ -31,7 +31,7 @@
%% given in the file `manifest.txt'.
%%
%% Package `multicol' to use with LaTeX2e
-%% Copyright 1989-2003 Frank Mittelbach
+%% Copyright 1989-2005 Frank Mittelbach
%%
%% In addition to the terms of LPPL any distributed version
%% (unchanged or modified) of multicol has to keep the statement
@@ -96,8 +96,8 @@
%%
\NeedsTeXFormat{LaTeX2e}[1997/12/01]
\ProvidesPackage{multicol}
- [2004/02/14 v1.6e multicolumn formatting (FMi)]
-%% \CheckSum{1561}
+ [2006/05/18 v1.6g multicolumn formatting (FMi)]
+%% \CheckSum{1562}
%% \CharacterTable
%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
@@ -735,6 +735,7 @@
\let\@dblfloat\@dbflt
\def\end@dblfloat{\par
\vskip\z@
+ \@minipagefalse
\egroup
\color@endbox
\@largefloatcheck
diff --git a/Master/texmf-dist/tex/latex/tools/q.tex b/Master/texmf-dist/tex/latex/tools/q.tex
index 6f108a67425..9971742a319 100644
--- a/Master/texmf-dist/tex/latex/tools/q.tex
+++ b/Master/texmf-dist/tex/latex/tools/q.tex
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
%% The LaTeX3 Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -16,12 +16,12 @@
%% --------------------------------------------------------------------------
%%
%% It may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
%% 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.3 or later is part of all distributions of LaTeX
-%% version 2003/12/01 or later.
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
%%
%% This file may only be distributed together with a copy of the LaTeX
%% `Tools Bundle'. You may however distribute the LaTeX `Tools Bundle'
diff --git a/Master/texmf-dist/tex/latex/tools/r.tex b/Master/texmf-dist/tex/latex/tools/r.tex
index 98bb0bf0811..f18893b832b 100644
--- a/Master/texmf-dist/tex/latex/tools/r.tex
+++ b/Master/texmf-dist/tex/latex/tools/r.tex
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
%% The LaTeX3 Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -16,12 +16,12 @@
%% --------------------------------------------------------------------------
%%
%% It may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
%% 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.3 or later is part of all distributions of LaTeX
-%% version 2003/12/01 or later.
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
%%
%% This file may only be distributed together with a copy of the LaTeX
%% `Tools Bundle'. You may however distribute the LaTeX `Tools Bundle'
diff --git a/Master/texmf-dist/tex/latex/tools/rawfonts.sty b/Master/texmf-dist/tex/latex/tools/rawfonts.sty
index 346a05abe5c..c370c874c1d 100644
--- a/Master/texmf-dist/tex/latex/tools/rawfonts.sty
+++ b/Master/texmf-dist/tex/latex/tools/rawfonts.sty
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
%% The LaTeX3 Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -16,12 +16,12 @@
%% --------------------------------------------------------------------------
%%
%% It may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
%% 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.3 or later is part of all distributions of LaTeX
-%% version 2003/12/01 or later.
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
%%
%% This file may only be distributed together with a copy of the LaTeX
%% `Tools Bundle'. You may however distribute the LaTeX `Tools Bundle'
diff --git a/Master/texmf-dist/tex/latex/tools/s.tex b/Master/texmf-dist/tex/latex/tools/s.tex
index c6b614c6c41..04f6224c377 100644
--- a/Master/texmf-dist/tex/latex/tools/s.tex
+++ b/Master/texmf-dist/tex/latex/tools/s.tex
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
%% The LaTeX3 Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -16,12 +16,12 @@
%% --------------------------------------------------------------------------
%%
%% It may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
%% 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.3 or later is part of all distributions of LaTeX
-%% version 2003/12/01 or later.
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
%%
%% This file may only be distributed together with a copy of the LaTeX
%% `Tools Bundle'. You may however distribute the LaTeX `Tools Bundle'
diff --git a/Master/texmf-dist/tex/latex/tools/showkeys.sty b/Master/texmf-dist/tex/latex/tools/showkeys.sty
index 3fa750dec20..04a6723e820 100644
--- a/Master/texmf-dist/tex/latex/tools/showkeys.sty
+++ b/Master/texmf-dist/tex/latex/tools/showkeys.sty
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
%% The LaTeX3 Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -16,12 +16,12 @@
%% --------------------------------------------------------------------------
%%
%% It may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
%% 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.3 or later is part of all distributions of LaTeX
-%% version 2003/12/01 or later.
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
%%
%% This file may only be distributed together with a copy of the LaTeX
%% `Tools Bundle'. You may however distribute the LaTeX `Tools Bundle'
@@ -31,9 +31,10 @@
%% given in the file `manifest.txt'.
%%
%% File: showkeys.dtx Copyright (C) 1992-1997 David Carlisle
+%% File: showkeys.dtx Copyright (C) 2006 David Carlisle, LaTeX3 Project
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{showkeys}
- [1997/06/12 v3.12 Show cite and label keys (DPC)]
+ [2006/01/09 v3.13 Show cite and label keys (DPC)]
\DeclareOption{notref}{\let\SK@ref\@empty}
\DeclareOption{notcite}{\let\SK@cite\@empty}
\let\SK@refcolor\relax
@@ -64,9 +65,10 @@
\def\SK@#1#2{%
\protected@edef\@tempa{#2}%
\expandafter#1\meaning\@tempa\SK@}
+\providecommand*\showkeyslabelformat[1]{%
+ \fbox{\normalfont\small\ttfamily#1}}
\def\SK@@label#1>#2\SK@{%
- \gdef\SK@lab{\smash{\SK@labelcolor\fbox{%
- \normalfont\small\ttfamily#2}}}%
+ \gdef\SK@lab{\smash{\SK@labelcolor\showkeyslabelformat{#2}}}%
\ifvmode
\if@inlabel
\global\setbox\@labels\hbox{%
@@ -108,33 +110,63 @@
\fi}
\AtBeginDocument{%
\let\SK@eqnnum\@eqnnum
- \def\@tempa{\let\iftagsleft@\iffalse}%
- \ifx\iftagsleft@\undefined\@tempa\fi%
- \let\SK@tagform@\tagform@
- \iftagsleft@
- \def\tagform@#1{%
- \ifx\df@label\@empty
- \SK@lab@relax
- \else
- \expandafter\SK@@label\meaning\df@label\SK@
- \fi
- \llap{\SK@lab\kern\marginparsep}%
- \SK@lab@relax\SK@tagform@{#1}}%
- \def\@eqnnum{%
- \llap{\SK@lab\kern\displaywidth\kern\marginparsep}%
- \SK@lab@relax\SK@eqnnum}%
- \else
- \def\tagform@#1{%
- \ifx\df@label\@empty
- \SK@lab@relax
- \else
- \expandafter\SK@@label\meaning\df@label\SK@
- \fi
- \SK@tagform@{#1}%
- \rlap{\kern\marginparsep\SK@lab}\SK@lab@relax}%
- \def\@eqnnum{\SK@eqnnum\rlap{\kern\marginparsep\SK@lab}%
- \SK@lab@relax}%
- \fi}
+ \@ifpackageloaded{amsmath}{%
+ \let\SK@tagform@\tagform@
+ \let\SK@maketag@@@\maketag@@@
+ \iftagsleft@
+ \def\tagform@#1{%
+ \ifx\df@label\@empty
+ \SK@lab@relax
+ \else
+ \expandafter\SK@@label\meaning\df@label\SK@
+ \fi
+ \llap{\SK@lab\kern\marginparsep}%
+ \SK@lab@relax\SK@tagform@{#1}}%
+ \def\maketag@@@#1{%
+ \ifx\df@label\@empty
+ \SK@lab@relax
+ \else
+ \expandafter\SK@@label\meaning\df@label\SK@
+ \fi
+ \llap{\SK@lab\kern\marginparsep}\SK@lab@relax
+ \SK@maketag@@@{#1}%
+ }%
+ \def\@eqnnum{%
+ \llap{\SK@lab\kern\displaywidth\kern\marginparsep}%
+ \SK@lab@relax\SK@eqnnum}%
+ \else
+ \def\tagform@#1{%
+ \ifx\df@label\@empty
+ \SK@lab@relax
+ \else
+ \expandafter\SK@@label\meaning\df@label\SK@
+ \fi
+ \SK@tagform@{#1}%
+ \rlap{\kern\marginparsep\SK@lab}\SK@lab@relax}%
+ \def\maketag@@@#1{%
+ \ifx\df@label\@empty
+ \SK@lab@relax
+ \else
+ \expandafter\SK@@label\meaning\df@label\SK@
+ \fi
+ \SK@maketag@@@{#1}%
+ \rlap{\kern\marginparsep\SK@lab}\SK@lab@relax
+ }%
+ \def\@eqnnum{\SK@eqnnum\rlap{\kern\marginparsep\SK@lab}%
+ \SK@lab@relax}%
+ \fi
+ }%
+ {%
+ \@ifundefined{ver@leqno.clo}{%
+ \def\@eqnnum{\SK@eqnnum\rlap{\kern\marginparsep\SK@lab}%
+ \SK@lab@relax}%
+ }{%
+ \def\@eqnnum{%
+ \llap{\SK@lab\kern\displaywidth\kern\marginparsep}%
+ \SK@lab@relax\SK@eqnnum}%
+ }%
+ }%
+}
\def\SK@labx{\rlap\SK@lab\global\let\SK@lab\relax}
\def\SK@lab@relax{\global\let\SK@lab\relax}\SK@lab@relax
\newif\ifSK@equation
@@ -149,6 +181,12 @@
\let\SK@gather\SK@equationtrue
\let\SK@multline\SK@equationtrue
\let\SK@flalign\SK@equationtrue
+\expandafter\let\csname SK@align*\endcsname\SK@equationtrue
+\expandafter\let\csname SK@alignat*\endcsname\SK@equationtrue
+\expandafter\let\csname SK@flalign*\endcsname\SK@equationtrue
+\expandafter\let\csname SK@gather*\endcsname\SK@equationtrue
+\expandafter\let\csname SK@multline*\endcsname\SK@equationtrue
+\expandafter\let\csname SK@equation*\endcsname\SK@equationtrue
\def\SK@def#1{%
\edef\@tempa{\expandafter\@gobble\string#1}%
\@ifundefined{\@tempa\space}%
@@ -160,28 +198,30 @@
\expandafter\def\csname\@tempa\space\endcsname}
\ifx\SK@ref\@empty
\AtBeginDocument{%
- \ifx\vpageref\@undefined\else
+ \@ifpackageloaded{varioref}{%
\SK@def\@@vpageref#1[#2]#3{{%
\let\label\SK@label
\SK@@@vpageref#1[#2]{#3}}}%
- \DeclareRobustCommand\vref[1]{%
- \unskip~\ref{#1}%
+ \def\vr@f#1{%
+ \leavevmode\unskip\vref@space
+ \ref{#1}%
{\let\label\SK@label
- \SK@@@vpageref\unskip[\unskip\space]{#1}}}%
- \fi}
+ \vpageref[\unskip]{#1}}}%
+ }{}}
\else
\AtBeginDocument{%
\SK@def\ref#1{\SK@\SK@@ref{#1}\SK@ref{#1}}%
\SK@def\pageref#1{\SK@\SK@@ref{#1}\SK@pageref{#1}}%
- \ifx\vpageref\@undefined\else
+ \@ifpackageloaded{varioref}{%
\SK@def\@@vpageref#1[#2]#3{{%
\let\label\SK@label\let\ref\SK@ref\let\pageref\SK@pageref
\leavevmode\unskip\SK@\SK@@ref{#3}\SK@@@vpageref#1[#2]{#3}}}%
- \DeclareRobustCommand\vref[1]{%
- \unskip~\ref{#1}%
- {\let\label\SK@label\let\ref\SK@ref\let\pageref\SK@pageref
- \SK@@@vpageref\unskip[\unskip\space]{#1}}}%
- \fi}
+ \def\vr@f#1{%
+ \leavevmode\unskip\vref@space
+ \ref{#1}%
+ \let\label\SK@label\let\ref\SK@ref\let\pageref\SK@pageref
+ \vpageref[\unskip]{#1}}%
+ }{}}
\fi
\ifx\SK@cite\@empty
\AtBeginDocument{%
diff --git a/Master/texmf-dist/tex/latex/tools/somedefs.sty b/Master/texmf-dist/tex/latex/tools/somedefs.sty
index 78e0ee4980a..2f2b552bc3e 100644
--- a/Master/texmf-dist/tex/latex/tools/somedefs.sty
+++ b/Master/texmf-dist/tex/latex/tools/somedefs.sty
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
%% The LaTeX3 Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -16,12 +16,12 @@
%% --------------------------------------------------------------------------
%%
%% It may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
%% 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.3 or later is part of all distributions of LaTeX
-%% version 2003/12/01 or later.
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
%%
%% This file may only be distributed together with a copy of the LaTeX
%% `Tools Bundle'. You may however distribute the LaTeX `Tools Bundle'
diff --git a/Master/texmf-dist/tex/latex/tools/tabularx.sty b/Master/texmf-dist/tex/latex/tools/tabularx.sty
index bd5933af3f1..b309bc4fdb7 100644
--- a/Master/texmf-dist/tex/latex/tools/tabularx.sty
+++ b/Master/texmf-dist/tex/latex/tools/tabularx.sty
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
%% The LaTeX3 Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -16,12 +16,12 @@
%% --------------------------------------------------------------------------
%%
%% It may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
%% 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.3 or later is part of all distributions of LaTeX
-%% version 2003/12/01 or later.
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
%%
%% This file may only be distributed together with a copy of the LaTeX
%% `Tools Bundle'. You may however distribute the LaTeX `Tools Bundle'
diff --git a/Master/texmf-dist/tex/latex/tools/thb.sty b/Master/texmf-dist/tex/latex/tools/thb.sty
index 9583b459f63..77c17fc14f9 100644
--- a/Master/texmf-dist/tex/latex/tools/thb.sty
+++ b/Master/texmf-dist/tex/latex/tools/thb.sty
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
%% The LaTeX3 Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -16,12 +16,12 @@
%% --------------------------------------------------------------------------
%%
%% It may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
%% 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.3 or later is part of all distributions of LaTeX
-%% version 2003/12/01 or later.
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
%%
%% This file may only be distributed together with a copy of the LaTeX
%% `Tools Bundle'. You may however distribute the LaTeX `Tools Bundle'
diff --git a/Master/texmf-dist/tex/latex/tools/thc.sty b/Master/texmf-dist/tex/latex/tools/thc.sty
index e7612a9c7a3..a15cc57274b 100644
--- a/Master/texmf-dist/tex/latex/tools/thc.sty
+++ b/Master/texmf-dist/tex/latex/tools/thc.sty
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
%% The LaTeX3 Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -16,12 +16,12 @@
%% --------------------------------------------------------------------------
%%
%% It may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
%% 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.3 or later is part of all distributions of LaTeX
-%% version 2003/12/01 or later.
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
%%
%% This file may only be distributed together with a copy of the LaTeX
%% `Tools Bundle'. You may however distribute the LaTeX `Tools Bundle'
diff --git a/Master/texmf-dist/tex/latex/tools/thcb.sty b/Master/texmf-dist/tex/latex/tools/thcb.sty
index fdfdf55ff42..25730a131bf 100644
--- a/Master/texmf-dist/tex/latex/tools/thcb.sty
+++ b/Master/texmf-dist/tex/latex/tools/thcb.sty
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
%% The LaTeX3 Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -16,12 +16,12 @@
%% --------------------------------------------------------------------------
%%
%% It may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
%% 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.3 or later is part of all distributions of LaTeX
-%% version 2003/12/01 or later.
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
%%
%% This file may only be distributed together with a copy of the LaTeX
%% `Tools Bundle'. You may however distribute the LaTeX `Tools Bundle'
diff --git a/Master/texmf-dist/tex/latex/tools/theorem.sty b/Master/texmf-dist/tex/latex/tools/theorem.sty
index 26c40e46a52..f83e3f06e40 100644
--- a/Master/texmf-dist/tex/latex/tools/theorem.sty
+++ b/Master/texmf-dist/tex/latex/tools/theorem.sty
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
%% The LaTeX3 Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -16,12 +16,12 @@
%% --------------------------------------------------------------------------
%%
%% It may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
%% 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.3 or later is part of all distributions of LaTeX
-%% version 2003/12/01 or later.
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
%%
%% This file may only be distributed together with a copy of the LaTeX
%% `Tools Bundle'. You may however distribute the LaTeX `Tools Bundle'
diff --git a/Master/texmf-dist/tex/latex/tools/thm.sty b/Master/texmf-dist/tex/latex/tools/thm.sty
index ece0662ee23..90cf6267a3e 100644
--- a/Master/texmf-dist/tex/latex/tools/thm.sty
+++ b/Master/texmf-dist/tex/latex/tools/thm.sty
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
%% The LaTeX3 Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -16,12 +16,12 @@
%% --------------------------------------------------------------------------
%%
%% It may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
%% 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.3 or later is part of all distributions of LaTeX
-%% version 2003/12/01 or later.
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
%%
%% This file may only be distributed together with a copy of the LaTeX
%% `Tools Bundle'. You may however distribute the LaTeX `Tools Bundle'
diff --git a/Master/texmf-dist/tex/latex/tools/thmb.sty b/Master/texmf-dist/tex/latex/tools/thmb.sty
index e7914741fc1..ab2476a97fc 100644
--- a/Master/texmf-dist/tex/latex/tools/thmb.sty
+++ b/Master/texmf-dist/tex/latex/tools/thmb.sty
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
%% The LaTeX3 Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -16,12 +16,12 @@
%% --------------------------------------------------------------------------
%%
%% It may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
%% 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.3 or later is part of all distributions of LaTeX
-%% version 2003/12/01 or later.
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
%%
%% This file may only be distributed together with a copy of the LaTeX
%% `Tools Bundle'. You may however distribute the LaTeX `Tools Bundle'
diff --git a/Master/texmf-dist/tex/latex/tools/thp.sty b/Master/texmf-dist/tex/latex/tools/thp.sty
index 49d45fd87bd..689cc561953 100644
--- a/Master/texmf-dist/tex/latex/tools/thp.sty
+++ b/Master/texmf-dist/tex/latex/tools/thp.sty
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
%% The LaTeX3 Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -16,12 +16,12 @@
%% --------------------------------------------------------------------------
%%
%% It may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
%% 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.3 or later is part of all distributions of LaTeX
-%% version 2003/12/01 or later.
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
%%
%% This file may only be distributed together with a copy of the LaTeX
%% `Tools Bundle'. You may however distribute the LaTeX `Tools Bundle'
diff --git a/Master/texmf-dist/tex/latex/tools/trace.sty b/Master/texmf-dist/tex/latex/tools/trace.sty
index 289e059a928..2f31a8df31f 100644
--- a/Master/texmf-dist/tex/latex/tools/trace.sty
+++ b/Master/texmf-dist/tex/latex/tools/trace.sty
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
%% The LaTeX3 Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -16,12 +16,12 @@
%% --------------------------------------------------------------------------
%%
%% It may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
%% 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.3 or later is part of all distributions of LaTeX
-%% version 2003/12/01 or later.
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
%%
%% This file may only be distributed together with a copy of the LaTeX
%% `Tools Bundle'. You may however distribute the LaTeX `Tools Bundle'
diff --git a/Master/texmf-dist/tex/latex/tools/varioref.sty b/Master/texmf-dist/tex/latex/tools/varioref.sty
index 4c5d1df6aa4..d9ee0320799 100644
--- a/Master/texmf-dist/tex/latex/tools/varioref.sty
+++ b/Master/texmf-dist/tex/latex/tools/varioref.sty
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
%% The LaTeX3 Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -16,12 +16,12 @@
%% --------------------------------------------------------------------------
%%
%% It may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
%% 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.3 or later is part of all distributions of LaTeX
-%% version 2003/12/01 or later.
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
%%
%% This file may only be distributed together with a copy of the LaTeX
%% `Tools Bundle'. You may however distribute the LaTeX `Tools Bundle'
@@ -31,7 +31,7 @@
%% given in the file `manifest.txt'.
%%
%% Package varioref to use with LaTeX2e
-%% Copyright (C) 1992-2004 Frank Mittelbach, all rights reserved.
+%% Copyright (C) 1992-2006 Frank Mittelbach, all rights reserved.
%%
%% For additions or updates to the language options please contact
%% the author at
@@ -42,7 +42,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1995/05/16]
\ProvidesPackage{varioref}
- [2004/02/27 v1.4i package for extended references (FMi)]
+ [2006/05/13 v1.4p package for extended references (FMi)]
%% \CharacterTable
%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
@@ -147,6 +147,28 @@
\def\reftextpagerange#1#2{auf Seiten~\pageref{#1}--\pageref{#2}}%
\def\reftextlabelrange#1#2{\ref{#1} bis~\ref{#2}}%
}}
+\DeclareOption{basque}
+ {\vref@addto\extrasbasque{%
+ \def\reftextfaceafter {hurrengo orrialdean}%
+ \def\reftextfacebefore{aurreko orrialdean}%
+ \let\reftextafter \reftextfaceafter
+ \let\reftextbefore \reftextfacebefore
+ \def\reftextcurrent {uneko orrialdean}%
+ \def\reftextfaraway#1{~\pageref{#1}. orrialdean}%
+ \def\reftextpagerange#1#2{~\pageref{#1}--\pageref{#2} orrialdeetan}%
+ \def\reftextlabelrange#1#2{\ref{#1}.etik \ref{#2}.eraino}%
+ }}
+\DeclareOption{bahasam}
+ {\vref@addto\extrasbahasam{%
+ \def\reftextfaceafter {pada muka surat \reftextvario{bertentangan}{berikutnya}}%
+ \def\reftextfacebefore{pada muka surat \reftextvario{bertentangan}{sebelumnya} }%
+ \def\reftextafter {pada muka surat berikutnya}%
+ \def\reftextbefore {pada muka surat sebelumnya}%
+ \def\reftextcurrent {pada muka surat ini}%
+ \def\reftextfaraway#1{pada muka surat~\pageref{#1}}%
+ \def\reftextpagerange#1#2{pada muka surat~\pageref{#1}--\pageref{#2}}%
+ \def\reftextlabelrange#1#2{\ref{#1}--\ref{#2}}%
+ }}
\DeclareOption{brazil}
{\vref@addto\extrabrazil{%
\def\reftextfaceafter {na \reftextvario{p\'agina oposta}{pr\'oxima
@@ -158,10 +180,8 @@
\def\reftextcurrent {\reftextvario{nesta p\'agina}{na p\'agina
corrente}}%
\def\reftextfaraway#1{na p\'agina~\pageref{#1}}%
- \def\reftextpagerange#1#2{\vref@stringwarning\reftextpagerange
- on pages~\pageref{#1}--\pageref{#2}}%
- \def\reftextlabelrange#1#2{\vref@stringwarning\reflabelpagerange
- \ref{#1} to~\ref{#2}}%
+ \def\reftextpagerange#1#2{nas p\'aginas~\pageref{#1}--\pageref{#2}}%
+ \def\reftextlabelrange#1#2{\ref{#1} a~\ref{#2}}%
}}
\DeclareOption{breton}
{\vref@excuse{breton}%
@@ -191,18 +211,16 @@
\def\reftextlabelrange#1#2{\ref{#1} a~\ref{#2}}%
}}
\DeclareOption{croatian}
- {\vref@excuse{croatian}%
- \vref@addto\extrascroatian{%
- \def\reftextfaceafter {on the \reftextvario{facing}{next} page}%
- \def\reftextfacebefore{on the \reftextvario{facing}{preceding}
- page}%
- \def\reftextafter {on the \reftextvario{following}{next} page}%
- \def\reftextbefore {on the \reftextvario{preceding}{previous} page}%
- \def\reftextcurrent {on \reftextvario{this}{the current} page}%
- \def\reftextfaraway#1{on page~\pageref{#1}}%
- \def\reftextpagerange#1#2{on pages~\pageref{#1}--\pageref{#2}}%
- \def\reftextlabelrange#1#2{\ref{#1} to~\ref{#2}}%
- }}
+ {\vref@addto\extrascroatian{%
+ \def\reftextfaceafter {na sljede\'coj stranici}%
+ \def\reftextfacebefore{na prethodnoj stranici}%
+ \let\reftextafter \reftextfaceafter
+ \let\reftextbefore \reftextfacebefore
+ \def\reftextcurrent {na ovoj stranici}%
+ \def\reftextfaraway#1{na stranici~\pageref{#1}}%
+ \def\reftextpagerange#1#2{na stranicama~\pageref{#1}--\pageref{#2}}%
+ \def\reftextlabelrange#1#2{\ref{#1} do~\ref{#2}}%
+ }}
\DeclareOption{czech}
{%\vref@excuse{czech}%
\vref@addto\extrasczech{%
@@ -244,7 +262,7 @@
\def\reftextcurrent {op deze \refpagename}%
\def\reftextfaraway#1{op \refpagename~\pageref{#1}}%
\def\reftextpagerange#1#2{op pagina's~\pageref{#1}--\pageref{#2}}%
- \def\reftextlabelrange#1#2{\ref#1--\ref{#2}}%
+ \def\reftextlabelrange#1#2{\ref{#1}--\ref{#2}}%
}}
\DeclareOption{english}
{\vref@addto\extrasenglish{%
@@ -281,10 +299,8 @@
\def\reftextbefore {edellisell\"a sivulla}%
\def\reftextcurrent {t\"all\"a sivulla}%
\def\reftextfaraway#1{sivulla~\pageref{#1}}%
- \def\reftextpagerange#1#2{\vref@stringwarning\reftextpagerange
- on pages~\pageref{#1}--\pageref{#2}}%
- \def\reftextlabelrange#1#2{\vref@stringwarning\reflabelpagerange
- \ref{#1} to~\ref{#2}}%
+ \def\reftextpagerange#1#2{sivuilla~\pageref{#1}--\pageref{#2}}%
+ \def\reftextlabelrange#1#2{\ref{#1}--\ref{#2}}%
}}
\DeclareOption{french}
{\vref@addto\extrasfrench{%
@@ -299,18 +315,16 @@
\def\reftextlabelrange#1#2{\ref{#1} \`a~\ref{#2}}%
}}
\DeclareOption{galician}
- {\vref@excuse{galician}%
- \vref@addto\extrasgalician{%
- \def\reftextfaceafter {na seguinte p\'axina}%
- \def\reftextfacebefore{na p\'agina anterior}%
- \let\reftextafter \reftextfaceafter
- \let\reftextbefore \reftextfacebefore
+ {\vref@addto\extrasgalician{%
+ \def\reftextfaceafter {na p\'axina oposta}%
+ \def\reftextfacebefore\reftextfaceafter
+ \let\reftextafter {na p\'axina seguinte}%
+ \let\reftextbefore {na p\'axina anterior}%
\def\reftextcurrent {nesta p\'axina}%
\def\reftextfaraway#1{na p\'axina~\pageref{#1}}%
- \def\reftextpagerange#1#2{\vref@stringwarning\reftextpagerange
- on pages~\pageref{#1}--\pageref{#2}}%
- \def\reftextlabelrange#1#2{\vref@stringwarning\reflabelpagerange
- \ref{#1} to~\ref{#2}}%
+ \def\reftextpagerange#1#2{%
+ nas p\'axinas~\pageref{#1}-\pageref{#2}}%
+ \def\reftextlabelrange#1#2{\ref{#1} a~\ref{#2}}%
}}
\DeclareOption{german}
{\vref@addto\extrasgerman{%
@@ -320,7 +334,7 @@
\let\reftextbefore \reftextfacebefore
\def\reftextcurrent {auf dieser Seite}%
\def\reftextfaraway#1{auf Seite~\pageref{#1}}%
- \def\reftextpagerange#1#2{auf Seiten~\pageref{#1}--\pageref{#2}}%
+ \def\reftextpagerange#1#2{auf den Seiten~\pageref{#1}--\pageref{#2}}%
\def\reftextlabelrange#1#2{\ref{#1} bis~\ref{#2}}%
}}
\DeclareOption{ngerman}
@@ -331,7 +345,7 @@
\let\reftextbefore \reftextfacebefore
\def\reftextcurrent {auf dieser Seite}%
\def\reftextfaraway#1{auf Seite~\pageref{#1}}%
- \def\reftextpagerange#1#2{auf Seiten~\pageref{#1}--\pageref{#2}}%
+ \def\reftextpagerange#1#2{auf den Seiten~\pageref{#1}--\pageref{#2}}%
\def\reftextlabelrange#1#2{\ref{#1} bis~\ref{#2}}%
}}
\DeclareOption{greek}
@@ -358,16 +372,14 @@
{successiva}}%
\def\reftextbefore {nella pagina precedente}%
\def\reftextcurrent {in questa pagina}%
- \def\reftextfaraway#1{a pagina~\pageref{#1}}%
- \def\reftextpagerange#1#2{\vref@stringwarning\reftextpagerange
- on pages~\pageref{#1}--\pageref{#2}}%
- \def\reftextlabelrange#1#2{\vref@stringwarning\reflabelpagerange
- \ref{#1} to~\ref{#2}}%
+ \def\reftextfaraway#1{nella pagina~\pageref{#1}}%
+ \def\reftextpagerange#1#2{nelle pagine~\pageref{#1}--\pageref{#2}}%
+ \def\reftextlabelrange#1#2{da~\ref{#1} a~\ref{#2}}%
}}
\DeclareOption{magyar}
{\vref@addto\extrasmagyar{%
- \def\reftextfaceafter {a k\"o\-vet\-kez\H{o} ol\-da\-lon}%
- \def\reftextfacebefore{az el\H{o}\-z\H{o} ol\-da\-lon}%
+ \def\reftextafter {a k\"o\-vet\-kez\H{o} ol\-da\-lon}%
+ \def\reftextbefore{az el\H{o}\-z\H{o} ol\-da\-lon}%
\def\reftextfaceafter {\reftextvario{a t\'ul\-ol\-da\-lon}%
{a k\"o\-vet\-kez\H{o} ol\-da\-lon}}%
\def\reftextfacebefore{\reftextvario{a t\'ul\-ol\-da\-lon}%
@@ -421,7 +433,7 @@
\def\reftextbefore {na poprzedniej stronie}%
\def\reftextcurrent {na \reftextvario{tej
samej}{bie\zkb{}\aob{}cej} stronie}%
- \def\reftextfaraway#1{na \pageref{#1}~stronie}%
+ \def\reftextfaraway#1{na stronie~\pageref{#1}}%
\def\reftextpagerange#1#2{na stronach~\pageref{#1}--\pageref{#2}}%
\def\reftextlabelrange#1#2{od~\ref{#1} do~\ref{#2}}%
}}
@@ -439,17 +451,16 @@
\def\reftextlabelrange#1#2{\ref{#1} a~\ref{#2}}%
}}
\DeclareOption{romanian}
- {\vref@excuse{romanian}%
- \vref@addto\extrasromanian{%
- \def\reftextfaceafter {on the \reftextvario{facing}{next} page}%
- \def\reftextfacebefore{on the \reftextvario{facing}{preceding}
- page}%
- \def\reftextafter {on the \reftextvario{following}{next} page}%
- \def\reftextbefore {on the \reftextvario{preceding}{previous} page}%
- \def\reftextcurrent {on \reftextvario{this}{the current} page}%
- \def\reftextfaraway#1{on page~\pageref{#1}}%
- \def\reftextpagerange#1#2{on pages~\pageref{#1}--\pageref{#2}}%
- \def\reftextlabelrange#1#2{\ref{#1} to~\ref{#2}}%
+ {\vref@addto\extrasromanian{%
+ \def\reftextfaceafter {pe pagina \reftextvario{opus\u{a}}{urm\u{a}toarei}}%
+ \def\reftextfacebefore{pe pagina \reftextvario{opus\u{a}}{precedentei}}%
+ \def\reftextafter {pe pagina \reftextvario{dup\u{a}}{urm\u{a}toarea}}%
+ \def\reftextbefore {pe pagina \reftextvario{dinaintea}{
+ precedentei}}%
+ \def\reftextcurrent {pe aceast\u{a} pagin\u{a}}%
+ \def\reftextfaraway#1{pe pagina~\pageref{#1}}%
+ \def\reftextpagerange#1#2{pe paginile~\pageref{#1}--\pageref{#2}}%
+ \def\reftextlabelrange#1#2{\ref{#1} la~\ref{#2}}%
}}
\DeclareOption{russian}
{\vref@addto\extrasrussian{%
@@ -510,7 +521,7 @@
\def\reftextcurrent {en esta p\'agina}%
\def\reftextfaraway#1{en la p\'agina~\pageref{#1}}%
\def\reftextpagerange#1#2{en las p\'aginas~\pageref{#1}%
- --\pageref{#2}}%
+ -\pageref{#2}}%
\def\reftextlabelrange#1#2{\ref{#1} a~\ref{#2}}%
}}
\DeclareOption{swedish}
@@ -541,6 +552,28 @@
\def\reftextpagerange#1#2{on pages~\pageref{#1}--\pageref{#2}}%
\def\reftextlabelrange#1#2{\ref{#1} to~\ref{#2}}%
}}
+\DeclareOption{ukrainian}
+ {\vref@addto\extrasukrainian{%
+ \def\reftextfaceafter{\cyrn\cyra\ \reftextvario{\cyrp\cyrr\cyro
+ \cyrt\cyri\cyrl\cyre\cyrzh\cyrn\cyrii\cyrishrt}%
+ {\cyrn\cyra\cyrs\cyrt\cyru\cyrp\cyrn\cyrii\cyrishrt}\ \cyrs\cyrt
+ \cyro\cyrr\cyri\cyrn\cyrc\cyrii}%
+ \def\reftextfacebefore{\cyrn\cyra\ \reftextvario{\cyrp\cyrr\cyro
+ \cyrt\cyri\cyrl\cyre\cyrzh\cyrn\cyrii\cyrishrt}%
+ {\cyrp\cyro\cyrp\cyre\cyrr\cyre\cyrd\cyrn\cyrii\cyrishrt}\
+ \cyrs\cyrt\cyro\cyrr\cyrii\cyrn\cyrc\cyrii}%
+ \def\reftextafter{\cyrn\cyra\ \cyrn\cyra\cyrs\cyrt\cyru\cyrp\cyrn
+ \cyrii\cyrishrt\ \cyrs\cyrt\cyro\cyrr\cyrii\cyrn\cyrc\cyrii}%
+ \def\reftextbefore{\cyrn\cyra\ \cyrp\cyro\cyrp\cyre\cyrr\cyre\cyrd
+ \cyrn\cyrii\cyrishrt\ \cyrs\cyrt\cyro\cyrr\cyrii\cyrn\cyrc\cyrii}%
+ \def\reftextcurrent{\cyrn\cyra\ \reftextvario{\cyrc\cyrii\cyrishrt}%
+ {\cyrd\cyra\cyrn\cyrii\cyrishrt}\ \cyrs\cyrt\cyro\cyrr\cyrii\cyrn
+ \cyrc\cyrii}%
+ \def\reftextfaraway#1{\cyrn\cyra\ \cyrs.~\pageref{#1}}%
+ \def\reftextpagerange#1#2{\cyrn\cyra\ \cyrs\cyrt\cyro\cyrr\cyrii
+ \cyrn\cyrk\cyra\cyrh~\pageref{#1}--\pageref{#2}}%
+ \def\reftextlabelrange#1#2{\cyrz~\ref{#1}\ \cyrd\cyro~\ref{#2}}%
+ }}
\DeclareOption{francais}{%
\typeout{Please use `french' instead of `francais'}%
\ExecuteOptions{french}}
@@ -642,7 +675,7 @@
\def\is@pos@number#1{\is@pos@num0#1\space\@nil}
\def\is@pos@num{\afterassignment\is@pos@num@ \count@}
\def\is@pos@num@#1\@nil{%
- \if0#10%
+ \ifx\@nil#1\@nil
\expandafter\@firstoftwo \else
\expandafter\@secondoftwo \fi}
\def\reftextvario#1#2{\ifodd\c@vrcnt #1\else#2\fi}
diff --git a/Master/texmf-dist/tex/latex/tools/verbatim.sty b/Master/texmf-dist/tex/latex/tools/verbatim.sty
index 1ac09c4bb46..ee388e26679 100644
--- a/Master/texmf-dist/tex/latex/tools/verbatim.sty
+++ b/Master/texmf-dist/tex/latex/tools/verbatim.sty
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
%% The LaTeX3 Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -16,12 +16,12 @@
%% --------------------------------------------------------------------------
%%
%% It may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
%% 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.3 or later is part of all distributions of LaTeX
-%% version 2003/12/01 or later.
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
%%
%% This file may only be distributed together with a copy of the LaTeX
%% `Tools Bundle'. You may however distribute the LaTeX `Tools Bundle'
diff --git a/Master/texmf-dist/tex/latex/tools/verbtest.tex b/Master/texmf-dist/tex/latex/tools/verbtest.tex
index 5263ebb4695..d2000aa7736 100644
--- a/Master/texmf-dist/tex/latex/tools/verbtest.tex
+++ b/Master/texmf-dist/tex/latex/tools/verbtest.tex
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
%% The LaTeX3 Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -16,12 +16,12 @@
%% --------------------------------------------------------------------------
%%
%% It may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
%% 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.3 or later is part of all distributions of LaTeX
-%% version 2003/12/01 or later.
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
%%
%% This file may only be distributed together with a copy of the LaTeX
%% `Tools Bundle'. You may however distribute the LaTeX `Tools Bundle'
diff --git a/Master/texmf-dist/tex/latex/tools/x.tex b/Master/texmf-dist/tex/latex/tools/x.tex
index cf112c43052..030a2e1f8a6 100644
--- a/Master/texmf-dist/tex/latex/tools/x.tex
+++ b/Master/texmf-dist/tex/latex/tools/x.tex
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
%% The LaTeX3 Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -16,12 +16,12 @@
%% --------------------------------------------------------------------------
%%
%% It may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
%% 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.3 or later is part of all distributions of LaTeX
-%% version 2003/12/01 or later.
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
%%
%% This file may only be distributed together with a copy of the LaTeX
%% `Tools Bundle'. You may however distribute the LaTeX `Tools Bundle'
diff --git a/Master/texmf-dist/tex/latex/tools/xr.sty b/Master/texmf-dist/tex/latex/tools/xr.sty
index 245629e9714..b8a7f44235c 100644
--- a/Master/texmf-dist/tex/latex/tools/xr.sty
+++ b/Master/texmf-dist/tex/latex/tools/xr.sty
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
%% The LaTeX3 Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -16,12 +16,12 @@
%% --------------------------------------------------------------------------
%%
%% It may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
%% 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.3 or later is part of all distributions of LaTeX
-%% version 2003/12/01 or later.
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
%%
%% This file may only be distributed together with a copy of the LaTeX
%% `Tools Bundle'. You may however distribute the LaTeX `Tools Bundle'
diff --git a/Master/texmf-dist/tex/latex/tools/xspace.sty b/Master/texmf-dist/tex/latex/tools/xspace.sty
index 1437d4e223b..b71da9dc935 100644
--- a/Master/texmf-dist/tex/latex/tools/xspace.sty
+++ b/Master/texmf-dist/tex/latex/tools/xspace.sty
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
%% The LaTeX3 Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -16,12 +16,12 @@
%% --------------------------------------------------------------------------
%%
%% It may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
%% 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.3 or later is part of all distributions of LaTeX
-%% version 2003/12/01 or later.
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
%%
%% This file may only be distributed together with a copy of the LaTeX
%% `Tools Bundle'. You may however distribute the LaTeX `Tools Bundle'
@@ -30,33 +30,113 @@
%% The list of all files belonging to the LaTeX `Tools Bundle' is
%% given in the file `manifest.txt'.
%%
-%% File: xspace.dtx Copyright (C) 1991-1996 David Carlisle
+%% File: xspace.dtx Copyright (C) 1991-1997 David Carlisle
+%% File: xspace.dtx Copyright (C) 2004-2006 David Carlisle,
+%% Morten H\o gholm
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{xspace}
- [1997/10/13 v1.06 Space after command names (DPC)]
-\DeclareRobustCommand\xspace{\futurelet\@let@token\@xspace}
+ [2006/05/08 v1.12 Space after command names (DPC,MH)]
+\DeclareRobustCommand\xspace{\@xspace@firsttrue
+ \futurelet\@let@token\@xspace}
+\newif\if@xspace@first
+\def\@xspace@simple{\futurelet\@let@token\@xspace}
+\def\@xspace@exceptions@tlp{%
+ ,.'/?;:!~-)\ \/\bgroup\egroup\@sptoken\space\@xobeysp
+ \footnote\footnotemark
+}
+\newcommand*\xspaceaddexceptions{%
+ \g@addto@macro\@xspace@exceptions@tlp
+}
+\newcommand*\xspaceremoveexception[1]{%
+ \def\reserved@a##1#1##2##3\@@{%
+ \@xspace@if@q@nil@NF##2{%
+ \def\reserved@a####1#1####2\@@{%
+ \gdef\@xspace@exceptions@tlp{####1####2}}%
+ \expandafter\reserved@a\@xspace@exceptions@tlp\@@
+ }%
+ }%
+ \expandafter\reserved@a\@xspace@exceptions@tlp#1\@xspace@q@nil\@@
+}
+\def\@xspace@break@loop#1\@nil{}
+\providecommand*\@xspace@hook{}
+\begingroup\expandafter\expandafter\expandafter\endgroup
+ \expandafter\ifx\csname eTeXversion\endcsname\relax
+ \begingroup
+ \catcode`\;=\active \catcode`\:=\active
+ \catcode`\?=\active \catcode`\!=\active
+ \catcode`\,=\active \catcode`\'=\active \catcode`\-=\active
+ \xspaceaddexceptions{;:?!,'-}
+ \endgroup
+ \let\@xspace@eTeX@setup\relax
+\else
+ \def\@xspace@eTeX@setup{%
+ \begingroup
+ \everyeof{}%
+ \endlinechar=-1\relax
+ \catcode`\ =10\relax
+ \makeatletter
+ \catcode`\\\z@
+ \catcode`\{\@ne
+ \catcode`\}\tw@
+ \scantokens\expandafter{\expandafter\gdef
+ \expandafter\@xspace@exceptions@tlp
+ \expandafter{\@xspace@exceptions@tlp}}%
+ \endgroup
+ }
+\fi
\def\@xspace{%
- \ifx\@let@token\bgroup\else
- \ifx\@let@token\egroup\else
- \ifx\@let@token\/\else
- \ifx\@let@token\ \else
- \ifx\@let@token~\else
- \ifx\@let@token.\else
- \ifx\@let@token!\else
- \ifx\@let@token,\else
- \ifx\@let@token:\else
- \ifx\@let@token;\else
- \ifx\@let@token?\else
- \ifx\@let@token/\else
- \ifx\@let@token'\else
- \ifx\@let@token)\else
- \ifx\@let@token-\else
- \ifx\@let@token\@xobeysp\else
- \ifx\@let@token\space\else
- \ifx\@let@token\@sptoken\else
- \space
- \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi}
-
+ \@xspace@lettoken@if@letter@TF \space{%
+ \if@xspace@first
+ \@xspace@firstfalse
+ \let\@xspace@maybespace\space
+ \@xspace@eTeX@setup
+ \fi
+ \expandafter\@xspace@check@token
+ \@xspace@exceptions@tlp\@xspace@q@nil\@nil
+ \@xspace@token@if@equal@NNT \space \@xspace@maybespace
+ {%
+ \@xspace@lettoken@if@expandable@TF
+ {\expandafter\@xspace@simple}%
+ {\@xspace@maybespace\@xspace@hook}%
+ }%
+ }%
+}
+\def\@xspace@check@token #1{%
+ \ifx\@xspace@q@nil#1%
+ \expandafter\@xspace@break@loop
+ \fi
+ \expandafter\ifx\csname @let@token\endcsname#1%
+ \let\@xspace@maybespace\relax
+ \expandafter\@xspace@break@loop
+ \fi
+ \@xspace@check@token
+}
+\def\@xspace@lettoken@if@letter@TF{%
+ \ifcat\noexpand\@let@token @% letter
+ \expandafter\@firstoftwo
+ \else
+ \expandafter\@secondoftwo
+ \fi}
+\def\@xspace@lettoken@if@expandable@TF{%
+ \expandafter\ifx\noexpand\@let@token\@let@token%
+ \expandafter\@secondoftwo
+ \else
+ \expandafter\@firstoftwo
+ \fi
+}
+\def\@xspace@token@if@equal@NNT#1#2{%
+ \ifx#1#2%
+ \expandafter\@firstofone
+ \else
+ \expandafter\@gobble
+ \fi}
+\def\@xspace@q@nil{\@xspace@q@nil}
+\def\@xspace@if@q@nil@NF#1{%
+ \ifx\@xspace@q@nil#1%
+ \expandafter\@gobble
+ \else
+ \expandafter\@firstofone
+ \fi}
\endinput
%%
%% End of file `xspace.sty'.
diff --git a/Master/texmf-dist/tpm/tools.tpm b/Master/texmf-dist/tpm/tools.tpm
index cafd2e8304b..919fdb2c666 100644
--- a/Master/texmf-dist/tpm/tools.tpm
+++ b/Master/texmf-dist/tpm/tools.tpm
@@ -3,7 +3,7 @@
<rdf:Description about="http://texlive.dante.de/texlive/Package/tools.zip">
<TPM:Name>tools</TPM:Name>
<TPM:Type>Package</TPM:Type>
- <TPM:Date>2006/01/11 23:58:32</TPM:Date>
+ <TPM:Date>2006/08/26 16:17:45</TPM:Date>
<TPM:Version>1.0</TPM:Version>
<TPM:Creator>rahtz</TPM:Creator>
<TPM:Title>The tools package.</TPM:Title>
@@ -11,7 +11,7 @@
<TPM:Author></TPM:Author>
<TPM:Size>4767319</TPM:Size>
<TPM:Build/>
- <TPM:RunFiles size="225256">
+ <TPM:RunFiles size="234163">
texmf-dist/tex/latex/tools/.tex
texmf-dist/tex/latex/tools/afterpage.sty
texmf-dist/tex/latex/tools/array.sty
@@ -53,7 +53,7 @@ texmf-dist/tex/latex/tools/xr.sty
texmf-dist/tex/latex/tools/xspace.sty
texmf-dist/tpm/tools.tpm
</TPM:RunFiles>
- <TPM:DocFiles size="3664979">
+ <TPM:DocFiles size="3785397">
texmf-dist/doc/latex/tools/afterpage.pdf
texmf-dist/doc/latex/tools/array.pdf
texmf-dist/doc/latex/tools/bm.pdf
@@ -77,13 +77,14 @@ texmf-dist/doc/latex/tools/showkeys.pdf
texmf-dist/doc/latex/tools/somedefs.pdf
texmf-dist/doc/latex/tools/tabularx.pdf
texmf-dist/doc/latex/tools/theorem.pdf
+texmf-dist/doc/latex/tools/tools.pdf
texmf-dist/doc/latex/tools/trace.pdf
texmf-dist/doc/latex/tools/varioref.pdf
texmf-dist/doc/latex/tools/verbatim.pdf
texmf-dist/doc/latex/tools/xr.pdf
texmf-dist/doc/latex/tools/xspace.pdf
</TPM:DocFiles>
- <TPM:SourceFiles size="877084">
+ <TPM:SourceFiles size="910828">
texmf-dist/source/latex/tools/afterpage.dtx
texmf-dist/source/latex/tools/array.dtx
texmf-dist/source/latex/tools/bm.dtx
diff --git a/Master/texmf/lists/tools b/Master/texmf/lists/tools
index 8c1488340a4..25fe317df49 100644
--- a/Master/texmf/lists/tools
+++ b/Master/texmf/lists/tools
@@ -21,6 +21,7 @@ texmf-dist/doc/latex/tools/showkeys.pdf
texmf-dist/doc/latex/tools/somedefs.pdf
texmf-dist/doc/latex/tools/tabularx.pdf
texmf-dist/doc/latex/tools/theorem.pdf
+texmf-dist/doc/latex/tools/tools.pdf
texmf-dist/doc/latex/tools/trace.pdf
texmf-dist/doc/latex/tools/varioref.pdf
texmf-dist/doc/latex/tools/verbatim.pdf