From 76e439039464d8b132be4800bb4d1d0d2ccddcc0 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 29 Dec 2006 00:56:13 +0000 Subject: hyperref update (28dec06) git-svn-id: svn://tug.org/texlive/trunk@3002 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/hyperref/ChangeLog | 4 ++++ Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf | Bin 266770 -> 266304 bytes Master/texmf-dist/doc/latex/hyperref/hyperref.pdf | Bin 2919005 -> 2919426 bytes .../texmf-dist/source/latex/hyperref/nameref.dtx | 23 +++++++++------------ Master/texmf-dist/tex/latex/hyperref/nameref.sty | 21 ++++++++----------- Master/texmf-dist/tpm/hyperref.tpm | 8 +++---- 6 files changed, 27 insertions(+), 29 deletions(-) diff --git a/Master/texmf-dist/doc/latex/hyperref/ChangeLog b/Master/texmf-dist/doc/latex/hyperref/ChangeLog index 291c2d52784..6d2712696f0 100644 --- a/Master/texmf-dist/doc/latex/hyperref/ChangeLog +++ b/Master/texmf-dist/doc/latex/hyperref/ChangeLog @@ -1,3 +1,7 @@ +2006-12-27 Heiko Oberdiek + * nameref 2.28: \protected@edef isn't robust enough for removing + \label in name strings. Now \label is disabled during referencing. + 2006-12-21 6.75j Heiko Oberdiek * 6.75j * Fix for bug in \Hy@safe@actives..., introduced in 6.75g. diff --git a/Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf b/Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf index df2f75e7280..a5ae7176425 100644 Binary files a/Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf and b/Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf differ diff --git a/Master/texmf-dist/doc/latex/hyperref/hyperref.pdf b/Master/texmf-dist/doc/latex/hyperref/hyperref.pdf index f13354853ed..08cf5285348 100644 Binary files a/Master/texmf-dist/doc/latex/hyperref/hyperref.pdf and b/Master/texmf-dist/doc/latex/hyperref/hyperref.pdf differ diff --git a/Master/texmf-dist/source/latex/hyperref/nameref.dtx b/Master/texmf-dist/source/latex/hyperref/nameref.dtx index 212de866f7f..bb61b32ee3b 100644 --- a/Master/texmf-dist/source/latex/hyperref/nameref.dtx +++ b/Master/texmf-dist/source/latex/hyperref/nameref.dtx @@ -24,9 +24,9 @@ %\ProvidesFile{nameref.drv} % \fi % \ProvidesFile{nameref.dtx} - [2006/12/21 v2.27 Cross-referencing by name of section] + [2006/12/27 v2.28 Cross-referencing by name of section] % -% \CheckSum{493} +% \CheckSum{473} % % \iffalse %<*driver> @@ -116,9 +116,6 @@ \def\label#1{% \@bsphack \begingroup - \let\label\@gobble - \def\ref{\protect\ref}% - \protected@edef\@currentlabelname{\@currentlabelname}% \@onelevel@sanitize\@currentlabelname \edef\@currentlabelname{% \expandafter\strip@period\@currentlabelname\relax.\relax\@@@% @@ -139,9 +136,6 @@ \@bsphack \SK@\SK@@label{#1}% \begingroup - \let\label\@gobble - \def\ref{\protect\ref}% - \protected@edef\@currentlabelname{\@currentlabelname}% \@onelevel@sanitize\@currentlabelname \edef\@currentlabelname{% \expandafter\strip@period\@currentlabelname\relax.\relax\@@@% @@ -169,9 +163,6 @@ \@bsphack \if@filesw {% - \let\label\@gobble - \def\ref{\protect\ref}% - \protected@edef\@currentlabelname{\@currentlabelname}% \@onelevel@sanitize\@currentlabelname \edef\@currentlabelname{% \expandafter\strip@period\@currentlabelname\relax.\relax\@@@% @@ -363,7 +354,10 @@ % Access the (third) name part with |\nameref|; % \begin{macrocode} \def\T@nameref#1{% - \NR@setref{#1}\@thirdoffive{#1}% + \begingroup + \let\label\@gobble + \NR@setref{#1}\@thirdoffive{#1}% + \endgroup }% \ifNR@showkeys \ifx\SK@ref\@empty @@ -372,7 +366,10 @@ \@safe@activestrue \SK@\SK@@ref{#1}% \@safe@activesfalse - \NR@setref{#1}\@thirdoffive{#1}% + \begingroup + \let\label\@gobble + \NR@setref{#1}\@thirdoffive{#1}% + \endgroup }% \fi \fi diff --git a/Master/texmf-dist/tex/latex/hyperref/nameref.sty b/Master/texmf-dist/tex/latex/hyperref/nameref.sty index 1ecb26f04f8..d878781e7fe 100644 --- a/Master/texmf-dist/tex/latex/hyperref/nameref.sty +++ b/Master/texmf-dist/tex/latex/hyperref/nameref.sty @@ -20,7 +20,7 @@ %% given in the file `manifest.txt'. \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{nameref} - [2006/12/21 v2.27 Cross-referencing by name of section] + [2006/12/27 v2.28 Cross-referencing by name of section] \RequirePackage{refcount}[2006/02/12] \def\strip@period#1.\relax#2\@@@{#1} \newif\ifNR@showkeys @@ -36,9 +36,6 @@ \def\label#1{% \@bsphack \begingroup - \let\label\@gobble - \def\ref{\protect\ref}% - \protected@edef\@currentlabelname{\@currentlabelname}% \@onelevel@sanitize\@currentlabelname \edef\@currentlabelname{% \expandafter\strip@period\@currentlabelname\relax.\relax\@@@% @@ -59,9 +56,6 @@ \@bsphack \SK@\SK@@label{#1}% \begingroup - \let\label\@gobble - \def\ref{\protect\ref}% - \protected@edef\@currentlabelname{\@currentlabelname}% \@onelevel@sanitize\@currentlabelname \edef\@currentlabelname{% \expandafter\strip@period\@currentlabelname\relax.\relax\@@@% @@ -84,9 +78,6 @@ \@bsphack \if@filesw {% - \let\label\@gobble - \def\ref{\protect\ref}% - \protected@edef\@currentlabelname{\@currentlabelname}% \@onelevel@sanitize\@currentlabelname \edef\@currentlabelname{% \expandafter\strip@period\@currentlabelname\relax.\relax\@@@% @@ -213,7 +204,10 @@ \DeclareRobustCommand{\pageref}{\T@pageref}% } \def\T@nameref#1{% - \NR@setref{#1}\@thirdoffive{#1}% + \begingroup + \let\label\@gobble + \NR@setref{#1}\@thirdoffive{#1}% + \endgroup }% \ifNR@showkeys \ifx\SK@ref\@empty @@ -222,7 +216,10 @@ \@safe@activestrue \SK@\SK@@ref{#1}% \@safe@activesfalse - \NR@setref{#1}\@thirdoffive{#1}% + \begingroup + \let\label\@gobble + \NR@setref{#1}\@thirdoffive{#1}% + \endgroup }% \fi \fi diff --git a/Master/texmf-dist/tpm/hyperref.tpm b/Master/texmf-dist/tpm/hyperref.tpm index bfe710781c3..a4da9c71ae3 100644 --- a/Master/texmf-dist/tpm/hyperref.tpm +++ b/Master/texmf-dist/tpm/hyperref.tpm @@ -3,7 +3,7 @@ hyperref Package - 2006/12/21 19:59:59 + 2006/12/27 08:28:53 rahtz Extensive support for hypertext in LaTeX. @@ -24,7 +24,7 @@ backends. 5983008 - + texmf-dist/tex/latex/hyperref/backref.sty texmf-dist/tex/latex/hyperref/hdvipdfm.def texmf-dist/tex/latex/hyperref/hdvips.def @@ -51,7 +51,7 @@ texmf-dist/tex/latex/hyperref/puvnenc.def texmf-dist/tex/latex/hyperref/xr-hyper.sty texmf-dist/tpm/hyperref.tpm - + texmf-dist/doc/latex/hyperref/ChangeLog texmf-dist/doc/latex/hyperref/ChangeLog.pdf texmf-dist/doc/latex/hyperref/README @@ -68,7 +68,7 @@ texmf-dist/doc/latex/hyperref/options.pdf texmf-dist/doc/latex/hyperref/paper.pdf texmf-dist/doc/latex/hyperref/slides.pdf - + texmf-dist/source/latex/hyperref/backref.dtx texmf-dist/source/latex/hyperref/bmhydoc.sty texmf-dist/source/latex/hyperref/doc/fdl.tex -- cgit v1.2.3