diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/hyperref')
19 files changed, 57 insertions, 33 deletions
diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def b/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def index bc2640618b6..e832dc82ff4 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def +++ b/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def @@ -24,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hdvipdfm.def} - [2009/11/25 v6.79h + [2009/11/26 v6.79i Hyperref driver for dvipdfm] \def\Hy@PutCatalog#1{\@pdfm@mark{docview << #1 >>}} \ifHy@pagelabels diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvips.def b/Master/texmf-dist/tex/latex/hyperref/hdvips.def index 0802c080393..34733f1b21a 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hdvips.def +++ b/Master/texmf-dist/tex/latex/hyperref/hdvips.def @@ -24,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hdvips.def} - [2009/11/25 v6.79h + [2009/11/26 v6.79i Hyperref driver for dvips] \providecommand*{\XR@ext}{pdf} \def\Hy@raisedlink{} diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvipson.def b/Master/texmf-dist/tex/latex/hyperref/hdvipson.def index 85ad2c199d2..27692ef3bc2 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hdvipson.def +++ b/Master/texmf-dist/tex/latex/hyperref/hdvipson.def @@ -24,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hdvipson.def} - [2009/11/25 v6.79h + [2009/11/26 v6.79i Hyperref driver for dvipsone] \providecommand*{\XR@ext}{pdf} \def\Hy@raisedlink{} diff --git a/Master/texmf-dist/tex/latex/hyperref/hdviwind.def b/Master/texmf-dist/tex/latex/hyperref/hdviwind.def index e17b22556f4..636c569372e 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hdviwind.def +++ b/Master/texmf-dist/tex/latex/hyperref/hdviwind.def @@ -24,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hdviwind.def} - [2009/11/25 v6.79h + [2009/11/26 v6.79i Hyperref driver for dviwindo] \begingroup \toks@\expandafter{\Hy@FirstPageHook}% diff --git a/Master/texmf-dist/tex/latex/hyperref/hpdftex.def b/Master/texmf-dist/tex/latex/hyperref/hpdftex.def index c235d89c7da..4a9abc1ee2a 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hpdftex.def +++ b/Master/texmf-dist/tex/latex/hyperref/hpdftex.def @@ -24,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hpdftex.def} - [2009/11/25 v6.79h + [2009/11/26 v6.79i Hyperref driver for pdfTeX] \let\Hy@PutCatalog\pdfcatalog \ifHy@pagelabels diff --git a/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg b/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg index 63c2125655c..491bd9e5f32 100644 --- a/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg +++ b/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg @@ -24,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{htex4ht.cfg} - [2009/11/25 v6.79h + [2009/11/26 v6.79i Hyperref configuration file for TeX4ht] \IfFileExists{\jobname.cfg}{\endinput}{} \Preamble{html} diff --git a/Master/texmf-dist/tex/latex/hyperref/htex4ht.def b/Master/texmf-dist/tex/latex/hyperref/htex4ht.def index f7035cc35f7..ec6ec2c7133 100644 --- a/Master/texmf-dist/tex/latex/hyperref/htex4ht.def +++ b/Master/texmf-dist/tex/latex/hyperref/htex4ht.def @@ -24,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{htex4ht.def} - [2009/11/25 v6.79h + [2009/11/26 v6.79i Hyperref driver for TeX4ht] \providecommand*{\XR@ext}{html} \def\Hy@raisedlink{} diff --git a/Master/texmf-dist/tex/latex/hyperref/htexture.def b/Master/texmf-dist/tex/latex/hyperref/htexture.def index 9001e59eadf..db185e2539e 100644 --- a/Master/texmf-dist/tex/latex/hyperref/htexture.def +++ b/Master/texmf-dist/tex/latex/hyperref/htexture.def @@ -24,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{htexture.def} - [2009/11/25 v6.79h + [2009/11/26 v6.79i Hyperref driver for Textures] \providecommand*{\XR@ext}{pdf} \begingroup diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtex.def b/Master/texmf-dist/tex/latex/hyperref/hvtex.def index 8fb82be85e9..f50723d56d4 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hvtex.def +++ b/Master/texmf-dist/tex/latex/hyperref/hvtex.def @@ -24,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hvtex.def} - [2009/11/25 v6.79h + [2009/11/26 v6.79i Hyperref driver for VTeX in PDF/PS mode] \providecommand*{\XR@ext}{pdf} \edef\Hy@VTeXversion{% diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def b/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def index 3baa457a712..f0d84681e16 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def +++ b/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def @@ -24,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hvtexhtml.def} - [2009/11/25 v6.79h + [2009/11/26 v6.79i Hyperref driver for VTeX in HTML mode] \providecommand*{\XR@ext}{htm} \RequirePackage{vtexhtml} diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def b/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def index e186a8f4f0f..a1d6a63c392 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def +++ b/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def @@ -24,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hvtexmrk.def} - [2009/11/25 v6.79h + [2009/11/26 v6.79i Hyperref driver for VTeX in PDF/PS mode (pdfmark specials)] \providecommand*{\XR@ext}{pdf} \def\Hy@raisedlink{} diff --git a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty index f36901c07bb..0b87e72c753 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/11/25 v6.79h + [2009/11/26 v6.79i Hypertext links for LaTeX] \begingroup \@makeother\`% @@ -3505,10 +3505,15 @@ } \def\hyperdef{\@ifnextchar[{\label@hyperdef}{\@hyperdef}} \def\@hyperdef#1#2#3{%, category, name, text + \ifx\\#1\\% + \def\Hy@AnchorName{#2}% + \else + \def\Hy@AnchorName{#1.#2}% + \fi \ifHy@nesting - \hyper@@anchor{#1.#2}{#3}% + \expandafter\hyper@@anchor\expandafter{\Hy@AnchorName}{#3}% \else - \hyper@@anchor{#1.#2}{\relax}#3% + \expandafter\hyper@@anchor\expandafter{\Hy@AnchorName}{\relax}#3% \fi } \def\label@hyperref[#1]{% @@ -3529,15 +3534,21 @@ \def\label@hyperdef[#1]#2#3#4{% label name, category, name, % anchor text \@bsphack + \ifx\\#2\\% + \def\Hy@AnchorName{#3}% + \else + \def\Hy@AnchorName{#2.#3}% + \fi \if@filesw - \protected@write\@auxout{}% - {\string\newlabel{#1}{{}{}{}\##2.#3}}% + \protected@write\@auxout{}{% + \string\newlabel{#1}{{}{}{}{\Hy@AnchorName}{}}% + }% \fi \@esphack \ifHy@nesting - \hyper@@anchor{#2.#3}{#4}% + \expandafter\hyper@@anchor\expandafter{\Hy@AnchorName}{#4}% \else - \hyper@@anchor{#2.#3}{\relax}#4% + \expandafter\hyper@@anchor\expandafter{\Hy@AnchorName}{\relax}#4% \fi } \def\hyper@@link{\let\Hy@reserved@a\relax @@ -4489,6 +4500,16 @@ \ifHy@texht\else\hyper@anchorstart{Doc-Start}\hyper@anchorend\fi \Hy@pdfstringfalse } + +\let\NoHy@OrgRef\ref +\def\ref{% + \@ifstar\NoHy@OrgRef\NoHy@OrgRef +} +\let\NoHy@OrgPageRef\pageref +\def\pageref{% + \@ifstar\NoHy@OrgPageRef\NoHy@OrgPageRef +} + \def\NoHyper{% \def\hyper@link@[##1]##2##3##4{##4}% \def\hyper@@anchor##1{}% @@ -5280,10 +5301,10 @@ \long\def\@mpfootnotetext#1{% \H@@mpfootnotetext{% \ifHy@nesting - \hyper@@anchor{\Hy@footnote@currentHref}{#1}% + \expandafter\hyper@@anchor\expandafter{\Hy@footnote@currentHref}{#1}% \else \Hy@raisedlink{% - \hyper@@anchor{\Hy@footnote@currentHref}{\relax}% + \expandafter\hyper@@anchor\expandafter{\Hy@footnote@currentHref}{\relax}% }#1% \fi }% @@ -5291,10 +5312,10 @@ \long\def\@footnotetext#1{% \H@@footnotetext{% \ifHy@nesting - \hyper@@anchor{\Hy@footnote@currentHref}{#1}% + \expandafter\hyper@@anchor\expandafter{\Hy@footnote@currentHref}{#1}% \else \Hy@raisedlink{% - \hyper@@anchor{\Hy@footnote@currentHref}{\relax}% + \expandafter\hyper@@anchor\expandafter{\Hy@footnote@currentHref}{\relax}% }% \let\@currentHlabel\Hy@footnote@currentHlabel \let\@currentHref\Hy@footnote@currentHref @@ -5382,7 +5403,7 @@ \bgroup \aftergroup\V@@@footnotetext \Hy@raisedlink{% - \hyper@@anchor{\Hy@footnote@currentHref}{\relax}% + \expandafter\hyper@@anchor\expandafter{\Hy@footnote@currentHref}{\relax}% }% \let\@currentHlabel\Hy@footnote@currentHlabel \let\@currentHref\Hy@footnote@currentHref @@ -5465,9 +5486,12 @@ \@makecaption{\csname fnum@#1\endcsname}{% \ignorespaces \ifHy@nesting - \hyper@@anchor{\@currentHref}{#3}% + \expandafter\hyper@@anchor\expandafter{\@currentHref}{#3}% \else - \Hy@raisedlink{\hyper@@anchor{\@currentHref}{\relax}}#3% + \Hy@raisedlink{% + \expandafter\hyper@@anchor\expandafter{\@currentHref}{\relax}% + }% + #3% \fi }% \fi @@ -5491,7 +5515,7 @@ #1\relax \ifx\Hy@float@currentHref\@undefined \else - \hyper@@anchor{\Hy@float@currentHref}{\relax}% + \expandafter\hyper@@anchor\expandafter{\Hy@float@currentHref}{\relax}% \global\let\Hy@float@currentHref\@undefined \fi }% diff --git a/Master/texmf-dist/tex/latex/hyperref/hypertex.def b/Master/texmf-dist/tex/latex/hyperref/hypertex.def index 3dbf4e86bf2..b497b103bc9 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hypertex.def +++ b/Master/texmf-dist/tex/latex/hyperref/hypertex.def @@ -24,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hypertex.def} - [2009/11/25 v6.79h + [2009/11/26 v6.79i Hyperref driver for HyperTeX specials] \providecommand*{\XR@ext}{dvi} \def\PDF@FinishDoc{} diff --git a/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty b/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty index 03d19adb9ad..c529db32ffe 100644 --- a/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty +++ b/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty @@ -25,7 +25,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{nohyperref} - [2009/11/25 v6.79h + [2009/11/26 v6.79i Dummy hyperref (SR)] \let\hyper@@anchor\@gobble \def\hyper@link#1#2#3{#3}% diff --git a/Master/texmf-dist/tex/latex/hyperref/pd1enc.def b/Master/texmf-dist/tex/latex/hyperref/pd1enc.def index 47ff37b0618..7d93fdccc73 100644 --- a/Master/texmf-dist/tex/latex/hyperref/pd1enc.def +++ b/Master/texmf-dist/tex/latex/hyperref/pd1enc.def @@ -24,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{pd1enc.def} - [2009/11/25 v6.79h + [2009/11/26 v6.79i Hyperref: PDFDocEncoding definition (HO)] \DeclareFontEncoding{PD1}{}{} \DeclareTextAccent{\`}{PD1}{\textasciigrave} diff --git a/Master/texmf-dist/tex/latex/hyperref/pdfmark.def b/Master/texmf-dist/tex/latex/hyperref/pdfmark.def index 690dee0cb62..486eabcdf23 100644 --- a/Master/texmf-dist/tex/latex/hyperref/pdfmark.def +++ b/Master/texmf-dist/tex/latex/hyperref/pdfmark.def @@ -24,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{pdfmark.def} - [2009/11/25 v6.79h + [2009/11/26 v6.79i Hyperref definitions for pdfmark specials] \begingroup \toks@\expandafter{\Hy@FirstPageHook}% diff --git a/Master/texmf-dist/tex/latex/hyperref/puarenc.def b/Master/texmf-dist/tex/latex/hyperref/puarenc.def index d7e216daf0a..0b0e2de5cc9 100644 --- a/Master/texmf-dist/tex/latex/hyperref/puarenc.def +++ b/Master/texmf-dist/tex/latex/hyperref/puarenc.def @@ -24,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{puarenc.def} - [2009/11/25 v6.79h + [2009/11/26 v6.79i Hyperref: Additions to puenc.def for Arabi] \DeclareTextCommand{\hamza}{PU}{\86\041}% 0621;afii57409;ARABIC LETTER HAMZA \DeclareTextCommand{\alefmadda}{PU}{\86\042}% 0622;afii57410;ARABIC LETTER ALEF WITH MADDA ABOVE diff --git a/Master/texmf-dist/tex/latex/hyperref/puenc.def b/Master/texmf-dist/tex/latex/hyperref/puenc.def index eb8fd4adfa8..39b7e5dcb06 100644 --- a/Master/texmf-dist/tex/latex/hyperref/puenc.def +++ b/Master/texmf-dist/tex/latex/hyperref/puenc.def @@ -24,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{puenc.def} - [2009/11/25 v6.79h + [2009/11/26 v6.79i Hyperref: PDF Unicode definition (HO)] \DeclareFontEncoding{PU}{}{} \DeclareTextCommand{\`}{PU}[1]{#1\83\000}% U+0300 diff --git a/Master/texmf-dist/tex/latex/hyperref/puvnenc.def b/Master/texmf-dist/tex/latex/hyperref/puvnenc.def index 45015920f0a..607b73b62d0 100644 --- a/Master/texmf-dist/tex/latex/hyperref/puvnenc.def +++ b/Master/texmf-dist/tex/latex/hyperref/puvnenc.def @@ -24,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{puvnenc.def} - [2009/11/25 v6.79h + [2009/11/26 v6.79i Hyperref: Additions to puenc.def for VnTeX] \DeclareTextCommand{\abreve}{PU}{\81\003} \DeclareTextCommand{\acircumflex}{PU}{\80\342} |