tools update for varioref (11aug11)

git-svn-id: svn://tug.org/texlive/trunk@23504 c570f23f-e606-0410-a88d-b1316a301751

28 files changed, 35 insertions, 25 deletions

diff --git a/Master/texmf-dist/doc/latex/tools/afterpage.pdf b/Master/texmf-dist/doc/latex/tools/afterpage.pdf
index 87dc4010068..91120433fc9 100644
--- a/Master/texmf-dist/doc/latex/tools/afterpage.pdf
+++ b/Master/texmf-dist/doc/latex/tools/afterpage.pdf
diff --git a/Master/texmf-dist/doc/latex/tools/array.pdf b/Master/texmf-dist/doc/latex/tools/array.pdf
index bd841ab61aa..1b05f3f17db 100644
--- a/Master/texmf-dist/doc/latex/tools/array.pdf
+++ b/Master/texmf-dist/doc/latex/tools/array.pdf
diff --git a/Master/texmf-dist/doc/latex/tools/bm.pdf b/Master/texmf-dist/doc/latex/tools/bm.pdf
index 24cef87c5dd..e0ab04d9bdf 100644
--- a/Master/texmf-dist/doc/latex/tools/bm.pdf
+++ b/Master/texmf-dist/doc/latex/tools/bm.pdf
diff --git a/Master/texmf-dist/doc/latex/tools/calc.pdf b/Master/texmf-dist/doc/latex/tools/calc.pdf
index baece5c79ab..21357ce15e7 100644
--- a/Master/texmf-dist/doc/latex/tools/calc.pdf
+++ b/Master/texmf-dist/doc/latex/tools/calc.pdf
diff --git a/Master/texmf-dist/doc/latex/tools/dcolumn.pdf b/Master/texmf-dist/doc/latex/tools/dcolumn.pdf
index 22970ded983..a708de97662 100644
--- a/Master/texmf-dist/doc/latex/tools/dcolumn.pdf
+++ b/Master/texmf-dist/doc/latex/tools/dcolumn.pdf
diff --git a/Master/texmf-dist/doc/latex/tools/delarray.pdf b/Master/texmf-dist/doc/latex/tools/delarray.pdf
index 451974f75ca..7e52d6d1111 100644
--- a/Master/texmf-dist/doc/latex/tools/delarray.pdf
+++ b/Master/texmf-dist/doc/latex/tools/delarray.pdf
diff --git a/Master/texmf-dist/doc/latex/tools/enumerate.pdf b/Master/texmf-dist/doc/latex/tools/enumerate.pdf
index b4d9839fc6b..2ab750dc52f 100644
--- a/Master/texmf-dist/doc/latex/tools/enumerate.pdf
+++ b/Master/texmf-dist/doc/latex/tools/enumerate.pdf
diff --git a/Master/texmf-dist/doc/latex/tools/fileerr.pdf b/Master/texmf-dist/doc/latex/tools/fileerr.pdf
index bda12d4e49d..3db273ecb14 100644
--- a/Master/texmf-dist/doc/latex/tools/fileerr.pdf
+++ b/Master/texmf-dist/doc/latex/tools/fileerr.pdf
diff --git a/Master/texmf-dist/doc/latex/tools/fontsmpl.pdf b/Master/texmf-dist/doc/latex/tools/fontsmpl.pdf
index 39a5df4a540..cc60dbbec56 100644
--- a/Master/texmf-dist/doc/latex/tools/fontsmpl.pdf
+++ b/Master/texmf-dist/doc/latex/tools/fontsmpl.pdf
diff --git a/Master/texmf-dist/doc/latex/tools/ftnright.pdf b/Master/texmf-dist/doc/latex/tools/ftnright.pdf
index 0bc70352931..fce888898d9 100644
--- a/Master/texmf-dist/doc/latex/tools/ftnright.pdf
+++ b/Master/texmf-dist/doc/latex/tools/ftnright.pdf
diff --git a/Master/texmf-dist/doc/latex/tools/hhline.pdf b/Master/texmf-dist/doc/latex/tools/hhline.pdf
index 20e33daf3c2..2e98766251c 100644
--- a/Master/texmf-dist/doc/latex/tools/hhline.pdf
+++ b/Master/texmf-dist/doc/latex/tools/hhline.pdf
diff --git a/Master/texmf-dist/doc/latex/tools/indentfirst.pdf b/Master/texmf-dist/doc/latex/tools/indentfirst.pdf
index 3e7aeebe5d2..e9d3c1964a0 100644
--- a/Master/texmf-dist/doc/latex/tools/indentfirst.pdf
+++ b/Master/texmf-dist/doc/latex/tools/indentfirst.pdf
diff --git a/Master/texmf-dist/doc/latex/tools/layout.pdf b/Master/texmf-dist/doc/latex/tools/layout.pdf
index 5db8d17436d..626dfafb4d3 100644
--- a/Master/texmf-dist/doc/latex/tools/layout.pdf
+++ b/Master/texmf-dist/doc/latex/tools/layout.pdf
diff --git a/Master/texmf-dist/doc/latex/tools/longtable.pdf b/Master/texmf-dist/doc/latex/tools/longtable.pdf
index 16f33cf5b1b..729e8ee6ec0 100644
--- a/Master/texmf-dist/doc/latex/tools/longtable.pdf
+++ b/Master/texmf-dist/doc/latex/tools/longtable.pdf
diff --git a/Master/texmf-dist/doc/latex/tools/multicol.pdf b/Master/texmf-dist/doc/latex/tools/multicol.pdf
index 88135ac1bce..f73d9528c07 100644
--- a/Master/texmf-dist/doc/latex/tools/multicol.pdf
+++ b/Master/texmf-dist/doc/latex/tools/multicol.pdf
diff --git a/Master/texmf-dist/doc/latex/tools/rawfonts.pdf b/Master/texmf-dist/doc/latex/tools/rawfonts.pdf
index adbd9c35d0c..c964347bfb6 100644
--- a/Master/texmf-dist/doc/latex/tools/rawfonts.pdf
+++ b/Master/texmf-dist/doc/latex/tools/rawfonts.pdf
diff --git a/Master/texmf-dist/doc/latex/tools/showkeys.pdf b/Master/texmf-dist/doc/latex/tools/showkeys.pdf
index 363a3ae5175..2f5f8254039 100644
--- a/Master/texmf-dist/doc/latex/tools/showkeys.pdf
+++ b/Master/texmf-dist/doc/latex/tools/showkeys.pdf
diff --git a/Master/texmf-dist/doc/latex/tools/somedefs.pdf b/Master/texmf-dist/doc/latex/tools/somedefs.pdf
index 78d5056e294..9dacb14fdec 100644
--- a/Master/texmf-dist/doc/latex/tools/somedefs.pdf
+++ b/Master/texmf-dist/doc/latex/tools/somedefs.pdf
diff --git a/Master/texmf-dist/doc/latex/tools/tabularx.pdf b/Master/texmf-dist/doc/latex/tools/tabularx.pdf
index 634029549d4..dc298936561 100644
--- a/Master/texmf-dist/doc/latex/tools/tabularx.pdf
+++ b/Master/texmf-dist/doc/latex/tools/tabularx.pdf
diff --git a/Master/texmf-dist/doc/latex/tools/theorem.pdf b/Master/texmf-dist/doc/latex/tools/theorem.pdf
index 7771388979c..4d5244fce41 100644
--- a/Master/texmf-dist/doc/latex/tools/theorem.pdf
+++ b/Master/texmf-dist/doc/latex/tools/theorem.pdf
diff --git a/Master/texmf-dist/doc/latex/tools/tools.pdf b/Master/texmf-dist/doc/latex/tools/tools.pdf
index 68d75270526..eb02819f906 100644
--- a/Master/texmf-dist/doc/latex/tools/tools.pdf
+++ b/Master/texmf-dist/doc/latex/tools/tools.pdf
diff --git a/Master/texmf-dist/doc/latex/tools/trace.pdf b/Master/texmf-dist/doc/latex/tools/trace.pdf
index f337d05109e..b3b87f26b29 100644
--- a/Master/texmf-dist/doc/latex/tools/trace.pdf
+++ b/Master/texmf-dist/doc/latex/tools/trace.pdf
diff --git a/Master/texmf-dist/doc/latex/tools/varioref.pdf b/Master/texmf-dist/doc/latex/tools/varioref.pdf
index c8dcdc7b552..e10314a1245 100644
--- a/Master/texmf-dist/doc/latex/tools/varioref.pdf
+++ b/Master/texmf-dist/doc/latex/tools/varioref.pdf
diff --git a/Master/texmf-dist/doc/latex/tools/verbatim.pdf b/Master/texmf-dist/doc/latex/tools/verbatim.pdf
index ea82b59127c..cfc8b0a90aa 100644
--- a/Master/texmf-dist/doc/latex/tools/verbatim.pdf
+++ b/Master/texmf-dist/doc/latex/tools/verbatim.pdf
diff --git a/Master/texmf-dist/doc/latex/tools/xr.pdf b/Master/texmf-dist/doc/latex/tools/xr.pdf
index 829a0b6c9ac..527e836f97b 100644
--- a/Master/texmf-dist/doc/latex/tools/xr.pdf
+++ b/Master/texmf-dist/doc/latex/tools/xr.pdf
diff --git a/Master/texmf-dist/doc/latex/tools/xspace.pdf b/Master/texmf-dist/doc/latex/tools/xspace.pdf
index 7817b7127cc..0da2b167360 100644
--- a/Master/texmf-dist/doc/latex/tools/xspace.pdf
+++ b/Master/texmf-dist/doc/latex/tools/xspace.pdf
diff --git a/Master/texmf-dist/source/latex/tools/varioref.dtx b/Master/texmf-dist/source/latex/tools/varioref.dtx
index 7cf7c7eed50..8459888071a 100644
--- a/Master/texmf-dist/source/latex/tools/varioref.dtx
+++ b/Master/texmf-dist/source/latex/tools/varioref.dtx
@@ -1,7 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
-% 2006 2008 2009 2009
+% Copyright 1993-2011
 % The LaTeX3 Project and any individual authors listed elsewhere
 % in this file. 
 % 
