From 488d5ec6dc4b2890e252f2a885acf032fda277b9 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 29 Nov 2009 00:29:08 +0000 Subject: hyperref update (28nov09) git-svn-id: svn://tug.org/texlive/trunk@16230 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/source/latex/hyperref/hyperref.dtx | 50 ++++++++++------------ .../texmf-dist/source/latex/hyperref/nameref.dtx | 45 +++++++++++++------ 2 files changed, 55 insertions(+), 40 deletions(-) (limited to 'Master/texmf-dist/source/latex/hyperref') diff --git a/Master/texmf-dist/source/latex/hyperref/hyperref.dtx b/Master/texmf-dist/source/latex/hyperref/hyperref.dtx index 5274277e038..9b27b632bef 100644 --- a/Master/texmf-dist/source/latex/hyperref/hyperref.dtx +++ b/Master/texmf-dist/source/latex/hyperref/hyperref.dtx @@ -38,7 +38,7 @@ %\ProvidesFile{puenc.def} %\ProvidesFile{puvnenc.def} %\ProvidesFile{puarenc.def} -% [2009/11/26 v6.79i +% [2009/11/27 v6.79k % Hypertext links for LaTeX] % Dummy hyperref (SR)] % Hyperref documentation driver file] @@ -115,7 +115,7 @@ \end{document} % % \fi -% \CheckSum{24995} +% \CheckSum{24997} % % \MakeShortVerb{|} % \StopEventually{} @@ -7361,9 +7361,7 @@ \def\pageref{% \@ifstar\NoHy@OrgPageRef\NoHy@OrgPageRef } - - - +% \end{macrocode} % % \section{Localized nullifying of package} % Sometimes we just don't want the wretched package interfering @@ -16746,21 +16744,28 @@ %<*outlines|hypertex> % \end{macrocode} % \begin{macrocode} +\newlength\Hy@SectionHShift +\def\Hy@SectionAnchor{% + \ifx\protect\@typeset@protect + \Hy@@SectionAnchor + \fi +} +\DeclareRobustCommand*{\Hy@@SectionAnchor}{% + \leavevmode + \hbox to 0pt{% + \kern-\Hy@SectionHShift + \Hy@raisedlink{% + \hyper@anchorstart{\@currentHref}\hyper@anchorend + }% + \hss + }% +} \let\H@old@ssect\@ssect \def\@ssect#1#2#3#4#5{% \Hy@GlobalStepCount\Hy@linkcounter \xdef\@currentHref{section*.\the\Hy@linkcounter}% - \H@old@ssect{#1}{#2}{#3}{#4}{% - \leavevmode - \hbox to 0pt{% - \dimen@=#1\relax\kern-\dimen@ - \Hy@raisedlink{% - \hyper@anchorstart{\@currentHref}\hyper@anchorend - }% - \hss - }% - #5% - }% + \setlength{\Hy@SectionHShift}{#1}% + \H@old@ssect{#1}{#2}{#3}{#4}{\Hy@SectionAnchor#5}% } \let\H@old@schapter\@schapter \def\@schapter#1{% @@ -16836,17 +16841,8 @@ {% \Hy@GlobalStepCount\Hy@linkcounter \xdef\@currentHref{section*.\the\Hy@linkcounter}% - \H@old@sect{#1}{#2}{#3}{#4}{#5}{#6}[{#7}]{% - \leavevmode - \hbox to 0pt{% - \dimen@=#3\relax\kern-\dimen@ - \Hy@raisedlink{% - \hyper@anchorstart{\@currentHref}\hyper@anchorend - }% - \hss - }% - #8% - }% + \setlength{\Hy@SectionHShift}{#3}% + \H@old@sect{#1}{#2}{#3}{#4}{#5}{#6}[{#7}]{\Hy@SectionAnchor#8}% }{% \H@old@sect{#1}{#2}{#3}{#4}{#5}{#6}[{#7}]{#8}% }% diff --git a/Master/texmf-dist/source/latex/hyperref/nameref.dtx b/Master/texmf-dist/source/latex/hyperref/nameref.dtx index 9ec895bada4..5465afdeb98 100644 --- a/Master/texmf-dist/source/latex/hyperref/nameref.dtx +++ b/Master/texmf-dist/source/latex/hyperref/nameref.dtx @@ -1,7 +1,7 @@ % \iffalse % File: nameref.dtx % Copyright (C) 1995-9 Sebastian Rahtz -% 2000-7 Sebastian Rahtz, Heiko Oberdiek +% 2000-9 Sebastian Rahtz, Heiko Oberdiek % %% This file is part of the `Hyperref Bundle'. %% ------------------------------------------- @@ -24,9 +24,9 @@ %\ProvidesFile{nameref.drv} % \fi % \ProvidesFile{nameref.dtx} - [2007/05/29 v2.31 Cross-referencing by name of section]% + [2009/11/27 v2.32 Cross-referencing by name of section]% % -% \CheckSum{576} +% \CheckSum{602} % % \iffalse %<*driver> @@ -210,7 +210,26 @@ % % If a section heading or the like has a |\label| in it, % we need to extract it, or subsequent processing breaks. -% This is done by the label-writing routine. +% +% \begin{macrocode} +\def\NR@gettitle#1{% + \def\@currentlabelname{#1}% + \begingroup + \let\label\@gobble + \let\index\@gobble + \let\glossary\@gobble + \let\markboth\@gobbletwo + \let\@mkboth\@gobbletwo + \let\markright\@gobble + \let\protect\@unexpandable@protect + \edef\x{\endgroup + \noexpand\def\noexpand\@currentlabelname{% + \@currentlabelname + }% + }% + \x +} +% \end{macrocode} % % First the numbered sections. While we are about it, put in % a useful section formatting macro. @@ -219,7 +238,7 @@ \newcounter{section@level} \def\@sect#1#2#3#4#5#6[#7]#8{% \setcounter{section@level}{#2}% - \def\@currentlabelname{#7}% + \NR@gettitle{#7}% \NR@sect{#1}{#2}{#3}{#4}{#5}{#6}[{#7}]{\Sectionformat{#8}{#2}}% } % \end{macrocode} @@ -227,7 +246,7 @@ % \begin{macrocode} \let\NR@ssect\@ssect \def\@ssect#1#2#3#4#5{% - \def\@currentlabelname{#5}% + \NR@gettitle{#5}% \NR@ssect{#1}{#2}{#3}{#4}{\Sectionformat{#5}{#1}}% } % \end{macrocode} @@ -237,17 +256,17 @@ % \begin{macrocode} \let\NR@part\@part \def\@part[#1]#2{% - \def\@currentlabelname{#1}% + \NR@gettitle{#1}% \NR@part[{#1}]{#2}% } \let\NR@chapter\@chapter \def\@chapter[#1]#2{% - \def\@currentlabelname{#1}% + \NR@gettitle{#1}% \NR@chapter[{#1}]{#2}% } \let\NR@schapter\@schapter \def\@schapter#1{% - \def\@currentlabelname{#1}% + \NR@gettitle{#1}% \NR@schapter{#1}% } % \end{macrocode} @@ -257,7 +276,7 @@ % \begin{macrocode} \let\NR@@caption\@caption \long\def\@caption#1[#2]{% - \def\@currentlabelname{#2}% + \NR@gettitle{#2}% \NR@@caption{#1}[{#2}]% } % \end{macrocode} @@ -271,7 +290,7 @@ \def\@tempa{#2}% \ifx\@tempa\@empty \else - \def\@currentlabelname{#2}% + \NR@gettitle{#2}% \fi }% }{}% @@ -284,7 +303,7 @@ \@ifpackageloaded{titlesec}{% \let\NRorg@ttl@sect@i\ttl@sect@i \def\ttl@sect@i#1#2[#3]#4{% - \def\@currentlabelname{#4}% + \NR@gettitle{#4}% \NRorg@ttl@sect@i{#1}{#2}[{#3}]{#4}% }% }{}% @@ -302,7 +321,7 @@ \edef\x{\endgroup \long\def\expandafter\noexpand\csname beamer@#1\endcsname [####1]{% hash-ok - \def\noexpand\@currentlabelname{####1}% + \noexpand\NR@gettitle{####1}% \expandafter\noexpand\csname NRorg@beamer@#1\endcsname [{####1}]% }% -- cgit v1.2.3