hyperref update (4mar10)

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

4 files changed, 62 insertions, 18 deletions

diff --git a/Master/texmf-dist/source/latex/hyperref/hyperref.dtx b/Master/texmf-dist/source/latex/hyperref/hyperref.dtx
index 6f9d4109cc5..a12320eefb1 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/02/25 v6.80h
+%<!none>  [2010/03/04 v6.80k
 %<package>  Hypertext links for LaTeX]
 %<nohyperref>  Dummy hyperref (SR)]
 %<driver>  Hyperref documentation driver file]
@@ -80,7 +80,9 @@
 ]{hyperref}
 \usepackage[numbered]{hypdoc}
 \usepackage{bmhydoc}
-\pdfstringdefDisableCommands{\let\\\textbackslash}%
+\pdfstringdefDisableCommands{%
+  \let\\\textbackslash
+}%
 \EnableCrossrefs
 \CodelineIndex
 \setlength{\hfuzz}{2pt}
@@ -91,9 +93,9 @@
   \GetFileInfo{hyperref.drv}%
   \title{Hypertext marks in \LaTeX}%
   \author{Sebastian Rahtz\\%
-    Email: \texttt{sebastian.rahtz@oucs.ox.ac.uk}\\[1.5ex]%
+    Email: \texttt{sebastian.rahtz at oucs.ox.ac.uk}\\[1.5ex]%
     Heiko Oberdiek\\%
-    Email: \texttt{oberdiek@uni-freiburg.de}}%
+    Email: \texttt{heiko.oberdiek at googlemail.com}}%
   % \date{processed \today}%
   \date{\filedate\space\fileversion}%
   \maketitle
@@ -124,7 +126,7 @@
 \end{document}
 %</driver>
 % \fi
-% \CheckSum{25557}
+% \CheckSum{25621}
 %
 % \MakeShortVerb{|}
 % \StopEventually{}
@@ -829,8 +831,7 @@
 %    \end{macro}
 %
 % \section{Dealing with PDF strings}\label{sec:pdfstring}
-%    The PDF string stuff done by Heiko Oberdiek.\\
-%    Email: \Email{oberdiek@uni-freiburg.de}.
+%    The PDF string stuff done by Heiko Oberdiek.
 %
 %    Naming convention: All internal commands that are only
 %    needed by \cs{pdfstringdef} are prefixed with \cs{HyPsd@}.
@@ -1044,6 +1045,13 @@
 %    Because font changes do not work, the standard font
 %    switching commands are disabled.
 %    \begin{macrocode}
+    \let\fontencoding\@gobble
+    \let\fontfamily\@gobble
+    \let\fontseries\@gobble
+    \let\fontshape\@gobble
+    \let\fontsize\@gobbletwo
+    \let\selectfont\@empty
+    \let\usefont\@gobblefour
     \let\emph\@firstofone
     \let\textnormal\@firstofone
     \let\textrm\@firstofone
@@ -6291,6 +6299,16 @@
 %    \end{macrocode}
 %
 %    \begin{macrocode}
+\def\Hy@AllowHyphens{%
+  \relax
+  \ifhmode
+    \penalty\@M
+    \hskip\z@skip
+  \fi
+}
+%    \end{macrocode}
+%
+%    \begin{macrocode}
 \DeclareRobustCommand*{\href}{%
   \@ifnextchar\bgroup\Hy@href{\hyper@normalise\href@}%
 }
