hyperref (19aug12)

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

21 files changed, 84 insertions, 28 deletions

diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def b/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def
index fdf85c81016..ed9dc0194bd 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/08/13 v6.83a %
+  [2012/08/18 v6.83b %
   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 46d45bce076..a3aec4555ec 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/08/13 v6.83a %
+  [2012/08/18 v6.83b %
   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 c46c13a77ae..f6a7f763ac7 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/08/13 v6.83a %
+  [2012/08/18 v6.83b %
   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 19821664d22..d09a5a72cc3 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/08/13 v6.83a %
+  [2012/08/18 v6.83b %
   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 053c520a579..9470923ad4d 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/08/13 v6.83a %
+  [2012/08/18 v6.83b %
   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 a8f4c85d86f..614e18a8226 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/08/13 v6.83a %
+  [2012/08/18 v6.83b %
   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 c2fde91003e..ce12e8a20f7 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/08/13 v6.83a %
+  [2012/08/18 v6.83b %
   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 27f74b605b4..2df1c217e4d 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/08/13 v6.83a %
+  [2012/08/18 v6.83b %
   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 daf67e75df0..c02d81aff22 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/08/13 v6.83a %
+  [2012/08/18 v6.83b %
   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 4e9a893cb77..ff5e3f4ac4b 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/08/13 v6.83a %
+  [2012/08/18 v6.83b %
   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 f80b26cd4a9..23ee561b0cc 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/08/13 v6.83a %
+  [2012/08/18 v6.83b %
  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 94cba8fee17..92fcede83d9 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/08/13 v6.83a %
+  [2012/08/18 v6.83b %
   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 bd1ae8568a3..72f4d947935 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/08/13 v6.83a %
+  [2012/08/18 v6.83b %
   Hypertext links for LaTeX]
 \begingroup
   \@makeother\`%
@@ -4931,6 +4931,56 @@
     \expandafter\hyper@@anchor\expandafter{\Hy@AnchorName}{\relax}#4%
   \fi
 }
+\newdimen\XeTeXLinkMargin
+\setlength{\XeTeXLinkMargin}{2pt}
+\ifxetex
+  \font\XeTeXLink@font=pzdr at 1sp\relax
+  \newcommand*{\XeTeXLink@space}{%
+    \begingroup
+      \XeTeXLink@font
+      \@xxxii
+    \endgroup
+  }%
+  \newcommand{\XeTeXLinkBox}[1]{%
+    \begingroup
+      \leavevmode
+      \sbox\z@{#1}%
+      \begingroup
+        \dimen@=\dp\z@
+        \advance\dimen@\XeTeXLinkMargin
+        \setbox\tw@=\llap{%
+          \hb@xt@\XeTeXLinkMargin{%
+            \lower\dimen@\hbox{\XeTeXLink@space}%
+            \hss
+          }%
+        }%
+        \dp\tw@=\dp\z@
+        \ht\tw@=\ht\z@
+        \copy\tw@
+      \endgroup
+      \copy\z@
+      \dimen@=\ht\z@
+      \advance\dimen@\XeTeXLinkMargin
+      \setbox\tw@=\rlap{%
+        \hb@xt@\XeTeXLinkMargin{%
+          \hss
+          \raise\dimen@\hbox{\XeTeXLink@space}%
+        }%
+      }%
+      \dp\tw@=\dp\z@
+      \ht\tw@=\ht\z@
+      \copy\tw@
+    \endgroup
+  }%
+\else
+  \newcommand*{\XeTeXLinkBox}[1]{%
+    \begingroup
+      \leavevmode
+      \sbox\z@{#1}%
+      \copy\z@
+    \endgroup
+  }%
+\fi
 \def\hyper@@link{\let\Hy@reserved@a\relax
   \@ifnextchar[{\hyper@link@}{\hyper@link@[link]}%
 }
@@ -6662,6 +6712,7 @@
 }
 \def\hyper@makecurrent#1{%
   \begingroup
+    \Hy@safe@activestrue
     \edef\Hy@param{#1}%
     \ifx\Hy@param\Hy@chapterstring
       \let\Hy@param\Hy@chapapp
@@ -7805,24 +7856,29 @@
   \endgroup
 }
 \def\contentsline#1#2#3#4{%
-  \ifx\\#4\\%
+  \begingroup
+    \Hy@safe@activestrue
+  \edef\x{\endgroup
+    \def\noexpand\Hy@tocdestname{#4}%
+  }\x
+  \ifx\Hy@tocdestname\ltx@empty
     \csname l@#1\endcsname{#2}{#3}%
   \else
     \ifcase\Hy@linktoc % none
       \csname l@#1\endcsname{#2}{#3}%
     \or % section
       \csname l@#1\endcsname{%
-        \hyper@linkstart{link}{#4}{#2}\hyper@linkend
+        \hyper@linkstart{link}{\Hy@tocdestname}{#2}\hyper@linkend
       }{#3}%
     \or % page
       \csname l@#1\endcsname{{#2}}{%
-        \hyper@linkstart{link}{#4}{#3}\hyper@linkend
+        \hyper@linkstart{link}{\Hy@tocdestname}{#3}\hyper@linkend
       }%
     \else % all
       \csname l@#1\endcsname{%
-        \hyper@linkstart{link}{#4}{#2}\hyper@linkend
+        \hyper@linkstart{link}{\Hy@tocdestname}{#2}\hyper@linkend
       }{%
-        \hyper@linkstart{link}{#4}{#3}\hyper@linkend
+        \hyper@linkstart{link}{\Hy@tocdestname}{#3}\hyper@linkend
       }%
     \fi
   \fi
diff --git a/Master/texmf-dist/tex/latex/hyperref/hypertex.def b/Master/texmf-dist/tex/latex/hyperref/hypertex.def
index 4263d5d36b8..00669c95f7d 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/08/13 v6.83a %
+  [2012/08/18 v6.83b %
   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 c495c7ae943..842c70fd9bd 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/08/13 v6.83a %
+  [2012/08/18 v6.83b %
   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 b63353c66b2..02e4e48083f 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/08/13 v6.83a %
+  [2012/08/18 v6.83b %
   Hyperref: PDFDocEncoding definition (HO)]
 \DeclareFontEncoding{PD1}{}{}
 \DeclareTextAccent{\`}{PD1}{\textasciigrave}
@@ -131,7 +131,7 @@
 \DeclareTextCommand{\OE}{PD1}{\226}% U+0152
 \DeclareTextCompositeCommand{\v}{PD1}{S}{\227}% U+0160
 \DeclareTextCompositeCommand{\"}{PD1}{Y}{\230}% U+0178
-\DeclareTextCommand{\IJ}{PD1}{\230}
+\DeclareTextCommand{\IJ}{PD1}{IJ}% ligature U+0049 U+004A
 \DeclareTextCompositeCommand{\v}{PD1}{Z}{\231}% U+017D
 \DeclareTextCommand{\i}{PD1}{\232}% U+0131
 \DeclareTextCommand{\l}{PD1}{\233}% U+0142
@@ -241,7 +241,7 @@
 \DeclareTextCommand{\th}{PD1}{\376}% U+00FE
 \DeclareTextCommand{\textthorn}{PD1}{\376}%* U+00FE
 \DeclareTextCompositeCommand{\"}{PD1}{y}{\377}% U+00FF
-\DeclareTextCommand{\ij}{PD1}{\377}% U+00FF
+\DeclareTextCommand{\ij}{PD1}{ij}% ligature U+0069 U+006A
 \DeclareTextCommand{\SS}{PD1}{SS}%
 \DeclareTextCommand{\textcelsius}{PD1}{\textdegree C}%
 \DeclareTextCommand{\textglqq}{PD1}{\quotedblbase}%
diff --git a/Master/texmf-dist/tex/latex/hyperref/pdfmark.def b/Master/texmf-dist/tex/latex/hyperref/pdfmark.def
index d0821022914..f0b61b70793 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/08/13 v6.83a %
+  [2012/08/18 v6.83b %
   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 aa08cc0a746..e31f5c32c97 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/08/13 v6.83a %
+  [2012/08/18 v6.83b %
   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 1d4789885d7..e69382abae4 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/08/13 v6.83a %
+  [2012/08/18 v6.83b %
   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 678ce3af704..52846bc85dd 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/08/13 v6.83a %
+  [2012/08/18 v6.83b %
   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 f3de9ed8104..e39e27cf8d9 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/08/13 v6.83a %
+  [2012/08/18 v6.83b %
   Hyperref: Additions to puenc.def for VnTeX]
 \DeclareTextCommand{\abreve}{PU}{\81\003}% U+0103
 \DeclareTextCommand{\acircumflex}{PU}{\80\342}% U+00E2