hyperref (16oct12)

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

27 files changed, 108 insertions, 51 deletions

diff --git a/Master/texmf-dist/doc/latex/hyperref/ChangeLog b/Master/texmf-dist/doc/latex/hyperref/ChangeLog
index d6bd12b8312..368b81d5ac1 100644
--- a/Master/texmf-dist/doc/latex/hyperref/ChangeLog
+++ b/Master/texmf-dist/doc/latex/hyperref/ChangeLog
@@ -1,3 +1,10 @@
+2012-10-15  6.83k  Heiko Oberdiek
+    * 6.83k
+    * If `hyperref' is loaded in the document class and `htlatex' is used,
+      then `hyperref' passes options for `tex4ht' found in \@documentclasshook
+      to `tex4ht'.
+    * \hyper@link@ suppresses links with empty target.
+
 2012-10-13  6.83j  Heiko Oberdiek
     * 6.83j
     * PDF forms/hpdftex.def: Field option `calculatesortkey' added
diff --git a/Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf b/Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf
index 55be977fead..d869de28865 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 212cac72955..f11fe6392b8 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 855f3318c50..7863ec19195 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 bc93dc40034..c8b9c23d576 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 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@
diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def b/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def
index 0e2f52683aa..e9fc6f9780a 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/10/13 v6.83j %
+  [2012/10/15 v6.83k %
   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 c721cff4b84..b1ed760ef6d 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/10/13 v6.83j %
+  [2012/10/15 v6.83k %
   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 9fcf5ed63c1..ee9fc291274 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/10/13 v6.83j %
+  [2012/10/15 v6.83k %
   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 1e7934ae41f..885872afa44 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/10/13 v6.83j %
+  [2012/10/15 v6.83k %
   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 3a869732214..af54810f0fa 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/10/13 v6.83j %
+  [2012/10/15 v6.83k %
   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 86bbfda718f..371dec2e342 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/10/13 v6.83j %
+  [2012/10/15 v6.83k %
   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 945d6d92fb2..bb2e93f669b 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/10/13 v6.83j %
+  [2012/10/15 v6.83k %
   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 e508cb78c87..114fdd48bd4 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/10/13 v6.83j %
+  [2012/10/15 v6.83k %
   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 6293044e144..1e74cb56531 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/10/13 v6.83j %
+  [2012/10/15 v6.83k %
   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 e87245c91ce..52a469fa6ae 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/10/13 v6.83j %
+  [2012/10/15 v6.83k %
   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 0f3c44f441e..3ec6dd01b1c 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/10/13 v6.83j %
+  [2012/10/15 v6.83k %
  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 639db802921..816f21c30d3 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/10/13 v6.83j %
+  [2012/10/15 v6.83k %
   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 2b463313eb7..423453249a9 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/10/13 v6.83j %
+  [2012/10/15 v6.83k %
   Hypertext links for LaTeX]
 \begingroup
   \@makeother\`%
@@ -4163,17 +4163,35 @@
 \DeclareLocalOptions{%
   a4paper,a5paper,b5paper,letterpaper,legalpaper,executivepaper%
 }
-\@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}%
+    }%
   }%
 }
 \let\ReadBookmarks\relax
@@ -5041,17 +5059,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@
diff --git a/Master/texmf-dist/tex/latex/hyperref/hypertex.def b/Master/texmf-dist/tex/latex/hyperref/hypertex.def
index b39de7cdda4..25c8a056a4a 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/10/13 v6.83j %
+  [2012/10/15 v6.83k %
   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 9e980f362e8..b20c402269f 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/10/13 v6.83j %
+  [2012/10/15 v6.83k %
   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 a7eaeaa3c43..a03a7a9b372 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/10/13 v6.83j %
+  [2012/10/15 v6.83k %
   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 3ba3a695a3a..794c5eabf3c 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/10/13 v6.83j %
+  [2012/10/15 v6.83k %
   Hyperref definitions for pdfmark specials]
 \Hy@VersionCheck{pdfmark.def}
 \begingroup
diff --git a/Master/texmf-dist/tex/latex/hyperref/psdextra.def b/Master/texmf-dist/tex/latex/hyperref/psdextra.def
index 270d964b4b1..5e30a097394 100644
--- a/Master/texmf-dist/tex/latex/hyperref/psdextra.def
+++ b/Master/texmf-dist/tex/latex/hyperref/psdextra.def
@@ -29,7 +29,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{psdextra.def}
-  [2012/10/13 v6.83j %
+  [2012/10/15 v6.83k %
   Hyperref: Additions to PDF string support]
 \Hy@VersionCheck{psdextra.def}
 \newcommand*{\psdmapshortnames}{%
diff --git a/Master/texmf-dist/tex/latex/hyperref/puarenc.def b/Master/texmf-dist/tex/latex/hyperref/puarenc.def
index 7f51f680411..56423382ca5 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/10/13 v6.83j %
+  [2012/10/15 v6.83k %
   Hyperref: Additions to puenc.def for Arabi]
 \DeclareTextCommand{\hamza}{PU}{\86\041}% U+0621
 \DeclareTextCommand{\alefmadda}{PU}{\86\042}% U+0622
diff --git a/Master/texmf-dist/tex/latex/hyperref/puenc.def b/Master/texmf-dist/tex/latex/hyperref/puenc.def
index 9ccfdd79bce..4382f9d1c8f 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/10/13 v6.83j %
+  [2012/10/15 v6.83k %
   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 1480518c4d4..5352732599b 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/10/13 v6.83j %
+  [2012/10/15 v6.83k %
   Hyperref: Additions to puenc.def for VnTeX]
 \DeclareTextCommand{\abreve}{PU}{\81\003}% U+0103
 \DeclareTextCommand{\acircumflex}{PU}{\80\342}% U+00E2