diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/hyperref/hyperref.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/hyperref/hyperref.sty | 69 |
1 files changed, 55 insertions, 14 deletions
diff --git a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty index 7fe8d898176..a4bfa670856 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty +++ b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty @@ -25,7 +25,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{hyperref} - [2009/10/09 v6.79a + [2009/11/14 v6.79e Hypertext links for LaTeX] \begingroup \@makeother\`% @@ -5882,12 +5882,19 @@ \ifHy@hyperindex \def\HyInd@ParenLeft{(}% \def\HyInd@ParenRight{)}% + \def\hyperindexformat#1#2{% + \let\HyOrg@hyperpage\hyperpage + \let\hyperpage\@firstofone + #1{\HyOrg@hyperpage{#2}}% + \let\hyperpage\HyOrg@hyperpage + }% \Hy@nextfalse \@ifpackageloaded{multind}{\Hy@nexttrue}{}% \@ifpackageloaded{index}{\Hy@nexttrue}{}% \@ifpackageloaded{amsmidx}{\Hy@nexttrue}{}% \begingroup \lccode`\|=\expandafter`\HyInd@EncapChar\relax + \lccode`\/=`\\\relax \lowercase{\endgroup \ifHy@next \let\HyInd@org@wrindex\@wrindex @@ -5896,13 +5903,28 @@ \ifx\\#3\\% \HyInd@org@wrindex{#1}{#2|hyperpage}% \else - \def\Hy@temp@A{#3}% - \ifcase0\ifx\Hy@temp@A\HyInd@ParenLeft 1\fi - \ifx\Hy@temp@A\HyInd@ParenRight 1\fi - \relax - \HyInd@org@wrindex{#1}{#2|#3}% + \HyInd@@@wrindex{#1}{#2}#3\\% + \fi + }% + \def\HyInd@@@wrindex#1#2#3#4\\{% + \def\Hy@temp@A{#3}% + \ifcase0\ifx\Hy@temp@A\HyInd@ParenLeft 1\fi + \ifx\Hy@temp@A\HyInd@ParenRight 1\fi + \relax + \HyInd@org@wrindex{#1}{% + #2|hyperindexformat{/#3#4}% + }% + \else + \ifx\\#4\\% + \ifx\Hy@temp@A\HyInd@ParenRight + \HyInd@org@wrindex{#1}{#2|#3}% + \else + \HyInd@org@wrindex{#1}{#2|#3hyperpage}% + \fi \else - \HyInd@org@wrindex{#1}{#2|#3hyperpage}% + \HyInd@org@wrindex{#1}{% + #2|#3hyperindexformat{/#4}% + }% \fi \fi }% @@ -5915,22 +5937,41 @@ \string\indexentry{#1|hyperpage}{\thepage}% }% \else - \def\Hy@temp@A{#2}% - \ifcase0\ifx\Hy@temp@A\HyInd@ParenLeft 1\fi - \ifx\Hy@temp@A\HyInd@ParenRight 1\fi - \relax + \HyInd@@@wrindex{#1}#2\\% + \fi + \fi + \endgroup + \@esphack + }% + \def\HyInd@@@wrindex#1#2#3\\{% + \def\Hy@temp@A{#2}% + \ifcase0\ifx\Hy@temp@A\HyInd@ParenLeft 1\fi + \ifx\Hy@temp@A\HyInd@ParenRight 1\fi + \relax + \protected@write\@indexfile{}{% + \string\indexentry{% + #1|hyperindexformat{/#2#3}% + }{\thepage}% + }% + \else + \ifx\\#3\\% + \ifx\Hy@temp@A\HyInd@ParenRight \protected@write\@indexfile{}{% - \string\indexentry{#1|#2}{\thepage}% + \string\indexentry{#1|#2}{\thepage}% }% \else \protected@write\@indexfile{}{% \string\indexentry{#1|#2hyperpage}{\thepage}% }% \fi + \else + \protected@write\@indexfile{}{% + \string\indexentry{% + #1|#2hyperindexformat{/#3}% + }{\thepage}% + }% \fi \fi - \endgroup - \@esphack }% \fi }% |