@@ -22,7 +21,7 @@
 % \fi
 % \iffalse
 %% Package varioref to use with LaTeX2e
-%% Copyright (C) 1992-2010  Frank Mittelbach, all rights reserved.
+%% Copyright (C) 1992-2011  Frank Mittelbach, all rights reserved.
 %%
 %% For additions or updates to the language options please contact
 %% the author at
@@ -34,10 +33,10 @@
 %
 %<package>\NeedsTeXFormat{LaTeX2e}[1995/05/16]
 %<package>\ProvidesPackage{varioref}
-%<package>    [2010/11/12 v1.4y package for extended references (FMi)]
+%<package>    [2011/07/27 v1.4z package for extended references (FMi)]
 % \fi
 %
-% \CheckSum{2170}
+% \CheckSum{2172}
 %% \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
@@ -710,7 +709,7 @@
   }}
 %    \end{macrocode}
 %    Text for Bulgarian defaults was contributed by
-%    Georgi Boshnakov (|georgi.boshnakov@gmail.com|).
+%    Georgi Boshnakov\\  (|georgi.boshnakov@gmail.com|).
 % \changes{v1.4q}{2006/05/23}{Added defaults for bulgarian}
 %    \begin{macrocode}
 \DeclareOption{bulgarian}%
@@ -1097,8 +1096,10 @@
 %    The following suggested patch has not been added yet (pending changes
 %    in babel system).
 %\begin{verbatim}
