summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/tools
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-09-28 15:28:40 +0000
committerKarl Berry <karl@freefriends.org>2009-09-28 15:28:40 +0000
commit0ca968cf4811fe9dee1a22dfbd031510dbcbda70 (patch)
treeea5a997fcee434f40f13fc8951e00255b7d521de /Master/texmf-dist/source/latex/tools
parenta7413da58c33f9b31d87d35b556eb455cefa06eb (diff)
tools (latex core) update via latex-tds (25sep09)
git-svn-id: svn://tug.org/texlive/trunk@15511 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/tools')
-rw-r--r--Master/texmf-dist/source/latex/tools/afterpage.dtx3
-rw-r--r--Master/texmf-dist/source/latex/tools/array.dtx11
-rw-r--r--Master/texmf-dist/source/latex/tools/bm.dtx3
-rw-r--r--Master/texmf-dist/source/latex/tools/calc.dtx42
-rw-r--r--Master/texmf-dist/source/latex/tools/dcolumn.dtx3
-rw-r--r--Master/texmf-dist/source/latex/tools/delarray.dtx3
-rw-r--r--Master/texmf-dist/source/latex/tools/enumerate.dtx3
-rw-r--r--Master/texmf-dist/source/latex/tools/fileerr.dtx3
-rw-r--r--Master/texmf-dist/source/latex/tools/fontsmpl.dtx3
-rw-r--r--Master/texmf-dist/source/latex/tools/ftnright.dtx3
-rw-r--r--Master/texmf-dist/source/latex/tools/hhline.dtx3
-rw-r--r--Master/texmf-dist/source/latex/tools/indentfirst.dtx3
-rw-r--r--Master/texmf-dist/source/latex/tools/layout.dtx3
-rw-r--r--Master/texmf-dist/source/latex/tools/longtable.dtx3
-rw-r--r--Master/texmf-dist/source/latex/tools/multicol.dtx41
-rw-r--r--Master/texmf-dist/source/latex/tools/rawfonts.dtx3
-rw-r--r--Master/texmf-dist/source/latex/tools/showkeys.dtx47
-rw-r--r--Master/texmf-dist/source/latex/tools/somedefs.dtx3
-rw-r--r--Master/texmf-dist/source/latex/tools/tabularx.dtx3
-rw-r--r--Master/texmf-dist/source/latex/tools/theorem.dtx3
-rw-r--r--Master/texmf-dist/source/latex/tools/tools.ins5
-rw-r--r--Master/texmf-dist/source/latex/tools/trace.dtx5
-rw-r--r--Master/texmf-dist/source/latex/tools/varioref.dtx110
-rw-r--r--Master/texmf-dist/source/latex/tools/verbatim.dtx3
-rw-r--r--Master/texmf-dist/source/latex/tools/xr.dtx3
-rw-r--r--Master/texmf-dist/source/latex/tools/xspace.dtx3
26 files changed, 232 insertions, 86 deletions
diff --git a/Master/texmf-dist/source/latex/tools/afterpage.dtx b/Master/texmf-dist/source/latex/tools/afterpage.dtx
index 284b5b16749..e9c597ccf8f 100644
--- a/Master/texmf-dist/source/latex/tools/afterpage.dtx
+++ b/Master/texmf-dist/source/latex/tools/afterpage.dtx
@@ -1,6 +1,7 @@
% \iffalse meta-comment
%
-% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
+% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
+% 2006 2008 2009
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
%
diff --git a/Master/texmf-dist/source/latex/tools/array.dtx b/Master/texmf-dist/source/latex/tools/array.dtx
index a94d171ddd9..b3b7e2ed293 100644
--- a/Master/texmf-dist/source/latex/tools/array.dtx
+++ b/Master/texmf-dist/source/latex/tools/array.dtx
@@ -1,6 +1,7 @@
% \iffalse meta-comment
%
-% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
+% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
+% 2006 2008 2009
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
%
@@ -25,11 +26,7 @@
%% Copyright (C) 1989-1998 Frank Mittelbach, all rights reserved.
%<+package>\NeedsTeXFormat{LaTeX2e}[1995/06/01]
%<+package>\ProvidesPackage{array}
-%<+package> [2005/08/23 v2.4b Tabular extension package (FMi)]
-%
-% *** 2008/09/06 Heiko Oberdiek, project `latex-tds': ***
-% *** The description of \arraybackslash is fixed, ***
-% *** see LaTeX bug report `tools/4044'. ***
+%<+package> [2008/09/09 v2.4c Tabular extension package (FMi)]
%
% \fi
%
@@ -52,6 +49,8 @@
%%
%
%
+% \changes{v2.4c}{2008/09/09}{(WR) Typo fix in documentation}
+%
% \changes{v2.3c}{1995/11/02}{(DPC) minor doc changes}
%
% \changes{v2.3a}{1994/10/16}{Added code for \cs{firsthline} and
diff --git a/Master/texmf-dist/source/latex/tools/bm.dtx b/Master/texmf-dist/source/latex/tools/bm.dtx
index c8e163fb4c0..fb3db67f5a3 100644
--- a/Master/texmf-dist/source/latex/tools/bm.dtx
+++ b/Master/texmf-dist/source/latex/tools/bm.dtx
@@ -1,6 +1,7 @@
% \iffalse meta-comment
%
-% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
+% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
+% 2006 2008 2009
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
%
diff --git a/Master/texmf-dist/source/latex/tools/calc.dtx b/Master/texmf-dist/source/latex/tools/calc.dtx
index b49f228f192..50e6620cc17 100644
--- a/Master/texmf-dist/source/latex/tools/calc.dtx
+++ b/Master/texmf-dist/source/latex/tools/calc.dtx
@@ -1,6 +1,7 @@
% \iffalse meta-comment
%
-% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
+% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
+% 2006 2008 2009
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
%
@@ -23,7 +24,7 @@
%% File `calc.dtx'.
%% Copyright (C) 1992--1995
%% Kresten Krab Thorup and Frank Jensen.
-%% Copyright (C) 1997--2005
+%% Copyright (C) 1997--2007
%% Kresten Krab Thorup, Frank Jensen and the LaTeX3 Project.
%%
%% The original authors (fj@hugin.dk and krab@daimi.aau.dk) have
@@ -39,7 +40,7 @@
%<driver> \ProvidesFile{calc.drv}
% \fi
% \ProvidesFile{calc.dtx}
- [2005/08/06 v4.2 Infix arithmetic (KKT,FJ)]
+ [2007/08/22 v4.3 Infix arithmetic (KKT,FJ)]
%
% \iffalse
%<*driver>
@@ -54,7 +55,7 @@
% \fi
%
% \GetFileInfo{calc.dtx}
-% \CheckSum{667}
+% \CheckSum{676}
%
% \title{The \texttt{calc} package\\Infix notation
% arithmetic in \LaTeX\thanks{We thank Frank Mittelbach for his
@@ -261,8 +262,13 @@
% \setlength{\parskip}{3pt plus 3pt * \real{1.5}}
%\end{verbatim}
% will set the paragraph separation to 4.5pt with no stretch or
-% shrink. (Incidentally, note how spaces can be used to enhance
-% readability.)
+% shrink. Incidentally, note how spaces can be used to enhance
+% readability. When \TeX\ is scanning for a \<number> etc.\ it is
+% common to terminate the scanning with a space token or by inserting
+% \cs{relax}. As of version~4.3 \textsf{calc} allows \cs{relax} tokens
+% to appear in places where they would usually be used for terminating
+% \TeX's scanning. In short this is just before any of \texttt{+-*/)}
+% or at the end of the expression being evaluated.
%
% When \TeX\ performs arithmetic on integers, any fractional part of
% the results are discarded. For example,
@@ -333,11 +339,17 @@
% \alt \<\textit{type} expression> \<plus or minus> \<\textit{type} term>
%
% \<\textit{type} term>^^A
-% \is \<\textit{type} factor>^^A
+% \is \<\textit{type} term> \<\textit{type} scan stop>
+% \alt \<\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>
+% \<$\max$ or $\min$ integer>^^A
+%
+% \<\textit{type} scan stop>^^A
+% \is \<empty>^^A
+% \alt \<optional space>^^A
+% \alt |\relax|
%
% \<\textit{type} factor>^^A
% \is \<\textit{type}>^^A
@@ -873,14 +885,16 @@
% \begin{macro}{\calc@post@scan}
% \begin{macro}{\@calc@post@scan}
% \changes{v4.2}{2005/08/06}{Added macro and force expansion}
+% \changes{v4.3}{2007/08/22}{Discard terminating \cs{relax} tokens and
+% avoid extra error message from \cs{calc@next}}
% 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?}
+% parentheses, an optional \cs{relax}, and the end-of-expression mark
+% (`|!|') is 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
-% control is returned to |\calc@assign@generic|).
+% end-of-expression marker: then scanning ends, and control is
+% returned to |\calc@assign@generic|).
%
% This macro may be optimized by selecting a different order of
% |\ifx|-tests. The test for `\texttt{!}' (end-of-expression) is
@@ -899,7 +913,9 @@
\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\relax\let\calc@next\calc@post@scan \else
+ \def\calc@next{\calc@error#1}%
+ \fi
\fi
\fi
\fi
diff --git a/Master/texmf-dist/source/latex/tools/dcolumn.dtx b/Master/texmf-dist/source/latex/tools/dcolumn.dtx
index f5a9c33aaaf..b087a50324a 100644
--- a/Master/texmf-dist/source/latex/tools/dcolumn.dtx
+++ b/Master/texmf-dist/source/latex/tools/dcolumn.dtx
@@ -1,6 +1,7 @@
% \iffalse meta-comment
%
-% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
+% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
+% 2006 2008 2009
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
%
diff --git a/Master/texmf-dist/source/latex/tools/delarray.dtx b/Master/texmf-dist/source/latex/tools/delarray.dtx
index 9134459cd90..0f1bf336768 100644
--- a/Master/texmf-dist/source/latex/tools/delarray.dtx
+++ b/Master/texmf-dist/source/latex/tools/delarray.dtx
@@ -1,6 +1,7 @@
% \iffalse meta-comment
%
-% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
+% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
+% 2006 2008 2009
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
%
diff --git a/Master/texmf-dist/source/latex/tools/enumerate.dtx b/Master/texmf-dist/source/latex/tools/enumerate.dtx
index 54fc8b6613b..3242bee4590 100644
--- a/Master/texmf-dist/source/latex/tools/enumerate.dtx
+++ b/Master/texmf-dist/source/latex/tools/enumerate.dtx
@@ -1,6 +1,7 @@
% \iffalse meta-comment
%
-% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
+% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
+% 2006 2008 2009
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
%
diff --git a/Master/texmf-dist/source/latex/tools/fileerr.dtx b/Master/texmf-dist/source/latex/tools/fileerr.dtx
index dc5a90e1a83..f5a415b3129 100644
--- a/Master/texmf-dist/source/latex/tools/fileerr.dtx
+++ b/Master/texmf-dist/source/latex/tools/fileerr.dtx
@@ -1,6 +1,7 @@
% \iffalse meta-comment
%
-% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
+% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
+% 2006 2008 2009
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
%
diff --git a/Master/texmf-dist/source/latex/tools/fontsmpl.dtx b/Master/texmf-dist/source/latex/tools/fontsmpl.dtx
index 532eb28f14e..530afac447b 100644
--- a/Master/texmf-dist/source/latex/tools/fontsmpl.dtx
+++ b/Master/texmf-dist/source/latex/tools/fontsmpl.dtx
@@ -1,6 +1,7 @@
% \iffalse meta-comment
%
-% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
+% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
+% 2006 2008 2009
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
%
diff --git a/Master/texmf-dist/source/latex/tools/ftnright.dtx b/Master/texmf-dist/source/latex/tools/ftnright.dtx
index 915d96bd5d4..7f6306aa3c4 100644
--- a/Master/texmf-dist/source/latex/tools/ftnright.dtx
+++ b/Master/texmf-dist/source/latex/tools/ftnright.dtx
@@ -1,6 +1,7 @@
% \iffalse meta-comment
%
-% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
+% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
+% 2006 2008 2009
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
%
diff --git a/Master/texmf-dist/source/latex/tools/hhline.dtx b/Master/texmf-dist/source/latex/tools/hhline.dtx
index b08e9dbdbac..9d29634e421 100644
--- a/Master/texmf-dist/source/latex/tools/hhline.dtx
+++ b/Master/texmf-dist/source/latex/tools/hhline.dtx
@@ -1,6 +1,7 @@
% \iffalse meta-comment
%
-% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
+% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
+% 2006 2008 2009
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
%
diff --git a/Master/texmf-dist/source/latex/tools/indentfirst.dtx b/Master/texmf-dist/source/latex/tools/indentfirst.dtx
index afb0c136891..eb49964b882 100644
--- a/Master/texmf-dist/source/latex/tools/indentfirst.dtx
+++ b/Master/texmf-dist/source/latex/tools/indentfirst.dtx
@@ -1,6 +1,7 @@
% \iffalse meta-comment
%
-% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
+% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
+% 2006 2008 2009
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
%
diff --git a/Master/texmf-dist/source/latex/tools/layout.dtx b/Master/texmf-dist/source/latex/tools/layout.dtx
index f14eb73ed99..dd2d34d5ece 100644
--- a/Master/texmf-dist/source/latex/tools/layout.dtx
+++ b/Master/texmf-dist/source/latex/tools/layout.dtx
@@ -1,6 +1,7 @@
% \iffalse meta-comment
%
-% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
+% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
+% 2006 2008 2009
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
%
diff --git a/Master/texmf-dist/source/latex/tools/longtable.dtx b/Master/texmf-dist/source/latex/tools/longtable.dtx
index 4367911193d..93e6d191201 100644
--- a/Master/texmf-dist/source/latex/tools/longtable.dtx
+++ b/Master/texmf-dist/source/latex/tools/longtable.dtx
@@ -1,6 +1,7 @@
% \iffalse meta-comment
%
-% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
+% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
+% 2006 2008 2009
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
%
diff --git a/Master/texmf-dist/source/latex/tools/multicol.dtx b/Master/texmf-dist/source/latex/tools/multicol.dtx
index 26b3b50355b..e0e293bb4f2 100644
--- a/Master/texmf-dist/source/latex/tools/multicol.dtx
+++ b/Master/texmf-dist/source/latex/tools/multicol.dtx
@@ -1,6 +1,7 @@
% \iffalse meta-comment
%
-% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
+% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
+% 2006 2008 2009
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
%
@@ -23,7 +24,7 @@
% \iffalse This is a METACOMMENT
%
%% Package `multicol' to use with LaTeX2e
-%% Copyright 1989-2005 Frank Mittelbach
+%% Copyright 1989-2007 Frank Mittelbach
%%
%% In addition to the terms of LPPL any distributed version
%% (unchanged or modified) of multicol has to keep the statement
@@ -94,10 +95,10 @@
%<driver> \ProvidesFile{multicol.drv}
% \fi
% \ProvidesFile{multicol.dtx}
- [2006/05/18 v1.6g multicolumn formatting (FMi)]
+ [2008/12/05 v1.6h multicolumn formatting (FMi)]
%
%
-%% \CheckSum{1562}
+%% \CheckSum{1560}
%% \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
@@ -308,6 +309,10 @@
% parameter |\columnseprule| to some positive value. In this
% article a value of {\sf.4pt} was used.
%
+% \DescribeMacro\columnseprulecolor
+% The color of the rules separating the columns can be specified through
+% |\columnseprulecolor|. The default value is |\normalcolor|.
+%
% \DescribeMacro\multicolbaselineskip
% Since narrow columns tend to need adjustments in interline spacing
% we also provide a \meta{skip} parameter called
@@ -380,13 +385,14 @@
% making its final decision. So a value of $-1$ may solve all your
% problems at the cost of slightly less optimal columns.
%
+%
% In the second step (balancing columns) we have other bells and
% whistles. First of all you can say |\raggedcolumns| if you
-% don't want the bottom lines to be aligned. The default is
-% |\flushcolumns|, so \TeX{} will normally try to make both the
-% top and bottom baselines of all columns align.
-%
+% don't want the bottom lines to be aligned.
+% The default is |\flushcolumns|, so \TeX{} will normally try to
+% make both
% \columnbreak
+% the top and bottom baselines of all columns align.
%
% Additionally you can set another counter, the `{\sf unbalance}'
% counter, to some positive \meta{number}. This will make all but the
@@ -1921,6 +1927,7 @@
% \changes{v1.5a}{1992/11/04}{New box mechanism}
% \changes{v1.5z}{2000/07/10}{Ensure that column rule has always
% \cs{normalcolor}}
+% \changes{v1.6f}{2006/09/19}{Make the color of the rule a hook}
% \begin{macrocode}
\process@cols\mult@gfirstbox{%
% \end{macrocode}
@@ -1931,7 +1938,7 @@
\ifdim\dp\count@>\dimen\tw@
\global\dimen\tw@\dp\count@ \fi
\box\count@
- \hss{\normalcolor\vrule
+ \hss{\columnseprulecolor\vrule
\@width\columnseprule}\hss}%
% \end{macrocode}
% As you will have noticed, we started with box register
@@ -1977,6 +1984,14 @@
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\columnseprulecolor}
+% \changes{v1.6f}{2006/09/19}{Make the color of the rule a hook}
+% By default the vertical rule between columns will be in |\normalcolor|.
+% \begin{macrocode}
+\def\columnseprulecolor{\normalcolor}
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}{\reinsert@footnotes}
% Before we tackle the bigger output routines we define just one
% more macro which will help us to find our way through the
@@ -2993,16 +3008,14 @@
% \changes{v1.5j}{1994/06/07}{Updated since floats have changed again}
% \changes{v1.5l}{1995/10/19}{Added \cs{@largefloatcheck}}
% \changes{v1.6g}{2006/02/23}{Added \cs{@minipagefalse}}
+% \changes{v1.6h}{2008/12/05}{Use \cs{@endfloatbox} to better support
+% the modifications done by the float package}
% Even if this should be used as a hook we use a |@| in the
% name since it is more for experts.
% \begin{macrocode}
\def\set@floatcmds{%
\let\@dblfloat\@dbflt
- \def\end@dblfloat{\par
- \vskip\z@
- \@minipagefalse
- \egroup
- \color@endbox
+ \def\end@dblfloat{\@endfloatbox
\@largefloatcheck
\outer@nobreak
% \end{macrocode}
diff --git a/Master/texmf-dist/source/latex/tools/rawfonts.dtx b/Master/texmf-dist/source/latex/tools/rawfonts.dtx
index e9305912c66..fa1c839c592 100644
--- a/Master/texmf-dist/source/latex/tools/rawfonts.dtx
+++ b/Master/texmf-dist/source/latex/tools/rawfonts.dtx
@@ -1,6 +1,7 @@
% \iffalse meta-comment
%
-% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
+% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
+% 2006 2008 2009
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
%
diff --git a/Master/texmf-dist/source/latex/tools/showkeys.dtx b/Master/texmf-dist/source/latex/tools/showkeys.dtx
index 9a3c1fcc5c8..4e55633b15d 100644
--- a/Master/texmf-dist/source/latex/tools/showkeys.dtx
+++ b/Master/texmf-dist/source/latex/tools/showkeys.dtx
@@ -1,6 +1,7 @@
% \iffalse meta-comment
%
-% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
+% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
+% 2006 2008 2009
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
%
@@ -21,7 +22,7 @@
% \fi
% \iffalse
%% File: showkeys.dtx Copyright (C) 1992-1997 David Carlisle
-%% File: showkeys.dtx Copyright (C) 2006 David Carlisle, LaTeX3 Project
+%% File: showkeys.dtx Copyright (C) 2006-2007 David Carlisle, LaTeX3 Project
%
%<*dtx>
\ProvidesFile{showkeys.dtx}
@@ -31,7 +32,7 @@
%<driver> \ProvidesFile{showkeys.drv}
% \fi
% \ProvidesFile{showkeys.dtx}
- [2006/01/09 v3.13 Show cite and label keys (DPC)]
+ [2007/08/07 v3.15 Show cite and label keys (DPC, MH)]
%
% \iffalse
%<*driver>
@@ -51,13 +52,13 @@
% \title{The \textsf{showkeys} 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{592}
+% \CheckSum{596}
%
%
% \changes{v1.01}{1992/08/25}{Initial version}
@@ -298,10 +299,14 @@
%
% \changes{v3.04}{1995/10/30}
% {final and draft options handling.}
+% \changes{v3.15}{2007/08/07}
+% {Fix \cs{showkeyslabelformat} for final option PR/3918.}
% Allow |final| to be specified in the document class options
% to supress the loading of this package.
% \begin{macrocode}
-\DeclareOption{final}{\endinput}
+\DeclareOption{final}{%
+ \providecommand*\showkeyslabelformat[1]{}%
+ \endinput}
\DeclareOption{draft}{}
% \end{macrocode}
%
@@ -355,7 +360,7 @@
%
% \begin{macrocode}
\def\@lbibitem[#1]#2{%
- \SK@lbibitem[#1]{#2}\SK@\SK@@label{#2}\ignorespaces}
+ \SK@lbibitem[{#1}]{#2}\SK@\SK@@label{#2}\ignorespaces}
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -452,11 +457,13 @@
% \end{macrocode}
% \changes{v3.10}{1996/09/06}
% {Inner vertical mode case, put it in the margin.}
+% \changes{v3.14}{2006/09/25}
+% {The label put in the margin shouldn't make box 255 wider (PR/3884).}
% \begin{macrocode}
\ifvoid\z@
\llap{\SK@lab\SK@lab@relax\kern\marginparsep}%
\else
- \hbox{\box\z@\kern\marginparsep\SK@labx}%
+ \hbox{\box\z@\rlap{\kern\marginparsep\SK@labx}}%
\fi
\vskip\skip@
\else
@@ -740,12 +747,14 @@
% {improve varioref support in notref option case, for
% tools/1744}
% \changes{v3.13}{2006/01/09}{Updated varioref support, for latex/3373}
+% \changes{v3.15}{2006/06/19}
+% {Prevent loss of brackets}
% \begin{macrocode}
\AtBeginDocument{%
\@ifpackageloaded{varioref}{%
\SK@def\@@vpageref#1[#2]#3{{%
\let\label\SK@label
- \SK@@@vpageref#1[#2]{#3}}}%
+ \SK@@@vpageref{#1}[{#2}]{#3}}}%
\def\vr@f#1{%
\leavevmode\unskip\vref@space
\ref{#1}%
@@ -764,6 +773,8 @@
% {Delay \cs{ref} redefinition.}
% \changes{v3.03}{1995/04/25}
% {Make redefinition conditional on notref option}
+% \changes{v3.15}{2006/06/19}
+% {Prevent loss of brackets}
% \begin{macrocode}
\AtBeginDocument{%
\SK@def\ref#1{\SK@\SK@@ref{#1}\SK@ref{#1}}%
@@ -774,7 +785,7 @@
\@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}}}%
+ \leavevmode\unskip\SK@\SK@@ref{#3}\SK@@@vpageref{#1}[{#2}]{#3}}}%
\def\vr@f#1{%
\leavevmode\unskip\vref@space
\ref{#1}%
@@ -801,7 +812,7 @@
\expandafter\let\expandafter
\SK@HAR@bi\csname\string\harvarditem\endcsname
\expandafter\def\csname\string\harvarditem\endcsname[#1]#2#3#4{%
- \SK@HAR@bi[#1]{#2}{#3}{#4}\SK@\SK@@label{#4}}%
+ \SK@HAR@bi[{#1}]{#2}{#3}{#4}\SK@\SK@@label{#4}}%
\fi}
\else
% \end{macrocode}
@@ -850,7 +861,7 @@
% {Fix \cs{harvarditem} support}
% \begin{macrocode}
\expandafter\def\csname\string\harvarditem\endcsname[#1]#2#3#4{%
- \SK@HAR@bi[#1]{#2}{#3}{#4}\SK@\SK@@label{#4}}%
+ \SK@HAR@bi[{#1}]{#2}{#3}{#4}\SK@\SK@@label{#4}}%
\fi}
% \end{macrocode}
%
@@ -865,15 +876,19 @@
% \end{macro}
%
% \begin{macro}{\SK@@ref}
-% This is much simpler than the printing of the label, as we know that
-% we can be in horizontal mode.
+% This is much simpler than the printing of the label, as we know
+% that we can be in horizontal mode. We temporarily set the switch
+% \cs{if@inlabel} false in order to avoid problems with the pdf\TeX\
+% color driver.
+% \changes{v3.14}{2006/09/25}
+% {Add fix for pdf\TeX.}
% \begin{macrocode}
\def\SK@@ref#1>#2\SK@{%
- \leavevmode\vbox to\z@{%
+ {\@inlabelfalse\leavevmode\vbox to\z@{%
\vss
\SK@refcolor
\rlap{\vrule\raise .75em%
- \hbox{\underbar{\normalfont\footnotesize\ttfamily#2}}}}}
+ \hbox{\underbar{\normalfont\footnotesize\ttfamily#2}}}}}}
% \end{macrocode}
% \end{macro}
%
diff --git a/Master/texmf-dist/source/latex/tools/somedefs.dtx b/Master/texmf-dist/source/latex/tools/somedefs.dtx
index 86fc96cdef8..bf00286e678 100644
--- a/Master/texmf-dist/source/latex/tools/somedefs.dtx
+++ b/Master/texmf-dist/source/latex/tools/somedefs.dtx
@@ -1,6 +1,7 @@
% \iffalse meta-comment
%
-% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
+% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
+% 2006 2008 2009
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
%
diff --git a/Master/texmf-dist/source/latex/tools/tabularx.dtx b/Master/texmf-dist/source/latex/tools/tabularx.dtx
index e52b4a32b89..70272ef32e0 100644
--- a/Master/texmf-dist/source/latex/tools/tabularx.dtx
+++ b/Master/texmf-dist/source/latex/tools/tabularx.dtx
@@ -1,6 +1,7 @@
% \iffalse meta-comment
%
-% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
+% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
+% 2006 2008 2009
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
%
diff --git a/Master/texmf-dist/source/latex/tools/theorem.dtx b/Master/texmf-dist/source/latex/tools/theorem.dtx
index 31f8386f539..285aae6b632 100644
--- a/Master/texmf-dist/source/latex/tools/theorem.dtx
+++ b/Master/texmf-dist/source/latex/tools/theorem.dtx
@@ -1,6 +1,7 @@
% \iffalse meta-comment
%
-% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
+% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
+% 2006 2008 2009
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
%
diff --git a/Master/texmf-dist/source/latex/tools/tools.ins b/Master/texmf-dist/source/latex/tools/tools.ins
index f67c2d923ab..291e49316af 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 2004 2005
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2008 2009
%% The LaTeX3 Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -41,7 +41,8 @@
This is a generated file.
-Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
+Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
+2006 2008 2009
The LaTeX3 Project and any individual authors listed elsewhere
in this file.
diff --git a/Master/texmf-dist/source/latex/tools/trace.dtx b/Master/texmf-dist/source/latex/tools/trace.dtx
index 013fb03bd51..3d5f040f211 100644
--- a/Master/texmf-dist/source/latex/tools/trace.dtx
+++ b/Master/texmf-dist/source/latex/tools/trace.dtx
@@ -1,6 +1,7 @@
% \iffalse meta-comment
%
-% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
+% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
+% 2006 2008 2009
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
%
@@ -21,7 +22,7 @@
% \fi
% \iffalse
%%
-%% $Id: trace.dtx,v 3.2 2003/06/29 14:44:49 mittelba Exp $
+%% $Id: trace.dtx 5291 2003-06-29 14:44:49Z mittelba $
%%
%% (C) Copyright 1999-2001 Frank Mittelbach
%% All rights reserved.
diff --git a/Master/texmf-dist/source/latex/tools/varioref.dtx b/Master/texmf-dist/source/latex/tools/varioref.dtx
index 9f1ec820a4c..9404a96ab21 100644
--- a/Master/texmf-dist/source/latex/tools/varioref.dtx
+++ b/Master/texmf-dist/source/latex/tools/varioref.dtx
@@ -1,6 +1,7 @@
% \iffalse meta-comment
%
-% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
+% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
+% 2006 2008 2009 2009
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
%
@@ -21,7 +22,7 @@
% \fi
% \iffalse
%% Package varioref to use with LaTeX2e
-%% Copyright (C) 1992-2006 Frank Mittelbach, all rights reserved.
+%% Copyright (C) 1992-2009 Frank Mittelbach, all rights reserved.
%%
%% For additions or updates to the language options please contact
%% the author at
@@ -33,10 +34,10 @@
%
%<package>\NeedsTeXFormat{LaTeX2e}[1995/05/16]
%<package>\ProvidesPackage{varioref}
-%<package> [2006/05/13 v1.4p package for extended references (FMi)]
+%<package> [2009/09/13 v1.4w package for extended references (FMi)]
% \fi
%
-% \CheckSum{1899}
+% \CheckSum{2150}
%% \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
@@ -296,7 +297,7 @@
% If you like to have |\vref| suppress the page number on pages where
% label and reference fall onto the same page, but prefer reference to
% page numbers otherwise then |\vpagerefnum| can be used. This macro
-% hold the current page ``number" when |\vpageref| and friends are
+% hold the current page ``number'' when |\vpageref| and friends are
% executed. Thus, by defining, for example
%\begin{verbatim}
%\renewcommand\reftextfaceafter {on page~\thevpagerefnum}
@@ -314,6 +315,7 @@
% (Some languages need updating, however.)
% It also supports languages currently not in babel;
% check the section on options later on.
+%
% You can also modify some or all of the strings by redefining the
% following commands.
%\DescribeMacro\reftextbefore
@@ -343,6 +345,18 @@
% |\vpageref| commands. As an example see the definitions of
% |\reftextbefore| etc.\ \vpageref[below]{reftextbefore}.
%
+% \begin{itshape} If babel is being used then the above commands need to be
+% changed using the Babel mechanism, e.g.,
+%\begin{verbatim}
+%\addto\extrasngerman{%
+% \renewcommand\reftextfaceafter {auf der n\"achsten Seite}%
+% ...
+% }
+%\end{verbatim}
+% Otherwise babel will reintroduce its own defaults each time the language is
+% changed (which happens in particular during |\begin{document}| where the
+% main language is selected).
+% \end{itshape}
%
% \subsection{Additions in 1998}
%
@@ -370,7 +384,7 @@
% As mentioned above the package supports all standard options offered
% by the Babel system to customize the strings produced. In addition it
% offers the option \texttt{draft} to turn error messages into warnings
-% during development. The defaul \texttt{final} produces error message
+% during development. The default \texttt{final} produces error message
% when a generated string falls onto a page boundary (see next section).
%
%
@@ -657,9 +671,10 @@
% (|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}
+% \changes{v1.4r}{2007/05/26}{Misspelling of \cs{extrasbrazil}}
% \begin{macrocode}
\DeclareOption{brazil}
- {\vref@addto\extrabrazil{%
+ {\vref@addto\extrasbrazil{%
\def\reftextfaceafter {na \reftextvario{p\'agina oposta}{pr\'oxima
p\'agina}}%
\def\reftextfacebefore{na p\'agina \reftextvario{oposta}{anterior}}%
@@ -694,6 +709,40 @@
\ref{#1} to~\ref{#2}}%
}}
% \end{macrocode}
+% Text for Bulgarian defaults was contributed by
+% Georgi Boshnakov (|georgi.boshnakov@gmail.com|).
+% \changes{v1.4q}{2006/05/23}{Added defaults for bulgarian}
+% \begin{macrocode}
+\DeclareOption{bulgarian}%
+ {\vref@addto\extrasbulgarian{%
+ \def\reftextfaceafter{\cyrn\cyra\
+ \reftextvario{\cyrs\cyrery\cyrs\cyre\cyrd\cyrn\cyra\cyrt\cyra}%
+ {\cyrs\cyrl\cyre\cyrd\cyrv\cyra\cyrshch\cyra\cyrt\cyra}
+ \cyrs\cyrt\cyrr\cyra\cyrn\cyri\cyrc\cyra}%
+ \def\reftextfacebefore{\cyrn\cyra\
+ \reftextvario{\cyrs\cyrery\cyrs\cyre\cyrd\cyrn\cyra\cyrt\cyra}%
+ {\cyrp\cyrr\cyre\cyrd\cyrn\cyra\cyrt\cyra}
+ \cyrs\cyrt\cyrr\cyra\cyrn\cyri\cyrc\cyra}%
+ \def\reftextafter{\cyrn\cyra\
+ \reftextvario{\cyrs\cyrl\cyre\cyrd\cyrv\cyra\cyrshch\cyra\cyrt\cyra}%
+ {\cyrs\cyrl\cyre\cyrd\cyrv\cyra\cyrshch\cyra\cyrt\cyra}
+ \cyrs\cyrt\cyrr\cyra\cyrn\cyri\cyrc\cyra}%
+ \def\reftextbefore{\cyrn\cyra\
+ \reftextvario{\cyrp\cyrr\cyre\cyrd\cyrn\cyra\cyrt\cyra}%
+ {\cyrp\cyrr\cyre\cyrd\cyri\cyrsh\cyrn\cyra\cyrt\cyra}
+ \cyrs\cyrt\cyrr\cyra\cyrn\cyri\cyrc\cyra}%
+ \def\reftextcurrent{\cyrn\cyra\
+ \reftextvario{\cyrt\cyra\cyrz\cyri}%
+ {\cyrt\cyre\cyrk\cyru\cyrshch\cyra\cyrt\cyra}
+ \cyrs\cyrt\cyrr\cyra\cyrn\cyri\cyrc\cyra}%
+ \def\reftextfaraway#1{\cyrn\cyra\ \cyrs\cyrt\cyrr\cyra\cyrn\cyri\cyrc\cyra
+ ~\pageref{#1}}%
+ \def\reftextpagerange#1#2{\cyrn\cyra\
+ \cyrs\cyrt\cyrr\cyra\cyrn\cyri\cyrc\cyri
+ ~\pageref{#1}--\pageref{#2}}%
+ \def\reftextlabelrange#1#2{\ref{#1} \cyrd\cyro~\ref{#2}}%
+ }}
+% \end{macrocode}
% Text for catalan defaults was contributed by Robert Fuster\\
% (\verb=rfuster@mat.upv.es=).
% \changes{v1.1c}{1997/06/12}{Added defaults for catalan}
@@ -967,12 +1016,34 @@
\def\reftextlabelrange#1#2{\ref{#1} ws\nobreakspace\ref{#2}}%
}}
% \end{macrocode}
+% Iselandic defaults suggested by Thorhallur Sverrisson
+% (\verb=thorhs@basis.is=).
+% \changes{v1.4t}{2007/09/07}{Added defaults for islandic}
+% \begin{macrocode}
+\DeclareOption{icelandic}
+ {\vref@addto\extrasicelandic{%
+ \def\reftextfaceafter {\'{a} \reftextvario{n{\ae}stu}%
+ {n{\ae}stu} s\'{i}{\dh}u}%
+ \def\reftextfacebefore{\'{a} \reftextvario{fyrri}%
+ {fyrri} s\'{i}{\dh}u}%
+ \def\reftextafter {\'{a} \reftextvario{n{\ae}stu}%
+ {n{\ae}stu} s\'{i}{\dh}u}%
+ \def\reftextbefore {\'{a} \reftextvario{fyrri}{fyrri} s\'{i}{\dh}u}%
+ \def\reftextcurrent {\'{a} \reftextvario{{\th}essari}%
+ {{\th}essari} s\'{i}{\dh}u}%
+ \def\reftextfaraway#1{\'{a} s\'{i}{\dh}u~\pageref{#1}}%
+ \def\reftextpagerange#1#2{\'{a} s\'{i}{\dh}um~\pageref{#1}--\pageref{#2}}%
+ \def\reftextlabelrange#1#2{\ref{#1} til~\ref{#2}}%
+ }}
+% \end{macrocode}
% Defaults for Italian suggested by Giovanni Pensa
% (\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}
+% \changes{v1.4u}{2009/03/21}{Correction for \cs{reftextfaraway} suggested
+% by Lorenzo Pantieri}
% \begin{macrocode}
\DeclareOption{italian}
{\vref@addto\extrasitalian{%
@@ -984,7 +1055,7 @@
{successiva}}%
\def\reftextbefore {nella pagina precedente}%
\def\reftextcurrent {in questa pagina}%
- \def\reftextfaraway#1{nella pagina~\pageref{#1}}%
+ \def\reftextfaraway#1{a pagina~\pageref{#1}}%
\def\reftextpagerange#1#2{nelle pagine~\pageref{#1}--\pageref{#2}}%
\def\reftextlabelrange#1#2{da~\ref{#1} a~\ref{#2}}%
}}
@@ -1115,9 +1186,10 @@
% Jos\'e Carlos Oliveira Santos \verb=jcsantos@fc.up.pt=.
% \changes{v1.2b}{1999/11/25}{Added portuguese defaults}
% \changes{v1.2c}{1999/12/02}{Added more portuguese defaults}
+% \changes{v1.4r}{2007/05/26}{Misspelling of \cs{extrasportuges}}
% \begin{macrocode}
\DeclareOption{portuges}
- {\vref@addto\extraportuges{%
+ {\vref@addto\extrasportuges{%
\def\reftextfaceafter {na \reftextvario{p\'agina ao lado}{pr\'oxima
p\'agina}}%
\def\reftextfacebefore{na p\'agina \reftextvario{ao lado}{anterior}}%
@@ -1129,11 +1201,15 @@
\def\reftextpagerange#1#2{nas p\'aginas~\pageref{#1}--\pageref{#2}}%
\def\reftextlabelrange#1#2{\ref{#1} a~\ref{#2}}%
}}
+% \end{macrocode}
+% \changes{v1.4v}{2009/06/13}{Incorrect text in \cs{reftextafter} (pr/4070)}
+% \begin{macrocode}
\DeclareOption{romanian}
{\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\reftextafter {\reftextvario{pe pagina urm\u{a}toare}%
+ {pe urm\u{a}toarea pagin\u{a}}}%
\def\reftextbefore {pe pagina \reftextvario{dinaintea}{
precedentei}}%
\def\reftextcurrent {pe aceast\u{a} pagin\u{a}}%
@@ -1813,6 +1889,8 @@
%
% \begin{macro}{\vref@pagenum}
% \changes{v1.2a}{1998/08/01}{Macro added}
+% \changes{v1.4w}{2009/09/13}{Use \cs{protected@edef} to avoid problems
+% in complicated setups, e.g., microtype (pr/4080)}
% This command takes a label as |#1| extracts the page number
% associated with it and saves the result in a csname which is
% passed as |#1|. If the label isn't associates with a page number
@@ -1823,7 +1901,7 @@
% \begin{macrocode}
\def\vref@pagenum#1#2{%
\@ifundefined{r@#2}{\@namedef{r@#2}{{??}{??}}}{}%
- \edef#1{\expandafter\expandafter\expandafter
+ \protected@edef#1{\expandafter\expandafter\expandafter
\@cdr\csname r@#2\endcsname
\@nil}%
}
@@ -1849,6 +1927,8 @@
% \begin{macro}{\@svpagerefrange}
% \changes{v1.2a}{1998/08/01}{Macro added}
% \changes{v1.3b}{2001/04/14}{Scan for star form}
+% \changes{v1.4s}{2007/08/07}
+% {Prevent loss of brackets}
% If both labels refer to the same page then we produce a
% |\vpageref|. Otherwise we produce the result of
% |\reftextpagerange|.
@@ -1863,7 +1943,7 @@
\vrefpagenum\@tempa{#2}%
\vrefpagenum\@tempb{#3}%
\ifx\@tempa\@tempb
- \vpageref*[#1]{#2}%
+ \vpageref*[{#1}]{#2}%
\else
\reftextpagerange{#2}{#3}%
\fi
@@ -1875,7 +1955,7 @@
\vrefpagenum\@tempa{#2}%
\vrefpagenum\@tempb{#3}%
\ifx\@tempa\@tempb
- \vpageref[#1]{#2}%
+ \vpageref[{#1}]{#2}%
\else
\reftextpagerange{#2}{#3}%
\fi
@@ -1892,9 +1972,11 @@
%
% \begin{macro}{\vrefrange}
% \changes{v1.2a}{1998/08/01}{Macro added}
+% \changes{v1.4s}{2006/08/07}
+% {Prevent loss of brackets}
% \begin{macrocode}
\newcommand\vrefrange[3][\reftextcurrent]
- {\reftextlabelrange{#2}{#3} \vpagerefrange[#1]{#2}{#3}}
+ {\reftextlabelrange{#2}{#3} \vpagerefrange[{#1}]{#2}{#3}}
% \end{macrocode}
% \end{macro}
%
diff --git a/Master/texmf-dist/source/latex/tools/verbatim.dtx b/Master/texmf-dist/source/latex/tools/verbatim.dtx
index f9d427c0aeb..88274e27c2f 100644
--- a/Master/texmf-dist/source/latex/tools/verbatim.dtx
+++ b/Master/texmf-dist/source/latex/tools/verbatim.dtx
@@ -1,6 +1,7 @@
% \iffalse meta-comment
%
-% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
+% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
+% 2006 2008 2009
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
%
diff --git a/Master/texmf-dist/source/latex/tools/xr.dtx b/Master/texmf-dist/source/latex/tools/xr.dtx
index cabfa624c93..afa4c15acb0 100644
--- a/Master/texmf-dist/source/latex/tools/xr.dtx
+++ b/Master/texmf-dist/source/latex/tools/xr.dtx
@@ -1,6 +1,7 @@
% \iffalse meta-comment
%
-% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
+% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
+% 2006 2008 2009
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
%
diff --git a/Master/texmf-dist/source/latex/tools/xspace.dtx b/Master/texmf-dist/source/latex/tools/xspace.dtx
index 5cb3b7cb2f1..2740032c7a2 100644
--- a/Master/texmf-dist/source/latex/tools/xspace.dtx
+++ b/Master/texmf-dist/source/latex/tools/xspace.dtx
@@ -1,6 +1,7 @@
% \iffalse meta-comment
%
-% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
+% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
+% 2006 2008 2009
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
%