summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/hyperref/hyperref.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/source/latex/hyperref/hyperref.dtx')
-rw-r--r--Master/texmf-dist/source/latex/hyperref/hyperref.dtx57
1 files changed, 41 insertions, 16 deletions
diff --git a/Master/texmf-dist/source/latex/hyperref/hyperref.dtx b/Master/texmf-dist/source/latex/hyperref/hyperref.dtx
index a48c4bb61e4..823a17e8158 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/10/13 v6.83j %
+%<!none> [2012/10/15 v6.83k %
%<package> Hypertext links for LaTeX]
%<nohyperref> Dummy hyperref (SR)]
%<driver> Hyperref documentation driver file]
@@ -147,7 +147,7 @@
\end{document}
%</driver>
% \fi
-% \CheckSum{39588}
+% \CheckSum{39635}
%
% \MakeShortVerb{|}
% \StopEventually{}
@@ -6865,17 +6865,35 @@
%
% Add option |tex4ht| if package |tex4ht| is loaded.
% \begin{macrocode}
-\@ifpackageloaded{tex4ht}{%
- \@ifpackagewith{hyperref}{tex4ht}{%
- }{%
- \PassOptionsToPackage{tex4ht}{hyperref}%
- }%
-}{}
-\ltx@IfUndefined{HCode}{%
+\@ifpackagewith{hyperref}{tex4ht}{%
}{%
- \@ifpackagewith{hyperref}{tex4ht}{%
- }{%
+ \@ifpackageloaded{tex4ht}{%
\PassOptionsToPackage{tex4ht}{hyperref}%
+ }{%
+ \ltx@IfUndefined{HCode}{%
+ }{%
+ \begingroup
+ \def\Hy@pkg{tex4ht}%
+ \def\Hy@temp@A#1\RequirePackage[#2]#3#4\Hy@NIL{%
+ \def\Hy@param{#2#3}%
+ \ifx\Hy@param\ltx@empty
+ \expandafter\ltx@gobble
+ \else
+ \def\Hy@param{#3}%
+ \ifx\Hy@param\Hy@pkg
+ \PassOptionsToPackage{#2}{tex4ht}%
+ \expandafter\expandafter\expandafter\@gobble
+ \else
+ \expandafter\expandafter\expandafter\ltx@firstofone
+ \fi
+ \fi
+ {\Hy@temp@A#4\Hy@NIL}%
+ }%
+ \expandafter
+ \Hy@temp@A\@documentclasshook\RequirePackage[]{}\Hy@NIL
+ \endgroup
+ \PassOptionsToPackage{tex4ht}{hyperref}%
+ }%
}%
}
% \end{macrocode}
@@ -7934,17 +7952,24 @@
\protected@edef\Hy@tempa{#2}%
\edef\Hy@tempb{#3}%
\ifx\Hy@tempa\ltx@empty
- \toks@{%
- \endgroup
- \hyper@link{#1}%
- }%
+ \ifx\Hy@tempb\ltx@empty
+ \Hy@Warning{Suppressing link with empty target}%
+ \toks@{%
+ \endgroup
+ \ltx@secondoftwo
+ }%
+ \else
+ \toks@{%
+ \endgroup
+ \hyper@link{#1}%
+ }%
+ \fi
\else
\toks@{%
\endgroup
\expandafter\hyper@readexternallink#2\\{#1}%
}%
\fi
- \Hy@safe@activestrue
\Hy@safe@activesfalse
\toks@\expandafter{%
\the\expandafter\toks@