hyperref (26sep12)

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

21 files changed, 97 insertions, 69 deletions

diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def b/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def
index bbed49f09e6..cb9b5345841 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def
@@ -29,10 +29,10 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{hdvipdfm.def}
-  [2012/09/24 v6.83e %
+  [2012/09/26 v6.83f %
   Hyperref driver for dvipdfm]
 \Hy@VersionCheck{hdvipdfm.def}
-\def\Hy@PutCatalog#1{\@pdfm@mark{docview << #1 >>}}
+\def\Hy@PutCatalog#1{\@pdfm@mark{docview <<#1>>}}
 \ifHy@pdfpagelabels
   \def\HyPL@StorePageLabel#1{%
     \if@filesw
diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvips.def b/Master/texmf-dist/tex/latex/hyperref/hdvips.def
index a4b5a24e886..b6b20be26e4 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/09/24 v6.83e %
+  [2012/09/26 v6.83f %
   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 efe5f197cbb..c5f40f9bb3e 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/09/24 v6.83e %
+  [2012/09/26 v6.83f %
   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 cb35299bb56..0436ae099e8 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/09/24 v6.83e %
+  [2012/09/26 v6.83f %
   Hyperref driver for dviwindo]
 \Hy@VersionCheck{hdviwind.def}
 \begingroup
@@ -51,7 +51,7 @@
   }%
 \endgroup
 \def\Hy@PutCatalog#1{%
-  \pdfmark{pdfmark=/PUT,Raw={\string{Catalog\string} << #1 >>}}%
+  \pdfmark{pdfmark=/PUT,Raw={\string{Catalog\string} <<#1>>}}%
 }
 \ifHy@pdfpagelabels
   \def\HyPL@StorePageLabel#1{%
diff --git a/Master/texmf-dist/tex/latex/hyperref/hpdftex.def b/Master/texmf-dist/tex/latex/hyperref/hpdftex.def
index b85e949f008..028c836ddbf 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/09/24 v6.83e %
+  [2012/09/26 v6.83f %
   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 ab259d2b658..1ff79531a2a 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/09/24 v6.83e %
+  [2012/09/26 v6.83f %
   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 23ba00aa1af..e536ff00a45 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/09/24 v6.83e %
+  [2012/09/26 v6.83f %
   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 31bdb78c678..368e0b08f05 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/09/24 v6.83e %
+  [2012/09/26 v6.83f %
   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 ca73df30a96..3ec72e1a8ad 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/09/24 v6.83e %
+  [2012/09/26 v6.83f %
   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 6741be7597c..36e9bc43c4a 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/09/24 v6.83e %
+  [2012/09/26 v6.83f %
   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 bb0c07de6f8..0e8e233e210 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/09/24 v6.83e %
+  [2012/09/26 v6.83f %
  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 9edcff45528..e85547ad240 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/09/24 v6.83e %
+  [2012/09/26 v6.83f %
   Hyperref driver for XeTeX]
 \Hy@VersionCheck{hxetex.def}
 \HyPsd@LoadUnicode
@@ -67,7 +67,7 @@
   \fi
 }
 \let\HyXeTeX@CheckUnicode\relax
-\def\Hy@PutCatalog#1{\@pdfm@mark{docview << #1 >>}}
+\def\Hy@PutCatalog#1{\@pdfm@mark{docview <<#1>>}}
 \ifHy@pdfpagelabels
   \def\HyPL@StorePageLabel#1{%
     \if@filesw
diff --git a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty
index 068bc4e3ae2..51ccd75dcc1 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/09/24 v6.83e %
+  [2012/09/26 v6.83f %
   Hypertext links for LaTeX]
 \begingroup
   \@makeother\`%
@@ -167,11 +167,21 @@
         \x{ }\z{#1}%
         \ifx\y\z
         \else
-          \Hy@Error{%
-            Version mismatch!\MessageBreak
-            * \y: hyperref.sty\MessageBreak
-            * \z: #1%
-          }\@ehd
+          \edef\a{#1}%
+          \edef\b{\HyOpt@CustomDriver.def}%
+          \ifx\a\b
+            \Hy@WarningNoLine{%
+              Version mismatch (custom driver)!\MessageBreak
+              * \y: hyperref.sty\MessageBreak
+              * \z: \a
+            }%
+          \else
+            \Hy@Error{%
+              Version mismatch!\MessageBreak
+              * \y: hyperref.sty\MessageBreak
+              * \z: \a
+            }\@ehd
+          \fi
         \fi
       }%
     }%
@@ -3078,6 +3088,17 @@
     }%
   \fi
 }
+\let\HyOpt@CustomDriver\ltx@empty
+\define@key{Hyp}{customdriver}{%
+  \IfFileExists{#1.def}{%
+    \def\HyOpt@CustomDriver{#1}%
+  }{%
+    \Hy@Warning{%
+      Missing driver file `#1.def',\MessageBreak
+      ignoring custom driver%
+    }%
+  }%
+}
 \define@key{Hyp}{hyperfigures}[true]{%
   \Hy@boolkey{hyperfigures}{#1}%
 }
@@ -4390,62 +4411,67 @@
       \fi
     \fi
   \fi
-  \def\HyOpt@DriverType{}%
-  \ifx\Hy@driver\@empty
-    \def\HyOpt@DriverType{ (autodetected)}%
-    \providecommand*{\Hy@defaultdriver}{hypertex}%
-    \ifpdf
-      \def\Hy@driver{hpdftex}%
-    \else
-      \ifxetex
-        \def\Hy@driver{hxetex}%
+  \let\HyOpt@DriverType\ltx@empty
+  \ifx\HyOpt@CustomDriver\ltx@empty
+    \ifx\Hy@driver\@empty
+      \def\HyOpt@DriverType{ (autodetected)}%
+      \providecommand*{\Hy@defaultdriver}{hypertex}%
+      \ifpdf
+        \def\Hy@driver{hpdftex}%
       \else
-        \ifvtexhtml
-          \def\Hy@driver{hvtexhtm}%
-          \def\MaybeStopEarly{%
-            \Hy@Message{Stopped early}%
-            \Hy@AtBeginDocument{%
-              \PDF@FinishDoc
-              \gdef\PDF@FinishDoc{}%
-            }%
-            \endinput
-          }%
+        \ifxetex
+          \def\Hy@driver{hxetex}%
         \else
-          \ifvtexpdf
-            \def\Hy@driver{hvtex}%
+          \ifvtexhtml
+            \def\Hy@driver{hvtexhtm}%
+            \def\MaybeStopEarly{%
+              \Hy@Message{Stopped early}%
+              \Hy@AtBeginDocument{%
+                \PDF@FinishDoc
+                \gdef\PDF@FinishDoc{}%
+              }%
+              \endinput
+            }%
           \else
-            \ifvtexps
+            \ifvtexpdf
               \def\Hy@driver{hvtex}%
             \else
-              \ifx\HyOpt@DriverFallback\ltx@empty
-                \let\Hy@driver\Hy@defaultdriver
-                \def\HyOpt@DriverType{ (default)}%
+              \ifvtexps
+                \def\Hy@driver{hvtex}%
               \else
-                \begingroup
-                  \toks@\expandafter{\HyOpt@DriverFallback}%
-                  \edef\x{\endgroup
-                    \noexpand\kvsetkeys{Hyp}{\the\toks@}%
-                  }%
-                \x
-                \ifx\Hy@driver\ltx@empty
+                \ifx\HyOpt@DriverFallback\ltx@empty
                   \let\Hy@driver\Hy@defaultdriver
                   \def\HyOpt@DriverType{ (default)}%
                 \else
-                  \def\HyOpt@DriverType{ (fallback)}%
+                  \begingroup
+                    \toks@\expandafter{\HyOpt@DriverFallback}%
+                    \edef\x{\endgroup
+                      \noexpand\kvsetkeys{Hyp}{\the\toks@}%
+                    }%
+                  \x
+                  \ifx\Hy@driver\ltx@empty
+                    \let\Hy@driver\Hy@defaultdriver
+                    \def\HyOpt@DriverType{ (default)}%
+                  \else
+                    \def\HyOpt@DriverType{ (fallback)}%
+                  \fi
                 \fi
               \fi
             \fi
           \fi
         \fi
       \fi
-    \fi
-    \ifx\Hy@driver\Hy@defaultdriver
-      \def\Hy@temp{hdviwind}%
-      \ifx\Hy@temp\Hy@driver
-        \kvsetkeys{Hyp}{colorlinks}%
-        \PassOptionsToPackage{dviwindo}{color}%
+      \ifx\Hy@driver\Hy@defaultdriver
+        \def\Hy@temp{hdviwind}%
+        \ifx\Hy@temp\Hy@driver
+          \kvsetkeys{Hyp}{colorlinks}%
+          \PassOptionsToPackage{dviwindo}{color}%
+        \fi
       \fi
     \fi
+  \else
+    \def\HyOpt@DriverType{ (custom)}%
+    \let\Hy@driver\HyOpt@CustomDriver
   \fi
   \Hy@Message{Driver\HyOpt@DriverType: \Hy@driver}%
   \chardef\Hy@VersionChecked=0 %
@@ -4472,6 +4498,8 @@
   \Hy@DisableOption{latex2html}%
   \Hy@DisableOption{ps2pdf}%
   \Hy@DisableOption{xetex}%
+  \Hy@DisableOption{driverfallback}%
+  \Hy@DisableOption{customdriver}%
   \Hy@DisableOption{pdfversion}%
 }
 \newif\ifHy@DvipdfmxOutlineOpen
diff --git a/Master/texmf-dist/tex/latex/hyperref/hypertex.def b/Master/texmf-dist/tex/latex/hyperref/hypertex.def
index a0c47d3e022..8c3a28f9033 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/09/24 v6.83e %
+  [2012/09/26 v6.83f %
   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 530ee64d2a2..7167dccdbde 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/09/24 v6.83e %
+  [2012/09/26 v6.83f %
   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 93635e9e95b..3b78f65db92 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/09/24 v6.83e %
+  [2012/09/26 v6.83f %
   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 ffafcfbf618..b25a0938911 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/09/24 v6.83e %
+  [2012/09/26 v6.83f %
   Hyperref definitions for pdfmark specials]
 \Hy@VersionCheck{pdfmark.def}
 \begingroup
@@ -51,7 +51,7 @@
   }%
 \endgroup
 \def\Hy@PutCatalog#1{%
-  \pdfmark{pdfmark=/PUT,Raw={\string{Catalog\string} << #1 >>}}%
+  \pdfmark{pdfmark=/PUT,Raw={\string{Catalog\string} <<#1>>}}%
 }
 \ifHy@pdfpagelabels
   \def\HyPL@StorePageLabel#1{%
diff --git a/Master/texmf-dist/tex/latex/hyperref/psdextra.def b/Master/texmf-dist/tex/latex/hyperref/psdextra.def
index 30912c2c1a0..79299ff643e 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/09/24 v6.83e %
+  [2012/09/26 v6.83f %
   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 01ceb164664..9e1ec058949 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/09/24 v6.83e %
+  [2012/09/26 v6.83f %
   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 675bd605ba3..6d98fedacbf 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/09/24 v6.83e %
+  [2012/09/26 v6.83f %
   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 b9f24b6f527..39064e58304 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/09/24 v6.83e %
+  [2012/09/26 v6.83f %
   Hyperref: Additions to puenc.def for VnTeX]
 \DeclareTextCommand{\abreve}{PU}{\81\003}% U+0103
 \DeclareTextCommand{\acircumflex}{PU}{\80\342}% U+00E2