-%    \def\reftextfaraway#1{a~\csname @@magyar@az@lowxu\endcsname{\pageref{#1}}.~ol\-da\-lon}%
-%    \def\reftextpagerange#1#2{a~\csname @@magyar@az@lowxu\endcsname{\pageref{#1}}%
+%    \def\reftextfaraway#1{a~\csname @@magyar@az@lowxu\endcsname
+%                                                {\pageref{#1}}.~ol\-da\-lon}%
+%    \def\reftextpagerange#1#2{a~\csname @@magyar@az@lowxu\endcsname
+%                                                        {\pageref{#1}}%
 %      --\pageref{#2}.~ol\-da\-la\-kon}%
 %    \def\reftextlabelrange#1#2{{}\csname @@magyar@told\endcsname\ref{#1}+tol
 %      \ref{#2}-ig}% Dat: `{}' is here for anti-\capitalize
@@ -1349,7 +1350,7 @@
     \def\reftextlabelrange#1#2{\ref{#1} to~\ref{#2}}%
   }}
 %    \end{macrocode}
-%    The text for Ukrainian defaults was contributed by Mykola Lyakhovych 
+%    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}
@@ -1916,18 +1917,24 @@
 %    if the label contained active characters, e.g., a ``:'' in French. So now
 %    we use even more |\expandafter| commands to avoid any expansion other
 %    than what is absolutely  required---I'm sure there is now a simpler way
-%    to code this, but \ldots:
+%    to code this, but \ldots\ in fact we didn't use enough initially resulting in another 
+%    bug (pr/4159):
 % \changes{v1.4w}{2009/09/13}{Use \cs{protected@edef} to avoid problems
 %              in complicated setups, e.g., microtype (pr/4080)}
 % \changes{v1.4y}{2010/11/12}{Avoid even \cs{protected@edef} to pacify french
 %    babel (pr/4093)}
-%    \begin{macrocode}
-  \expandafter\expandafter\expandafter
-  \def\expandafter\expandafter\expandafter
-         #1\expandafter\expandafter\expandafter
-               {\expandafter\expandafter\expandafter
-                \@cdr\csname r@#2\endcsname
-                \@nil}%
+% \changes{v1.4z}{2011/07/27}{Previous fix need one more expansion
+%                            (pr/4159)}
+%    \begin{macrocode}
+  \expandafter\def\expandafter#1\expandafter{%
+  \romannumeral
+    \expandafter\expandafter\expandafter
+  \z@
+  \expandafter \@cdr
+  \romannumeral
+    \expandafter\expandafter\expandafter
+  \z@
+  \csname r@#2\endcsname\@nil}%
 }
 %    \end{macrocode}
 %  \end{macro}
diff --git a/Master/texmf-dist/tex/latex/tools/varioref.sty b/Master/texmf-dist/tex/latex/tools/varioref.sty
index 6df5db8ee63..b4a5f5ed172 100644
--- a/Master/texmf-dist/tex/latex/tools/varioref.sty
+++ b/Master/texmf-dist/tex/latex/tools/varioref.sty
@@ -32,7 +32,7 @@
 %% given in the file `manifest.txt'.
 %% 
 %% Package varioref to use with LaTeX2e
-%% Copyright (C) 1992-2010  Frank Mittelbach, all rights reserved.
+%% Copyright (C) 1992-2011  Frank Mittelbach, all rights reserved.
 %%
 %% For additions or updates to the language options please contact
 %% the author at
@@ -43,7 +43,7 @@
 %%
 \NeedsTeXFormat{LaTeX2e}[1995/05/16]
 \ProvidesPackage{varioref}
-    [2010/11/12 v1.4y package for extended references (FMi)]
+    [2011/07/27 v1.4z 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
@@ -729,12 +729,15 @@
 \def\fullref#1{\ref{#1} \reftextfaraway{#1}}
 \def\vref@pagenum#1#2{%
   \@ifundefined{r@#2}{\@namedef{r@#2}{{??}{??}}}{}%
-  \expandafter\expandafter\expandafter
-  \def\expandafter\expandafter\expandafter
-         #1\expandafter\expandafter\expandafter
-               {\expandafter\expandafter\expandafter
-                \@cdr\csname r@#2\endcsname
-                \@nil}%
+  \expandafter\def\expandafter#1\expandafter{%
+  \romannumeral
+    \expandafter\expandafter\expandafter
+  \z@
+  \expandafter \@cdr
+  \romannumeral
+    \expandafter\expandafter\expandafter
+  \z@
+  \csname r@#2\endcsname\@nil}%
 }
 \def\vrefpagenum#1#2{%
   \@ifundefined{r@#2}%