summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-09-18 00:07:43 +0000
committerKarl Berry <karl@freefriends.org>2010-09-18 00:07:43 +0000
commit122d749a0aa11870aba704eb168d86722b47457c (patch)
treecf629386298af9bb64400dfd9b15dbecbeb9f382
parentabb06c39927dee255284ee41af720b3f53d23dd6 (diff)
hyperref update (17sep10)
git-svn-id: svn://tug.org/texlive/trunk@19782 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/hyperref/ChangeLog13
-rw-r--r--Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdfbin321037 -> 321944 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hyperref/backref.pdf4
-rw-r--r--Master/texmf-dist/doc/latex/hyperref/hyperref.pdfbin3662224 -> 3670736 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hyperref/nameref.pdf4
-rw-r--r--Master/texmf-dist/source/latex/hyperref/hyperref.dtx102
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def4
-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.def6
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/hpdftex.def4
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg2
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/htex4ht.def6
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/htexture.def6
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/hvtex.def6
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def6
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def2
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/hxetex.def4
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/hyperref.sty65
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/hypertex.def6
-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.def6
-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, 169 insertions, 91 deletions
diff --git a/Master/texmf-dist/doc/latex/hyperref/ChangeLog b/Master/texmf-dist/doc/latex/hyperref/ChangeLog
index f0d89e2e90b..d437534e0a3 100644
--- a/Master/texmf-dist/doc/latex/hyperref/ChangeLog
+++ b/Master/texmf-dist/doc/latex/hyperref/ChangeLog
@@ -1,3 +1,16 @@
+2010-09-17 6.81q Heiko Oberdiek
+ * 6.81q
+ * Broken error messages because of broken \Hy@Error fixed.
+
+2010-09-17 6.81p Heiko Oberdiek
+ * 6.81p
+ * Sanitizing (babel shorthands) of anchor names in
+ \hyper@anchor and \hyper@anchorstart.
+
+2010-09-16 6.81o Heiko Oberdiek
+ * 6.81o
+ * Broken option `pdfborder' fixed (since 6.81n).
+
2010-09-13 6.81n Heiko Oberdiek
* 6.81n
* New option `driverfallback'. It takes a driver option for
diff --git a/Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf b/Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf
index f9d3b6994f3..7ec6d6c8b2f 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 b0e5c515ecb..f578167db7c 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:20100914225816+02'00')/Subject(Bibliographical back referencing)/Creator(LaTeX with hyperref package)/Author(David Carlisle and Sebastian Rahtz)/Trapped/False/Producer(pdfTeX-1.40.11)/CreationDate(D:20100914225816+02'00')/PTEX.Fullbanner(This is pdfTeX, Version 3.1415926-1.40.11-2.2 (TeX Live 2010) kpathsea version 6.0.0)/Title(Back referencing from bibliographical citations)>>
+6 0 obj<</ModDate(D:20100917080221+02'00')/Subject(Bibliographical back referencing)/Creator(LaTeX with hyperref package)/Author(David Carlisle and Sebastian Rahtz)/Trapped/False/Producer(pdfTeX-1.40.11)/CreationDate(D:20100917080221+02'00')/PTEX.Fullbanner(This is pdfTeX, Version 3.1415926-1.40.11-2.2 (TeX Live 2010) kpathsea version 6.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
@@ -3899,7 +3899,7 @@ endobj
endobj
1477 0 obj<</D(HD.J.2)/S/GoTo>>
endobj
-1478 0 obj<</Type/XRef/Filter/FlateDecode/W[0 3 0]/Root 1 0 R/ID[(>/jrN#ҷK
+1478 0 obj<</Type/XRef/Filter/FlateDecode/W[0 3 0]/Root 1 0 R/ID[(p.GЄF;)(nuKtj>!a`l)]/Compress<</SpecO/1.5/LengthO 435818>>/Info 6 0 R/DecodeParms<</Predictor 12/Columns 3>>/Size 1479/Length 1078>>stream
xڽXMlMAGņ і&TIKh J{>I %(j"% ?D$vb#;j#!!T|͹j;s̙3g~1 C0^4
&J-QA;"X9B>;_hv<B#;$!R2PfmiRxP*b v+ゕ65U8JǁY6mcf}lJp lcIJVe&#c\]
Suĥe*1zW9ɉcmgz|yǖd͓5+P!Ȟ<r`_׷ṠnhduЌћ֦|E[=S3k4TK̙59dsO[kVoa{\2ozθA;n^u4]XrcSc6b3+9%1#A94g7
diff --git a/Master/texmf-dist/doc/latex/hyperref/hyperref.pdf b/Master/texmf-dist/doc/latex/hyperref/hyperref.pdf
index 5dac93c2277..d603b59897c 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 566200d13f9..ca285dff2c2 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[13 0 R/FitBH 752.95145]/S/GoTo>>
endobj
-6 0 obj<</ModDate(D:20100914225823+02'00')/Subject(Cross-referencing by name of section)/Creator(LaTeX with hyperref package)/Author(Sebastian Rahtz)/Trapped/False/Producer(pdfTeX-1.40.11)/CreationDate(D:20100914225823+02'00')/PTEX.Fullbanner(This is pdfTeX, Version 3.1415926-1.40.11-2.2 (TeX Live 2010) kpathsea version 6.0.0)/Title(Section name references in LaTeX)>>
+6 0 obj<</ModDate(D:20100917080227+02'00')/Subject(Cross-referencing by name of section)/Creator(LaTeX with hyperref package)/Author(Sebastian Rahtz)/Trapped/False/Producer(pdfTeX-1.40.11)/CreationDate(D:20100917080227+02'00')/PTEX.Fullbanner(This is pdfTeX, Version 3.1415926-1.40.11-2.2 (TeX Live 2010) kpathsea version 6.0.0)/Title(Section name references in LaTeX)>>
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
@@ -3775,7 +3775,7 @@ endobj
endobj
1411 0 obj<</D(HD.N.2)/S/GoTo>>
endobj
-1412 0 obj<</Type/XRef/Filter/FlateDecode/W[0 3 0]/Root 1 0 R/ID[(4-_{8dޘR)([;\\dJ/p)]/Compress<</SpecO/1.5/LengthO 420054>>/Info 6 0 R/DecodeParms<</Predictor 12/Columns 3>>/Size 1413/Length 1022>>stream
+1412 0 obj<</Type/XRef/Filter/FlateDecode/W[0 3 0]/Root 1 0 R/ID[(uۂh᥂AB[)(ꔱݻ`f)]/Compress<</SpecO/1.5/LengthO 420054>>/Info 6 0 R/DecodeParms<</Predictor 12/Columns 3>>/Size 1413/Length 1022>>stream
xڽXoMAT*,BiRTJ|DhGЅ ‚ZՏ H,l|$""Bkw}o:w~j̙3gΙ;W0cs!& Y6
n!$o/o0&^.|[u0a/C
9VVj
diff --git a/Master/texmf-dist/source/latex/hyperref/hyperref.dtx b/Master/texmf-dist/source/latex/hyperref/hyperref.dtx
index f56ee4d783a..f22d44e30e2 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/09/13 v6.81n
+%<!none> [2010/09/17 v6.81q
%<package> Hypertext links for LaTeX]
%<nohyperref> Dummy hyperref (SR)]
%<driver> Hyperref documentation driver file]
@@ -126,7 +126,7 @@
\end{document}
%</driver>
% \fi
-% \CheckSum{27751}
+% \CheckSum{27800}
%
% \MakeShortVerb{|}
% \StopEventually{}
@@ -575,10 +575,10 @@
\RequirePackage{ifxetex}[2006/08/21]
\RequirePackage{hycolor}
\RequirePackage{letltxmacro}[2008/06/13]
-\def\Hy@Error#1{\@PackageError{hyperref}}
-\def\Hy@Warning#1{\@PackageWarning{hyperref}{#1}}
-\def\Hy@WarningNoLine#1{\@PackageWarningNoLine{hyperref}{#1}}
-\def\Hy@Info#1{\@PackageInfo{hyperref}{#1}}
+\def\Hy@Error{\@PackageError{hyperref}}
+\def\Hy@Warning{\@PackageWarning{hyperref}}
+\def\Hy@WarningNoLine{\@PackageWarningNoLine{hyperref}}
+\def\Hy@Info{\@PackageInfo{hyperref}}
\def\Hy@InfoNoLine{\@PackageInfoNoLine{hyperref}}
\def\Hy@Message#1{%
\GenericWarning{%
@@ -610,12 +610,20 @@
\edef\{{\ltx@backslashchar\ltx@leftbracechar}%
\edef\}{\ltx@rightbracechar}%
\edef\\{\ltx@backslashchar\ltx@backslashchar}%
- \ifnum\pdfmatch{#2}{#1}=\ltx@one
+ \ifcase\pdfmatch{#2}{#1} %
+ \endgroup
+ \expandafter\ltx@secondoftwo
+ \or
\endgroup
\expandafter\ltx@firstoftwo
\else
+ \Hy@Warning{%
+ Internal error: Wrong pattern!\MessageBreak
+ --> #2 <--\MessageBreak
+ Pattern check ignored%
+ }%
\endgroup
- \expandafter\ltx@secondoftwo
+ \expandafter\ltx@firstoftwo
\fi
}%
}
@@ -5824,20 +5832,20 @@
\do{/P}{Push}%
}
\define@key{Hyp}{pdfborder}{%
- \def\Hy@temp{#1}%
- \Hy@Match\Hy@temp{%
- ^(\HyPat@NonNegativeReal/ %
- \HyPat@NonNegativeReal/ %
- \HyPat@NonNegativeReal/%
- ( ?[\HyPat@NonNegativeReal/( \HyPat@NonNegativeReal/)*])?)$%
- }{%
- \let\@pdfborder\Hy@temp
- }{%
+ \let\Hy@temp\@pdfborder
+ \def\@pdfborder{#1}%
+ \Hy@Match\@pdfborder{%
+ ^\HyPat@NonNegativeReal/ %
+ \HyPat@NonNegativeReal/ %
+ \HyPat@NonNegativeReal/%
+ ( ?\[\HyPat@NonNegativeReal/( \HyPat@NonNegativeReal/)*])?$%
+ }{}{%
\Hy@Warning{%
- Invalid value `\Hy@temp'\MessageBreak
+ Invalid value `\@pdfborder'\MessageBreak
for option `pdfborder'.\MessageBreak
Option setting is ignored%
}%
+ \let\@pdfborder\Hy@temp
}%
}
\define@key{Hyp}{pdfborderstyle}{\def\@pdfborderstyle{#1}}
@@ -6438,6 +6446,32 @@
% \end{macrocode}
%
% \begin{macrocode}
+\def\Hy@wrapper@babel#1#2{%
+ \begingroup
+ \Hy@safe@activestrue
+ \set@display@protect
+ \edef\x{#2}%
+ \@onelevel@sanitize\x
+ \toks@{#1}%
+ \edef\x{\endgroup\the\toks@{\x}}%
+ \x
+}
+\def\Hy@WrapperDef#1{%
+ \begingroup
+ \escapechar=\m@ne
+ \xdef\Hy@gtemp{%
+ \expandafter\noexpand\csname HyWrap@\string#1\endcsname
+ }%
+ \endgroup
+ \edef#1{%
+ \noexpand\Hy@wrapper@babel
+ \expandafter\noexpand\Hy@gtemp
+ }%
+ \expandafter\def\Hy@gtemp
+}
+% \end{macrocode}
+%
+% \begin{macrocode}
\ifHy@figures
\Hy@Info{Hyper figures ON}%
\else
@@ -12176,7 +12210,7 @@
% \end{macrocode}
% First define the anchors:
% \begin{macrocode}
-\def\new@pdflink#1{%
+\Hy@WrapperDef\new@pdflink#1{%
\ifhmode
\@savsf\spacefactor
\fi
@@ -12886,7 +12920,7 @@
\special{html:<base href="\@baseurl">}%
\fi
}
-\def\hyper@anchor#1{%
+\Hy@WrapperDef\hyper@anchor#1{%
\Hy@SaveLastskip
\Hy@VerboseAnchor{#1}%
\begingroup
@@ -12901,7 +12935,7 @@
\Hy@activeanchorfalse
\Hy@RestoreLastskip
}
-\def\hyper@anchorstart#1{%
+\Hy@WrapperDef\hyper@anchorstart#1{%
\Hy@SaveLastskip
\Hy@VerboseAnchor{#1}%
\begingroup
@@ -13019,7 +13053,7 @@
% \begin{macrocode}
\providecommand*{\XR@ext}{dvi}
\providecommand*\wwwbrowser{c:\string\netscape\string\netscape}
-\def\hyper@anchor#1{%
+\Hy@WrapperDef\hyper@anchor#1{%
\Hy@SaveLastskip
\Hy@VerboseAnchor{#1}%
\begingroup
@@ -13031,7 +13065,7 @@
\Hy@activeanchorfalse
\Hy@RestoreLastskip
}
-\def\hyper@anchorstart#1{%
+\Hy@WrapperDef\hyper@anchorstart#1{%
\Hy@SaveLastskip
\Hy@VerboseAnchor{#1}%
\special{mark: #1}%
@@ -13288,7 +13322,7 @@
}
\newsavebox{\pdfm@box}
\def\@pdfm@mark#1{\special{pdf:#1}}
-\def\@pdfm@dest#1{%
+\Hy@WrapperDef\@pdfm@dest#1{%
\Hy@SaveLastskip
\Hy@VerboseAnchor{#1}%
\begingroup
@@ -13825,7 +13859,7 @@
\special{!direct </a>}%
\fi
}
-\def\hyper@anchorstart#1{%
+\Hy@WrapperDef\hyper@anchorstart#1{%
\Hy@SaveLastskip
\Hy@VerboseAnchor{#1}%
\begingroup
@@ -13841,7 +13875,7 @@
\Hy@activeanchorfalse
\Hy@RestoreLastskip
}
-\def\hyper@anchor#1{%
+\Hy@WrapperDef\hyper@anchor#1{%
\Hy@SaveLastskip
\Hy@VerboseAnchor{#1}%
\begingroup
@@ -13927,7 +13961,7 @@
\providecommand*\@pdfborder{0 0 1}
\providecommand*\@pdfborderstyle{}
\let\CurrentBorderColor\@linkbordercolor
-\def\hyper@anchor#1{%
+\Hy@WrapperDef\hyper@anchor#1{%
\Hy@SaveLastskip
\Hy@VerboseAnchor{#1}%
\begingroup
@@ -13940,7 +13974,7 @@
\Hy@activeanchorfalse
\Hy@RestoreLastskip
}
-\def\hyper@anchorstart#1{%
+\Hy@WrapperDef\hyper@anchorstart#1{%
\Hy@SaveLastskip
\Hy@VerboseAnchor{#1}%
\begingroup
@@ -14609,7 +14643,7 @@
\def\HyPat@ObjRef{%
\{[^{}]+\}%
}
-\def\hyper@anchor#1{%
+\Hy@WrapperDef\hyper@anchor#1{%
\Hy@SaveLastskip
\Hy@VerboseAnchor{#1}%
\begingroup
@@ -14623,7 +14657,7 @@
\Hy@RestoreLastskip
}
\ltx@IfUndefined{hyper@anchorstart}{}{\endinput}
-\def\hyper@anchorstart#1{%
+\Hy@WrapperDef\hyper@anchorstart#1{%
\Hy@SaveLastskip
\Hy@VerboseAnchor{#1}%
\literalps@out{H.S}%
@@ -15784,7 +15818,7 @@
\fi
\keepPDF@SetupDoc
}
-\def\hyper@anchor#1{%
+\Hy@WrapperDef\hyper@anchor#1{%
\Hy@SaveLastskip
\Hy@VerboseAnchor{#1}%
\begingroup
@@ -15798,7 +15832,7 @@
\Hy@activeanchorfalse
\Hy@RestoreLastskip
}
-\def\hyper@anchorstart#1{%
+\Hy@WrapperDef\hyper@anchorstart#1{%
\Hy@SaveLastskip
\Hy@VerboseAnchor{#1}%
\begingroup
@@ -16095,7 +16129,7 @@
\special{t4ht=<base href="\@baseurl">}%
\fi
}
-\def\hyper@anchor#1{%
+\Hy@WrapperDef\hyper@anchor#1{%
\Hy@SaveLastskip
\Hy@VerboseAnchor{#1}%
\begingroup
@@ -16109,7 +16143,7 @@
\Hy@activeanchorfalse
\Hy@RestoreLastskip
}
-\def\hyper@anchorstart#1{%
+\Hy@WrapperDef\hyper@anchorstart#1{%
\Hy@SaveLastskip
\Hy@VerboseAnchor{#1}%
\begingroup
diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def b/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def
index 79f073870a3..281c5d4e229 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/09/13 v6.81n
+ [2010/09/17 v6.81q
Hyperref driver for dvipdfm]
\def\Hy@PutCatalog#1{\@pdfm@mark{docview << #1 >>}}
\ifHy@pagelabels
@@ -128,7 +128,7 @@
}
\newsavebox{\pdfm@box}
\def\@pdfm@mark#1{\special{pdf:#1}}
-\def\@pdfm@dest#1{%
+\Hy@WrapperDef\@pdfm@dest#1{%
\Hy@SaveLastskip
\Hy@VerboseAnchor{#1}%
\begingroup
diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvips.def b/Master/texmf-dist/tex/latex/hyperref/hdvips.def
index a216e0c7860..de5432fa913 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/09/13 v6.81n
+ [2010/09/17 v6.81q
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 408cb4b8345..ad3b08a1e07 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/09/13 v6.81n
+ [2010/09/17 v6.81q
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 ecf7e8356fe..801f68f8e24 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/09/13 v6.81n
+ [2010/09/17 v6.81q
Hyperref driver for dviwindo]
\begingroup
\@ifundefined{headerps@out}{}{%
@@ -143,7 +143,7 @@
\fi
\providecommand*{\XR@ext}{dvi}
\providecommand*\wwwbrowser{c:\string\netscape\string\netscape}
-\def\hyper@anchor#1{%
+\Hy@WrapperDef\hyper@anchor#1{%
\Hy@SaveLastskip
\Hy@VerboseAnchor{#1}%
\begingroup
@@ -155,7 +155,7 @@
\Hy@activeanchorfalse
\Hy@RestoreLastskip
}
-\def\hyper@anchorstart#1{%
+\Hy@WrapperDef\hyper@anchorstart#1{%
\Hy@SaveLastskip
\Hy@VerboseAnchor{#1}%
\special{mark: #1}%
diff --git a/Master/texmf-dist/tex/latex/hyperref/hpdftex.def b/Master/texmf-dist/tex/latex/hyperref/hpdftex.def
index 5f4499bfb92..3c43fa5bc55 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/09/13 v6.81n
+ [2010/09/17 v6.81q
Hyperref driver for pdfTeX]
\let\Hy@PutCatalog\pdfcatalog
\ifHy@pagelabels
@@ -255,7 +255,7 @@
\pdflinkmargin1pt %
\fi
\providecommand*\@pdfview{XYZ}
-\def\new@pdflink#1{%
+\Hy@WrapperDef\new@pdflink#1{%
\ifhmode
\@savsf\spacefactor
\fi
diff --git a/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg b/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg
index 03fe4ce5e60..9804bf7abeb 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/09/13 v6.81n
+ [2010/09/17 v6.81q
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 281f6d2e839..5551a83be10 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/09/13 v6.81n
+ [2010/09/17 v6.81q
Hyperref driver for TeX4ht]
\providecommand*{\XR@ext}{html}
\def\Hy@raisedlink{}
@@ -46,7 +46,7 @@
\special{t4ht=<base href="\@baseurl">}%
\fi
}
-\def\hyper@anchor#1{%
+\Hy@WrapperDef\hyper@anchor#1{%
\Hy@SaveLastskip
\Hy@VerboseAnchor{#1}%
\begingroup
@@ -60,7 +60,7 @@
\Hy@activeanchorfalse
\Hy@RestoreLastskip
}
-\def\hyper@anchorstart#1{%
+\Hy@WrapperDef\hyper@anchorstart#1{%
\Hy@SaveLastskip
\Hy@VerboseAnchor{#1}%
\begingroup
diff --git a/Master/texmf-dist/tex/latex/hyperref/htexture.def b/Master/texmf-dist/tex/latex/hyperref/htexture.def
index c8e2659fc47..d794d1c9e4c 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/09/13 v6.81n
+ [2010/09/17 v6.81q
Hyperref driver for Textures]
\providecommand*{\XR@ext}{pdf}
\begingroup
@@ -124,7 +124,7 @@
\fi
\keepPDF@SetupDoc
}
-\def\hyper@anchor#1{%
+\Hy@WrapperDef\hyper@anchor#1{%
\Hy@SaveLastskip
\Hy@VerboseAnchor{#1}%
\begingroup
@@ -138,7 +138,7 @@
\Hy@activeanchorfalse
\Hy@RestoreLastskip
}
-\def\hyper@anchorstart#1{%
+\Hy@WrapperDef\hyper@anchorstart#1{%
\Hy@SaveLastskip
\Hy@VerboseAnchor{#1}%
\begingroup
diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtex.def b/Master/texmf-dist/tex/latex/hyperref/hvtex.def
index cb975bbc37e..66adb83c5e2 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/09/13 v6.81n
+ [2010/09/17 v6.81q
Hyperref driver for VTeX in PDF/PS mode]
\providecommand*{\XR@ext}{pdf}
\edef\Hy@VTeXversion{%
@@ -164,7 +164,7 @@
\providecommand*\@pdfborder{0 0 1}
\providecommand*\@pdfborderstyle{}
\let\CurrentBorderColor\@linkbordercolor
-\def\hyper@anchor#1{%
+\Hy@WrapperDef\hyper@anchor#1{%
\Hy@SaveLastskip
\Hy@VerboseAnchor{#1}%
\begingroup
@@ -177,7 +177,7 @@
\Hy@activeanchorfalse
\Hy@RestoreLastskip
}
-\def\hyper@anchorstart#1{%
+\Hy@WrapperDef\hyper@anchorstart#1{%
\Hy@SaveLastskip
\Hy@VerboseAnchor{#1}%
\begingroup
diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def b/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def
index eb4e612cab3..a648e82550d 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/09/13 v6.81n
+ [2010/09/17 v6.81q
Hyperref driver for VTeX in HTML mode]
\providecommand*{\XR@ext}{htm}
\RequirePackage{vtexhtml}
@@ -85,7 +85,7 @@
\special{!direct </a>}%
\fi
}
-\def\hyper@anchorstart#1{%
+\Hy@WrapperDef\hyper@anchorstart#1{%
\Hy@SaveLastskip
\Hy@VerboseAnchor{#1}%
\begingroup
@@ -101,7 +101,7 @@
\Hy@activeanchorfalse
\Hy@RestoreLastskip
}
-\def\hyper@anchor#1{%
+\Hy@WrapperDef\hyper@anchor#1{%
\Hy@SaveLastskip
\Hy@VerboseAnchor{#1}%
\begingroup
diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def b/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def
index 54f77ca6571..a24ba9c64c9 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/09/13 v6.81n
+ [2010/09/17 v6.81q
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 2a68daa8872..17e45c2aec8 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/09/13 v6.81n
+ [2010/09/17 v6.81q
Hyperref driver for XeTeX]
\HyPsd@LoadUnicode
\Hy@unicodetrue
@@ -210,7 +210,7 @@
}
\newsavebox{\pdfm@box}
\def\@pdfm@mark#1{\special{pdf:#1}}
-\def\@pdfm@dest#1{%
+\Hy@WrapperDef\@pdfm@dest#1{%
\Hy@SaveLastskip
\Hy@VerboseAnchor{#1}%
\begingroup
diff --git a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty
index ee45a5ee31d..29498f28f09 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/09/13 v6.81n
+ [2010/09/17 v6.81q
Hypertext links for LaTeX]
\begingroup
\@makeother\`%
@@ -109,10 +109,10 @@
\RequirePackage{ifxetex}[2006/08/21]
\RequirePackage{hycolor}
\RequirePackage{letltxmacro}[2008/06/13]
-\def\Hy@Error#1{\@PackageError{hyperref}}
-\def\Hy@Warning#1{\@PackageWarning{hyperref}{#1}}
-\def\Hy@WarningNoLine#1{\@PackageWarningNoLine{hyperref}{#1}}
-\def\Hy@Info#1{\@PackageInfo{hyperref}{#1}}
+\def\Hy@Error{\@PackageError{hyperref}}
+\def\Hy@Warning{\@PackageWarning{hyperref}}
+\def\Hy@WarningNoLine{\@PackageWarningNoLine{hyperref}}
+\def\Hy@Info{\@PackageInfo{hyperref}}
\def\Hy@InfoNoLine{\@PackageInfoNoLine{hyperref}}
\def\Hy@Message#1{%
\GenericWarning{%
@@ -139,12 +139,20 @@
\edef\{{\ltx@backslashchar\ltx@leftbracechar}%
\edef\}{\ltx@rightbracechar}%
\edef\\{\ltx@backslashchar\ltx@backslashchar}%
- \ifnum\pdfmatch{#2}{#1}=\ltx@one
+ \ifcase\pdfmatch{#2}{#1} %
+ \endgroup
+ \expandafter\ltx@secondoftwo
+ \or
\endgroup
\expandafter\ltx@firstoftwo
\else
+ \Hy@Warning{%
+ Internal error: Wrong pattern!\MessageBreak
+ --> #2 <--\MessageBreak
+ Pattern check ignored%
+ }%
\endgroup
- \expandafter\ltx@secondoftwo
+ \expandafter\ltx@firstoftwo
\fi
}%
}
@@ -3303,20 +3311,20 @@
\do{/P}{Push}%
}
\define@key{Hyp}{pdfborder}{%
- \def\Hy@temp{#1}%
- \Hy@Match\Hy@temp{%
- ^(\HyPat@NonNegativeReal/ %
- \HyPat@NonNegativeReal/ %
- \HyPat@NonNegativeReal/%
- ( ?[\HyPat@NonNegativeReal/( \HyPat@NonNegativeReal/)*])?)$%
- }{%
- \let\@pdfborder\Hy@temp
- }{%
+ \let\Hy@temp\@pdfborder
+ \def\@pdfborder{#1}%
+ \Hy@Match\@pdfborder{%
+ ^\HyPat@NonNegativeReal/ %
+ \HyPat@NonNegativeReal/ %
+ \HyPat@NonNegativeReal/%
+ ( ?\[\HyPat@NonNegativeReal/( \HyPat@NonNegativeReal/)*])?$%
+ }{}{%
\Hy@Warning{%
- Invalid value `\Hy@temp'\MessageBreak
+ Invalid value `\@pdfborder'\MessageBreak
for option `pdfborder'.\MessageBreak
Option setting is ignored%
}%
+ \let\@pdfborder\Hy@temp
}%
}
\define@key{Hyp}{pdfborderstyle}{\def\@pdfborderstyle{#1}}
@@ -3865,6 +3873,29 @@
\ifHy@next
\let\texttilde\~%
\fi
+\def\Hy@wrapper@babel#1#2{%
+ \begingroup
+ \Hy@safe@activestrue
+ \set@display@protect
+ \edef\x{#2}%
+ \@onelevel@sanitize\x
+ \toks@{#1}%
+ \edef\x{\endgroup\the\toks@{\x}}%
+ \x
+}
+\def\Hy@WrapperDef#1{%
+ \begingroup
+ \escapechar=\m@ne
+ \xdef\Hy@gtemp{%
+ \expandafter\noexpand\csname HyWrap@\string#1\endcsname
+ }%
+ \endgroup
+ \edef#1{%
+ \noexpand\Hy@wrapper@babel
+ \expandafter\noexpand\Hy@gtemp
+ }%
+ \expandafter\def\Hy@gtemp
+}
\ifHy@figures
\Hy@Info{Hyper figures ON}%
\else
diff --git a/Master/texmf-dist/tex/latex/hyperref/hypertex.def b/Master/texmf-dist/tex/latex/hyperref/hypertex.def
index d44af040097..b0b939e9ced 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/09/13 v6.81n
+ [2010/09/17 v6.81q
Hyperref driver for HyperTeX specials]
\providecommand*{\XR@ext}{dvi}
\def\PDF@FinishDoc{}
@@ -39,7 +39,7 @@
\special{html:<base href="\@baseurl">}%
\fi
}
-\def\hyper@anchor#1{%
+\Hy@WrapperDef\hyper@anchor#1{%
\Hy@SaveLastskip
\Hy@VerboseAnchor{#1}%
\begingroup
@@ -54,7 +54,7 @@
\Hy@activeanchorfalse
\Hy@RestoreLastskip
}
-\def\hyper@anchorstart#1{%
+\Hy@WrapperDef\hyper@anchorstart#1{%
\Hy@SaveLastskip
\Hy@VerboseAnchor{#1}%
\begingroup
diff --git a/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty b/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty
index f7d9b82a933..ee530705c52 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/09/13 v6.81n
+ [2010/09/17 v6.81q
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 707196cedce..319adc96b2a 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/09/13 v6.81n
+ [2010/09/17 v6.81q
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 a45ad53a232..c6e3d230f61 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/09/13 v6.81n
+ [2010/09/17 v6.81q
Hyperref definitions for pdfmark specials]
\begingroup
\@ifundefined{headerps@out}{}{%
@@ -176,7 +176,7 @@
\def\HyPat@ObjRef{%
\{[^{}]+\}%
}
-\def\hyper@anchor#1{%
+\Hy@WrapperDef\hyper@anchor#1{%
\Hy@SaveLastskip
\Hy@VerboseAnchor{#1}%
\begingroup
@@ -190,7 +190,7 @@
\Hy@RestoreLastskip
}
\ltx@IfUndefined{hyper@anchorstart}{}{\endinput}
-\def\hyper@anchorstart#1{%
+\Hy@WrapperDef\hyper@anchorstart#1{%
\Hy@SaveLastskip
\Hy@VerboseAnchor{#1}%
\literalps@out{H.S}%
diff --git a/Master/texmf-dist/tex/latex/hyperref/puarenc.def b/Master/texmf-dist/tex/latex/hyperref/puarenc.def
index 5c0451dec73..37f47bcd315 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/09/13 v6.81n
+ [2010/09/17 v6.81q
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 fdcbed084b9..b3edb5c0b7a 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/09/13 v6.81n
+ [2010/09/17 v6.81q
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 bc08d2f5f2f..e9d32126d91 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/09/13 v6.81n
+ [2010/09/17 v6.81q
Hyperref: Additions to puenc.def for VnTeX]
\DeclareTextCommand{\abreve}{PU}{\81\003}
\DeclareTextCommand{\acircumflex}{PU}{\80\342}