hyperref (10apr11)

git-svn-id: svn://tug.org/texlive/trunk@22039 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 190 insertions, 162 deletions

diff --git a/Master/texmf-dist/source/latex/hyperref/hyperref.dtx b/Master/texmf-dist/source/latex/hyperref/hyperref.dtx
index eabf4790d62..492b5f23207 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>  [2011/03/09 v6.82d %
+%<!none>  [2011/04/09 v6.82f %
 %<package>  Hypertext links for LaTeX]
 %<nohyperref>  Dummy hyperref (SR)]
 %<driver>  Hyperref documentation driver file]
@@ -139,7 +139,7 @@
 \end{document}
 %</driver>
 % \fi
-% \CheckSum{28415}
+% \CheckSum{28544}
 %
 % \MakeShortVerb{|}
 % \StopEventually{}
@@ -578,7 +578,7 @@
 % setup internal code changed at that point. It'll probably break
 % with the later releases!
 %    \begin{macrocode}
-\RequirePackage{ltxcmds}[2010/03/09]
+\RequirePackage{ltxcmds}[2010/04/26]
 \@ifpackagelater{ltxcmds}{2010/10/25}{}{%
   \long\def\ltx@LocalAppendToMacro#1#2{%
     \global\let\LTXcmds@gtemp#1%
@@ -698,7 +698,7 @@
 %
 %    \begin{macrocode}
 \ltx@IfUndefined{pdfmatch}{%
-  \def\Hy@Match#1#2#3#4{}%
+  \let\Hy@Match\ltx@gobblefour
 }{%
   \def\Hy@Match#1#2{%
     \begingroup
@@ -789,12 +789,12 @@
 %    \end{macro}
 %    \begin{macro}{\Hy@AtBeginDocumentHook}
 %    \begin{macrocode}
-\def\Hy@AtBeginDocumentHook{}
+\let\Hy@AtBeginDocumentHook\ltx@empty
 %    \end{macrocode}
 %    \end{macro}
 %    \begin{macro}{\Hy@AtEndOfPackageHook}
 %    \begin{macrocode}
-\def\Hy@AtEndOfPackageHook{}
+\let\Hy@AtEndOfPackageHook\ltx@empty
 %    \end{macrocode}
 %    \end{macro}
 %    Install the hook, before package `kvoptions' is loaded.
@@ -922,7 +922,7 @@
 %
 %    \begin{macrocode}
 \newdimen\@linkdim
-\let\Hy@driver\@empty
+\let\Hy@driver\ltx@empty
 \let\MaybeStopEarly\relax
 \newcount\Hy@linkcounter
 \newcount\Hy@pagecounter
@@ -932,16 +932,6 @@
 %
 % \subsection{Macros for recursions}
 %
-%    \begin{macro}{\Hy@ReturnAfterElseFi}
-%    \begin{macro}{\Hy@ReturnAfterFi}
-%    The commands \cs{Hy@ReturnAfterElseFi} and \cs{Hy@ReturnAfterFi}
-%    avoid a too deep \cs{if}-nesting especially for recursive macros.
-%    \begin{macrocode}
-\long\def\Hy@ReturnAfterElseFi#1\else#2\fi{\fi#1}
-\long\def\Hy@ReturnAfterFi#1\fi{\fi#1}
-%    \end{macrocode}
-%    \end{macro}
-%    \end{macro}
 %    \begin{macrocode}
 \let\Hy@ReturnEnd\@empty
 \long\def\Hy@ReturnAfterFiFiEnd#1\fi#2\Hy@ReturnEnd{\fi\fi#1}
@@ -1019,7 +1009,7 @@
     \toks@\expandafter{\the\toks@ #1}%
     \ifx\\#2\\%
     \else
-      \Hy@ReturnAfterFi{%
+      \ltx@ReturnAfterFi{%
         \HyCal@do#2\@nil
       }%
     \fi
@@ -3398,7 +3388,7 @@
 %    \begin{macrocode}
 \def\HyPsd@Warning#1{%
   \begingroup
-    \def\space{ }%
+    \let\space\ltx@space
     \Hy@Warning{#1}%
   \endgroup
 }
@@ -3517,7 +3507,7 @@
 %
 %    Because the string is already expanded, the \cs{if} commands
 %    should disappeared. So we can move some parts out
-%    of the argument of \cs{Hy@ReturnAfterFi}.
+%    of the argument of \cs{ltx@ReturnAfterFi}.
 %    \begin{macrocode}
 \def\HyPsd@@RemoveBracesFi#1#2\HyPsd@End#3\fi{%
   \fi
@@ -3801,7 +3791,7 @@
   }%
   \ifx\\#2\\%
   \else
-    \Hy@ReturnAfterFi{%
+    \ltx@ReturnAfterFi{%
       \HyPsd@GlyphProcessWarning#2\@empty
     }%
   \fi
@@ -3976,7 +3966,7 @@
   |gdef|HyPsd@DoConvert#1{%
     |ifx#1|@empty
     |else
-      |Hy@ReturnAfterFi{%
+      |ltx@ReturnAfterFi{%
         |ifx#1\%%
           \%%
           |expandafter|HyPsd@DoEscape
@@ -3995,7 +3985,7 @@
     |ifx#19%
       |expandafter|HyPsd@GetTwoBytes
     |else
-      |Hy@ReturnAfterFi{%
+      |ltx@ReturnAfterFi{%
         |ifx#18%
           00%
           |expandafter|HyPsd@GetTwoBytes
@@ -6292,7 +6282,7 @@
     \x
   \fi
 }
-\def\HyInfo@AddonList{}
+\let\HyInfo@AddonList\ltx@empty
 %    \end{macrocode}
 %    \begin{macrocode}
 \define@key{Hyp}{pdfview}{\calculate@pdfview#1 \\}
@@ -6318,14 +6308,14 @@
 \fi
 \define@key{Hyp}{pdfstartpage}{%
   \ifx\\#1\\%
-    \def\@pdfstartpage{}%
+    \let\@pdfstartpage\ltx@empty
   \else
     \edef\@pdfstartpage{\Hy@number{#1}}%
   \fi
 }%
 \define@key{Hyp}{pdfstartview}{%
   \ifx\\#1\\%
-    \def\@pdfstartview{}%
+    \let\@pdfstartview\ltx@empty
   \else
     \hypercalcbpdef\@pdfstartview{/#1}%
   \fi
@@ -6427,21 +6417,21 @@
 \def\@runbordercolor{0 .7 .7}
 \def\@citebordercolor{0 1 0}
 \def\@pdfhighlight{/I}
-\def\@pdftitle{}
-\def\@pdfauthor{}
+\let\@pdftitle\ltx@empty
+\let\@pdfauthor\ltx@empty
 \let\@pdfproducer\relax
 \def\@pdfcreator{LaTeX with hyperref package}
-\def\@pdfcreationdate{}
-\def\@pdfmoddate{}
-\def\@pdfsubject{}
-\def\@pdfkeywords{}
-\def\@pdftrapped{}
-\def\@pdfpagescrop{}
+\let\@pdfcreationdate\ltx@empty
+\let\@pdfmoddate\ltx@empty
+\let\@pdfsubject\ltx@empty
+\let\@pdfkeywords\ltx@empty
+\let\@pdftrapped\ltx@empty
+\let\@pdfpagescrop\ltx@empty
 \def\@pdfstartview{/Fit}
 \def\@pdfremotestartview{/Fit}
 \def\@pdfstartpage{1}
-\def\@pdfprintpagerange{}
-\def\@pdflang{}
+\let\@pdfprintpagerange\ltx@empty
+\let\@pdflang\ltx@empty
 \let\PDF@SetupDoc\@empty
 \let\PDF@FinishDoc\@empty
 \let\phantomsection\@empty
@@ -6507,19 +6497,43 @@
 %
 %    After processing options.
 %
+% \subsection{Package xspace support}
+%
+%    \begin{macrocode}
+\def\Hy@xspace@end{}
+\ltx@IfUndefined{xspaceaddexceptions}{%
+  \Hy@AtBeginDocument{%
+    \ltx@IfUndefined{xspaceaddexceptions}{%
+    }{%
+      \def\Hy@xspace@end{%
+        \ltx@gobble{end for xspace}%
+      }%
+      \xspaceaddexceptions{\Hy@xspace@end,\hyper@linkend,\hyper@anchorend}%
+    }%
+  }%
+}{%
+  \def\Hy@xspace@end{%
+    \ltx@gobble{end for xspace}%
+  }%
+  \xspaceaddexceptions{\Hy@xspace@end,\hyper@linkend,\hyper@anchorend}%
+}
+%    \end{macrocode}
+%
+% \subsection{Option draft}
+%
 %    \begin{macrocode}
 \Hy@AtBeginDocument{%
   \ifHy@draft
     \let\hyper@@anchor\@gobble
-    \gdef\hyper@link#1#2#3{#3}%
-    \let\hyper@anchorstart\@gobble
-    \let\hyper@anchorend\@empty
+    \gdef\hyper@link#1#2#3{#3\Hy@xspace@end}%
+    \def\hyper@anchorstart#1#2{#2\Hy@xspace@end}%
+    \def\hyper@anchorend{\Hy@xspace@end}%
     \let\hyper@linkstart\@gobbletwo
-    \let\hyper@linkend\@empty
-    \def\hyper@linkurl#1#2{#1}%
-    \def\hyper@linkfile#1#2#3{#1}%
-    \def\hyper@link@[#1]#2#3{}%
-    \def\Acrobatmenu#1#2{\leavevmode#2}%
+    \def\hyper@linkend{\Hy@xspace@end}%
+    \def\hyper@linkurl#1#2{#1\Hy@xspace@end}%
+    \def\hyper@linkfile#1#2#3{#1\Hy@xspace@end}%
+    \def\hyper@link@[#1]#2#3#4{#4\Hy@xspace@end}%
+    \def\Acrobatmenu#1#2{\leavevmode#2\Hy@xspace@end}%
     \let\PDF@SetupDoc\@empty
     \let\PDF@FinishDoc\@empty
     \let\@fifthoffive\@secondoftwo
@@ -6905,7 +6919,7 @@
     \def\@pdfpagemode{UseOutlines}%
   \fi
 \else
-  \def\@bookmarkopenstatus#1{}%
+  \let\@bookmarkopenstatus\ltx@gobble
   \Hy@Info{Bookmarks OFF}%
   \Hy@AtEndOfPackage{%
     \global\let\ReadBookmarks\relax
@@ -6921,7 +6935,7 @@
 %    Add wrapper for setting standard catcodes (babel's shorthands).
 %    \begin{macrocode}
 \def\Hy@CatcodeWrapper#1{%
-  \def\Hy@EndWrap{}%
+  \let\Hy@EndWrap\ltx@empty
   \def\TMP@EnsureCode##1##2{%
     \edef\Hy@EndWrap{%
       \Hy@EndWrap
@@ -7127,11 +7141,11 @@
   \gdef\hyper@n@rmalise#1#2{^^A
     \def\Hy@tempa{#2}^^A
     \ifx\Hy@tempa\Hy@ActiveCarriageReturn
-      \Hy@ReturnAfterElseFi{^^A
+      \ltx@ReturnAfterElseFi{^^A
         \hyper@@normalise{#1}^^A
       }^^A
     \else
-      \Hy@ReturnAfterFi{^^A
+      \ltx@ReturnAfterFi{^^A
         \hyper@@normalise{#1}{#2}^^A
       }^^A
     \fi
@@ -7147,7 +7161,7 @@
     #1^^A
     \ifx\limits#2\limits
     \else
-      \Hy@ReturnAfterFi{^^A
+      \ltx@ReturnAfterFi{^^A
         \Hy@RemovePercentCr #2\@nil
       }^^A
     \fi
@@ -7379,7 +7393,7 @@
   \expandafter\tryhyper@link\ref@one\\{#1}%
 }
 \def\tryhyper@link#1\\#2{%
- \hyper@@link{#2}{#1}%
+  \hyper@@link{#2}{#1}%
 }
 %    \end{macrocode}
 %
@@ -7689,7 +7703,7 @@
   \fi
   \let\anchor@spot\@empty
 }
-\def\anchor@spot{}
+\let\anchor@spot\ltx@empty
 %    \end{macrocode}
 % \section{Compatibility with the \emph{\LaTeX{}2html} package}\label{latex2html}
 % Map our macro names on to Nikos', so that documents prepared
@@ -8043,7 +8057,7 @@
   \fi
   \HyField@PrintFlags{Submit}{submit button field}%
   \bitsetIsEmpty{HyField@Submit}{%
-    \def\Fld@submitflags{}%
+    \let\Fld@submitflags\ltx@empty
   }{%
     \edef\Fld@submitflags{/Flags \bitsetGetDec{HyField@Submit}}%
   }%
@@ -8068,7 +8082,7 @@
   \HyField@UseFlag{F}{LockedContents}%
   \HyField@PrintFlags{F}{#1}%
   \bitsetIsEmpty{HyField@F}{%
-    \def\Fld@annotflags{}%
+    \let\Fld@annotflags\ltx@empty
   }{%
     \edef\Fld@annotflags{/F \bitsetGetDec{HyField@F}}%
   }%
@@ -8089,7 +8103,7 @@
   \HyField@SetFlag{Ff}{Pushbutton}%
   \HyField@PrintFlags{Ff}{push button field}%
   \bitsetIsEmpty{HyField@Ff}{%
-    \def\Fld@flags{}%
+    \let\Fld@flags\ltx@empty
   }{%
     \edef\Fld@flags{/Ff \bitsetGetDec{HyField@Ff}}%
   }%
@@ -8109,7 +8123,7 @@
   \HyField@UseFlag{Ff}{NoExport}%
   \HyField@PrintFlags{Ff}{check box field}%
   \bitsetIsEmpty{HyField@Ff}{%
-    \def\Fld@flags{}%
+    \let\Fld@flags\ltx@empty
   }{%
     \edef\Fld@flags{/Ff \bitsetGetDec{HyField@Ff}}%
   }%
@@ -8132,7 +8146,7 @@
   \HyField@UseFlag{Ff}{RadiosInUnison}%
   \HyField@PrintFlags{Ff}{radio button field}%
   \bitsetIsEmpty{HyField@Ff}{%
-    \def\Fld@flags{}%
+    \let\Fld@flags\ltx@empty
   }{%
     \edef\Fld@flags{/Ff \bitsetGetDec{HyField@Ff}}%
   }%
@@ -8171,7 +8185,7 @@
   \HyField@UseFlag{Ff}{RichText}%
   \HyField@PrintFlags{Ff}{text field}%
   \bitsetIsEmpty{HyField@Ff}{%
-    \def\Fld@flags{}%
+    \let\Fld@flags\ltx@empty
   }{%
     \edef\Fld@flags{/Ff \bitsetGetDec{HyField@Ff}}%
   }%
@@ -8203,7 +8217,7 @@
   \HyField@UseFlag{Ff}{CommitOnSelChange}%
   \HyField@PrintFlags{Ff}{choice field}%
   \bitsetIsEmpty{HyField@Ff}{%
-    \def\Fld@flags{}%
+    \let\Fld@flags\ltx@empty
   }{%
     \edef\Fld@flags{/Ff \bitsetGetDec{HyField@Ff}}%
   }%
@@ -8221,8 +8235,8 @@
 %    \begin{macrocode}
 \def\HyField@PDFChoices#1{%
   \begingroup
-    \gdef\Fld@choices{}%
-    \def\HyTmp@optlist{}%
+    \global\let\Fld@choices\ltx@empty
+    \let\HyTmp@optlist\ltx@empty
     \let\HyTmp@optitem\relax
     \count@=0 %
     \kv@parse{#1}{%
@@ -8546,7 +8560,7 @@
   \Fld@DingDef\Fld@radiosymbol{#1}%
 }
 \def\Fld@DingDef#1#2{%
-  \def\Fld@temp{}%
+  \let\Fld@temp\ltx@empty
   \Fld@@DingDef#2\ding{}\@nil
   \let#1\Fld@temp
 }
@@ -8590,17 +8604,17 @@
 }
 %    \end{macrocode}
 %    \begin{macrocode}
-\def\Fld@onclick@code{}
-\def\Fld@format@code{}
-\def\Fld@validate@code{}
-\def\Fld@calculate@code{}
-\def\Fld@keystroke@code{}
-\def\Fld@onfocus@code{}
-\def\Fld@onblur@code{}
-\def\Fld@onmousedown@code{}
-\def\Fld@onmouseup@code{}
-\def\Fld@onenter@code{}
-\def\Fld@onexit@code{}
+\let\Fld@onclick@code\ltx@empty
+\let\Fld@format@code\ltx@empty
+\let\Fld@validate@code\ltx@empty
+\let\Fld@calculate@code\ltx@empty
+\let\Fld@keystroke@code\ltx@empty
+\let\Fld@onfocus@code\ltx@empty
+\let\Fld@onblur@code\ltx@empty
+\let\Fld@onmousedown@code\ltx@empty
+\let\Fld@onmouseup@code\ltx@empty
+\let\Fld@onenter@code\ltx@empty
+\let\Fld@onexit@code\ltx@empty
 \def\Hy@temp#1{%
   \expandafter\Hy@@temp\csname Fld@#1@code\endcsname{#1}%
 }
@@ -8852,33 +8866,31 @@
 % |hyperref| playing havoc in the front matter.
 %    \begin{macrocode}
 \def\NoHyper{%
-  \def\hyper@link@[##1]##2##3##4{##4}%
-  \def\hyper@@anchor##1{}%
+  \def\hyper@link@[##1]##2##3##4{##4\Hy@xspace@end}%
+  \def\hyper@@anchor##1##2{##2\Hy@xspace@end}%
   \global\let\hyper@livelink\hyper@link
-  \gdef\hyper@link##1##2##3{##3}%
-  \def\hyper@anchor##1{}%
-  \def\hyper@anchorstart##1{}%
-  \let\hyper@anchorend\@empty
-  \def\hyper@linkstart##1##2{}%
-  \let\hyper@linkend\@empty
-  \def\hyper@linkurl##1##2{##1}%
-  \def\hyper@linkfile##1##2##3{##1}%
-  \def\hyper@link@[##1]##2##3{}%
+  \gdef\hyper@link##1##2##3{##3\Hy@xspace@end}%
+  \let\hyper@anchor\ltx@gobble
+  \let\hyper@anchorstart\ltx@gobble
+  \def\hyper@anchorend{\Hy@xspace@end}%
+  \let\hyper@linkstart\ltx@gobbletwo
+  \def\hyper@linkend{\Hy@xspace@end}%
+  \def\hyper@linkurl##1##2{##1\Hy@xspace@end}%
+  \def\hyper@linkfile##1##2##3{##1\Hy@xspace@end}%
   \let\Hy@backout\@gobble
 }
 \def\stop@hyper{%
-  \def\hyper@link@[##1]##2##3##4{##4}%
+  \def\hyper@link@[##1]##2##3##4{##4\Hy@xspace@end}%
   \let\Hy@backout\@gobble
-  \def\hyper@@anchor##1{}%
-  \def\hyper@link##1##2##3{##3}%
-  \def\hyper@anchor##1{}%
-  \def\hyper@anchorstart##1{}%
-  \let\hyper@anchorend\@empty
-  \def\hyper@linkstart##1##2{}%
-  \let\hyper@linkend\@empty
-  \def\hyper@linkurl##1##2{##1}%
-  \def\hyper@linkfile##1##2##3{##1}%
-  \def\hyper@link@[##1]##2##3{}%
+  \let\hyper@@anchor\ltx@gobble
+  \def\hyper@link##1##2##3{##3\Hy@xspace@end}%
+  \let\hyper@anchor\ltx@gobble
+  \let\hyper@anchorstart\ltx@gobble
+  \def\hyper@anchorend{\Hy@xspace@end}%
+  \let\hyper@linkstart\ltx@gobbletwo
+  \def\hyper@linkend{\Hy@xspace@end}%
+  \def\hyper@linkurl##1##2{##1\Hy@xspace@end}%
+  \def\hyper@linkfile##1##2##3{##1\Hy@xspace@end}%
 }
 \def\endNoHyper{%
   \global\let\hyper@link\hyper@livelink
@@ -9006,7 +9018,7 @@
       \string\gdef\string\HyperFirstAtBeginDocument\string#1{\string#1}%
     }%
   \fi
-  \def\HyperFirstAtBeginDocument#1{#1}%
+  \let\HyperFirstAtBeginDocument\ltx@firstofone
 %    \end{macrocode}
 %
 % Now the code to deal with adding the hyperref package to a document
@@ -9141,12 +9153,12 @@
 %
 %    \begin{macrocode}
 \RequirePackage{atbegshi}[2007/09/09]
-\def\Hy@EveryPageHook{}
-\def\Hy@EveryPageBoxHook{}
-\def\Hy@FirstPageHook{}
+\let\Hy@EveryPageHook\ltx@empty
+\let\Hy@EveryPageBoxHook\ltx@empty
+\let\Hy@FirstPageHook\ltx@empty
 \AtBeginShipout{%
   \Hy@EveryPageHook
-  \ifx\Hy@EveryPageBoxHook\@empty
+  \ifx\Hy@EveryPageBoxHook\ltx@empty
   \else
     \setbox\AtBeginShipoutBox=\vbox{%
       \offinterlineskip
@@ -9160,7 +9172,7 @@
 }
 \g@addto@macro\Hy@FirstPageHook{%
   \PDF@FinishDoc
-  \gdef\PDF@FinishDoc{}%
+  \global\let\PDF@FinishDoc\ltx@empty
 }
 %    \end{macrocode}
 %
@@ -9196,7 +9208,7 @@
 %    The page labels are collected in \cmd{\HyPL@Labels} and
 %    set at the end of the document.
 %    \begin{macrocode}
-  \def\HyPL@Labels{}%
+  \let\HyPL@Labels\ltx@empty
 %    \end{macrocode}
 %    \end{macro}
 %    \begin{macro}{\Hy@abspage}
@@ -9212,7 +9224,7 @@
 %    \begin{macrocode}
   \def\HyPL@LastType{init}%
   \def\HyPL@LastNumber{0}%
-  \def\HyPL@LastPrefix{}%
+  \let\HyPL@LastPrefix\ltx@empty
 %    \end{macrocode}
 %    Definitions for the PDF names of the \LaTeX{} pendents.
 %    \begin{macrocode}
@@ -9224,7 +9236,7 @@
 %    \end{macrocode}
 %
 %    \begin{macrocode}
-  \def\HyPL@SlidesSetPage{}%
+  \let\HyPL@SlidesSetPage\ltx@empty
   \ltx@ifclassloaded{slides}{%
     \def\HyPL@SlidesSetPage{%
       \advance\c@page\ltx@one
@@ -9233,7 +9245,7 @@
           \Hy@SlidesFormatOptionalPage{\thepage}%
         }%
       \else
-        \def\HyPL@SlidesOptionalPage{}%
+        \let\HyPL@SlidesOptionalPage\ltx@empty
       \fi
       \advance\c@page-\ltx@one
       \def\HyPL@page{%
@@ -11780,7 +11792,7 @@
   \def\Hy@temp{#3}%
   \ifx\Hy@temp\@empty
   \else
-    \Hy@ReturnAfterFi{%
+    \ltx@ReturnAfterFi{%
       \HyInd@hyperpage#3\@nil
     }%
   \fi
@@ -11822,7 +11834,7 @@
       \hyperlink{page.\the\toks@}{\the\toks@}%
     \fi
   \else
-    \Hy@ReturnAfterFi{%
+    \ltx@ReturnAfterFi{%
       \HyInd@removespaces#2\@nil
     }%
   \fi
@@ -12358,7 +12370,7 @@
       |ifx|\#2|\%%
       |else
         \\%
-        |Hy@ReturnAfterFi{%
+        |ltx@ReturnAfterFi{%
           |Hy@ExchangeBackslash#2|@nil
         }%
       |fi
@@ -12369,7 +12381,7 @@
     \ifx\\#2\\%
     \else
       \@backslashchar(%
-      \Hy@ReturnAfterFi{%
+      \ltx@ReturnAfterFi{%
         \Hy@ExchangeLeftParenthesis#2\@nil
       }%
     \fi
@@ -12379,7 +12391,7 @@
     \ifx\\#2\\%
     \else
       \@backslashchar)%
-      \Hy@ReturnAfterFi{%
+      \ltx@ReturnAfterFi{%
         \Hy@ExchangeRightParenthesis#2\@nil
       }%
     \fi
@@ -12679,7 +12691,7 @@
   }{%
     \edef\CurrentBorderColor{\csname @#1bordercolor\endcsname}%
   }%
-  \find@pdflink{#1}{#2}#3%
+  \find@pdflink{#1}{#2}#3\Hy@xspace@end
   \close@pdflink
 }
 \let\CurrentBorderColor\@linkbordercolor
@@ -12714,7 +12726,7 @@
        >>%
       }%
       \relax
-    \Hy@colorlink\@urlcolor#1%
+    \Hy@colorlink\@urlcolor#1\Hy@xspace@end
     \close@pdflink
   \endgroup
 }
@@ -12768,7 +12780,7 @@
         >>%
       }%
       \relax
-    \Hy@colorlink\@filecolor#1%
+    \Hy@colorlink\@filecolor#1\Hy@xspace@end
     \close@pdflink
   \endgroup
 }
@@ -12804,7 +12816,7 @@
         >>%
       }%
       \relax
-    \Hy@colorlink\@runcolor#2%
+    \Hy@colorlink\@runcolor#2\Hy@xspace@end
     \close@pdflink
   \endgroup
 }
@@ -13288,7 +13300,7 @@
 %    \begin{macrocode}
 %<*hypertex>
 \providecommand*{\XR@ext}{dvi}
-\def\PDF@FinishDoc{}
+\let\PDF@FinishDoc\ltx@empty
 \def\PDF@SetupDoc{%
   \ifx\@baseurl\@empty
   \else
@@ -13383,7 +13395,7 @@
     \begingroup
       \hyper@chars
       \special{html:<a href=\hyper@quote#2\hyper@quote>}%
-      \Hy@colorlink\@urlcolor#1%
+      \Hy@colorlink\@urlcolor#1\Hy@xspace@end
       \special{html:</a>}%
       \Hy@endcolorlink
     \endgroup
@@ -13479,7 +13491,7 @@
       }%
       \expandafter\Hy@colorlink\csname @#1color\endcsname
       \Hy@RestoreSpaceFactor
-      #3%
+      #3\Hy@xspace@end
       \Hy@SaveSpaceFactor
       \Hy@endcolorlink
     }%
@@ -13494,7 +13506,7 @@
       #2%
     }%
     \expandafter\Hy@colorlink\csname @#1color\endcsname
-    #3%
+    #3\Hy@xspace@end
     \Hy@endcolorlink
   \fi
 }
@@ -13517,7 +13529,7 @@
         }%
         \Hy@colorlink\@urlcolor
           \Hy@RestoreSpaceFactor
-          #1%
+          #1\Hy@xspace@end
           \Hy@SaveSpaceFactor
         \Hy@endcolorlink
       }%
@@ -13532,7 +13544,9 @@
         launch: \wwwbrowser\space
         #2%
       }%
-      \Hy@colorlink\@urlcolor#1\Hy@endcolorlink
+      \Hy@colorlink\@urlcolor
+        #1\Hy@xspace@end
+      \Hy@endcolorlink
     \fi
   \endgroup
 }
@@ -13555,7 +13569,7 @@
         }%
         \Hy@colorlink\@filecolor
           \Hy@RestoreSpaceFactor
-          #1%
+          #1\Hy@xspace@end
           \Hy@SaveSpaceFactor
         \Hy@endcolorlink
       }%
@@ -13570,7 +13584,9 @@
         #3,%
         file: #2%
       }%
-      \Hy@colorlink\@filecolor#1\Hy@endcolorlink
+      \Hy@colorlink\@filecolor
+        #1\Hy@xspace@end
+      \Hy@endcolorlink
     \fi
   \endgroup
 }
@@ -13937,7 +13953,7 @@
 }
 \def\hyper@linkend{\Hy@EndAnnot}%
 \def\hyper@link#1#2#3{%
-  \hyper@linkstart{#1}{#2}#3\hyper@linkend
+  \hyper@linkstart{#1}{#2}#3\Hy@xspace@end\hyper@linkend
 }
 \def\hyper@linkfile#1#2#3{%
   \leavevmode
@@ -13973,7 +13989,7 @@
     }%
     \Hy@colorlink\@filecolor
   }%
-  #1%
+  #1\Hy@xspace@end
   \Hy@EndAnnot
 }
 \def\@hyper@launch run:#1\\#2#3{% filename, anchor text linkname
@@ -14005,7 +14021,7 @@
     }%
     \Hy@colorlink\@runcolor
   }%
-  #2%
+  #2\Hy@xspace@end
   \Hy@EndAnnot
 }
 \def\hyper@linkurl#1#2{%
@@ -14034,7 +14050,7 @@
     }%
     \Hy@colorlink\@urlcolor
   }%
-  #1%
+  #1\Hy@xspace@end
   \Hy@EndAnnot
 }
 \def\Acrobatmenu#1#2{%
@@ -14059,7 +14075,7 @@
       }%
       \Hy@colorlink\@menucolor
     }%
-    #2%
+    #2\Hy@xspace@end
     \Hy@EndAnnot
   }%
 }
@@ -14215,7 +14231,7 @@
 \providecommand*{\XR@ext}{htm}
 \RequirePackage{vtexhtml}
 \newif\if@Localurl
-\def\PDF@FinishDoc{}
+\let\PDF@FinishDoc\ltx@empty
 \def\PDF@SetupDoc{%
   \ifx\@baseurl\@empty
   \else
@@ -14228,7 +14244,7 @@
   \leavevmode
   \special{!direct <a href=%
       \hyper@quote\hyper@hash\HyperDestNameFilter{#2}\hyper@quote>}%
-  #3%
+  #3\Hy@xspace@end
   \special{!direct </a>}%
 }
 \def\hyper@linkurl#1#2{%
@@ -14238,7 +14254,7 @@
     \MathBSuppress=1\relax
     \special{!direct <a href=%
         \hyper@quote\HyperDestNameFilter{#2}\hyper@quote>}%
-    #1%
+    #1\Hy@xspace@end
     \MathBSuppress=0\relax
     \special{!direct </a>}%
   \endgroup
@@ -14302,7 +14318,7 @@
 \def\@Form[#1]{%
   \Hy@Message{Sorry, TeXpider does not yet support FORMs}%
 }
-\def\@endForm{}
+\let\@endForm\ltx@empty
 \def\@Gauge[#1]#2#3#4{% parameters, label, minimum, maximum
   \Hy@Message{Sorry, TeXpider does not yet support FORM gauges}%
 }
@@ -14469,7 +14485,9 @@
       \fi
     >%
   }%
-  \Hy@colorlink\@filecolor#1\Hy@endcolorlink
+  \Hy@colorlink\@filecolor
+    #1\Hy@xspace@end
+  \Hy@endcolorlink
   \special{!endaref}%
 }
 \def\hyper@linkurl#1#2{%
@@ -14493,7 +14511,9 @@
         \fi
       >%
     }%
-    \Hy@colorlink\@urlcolor#1\Hy@endcolorlink
+    \Hy@colorlink\@urlcolor
+      #1\Hy@xspace@end
+    \Hy@endcolorlink
     \special{!endaref}%
   \endgroup
 }
@@ -14526,7 +14546,9 @@
     >%
   }%
   \expandafter
-  \Hy@colorlink\csname @#1color\endcsname#3\Hy@endcolorlink
+  \Hy@colorlink\csname @#1color\endcsname
+    #3\Hy@xspace@end
+  \Hy@endcolorlink
   \special{!endaref}%
 }
 \def\hyper@image#1#2{%
@@ -14557,7 +14579,9 @@
       \fi
     >%
   }%
-  \Hy@colorlink\@runcolor#2\Hy@endcolorlink
+  \Hy@colorlink\@runcolor
+    #2\Hy@xspace@end
+  \Hy@endcolorlink
   \special{!endaref}%
 }
 \def\Acrobatmenu#1#2{%
@@ -14573,7 +14597,9 @@
         \fi
       >%
     }%
-    \Hy@colorlink\@menucolor#2\Hy@endcolorlink
+    \Hy@colorlink\@menucolor
+      #2\Hy@xspace@end
+    \Hy@endcolorlink
     \special{!endaref}%
   }%
 }
@@ -15091,7 +15117,7 @@
     \ifmmode
       \def\Hy@LinkMath{$}%
     \else
-      \def\Hy@LinkMath{}%
+      \let\Hy@LinkMath\ltx@empty
     \fi
     \Hy@SaveSpaceFactor
     \hbox\bgroup
@@ -15470,13 +15496,13 @@
     \ifmmode
       \def\Hy@LinkMath{$}%
     \else
-      \def\Hy@LinkMath{}%
+      \let\Hy@LinkMath\ltx@empty
     \fi
     \ifHy@breaklinks
       \Hy@setouterhbox\pdf@box{%
         \Hy@RestoreSpaceFactor
         \Hy@LinkMath
-        \Hy@AllowHyphens#1%
+        \Hy@AllowHyphens#1\Hy@xspace@end
         \Hy@LinkMath
         \Hy@SaveSpaceFactor
       }%
@@ -15484,7 +15510,7 @@
       \sbox\pdf@box{%
         \Hy@RestoreSpaceFactor
         \Hy@LinkMath
-        #1%
+        #1\Hy@xspace@end
         \Hy@LinkMath
         \Hy@SaveSpaceFactor
       }%
@@ -15844,7 +15870,7 @@
 %    \begin{macrocode}
 %<*dvips>
 \providecommand*{\XR@ext}{pdf}
-\def\Hy@raisedlink{}
+\let\Hy@raisedlink\ltx@empty
 \def\literalps@out#1{\special{ps:SDict begin #1 end}}%
 \def\headerps@out#1{\special{! #1}}%
 \input{pdfmark.def}%
@@ -15986,7 +16012,7 @@
 %    \begin{macrocode}
 %<*vtexpdfmark>
 \providecommand*{\XR@ext}{pdf}
-\def\Hy@raisedlink{}
+\let\Hy@raisedlink\ltx@empty
 \def\literalps@out#1{\special{pS:#1}}%
 \def\headerps@out#1{\immediate\special{pS:#1}}%
 \input{pdfmark.def}%
@@ -16313,7 +16339,7 @@
     }%
     \Hy@colorlink\@urlcolor
       \Hy@RestoreSpaceFactor
-      #1%
+      #1\Hy@xspace@end
       \Hy@SaveSpaceFactor
       \@linkdim\ht\@tempboxa
       \advance\@linkdim by -6.5\p@
@@ -16324,7 +16350,7 @@
     \begingroup
       \hyper@chars
       \special{html:<a href=\hyper@quote#2\hyper@quote>}%
-      \Hy@colorlink\@urlcolor#1%
+      \Hy@colorlink\@urlcolor#1\Hy@xspace@end
       \special{html:</a>}%
       \Hy@endcolorlink
     \endgroup
@@ -16352,7 +16378,7 @@
 % |\special| commands.
 %<*dvipsone>
 \providecommand*{\XR@ext}{pdf}
-\def\Hy@raisedlink{}
+\let\Hy@raisedlink\ltx@empty
 \providecommand*\@pdfborder{0 0 1}
 \providecommand*\@pdfborderstyle{}
 \def\literalps@out#1{\special{ps:#1}}%
@@ -16541,14 +16567,14 @@
 %    \begin{macrocode}
 %<*tex4ht>
 \providecommand*{\XR@ext}{html}
-\def\Hy@raisedlink{}
+\let\Hy@raisedlink\ltx@empty
 \@ifpackageloaded{tex4ht}{%
   \Hy@InfoNoLine{tex4ht is already loaded}%
 }{%
   \RequirePackage[htex4ht]{tex4ht}%
 }
 \hyperlinkfileprefix{}
-\def\PDF@FinishDoc{}
+\let\PDF@FinishDoc\ltx@empty
 \def\PDF@SetupDoc{%
   \ifx\@baseurl\@empty
   \else
@@ -16623,7 +16649,7 @@
     }%
     \Hy@colorlink\@urlcolor
       \Hy@RestoreSpaceFactor
-      #1%
+      #1\Hy@xspace@end
       \Hy@SaveSpaceFactor
     \Hy@endcolorlink
     \@linkdim\ht\@tempboxa
@@ -16634,7 +16660,9 @@
    \begingroup
      \hyper@chars
      \special{t4ht=<a href=\hyper@quote#2\hyper@quote>}%
-     \Hy@colorlink\@urlcolor#1\Hy@endcolorlink
+     \Hy@colorlink\@urlcolor
+       #1\Hy@xspace@end
+     \Hy@endcolorlink
      \special{t4ht=</a>}%
    \endgroup
  \fi
@@ -16656,7 +16684,7 @@
 \ifx \rEfLiNK \UnDef
   \def\rEfLiNK #1#2{#2}%
 \fi
-\def\backref#1{}
+\let\backref\ltx@gobble
 %    \end{macrocode}
 %    Fix for tex4ht.
 %    \begin{macrocode}
@@ -16670,7 +16698,7 @@
     \fi
     \Hy@OrgMakeLabel{#1}{%
       \Hy@RestoreSpaceFactor
-      #2%
+      #2\Hy@xspace@end%
       \Hy@SaveSpaceFactor
     }%
     \Hy@RestoreSpaceFactor
@@ -16879,13 +16907,13 @@
 }}%
   \kvsetkeys{Form}{#1}%
 }
-\def\@endForm{}
+\let\@endForm\ltx@empty
 \def\@Gauge[#1]#2#3#4{% parameters, label, minimum, maximum
   \Hy@Message{Sorry, pdfmark drivers do not support FORM gauges}%
 }
 \def\@TextField[#1]#2{% parameters, label
   \def\Fld@name{#2}%
-  \def\Fld@default{}%
+  \let\Fld@default\ltx@empty
   \let\Fld@value\@empty
   \def\Fld@width{\DefaultWidthofText}%
   \def\Fld@height{%
@@ -17096,7 +17124,7 @@
 %    \begin{macrocode}
 %<*hypertex>
 \def\@Form[#1]{\Hy@Message{Sorry, HyperTeX does not support FORMs}}
-\def\@endForm{}
+\let\@endForm\ltx@empty
 \def\@Gauge[#1]#2#3#4{% parameters, label, minimum, maximum
   \Hy@Message{Sorry, HyperTeX does not support FORM gauges}%
 }
@@ -17130,7 +17158,7 @@
 \def\@TextField[#1]#2{% parameters, label
   \let\Hy@reserved@a\@empty
   \def\Fld@name{#2}%
-  \def\Fld@default{}%
+  \let\Fld@default\ltx@empty
   \bgroup
     \Field@toks={ }%
     \kvsetkeys{Field}{#1}%
@@ -17177,7 +17205,7 @@
 }
 \def\@ChoiceMenu[#1]#2#3{% parameters, label, choices
   \def\Fld@name{#2}%
-  \def\Fld@default{}%
+  \let\Fld@default\ltx@empty
   \let\Hy@reserved@a\relax
   \begingroup
     \expandafter\Fld@findlength#3\\%
@@ -17275,7 +17303,7 @@
   }%
 % \hbox to 0pt{\hskip-\maxdimen{\pdfrefxform \the\pdflastxform}}%
 }%
-\def\HyField@afields{}
+\let\HyField@afields\ltx@empty
 \begingroup\expandafter\expandafter\expandafter\endgroup
 \expandafter\ifx\csname pdflastlink\endcsname\relax
   \let\HyField@AddToFields\relax
@@ -17287,7 +17315,7 @@
     but other PDF viewers might complain%
   }%
 \else
-  \def\HyField@AuxAddToFields#1{}%
+  \let\HyField@AuxAddToFields\ltx@gobble
   \def\HyField@AfterAuxOpen{\Hy@AtBeginDocument}%
   \Hy@AtBeginDocument{%
     \if@filesw
@@ -17375,10 +17403,10 @@
     \fbox{\textcolor{yellow}{\textsf{SubmitP}}}%
   }{SubmitP}%
 }
-\def\@endForm{}
+\let\@endForm\ltx@empty
 \def\@TextField[#1]#2{% parameters, label
   \def\Fld@name{#2}%
-  \def\Fld@default{}%
+  \let\Fld@default\ltx@empty
   \let\Fld@value\@empty
   \def\Fld@width{\DefaultWidthofText}%
   \def\Fld@height{%
@@ -17718,7 +17746,7 @@
 %    \end{macro}
 %    \begin{macro}{\@endForm}
 %    \begin{macrocode}
-\def\@endForm{}
+\let\@endForm\ltx@empty
 %    \end{macrocode}
 %    \end{macro}
 %
@@ -17759,7 +17787,7 @@
 %    \begin{macrocode}
 \def\@TextField[#1]#2{% parameters, label
   \def\Fld@name{#2}%
-  \def\Fld@default{}%
+  \let\Fld@default\ltx@empty
   \let\Fld@value\@empty
   \def\Fld@width{\DefaultWidthofText}%
   \def\Fld@height{%
@@ -18161,7 +18189,7 @@
     \else
       \expandafter
       \Hy@pstringdef\csname Hy@esc@\string#2\endcsname{#2}%
-      \Hy@ReturnAfterFi{%
+      \ltx@ReturnAfterFi{%
         \Hy@@escapeform#3\@nil
       }%
     \fi