@@ -13555,6 +13573,7 @@
   \Hy@SaveLastskip
   \Hy@VerboseAnchor{#1}%
   \literalps@out{H.S}%
+  \Hy@AllowHyphens
   \xdef\hyper@currentanchor{#1}%
   \Hy@activeanchortrue
 }
@@ -13577,6 +13596,7 @@
   \fi
   \expandafter\Hy@colorlink\csname @#1color\endcsname
   \literalps@out{H.S}%
+  \Hy@AllowHyphens
   \xdef\hyper@currentanchor{#2}%
   \gdef\hyper@currentlinktype{#1}%
 }
@@ -13921,7 +13941,7 @@
 \def\pdf@rect#1{%
   \leavevmode
   \ifHy@breaklinks
-    \Hy@setouterhbox\pdf@box{#1}%
+    \Hy@setouterhbox\pdf@box{\Hy@AllowHyphens#1}%
   \else
     \sbox\pdf@box{#1}%
   \fi
@@ -15670,14 +15690,38 @@
     but other PDF viewers might complain%
   }%
 \else
+  \def\HyField@AuxAddToFields#1{}%
+  \def\HyField@AfterAuxOpen{\AtBeginDocument}%
+  \AtBeginDocument{%
+    \if@filesw
+      \immediate\write\@mainaux{%
+        \string\providecommand\string\HyField@AuxAddToFields[1]{}%
+      }%
+    \fi
+    \let\HyField@AfterAuxOpen\@firstofone
+    \def\HyField@AuxAddToFields#1{%
+      \xdef\HyField@afields{%
+        \ifx\HyField@afields\@empty
+        \else
+          \HyField@afields
+          \space
+        \fi
+        #1 0 R%
+      }%
+    }%
+  }%
   \def\HyField@AddToFields{%
-    \xdef\HyField@afields{%
-      \ifx\HyField@afields\@empty
-      \else
-        \HyField@afields
-        \space
+    \expandafter\HyField@@AddToFields\expandafter{%
+      \the\pdflastlink
+    }%
+  }%
+  \def\HyField@@AddToFields#1{%
+    \HyField@AfterAuxOpen{%
+      \if@filesw
+        \write\@mainaux{%
+          \string\HyField@AuxAddToFields{#1}%
+        }%
       \fi
-      \the\pdflastlink\space 0 R%
     }%
   }%
 \fi
@@ -15690,7 +15734,7 @@
     \pdfrefobj\OBJ@ZaDb
     \pdfrefobj\OBJ@Helv
   \fi
-  \AtEndDocument{%
+  \AtVeryEndDocument{%
     \immediate\pdfobj{%
       <<%
         /Fields[\HyField@afields]%
diff --git a/Master/texmf-dist/source/latex/hyperref/test/test-bm-pu-licr.tex b/Master/texmf-dist/source/latex/hyperref/test/test-bm-pu-licr.tex
index 479923b32eb..664e85ce734 100644
--- a/Master/texmf-dist/source/latex/hyperref/test/test-bm-pu-licr.tex
+++ b/Master/texmf-dist/source/latex/hyperref/test/test-bm-pu-licr.tex
@@ -26,7 +26,7 @@
 % given in the file `manifest.txt'.
 %
 % Please send error reports and suggestions for improvements to
-%   Heiko Oberdiek <oberdiek@uni-freiburg.de>.
+%   Heiko Oberdiek <heiko.oberdiek at googlemail.com>.
 %
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{test-bm-pu-licr.tex}%
diff --git a/Master/texmf-dist/source/latex/hyperref/test/testbmgl.tex b/Master/texmf-dist/source/latex/hyperref/test/testbmgl.tex
index 9fd1684fbf1..41c140fad14 100644
--- a/Master/texmf-dist/source/latex/hyperref/test/testbmgl.tex
+++ b/Master/texmf-dist/source/latex/hyperref/test/testbmgl.tex
@@ -26,7 +26,7 @@
 % given in the file `manifest.txt'.
 %
 % Please send error reports and suggestions for improvements to
-%   Heiko Oberdiek <oberdiek@uni-freiburg.de>.
+%   Heiko Oberdiek <heiko.oberdiek at googlemail.com>.
 %
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{testbmgl.tex}[2008/09/11 v1.3 Test bookmark glyphs (HO)]
diff --git a/Master/texmf-dist/source/latex/hyperref/test/testbmu.tex b/Master/texmf-dist/source/latex/hyperref/test/testbmu.tex
index 0de8c2f688a..eb265222436 100644
--- a/Master/texmf-dist/source/latex/hyperref/test/testbmu.tex
+++ b/Master/texmf-dist/source/latex/hyperref/test/testbmu.tex
@@ -26,7 +26,7 @@
 % given in the file `manifest.txt'.
 %
 % Please send error reports and suggestions for improvements to
-%   Heiko Oberdiek <oberdiek@uni-freiburg.de>.
+%   Heiko Oberdiek <heiko.oberdiek at googlemail.com>.
 %
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{testbmu.tex}[2008/09/11 v1.4 Test bookmark glyphs (HO)]