summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/latex/hyperref/ChangeLog9
-rw-r--r--Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdfbin302919 -> 303364 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hyperref/backref.pdf4
-rw-r--r--Master/texmf-dist/doc/latex/hyperref/hyperref.pdfbin3680933 -> 3683225 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hyperref/nameref.pdf4
-rw-r--r--Master/texmf-dist/source/latex/hyperref/hyperref.dtx222
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def188
-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.def2
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/hpdftex.def2
-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.def2
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/hvtex.def2
-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/hyperref.sty15
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/hypertex.def2
-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.def2
-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
-rw-r--r--Master/tlpkg/tlpsrc/tikz-timing.tlpsrc1
26 files changed, 264 insertions, 213 deletions
diff --git a/Master/texmf-dist/doc/latex/hyperref/ChangeLog b/Master/texmf-dist/doc/latex/hyperref/ChangeLog
index 52cb713875f..f7addc2d7df 100644
--- a/Master/texmf-dist/doc/latex/hyperref/ChangeLog
+++ b/Master/texmf-dist/doc/latex/hyperref/ChangeLog
@@ -1,3 +1,12 @@
+2009-05-01 6.78r Heiko Oberdiek
+ * 6.78r
+ * \pdfstringdef:
+ * Typo in definition of \new@ifnextchar fixed (Ulrike Fischer),
+ * and \kernel@ifnextchar disabled (Dan Luecking).
+ * dvipdfm(x)/xetex: This driver family does not support nested
+ annotations. Therefore annotations inside annotations are
+ disabled automatically.
+
2009-04-04 6.78q Heiko Oberdiek
* 6.78q
* Better error message for \MakeUppercase and \MakeLowercase
diff --git a/Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf b/Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf
index 53b5cdee221..3faadfcf314 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 997a4076b42..daefc1deb1f 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<</S/GoTo/D[13 0 R/FitBH 752.95145]>>
endobj
-6 0 obj<</PTEX.Fullbanner(This is pdfTeX, Version 3.1415926-1.40.9-2.2 (Web2C 7.5.7) kpathsea version 3.5.7)/Trapped/False/Subject(Bibliographical back referencing)/ModDate(D:20090404184408+02'00')/Author(David Carlisle and Sebastian Rahtz)/Producer(pdfTeX-1.40.9)/Title(Back referencing from bibliographical citations)/Creator(LaTeX with hyperref package)/CreationDate(D:20090404184408+02'00')>>
+6 0 obj<</PTEX.Fullbanner(This is pdfTeX, Version 3.1415926-1.40.9-2.2 (Web2C 7.5.7) kpathsea version 3.5.7)/Trapped/False/Subject(Bibliographical back referencing)/ModDate(D:20090501145354+02'00')/Author(David Carlisle and Sebastian Rahtz)/Producer(pdfTeX-1.40.9)/Title(Back referencing from bibliographical citations)/Creator(LaTeX with hyperref package)/CreationDate(D:20090501145354+02'00')>>
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
@@ -4086,7 +4086,7 @@ xref
0000239136 00000 n
0000239175 00000 n
trailer
-<</Size 1182/Root 1 0 R/Compress<</LengthO 278917/SpecO/1.4>>/Info 6 0 R/ID[(~o2!th)(&p9c)]>>
+<</Size 1182/Root 1 0 R/Compress<</LengthO 278917/SpecO/1.4>>/Info 6 0 R/ID[(V.줋uA>=2AX)(™Z̵ơ1G-)]>>
startxref
239214
%%EOF
diff --git a/Master/texmf-dist/doc/latex/hyperref/hyperref.pdf b/Master/texmf-dist/doc/latex/hyperref/hyperref.pdf
index d0ad29921ef..3dc03c7a900 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 2acea8d3083..97e71555c64 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<</S/GoTo/D[12 0 R/FitBH 752.95145]>>
endobj
-6 0 obj<</PTEX.Fullbanner(This is pdfTeX, Version 3.1415926-1.40.9-2.2 (Web2C 7.5.7) kpathsea version 3.5.7)/Trapped/False/Subject(Cross-referencing by name of section)/ModDate(D:20090404184419+02'00')/Author(Sebastian Rahtz)/Producer(pdfTeX-1.40.9)/Title(Section name references in LaTeX)/Creator(LaTeX with hyperref package)/CreationDate(D:20090404184419+02'00')>>
+6 0 obj<</PTEX.Fullbanner(This is pdfTeX, Version 3.1415926-1.40.9-2.2 (Web2C 7.5.7) kpathsea version 3.5.7)/Trapped/False/Subject(Cross-referencing by name of section)/ModDate(D:20090501145405+02'00')/Author(Sebastian Rahtz)/Producer(pdfTeX-1.40.9)/Title(Section name references in LaTeX)/Creator(LaTeX with hyperref package)/CreationDate(D:20090501145405+02'00')>>
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
@@ -4045,7 +4045,7 @@ xref
0000230439 00000 n
0000230478 00000 n
trailer
-<</Size 1182/Root 1 0 R/Compress<</LengthO 270328/SpecO/1.4>>/Info 6 0 R/ID[( 1e:b1t;S)(M0cX1T)]>>
+<</Size 1182/Root 1 0 R/Compress<</LengthO 270328/SpecO/1.4>>/Info 6 0 R/ID[(<5X;iMfWT)(Jͬbڥ
startxref
230517
%%EOF
diff --git a/Master/texmf-dist/source/latex/hyperref/hyperref.dtx b/Master/texmf-dist/source/latex/hyperref/hyperref.dtx
index 9c7243af0b6..8175a5853e5 100644
--- a/Master/texmf-dist/source/latex/hyperref/hyperref.dtx
+++ b/Master/texmf-dist/source/latex/hyperref/hyperref.dtx
@@ -38,7 +38,7 @@
%<puenc>\ProvidesFile{puenc.def}
%<puvnenc>\ProvidesFile{puvnenc.def}
%<puarenc>\ProvidesFile{puarenc.def}
-%<!none> [2009/04/04 v6.78q
+%<!none> [2009/05/01 v6.78r
%<package> Hypertext links for LaTeX]
%<nohyperref> Dummy hyperref (SR)]
%<driver> Hyperref documentation driver file]
@@ -114,7 +114,7 @@
\end{document}
%</driver>
% \fi
-% \CheckSum{24557}
+% \CheckSum{24573}
%
% \MakeShortVerb{|}
% \StopEventually{}
@@ -1244,8 +1244,9 @@
% approximation. So here a cheaper solution follows
% in order to get rid of the error message at least:
% \begin{macrocode}
- \let\@ifnextchar\HyPsd@ifnextchar
- \let\@ifnextchar\HyPsd@new@ifnextchar
+ \def\@ifnextchar{\HyPsd@ifnextchar\@ifnextchar}%
+ \def\kernel@ifnextchar{\HyPsd@ifnextchar\kernel@ifnextchar}%
+ \def\new@ifnextchar{\HyPsd@ifnextchar\new@ifnextchar}%
\let\@protected@testopt\HyPsd@protected@testopt
% \end{macrocode}
% Support for package `xargs':
@@ -2622,21 +2623,16 @@
% are canceled. \cs{@ifnextchar} cannot work in a correct
% manner, because it uses \cs{futurelet}, but this is a
% stomach feature, that doesn't work in an expanding context.
+% There are several variants of \cs{@ifnextchar}:
+% \begin{itemize}
+% \item \cs{@ifnextchar}
+% \item \cs{kernel@ifnextchar}
+% \item \cs{new@ifnextchar} from package \verb|amsgen.sty|
+% (bug report latex/3662).
+% \end{itemize}
% \begin{macrocode}
-\def\HyPsd@ifnextchar{%
- \pdfstringdefWarn\@ifnextchar
- \expandafter\@gobbletwo\@gobble
-}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\HyPsd@new@ifnextchar}
-% Package \verb|amsgen.sty| redefines \cs{@ifstar} using
-% \cs{new@ifnextchar} instead of \cs{@ifnextchar}. See
-% bug report latex/3662.
-% \begin{macrocode}
-\def\HyPsd@new@ifnextchar{%
- \pdfstringdefWarn\new@ifnextchar
+\def\HyPsd@ifnextchar#1{%
+ \pdfstringdefWarn#1%
\expandafter\@gobbletwo\@gobble
}
% \end{macrocode}
@@ -11656,6 +11652,9 @@
}
% \end{macrocode}
% \begin{macrocode}
+\newcounter{Hy@AnnotLevel}
+% \end{macrocode}
+% \begin{macrocode}
\ifHy@ocgcolorlinks
\def\OBJ@OCG@view{@OCG@view}%
\@pdfm@mark{%
@@ -11768,112 +11767,135 @@
\fi
% \end{macrocode}
% \begin{macrocode}
+\def\Hy@BeginAnnot#1{%
+ \stepcounter{Hy@AnnotLevel}%
+ \ifnum\value{Hy@AnnotLevel}=\@ne
+ #1%
+ \fi
+}
+\def\Hy@EndAnnot{%
+ \ifnum\value{Hy@AnnotLevel}=\@ne
+ \Hy@endcolorlink
+ \@pdfm@mark{eann}%
+ \fi
+ \addtocounter{Hy@AnnotLevel}\m@ne
+}
+% \end{macrocode}
+% \begin{macrocode}
\def\Hy@undefinedname{UNDEFINED}
\def\hyper@linkstart#1#2{%
- \protected@edef\Hy@testname{#2}%
- \ifx\Hy@testname\@empty
- \Hy@Warning{%
- Empty destination name,\MessageBreak
- using `\Hy@undefinedname'%
- }%
- \let\Hy@testname\Hy@undefinedname
- \else
- \Hy@pstringdef\Hy@testname{%
- \expandafter\HyperDestNameFilter\expandafter{\Hy@testname}%
- }%
- \fi
- \@pdfm@mark{%
- bann<<%
- /Type/Annot%
- /Subtype/Link%
- \ifHy@pdfa /F 4\fi
- \Hy@setpdfborder
- \expandafter\ifx\csname @#1bordercolor\endcsname\relax
- \else
- /C[\csname @#1bordercolor\endcsname]%
- \fi
- /A<<%
- /S/GoTo%
- /D(\Hy@testname)%
+ \Hy@BeginAnnot{%
+ \protected@edef\Hy@testname{#2}%
+ \ifx\Hy@testname\@empty
+ \Hy@Warning{%
+ Empty destination name,\MessageBreak
+ using `\Hy@undefinedname'%
+ }%
+ \let\Hy@testname\Hy@undefinedname
+ \else
+ \Hy@pstringdef\Hy@testname{%
+ \expandafter\HyperDestNameFilter\expandafter{\Hy@testname}%
+ }%
+ \fi
+ \@pdfm@mark{%
+ bann<<%
+ /Type/Annot%
+ /Subtype/Link%
+ \ifHy@pdfa /F 4\fi
+ \Hy@setpdfborder
+ \expandafter\ifx\csname @#1bordercolor\endcsname\relax
+ \else
+ /C[\csname @#1bordercolor\endcsname]%
+ \fi
+ /A<<%
+ /S/GoTo%
+ /D(\Hy@testname)%
+ >>%
>>%
- >>%
+ }%
+ \expandafter\Hy@colorlink\csname @#1color\endcsname
}%
- \expandafter\Hy@colorlink\csname @#1color\endcsname
-}
-\def\hyper@linkend{%
- \Hy@endcolorlink
- \@pdfm@mark{eann}%
}
+\def\hyper@linkend{\Hy@EndAnnot}%
\def\hyper@link#1#2#3{%
\hyper@linkstart{#1}{#2}#3\hyper@linkend
}
\def\hyper@linkfile#1#2#3{%
- \Hy@pstringdef\Hy@pstringF{#2}%
- \Hy@pstringdef\Hy@pstringD{#3}%
\leavevmode
- \@pdfm@mark{%
- bann<<%
- /Type/Annot%
- /Subtype/Link%
- \ifHy@pdfa /F 4\fi
- \Hy@setpdfborder
- \ifx\@filebordercolor\relax
- \else
- /C[\@filebordercolor]%
- \fi
- /A<<%
- /S/GoToR%
- /F(\Hy@pstringF)%
- /D\ifx\\#3\\[0 \@pdfstartview]\else(\Hy@pstringD)\fi
- \Hy@SetNewWindow
+ \Hy@BeginAnnot{%
+ \Hy@pstringdef\Hy@pstringF{#2}%
+ \Hy@pstringdef\Hy@pstringD{#3}%
+ \@pdfm@mark{%
+ bann<<%
+ /Type/Annot%
+ /Subtype/Link%
+ \ifHy@pdfa /F 4\fi
+ \Hy@setpdfborder
+ \ifx\@filebordercolor\relax
+ \else
+ /C[\@filebordercolor]%
+ \fi
+ /A<<%
+ /S/GoToR%
+ /F(\Hy@pstringF)%
+ /D\ifx\\#3\\[0 \@pdfstartview]\else(\Hy@pstringD)\fi
+ \Hy@SetNewWindow
+ >>%
>>%
- >>%
+ }%
+ \Hy@colorlink\@filecolor
}%
- \Hy@colorlink\@filecolor#1\Hy@endcolorlink
- \@pdfm@mark{eann}%
+ #1%
+ \Hy@EndAnnot
}
\def\hyper@linkurl#1#2{%
- \Hy@pstringdef\Hy@pstringURI{#2}%
\leavevmode
- \@pdfm@mark{%
- bann<<%
- /Type/Annot%
- /Subtype/Link%
- \ifHy@pdfa /F 4\fi
- \Hy@setpdfborder
- \ifx\@urlbordercolor\relax
- \else
- /C[\@urlbordercolor]%
- \fi
- /A<<%
- /S/URI%
- /URI(\Hy@pstringURI)%
- >>%
- >>%
- }%
- \Hy@colorlink\@urlcolor#1\Hy@endcolorlink
- \@pdfm@mark{eann}%
-}
-\def\Acrobatmenu#1#2{%
- \Hy@Acrobatmenu{#1}{#2}{%
+ \Hy@BeginAnnot{%
+ \Hy@pstringdef\Hy@pstringURI{#2}%
\@pdfm@mark{%
bann<<%
/Type/Annot%
/Subtype/Link%
\ifHy@pdfa /F 4\fi
- /A<<%
- /S/Named%
- /N/#1%
- >>%
\Hy@setpdfborder
- \ifx\@menubordercolor\relax
- \relax
- /C[\@menubordercolor]%
+ \ifx\@urlbordercolor\relax
+ \else
+ /C[\@urlbordercolor]%
\fi
+ /A<<%
+ /S/URI%
+ /URI(\Hy@pstringURI)%
+ >>%
>>%
}%
- \Hy@colorlink\@menucolor#2\Hy@endcolorlink
- \@pdfm@mark{eann}%
+ \Hy@colorlink\@urlcolor
+ }%
+ #1%
+ \Hy@EndAnnot
+}
+\def\Acrobatmenu#1#2{%
+ \Hy@Acrobatmenu{#1}{#2}{%
+ \Hy@BeginAnnot{%
+ \@pdfm@mark{%
+ bann<<%
+ /Type/Annot%
+ /Subtype/Link%
+ \ifHy@pdfa /F 4\fi
+ /A<<%
+ /S/Named%
+ /N/#1%
+ >>%
+ \Hy@setpdfborder
+ \ifx\@menubordercolor\relax
+ \relax
+ /C[\@menubordercolor]%
+ \fi
+ >>%
+ }%
+ \Hy@colorlink\@menucolor
+ }%
+ #2%
+ \Hy@EndAnnot
}%
}
\ifx\@pdfproducer\relax
diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def b/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def
index 40a9b0c2dcb..6d50e2f92a7 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def
@@ -24,7 +24,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{hdvipdfm.def}
- [2009/04/04 v6.78q
+ [2009/05/01 v6.78r
Hyperref driver for dvipdfm]
\def\Hy@PutCatalog#1{\@pdfm@mark{docview << #1 >>}}
\ifHy@pagelabels
@@ -185,6 +185,7 @@
\def\hyper@anchorend{%
\Hy@activeanchorfalse
}
+\newcounter{Hy@AnnotLevel}
\ifHy@ocgcolorlinks
\def\OBJ@OCG@view{@OCG@view}%
\@pdfm@mark{%
@@ -295,112 +296,133 @@
\else
\Hy@DisableOption{ocgcolorlinks}%
\fi
+\def\Hy@BeginAnnot#1{%
+ \stepcounter{Hy@AnnotLevel}%
+ \ifnum\value{Hy@AnnotLevel}=\@ne
+ #1%
+ \fi
+}
+\def\Hy@EndAnnot{%
+ \ifnum\value{Hy@AnnotLevel}=\@ne
+ \Hy@endcolorlink
+ \@pdfm@mark{eann}%
+ \fi
+ \addtocounter{Hy@AnnotLevel}\m@ne
+}
\def\Hy@undefinedname{UNDEFINED}
\def\hyper@linkstart#1#2{%
- \protected@edef\Hy@testname{#2}%
- \ifx\Hy@testname\@empty
- \Hy@Warning{%
- Empty destination name,\MessageBreak
- using `\Hy@undefinedname'%
- }%
- \let\Hy@testname\Hy@undefinedname
- \else
- \Hy@pstringdef\Hy@testname{%
- \expandafter\HyperDestNameFilter\expandafter{\Hy@testname}%
- }%
- \fi
- \@pdfm@mark{%
- bann<<%
- /Type/Annot%
- /Subtype/Link%
- \ifHy@pdfa /F 4\fi
- \Hy@setpdfborder
- \expandafter\ifx\csname @#1bordercolor\endcsname\relax
- \else
- /C[\csname @#1bordercolor\endcsname]%
- \fi
- /A<<%
- /S/GoTo%
- /D(\Hy@testname)%
+ \Hy@BeginAnnot{%
+ \protected@edef\Hy@testname{#2}%
+ \ifx\Hy@testname\@empty
+ \Hy@Warning{%
+ Empty destination name,\MessageBreak
+ using `\Hy@undefinedname'%
+ }%
+ \let\Hy@testname\Hy@undefinedname
+ \else
+ \Hy@pstringdef\Hy@testname{%
+ \expandafter\HyperDestNameFilter\expandafter{\Hy@testname}%
+ }%
+ \fi
+ \@pdfm@mark{%
+ bann<<%
+ /Type/Annot%
+ /Subtype/Link%
+ \ifHy@pdfa /F 4\fi
+ \Hy@setpdfborder
+ \expandafter\ifx\csname @#1bordercolor\endcsname\relax
+ \else
+ /C[\csname @#1bordercolor\endcsname]%
+ \fi
+ /A<<%
+ /S/GoTo%
+ /D(\Hy@testname)%
+ >>%
>>%
- >>%
+ }%
+ \expandafter\Hy@colorlink\csname @#1color\endcsname
}%
- \expandafter\Hy@colorlink\csname @#1color\endcsname
-}
-\def\hyper@linkend{%
- \Hy@endcolorlink
- \@pdfm@mark{eann}%
}
+\def\hyper@linkend{\Hy@EndAnnot}%
\def\hyper@link#1#2#3{%
\hyper@linkstart{#1}{#2}#3\hyper@linkend
}
\def\hyper@linkfile#1#2#3{%
- \Hy@pstringdef\Hy@pstringF{#2}%
- \Hy@pstringdef\Hy@pstringD{#3}%
\leavevmode
- \@pdfm@mark{%
- bann<<%
- /Type/Annot%
- /Subtype/Link%
- \ifHy@pdfa /F 4\fi
- \Hy@setpdfborder
- \ifx\@filebordercolor\relax
- \else
- /C[\@filebordercolor]%
- \fi
- /A<<%
- /S/GoToR%
- /F(\Hy@pstringF)%
- /D\ifx\\#3\\[0 \@pdfstartview]\else(\Hy@pstringD)\fi
- \Hy@SetNewWindow
+ \Hy@BeginAnnot{%
+ \Hy@pstringdef\Hy@pstringF{#2}%
+ \Hy@pstringdef\Hy@pstringD{#3}%
+ \@pdfm@mark{%
+ bann<<%
+ /Type/Annot%
+ /Subtype/Link%
+ \ifHy@pdfa /F 4\fi
+ \Hy@setpdfborder
+ \ifx\@filebordercolor\relax
+ \else
+ /C[\@filebordercolor]%
+ \fi
+ /A<<%
+ /S/GoToR%
+ /F(\Hy@pstringF)%
+ /D\ifx\\#3\\[0 \@pdfstartview]\else(\Hy@pstringD)\fi
+ \Hy@SetNewWindow
+ >>%
>>%
- >>%
+ }%
+ \Hy@colorlink\@filecolor
}%
- \Hy@colorlink\@filecolor#1\Hy@endcolorlink
- \@pdfm@mark{eann}%
+ #1%
+ \Hy@EndAnnot
}
\def\hyper@linkurl#1#2{%
- \Hy@pstringdef\Hy@pstringURI{#2}%
\leavevmode
- \@pdfm@mark{%
- bann<<%
- /Type/Annot%
- /Subtype/Link%
- \ifHy@pdfa /F 4\fi
- \Hy@setpdfborder
- \ifx\@urlbordercolor\relax
- \else
- /C[\@urlbordercolor]%
- \fi
- /A<<%
- /S/URI%
- /URI(\Hy@pstringURI)%
- >>%
- >>%
- }%
- \Hy@colorlink\@urlcolor#1\Hy@endcolorlink
- \@pdfm@mark{eann}%
-}
-\def\Acrobatmenu#1#2{%
- \Hy@Acrobatmenu{#1}{#2}{%
+ \Hy@BeginAnnot{%
+ \Hy@pstringdef\Hy@pstringURI{#2}%
\@pdfm@mark{%
bann<<%
/Type/Annot%
/Subtype/Link%
\ifHy@pdfa /F 4\fi
- /A<<%
- /S/Named%
- /N/#1%
- >>%
\Hy@setpdfborder
- \ifx\@menubordercolor\relax
- \relax
- /C[\@menubordercolor]%
+ \ifx\@urlbordercolor\relax
+ \else
+ /C[\@urlbordercolor]%
\fi
+ /A<<%
+ /S/URI%
+ /URI(\Hy@pstringURI)%
+ >>%
>>%
}%
- \Hy@colorlink\@menucolor#2\Hy@endcolorlink
- \@pdfm@mark{eann}%
+ \Hy@colorlink\@urlcolor
+ }%
+ #1%
+ \Hy@EndAnnot
+}
+\def\Acrobatmenu#1#2{%
+ \Hy@Acrobatmenu{#1}{#2}{%
+ \Hy@BeginAnnot{%
+ \@pdfm@mark{%
+ bann<<%
+ /Type/Annot%
+ /Subtype/Link%
+ \ifHy@pdfa /F 4\fi
+ /A<<%
+ /S/Named%
+ /N/#1%
+ >>%
+ \Hy@setpdfborder
+ \ifx\@menubordercolor\relax
+ \relax
+ /C[\@menubordercolor]%
+ \fi
+ >>%
+ }%
+ \Hy@colorlink\@menucolor
+ }%
+ #2%
+ \Hy@EndAnnot
}%
}
\ifx\@pdfproducer\relax
diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvips.def b/Master/texmf-dist/tex/latex/hyperref/hdvips.def
index 3f1619a9cfb..37398dc301a 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hdvips.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hdvips.def
@@ -24,7 +24,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{hdvips.def}
- [2009/04/04 v6.78q
+ [2009/05/01 v6.78r
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 9229ab51bf9..89d4e1873a1 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hdvipson.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hdvipson.def
@@ -24,7 +24,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{hdvipson.def}
- [2009/04/04 v6.78q
+ [2009/05/01 v6.78r
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 5b9251847dd..5d9d4460828 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hdviwind.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hdviwind.def
@@ -24,7 +24,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{hdviwind.def}
- [2009/04/04 v6.78q
+ [2009/05/01 v6.78r
Hyperref driver for dviwindo]
\begingroup
\toks@\expandafter{\Hy@FirstPageHook}%
diff --git a/Master/texmf-dist/tex/latex/hyperref/hpdftex.def b/Master/texmf-dist/tex/latex/hyperref/hpdftex.def
index 428ef6d1d1b..134115ff34a 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hpdftex.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hpdftex.def
@@ -24,7 +24,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{hpdftex.def}
- [2009/04/04 v6.78q
+ [2009/05/01 v6.78r
Hyperref driver for pdfTeX]
\let\Hy@PutCatalog\pdfcatalog
\ifHy@pagelabels
diff --git a/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg b/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg
index 6a7fff44edb..c1e92558fa5 100644
--- a/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg
+++ b/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg
@@ -24,7 +24,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{htex4ht.cfg}
- [2009/04/04 v6.78q
+ [2009/05/01 v6.78r
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 eaf0722f442..62ecbd5dedd 100644
--- a/Master/texmf-dist/tex/latex/hyperref/htex4ht.def
+++ b/Master/texmf-dist/tex/latex/hyperref/htex4ht.def
@@ -24,7 +24,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{htex4ht.def}
- [2009/04/04 v6.78q
+ [2009/05/01 v6.78r
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 d9a3499e799..4358b8de9e5 100644
--- a/Master/texmf-dist/tex/latex/hyperref/htexture.def
+++ b/Master/texmf-dist/tex/latex/hyperref/htexture.def
@@ -24,7 +24,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{htexture.def}
- [2009/04/04 v6.78q
+ [2009/05/01 v6.78r
Hyperref driver for Textures]
\providecommand*{\XR@ext}{pdf}
\begingroup
diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtex.def b/Master/texmf-dist/tex/latex/hyperref/hvtex.def
index eb008ee4f41..7cc1c3e61a2 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hvtex.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hvtex.def
@@ -24,7 +24,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{hvtex.def}
- [2009/04/04 v6.78q
+ [2009/05/01 v6.78r
Hyperref driver for VTeX in PDF/PS mode]
\providecommand*{\XR@ext}{pdf}
\edef\Hy@VTeXversion{%
diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def b/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def
index 13769e0ac24..163627a087b 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def
@@ -24,7 +24,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{hvtexhtml.def}
- [2009/04/04 v6.78q
+ [2009/05/01 v6.78r
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 46a3e8050d0..45142a5e456 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def
@@ -24,7 +24,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{hvtexmrk.def}
- [2009/04/04 v6.78q
+ [2009/05/01 v6.78r
Hyperref driver for VTeX in PDF/PS mode (pdfmark specials)]
\providecommand*{\XR@ext}{pdf}
\def\Hy@raisedlink{}
diff --git a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty
index 4c549108d26..e023920e3d8 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty
+++ b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty
@@ -25,7 +25,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{hyperref}
- [2009/04/04 v6.78q
+ [2009/05/01 v6.78r
Hypertext links for LaTeX]
\begingroup
\@makeother\`%
@@ -375,8 +375,9 @@
\let\bgroup\/%
\let\egroup\/%
\let\discretionary\@gobbletwo
- \let\@ifnextchar\HyPsd@ifnextchar
- \let\@ifnextchar\HyPsd@new@ifnextchar
+ \def\@ifnextchar{\HyPsd@ifnextchar\@ifnextchar}%
+ \def\kernel@ifnextchar{\HyPsd@ifnextchar\kernel@ifnextchar}%
+ \def\new@ifnextchar{\HyPsd@ifnextchar\new@ifnextchar}%
\let\@protected@testopt\HyPsd@protected@testopt
\let\@protected@testopt@xargs\HyPsd@protected@testopt
\begingroup
@@ -1039,12 +1040,8 @@
\expandafter\@gobble\string#1\@empty
}%
}
-\def\HyPsd@ifnextchar{%
- \pdfstringdefWarn\@ifnextchar
- \expandafter\@gobbletwo\@gobble
-}
-\def\HyPsd@new@ifnextchar{%
- \pdfstringdefWarn\new@ifnextchar
+\def\HyPsd@ifnextchar#1{%
+ \pdfstringdefWarn#1%
\expandafter\@gobbletwo\@gobble
}
\def\HyPsd@protected@testopt#1{%
diff --git a/Master/texmf-dist/tex/latex/hyperref/hypertex.def b/Master/texmf-dist/tex/latex/hyperref/hypertex.def
index fb53bc7bf35..19231d7c9ea 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hypertex.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hypertex.def
@@ -24,7 +24,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{hypertex.def}
- [2009/04/04 v6.78q
+ [2009/05/01 v6.78r
Hyperref driver for HyperTeX specials]
\providecommand*{\XR@ext}{dvi}
\def\PDF@FinishDoc{}
diff --git a/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty b/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty
index 33414244e34..16936ff9b24 100644
--- a/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty
+++ b/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty
@@ -25,7 +25,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{nohyperref}
- [2009/04/04 v6.78q
+ [2009/05/01 v6.78r
Dummy hyperref (SR)]
\let\hyper@@anchor\@gobble
\def\hyper@link#1#2#3{#3}%
diff --git a/Master/texmf-dist/tex/latex/hyperref/pd1enc.def b/Master/texmf-dist/tex/latex/hyperref/pd1enc.def
index c06b3a5c67b..a9a3d249dbe 100644
--- a/Master/texmf-dist/tex/latex/hyperref/pd1enc.def
+++ b/Master/texmf-dist/tex/latex/hyperref/pd1enc.def
@@ -24,7 +24,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{pd1enc.def}
- [2009/04/04 v6.78q
+ [2009/05/01 v6.78r
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 c2cb7078bdf..c47c2555a54 100644
--- a/Master/texmf-dist/tex/latex/hyperref/pdfmark.def
+++ b/Master/texmf-dist/tex/latex/hyperref/pdfmark.def
@@ -24,7 +24,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{pdfmark.def}
- [2009/04/04 v6.78q
+ [2009/05/01 v6.78r
Hyperref definitions for pdfmark specials]
\begingroup
\toks@\expandafter{\Hy@FirstPageHook}%
diff --git a/Master/texmf-dist/tex/latex/hyperref/puarenc.def b/Master/texmf-dist/tex/latex/hyperref/puarenc.def
index a9b57c73fa6..ded9c05f5cb 100644
--- a/Master/texmf-dist/tex/latex/hyperref/puarenc.def
+++ b/Master/texmf-dist/tex/latex/hyperref/puarenc.def
@@ -24,7 +24,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{puarenc.def}
- [2009/04/04 v6.78q
+ [2009/05/01 v6.78r
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 221df67bc06..69750b141c6 100644
--- a/Master/texmf-dist/tex/latex/hyperref/puenc.def
+++ b/Master/texmf-dist/tex/latex/hyperref/puenc.def
@@ -24,7 +24,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{puenc.def}
- [2009/04/04 v6.78q
+ [2009/05/01 v6.78r
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 2d2b157c665..7e3a24bf08d 100644
--- a/Master/texmf-dist/tex/latex/hyperref/puvnenc.def
+++ b/Master/texmf-dist/tex/latex/hyperref/puvnenc.def
@@ -24,7 +24,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{puvnenc.def}
- [2009/04/04 v6.78q
+ [2009/05/01 v6.78r
Hyperref: Additions to puenc.def for VnTeX]
\DeclareTextCommand{\abreve}{PU}{\81\003}
\DeclareTextCommand{\acircumflex}{PU}{\80\342}
diff --git a/Master/tlpkg/tlpsrc/tikz-timing.tlpsrc b/Master/tlpkg/tlpsrc/tikz-timing.tlpsrc
index 35fce20bfc1..6717c40bd6d 100644
--- a/Master/tlpkg/tlpsrc/tikz-timing.tlpsrc
+++ b/Master/tlpkg/tlpsrc/tikz-timing.tlpsrc
@@ -1,2 +1,3 @@
name tikz-timing
category Package
+depend svn-prov