diff options
Diffstat (limited to 'Master/texmf-dist/source/latex/hyperref/hyperref.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/hyperref/hyperref.dtx | 83 |
1 files changed, 74 insertions, 9 deletions
diff --git a/Master/texmf-dist/source/latex/hyperref/hyperref.dtx b/Master/texmf-dist/source/latex/hyperref/hyperref.dtx index a57d98ec554..abbd9b2287c 100644 --- a/Master/texmf-dist/source/latex/hyperref/hyperref.dtx +++ b/Master/texmf-dist/source/latex/hyperref/hyperref.dtx @@ -45,7 +45,7 @@ %<puvnenc>\ProvidesFile{puvnenc.def} %<puarenc>\ProvidesFile{puarenc.def} %<psdextra>\ProvidesFile{psdextra.def} -%<!none> [2012/08/13 v6.83a % +%<!none> [2012/08/18 v6.83b % %<package> Hypertext links for LaTeX] %<nohyperref> Dummy hyperref (SR)] %<driver> Hyperref documentation driver file] @@ -147,7 +147,7 @@ \end{document} %</driver> % \fi -% \CheckSum{39107} +% \CheckSum{39205} % % \MakeShortVerb{|} % \StopEventually{} @@ -7431,6 +7431,7 @@ % \end{macrocode} % % \section{User hypertext macros}\label{usermacros} +% % We need to normalise all user commands taking a URL argument; % Within the argument the following special definitions apply: % |\#|, |\%|, |~| produce |#|, |%|, |~| respectively. @@ -7792,7 +7793,64 @@ \fi } % \end{macrocode} +% +% \subsection{Link box support for XeTeX} +% +% \begin{macrocode} +\newdimen\XeTeXLinkMargin +\setlength{\XeTeXLinkMargin}{2pt} +\ifxetex + \font\XeTeXLink@font=pzdr at 1sp\relax + \newcommand*{\XeTeXLink@space}{% + \begingroup + \XeTeXLink@font + \@xxxii + \endgroup + }% + \newcommand{\XeTeXLinkBox}[1]{% + \begingroup + \leavevmode + \sbox\z@{#1}% + \begingroup + \dimen@=\dp\z@ + \advance\dimen@\XeTeXLinkMargin + \setbox\tw@=\llap{% + \hb@xt@\XeTeXLinkMargin{% + \lower\dimen@\hbox{\XeTeXLink@space}% + \hss + }% + }% + \dp\tw@=\dp\z@ + \ht\tw@=\ht\z@ + \copy\tw@ + \endgroup + \copy\z@ + \dimen@=\ht\z@ + \advance\dimen@\XeTeXLinkMargin + \setbox\tw@=\rlap{% + \hb@xt@\XeTeXLinkMargin{% + \hss + \raise\dimen@\hbox{\XeTeXLink@space}% + }% + }% + \dp\tw@=\dp\z@ + \ht\tw@=\ht\z@ + \copy\tw@ + \endgroup + }% +\else + \newcommand*{\XeTeXLinkBox}[1]{% + \begingroup + \leavevmode + \sbox\z@{#1}% + \copy\z@ + \endgroup + }% +\fi +% \end{macrocode} +% % \section{Underlying basic hypertext macros}\label{coremacros} +% % Links have an optional type, a filename (possibly a URL), % an internal name, and some marked text. (Caution: the internal % name may contain babel shorthand characters.) @@ -8182,6 +8240,7 @@ % \end{macrocode} % % \section{Compatibility with the \emph{\LaTeX{}2html} package}\label{latex2html} +% % Map our macro names on to Nikos', so that documents prepared % for that system will work without change. % @@ -10517,6 +10576,7 @@ % \begin{macrocode} \def\hyper@makecurrent#1{% \begingroup + \Hy@safe@activestrue \edef\Hy@param{#1}% \ifx\Hy@param\Hy@chapterstring \let\Hy@param\Hy@chapapp @@ -12110,24 +12170,29 @@ \endgroup } \def\contentsline#1#2#3#4{% - \ifx\\#4\\% + \begingroup + \Hy@safe@activestrue + \edef\x{\endgroup + \def\noexpand\Hy@tocdestname{#4}% + }\x + \ifx\Hy@tocdestname\ltx@empty \csname l@#1\endcsname{#2}{#3}% \else \ifcase\Hy@linktoc % none \csname l@#1\endcsname{#2}{#3}% \or % section \csname l@#1\endcsname{% - \hyper@linkstart{link}{#4}{#2}\hyper@linkend + \hyper@linkstart{link}{\Hy@tocdestname}{#2}\hyper@linkend }{#3}% \or % page \csname l@#1\endcsname{{#2}}{% - \hyper@linkstart{link}{#4}{#3}\hyper@linkend + \hyper@linkstart{link}{\Hy@tocdestname}{#3}\hyper@linkend }% \else % all \csname l@#1\endcsname{% - \hyper@linkstart{link}{#4}{#2}\hyper@linkend + \hyper@linkstart{link}{\Hy@tocdestname}{#2}\hyper@linkend }{% - \hyper@linkstart{link}{#4}{#3}\hyper@linkend + \hyper@linkstart{link}{\Hy@tocdestname}{#3}\hyper@linkend }% \fi \fi @@ -20306,7 +20371,7 @@ \DeclareTextCompositeCommand{\v}{PD1}{S}{\227}% U+0160 % U+0178 LATIN CAPITAL LETTER Y WITH DIAERESIS; Ydieresis \DeclareTextCompositeCommand{\"}{PD1}{Y}{\230}% U+0178 -\DeclareTextCommand{\IJ}{PD1}{\230} +\DeclareTextCommand{\IJ}{PD1}{IJ}% ligature U+0049 U+004A % U+017D LATIN CAPITAL LETTER Z WITH CARON; Zcaron \DeclareTextCompositeCommand{\v}{PD1}{Z}{\231}% U+017D % U+0131 LATIN SMALL LETTER DOTLESS I; dotlessi @@ -20525,7 +20590,7 @@ \DeclareTextCommand{\textthorn}{PD1}{\376}%* U+00FE % U+00FF LATIN SMALL LETTER Y WITH DIAERESIS; ydieresis \DeclareTextCompositeCommand{\"}{PD1}{y}{\377}% U+00FF -\DeclareTextCommand{\ij}{PD1}{\377}% U+00FF +\DeclareTextCommand{\ij}{PD1}{ij}% ligature U+0069 U+006A % \end{macrocode} % Glyphs that consist of several characters. % \begin{macrocode} |