summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-03-31 00:11:07 +0000
committerKarl Berry <karl@freefriends.org>2010-03-31 00:11:07 +0000
commitac3fb1ee6dfc31e6b82bf85c87aac0b88c5c49ac (patch)
tree35b8a5e362306cdf4de49da379506e403bf53a07 /Master
parentfb391569a88e85e8d3d220e2d61b15c6f1b9f764 (diff)
hyperref update (30mar10)
git-svn-id: svn://tug.org/texlive/trunk@17636 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/hyperref/ChangeLog21
-rw-r--r--Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdfbin339662 -> 341088 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hyperref/backref.pdf4
-rw-r--r--Master/texmf-dist/doc/latex/hyperref/hyperref.pdfbin4071002 -> 4095690 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hyperref/nameref.pdf6
-rw-r--r--Master/texmf-dist/source/latex/hyperref/hyperref.dtx413
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def89
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/hdvips.def2
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/hdvipson.def2
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/hdviwind.def4
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/hpdftex.def93
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg2
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/htex4ht.def2
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/htexture.def6
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/hvtex.def79
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def2
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def2
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/hxetex.def99
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/hyperref.sty240
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/hypertex.def20
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/nohyperref.sty2
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/pd1enc.def2
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/pdfmark.def87
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/puarenc.def2
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/puenc.def2
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/puvnenc.def2
26 files changed, 840 insertions, 343 deletions
diff --git a/Master/texmf-dist/doc/latex/hyperref/ChangeLog b/Master/texmf-dist/doc/latex/hyperref/ChangeLog
index c6e88e6de58..ec304b7313c 100644
--- a/Master/texmf-dist/doc/latex/hyperref/ChangeLog
+++ b/Master/texmf-dist/doc/latex/hyperref/ChangeLog
@@ -1,3 +1,24 @@
+2010-03-30 6.80u Heiko Oberdiek
+ * 6.80u
+ * \pdfstringdef: Fix for unexpandable shorthand `"-'
+ of `russianb.ldf'. (Bug found by Uladzimir Pylinski.)
+
+2010-03-29 6.80t Heiko Oberdiek
+ * 6.80t
+ * Support for package `amsthm' fixed.
+ (Bug found by Dana Lahat.)
+
+2010-03-28 6.80s Heiko Oberdiek
+ * 6.80s
+ * \@currentHlabel is no longer used.
+ * \HyperGlobalCurrentHref and \HyperLocalCurrentHref added.
+ (Not yet supported in footnotes.)
+ * Fix in bookmarks/.out file: some special characters protected.
+ * \href: detection of file links fixed if the file base name
+ contains dots (bug found by Uladzimir Pylinski).
+ * Some changes to allow `hyperref' to be loaded via
+ \AtBeginDocument (experimental).
+
2010-03-19 6.80r Heiko Oberdiek
* 6.80r
* Experimental boolean option `localanchorname' added.
diff --git a/Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf b/Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf
index 07c21a42ff4..d6d4ea1a27f 100644
--- a/Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf
+++ b/Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hyperref/backref.pdf b/Master/texmf-dist/doc/latex/hyperref/backref.pdf
index 05c93833f72..5f863596576 100644
--- a/Master/texmf-dist/doc/latex/hyperref/backref.pdf
+++ b/Master/texmf-dist/doc/latex/hyperref/backref.pdf
@@ -10,7 +10,7 @@ endobj
endobj
5 0 obj<</D[13 0 R/FitBH 752.95145]/S/GoTo>>
endobj
-6 0 obj<</ModDate(D:20100318232750+01'00')/Subject(Bibliographical back referencing)/Creator(LaTeX with hyperref package)/Author(David Carlisle and Sebastian Rahtz)/Trapped/False/Producer(pdfTeX-1.40.10)/CreationDate(D:20100318232750+01'00')/PTEX.Fullbanner(This is pdfTeX, Version 3.1415926-1.40.10-2.2 (TeX Live 2009) kpathsea version 5.0.0)/Title(Back referencing from bibliographical citations)>>
+6 0 obj<</ModDate(D:20100330180501+02'00')/Subject(Bibliographical back referencing)/Creator(LaTeX with hyperref package)/Author(David Carlisle and Sebastian Rahtz)/Trapped/False/Producer(pdfTeX-1.40.10)/CreationDate(D:20100330180501+02'00')/PTEX.Fullbanner(This is pdfTeX, Version 3.1415926-1.40.10-2.2 (TeX Live 2009) kpathsea version 5.0.0)/Title(Back referencing from bibliographical citations)>>
endobj
7 0 obj<</Type/Pages/Kids[13 0 R 14 0 R 15 0 R 16 0 R 17 0 R 18 0 R]/Parent 2 0 R/Count 6>>
endobj
@@ -5384,7 +5384,7 @@ xref
0000385083 00000 n
0000385122 00000 n
trailer
-<</Root 1 0 R/ID[(,3 _p=c7)(FK"w@ݖ)]/Compress<</SpecO/1.4/LengthO 435517>>/Info 6 0 R/Size 1478>>
+<</Root 1 0 R/ID[(|\r+.LZ)(T^' B)]/Compress<</SpecO/1.4/LengthO 435517>>/Info 6 0 R/Size 1478>>
startxref
385161
%%EOF
diff --git a/Master/texmf-dist/doc/latex/hyperref/hyperref.pdf b/Master/texmf-dist/doc/latex/hyperref/hyperref.pdf
index 300d394a414..67732fa8ab0 100644
--- a/Master/texmf-dist/doc/latex/hyperref/hyperref.pdf
+++ b/Master/texmf-dist/doc/latex/hyperref/hyperref.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hyperref/nameref.pdf b/Master/texmf-dist/doc/latex/hyperref/nameref.pdf
index fa39e1c3dd9..d66fea225d3 100644
--- a/Master/texmf-dist/doc/latex/hyperref/nameref.pdf
+++ b/Master/texmf-dist/doc/latex/hyperref/nameref.pdf
@@ -10,7 +10,7 @@ endobj
endobj
5 0 obj<</D[12 0 R/FitBH 752.95145]/S/GoTo>>
endobj
-6 0 obj<</ModDate(D:20100318232805+01'00')/Subject(Cross-referencing by name of section)/Creator(LaTeX with hyperref package)/Author(Sebastian Rahtz)/Trapped/False/Producer(pdfTeX-1.40.10)/CreationDate(D:20100318232805+01'00')/PTEX.Fullbanner(This is pdfTeX, Version 3.1415926-1.40.10-2.2 (TeX Live 2009) kpathsea version 5.0.0)/Title(Section name references in LaTeX)>>
+6 0 obj<</ModDate(D:20100330180507+02'00')/Subject(Cross-referencing by name of section)/Creator(LaTeX with hyperref package)/Author(Sebastian Rahtz)/Trapped/False/Producer(pdfTeX-1.40.10)/CreationDate(D:20100330180507+02'00')/PTEX.Fullbanner(This is pdfTeX, Version 3.1415926-1.40.10-2.2 (TeX Live 2009) kpathsea version 5.0.0)/Title(Section name references in LaTeX)>>
endobj
7 0 obj<</Type/Pages/Kids[12 0 R 13 0 R 14 0 R 15 0 R 16 0 R 17 0 R]/Parent 2 0 R/Count 6>>
endobj
@@ -4539,9 +4539,7 @@ xref
0000348616 00000 n
0000348655 00000 n
trailer
-<</Root 1 0 R/ID[(?g
-DQ
-|8)(]II,s)]/Compress<</SpecO/1.4/LengthO 388932>>/Info 6 0 R/Size 1202>>
+<</Root 1 0 R/ID[(`^P=Í!?G )(6$9o;)]/Compress<</SpecO/1.4/LengthO 388932>>/Info 6 0 R/Size 1202>>
startxref
348694
%%EOF
diff --git a/Master/texmf-dist/source/latex/hyperref/hyperref.dtx b/Master/texmf-dist/source/latex/hyperref/hyperref.dtx
index 3142fccba5e..4d442b0954e 100644
--- a/Master/texmf-dist/source/latex/hyperref/hyperref.dtx
+++ b/Master/texmf-dist/source/latex/hyperref/hyperref.dtx
@@ -44,7 +44,7 @@
%<puenc>\ProvidesFile{puenc.def}
%<puvnenc>\ProvidesFile{puvnenc.def}
%<puarenc>\ProvidesFile{puarenc.def}
-%<!none> [2010/03/19 v6.80r
+%<!none> [2010/03/30 v6.80u
%<package> Hypertext links for LaTeX]
%<nohyperref> Dummy hyperref (SR)]
%<driver> Hyperref documentation driver file]
@@ -126,7 +126,7 @@
\end{document}
%</driver>
% \fi
-% \CheckSum{26810}
+% \CheckSum{26960}
%
% \MakeShortVerb{|}
% \StopEventually{}
@@ -598,6 +598,48 @@
}{}%
% \end{macrocode}
% \end{macro}
+% \begin{macro}{\Hy@AtBeginDocument}
+% For the case that package `hyperref' is loaded
+% using \cs{AtBeginDocument}, we have to wrap the calls
+% of \cs{AtBeginDocument}/\cs{AfterBeginDocument} in
+% \cs{AtEndOfPackage}. However, packages must be
+% loaded in \cs{AtEndOfPackage} \emph{before} package
+% `kvoptions' has to perform its option cleanup.
+% Therefore we use a hook.
+% \begin{macrocode}
+\def\Hy@AtBeginDocument{%
+ \ltx@LocalAppendToMacro\Hy@AtBeginDocumentHook
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\Hy@AtEndOfPackage}
+% \begin{macrocode}
+\def\Hy@AtEndOfPackage{%
+ \ltx@LocalAppendToMacro\Hy@AtEndOfPackageHook
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\Hy@AtBeginDocumentHook}
+% \begin{macrocode}
+\def\Hy@AtBeginDocumentHook{}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\Hy@AtEndOfPackageHook}
+% \begin{macrocode}
+\def\Hy@AtEndOfPackageHook{}
+% \end{macrocode}
+% \end{macro}
+% Install the hook, before package `kvoptions' is loaded.
+% \begin{macrocode}
+\AtEndOfPackage{%
+ \Hy@AtEndOfPackageHook
+ \let\Hy@AtEndOfPackageHook\@undefined
+ \AfterBeginDocument{%
+ \Hy@AtBeginDocumentHook{}%
+ \let\Hy@AtBeginDocumentHook\@undefined
+ }%
+}
+% \end{macrocode}
%
% \subsection{Switches}
% \begin{macrocode}
@@ -1116,6 +1158,7 @@
}%
\HyPsd@GreekPatch
\HyPsd@SpanishPatch
+ \HyPsd@RussianPatch
% \end{macrocode}
% \begin{macrocode}
\HyPsd@BabelPatch
@@ -1776,7 +1819,7 @@
\let\c\HyLinguex@OrgC
\let\d\HyLinguex@OrgD
}%
- \AtEndOfPackage{%
+ \Hy@AtEndOfPackage{%
\pdfstringdefDisableCommands{%
\ltx@IfUndefined{oldb}{}{\let\b\oldb}%
\ltx@IfUndefined{oldc}{}{\let\c\oldc}%
@@ -2021,7 +2064,7 @@
}{}%
}
\Hy@temp
-\expandafter\AtBeginDocument\expandafter{\Hy@temp}
+\expandafter\Hy@AtBeginDocument\expandafter{\Hy@temp}
% \end{macrocode}
%
% \begin{macrocode}
@@ -2261,11 +2304,20 @@
% \end{macrocode}
% \begin{macrocode}
\def\HyPsd@SpanishPatch{%
- \begingroup\expandafter\expandafter\expandafter\endgroup
- \expandafter\ifx\csname es@save@dot\endcsname\relax
- \else
+ \ltx@IfUndefined{es@save@dot}{%
+ }{%
\let\.\es@save@dot
- \fi
+ }%
+}
+% \end{macrocode}
+% Shorthand |"-| of `russianb.ldf' is not expandable,
+% therefore it is disabled and replaced by |-|.
+% \begin{macrocode}
+\def\HyPsd@RussianPatch{%
+ \ltx@IfUndefined{russian@sh@"@-@}{%
+ }{%
+ \@namedef{russian@sh@"@-@}{-}%
+ }%
}
% \end{macrocode}
%
@@ -4046,7 +4098,7 @@
%
% \begin{macrocode}
\@ifclassloaded{memoir}{%
- \AtEndOfPackage{\RequirePackage{memhfixc}}%
+ \Hy@AtEndOfPackage{\RequirePackage{memhfixc}}%
}{}
% \end{macrocode}
%
@@ -4534,7 +4586,7 @@
\DeclareFontSubstitution{PU}{pdf}{m}{n}%
\global\let\HyPsd@LoadUnicode\relax
}
-\AtBeginDocument{%
+\Hy@AtBeginDocument{%
\ifx\HyPsd@LoadUnicode\relax
\else
\def\HyPsd@LoadUnicode{%
@@ -4596,7 +4648,7 @@
\RequirePackage{stringenc}[2009/12/15]%
\let\HyPsd@LoadStringEnc\relax
}
-\AtBeginDocument{%
+\Hy@AtBeginDocument{%
\@ifpackageloaded{stringenc}{%
\let\HyPsd@LoadStringEnc\relax
}{%
@@ -4643,7 +4695,7 @@
\def\Hy@driver{htex4ht}%
\def\MaybeStopEarly{%
\typeout{Hyperref stopped early}%
- \AfterBeginDocument{%
+ \Hy@AtBeginDocument{%
\PDF@FinishDoc
\gdef\PDF@FinishDoc{}%
}%
@@ -4697,7 +4749,7 @@
\def\Hy@driver{hvtexhtm}%
\def\MaybeStopEarly{%
\typeout{Hyperref stopped early}%
- \AfterBeginDocument{%
+ \Hy@AtBeginDocument{%
\PDF@FinishDoc
\gdef\PDF@FinishDoc{}%
}%
@@ -4745,7 +4797,7 @@
\def\Hy@driver{htexture}%
}
\define@key{Hyp}{latex2html}[true]{%
- \AtBeginDocument{\@@latextohtmlX}%
+ \Hy@AtBeginDocument{\@@latextohtmlX}%
}
% \end{macrocode}
% No more special treatment for ps2pdf. Let it sink or swim.
@@ -5232,7 +5284,7 @@
% \begin{macrocode}
\define@key{Hyp}{vietnamese}[]{%
\HyLang@addto\extrasvietnamese\HyLang@vietnamese
- \AtEndOfPackage{%
+ \Hy@AtEndOfPackage{%
\@ifundefined{T@PU}{}{%
\input{puvnenc.def}%
}%
@@ -5240,7 +5292,7 @@
}
\define@key{Hyp}{vietnam}[]{%
\HyLang@addto\extrasvietnam\HyLang@vietnamese
- \AtEndOfPackage{%
+ \Hy@AtEndOfPackage{%
\@ifundefined{T@PU}{}{%
\input{puvnenc.def}%
}%
@@ -5251,7 +5303,7 @@
% to PU encoding for Arabi.
% \begin{macrocode}
\define@key{Hyp}{arabic}[]{%
- \AtEndOfPackage{%
+ \Hy@AtEndOfPackage{%
\@ifundefined{T@PU}{}{%
\input{puarenc.def}%
}%
@@ -5268,7 +5320,7 @@
\define@key{Hyp}{ocgcolorlinks}[true]{%
\Hy@boolkey{ocgcolorlinks}{#1}%
}
-\AtBeginDocument{%
+\Hy@AtBeginDocument{%
\begingroup
\@ifundefined{OBJ@OCG@view}{%
\ifHy@ocgcolorlinks
@@ -5921,7 +5973,7 @@
\let\phantomsection\@empty
\let\special@paper\@empty
\def\HyperDestNameFilter#1{#1}
-\AtBeginDocument{%
+\Hy@AtBeginDocument{%
\begingroup
\edef\x{\@ifundefined{stockheight}\paperheight\stockheight}%
\dimen@=\x\relax
@@ -5994,7 +6046,7 @@
% After processing options.
%
% \begin{macrocode}
-\AtBeginDocument{%
+\Hy@AtBeginDocument{%
\ifHy@draft
\let\hyper@@anchor\@gobble
\gdef\hyper@link#1#2#3{#3}%
@@ -6117,7 +6169,7 @@
\Hy@Info{Backreferencing OFF}%
\fi
\ifHy@typexml
- \AtEndOfPackage{%
+ \Hy@AtEndOfPackage{%
\RequirePackage{color}%
\RequirePackage{nameref}%
}%
@@ -6129,13 +6181,13 @@
\typeout{Implicit mode OFF; no redefinition of LaTeX internals}%
\def\MaybeStopEarly{%
\typeout{Hyperref stopped early}%
- \AfterBeginDocument{%
+ \Hy@AtBeginDocument{%
\PDF@FinishDoc
\gdef\PDF@FinishDoc{}%
}%
\endinput
}%
- \AtBeginDocument{%
+ \Hy@AtBeginDocument{%
\let\autoref\ref
\let\autopageref\pageref
\ifx\@pdfpagemode\@empty
@@ -6143,7 +6195,7 @@
\fi
\global\Hy@backreffalse
}%
- \AtEndOfPackage{%
+ \Hy@AtEndOfPackage{%
\global\let\ReadBookmarks\relax
\global\let\WriteBookmarks\relax
}%
@@ -6154,7 +6206,7 @@
% \subsubsection{Driver loading}
%
% \begin{macrocode}
-\AtEndOfPackage{%
+\Hy@AtEndOfPackage{%
\@ifpackageloaded{tex4ht}{%
\def\Hy@driver{htex4ht}%
\Hy@texhttrue
@@ -6243,7 +6295,7 @@
\def\Hy@driver{hvtexhtm}%
\def\MaybeStopEarly{%
\typeout{Hyperref stopped early}%
- \AfterBeginDocument{%
+ \Hy@AtBeginDocument{%
\PDF@FinishDoc
\gdef\PDF@FinishDoc{}%
}%
@@ -6269,9 +6321,9 @@
\PassOptionsToPackage{dviwindo}{color}%
\fi
\fi
- \typeout{*hyperref using default driver \Hy@driver*}%
+ \typeout{* hyperref using default driver \Hy@driver\ltx@space*}%
\else
- \typeout{*hyperref using driver \Hy@driver*}%
+ \typeout{* hyperref using driver \Hy@driver\ltx@space*}%
\fi
\input{\Hy@driver.def}%
\let\@unprocessedoptions\relax
@@ -6314,7 +6366,7 @@
\Hy@DisableOption{latex2html}
\Hy@DisableOption{ps2pdf}
\Hy@DisableOption{xetex}
-\AtEndOfPackage{%
+\Hy@AtEndOfPackage{%
\Hy@DisableOption{pdfversion}%
}
% \end{macrocode}
@@ -6345,7 +6397,7 @@
\else
\def\@bookmarkopenstatus#1{}%
\Hy@Info{Bookmarks OFF}%
- \AtEndOfPackage{%
+ \Hy@AtEndOfPackage{%
\global\let\ReadBookmarks\relax
\global\let\WriteBookmarks\relax
}%
@@ -6402,7 +6454,7 @@
% |\HyColor@UseColor| expects a macro as argument. It contains
% the color specification.
% \begin{macrocode}
-\AtBeginDocument{%
+\Hy@AtBeginDocument{%
\ifHy@ocgcolorlinks
\setkeys{Hyp}{colorlinks}%
\ifHy@pdfa
@@ -6479,7 +6531,7 @@
\@ifstar\@pagerefstar\T@pageref
}%
}
-\AfterBeginDocument{%
+\Hy@AtBeginDocument{%
\ifHy@texht
\else
\Hy@CatcodeWrapper{%
@@ -6915,9 +6967,9 @@
\edef\filename@ext{\XR@ext}%
\fi
\def\use@file{\filename@area\filename@base.\filename@ext}%
- \ifx\filename@ext\XR@ext
+ \Hy@IfStringEndsWith\filename@ext\XR@ext{%
\hyper@linkfile{#2}{\use@file}{#3}%
- \else
+ }{%
\ifx\@baseurl\@empty
\hyper@linkurl{#2}{%
\Hy@linkfileprefix\use@file\ifx\\#3\\\else\hyper@hash#3\fi
@@ -6925,7 +6977,27 @@
\else
\hyper@linkurl{#2}{\use@file\ifx\\#3\\\else\hyper@hash#3\fi}%
\fi
- \fi
+ }%
+}
+% \end{macrocode}
+% \begin{macrocode}
+\def\Hy@IfStringEndsWith#1#2{%
+ \begingroup
+ \edef\x{#1}%
+ \@onelevel@sanitize\x
+ \edef\x{.\x$}%
+ \edef\y{#2}%
+ \@onelevel@sanitize\y
+ \edef\y{.\y$}%
+ \expandafter\def\expandafter\z\expandafter##\expandafter1\y##2\@nil{%
+ \endgroup
+ \ifx\relax##2\relax
+ \expandafter\ltx@secondoftwo
+ \else
+ \expandafter\ltx@firstoftwo
+ \fi
+ }%
+ \expandafter\expandafter\expandafter\z\expandafter\x\y\@nil
}
% \end{macrocode}
% Anchors have a name, and marked text.
@@ -7660,8 +7732,9 @@
\Form@htmltrue
\def\Fld@export{html}%
\else
- \typeout{hyperref: form `encoding' key set to #1 %
- -- unknown type%
+ \Hy@Warning{%
+ Form `encoding' key with \MessageBreak
+ unknown value `#1'%
}%
\Form@htmlfalse
\fi
@@ -7999,7 +8072,7 @@
% in backreferencing-by-section, to allow for cites before
% any sectioning commands. Set up PDF info.
% \begin{macrocode}
-\AfterBeginDocument{%
+\Hy@AtBeginDocument{%
\Hy@pdfstringtrue
\PDF@SetupDoc
\let\PDF@SetupDoc\@empty
@@ -8153,7 +8226,7 @@
% All the code is delayed to |\begin{document}|
% \begin{macrocode}
%<*package>
-\AfterBeginDocument{%
+\Hy@AtBeginDocument{%
% \end{macrocode}
% First the code to deal with removing the hyperref package from
% a document.
@@ -8169,42 +8242,44 @@
\immediate\write\@auxout{<relaxxml>\relax}%
\fi
\immediate\write\@auxout{%
-% \end{macrocode}
-%
-% \begin{macrocode}
- \string\ifx\string\hyper@anchor\string\@undefined^^J%
-% \end{macrocode}
-%
-% \begin{macrocode}
- \global\let\string\oldcontentsline\string\contentsline^^J%
- \gdef\string\contentsline%
- \string#1\string#2\string#3\string#4{%
- \string\oldcontentsline%
- {\string#1}{\string#2}{\string#3}}^^J%
- \global\let\string\oldnewlabel\string\newlabel^^J%
- \gdef\string\newlabel\string#1\string#2{%
- \string\newlabelxx{\string#1}\string#2}^^J%
- \gdef\string\newlabelxx%
- \string#1\string#2\string#3\string#4\string#5\string#6{%
- \string\oldnewlabel{\string#1}{{\string#2}{\string#3}}}^^J%
+ \string\providecommand\string\HyperFirstAtBeginDocument{%
+ \string\AtBeginDocument}^^J%
+ \string\HyperFirstAtBeginDocument{%
+ \string\ifx\string\hyper@anchor\string\@undefined^^J%
+ \string\global\string\let\string\oldcontentsline\string\contentsline^^J%
+ \string\gdef\string\contentsline%
+ \string#1\string#2\string#3\string#4{%
+ \string\oldcontentsline%
+ {\string#1}{\string#2}{\string#3}}^^J%
+ \string\global\string\let\string\oldnewlabel\string\newlabel^^J%
+ \string\gdef\string\newlabel\string#1\string#2{%
+ \string\newlabelxx{\string#1}\string#2}^^J%
+ \string\gdef\string\newlabelxx%
+ \string#1\string#2\string#3\string#4\string#5\string#6{%
+ \string\oldnewlabel{\string#1}{{\string#2}{\string#3}}}^^J%
% \end{macrocode}
%
% But the new aux file will be read again at the end, with the normal
% definitions expected, so better put things back as they were.
% \begin{macrocode}
- \string\AtEndDocument{%
- \let\string\contentsline\string\oldcontentsline^^J%
- \let\string\newlabel\string\oldnewlabel}^^J%
+ \string\AtEndDocument{%
+ \string\ifx\string\hyper@anchor\string\@undefined^^J%
+ \string\let\string\contentsline\string\oldcontentsline^^J%
+ \string\let\string\newlabel\string\oldnewlabel^^J%
+ \string\fi%
+ }^^J%
% \end{macrocode}
%
% If the document is being run with hyperref put this definition
% into the aux file, so we can spot it on the next run.
% \begin{macrocode}
- \string\else^^J%
- \global\let\string\hyper@last\relax^^J%
- \string\fi^^J%
+ \string\fi%
+ }^^J%
+ \string\global\string\let\string\hyper@last\relax^^J%
+ \string\gdef\string\HyperFirstAtBeginDocument\string#1{\string#1}%
}%
\fi
+ \def\HyperFirstAtBeginDocument#1{#1}%
% \end{macrocode}
%
% Now the code to deal with adding the hyperref package to a document
@@ -8742,10 +8817,10 @@
\ifx\HyPsd@temp\HyPsd@pdfencoding@auto
\let\HyPsd@pdfencoding\HyPsd@temp
\else
- \HyWarning{%
- XeTeX driver only supports `pdfencoding=unicode|auto.%
- \MessageBreak
- Ignoring option setting `pdfencoding=\HyPsd@temp'%
+ \Hy@Warning{%
+ XeTeX driver only supports\MessageBreak
+ `pdfencoding=unicode|auto'. Ignoring option\MessageBreak
+ setting `pdfencoding=\HyPsd@temp'%
}%
\fi
\fi
@@ -8816,7 +8891,7 @@
% A marker for the rerun warning is set and the /PageLabels
% is written.
% \begin{macrocode}
- \AfterBeginDocument{%
+ \Hy@AtBeginDocument{%
\if@filesw
\immediate\write\@mainaux{%
\string\providecommand\string*\string\HyPL@Entry[1]{}%
@@ -9065,9 +9140,9 @@
\fi
\ifHy@naturalnames
\let\textlatin\@firstofone
- \xdef\Hy@GlobalTempHlabel{\csname the#1\endcsname}%
+ \xdef\HyperGlobalCurrentHref{\csname the#1\endcsname}%
\else
- \xdef\Hy@GlobalTempHlabel{%
+ \xdef\HyperGlobalCurrentHref{%
\csname
the%
\expandafter\ifx\csname theH#1\endcsname\relax\else H\fi
@@ -9075,24 +9150,54 @@
\endcsname
}%
\fi
- \xdef\Hy@GlobalTempHref{%
- \Hy@param.\expandafter\strip@prefix\meaning\Hy@GlobalTempHlabel
+ \xdef\HyperGlobalCurrentHref{%
+ \Hy@param.\expandafter\strip@prefix\meaning\HyperGlobalCurrentHref
}%
\else
\Hy@GlobalStepCount\Hy@linkcounter
- \xdef\Hy@GlobalTempHref{\Hy@param.\the\Hy@linkcounter}%
+ \xdef\HyperGlobalCurrentHref{\Hy@param.\the\Hy@linkcounter}%
\fi
\endgroup
+ \let\HyperLocalCurrentHref\HyperGlobalCurrentHref
+ \ifHy@localanchorname
+ \let\@currentHref\HyperLocalCurrentHref
+ \else
+ \global\let\@currentHref\HyperGlobalCurrentHref
+ \fi
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\Hy@MakeCurrentHref}
+% \begin{macrocode}
+\def\Hy@MakeCurrentHref#1{%
+ \edef\HyperLocalCurrentHref{#1}%
+ \@onelevel@sanitize\HyperLocalCurrentHref
+ \global\let\HyperGlobalCurrentHref\HyperLocalCurrentHref
+ \let\HyperLocalCurrentHref\HyperGlobalCurrentHref
\ifHy@localanchorname
- \let\@currentHlabel\Hy@GlobalTempHlabel
- \let\@currentHref\Hy@GlobalTempHref
+ \let\@currentHref\HyperLocalCurrentHref
\else
- \global\let\@currentHlabel\Hy@GlobalTempHlabel
- \global\let\@currentHref\Hy@GlobalTempHref
+ \global\let\@currentHref\HyperGlobalCurrentHref
\fi
}
% \end{macrocode}
% \end{macro}
+% \begin{macro}{\Hy@MakeCurrentHrefAuto}
+% \begin{macrocode}
+\def\Hy@MakeCurrentHrefAuto#1{%
+ \Hy@GlobalStepCount\Hy@linkcounter
+ \Hy@MakeCurrentHref{#1.\the\Hy@linkcounter}%
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@currentHlabel}
+% \cs{@currrentHlabel} is only defined for compatibility with
+% package `hypdvips'.
+% \begin{macrocode}
+\def\@currentHlabel{\@currentHref}
+% \end{macrocode}
+% \end{macro}
%
% \begin{macrocode}
\@ifpackageloaded{fancyvrb}{%
@@ -9118,7 +9223,7 @@
% The link will not work if option pageanchor is set to false.
% \begin{macro}{\lastpage@putlabel}
% \begin{macrocode}
-\AtBeginDocument{%
+\Hy@AtBeginDocument{%
\@ifclassloaded{revtex4}{%
\@namedef{ver@lastpage.sty}{1994/06/25}%
}{}%
@@ -9207,8 +9312,7 @@
% \begin{macrocode}
\@ifpackageloaded{titlesec}{%
\def\ttl@Hy@steplink#1{%
- \Hy@GlobalStepCount\Hy@linkcounter
- \xdef\@currentHref{#1*.\the\Hy@linkcounter}%
+ \Hy@MakeCurrentHrefAuto{#1*}%
\edef\ttl@Hy@saveanchor{%
\noexpand\Hy@raisedlink{%
\noexpand\hyper@anchorstart{\@currentHref}%
@@ -9284,7 +9388,6 @@
\expandafter\def\y[##1]##2{%
\H@refstepcounter{#1}%
\hyper@makecurrent{table}%
- \let\Hy@LT@currentHlabel\@currentHlabel
\let\Hy@LT@currentHref\@currentHref
#2\@sharp#####4%
}%
@@ -9299,7 +9402,6 @@
\endgroup
\def\LT@start{%
#1%
- \let\@currentHlabel\Hy@LT@currentHlabel
\let\@currentHref\Hy@LT@currentHref
\Hy@raisedlink{%
\hyper@anchorstart{\@currentHref}\hyper@anchorend
@@ -9495,6 +9597,7 @@
\else
\H@refstepcounter{#2}%
\hyper@makecurrent{#2}%
+ \let\Hy@dth@currentHref\@currentHref
\def\@tempa{%
\@oparg{\@begintheorem{#3}{\csname the#2\endcsname}}[]%
}%
@@ -9516,7 +9619,10 @@
\ifx\@empty\dth@counter
\else
\Hy@raisedlink{%
- \hyper@anchorstart{\@currentHref}\hyper@anchorend
+ \hyper@anchorstart{%
+ \ltx@ifundefined{Hy@dth@currentHref}%
+ \@currentHref\Hy@dth@currentHref
+ }\hyper@anchorend
}%
\fi
\unhbox\@labels
@@ -9590,7 +9696,6 @@
\Hy@footnote@currentHref
}{\relax}%
}%
- \let\@currentHlabel\Hy@footnote@currentHlabel
\let\@currentHref\Hy@footnote@currentHref
\let\@currentlabelname\@empty
#1%
@@ -9609,12 +9714,9 @@
\leavevmode
\ifhmode\edef\@x@sf{\the\spacefactor}\nobreak\fi
\stepcounter{Hfootnote}%
- \global\let\Hy@saved@currentHlabel\@currentHlabel
\global\let\Hy@saved@currentHref\@currentHref
\hyper@makecurrent{Hfootnote}%
- \global\let\Hy@footnote@currentHlabel\@currentHlabel
\global\let\Hy@footnote@currentHref\@currentHref
- \global\let\@currentHlabel\Hy@saved@currentHlabel
\global\let\@currentHref\Hy@saved@currentHref
\hyper@linkstart{link}{\Hy@footnote@currentHref}%
\@makefnmark
@@ -9649,29 +9751,27 @@
\noexpand\protected@xdef\noexpand\@thefnmark{%
\noexpand\thempfn
}%
- \expandafter\expandafter\expandafter\noexpand
- \expandafter\expandafter\expandafter\Hy@LT@footnotetext
- \expandafter\expandafter\expandafter{%
- \expandafter\Hy@footnote@currentHref\expandafter
- }\expandafter{\Hy@footnote@currentHlabel}%
+ \expandafter\noexpand\expandafter\Hy@LT@footnotetext
+ \expandafter{%
+ \Hy@footnote@currentHref
+ }%
}%
\global\LT@p@ftn\expandafter{%
\@tempa{#1}%
\endgroup
}%
}%
- \long\def\Hy@LT@footnotetext#1#2#3{%
+ \long\def\Hy@LT@footnotetext#1#2{%
\H@@footnotetext{%
\ifHy@nesting
- \hyper@@anchor{#1}{#3}%
+ \hyper@@anchor{#1}{#2}%
\else
\Hy@raisedlink{%
\hyper@@anchor{#1}{\relax}%
}%
- \def\@currentHlabel{#2}%
\def\@currentHref{#1}%
\let\@currentlabelname\@empty
- #3%
+ #2%
\fi
}%
}%
@@ -9701,7 +9801,6 @@
\Hy@footnote@currentHref
}{\relax}%
}%
- \let\@currentHlabel\Hy@footnote@currentHlabel
\let\@currentHref\Hy@footnote@currentHref
\let\@currentlabelname\@empty
\ignorespaces
@@ -10168,7 +10267,7 @@
% messages.
% \begin{macrocode}
\@ifpackageloaded{harvard}{%
- \AtBeginDocument{%
+ \Hy@AtBeginDocument{%
\Hy@Info{*** compatibility with harvard **** }%
\Hy@raiselinksfalse
\def\harvardcite#1#2#3#4{%
@@ -10489,8 +10588,7 @@
% \begin{macrocode}
\@ifpackageloaded{amsmath}{%
\def\Hy@make@anchor{%
- \Hy@GlobalStepCount\Hy@linkcounter
- \xdef\@currentHref{AMS.\the\Hy@linkcounter}%
+ \Hy@MakeCurrentHrefAuto{AMS}%
\Hy@raisedlink{\hyper@anchorstart{\@currentHref}\hyper@anchorend}%
}%
\def\Hy@make@df@tag@@#1{%
@@ -11101,7 +11199,7 @@
\def\@pagerefstar#1{%
\HyRef@StarSetRef{#1}\@secondoffive
}
-\AtBeginDocument{%
+\Hy@AtBeginDocument{%
\@ifpackageloaded{varioref}{%
\def\@Refstar#1{%
\HyRef@StarSetRef{#1}\HyRef@MakeUppercaseFirstOfFive
@@ -11253,7 +11351,7 @@
\@ifpackageloaded{showkeys}{%
\HyRef@ShowKeysInit
}{%
- \AtBeginDocument{%
+ \Hy@AtBeginDocument{%
\@ifpackageloaded{showkeys}{%
\HyRef@ShowKeysInit
}{}%
@@ -11496,7 +11594,7 @@
}%
}%
\x
- \AtBeginDocument{%
+ \Hy@AtBeginDocument{%
\def\Hy@colorlink#1{%
\begingroup
\ifHy@ocgcolorlinks
@@ -12081,7 +12179,7 @@
% \begin{macrocode}
%</pdftex>
%<*pdftex|xetex>
-\AtBeginDocument{%
+\Hy@AtBeginDocument{%
\ifHy@setpagesize
\expandafter\@firstofone
\else
@@ -12761,7 +12859,7 @@
}%
}%
}%
- \AtBeginDocument{%
+ \Hy@AtBeginDocument{%
\def\Hy@colorlink#1{%
\begingroup
\ifHy@ocgcolorlinks
@@ -13220,7 +13318,7 @@
\fi
}%
}%
- \AtBeginDocument{\VTeXInitMediaSize}%
+ \Hy@AtBeginDocument{\VTeXInitMediaSize}%
\fi
\Hy@DisableOption{setpagesize}%
\fi
@@ -14958,7 +15056,7 @@
% The Rect pair are called at the LL and UR corners of a box
% known to \TeX.
% \begin{macrocode}
-\AfterBeginDocument{%
+\Hy@AtBeginDocument{%
\headerps@out{%
% \end{macrocode}
% Textures lives in normal points, I think. So conversion from one
@@ -15003,7 +15101,7 @@
}
% \end{macrocode}
% \begin{macrocode}
-\AfterBeginDocument{%
+\Hy@AtBeginDocument{%
\ifHy@colorlinks
\headerps@out{/PDFBorder{/Border [0 0 0]}def}%
\fi
@@ -16034,8 +16132,8 @@
}%
\else
\def\HyField@AuxAddToFields#1{}%
- \def\HyField@AfterAuxOpen{\AtBeginDocument}%
- \AtBeginDocument{%
+ \def\HyField@AfterAuxOpen{\Hy@AtBeginDocument}%
+ \Hy@AtBeginDocument{%
\if@filesw
\immediate\write\@mainaux{%
\string\providecommand\string\HyField@AuxAddToFields[1]{}%
@@ -17297,8 +17395,7 @@
% to get bookmarks when used with a manual |\addcontentsline|
% \begin{macrocode}
\def\phantomsection{%
- \Hy@GlobalStepCount\Hy@linkcounter
- \xdef\@currentHref{section*.\the\Hy@linkcounter}%
+ \Hy@MakeCurrentHrefAuto{section*}%
\Hy@raisedlink{\hyper@anchorstart{\@currentHref}\hyper@anchorend}%
}
%</package>
@@ -17390,6 +17487,7 @@
\fi
\HyPsd@XeTeXBigCharstrue
\pdfstringdef\Hy@tempa{#2}%
+ \HyPsd@SanitizeForOutFile\Hy@tempa
\if@filesw
\stepcounter{bookmark@seq@number}%
\@ifundefined{@outlinefile}{%
@@ -17407,6 +17505,57 @@
}
\newcounter{bookmark@seq@number}
% \end{macrocode}
+% \begin{macrocode}
+\begingroup
+ \lccode`(=`{%
+ \lccode`)=`}%
+ \lccode`1=\z@
+ \lccode`2=\z@
+ \lccode`3=\z@
+ \lccode`5=\z@
+ \lccode`7=\z@
+ \lccode`\#=\z@
+ \lccode`\`=\z@
+ \lccode`\{=\z@
+ \lccode`\}=\z@
+\lowercase{%
+ \endgroup
+ \def\HyPsd@SanitizeForOutFile#1{%
+ \@onelevel@sanitize\Hy@tempa
+ \escapechar`\\%
+ \edef\Hy@tempa{%
+ \expandafter\HyPsd@SanitizeOut@BraceLeft\Hy@tempa(\@nil
+ }%
+ \edef\Hy@tempa{%
+ \expandafter\HyPsd@SanitizeOut@BraceRight\Hy@tempa)\@nil
+ }%
+ }%
+ \def\HyPsd@SanitizeOut@BraceLeft#1(#2\@nil{%
+ #1%
+ \ifx\\#2\\%
+ \expandafter\ltx@gobble
+ \else
+ \expandafter\ltx@firstofone
+ \fi
+ {%
+ \string\173%
+ \HyPsd@SanitizeOut@BraceLeft#2\@nil
+ }%
+ }%
+ \def\HyPsd@SanitizeOut@BraceRight#1)#2\@nil{%
+ #1%
+ \ifx\\#2\\%
+ \expandafter\ltx@gobble
+ \else
+ \expandafter\ltx@firstofone
+ \fi
+ {%
+ \string\175%
+ \HyPsd@SanitizeOut@BraceRight#2\@nil
+ }%
+ }%
+}
+% \end{macrocode}
% In the call of \cmd{\BOOKMARK} the braces around \verb|#4|
% are omitted, because it is not likely, that the level number
% contains \verb|]|.
@@ -17562,11 +17711,16 @@
\def\({(}%
\def\){)}%
\def\do##1{%
- \ifnum\the\catcode`##1=\active
+ \ifnum\catcode`##1=\active
\@makeother##1%
+ \else
+ \ifnum\catcode`##1=6 %
+ \@makeother##1%
+ \fi
\fi
}%
\dospecials
+ \Hy@safe@activestrue
\InputIfFileExists{\jobname.out}{}{}%
\endgroup
\ifx\WriteBookmarks\relax
@@ -17590,6 +17744,17 @@
%<*!vtex>
\def\ReadBookmarks{%
\begingroup
+ \def\do##1{%
+ \ifnum\catcode`##1=\active
+ \@makeother##1%
+ \else
+ \ifnum\catcode`##1=6 %
+ \@makeother##1%
+ \fi
+ \fi
+ }%
+ \dospecials
+ \Hy@safe@activestrue
\escapechar=`\\%
\let\escapechar\@gobble %
\def\@@BOOKMARK[##1][##2]##3##4##5{%
@@ -17639,8 +17804,8 @@
%</dvipdfm|xetex>
}%
{%
- \def\WriteBookmarks{0}%
- \InputIfFileExists{\jobname.out}{}{}%
+ \def\WriteBookmarks{0}%
+ \InputIfFileExists{\jobname.out}{}{}%
}%
%{\escapechar\m@ne\InputIfFileExists{\jobname.out}{}{}}%
\ifx\WriteBookmarks\relax
@@ -17706,8 +17871,7 @@
}
\let\H@old@ssect\@ssect
\def\@ssect#1#2#3#4#5{%
- \Hy@GlobalStepCount\Hy@linkcounter
- \xdef\@currentHref{section*.\the\Hy@linkcounter}%
+ \Hy@MakeCurrentHrefAuto{section*}%
\setlength{\Hy@SectionHShift}{#1}%
\begingroup
\toks@{\H@old@ssect{#1}{#2}{#3}{#4}}%
@@ -17723,8 +17887,7 @@
\def\@schapter#1{%
\begingroup
\let\@mkboth\@gobbletwo
- \Hy@GlobalStepCount\Hy@linkcounter
- \xdef\@currentHref{\Hy@chapapp*.\the\Hy@linkcounter}%
+ \Hy@MakeCurrentHrefAuto{\Hy@chapapp*}%
\Hy@raisedlink{%
\hyper@anchorstart{\@currentHref}\hyper@anchorend
}%
@@ -17741,8 +17904,7 @@
\let\Hy@org@chapter\@chapter
\def\@chapter{%
\def\Hy@next{%
- \Hy@GlobalStepCount\Hy@linkcounter
- \xdef\@currentHref{\Hy@chapapp*.\the\Hy@linkcounter}%
+ \Hy@MakeCurrentHrefAuto{\Hy@chapapp*}%
\Hy@raisedlink{%
\hyper@anchorstart{\@currentHref}\hyper@anchorend
}%
@@ -17776,8 +17938,7 @@
% \begin{macrocode}
\let\H@old@spart\@spart
\def\@spart#1{%
- \Hy@GlobalStepCount\Hy@linkcounter
- \xdef\@currentHref{part*.\the\Hy@linkcounter}%
+ \Hy@MakeCurrentHrefAuto{part*}%
\Hy@raisedlink{%
\hyper@anchorstart{\@currentHref}\hyper@anchorend
}%
@@ -17791,8 +17952,7 @@
\expandafter\@secondoftwo
\fi
{%
- \Hy@GlobalStepCount\Hy@linkcounter
- \xdef\@currentHref{section*.\the\Hy@linkcounter}%
+ \Hy@MakeCurrentHrefAuto{section*}%
\setlength{\Hy@SectionHShift}{#3}%
\begingroup
\toks@{\H@old@sect{#1}{#2}{#3}{#4}{#5}{#6}[{#7}]}%
@@ -17851,8 +18011,7 @@
\fi
\addtocontents{lof}{\protect\addvspace{10\p@}}%
\addtocontents{lot}{\protect\addvspace{10\p@}}%
- \Hy@GlobalStepCount\Hy@linkcounter
- \xdef\@currentHref{\Hy@chapapp*.\the\Hy@linkcounter}%
+ \Hy@MakeCurrentHrefAuto{\Hy@chapapp*}%
\Hy@raisedlink{%
\hyper@anchorstart{\@currentHref}\hyper@anchorend
}%
diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def b/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def
index 96969e16a00..c51019d90b9 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def
@@ -29,7 +29,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{hdvipdfm.def}
- [2010/03/19 v6.80r
+ [2010/03/30 v6.80u
Hyperref driver for dvipdfm]
\def\Hy@PutCatalog#1{\@pdfm@mark{docview << #1 >>}}
\ifHy@pagelabels
@@ -43,7 +43,7 @@
\endgroup
\fi
}%
- \AfterBeginDocument{%
+ \Hy@AtBeginDocument{%
\if@filesw
\immediate\write\@mainaux{%
\string\providecommand\string*\string\HyPL@Entry[1]{}%
@@ -274,7 +274,7 @@
}%
}%
}%
- \AtBeginDocument{%
+ \Hy@AtBeginDocument{%
\def\Hy@colorlink#1{%
\begingroup
\ifHy@ocgcolorlinks
@@ -1314,6 +1314,7 @@
\fi
\HyPsd@XeTeXBigCharstrue
\pdfstringdef\Hy@tempa{#2}%
+ \HyPsd@SanitizeForOutFile\Hy@tempa
\if@filesw
\stepcounter{bookmark@seq@number}%
\@ifundefined{@outlinefile}{%
@@ -1330,6 +1331,55 @@
\endgroup
}
\newcounter{bookmark@seq@number}
+\begingroup
+ \lccode`(=`{%
+ \lccode`)=`}%
+ \lccode`1=\z@
+ \lccode`2=\z@
+ \lccode`3=\z@
+ \lccode`5=\z@
+ \lccode`7=\z@
+ \lccode`\#=\z@
+ \lccode`\`=\z@
+ \lccode`\{=\z@
+ \lccode`\}=\z@
+\lowercase{%
+ \endgroup
+ \def\HyPsd@SanitizeForOutFile#1{%
+ \@onelevel@sanitize\Hy@tempa
+ \escapechar`\\%
+ \edef\Hy@tempa{%
+ \expandafter\HyPsd@SanitizeOut@BraceLeft\Hy@tempa(\@nil
+ }%
+ \edef\Hy@tempa{%
+ \expandafter\HyPsd@SanitizeOut@BraceRight\Hy@tempa)\@nil
+ }%
+ }%
+ \def\HyPsd@SanitizeOut@BraceLeft#1(#2\@nil{%
+ #1%
+ \ifx\\#2\\%
+ \expandafter\ltx@gobble
+ \else
+ \expandafter\ltx@firstofone
+ \fi
+ {%
+ \string\173%
+ \HyPsd@SanitizeOut@BraceLeft#2\@nil
+ }%
+ }%
+ \def\HyPsd@SanitizeOut@BraceRight#1)#2\@nil{%
+ #1%
+ \ifx\\#2\\%
+ \expandafter\ltx@gobble
+ \else
+ \expandafter\ltx@firstofone
+ \fi
+ {%
+ \string\175%
+ \HyPsd@SanitizeOut@BraceRight#2\@nil
+ }%
+ }%
+}
\newcommand{\currentpdfbookmark}{%
\pdfbookmark[\Hy@currentbookmarklevel]%
}
@@ -1366,6 +1416,17 @@
}
\def\ReadBookmarks{%
\begingroup
+ \def\do##1{%
+ \ifnum\catcode`##1=\active
+ \@makeother##1%
+ \else
+ \ifnum\catcode`##1=6 %
+ \@makeother##1%
+ \fi
+ \fi
+ }%
+ \dospecials
+ \Hy@safe@activestrue
\escapechar=`\\%
\let\escapechar\@gobble %
\def\@@BOOKMARK[##1][##2]##3##4##5{%
@@ -1397,8 +1458,8 @@
}%
}%
{%
- \def\WriteBookmarks{0}%
- \InputIfFileExists{\jobname.out}{}{}%
+ \def\WriteBookmarks{0}%
+ \InputIfFileExists{\jobname.out}{}{}%
}%
%{\escapechar\m@ne\InputIfFileExists{\jobname.out}{}{}}%
\ifx\WriteBookmarks\relax
@@ -1448,8 +1509,7 @@
}
\let\H@old@ssect\@ssect
\def\@ssect#1#2#3#4#5{%
- \Hy@GlobalStepCount\Hy@linkcounter
- \xdef\@currentHref{section*.\the\Hy@linkcounter}%
+ \Hy@MakeCurrentHrefAuto{section*}%
\setlength{\Hy@SectionHShift}{#1}%
\begingroup
\toks@{\H@old@ssect{#1}{#2}{#3}{#4}}%
@@ -1465,8 +1525,7 @@
\def\@schapter#1{%
\begingroup
\let\@mkboth\@gobbletwo
- \Hy@GlobalStepCount\Hy@linkcounter
- \xdef\@currentHref{\Hy@chapapp*.\the\Hy@linkcounter}%
+ \Hy@MakeCurrentHrefAuto{\Hy@chapapp*}%
\Hy@raisedlink{%
\hyper@anchorstart{\@currentHref}\hyper@anchorend
}%
@@ -1477,8 +1536,7 @@
\let\Hy@org@chapter\@chapter
\def\@chapter{%
\def\Hy@next{%
- \Hy@GlobalStepCount\Hy@linkcounter
- \xdef\@currentHref{\Hy@chapapp*.\the\Hy@linkcounter}%
+ \Hy@MakeCurrentHrefAuto{\Hy@chapapp*}%
\Hy@raisedlink{%
\hyper@anchorstart{\@currentHref}\hyper@anchorend
}%
@@ -1508,8 +1566,7 @@
}
\let\H@old@spart\@spart
\def\@spart#1{%
- \Hy@GlobalStepCount\Hy@linkcounter
- \xdef\@currentHref{part*.\the\Hy@linkcounter}%
+ \Hy@MakeCurrentHrefAuto{part*}%
\Hy@raisedlink{%
\hyper@anchorstart{\@currentHref}\hyper@anchorend
}%
@@ -1523,8 +1580,7 @@
\expandafter\@secondoftwo
\fi
{%
- \Hy@GlobalStepCount\Hy@linkcounter
- \xdef\@currentHref{section*.\the\Hy@linkcounter}%
+ \Hy@MakeCurrentHrefAuto{section*}%
\setlength{\Hy@SectionHShift}{#3}%
\begingroup
\toks@{\H@old@sect{#1}{#2}{#3}{#4}{#5}{#6}[{#7}]}%
@@ -1558,8 +1614,7 @@
\fi
\addtocontents{lof}{\protect\addvspace{10\p@}}%
\addtocontents{lot}{\protect\addvspace{10\p@}}%
- \Hy@GlobalStepCount\Hy@linkcounter
- \xdef\@currentHref{\Hy@chapapp*.\the\Hy@linkcounter}%
+ \Hy@MakeCurrentHrefAuto{\Hy@chapapp*}%
\Hy@raisedlink{%
\hyper@anchorstart{\@currentHref}\hyper@anchorend
}%
diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvips.def b/Master/texmf-dist/tex/latex/hyperref/hdvips.def
index aa99757151c..6e9959aaa8d 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hdvips.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hdvips.def
@@ -29,7 +29,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{hdvips.def}
- [2010/03/19 v6.80r
+ [2010/03/30 v6.80u
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 18d52033c55..8cd5e4e2448 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hdvipson.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hdvipson.def
@@ -29,7 +29,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{hdvipson.def}
- [2010/03/19 v6.80r
+ [2010/03/30 v6.80u
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 9544d639f13..4a18edb1fdf 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hdviwind.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hdviwind.def
@@ -29,7 +29,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{hdviwind.def}
- [2010/03/19 v6.80r
+ [2010/03/30 v6.80u
Hyperref driver for dviwindo]
\begingroup
\@ifundefined{headerps@out}{}{%
@@ -63,7 +63,7 @@
\endgroup
\fi
}%
- \AfterBeginDocument{%
+ \Hy@AtBeginDocument{%
\if@filesw
\immediate\write\@mainaux{%
\string\providecommand\string*\string\HyPL@Entry[1]{}%
diff --git a/Master/texmf-dist/tex/latex/hyperref/hpdftex.def b/Master/texmf-dist/tex/latex/hyperref/hpdftex.def
index a08fd9ee76d..b2d39109053 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hpdftex.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hpdftex.def
@@ -29,7 +29,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{hpdftex.def}
- [2010/03/19 v6.80r
+ [2010/03/30 v6.80u
Hyperref driver for pdfTeX]
\let\Hy@PutCatalog\pdfcatalog
\ifHy@pagelabels
@@ -211,7 +211,7 @@
}%
}%
\x
- \AtBeginDocument{%
+ \Hy@AtBeginDocument{%
\def\Hy@colorlink#1{%
\begingroup
\ifHy@ocgcolorlinks
@@ -676,7 +676,7 @@
\hyper@pageduration
\hyper@pagehidden
}
-\AtBeginDocument{%
+\Hy@AtBeginDocument{%
\ifHy@setpagesize
\expandafter\@firstofone
\else
@@ -781,8 +781,8 @@
}%
\else
\def\HyField@AuxAddToFields#1{}%
- \def\HyField@AfterAuxOpen{\AtBeginDocument}%
- \AtBeginDocument{%
+ \def\HyField@AfterAuxOpen{\Hy@AtBeginDocument}%
+ \Hy@AtBeginDocument{%
\if@filesw
\immediate\write\@mainaux{%
\string\providecommand\string\HyField@AuxAddToFields[1]{}%
@@ -1531,6 +1531,7 @@
\fi
\HyPsd@XeTeXBigCharstrue
\pdfstringdef\Hy@tempa{#2}%
+ \HyPsd@SanitizeForOutFile\Hy@tempa
\if@filesw
\stepcounter{bookmark@seq@number}%
\@ifundefined{@outlinefile}{%
@@ -1547,6 +1548,55 @@
\endgroup
}
\newcounter{bookmark@seq@number}
+\begingroup
+ \lccode`(=`{%
+ \lccode`)=`}%
+ \lccode`1=\z@
+ \lccode`2=\z@
+ \lccode`3=\z@
+ \lccode`5=\z@
+ \lccode`7=\z@
+ \lccode`\#=\z@
+ \lccode`\`=\z@
+ \lccode`\{=\z@
+ \lccode`\}=\z@
+\lowercase{%
+ \endgroup
+ \def\HyPsd@SanitizeForOutFile#1{%
+ \@onelevel@sanitize\Hy@tempa
+ \escapechar`\\%
+ \edef\Hy@tempa{%
+ \expandafter\HyPsd@SanitizeOut@BraceLeft\Hy@tempa(\@nil
+ }%
+ \edef\Hy@tempa{%
+ \expandafter\HyPsd@SanitizeOut@BraceRight\Hy@tempa)\@nil
+ }%
+ }%
+ \def\HyPsd@SanitizeOut@BraceLeft#1(#2\@nil{%
+ #1%
+ \ifx\\#2\\%
+ \expandafter\ltx@gobble
+ \else
+ \expandafter\ltx@firstofone
+ \fi
+ {%
+ \string\173%
+ \HyPsd@SanitizeOut@BraceLeft#2\@nil
+ }%
+ }%
+ \def\HyPsd@SanitizeOut@BraceRight#1)#2\@nil{%
+ #1%
+ \ifx\\#2\\%
+ \expandafter\ltx@gobble
+ \else
+ \expandafter\ltx@firstofone
+ \fi
+ {%
+ \string\175%
+ \HyPsd@SanitizeOut@BraceRight#2\@nil
+ }%
+ }%
+}
\newcommand{\currentpdfbookmark}{%
\pdfbookmark[\Hy@currentbookmarklevel]%
}
@@ -1583,6 +1633,17 @@
}
\def\ReadBookmarks{%
\begingroup
+ \def\do##1{%
+ \ifnum\catcode`##1=\active
+ \@makeother##1%
+ \else
+ \ifnum\catcode`##1=6 %
+ \@makeother##1%
+ \fi
+ \fi
+ }%
+ \dospecials
+ \Hy@safe@activestrue
\escapechar=`\\%
\let\escapechar\@gobble %
\def\@@BOOKMARK[##1][##2]##3##4##5{%
@@ -1602,8 +1663,8 @@
}%
}%
{%
- \def\WriteBookmarks{0}%
- \InputIfFileExists{\jobname.out}{}{}%
+ \def\WriteBookmarks{0}%
+ \InputIfFileExists{\jobname.out}{}{}%
}%
%{\escapechar\m@ne\InputIfFileExists{\jobname.out}{}{}}%
\ifx\WriteBookmarks\relax
@@ -1656,8 +1717,7 @@
}
\let\H@old@ssect\@ssect
\def\@ssect#1#2#3#4#5{%
- \Hy@GlobalStepCount\Hy@linkcounter
- \xdef\@currentHref{section*.\the\Hy@linkcounter}%
+ \Hy@MakeCurrentHrefAuto{section*}%
\setlength{\Hy@SectionHShift}{#1}%
\begingroup
\toks@{\H@old@ssect{#1}{#2}{#3}{#4}}%
@@ -1673,8 +1733,7 @@
\def\@schapter#1{%
\begingroup
\let\@mkboth\@gobbletwo
- \Hy@GlobalStepCount\Hy@linkcounter
- \xdef\@currentHref{\Hy@chapapp*.\the\Hy@linkcounter}%
+ \Hy@MakeCurrentHrefAuto{\Hy@chapapp*}%
\Hy@raisedlink{%
\hyper@anchorstart{\@currentHref}\hyper@anchorend
}%
@@ -1685,8 +1744,7 @@
\let\Hy@org@chapter\@chapter
\def\@chapter{%
\def\Hy@next{%
- \Hy@GlobalStepCount\Hy@linkcounter
- \xdef\@currentHref{\Hy@chapapp*.\the\Hy@linkcounter}%
+ \Hy@MakeCurrentHrefAuto{\Hy@chapapp*}%
\Hy@raisedlink{%
\hyper@anchorstart{\@currentHref}\hyper@anchorend
}%
@@ -1716,8 +1774,7 @@
}
\let\H@old@spart\@spart
\def\@spart#1{%
- \Hy@GlobalStepCount\Hy@linkcounter
- \xdef\@currentHref{part*.\the\Hy@linkcounter}%
+ \Hy@MakeCurrentHrefAuto{part*}%
\Hy@raisedlink{%
\hyper@anchorstart{\@currentHref}\hyper@anchorend
}%
@@ -1731,8 +1788,7 @@
\expandafter\@secondoftwo
\fi
{%
- \Hy@GlobalStepCount\Hy@linkcounter
- \xdef\@currentHref{section*.\the\Hy@linkcounter}%
+ \Hy@MakeCurrentHrefAuto{section*}%
\setlength{\Hy@SectionHShift}{#3}%
\begingroup
\toks@{\H@old@sect{#1}{#2}{#3}{#4}{#5}{#6}[{#7}]}%
@@ -1766,8 +1822,7 @@
\fi
\addtocontents{lof}{\protect\addvspace{10\p@}}%
\addtocontents{lot}{\protect\addvspace{10\p@}}%
- \Hy@GlobalStepCount\Hy@linkcounter
- \xdef\@currentHref{\Hy@chapapp*.\the\Hy@linkcounter}%
+ \Hy@MakeCurrentHrefAuto{\Hy@chapapp*}%
\Hy@raisedlink{%
\hyper@anchorstart{\@currentHref}\hyper@anchorend
}%
diff --git a/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg b/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg
index 3adbdc452c9..491b331fdad 100644
--- a/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg
+++ b/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg
@@ -29,7 +29,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{htex4ht.cfg}
- [2010/03/19 v6.80r
+ [2010/03/30 v6.80u
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 6cc2fd797e4..a31364946b8 100644
--- a/Master/texmf-dist/tex/latex/hyperref/htex4ht.def
+++ b/Master/texmf-dist/tex/latex/hyperref/htex4ht.def
@@ -29,7 +29,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{htex4ht.def}
- [2010/03/19 v6.80r
+ [2010/03/30 v6.80u
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 047c20809d0..d3cf4d81de3 100644
--- a/Master/texmf-dist/tex/latex/hyperref/htexture.def
+++ b/Master/texmf-dist/tex/latex/hyperref/htexture.def
@@ -29,7 +29,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{htexture.def}
- [2010/03/19 v6.80r
+ [2010/03/30 v6.80u
Hyperref driver for Textures]
\providecommand*{\XR@ext}{pdf}
\begingroup
@@ -72,7 +72,7 @@
\providecommand*\@pdfborderstyle{}
\providecommand*\@pdfview{XYZ}
\providecommand*\@pdfviewparams{ H.V}
-\AfterBeginDocument{%
+\Hy@AtBeginDocument{%
\headerps@out{%
/vsize {\Hy@pageheight} def%
/DvipsToPDF {} def%
@@ -110,7 +110,7 @@
} def\Hy@ps@CR
}%
}
-\AfterBeginDocument{%
+\Hy@AtBeginDocument{%
\ifHy@colorlinks
\headerps@out{/PDFBorder{/Border [0 0 0]}def}%
\fi
diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtex.def b/Master/texmf-dist/tex/latex/hyperref/hvtex.def
index 071adb323ea..f32c33fe57c 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hvtex.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hvtex.def
@@ -29,7 +29,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{hvtex.def}
- [2010/03/19 v6.80r
+ [2010/03/30 v6.80u
Hyperref driver for VTeX in PDF/PS mode]
\providecommand*{\XR@ext}{pdf}
\edef\Hy@VTeXversion{%
@@ -155,7 +155,7 @@
\fi
}%
}%
- \AtBeginDocument{\VTeXInitMediaSize}%
+ \Hy@AtBeginDocument{\VTeXInitMediaSize}%
\fi
\Hy@DisableOption{setpagesize}%
\fi
@@ -657,6 +657,7 @@
\fi
\HyPsd@XeTeXBigCharstrue
\pdfstringdef\Hy@tempa{#2}%
+ \HyPsd@SanitizeForOutFile\Hy@tempa
\if@filesw
\stepcounter{bookmark@seq@number}%
\@ifundefined{@outlinefile}{%
@@ -673,6 +674,55 @@
\endgroup
}
\newcounter{bookmark@seq@number}
+\begingroup
+ \lccode`(=`{%
+ \lccode`)=`}%
+ \lccode`1=\z@
+ \lccode`2=\z@
+ \lccode`3=\z@
+ \lccode`5=\z@
+ \lccode`7=\z@
+ \lccode`\#=\z@
+ \lccode`\`=\z@
+ \lccode`\{=\z@
+ \lccode`\}=\z@
+\lowercase{%
+ \endgroup
+ \def\HyPsd@SanitizeForOutFile#1{%
+ \@onelevel@sanitize\Hy@tempa
+ \escapechar`\\%
+ \edef\Hy@tempa{%
+ \expandafter\HyPsd@SanitizeOut@BraceLeft\Hy@tempa(\@nil
+ }%
+ \edef\Hy@tempa{%
+ \expandafter\HyPsd@SanitizeOut@BraceRight\Hy@tempa)\@nil
+ }%
+ }%
+ \def\HyPsd@SanitizeOut@BraceLeft#1(#2\@nil{%
+ #1%
+ \ifx\\#2\\%
+ \expandafter\ltx@gobble
+ \else
+ \expandafter\ltx@firstofone
+ \fi
+ {%
+ \string\173%
+ \HyPsd@SanitizeOut@BraceLeft#2\@nil
+ }%
+ }%
+ \def\HyPsd@SanitizeOut@BraceRight#1)#2\@nil{%
+ #1%
+ \ifx\\#2\\%
+ \expandafter\ltx@gobble
+ \else
+ \expandafter\ltx@firstofone
+ \fi
+ {%
+ \string\175%
+ \HyPsd@SanitizeOut@BraceRight#2\@nil
+ }%
+ }%
+}
\newcommand{\currentpdfbookmark}{%
\pdfbookmark[\Hy@currentbookmarklevel]%
}
@@ -780,11 +830,16 @@
\def\({(}%
\def\){)}%
\def\do##1{%
- \ifnum\the\catcode`##1=\active
+ \ifnum\catcode`##1=\active
\@makeother##1%
+ \else
+ \ifnum\catcode`##1=6 %
+ \@makeother##1%
+ \fi
\fi
}%
\dospecials
+ \Hy@safe@activestrue
\InputIfFileExists{\jobname.out}{}{}%
\endgroup
\ifx\WriteBookmarks\relax
@@ -821,8 +876,7 @@
}
\let\H@old@ssect\@ssect
\def\@ssect#1#2#3#4#5{%
- \Hy@GlobalStepCount\Hy@linkcounter
- \xdef\@currentHref{section*.\the\Hy@linkcounter}%
+ \Hy@MakeCurrentHrefAuto{section*}%
\setlength{\Hy@SectionHShift}{#1}%
\begingroup
\toks@{\H@old@ssect{#1}{#2}{#3}{#4}}%
@@ -838,8 +892,7 @@
\def\@schapter#1{%
\begingroup
\let\@mkboth\@gobbletwo
- \Hy@GlobalStepCount\Hy@linkcounter
- \xdef\@currentHref{\Hy@chapapp*.\the\Hy@linkcounter}%
+ \Hy@MakeCurrentHrefAuto{\Hy@chapapp*}%
\Hy@raisedlink{%
\hyper@anchorstart{\@currentHref}\hyper@anchorend
}%
@@ -850,8 +903,7 @@
\let\Hy@org@chapter\@chapter
\def\@chapter{%
\def\Hy@next{%
- \Hy@GlobalStepCount\Hy@linkcounter
- \xdef\@currentHref{\Hy@chapapp*.\the\Hy@linkcounter}%
+ \Hy@MakeCurrentHrefAuto{\Hy@chapapp*}%
\Hy@raisedlink{%
\hyper@anchorstart{\@currentHref}\hyper@anchorend
}%
@@ -881,8 +933,7 @@
}
\let\H@old@spart\@spart
\def\@spart#1{%
- \Hy@GlobalStepCount\Hy@linkcounter
- \xdef\@currentHref{part*.\the\Hy@linkcounter}%
+ \Hy@MakeCurrentHrefAuto{part*}%
\Hy@raisedlink{%
\hyper@anchorstart{\@currentHref}\hyper@anchorend
}%
@@ -896,8 +947,7 @@
\expandafter\@secondoftwo
\fi
{%
- \Hy@GlobalStepCount\Hy@linkcounter
- \xdef\@currentHref{section*.\the\Hy@linkcounter}%
+ \Hy@MakeCurrentHrefAuto{section*}%
\setlength{\Hy@SectionHShift}{#3}%
\begingroup
\toks@{\H@old@sect{#1}{#2}{#3}{#4}{#5}{#6}[{#7}]}%
@@ -931,8 +981,7 @@
\fi
\addtocontents{lof}{\protect\addvspace{10\p@}}%
\addtocontents{lot}{\protect\addvspace{10\p@}}%
- \Hy@GlobalStepCount\Hy@linkcounter
- \xdef\@currentHref{\Hy@chapapp*.\the\Hy@linkcounter}%
+ \Hy@MakeCurrentHrefAuto{\Hy@chapapp*}%
\Hy@raisedlink{%
\hyper@anchorstart{\@currentHref}\hyper@anchorend
}%
diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def b/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def
index d35eac7487f..6b553f54c99 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def
@@ -29,7 +29,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{hvtexhtml.def}
- [2010/03/19 v6.80r
+ [2010/03/30 v6.80u
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 300c148c2a0..861b39192a1 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def
@@ -29,7 +29,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{hvtexmrk.def}
- [2010/03/19 v6.80r
+ [2010/03/30 v6.80u
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/hxetex.def b/Master/texmf-dist/tex/latex/hyperref/hxetex.def
index 496aaf12074..bf43bdc7a84 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hxetex.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hxetex.def
@@ -29,7 +29,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{hxetex.def}
- [2010/03/19 v6.80r
+ [2010/03/30 v6.80u
Hyperref driver for XeTeX]
\HyPsd@LoadUnicode
\Hy@unicodetrue
@@ -57,10 +57,10 @@
\ifx\HyPsd@temp\HyPsd@pdfencoding@auto
\let\HyPsd@pdfencoding\HyPsd@temp
\else
- \HyWarning{%
- XeTeX driver only supports `pdfencoding=unicode|auto.%
- \MessageBreak
- Ignoring option setting `pdfencoding=\HyPsd@temp'%
+ \Hy@Warning{%
+ XeTeX driver only supports\MessageBreak
+ `pdfencoding=unicode|auto'. Ignoring option\MessageBreak
+ setting `pdfencoding=\HyPsd@temp'%
}%
\fi
\fi
@@ -78,7 +78,7 @@
\endgroup
\fi
}%
- \AfterBeginDocument{%
+ \Hy@AtBeginDocument{%
\if@filesw
\immediate\write\@mainaux{%
\string\providecommand\string*\string\HyPL@Entry[1]{}%
@@ -156,7 +156,7 @@
\let#1\Hy@gtemp
}%
\fi
-\AtBeginDocument{%
+\Hy@AtBeginDocument{%
\ifHy@setpagesize
\expandafter\@firstofone
\else
@@ -356,7 +356,7 @@
}%
}%
}%
- \AtBeginDocument{%
+ \Hy@AtBeginDocument{%
\def\Hy@colorlink#1{%
\begingroup
\ifHy@ocgcolorlinks
@@ -1376,6 +1376,7 @@
\fi
\HyPsd@XeTeXBigCharstrue
\pdfstringdef\Hy@tempa{#2}%
+ \HyPsd@SanitizeForOutFile\Hy@tempa
\if@filesw
\stepcounter{bookmark@seq@number}%
\@ifundefined{@outlinefile}{%
@@ -1392,6 +1393,55 @@
\endgroup
}
\newcounter{bookmark@seq@number}
+\begingroup
+ \lccode`(=`{%
+ \lccode`)=`}%
+ \lccode`1=\z@
+ \lccode`2=\z@
+ \lccode`3=\z@
+ \lccode`5=\z@
+ \lccode`7=\z@
+ \lccode`\#=\z@
+ \lccode`\`=\z@
+ \lccode`\{=\z@
+ \lccode`\}=\z@
+\lowercase{%
+ \endgroup
+ \def\HyPsd@SanitizeForOutFile#1{%
+ \@onelevel@sanitize\Hy@tempa
+ \escapechar`\\%
+ \edef\Hy@tempa{%
+ \expandafter\HyPsd@SanitizeOut@BraceLeft\Hy@tempa(\@nil
+ }%
+ \edef\Hy@tempa{%
+ \expandafter\HyPsd@SanitizeOut@BraceRight\Hy@tempa)\@nil
+ }%
+ }%
+ \def\HyPsd@SanitizeOut@BraceLeft#1(#2\@nil{%
+ #1%
+ \ifx\\#2\\%
+ \expandafter\ltx@gobble
+ \else
+ \expandafter\ltx@firstofone
+ \fi
+ {%
+ \string\173%
+ \HyPsd@SanitizeOut@BraceLeft#2\@nil
+ }%
+ }%
+ \def\HyPsd@SanitizeOut@BraceRight#1)#2\@nil{%
+ #1%
+ \ifx\\#2\\%
+ \expandafter\ltx@gobble
+ \else
+ \expandafter\ltx@firstofone
+ \fi
+ {%
+ \string\175%
+ \HyPsd@SanitizeOut@BraceRight#2\@nil
+ }%
+ }%
+}
\newcommand{\currentpdfbookmark}{%
\pdfbookmark[\Hy@currentbookmarklevel]%
}
@@ -1428,6 +1478,17 @@
}
\def\ReadBookmarks{%
\begingroup
+ \def\do##1{%
+ \ifnum\catcode`##1=\active
+ \@makeother##1%
+ \else
+ \ifnum\catcode`##1=6 %
+ \@makeother##1%
+ \fi
+ \fi
+ }%
+ \dospecials
+ \Hy@safe@activestrue
\escapechar=`\\%
\let\escapechar\@gobble %
\def\@@BOOKMARK[##1][##2]##3##4##5{%
@@ -1459,8 +1520,8 @@
}%
}%
{%
- \def\WriteBookmarks{0}%
- \InputIfFileExists{\jobname.out}{}{}%
+ \def\WriteBookmarks{0}%
+ \InputIfFileExists{\jobname.out}{}{}%
}%
%{\escapechar\m@ne\InputIfFileExists{\jobname.out}{}{}}%
\ifx\WriteBookmarks\relax
@@ -1510,8 +1571,7 @@
}
\let\H@old@ssect\@ssect
\def\@ssect#1#2#3#4#5{%
- \Hy@GlobalStepCount\Hy@linkcounter
- \xdef\@currentHref{section*.\the\Hy@linkcounter}%
+ \Hy@MakeCurrentHrefAuto{section*}%
\setlength{\Hy@SectionHShift}{#1}%
\begingroup
\toks@{\H@old@ssect{#1}{#2}{#3}{#4}}%
@@ -1527,8 +1587,7 @@
\def\@schapter#1{%
\begingroup
\let\@mkboth\@gobbletwo
- \Hy@GlobalStepCount\Hy@linkcounter
- \xdef\@currentHref{\Hy@chapapp*.\the\Hy@linkcounter}%
+ \Hy@MakeCurrentHrefAuto{\Hy@chapapp*}%
\Hy@raisedlink{%
\hyper@anchorstart{\@currentHref}\hyper@anchorend
}%
@@ -1539,8 +1598,7 @@
\let\Hy@org@chapter\@chapter
\def\@chapter{%
\def\Hy@next{%
- \Hy@GlobalStepCount\Hy@linkcounter
- \xdef\@currentHref{\Hy@chapapp*.\the\Hy@linkcounter}%
+ \Hy@MakeCurrentHrefAuto{\Hy@chapapp*}%
\Hy@raisedlink{%
\hyper@anchorstart{\@currentHref}\hyper@anchorend
}%
@@ -1570,8 +1628,7 @@
}
\let\H@old@spart\@spart
\def\@spart#1{%
- \Hy@GlobalStepCount\Hy@linkcounter
- \xdef\@currentHref{part*.\the\Hy@linkcounter}%
+ \Hy@MakeCurrentHrefAuto{part*}%
\Hy@raisedlink{%
\hyper@anchorstart{\@currentHref}\hyper@anchorend
}%
@@ -1585,8 +1642,7 @@
\expandafter\@secondoftwo
\fi
{%
- \Hy@GlobalStepCount\Hy@linkcounter
- \xdef\@currentHref{section*.\the\Hy@linkcounter}%
+ \Hy@MakeCurrentHrefAuto{section*}%
\setlength{\Hy@SectionHShift}{#3}%
\begingroup
\toks@{\H@old@sect{#1}{#2}{#3}{#4}{#5}{#6}[{#7}]}%
@@ -1620,8 +1676,7 @@
\fi
\addtocontents{lof}{\protect\addvspace{10\p@}}%
\addtocontents{lot}{\protect\addvspace{10\p@}}%
- \Hy@GlobalStepCount\Hy@linkcounter
- \xdef\@currentHref{\Hy@chapapp*.\the\Hy@linkcounter}%
+ \Hy@MakeCurrentHrefAuto{\Hy@chapapp*}%
\Hy@raisedlink{%
\hyper@anchorstart{\@currentHref}\hyper@anchorend
}%
diff --git a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty
index eac583ba1c2..8e1c424a548 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty
+++ b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty
@@ -30,7 +30,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{hyperref}
- [2010/03/19 v6.80r
+ [2010/03/30 v6.80u
Hypertext links for LaTeX]
\begingroup
\@makeother\`%
@@ -114,6 +114,22 @@
\@ifundefined{AfterBeginDocument}{%
\def\AfterBeginDocument{\AtBeginDocument}%
}{}%
+\def\Hy@AtBeginDocument{%
+ \ltx@LocalAppendToMacro\Hy@AtBeginDocumentHook
+}
+\def\Hy@AtEndOfPackage{%
+ \ltx@LocalAppendToMacro\Hy@AtEndOfPackageHook
+}
+\def\Hy@AtBeginDocumentHook{}
+\def\Hy@AtEndOfPackageHook{}
+\AtEndOfPackage{%
+ \Hy@AtEndOfPackageHook
+ \let\Hy@AtEndOfPackageHook\@undefined
+ \AfterBeginDocument{%
+ \Hy@AtBeginDocumentHook{}%
+ \let\Hy@AtBeginDocumentHook\@undefined
+ }%
+}
\newif\ifHy@typexml
\newif\ifHy@activeanchor
\newif\ifHy@backref
@@ -348,6 +364,7 @@
}%
\HyPsd@GreekPatch
\HyPsd@SpanishPatch
+ \HyPsd@RussianPatch
\HyPsd@BabelPatch
\let\@safe@activestrue\relax
\let\@safe@activesfalse\relax
@@ -607,7 +624,7 @@
\let\c\HyLinguex@OrgC
\let\d\HyLinguex@OrgD
}%
- \AtEndOfPackage{%
+ \Hy@AtEndOfPackage{%
\pdfstringdefDisableCommands{%
\ltx@IfUndefined{oldb}{}{\let\b\oldb}%
\ltx@IfUndefined{oldc}{}{\let\c\oldc}%
@@ -713,7 +730,7 @@
}{}%
}
\Hy@temp
-\expandafter\AtBeginDocument\expandafter{\Hy@temp}
+\expandafter\Hy@AtBeginDocument\expandafter{\Hy@temp}
\newif\ifHy@next
\ltx@IfUndefined{danish@sh@"@sel}{}{%
\def\HyPsd@babel@danish{%
@@ -939,11 +956,16 @@
\HyPsd@@GreekNum#1{#5#6#7}%
}
\def\HyPsd@SpanishPatch{%
- \begingroup\expandafter\expandafter\expandafter\endgroup
- \expandafter\ifx\csname es@save@dot\endcsname\relax
- \else
+ \ltx@IfUndefined{es@save@dot}{%
+ }{%
\let\.\es@save@dot
- \fi
+ }%
+}
+\def\HyPsd@RussianPatch{%
+ \ltx@IfUndefined{russian@sh@"@-@}{%
+ }{%
+ \@namedef{russian@sh@"@-@}{-}%
+ }%
}
\RequirePackage{intcalc}[2007/09/27]
\def\HyPsd@CJKhook{%
@@ -2044,7 +2066,7 @@
}%
\fi
\@ifclassloaded{memoir}{%
- \AtEndOfPackage{\RequirePackage{memhfixc}}%
+ \Hy@AtEndOfPackage{\RequirePackage{memhfixc}}%
}{}
\@ifpackageloaded{subfigure}{%
\ltx@IfUndefined{sub@label}{%
@@ -2376,7 +2398,7 @@
\DeclareFontSubstitution{PU}{pdf}{m}{n}%
\global\let\HyPsd@LoadUnicode\relax
}
-\AtBeginDocument{%
+\Hy@AtBeginDocument{%
\ifx\HyPsd@LoadUnicode\relax
\else
\def\HyPsd@LoadUnicode{%
@@ -2436,7 +2458,7 @@
\RequirePackage{stringenc}[2009/12/15]%
\let\HyPsd@LoadStringEnc\relax
}
-\AtBeginDocument{%
+\Hy@AtBeginDocument{%
\@ifpackageloaded{stringenc}{%
\let\HyPsd@LoadStringEnc\relax
}{%
@@ -2477,7 +2499,7 @@
\def\Hy@driver{htex4ht}%
\def\MaybeStopEarly{%
\typeout{Hyperref stopped early}%
- \AfterBeginDocument{%
+ \Hy@AtBeginDocument{%
\PDF@FinishDoc
\gdef\PDF@FinishDoc{}%
}%
@@ -2531,7 +2553,7 @@
\def\Hy@driver{hvtexhtm}%
\def\MaybeStopEarly{%
\typeout{Hyperref stopped early}%
- \AfterBeginDocument{%
+ \Hy@AtBeginDocument{%
\PDF@FinishDoc
\gdef\PDF@FinishDoc{}%
}%
@@ -2579,7 +2601,7 @@
\def\Hy@driver{htexture}%
}
\define@key{Hyp}{latex2html}[true]{%
- \AtBeginDocument{\@@latextohtmlX}%
+ \Hy@AtBeginDocument{\@@latextohtmlX}%
}
\define@key{Hyp}{ps2pdf}[true]{%
\def\Hy@driver{hdvips}%
@@ -2885,7 +2907,7 @@
\HyLang@DeclareLang{hungarian}{magyar}{}
\define@key{Hyp}{vietnamese}[]{%
\HyLang@addto\extrasvietnamese\HyLang@vietnamese
- \AtEndOfPackage{%
+ \Hy@AtEndOfPackage{%
\@ifundefined{T@PU}{}{%
\input{puvnenc.def}%
}%
@@ -2893,14 +2915,14 @@
}
\define@key{Hyp}{vietnam}[]{%
\HyLang@addto\extrasvietnam\HyLang@vietnamese
- \AtEndOfPackage{%
+ \Hy@AtEndOfPackage{%
\@ifundefined{T@PU}{}{%
\input{puvnenc.def}%
}%
}%
}
\define@key{Hyp}{arabic}[]{%
- \AtEndOfPackage{%
+ \Hy@AtEndOfPackage{%
\@ifundefined{T@PU}{}{%
\input{puarenc.def}%
}%
@@ -2912,7 +2934,7 @@
\define@key{Hyp}{ocgcolorlinks}[true]{%
\Hy@boolkey{ocgcolorlinks}{#1}%
}
-\AtBeginDocument{%
+\Hy@AtBeginDocument{%
\begingroup
\@ifundefined{OBJ@OCG@view}{%
\ifHy@ocgcolorlinks
@@ -3466,7 +3488,7 @@
\let\phantomsection\@empty
\let\special@paper\@empty
\def\HyperDestNameFilter#1{#1}
-\AtBeginDocument{%
+\Hy@AtBeginDocument{%
\begingroup
\edef\x{\@ifundefined{stockheight}\paperheight\stockheight}%
\dimen@=\x\relax
@@ -3504,7 +3526,7 @@
}{}
\let\ReadBookmarks\relax
\ProcessKeyvalOptions{Hyp}
-\AtBeginDocument{%
+\Hy@AtBeginDocument{%
\ifHy@draft
\let\hyper@@anchor\@gobble
\gdef\hyper@link#1#2#3{#3}%
@@ -3607,7 +3629,7 @@
\Hy@Info{Backreferencing OFF}%
\fi
\ifHy@typexml
- \AtEndOfPackage{%
+ \Hy@AtEndOfPackage{%
\RequirePackage{color}%
\RequirePackage{nameref}%
}%
@@ -3619,13 +3641,13 @@
\typeout{Implicit mode OFF; no redefinition of LaTeX internals}%
\def\MaybeStopEarly{%
\typeout{Hyperref stopped early}%
- \AfterBeginDocument{%
+ \Hy@AtBeginDocument{%
\PDF@FinishDoc
\gdef\PDF@FinishDoc{}%
}%
\endinput
}%
- \AtBeginDocument{%
+ \Hy@AtBeginDocument{%
\let\autoref\ref
\let\autopageref\pageref
\ifx\@pdfpagemode\@empty
@@ -3633,13 +3655,13 @@
\fi
\global\Hy@backreffalse
}%
- \AtEndOfPackage{%
+ \Hy@AtEndOfPackage{%
\global\let\ReadBookmarks\relax
\global\let\WriteBookmarks\relax
}%
\fi
\Hy@DisableOption{implicit}
-\AtEndOfPackage{%
+\Hy@AtEndOfPackage{%
\@ifpackageloaded{tex4ht}{%
\def\Hy@driver{htex4ht}%
\Hy@texhttrue
@@ -3719,7 +3741,7 @@
\def\Hy@driver{hvtexhtm}%
\def\MaybeStopEarly{%
\typeout{Hyperref stopped early}%
- \AfterBeginDocument{%
+ \Hy@AtBeginDocument{%
\PDF@FinishDoc
\gdef\PDF@FinishDoc{}%
}%
@@ -3745,9 +3767,9 @@
\PassOptionsToPackage{dviwindo}{color}%
\fi
\fi
- \typeout{*hyperref using default driver \Hy@driver*}%
+ \typeout{* hyperref using default driver \Hy@driver\ltx@space*}%
\else
- \typeout{*hyperref using driver \Hy@driver*}%
+ \typeout{* hyperref using driver \Hy@driver\ltx@space*}%
\fi
\input{\Hy@driver.def}%
\let\@unprocessedoptions\relax
@@ -3784,7 +3806,7 @@
\Hy@DisableOption{latex2html}
\Hy@DisableOption{ps2pdf}
\Hy@DisableOption{xetex}
-\AtEndOfPackage{%
+\Hy@AtEndOfPackage{%
\Hy@DisableOption{pdfversion}%
}
\def\WriteBookmarks{0}
@@ -3807,7 +3829,7 @@
\else
\def\@bookmarkopenstatus#1{}%
\Hy@Info{Bookmarks OFF}%
- \AtEndOfPackage{%
+ \Hy@AtEndOfPackage{%
\global\let\ReadBookmarks\relax
\global\let\WriteBookmarks\relax
}%
@@ -3855,7 +3877,7 @@
#1\relax
\Hy@EndWrap
}
-\AtBeginDocument{%
+\Hy@AtBeginDocument{%
\ifHy@ocgcolorlinks
\setkeys{Hyp}{colorlinks}%
\ifHy@pdfa
@@ -3929,7 +3951,7 @@
\@ifstar\@pagerefstar\T@pageref
}%
}
-\AfterBeginDocument{%
+\Hy@AtBeginDocument{%
\ifHy@texht
\else
\Hy@CatcodeWrapper{%
@@ -4239,9 +4261,9 @@
\edef\filename@ext{\XR@ext}%
\fi
\def\use@file{\filename@area\filename@base.\filename@ext}%
- \ifx\filename@ext\XR@ext
+ \Hy@IfStringEndsWith\filename@ext\XR@ext{%
\hyper@linkfile{#2}{\use@file}{#3}%
- \else
+ }{%
\ifx\@baseurl\@empty
\hyper@linkurl{#2}{%
\Hy@linkfileprefix\use@file\ifx\\#3\\\else\hyper@hash#3\fi
@@ -4249,7 +4271,25 @@
\else
\hyper@linkurl{#2}{\use@file\ifx\\#3\\\else\hyper@hash#3\fi}%
\fi
- \fi
+ }%
+}
+\def\Hy@IfStringEndsWith#1#2{%
+ \begingroup
+ \edef\x{#1}%
+ \@onelevel@sanitize\x
+ \edef\x{.\x$}%
+ \edef\y{#2}%
+ \@onelevel@sanitize\y
+ \edef\y{.\y$}%
+ \expandafter\def\expandafter\z\expandafter##\expandafter1\y##2\@nil{%
+ \endgroup
+ \ifx\relax##2\relax
+ \expandafter\ltx@secondoftwo
+ \else
+ \expandafter\ltx@firstoftwo
+ \fi
+ }%
+ \expandafter\expandafter\expandafter\z\expandafter\x\y\@nil
}
\long\def\hyper@@anchor#1#2{\@hyper@@anchor#1\relax#2\relax}
\long\def\@hyper@@anchor#1\relax#2#3\relax{%
@@ -4762,8 +4802,9 @@
\Form@htmltrue
\def\Fld@export{html}%
\else
- \typeout{hyperref: form `encoding' key set to #1 %
- -- unknown type%
+ \Hy@Warning{%
+ Form `encoding' key with \MessageBreak
+ unknown value `#1'%
}%
\Form@htmlfalse
\fi
@@ -5076,7 +5117,7 @@
\edef\hyper@quote{\string"}
\let\@currentHref\@empty
\let\Hy@footnote@currentHref\@empty
-\AfterBeginDocument{%
+\Hy@AtBeginDocument{%
\Hy@pdfstringtrue
\PDF@SetupDoc
\let\PDF@SetupDoc\@empty
@@ -5148,7 +5189,7 @@
\def\endNoHyper{%
\global\let\hyper@link\hyper@livelink
}
-\AfterBeginDocument{%
+\Hy@AtBeginDocument{%
\if@filesw
\ifHy@typexml
\immediate\closeout\@mainaux
@@ -5156,26 +5197,34 @@
\immediate\write\@auxout{<relaxxml>\relax}%
\fi
\immediate\write\@auxout{%
- \string\ifx\string\hyper@anchor\string\@undefined^^J%
- \global\let\string\oldcontentsline\string\contentsline^^J%
- \gdef\string\contentsline%
- \string#1\string#2\string#3\string#4{%
- \string\oldcontentsline%
- {\string#1}{\string#2}{\string#3}}^^J%
- \global\let\string\oldnewlabel\string\newlabel^^J%
- \gdef\string\newlabel\string#1\string#2{%
- \string\newlabelxx{\string#1}\string#2}^^J%
- \gdef\string\newlabelxx%
- \string#1\string#2\string#3\string#4\string#5\string#6{%
- \string\oldnewlabel{\string#1}{{\string#2}{\string#3}}}^^J%
- \string\AtEndDocument{%
- \let\string\contentsline\string\oldcontentsline^^J%
- \let\string\newlabel\string\oldnewlabel}^^J%
- \string\else^^J%
- \global\let\string\hyper@last\relax^^J%
- \string\fi^^J%
+ \string\providecommand\string\HyperFirstAtBeginDocument{%
+ \string\AtBeginDocument}^^J%
+ \string\HyperFirstAtBeginDocument{%
+ \string\ifx\string\hyper@anchor\string\@undefined^^J%
+ \string\global\string\let\string\oldcontentsline\string\contentsline^^J%
+ \string\gdef\string\contentsline%
+ \string#1\string#2\string#3\string#4{%
+ \string\oldcontentsline%
+ {\string#1}{\string#2}{\string#3}}^^J%
+ \string\global\string\let\string\oldnewlabel\string\newlabel^^J%
+ \string\gdef\string\newlabel\string#1\string#2{%
+ \string\newlabelxx{\string#1}\string#2}^^J%
+ \string\gdef\string\newlabelxx%
+ \string#1\string#2\string#3\string#4\string#5\string#6{%
+ \string\oldnewlabel{\string#1}{{\string#2}{\string#3}}}^^J%
+ \string\AtEndDocument{%
+ \string\ifx\string\hyper@anchor\string\@undefined^^J%
+ \string\let\string\contentsline\string\oldcontentsline^^J%
+ \string\let\string\newlabel\string\oldnewlabel^^J%
+ \string\fi%
+ }^^J%
+ \string\fi%
+ }^^J%
+ \string\global\string\let\string\hyper@last\relax^^J%
+ \string\gdef\string\HyperFirstAtBeginDocument\string#1{\string#1}%
}%
\fi
+ \def\HyperFirstAtBeginDocument#1{#1}%
\ifx\hyper@last\@undefined
\def\@starttoc#1{%
\begingroup
@@ -5564,9 +5613,9 @@
\fi
\ifHy@naturalnames
\let\textlatin\@firstofone
- \xdef\Hy@GlobalTempHlabel{\csname the#1\endcsname}%
+ \xdef\HyperGlobalCurrentHref{\csname the#1\endcsname}%
\else
- \xdef\Hy@GlobalTempHlabel{%
+ \xdef\HyperGlobalCurrentHref{%
\csname
the%
\expandafter\ifx\csname theH#1\endcsname\relax\else H\fi
@@ -5574,22 +5623,37 @@
\endcsname
}%
\fi
- \xdef\Hy@GlobalTempHref{%
- \Hy@param.\expandafter\strip@prefix\meaning\Hy@GlobalTempHlabel
+ \xdef\HyperGlobalCurrentHref{%
+ \Hy@param.\expandafter\strip@prefix\meaning\HyperGlobalCurrentHref
}%
\else
\Hy@GlobalStepCount\Hy@linkcounter
- \xdef\Hy@GlobalTempHref{\Hy@param.\the\Hy@linkcounter}%
+ \xdef\HyperGlobalCurrentHref{\Hy@param.\the\Hy@linkcounter}%
\fi
\endgroup
+ \let\HyperLocalCurrentHref\HyperGlobalCurrentHref
+ \ifHy@localanchorname
+ \let\@currentHref\HyperLocalCurrentHref
+ \else
+ \global\let\@currentHref\HyperGlobalCurrentHref
+ \fi
+}
+\def\Hy@MakeCurrentHref#1{%
+ \edef\HyperLocalCurrentHref{#1}%
+ \@onelevel@sanitize\HyperLocalCurrentHref
+ \global\let\HyperGlobalCurrentHref\HyperLocalCurrentHref
+ \let\HyperLocalCurrentHref\HyperGlobalCurrentHref
\ifHy@localanchorname
- \let\@currentHlabel\Hy@GlobalTempHlabel
- \let\@currentHref\Hy@GlobalTempHref
+ \let\@currentHref\HyperLocalCurrentHref
\else
- \global\let\@currentHlabel\Hy@GlobalTempHlabel
- \global\let\@currentHref\Hy@GlobalTempHref
+ \global\let\@currentHref\HyperGlobalCurrentHref
\fi
}
+\def\Hy@MakeCurrentHrefAuto#1{%
+ \Hy@GlobalStepCount\Hy@linkcounter
+ \Hy@MakeCurrentHref{#1.\the\Hy@linkcounter}%
+}
+\def\@currentHlabel{\@currentHref}
\@ifpackageloaded{fancyvrb}{%
\@ifpackagelater{fancyvrb}{1998/05/20}{}{%
\def\FV@StepLineNo{%
@@ -5599,7 +5663,7 @@
}%
}%
}{}
-\AtBeginDocument{%
+\Hy@AtBeginDocument{%
\@ifclassloaded{revtex4}{%
\@namedef{ver@lastpage.sty}{1994/06/25}%
}{}%
@@ -5655,8 +5719,7 @@
\def\hypergetpageref#1{\getrefbykeydefault{#1}{page}{0}}
\@ifpackageloaded{titlesec}{%
\def\ttl@Hy@steplink#1{%
- \Hy@GlobalStepCount\Hy@linkcounter
- \xdef\@currentHref{#1*.\the\Hy@linkcounter}%
+ \Hy@MakeCurrentHrefAuto{#1*}%
\edef\ttl@Hy@saveanchor{%
\noexpand\Hy@raisedlink{%
\noexpand\hyper@anchorstart{\@currentHref}%
@@ -5708,7 +5771,6 @@
\expandafter\def\y[##1]##2{%
\H@refstepcounter{#1}%
\hyper@makecurrent{table}%
- \let\Hy@LT@currentHlabel\@currentHlabel
\let\Hy@LT@currentHref\@currentHref
#2\@sharp#####4%
}%
@@ -5719,7 +5781,6 @@
\endgroup
\def\LT@start{%
#1%
- \let\@currentHlabel\Hy@LT@currentHlabel
\let\@currentHref\Hy@LT@currentHref
\Hy@raisedlink{%
\hyper@anchorstart{\@currentHref}\hyper@anchorend
@@ -5871,6 +5932,7 @@
\else
\H@refstepcounter{#2}%
\hyper@makecurrent{#2}%
+ \let\Hy@dth@currentHref\@currentHref
\def\@tempa{%
\@oparg{\@begintheorem{#3}{\csname the#2\endcsname}}[]%
}%
@@ -5892,7 +5954,10 @@
\ifx\@empty\dth@counter
\else
\Hy@raisedlink{%
- \hyper@anchorstart{\@currentHref}\hyper@anchorend
+ \hyper@anchorstart{%
+ \ltx@ifundefined{Hy@dth@currentHref}%
+ \@currentHref\Hy@dth@currentHref
+ }\hyper@anchorend
}%
\fi
\unhbox\@labels
@@ -5955,7 +6020,6 @@
\Hy@footnote@currentHref
}{\relax}%
}%
- \let\@currentHlabel\Hy@footnote@currentHlabel
\let\@currentHref\Hy@footnote@currentHref
\let\@currentlabelname\@empty
#1%
@@ -5966,12 +6030,9 @@
\leavevmode
\ifhmode\edef\@x@sf{\the\spacefactor}\nobreak\fi
\stepcounter{Hfootnote}%
- \global\let\Hy@saved@currentHlabel\@currentHlabel
\global\let\Hy@saved@currentHref\@currentHref
\hyper@makecurrent{Hfootnote}%
- \global\let\Hy@footnote@currentHlabel\@currentHlabel
\global\let\Hy@footnote@currentHref\@currentHref
- \global\let\@currentHlabel\Hy@saved@currentHlabel
\global\let\@currentHref\Hy@saved@currentHref
\hyper@linkstart{link}{\Hy@footnote@currentHref}%
\@makefnmark
@@ -5997,29 +6058,27 @@
\noexpand\protected@xdef\noexpand\@thefnmark{%
\noexpand\thempfn
}%
- \expandafter\expandafter\expandafter\noexpand
- \expandafter\expandafter\expandafter\Hy@LT@footnotetext
- \expandafter\expandafter\expandafter{%
- \expandafter\Hy@footnote@currentHref\expandafter
- }\expandafter{\Hy@footnote@currentHlabel}%
+ \expandafter\noexpand\expandafter\Hy@LT@footnotetext
+ \expandafter{%
+ \Hy@footnote@currentHref
+ }%
}%
\global\LT@p@ftn\expandafter{%
\@tempa{#1}%
\endgroup
}%
}%
- \long\def\Hy@LT@footnotetext#1#2#3{%
+ \long\def\Hy@LT@footnotetext#1#2{%
\H@@footnotetext{%
\ifHy@nesting
- \hyper@@anchor{#1}{#3}%
+ \hyper@@anchor{#1}{#2}%
\else
\Hy@raisedlink{%
\hyper@@anchor{#1}{\relax}%
}%
- \def\@currentHlabel{#2}%
\def\@currentHref{#1}%
\let\@currentlabelname\@empty
- #3%
+ #2%
\fi
}%
}%
@@ -6045,7 +6104,6 @@
\Hy@footnote@currentHref
}{\relax}%
}%
- \let\@currentHlabel\Hy@footnote@currentHlabel
\let\@currentHref\Hy@footnote@currentHref
\let\@currentlabelname\@empty
\ignorespaces
@@ -6319,7 +6377,7 @@
}%
}{}
\@ifpackageloaded{harvard}{%
- \AtBeginDocument{%
+ \Hy@AtBeginDocument{%
\Hy@Info{*** compatibility with harvard **** }%
\Hy@raiselinksfalse
\def\harvardcite#1#2#3#4{%
@@ -6548,8 +6606,7 @@
}
\@ifpackageloaded{amsmath}{%
\def\Hy@make@anchor{%
- \Hy@GlobalStepCount\Hy@linkcounter
- \xdef\@currentHref{AMS.\the\Hy@linkcounter}%
+ \Hy@MakeCurrentHrefAuto{AMS}%
\Hy@raisedlink{\hyper@anchorstart{\@currentHref}\hyper@anchorend}%
}%
\def\Hy@make@df@tag@@#1{%
@@ -7025,7 +7082,7 @@
\def\@pagerefstar#1{%
\HyRef@StarSetRef{#1}\@secondoffive
}
-\AtBeginDocument{%
+\Hy@AtBeginDocument{%
\@ifpackageloaded{varioref}{%
\def\@Refstar#1{%
\HyRef@StarSetRef{#1}\HyRef@MakeUppercaseFirstOfFive
@@ -7172,7 +7229,7 @@
\@ifpackageloaded{showkeys}{%
\HyRef@ShowKeysInit
}{%
- \AtBeginDocument{%
+ \Hy@AtBeginDocument{%
\@ifpackageloaded{showkeys}{%
\HyRef@ShowKeysInit
}{}%
@@ -7200,8 +7257,7 @@
\providecommand*\pageautorefname{page}
\providecommand*{\Hy@DistillerDestFix}{}
\def\phantomsection{%
- \Hy@GlobalStepCount\Hy@linkcounter
- \xdef\@currentHref{section*.\the\Hy@linkcounter}%
+ \Hy@MakeCurrentHrefAuto{section*}%
\Hy@raisedlink{\hyper@anchorstart{\@currentHref}\hyper@anchorend}%
}
\endinput
diff --git a/Master/texmf-dist/tex/latex/hyperref/hypertex.def b/Master/texmf-dist/tex/latex/hyperref/hypertex.def
index c1511c35686..76a4f7ae4f0 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hypertex.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hypertex.def
@@ -29,7 +29,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{hypertex.def}
- [2010/03/19 v6.80r
+ [2010/03/30 v6.80u
Hyperref driver for HyperTeX specials]
\providecommand*{\XR@ext}{dvi}
\def\PDF@FinishDoc{}
@@ -162,8 +162,7 @@
}
\let\H@old@ssect\@ssect
\def\@ssect#1#2#3#4#5{%
- \Hy@GlobalStepCount\Hy@linkcounter
- \xdef\@currentHref{section*.\the\Hy@linkcounter}%
+ \Hy@MakeCurrentHrefAuto{section*}%
\setlength{\Hy@SectionHShift}{#1}%
\begingroup
\toks@{\H@old@ssect{#1}{#2}{#3}{#4}}%
@@ -179,8 +178,7 @@
\def\@schapter#1{%
\begingroup
\let\@mkboth\@gobbletwo
- \Hy@GlobalStepCount\Hy@linkcounter
- \xdef\@currentHref{\Hy@chapapp*.\the\Hy@linkcounter}%
+ \Hy@MakeCurrentHrefAuto{\Hy@chapapp*}%
\Hy@raisedlink{%
\hyper@anchorstart{\@currentHref}\hyper@anchorend
}%
@@ -191,8 +189,7 @@
\let\Hy@org@chapter\@chapter
\def\@chapter{%
\def\Hy@next{%
- \Hy@GlobalStepCount\Hy@linkcounter
- \xdef\@currentHref{\Hy@chapapp*.\the\Hy@linkcounter}%
+ \Hy@MakeCurrentHrefAuto{\Hy@chapapp*}%
\Hy@raisedlink{%
\hyper@anchorstart{\@currentHref}\hyper@anchorend
}%
@@ -222,8 +219,7 @@
}
\let\H@old@spart\@spart
\def\@spart#1{%
- \Hy@GlobalStepCount\Hy@linkcounter
- \xdef\@currentHref{part*.\the\Hy@linkcounter}%
+ \Hy@MakeCurrentHrefAuto{part*}%
\Hy@raisedlink{%
\hyper@anchorstart{\@currentHref}\hyper@anchorend
}%
@@ -237,8 +233,7 @@
\expandafter\@secondoftwo
\fi
{%
- \Hy@GlobalStepCount\Hy@linkcounter
- \xdef\@currentHref{section*.\the\Hy@linkcounter}%
+ \Hy@MakeCurrentHrefAuto{section*}%
\setlength{\Hy@SectionHShift}{#3}%
\begingroup
\toks@{\H@old@sect{#1}{#2}{#3}{#4}{#5}{#6}[{#7}]}%
@@ -263,8 +258,7 @@
\fi
\addtocontents{lof}{\protect\addvspace{10\p@}}%
\addtocontents{lot}{\protect\addvspace{10\p@}}%
- \Hy@GlobalStepCount\Hy@linkcounter
- \xdef\@currentHref{\Hy@chapapp*.\the\Hy@linkcounter}%
+ \Hy@MakeCurrentHrefAuto{\Hy@chapapp*}%
\Hy@raisedlink{%
\hyper@anchorstart{\@currentHref}\hyper@anchorend
}%
diff --git a/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty b/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty
index dfca430f5a9..b33af3b204b 100644
--- a/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty
+++ b/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty
@@ -30,7 +30,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{nohyperref}
- [2010/03/19 v6.80r
+ [2010/03/30 v6.80u
Dummy hyperref (SR)]
\RequirePackage{letltxmacro}[2008/06/13]
\let\hyper@@anchor\@gobble
diff --git a/Master/texmf-dist/tex/latex/hyperref/pd1enc.def b/Master/texmf-dist/tex/latex/hyperref/pd1enc.def
index 4a8e39edb54..7a34a92e4c5 100644
--- a/Master/texmf-dist/tex/latex/hyperref/pd1enc.def
+++ b/Master/texmf-dist/tex/latex/hyperref/pd1enc.def
@@ -29,7 +29,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{pd1enc.def}
- [2010/03/19 v6.80r
+ [2010/03/30 v6.80u
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 6fa1a06d1e9..225fa7b92ea 100644
--- a/Master/texmf-dist/tex/latex/hyperref/pdfmark.def
+++ b/Master/texmf-dist/tex/latex/hyperref/pdfmark.def
@@ -29,7 +29,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{pdfmark.def}
- [2010/03/19 v6.80r
+ [2010/03/30 v6.80u
Hyperref definitions for pdfmark specials]
\begingroup
\@ifundefined{headerps@out}{}{%
@@ -63,7 +63,7 @@
\endgroup
\fi
}%
- \AfterBeginDocument{%
+ \Hy@AtBeginDocument{%
\if@filesw
\immediate\write\@mainaux{%
\string\providecommand\string*\string\HyPL@Entry[1]{}%
@@ -1535,6 +1535,7 @@
\fi
\HyPsd@XeTeXBigCharstrue
\pdfstringdef\Hy@tempa{#2}%
+ \HyPsd@SanitizeForOutFile\Hy@tempa
\if@filesw
\stepcounter{bookmark@seq@number}%
\@ifundefined{@outlinefile}{%
@@ -1551,6 +1552,55 @@
\endgroup
}
\newcounter{bookmark@seq@number}
+\begingroup
+ \lccode`(=`{%
+ \lccode`)=`}%
+ \lccode`1=\z@
+ \lccode`2=\z@
+ \lccode`3=\z@
+ \lccode`5=\z@
+ \lccode`7=\z@
+ \lccode`\#=\z@
+ \lccode`\`=\z@
+ \lccode`\{=\z@
+ \lccode`\}=\z@
+\lowercase{%
+ \endgroup
+ \def\HyPsd@SanitizeForOutFile#1{%
+ \@onelevel@sanitize\Hy@tempa
+ \escapechar`\\%
+ \edef\Hy@tempa{%
+ \expandafter\HyPsd@SanitizeOut@BraceLeft\Hy@tempa(\@nil
+ }%
+ \edef\Hy@tempa{%
+ \expandafter\HyPsd@SanitizeOut@BraceRight\Hy@tempa)\@nil
+ }%
+ }%
+ \def\HyPsd@SanitizeOut@BraceLeft#1(#2\@nil{%
+ #1%
+ \ifx\\#2\\%
+ \expandafter\ltx@gobble
+ \else
+ \expandafter\ltx@firstofone
+ \fi
+ {%
+ \string\173%
+ \HyPsd@SanitizeOut@BraceLeft#2\@nil
+ }%
+ }%
+ \def\HyPsd@SanitizeOut@BraceRight#1)#2\@nil{%
+ #1%
+ \ifx\\#2\\%
+ \expandafter\ltx@gobble
+ \else
+ \expandafter\ltx@firstofone
+ \fi
+ {%
+ \string\175%
+ \HyPsd@SanitizeOut@BraceRight#2\@nil
+ }%
+ }%
+}
\newcommand{\currentpdfbookmark}{%
\pdfbookmark[\Hy@currentbookmarklevel]%
}
@@ -1587,6 +1637,17 @@
}
\def\ReadBookmarks{%
\begingroup
+ \def\do##1{%
+ \ifnum\catcode`##1=\active
+ \@makeother##1%
+ \else
+ \ifnum\catcode`##1=6 %
+ \@makeother##1%
+ \fi
+ \fi
+ }%
+ \dospecials
+ \Hy@safe@activestrue
\escapechar=`\\%
\let\escapechar\@gobble %
\def\@@BOOKMARK[##1][##2]##3##4##5{%
@@ -1606,8 +1667,8 @@
}%
}%
{%
- \def\WriteBookmarks{0}%
- \InputIfFileExists{\jobname.out}{}{}%
+ \def\WriteBookmarks{0}%
+ \InputIfFileExists{\jobname.out}{}{}%
}%
%{\escapechar\m@ne\InputIfFileExists{\jobname.out}{}{}}%
\ifx\WriteBookmarks\relax
@@ -1657,8 +1718,7 @@
}
\let\H@old@ssect\@ssect
\def\@ssect#1#2#3#4#5{%
- \Hy@GlobalStepCount\Hy@linkcounter
- \xdef\@currentHref{section*.\the\Hy@linkcounter}%
+ \Hy@MakeCurrentHrefAuto{section*}%
\setlength{\Hy@SectionHShift}{#1}%
\begingroup
\toks@{\H@old@ssect{#1}{#2}{#3}{#4}}%
@@ -1674,8 +1734,7 @@
\def\@schapter#1{%
\begingroup
\let\@mkboth\@gobbletwo
- \Hy@GlobalStepCount\Hy@linkcounter
- \xdef\@currentHref{\Hy@chapapp*.\the\Hy@linkcounter}%
+ \Hy@MakeCurrentHrefAuto{\Hy@chapapp*}%
\Hy@raisedlink{%
\hyper@anchorstart{\@currentHref}\hyper@anchorend
}%
@@ -1686,8 +1745,7 @@
\let\Hy@org@chapter\@chapter
\def\@chapter{%
\def\Hy@next{%
- \Hy@GlobalStepCount\Hy@linkcounter
- \xdef\@currentHref{\Hy@chapapp*.\the\Hy@linkcounter}%
+ \Hy@MakeCurrentHrefAuto{\Hy@chapapp*}%
\Hy@raisedlink{%
\hyper@anchorstart{\@currentHref}\hyper@anchorend
}%
@@ -1717,8 +1775,7 @@
}
\let\H@old@spart\@spart
\def\@spart#1{%
- \Hy@GlobalStepCount\Hy@linkcounter
- \xdef\@currentHref{part*.\the\Hy@linkcounter}%
+ \Hy@MakeCurrentHrefAuto{part*}%
\Hy@raisedlink{%
\hyper@anchorstart{\@currentHref}\hyper@anchorend
}%
@@ -1732,8 +1789,7 @@
\expandafter\@secondoftwo
\fi
{%
- \Hy@GlobalStepCount\Hy@linkcounter
- \xdef\@currentHref{section*.\the\Hy@linkcounter}%
+ \Hy@MakeCurrentHrefAuto{section*}%
\setlength{\Hy@SectionHShift}{#3}%
\begingroup
\toks@{\H@old@sect{#1}{#2}{#3}{#4}{#5}{#6}[{#7}]}%
@@ -1767,8 +1823,7 @@
\fi
\addtocontents{lof}{\protect\addvspace{10\p@}}%
\addtocontents{lot}{\protect\addvspace{10\p@}}%
- \Hy@GlobalStepCount\Hy@linkcounter
- \xdef\@currentHref{\Hy@chapapp*.\the\Hy@linkcounter}%
+ \Hy@MakeCurrentHrefAuto{\Hy@chapapp*}%
\Hy@raisedlink{%
\hyper@anchorstart{\@currentHref}\hyper@anchorend
}%
diff --git a/Master/texmf-dist/tex/latex/hyperref/puarenc.def b/Master/texmf-dist/tex/latex/hyperref/puarenc.def
index 15caad3bdbf..df9d03cc7c7 100644
--- a/Master/texmf-dist/tex/latex/hyperref/puarenc.def
+++ b/Master/texmf-dist/tex/latex/hyperref/puarenc.def
@@ -29,7 +29,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{puarenc.def}
- [2010/03/19 v6.80r
+ [2010/03/30 v6.80u
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 75a2808729c..860dcce3f7b 100644
--- a/Master/texmf-dist/tex/latex/hyperref/puenc.def
+++ b/Master/texmf-dist/tex/latex/hyperref/puenc.def
@@ -29,7 +29,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{puenc.def}
- [2010/03/19 v6.80r
+ [2010/03/30 v6.80u
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 7c5ab70909c..1aac271d732 100644
--- a/Master/texmf-dist/tex/latex/hyperref/puvnenc.def
+++ b/Master/texmf-dist/tex/latex/hyperref/puvnenc.def
@@ -29,7 +29,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{puvnenc.def}
- [2010/03/19 v6.80r
+ [2010/03/30 v6.80u
Hyperref: Additions to puenc.def for VnTeX]
\DeclareTextCommand{\abreve}{PU}{\81\003}
\DeclareTextCommand{\acircumflex}{PU}{\80\342}