tools (8oct11)

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

1 files changed, 10 insertions, 14 deletions

diff --git a/Master/texmf-dist/source/latex/tools/varioref.dtx b/Master/texmf-dist/source/latex/tools/varioref.dtx
index 8459888071a..3cf17801dc7 100644
--- a/Master/texmf-dist/source/latex/tools/varioref.dtx
+++ b/Master/texmf-dist/source/latex/tools/varioref.dtx
@@ -33,10 +33,10 @@
 %
 %<package>\NeedsTeXFormat{LaTeX2e}[1995/05/16]
 %<package>\ProvidesPackage{varioref}
-%<package>    [2011/07/27 v1.4z package for extended references (FMi)]
+%<package>    [2011/10/02 v1.4z package for extended references (FMi)]
 % \fi
 %
-% \CheckSum{2172}
+% \CheckSum{2164}
 %% \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
@@ -1923,18 +1923,14 @@
 %              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)}
-% \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}%
+% \changes{v1.4z}{2011/10/02}{Previous fix need one more expansion
+%                            (pr/4159,pr/4171)}
+%    \begin{macrocode}
+  \expandafter\expandafter\expandafter\vref@@pagenum
+  \csname r@#2\endcsname{}{}\@nil#1%
+}
+\def\vref@@pagenum#1#2#3\@nil#4{%
+  \def#4{#2}%
 }
 %    \end{macrocode}
 %  \end{macro}