summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/tools/varioref.dtx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-08-12 00:23:14 +0000
committerKarl Berry <karl@freefriends.org>2011-08-12 00:23:14 +0000
commitfe1d1302556e0520cfc543b149bb0b27b06cb2de (patch)
tree315cea97f67b340ad6dea168ea439a6a2768ceb7 /Master/texmf-dist/source/latex/tools/varioref.dtx
parent4ef16cc33e3975ee384eb75c8c120d53c402ff3a (diff)
tools update for varioref (11aug11)
git-svn-id: svn://tug.org/texlive/trunk@23504 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/tools/varioref.dtx')
-rw-r--r--Master/texmf-dist/source/latex/tools/varioref.dtx41
1 files changed, 24 insertions, 17 deletions
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}