hyperref

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

26 files changed, 57 insertions, 46 deletions

diff --git a/Master/texmf-dist/doc/latex/hyperref/ChangeLog b/Master/texmf-dist/doc/latex/hyperref/ChangeLog
index e82803804aa..f445ef406c8 100644
--- a/Master/texmf-dist/doc/latex/hyperref/ChangeLog
+++ b/Master/texmf-dist/doc/latex/hyperref/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-13  6.82q  Heiko Oberdiek
+    * 6.82q
+    * \HyNew@float@makebox added for package `caption'
+      (feature request from Axel Sommerfeldt).
+
 2012-02-28  6.82p  Heiko Oberdiek
     * 6.82p
     * pdfmark: Missing border color setting for \Acrobatmenu added.
diff --git a/Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf b/Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf
index 3991b5f8060..c7433867741 100644
--- a/Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf
+++ b/Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf
diff --git a/Master/texmf-dist/doc/latex/hyperref/backref.pdf b/Master/texmf-dist/doc/latex/hyperref/backref.pdf
index 4b70fe8a62d..5bc26bd6cc2 100644
--- a/Master/texmf-dist/doc/latex/hyperref/backref.pdf
+++ b/Master/texmf-dist/doc/latex/hyperref/backref.pdf
diff --git a/Master/texmf-dist/doc/latex/hyperref/hyperref.pdf b/Master/texmf-dist/doc/latex/hyperref/hyperref.pdf
index 9a0cfae7a4a..034e92971d1 100644
--- a/Master/texmf-dist/doc/latex/hyperref/hyperref.pdf
+++ b/Master/texmf-dist/doc/latex/hyperref/hyperref.pdf
diff --git a/Master/texmf-dist/doc/latex/hyperref/nameref.pdf b/Master/texmf-dist/doc/latex/hyperref/nameref.pdf
index c6a67e89c1c..8a0f6bfce67 100644
--- a/Master/texmf-dist/doc/latex/hyperref/nameref.pdf
+++ b/Master/texmf-dist/doc/latex/hyperref/nameref.pdf
diff --git a/Master/texmf-dist/source/latex/hyperref/hyperref.dtx b/Master/texmf-dist/source/latex/hyperref/hyperref.dtx
index 1b8912eb6ed..d0c67fdf5ec 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>  [2012/02/28 v6.82p %
+%<!none>  [2012/05/13 v6.82q %
 %<package>  Hypertext links for LaTeX]
 %<nohyperref>  Dummy hyperref (SR)]
 %<driver>  Hyperref documentation driver file]
@@ -145,7 +145,7 @@
 \end{document}
 %</driver>
 % \fi
-% \CheckSum{28743}
+% \CheckSum{28746}
 %
 % \MakeShortVerb{|}
 % \StopEventually{}
@@ -11005,8 +11005,24 @@
 %    of the float, if the float is controlled by float.sty.
 %    Several \verb|\caption| commands inside one float are
 %    not supported.
+%
+%    \cs{HyNew@float@makebox} is introduced as feature request
+%    of Axel Sommerfeldt to make the life easier for his
+%    package `caption'.
 %    \begin{macrocode}
 \let\Hy@float@caption\@caption
+\newcommand{\HyNew@float@makebox}[1]{%
+  \HyOrg@float@makebox{%
+    #1\relax
+    \ifx\Hy@float@currentHref\@undefined
+    \else
+      \expandafter\hyper@@anchor\expandafter{%
+        \Hy@float@currentHref
+      }{\relax}%
+      \global\let\Hy@float@currentHref\@undefined
+    \fi
+  }%
+}%
 \@ifpackageloaded{float}{%
   \def\Hy@float@caption{%
     \ifx\Hy@float@currentHref\@undefined
@@ -11018,18 +11034,7 @@
     \float@caption
   }%
   \let\HyOrg@float@makebox\float@makebox
-  \renewcommand{\float@makebox}[1]{%
-    \HyOrg@float@makebox{%
-      #1\relax
-      \ifx\Hy@float@currentHref\@undefined
-      \else
-        \expandafter\hyper@@anchor\expandafter{%
-          \Hy@float@currentHref
-        }{\relax}%
-        \global\let\Hy@float@currentHref\@undefined
-      \fi
-    }%
-  }%
+  \let\float@makebox\HyNew@float@makebox
 }{}
 %    \end{macrocode}
 %
diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def b/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def
index 3dfc0475c39..33aa284924f 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def
@@ -29,7 +29,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{hdvipdfm.def}
-  [2012/02/28 v6.82p %
+  [2012/05/13 v6.82q %
   Hyperref driver for dvipdfm]
 \Hy@VersionCheck{hdvipdfm.def}
 \def\Hy@PutCatalog#1{\@pdfm@mark{docview << #1 >>}}
diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvips.def b/Master/texmf-dist/tex/latex/hyperref/hdvips.def
index aa81935a938..848bad1eb82 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hdvips.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hdvips.def
@@ -29,7 +29,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{hdvips.def}
-  [2012/02/28 v6.82p %
+  [2012/05/13 v6.82q %
   Hyperref driver for dvips]
 \Hy@VersionCheck{hdvips.def}
 \providecommand*{\XR@ext}{pdf}
diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvipson.def b/Master/texmf-dist/tex/latex/hyperref/hdvipson.def
index 09c6f0579e5..9b8c8060b85 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hdvipson.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hdvipson.def
@@ -29,7 +29,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{hdvipson.def}
-  [2012/02/28 v6.82p %
+  [2012/05/13 v6.82q %
   Hyperref driver for dvipsone]
 \Hy@VersionCheck{hdvipson.def}
 \providecommand*{\XR@ext}{pdf}
diff --git a/Master/texmf-dist/tex/latex/hyperref/hdviwind.def b/Master/texmf-dist/tex/latex/hyperref/hdviwind.def
index ba46d83ebe8..8b90db287bd 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hdviwind.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hdviwind.def
@@ -29,7 +29,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{hdviwind.def}
-  [2012/02/28 v6.82p %
+  [2012/05/13 v6.82q %
   Hyperref driver for dviwindo]
 \Hy@VersionCheck{hdviwind.def}
 \begingroup
diff --git a/Master/texmf-dist/tex/latex/hyperref/hpdftex.def b/Master/texmf-dist/tex/latex/hyperref/hpdftex.def
index 1b8345b06ce..eb73095d8de 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hpdftex.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hpdftex.def
@@ -29,7 +29,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{hpdftex.def}
-  [2012/02/28 v6.82p %
+  [2012/05/13 v6.82q %
   Hyperref driver for pdfTeX]
 \Hy@VersionCheck{hpdftex.def}
 \pdf@ifdraftmode{%
diff --git a/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg b/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg
index c551125d674..2fa750ec73b 100644
--- a/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg
+++ b/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg
@@ -29,7 +29,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{htex4ht.cfg}
-  [2012/02/28 v6.82p %
+  [2012/05/13 v6.82q %
   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 d77f1cf768d..5c12c25f0d6 100644
--- a/Master/texmf-dist/tex/latex/hyperref/htex4ht.def
+++ b/Master/texmf-dist/tex/latex/hyperref/htex4ht.def
@@ -29,7 +29,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{htex4ht.def}
-  [2012/02/28 v6.82p %
+  [2012/05/13 v6.82q %
   Hyperref driver for TeX4ht]
 \Hy@VersionCheck{htex4ht.def}
 \providecommand*{\XR@ext}{html}
diff --git a/Master/texmf-dist/tex/latex/hyperref/htexture.def b/Master/texmf-dist/tex/latex/hyperref/htexture.def
index b0199c52370..81362a1c4f1 100644
--- a/Master/texmf-dist/tex/latex/hyperref/htexture.def
+++ b/Master/texmf-dist/tex/latex/hyperref/htexture.def
@@ -29,7 +29,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{htexture.def}
-  [2012/02/28 v6.82p %
+  [2012/05/13 v6.82q %
   Hyperref driver for Textures]
 \Hy@VersionCheck{htexture.def}
 \providecommand*{\XR@ext}{pdf}
diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtex.def b/Master/texmf-dist/tex/latex/hyperref/hvtex.def
index fb9174754de..f2c2dd16454 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hvtex.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hvtex.def
@@ -29,7 +29,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{hvtex.def}
-  [2012/02/28 v6.82p %
+  [2012/05/13 v6.82q %
   Hyperref driver for VTeX in PDF/PS mode]
 \Hy@VersionCheck{hvtex.def}
 \providecommand*{\XR@ext}{pdf}
diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def b/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def
index ae9ccdb0e11..f5fa55b813c 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def
@@ -29,7 +29,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{hvtexhtml.def}
-  [2012/02/28 v6.82p %
+  [2012/05/13 v6.82q %
   Hyperref driver for VTeX in HTML mode]
 \Hy@VersionCheck{hvtexhtm.def}
 \providecommand*{\XR@ext}{htm}
diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def b/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def
index 1db3281e652..f93971871cf 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def
@@ -29,7 +29,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{hvtexmrk.def}
-  [2012/02/28 v6.82p %
+  [2012/05/13 v6.82q %
  Hyperref driver for VTeX in PDF/PS mode (pdfmark specials)]
 \Hy@VersionCheck{hvtexmrk.def}
 \providecommand*{\XR@ext}{pdf}
diff --git a/Master/texmf-dist/tex/latex/hyperref/hxetex.def b/Master/texmf-dist/tex/latex/hyperref/hxetex.def
index 2ec598f8413..f3c095629e1 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hxetex.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hxetex.def
@@ -29,7 +29,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{hxetex.def}
-  [2012/02/28 v6.82p %
+  [2012/05/13 v6.82q %
   Hyperref driver for XeTeX]
 \Hy@VersionCheck{hxetex.def}
 \HyPsd@LoadUnicode
diff --git a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty
index b8004922014..24440c3c24c 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty
+++ b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty
@@ -30,7 +30,7 @@
 %%
 \NeedsTeXFormat{LaTeX2e}[1995/12/01]
 \ProvidesPackage{hyperref}
-  [2012/02/28 v6.82p %
+  [2012/05/13 v6.82q %
   Hypertext links for LaTeX]
 \begingroup
   \@makeother\`%
@@ -7074,6 +7074,18 @@
   \endgroup
 }
 \let\Hy@float@caption\@caption
+\newcommand{\HyNew@float@makebox}[1]{%
+  \HyOrg@float@makebox{%
+    #1\relax
+    \ifx\Hy@float@currentHref\@undefined
+    \else
+      \expandafter\hyper@@anchor\expandafter{%
+        \Hy@float@currentHref
+      }{\relax}%
+      \global\let\Hy@float@currentHref\@undefined
+    \fi
+  }%
+}%
 \@ifpackageloaded{float}{%
   \def\Hy@float@caption{%
     \ifx\Hy@float@currentHref\@undefined
@@ -7085,18 +7097,7 @@
     \float@caption
   }%
   \let\HyOrg@float@makebox\float@makebox
-  \renewcommand{\float@makebox}[1]{%
-    \HyOrg@float@makebox{%
-      #1\relax
-      \ifx\Hy@float@currentHref\@undefined
-      \else
-        \expandafter\hyper@@anchor\expandafter{%
-          \Hy@float@currentHref
-        }{\relax}%
-        \global\let\Hy@float@currentHref\@undefined
-      \fi
-    }%
-  }%
+  \let\float@makebox\HyNew@float@makebox
 }{}
 \def\hyper@natlinkstart#1{%
   \Hy@backout{#1}%
diff --git a/Master/texmf-dist/tex/latex/hyperref/hypertex.def b/Master/texmf-dist/tex/latex/hyperref/hypertex.def
index 5ffdd2d0a44..13c604435b0 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hypertex.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hypertex.def
@@ -29,7 +29,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{hypertex.def}
-  [2012/02/28 v6.82p %
+  [2012/05/13 v6.82q %
   Hyperref driver for HyperTeX specials]
 \Hy@VersionCheck{hypertex.def}
 \providecommand*{\XR@ext}{dvi}
diff --git a/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty b/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty
index a08da83a52c..00ca251eb3e 100644
--- a/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty
+++ b/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty
@@ -30,7 +30,7 @@
 %%
 \NeedsTeXFormat{LaTeX2e}[1995/12/01]
 \ProvidesPackage{nohyperref}
-  [2012/02/28 v6.82p %
+  [2012/05/13 v6.82q %
   Dummy hyperref (SR)]
 \RequirePackage{letltxmacro}[2008/06/13]
 \let\hyper@@anchor\@gobble
diff --git a/Master/texmf-dist/tex/latex/hyperref/pd1enc.def b/Master/texmf-dist/tex/latex/hyperref/pd1enc.def
index 21792a035fc..cf0a269b76b 100644
--- a/Master/texmf-dist/tex/latex/hyperref/pd1enc.def
+++ b/Master/texmf-dist/tex/latex/hyperref/pd1enc.def
@@ -29,7 +29,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{pd1enc.def}
-  [2012/02/28 v6.82p %
+  [2012/05/13 v6.82q %
   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 040797fe643..1d3553678b1 100644
--- a/Master/texmf-dist/tex/latex/hyperref/pdfmark.def
+++ b/Master/texmf-dist/tex/latex/hyperref/pdfmark.def
@@ -29,7 +29,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{pdfmark.def}
-  [2012/02/28 v6.82p %
+  [2012/05/13 v6.82q %
   Hyperref definitions for pdfmark specials]
 \Hy@VersionCheck{pdfmark.def}
 \begingroup
diff --git a/Master/texmf-dist/tex/latex/hyperref/puarenc.def b/Master/texmf-dist/tex/latex/hyperref/puarenc.def
index d4eb01fae6d..43f1daa447c 100644
--- a/Master/texmf-dist/tex/latex/hyperref/puarenc.def
+++ b/Master/texmf-dist/tex/latex/hyperref/puarenc.def
@@ -29,7 +29,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{puarenc.def}
-  [2012/02/28 v6.82p %
+  [2012/05/13 v6.82q %
   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 bb515ac0b33..1259361f616 100644
--- a/Master/texmf-dist/tex/latex/hyperref/puenc.def
+++ b/Master/texmf-dist/tex/latex/hyperref/puenc.def
@@ -29,7 +29,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{puenc.def}
-  [2012/02/28 v6.82p %
+  [2012/05/13 v6.82q %
   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 88d45cc996f..71f41a43d2a 100644
--- a/Master/texmf-dist/tex/latex/hyperref/puvnenc.def
+++ b/Master/texmf-dist/tex/latex/hyperref/puvnenc.def
@@ -29,7 +29,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{puvnenc.def}
-  [2012/02/28 v6.82p %
+  [2012/05/13 v6.82q %
   Hyperref: Additions to puenc.def for VnTeX]
 \DeclareTextCommand{\abreve}{PU}{\81\003}
 \DeclareTextCommand{\acircumflex}{PU}{\80\342}