hyperref update (15nov09)

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

20 files changed, 347 insertions, 49 deletions

diff --git a/Master/texmf-dist/tex/latex/hyperref/backref.sty b/Master/texmf-dist/tex/latex/hyperref/backref.sty
index 97680806677..41ad496ad83 100644
--- a/Master/texmf-dist/tex/latex/hyperref/backref.sty
+++ b/Master/texmf-dist/tex/latex/hyperref/backref.sty
@@ -6,7 +6,7 @@
 %%
 %% backref.dtx  (with options: `package')
 %% 
-%% File: backref.dtx Copyright (C) 1995-2005 David Carlisle, Sebastian Rahtz, Heiko Oberdiek
+%% File: backref.dtx Copyright (C) 1995-2009 David Carlisle, Sebastian Rahtz, Heiko Oberdiek
 %% This file is part of the `Hyperref Bundle'.
 %% -------------------------------------------
 %%
@@ -21,7 +21,7 @@
 %% given in the file `manifest.txt'.
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{backref}
-  [2006/09/05 v1.28 Bibliographical back referencing]%
+  [2009/11/14 v1.29 Bibliographical back referencing]%
 \newif\ifBR@verbose
 \@ifundefined{ifHy@verbose}{%
   \BR@verbosefalse
@@ -318,6 +318,50 @@
   \fi
   \@esphack
 }
+\RequirePackage{pdftexcmds}[2009/04/10]
+\begingroup
+  \xdef\BR@CheckSumBefore{%
+    \@ifundefined{pdf@filemdfivesum}{}{%
+      \pdf@filemdfivesum{\jobname.brf}%
+    }%
+    :%
+    \@ifundefined{pdf@filesize}{}{%
+      \pdf@filesize{\jobname.brf}%
+    }%
+  }%
+\endgroup
+\AtBeginDocument{%
+  \AtEndDocument{%
+    \clearpage
+    \if@filesw
+      \immediate\write\@mainaux{%
+        \string\csname\space BR@CheckEnd\string\endcsname
+      }%
+    \fi
+  }%
+  \def\BR@CheckEnd{%
+    \begingroup
+      \@ifundefined{tf@brf@open}{}{%
+        \immediate\closeout\tf@brf
+      }%
+      \edef\BR@CheckSumAfter{%
+        \@ifundefined{pdf@filemdfivesum}{}{%
+          \pdf@filemdfivesum{\jobname.brf}%
+        }%
+        :%
+        \@ifundefined{pdf@filesize}{}{%
+          \pdf@filesize{\jobname.brf}%
+        }%
+      }%
+      \ifx\BR@CheckSumBefore\BR@CheckSumAfter
+      \else
+        \PackageWarningNoLine{backref}{%
+          Rerun to get bibliographical references right%
+        }%
+      \fi
+    \endgroup
+  }%
+}
 \endinput
 %%
 %% End of file `backref.sty'.
diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def b/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def
index 66c6e09a982..52e99bf380e 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def
@@ -24,7 +24,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{hdvipdfm.def}
-  [2009/10/09 v6.79a
+  [2009/11/14 v6.79e
   Hyperref driver for dvipdfm]
 \def\Hy@PutCatalog#1{\@pdfm@mark{docview << #1 >>}}
 \ifHy@pagelabels
@@ -58,7 +58,7 @@
     }%
   }%
 \fi
-\RequirePackage{pdftexcmds}[2007/11/11]
+\RequirePackage{pdftexcmds}[2009/04/10]
 \begingroup\expandafter\expandafter\expandafter\endgroup
 \expandafter\ifx\csname pdf@escapestring\endcsname\relax
   \begingroup
@@ -526,11 +526,21 @@
   \fi
 }
 \AtBeginShipoutFirst{%
-  \ifx\special@paper\@empty
-  \else
-    \ifHy@setpagesize
-      \special{papersize=\special@paper}%
-    \fi
+  \ifHy@setpagesize
+    \begingroup
+      \@ifundefined{stockwidth}{%
+        \ifx\special@paper\@empty
+          \special{papersize=\the\paperwidth,\the\paperheight}%
+        \else
+          \special{papersize=\special@paper}%
+        \fi
+      }{%
+        \ifdim\stockwidth=\z@
+        \else
+          \special{papersize=\the\stockwidth,\the\stockheight}%
+        \fi
+      }%
+    \endgroup
   \fi
   \Hy@DisableOption{setpagesize}%
 }
@@ -1270,15 +1280,18 @@
       \fi
       \pdfstringdef\Hy@tempa{#2}%
       \if@filesw
+        \stepcounter{bookmark@seq@number}%
         \protected@write\@outlinefile{}{%
           \protect\BOOKMARK
             [\Hy@level][\@bookmarkopenstatus{\Hy@level}]{#3}%
             {\Hy@tempa}{\Hy@tempb}%
+            \@percentchar\space\thebookmark@seq@number
         }%
       \fi
     \fi
   \endgroup
 }
+\newcounter{bookmark@seq@number}
 \newcommand{\currentpdfbookmark}{%
   \pdfbookmark[\Hy@currentbookmarklevel]%
 }
@@ -1300,6 +1313,50 @@
 }
 \def\BOOKMARK{\@ifnextchar[{\@BOOKMARK}{\@@BOOKMARK[1][-]}}
 \def\@BOOKMARK[#1]{\@ifnextchar[{\@@BOOKMARK[#1]}{\@@BOOKMARK[#1][-]}}
+\def\Hy@OutlineRerunCheck{%
+  \begingroup
+    \xdef\Hy@OutlineCheckSumBefore{%
+      \@ifundefined{pdf@filemdfivesum}{}{%
+        \pdf@filemdfivesum{\jobname.out}%
+      }%
+      :%
+      \@ifundefined{pdf@filesize}{}{%
+        \pdf@filesize{\jobname.out}%
+      }%
+    }%
+  \endgroup
+  \AtEndDocument{%
+    \clearpage
+    \if@filesw
+      \immediate\write\@mainaux{%
+        \string\csname\space Hy@OutlineCheckEnd\string\endcsname
+      }%
+    \fi
+  }%
+}
+\AtBeginDocument{%
+  \def\Hy@OutlineCheckEnd{%
+    \begingroup
+      \immediate\closeout\@outlinefile
+      \edef\Hy@OutlineCheckSumAfter{%
+        \@ifundefined{pdf@filemdfivesum}{}{%
+          \pdf@filemdfivesum{\jobname.out}%
+        }%
+        :%
+        \@ifundefined{pdf@filesize}{}{%
+          \pdf@filesize{\jobname.out}%
+        }%
+      }%
+      \ifx\Hy@OutlineCheckSumBefore\Hy@OutlineCheckSumAfter
+      \else
+        \Hy@WarningNoLine{%
+          Rerun to get outlines right\MessageBreak
+          or use package `bookmark'%
+        }%
+      \fi
+    \endgroup
+  }%
+}
 \def\ReadBookmarks{%
   \begingroup
     \escapechar=`\\%
@@ -1339,6 +1396,7 @@
    \else
      \if@filesw
        \newwrite\@outlinefile
+       \Hy@OutlineRerunCheck
        \immediate\openout\@outlinefile=\jobname.out\relax
        \ifHy@typexml
          \immediate\write\@outlinefile{<relaxxml>\relax}%
diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvips.def b/Master/texmf-dist/tex/latex/hyperref/hdvips.def
index 97fd0d1e531..37e0588c752 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hdvips.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hdvips.def
@@ -24,7 +24,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{hdvips.def}
-  [2009/10/09 v6.79a
+  [2009/11/14 v6.79e
   Hyperref driver for dvips]
 \providecommand*{\XR@ext}{pdf}
 \def\Hy@raisedlink{}
@@ -83,11 +83,22 @@
     } def%
   }%
 }
-\AfterBeginDocument{%
-  \ifx\special@paper\@empty\else
-    \ifHy@setpagesize
-      \special{papersize=\special@paper}%
-    \fi
+\AtBeginShipoutFirst{%
+  \ifHy@setpagesize
+    \begingroup
+      \@ifundefined{stockwidth}{%
+        \ifx\special@paper\@empty
+          \special{papersize=\the\paperwidth,\the\paperheight}%
+        \else
+          \special{papersize=\special@paper}%
+        \fi
+      }{%
+        \ifdim\stockwidth=\z@
+        \else
+          \special{papersize=\the\stockwidth,\the\stockheight}%
+        \fi
+      }%
+    \endgroup
   \fi
   \Hy@DisableOption{setpagesize}%
 }
diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvipson.def b/Master/texmf-dist/tex/latex/hyperref/hdvipson.def
index 5ec4f234a07..12c16433966 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hdvipson.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hdvipson.def
@@ -24,7 +24,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{hdvipson.def}
-  [2009/10/09 v6.79a
+  [2009/11/14 v6.79e
   Hyperref driver for dvipsone]
 \providecommand*{\XR@ext}{pdf}
 \def\Hy@raisedlink{}
diff --git a/Master/texmf-dist/tex/latex/hyperref/hdviwind.def b/Master/texmf-dist/tex/latex/hyperref/hdviwind.def
index bde904e91db..b1a1c66e4a3 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hdviwind.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hdviwind.def
@@ -24,7 +24,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{hdviwind.def}
-  [2009/10/09 v6.79a
+  [2009/11/14 v6.79e
   Hyperref driver for dviwindo]
 \begingroup
   \toks@\expandafter{\Hy@FirstPageHook}%
@@ -76,7 +76,7 @@
     }%
   }%
 \fi
-\RequirePackage{pdftexcmds}[2007/11/11]
+\RequirePackage{pdftexcmds}[2009/04/10]
 \begingroup\expandafter\expandafter\expandafter\endgroup
 \expandafter\ifx\csname pdf@escapestring\endcsname\relax
   \begingroup
diff --git a/Master/texmf-dist/tex/latex/hyperref/hpdftex.def b/Master/texmf-dist/tex/latex/hyperref/hpdftex.def
index ab4f6fc44a6..fa34d087e1e 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hpdftex.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hpdftex.def
@@ -24,7 +24,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{hpdftex.def}
-  [2009/10/09 v6.79a
+  [2009/11/14 v6.79e
   Hyperref driver for pdfTeX]
 \let\Hy@PutCatalog\pdfcatalog
 \ifHy@pagelabels
@@ -41,7 +41,7 @@
     \AtEndDocument{\clearpage\HyPL@SetPageLabels}%
   }%
 \fi
-\RequirePackage{pdftexcmds}[2007/11/11]
+\RequirePackage{pdftexcmds}[2009/04/10]
 \begingroup\expandafter\expandafter\expandafter\endgroup
 \expandafter\ifx\csname pdf@escapestring\endcsname\relax
   \begingroup
@@ -1481,15 +1481,18 @@
       \fi
       \pdfstringdef\Hy@tempa{#2}%
       \if@filesw
+        \stepcounter{bookmark@seq@number}%
         \protected@write\@outlinefile{}{%
           \protect\BOOKMARK
             [\Hy@level][\@bookmarkopenstatus{\Hy@level}]{#3}%
             {\Hy@tempa}{\Hy@tempb}%
+            \@percentchar\space\thebookmark@seq@number
         }%
       \fi
     \fi
   \endgroup
 }
+\newcounter{bookmark@seq@number}
 \newcommand{\currentpdfbookmark}{%
   \pdfbookmark[\Hy@currentbookmarklevel]%
 }
@@ -1511,6 +1514,50 @@
 }
 \def\BOOKMARK{\@ifnextchar[{\@BOOKMARK}{\@@BOOKMARK[1][-]}}
 \def\@BOOKMARK[#1]{\@ifnextchar[{\@@BOOKMARK[#1]}{\@@BOOKMARK[#1][-]}}
+\def\Hy@OutlineRerunCheck{%
+  \begingroup
+    \xdef\Hy@OutlineCheckSumBefore{%
+      \@ifundefined{pdf@filemdfivesum}{}{%
+        \pdf@filemdfivesum{\jobname.out}%
+      }%
+      :%
+      \@ifundefined{pdf@filesize}{}{%
+        \pdf@filesize{\jobname.out}%
+      }%
+    }%
+  \endgroup
+  \AtEndDocument{%
+    \clearpage
+    \if@filesw
+      \immediate\write\@mainaux{%
+        \string\csname\space Hy@OutlineCheckEnd\string\endcsname
+      }%
+    \fi
+  }%
+}
+\AtBeginDocument{%
+  \def\Hy@OutlineCheckEnd{%
+    \begingroup
+      \immediate\closeout\@outlinefile
+      \edef\Hy@OutlineCheckSumAfter{%
+        \@ifundefined{pdf@filemdfivesum}{}{%
+          \pdf@filemdfivesum{\jobname.out}%
+        }%
+        :%
+        \@ifundefined{pdf@filesize}{}{%
+          \pdf@filesize{\jobname.out}%
+        }%
+      }%
+      \ifx\Hy@OutlineCheckSumBefore\Hy@OutlineCheckSumAfter
+      \else
+        \Hy@WarningNoLine{%
+          Rerun to get outlines right\MessageBreak
+          or use package `bookmark'%
+        }%
+      \fi
+    \endgroup
+  }%
+}
 \def\ReadBookmarks{%
   \begingroup
     \escapechar=`\\%
@@ -1538,6 +1585,7 @@
    \else
      \if@filesw
        \newwrite\@outlinefile
+       \Hy@OutlineRerunCheck
        \immediate\openout\@outlinefile=\jobname.out\relax
        \ifHy@typexml
          \immediate\write\@outlinefile{<relaxxml>\relax}%
diff --git a/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg b/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg
index 6809c58a7a7..084f79f7da4 100644
--- a/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg
+++ b/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg
@@ -24,7 +24,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{htex4ht.cfg}
-  [2009/10/09 v6.79a
+  [2009/11/14 v6.79e
   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 31055f8113d..d1ab1863b8e 100644
--- a/Master/texmf-dist/tex/latex/hyperref/htex4ht.def
+++ b/Master/texmf-dist/tex/latex/hyperref/htex4ht.def
@@ -24,7 +24,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{htex4ht.def}
-  [2009/10/09 v6.79a
+  [2009/11/14 v6.79e
   Hyperref driver for TeX4ht]
 \providecommand*{\XR@ext}{html}
 \def\Hy@raisedlink{}
diff --git a/Master/texmf-dist/tex/latex/hyperref/htexture.def b/Master/texmf-dist/tex/latex/hyperref/htexture.def
index 311c256ec0f..f34c374b1e9 100644
--- a/Master/texmf-dist/tex/latex/hyperref/htexture.def
+++ b/Master/texmf-dist/tex/latex/hyperref/htexture.def
@@ -24,7 +24,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{htexture.def}
-  [2009/10/09 v6.79a
+  [2009/11/14 v6.79e
   Hyperref driver for Textures]
 \providecommand*{\XR@ext}{pdf}
 \begingroup
diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtex.def b/Master/texmf-dist/tex/latex/hyperref/hvtex.def
index a8d0d6ad4cf..c6ce7b73400 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hvtex.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hvtex.def
@@ -24,7 +24,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{hvtex.def}
-  [2009/10/09 v6.79a
+  [2009/11/14 v6.79e
   Hyperref driver for VTeX in PDF/PS mode]
 \providecommand*{\XR@ext}{pdf}
 \edef\Hy@VTeXversion{%
@@ -71,7 +71,7 @@
     \AtEndDocument{\clearpage\HyPL@SetPageLabels}%
   }%
 \fi
-\RequirePackage{pdftexcmds}[2007/11/11]
+\RequirePackage{pdftexcmds}[2009/04/10]
 \begingroup\expandafter\expandafter\expandafter\endgroup
 \expandafter\ifx\csname pdf@escapestring\endcsname\relax
   \begingroup
@@ -637,15 +637,18 @@
       \fi
       \pdfstringdef\Hy@tempa{#2}%
       \if@filesw
+        \stepcounter{bookmark@seq@number}%
         \protected@write\@outlinefile{}{%
           \protect\BOOKMARK
             [\Hy@level][\@bookmarkopenstatus{\Hy@level}]{#3}%
             {\Hy@tempa}{\Hy@tempb}%
+            \@percentchar\space\thebookmark@seq@number
         }%
       \fi
     \fi
   \endgroup
 }
+\newcounter{bookmark@seq@number}
 \newcommand{\currentpdfbookmark}{%
   \pdfbookmark[\Hy@currentbookmarklevel]%
 }
@@ -667,6 +670,50 @@
 }
 \def\BOOKMARK{\@ifnextchar[{\@BOOKMARK}{\@@BOOKMARK[1][-]}}
 \def\@BOOKMARK[#1]{\@ifnextchar[{\@@BOOKMARK[#1]}{\@@BOOKMARK[#1][-]}}
+\def\Hy@OutlineRerunCheck{%
+  \begingroup
+    \xdef\Hy@OutlineCheckSumBefore{%
+      \@ifundefined{pdf@filemdfivesum}{}{%
+        \pdf@filemdfivesum{\jobname.out}%
+      }%
+      :%
+      \@ifundefined{pdf@filesize}{}{%
+        \pdf@filesize{\jobname.out}%
+      }%
+    }%
+  \endgroup
+  \AtEndDocument{%
+    \clearpage
+    \if@filesw
+      \immediate\write\@mainaux{%
+        \string\csname\space Hy@OutlineCheckEnd\string\endcsname
+      }%
+    \fi
+  }%
+}
+\AtBeginDocument{%
+  \def\Hy@OutlineCheckEnd{%
+    \begingroup
+      \immediate\closeout\@outlinefile
+      \edef\Hy@OutlineCheckSumAfter{%
+        \@ifundefined{pdf@filemdfivesum}{}{%
+          \pdf@filemdfivesum{\jobname.out}%
+        }%
+        :%
+        \@ifundefined{pdf@filesize}{}{%
+          \pdf@filesize{\jobname.out}%
+        }%
+      }%
+      \ifx\Hy@OutlineCheckSumBefore\Hy@OutlineCheckSumAfter
+      \else
+        \Hy@WarningNoLine{%
+          Rerun to get outlines right\MessageBreak
+          or use package `bookmark'%
+        }%
+      \fi
+    \endgroup
+  }%
+}
 \newcount\@serial@counter\@serial@counter=1\relax
 \begingroup
   \catcode`\'=12 %
@@ -749,6 +796,7 @@
   \else
     \if@filesw
       \newwrite\@outlinefile
+      \Hy@OutlineRerunCheck
       \immediate\openout\@outlinefile=\jobname.out\relax
       \ifHy@typexml
         \immediate\write\@outlinefile{<relaxxml>\relax}%
diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def b/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def
index 7d62b4cedd9..d40adaf0a66 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def
@@ -24,7 +24,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{hvtexhtml.def}
-  [2009/10/09 v6.79a
+  [2009/11/14 v6.79e
   Hyperref driver for VTeX in HTML mode]
 \providecommand*{\XR@ext}{htm}
 \RequirePackage{vtexhtml}
diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def b/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def
index 6cc9197184c..3e9ad0f55d9 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def
@@ -24,7 +24,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{hvtexmrk.def}
-  [2009/10/09 v6.79a
+  [2009/11/14 v6.79e
  Hyperref driver for VTeX in PDF/PS mode (pdfmark specials)]
 \providecommand*{\XR@ext}{pdf}
 \def\Hy@raisedlink{}
diff --git a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty
index 7fe8d898176..a4bfa670856 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty
+++ b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty
@@ -25,7 +25,7 @@
 %%
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{hyperref}
-  [2009/10/09 v6.79a
+  [2009/11/14 v6.79e
   Hypertext links for LaTeX]
 \begingroup
   \@makeother\`%
@@ -5882,12 +5882,19 @@
 \ifHy@hyperindex
   \def\HyInd@ParenLeft{(}%
   \def\HyInd@ParenRight{)}%
+  \def\hyperindexformat#1#2{%
+    \let\HyOrg@hyperpage\hyperpage
+    \let\hyperpage\@firstofone
+    #1{\HyOrg@hyperpage{#2}}%
+    \let\hyperpage\HyOrg@hyperpage
+  }%
   \Hy@nextfalse
   \@ifpackageloaded{multind}{\Hy@nexttrue}{}%
   \@ifpackageloaded{index}{\Hy@nexttrue}{}%
   \@ifpackageloaded{amsmidx}{\Hy@nexttrue}{}%
   \begingroup
     \lccode`\|=\expandafter`\HyInd@EncapChar\relax
+    \lccode`\/=`\\\relax
   \lowercase{\endgroup
     \ifHy@next
       \let\HyInd@org@wrindex\@wrindex
@@ -5896,13 +5903,28 @@
         \ifx\\#3\\%
           \HyInd@org@wrindex{#1}{#2|hyperpage}%
         \else
-          \def\Hy@temp@A{#3}%
-          \ifcase0\ifx\Hy@temp@A\HyInd@ParenLeft 1\fi
-                  \ifx\Hy@temp@A\HyInd@ParenRight 1\fi
-                  \relax
-            \HyInd@org@wrindex{#1}{#2|#3}%
+          \HyInd@@@wrindex{#1}{#2}#3\\%
+        \fi
+      }%
+      \def\HyInd@@@wrindex#1#2#3#4\\{%
+        \def\Hy@temp@A{#3}%
+        \ifcase0\ifx\Hy@temp@A\HyInd@ParenLeft 1\fi
+                \ifx\Hy@temp@A\HyInd@ParenRight 1\fi
+                \relax
+          \HyInd@org@wrindex{#1}{%
+            #2|hyperindexformat{/#3#4}%
+          }%
+        \else
+          \ifx\\#4\\%
+            \ifx\Hy@temp@A\HyInd@ParenRight
+              \HyInd@org@wrindex{#1}{#2|#3}%
+            \else
+              \HyInd@org@wrindex{#1}{#2|#3hyperpage}%
+            \fi
           \else
-            \HyInd@org@wrindex{#1}{#2|#3hyperpage}%
+            \HyInd@org@wrindex{#1}{%
+              #2|#3hyperindexformat{/#4}%
+            }%
           \fi
         \fi
       }%
@@ -5915,22 +5937,41 @@
               \string\indexentry{#1|hyperpage}{\thepage}%
             }%
           \else
-            \def\Hy@temp@A{#2}%
-            \ifcase0\ifx\Hy@temp@A\HyInd@ParenLeft 1\fi
-                    \ifx\Hy@temp@A\HyInd@ParenRight 1\fi
-                    \relax
+            \HyInd@@@wrindex{#1}#2\\%
+          \fi
+        \fi
+        \endgroup
+        \@esphack
+      }%
+      \def\HyInd@@@wrindex#1#2#3\\{%
+        \def\Hy@temp@A{#2}%
+        \ifcase0\ifx\Hy@temp@A\HyInd@ParenLeft 1\fi
+                \ifx\Hy@temp@A\HyInd@ParenRight 1\fi
+                \relax
+          \protected@write\@indexfile{}{%
+            \string\indexentry{%
+              #1|hyperindexformat{/#2#3}%
+            }{\thepage}%
+          }%
+        \else
+          \ifx\\#3\\%
+            \ifx\Hy@temp@A\HyInd@ParenRight
               \protected@write\@indexfile{}{%
-                \string\indexentry{#1|#2}{\thepage}%
+                 \string\indexentry{#1|#2}{\thepage}%
               }%
             \else
               \protected@write\@indexfile{}{%
                  \string\indexentry{#1|#2hyperpage}{\thepage}%
               }%
             \fi
+          \else
+            \protected@write\@indexfile{}{%
+               \string\indexentry{%
+                 #1|#2hyperindexformat{/#3}%
+               }{\thepage}%
+            }%
           \fi
         \fi
-        \endgroup
-        \@esphack
       }%
     \fi
   }%
diff --git a/Master/texmf-dist/tex/latex/hyperref/hypertex.def b/Master/texmf-dist/tex/latex/hyperref/hypertex.def
index 09d50155f39..278becacca2 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hypertex.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hypertex.def
@@ -24,7 +24,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{hypertex.def}
-  [2009/10/09 v6.79a
+  [2009/11/14 v6.79e
   Hyperref driver for HyperTeX specials]
 \providecommand*{\XR@ext}{dvi}
 \def\PDF@FinishDoc{}
diff --git a/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty b/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty
index d76f37331ea..c01eb5983bb 100644
--- a/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty
+++ b/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty
@@ -25,7 +25,7 @@
 %%
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{nohyperref}
-  [2009/10/09 v6.79a
+  [2009/11/14 v6.79e
   Dummy hyperref (SR)]
 \let\hyper@@anchor\@gobble
 \def\hyper@link#1#2#3{#3}%
diff --git a/Master/texmf-dist/tex/latex/hyperref/pd1enc.def b/Master/texmf-dist/tex/latex/hyperref/pd1enc.def
index b4fafd74228..47d2661be0a 100644
--- a/Master/texmf-dist/tex/latex/hyperref/pd1enc.def
+++ b/Master/texmf-dist/tex/latex/hyperref/pd1enc.def
@@ -24,7 +24,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{pd1enc.def}
-  [2009/10/09 v6.79a
+  [2009/11/14 v6.79e
   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 f3517747940..cc282b52736 100644
--- a/Master/texmf-dist/tex/latex/hyperref/pdfmark.def
+++ b/Master/texmf-dist/tex/latex/hyperref/pdfmark.def
@@ -24,7 +24,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{pdfmark.def}
-  [2009/10/09 v6.79a
+  [2009/11/14 v6.79e
   Hyperref definitions for pdfmark specials]
 \begingroup
   \toks@\expandafter{\Hy@FirstPageHook}%
@@ -76,7 +76,7 @@
     }%
   }%
 \fi
-\RequirePackage{pdftexcmds}[2007/11/11]
+\RequirePackage{pdftexcmds}[2009/04/10]
 \begingroup\expandafter\expandafter\expandafter\endgroup
 \expandafter\ifx\csname pdf@escapestring\endcsname\relax
   \begingroup
@@ -1499,15 +1499,18 @@
       \fi
       \pdfstringdef\Hy@tempa{#2}%
       \if@filesw
+        \stepcounter{bookmark@seq@number}%
         \protected@write\@outlinefile{}{%
           \protect\BOOKMARK
             [\Hy@level][\@bookmarkopenstatus{\Hy@level}]{#3}%
             {\Hy@tempa}{\Hy@tempb}%
+            \@percentchar\space\thebookmark@seq@number
         }%
       \fi
     \fi
   \endgroup
 }
+\newcounter{bookmark@seq@number}
 \newcommand{\currentpdfbookmark}{%
   \pdfbookmark[\Hy@currentbookmarklevel]%
 }
@@ -1529,6 +1532,50 @@
 }
 \def\BOOKMARK{\@ifnextchar[{\@BOOKMARK}{\@@BOOKMARK[1][-]}}
 \def\@BOOKMARK[#1]{\@ifnextchar[{\@@BOOKMARK[#1]}{\@@BOOKMARK[#1][-]}}
+\def\Hy@OutlineRerunCheck{%
+  \begingroup
+    \xdef\Hy@OutlineCheckSumBefore{%
+      \@ifundefined{pdf@filemdfivesum}{}{%
+        \pdf@filemdfivesum{\jobname.out}%
+      }%
+      :%
+      \@ifundefined{pdf@filesize}{}{%
+        \pdf@filesize{\jobname.out}%
+      }%
+    }%
+  \endgroup
+  \AtEndDocument{%
+    \clearpage
+    \if@filesw
+      \immediate\write\@mainaux{%
+        \string\csname\space Hy@OutlineCheckEnd\string\endcsname
+      }%
+    \fi
+  }%
+}
+\AtBeginDocument{%
+  \def\Hy@OutlineCheckEnd{%
+    \begingroup
+      \immediate\closeout\@outlinefile
+      \edef\Hy@OutlineCheckSumAfter{%
+        \@ifundefined{pdf@filemdfivesum}{}{%
+          \pdf@filemdfivesum{\jobname.out}%
+        }%
+        :%
+        \@ifundefined{pdf@filesize}{}{%
+          \pdf@filesize{\jobname.out}%
+        }%
+      }%
+      \ifx\Hy@OutlineCheckSumBefore\Hy@OutlineCheckSumAfter
+      \else
+        \Hy@WarningNoLine{%
+          Rerun to get outlines right\MessageBreak
+          or use package `bookmark'%
+        }%
+      \fi
+    \endgroup
+  }%
+}
 \def\ReadBookmarks{%
   \begingroup
     \escapechar=`\\%
@@ -1556,6 +1603,7 @@
    \else
      \if@filesw
        \newwrite\@outlinefile
+       \Hy@OutlineRerunCheck
        \immediate\openout\@outlinefile=\jobname.out\relax
        \ifHy@typexml
          \immediate\write\@outlinefile{<relaxxml>\relax}%
diff --git a/Master/texmf-dist/tex/latex/hyperref/puarenc.def b/Master/texmf-dist/tex/latex/hyperref/puarenc.def
index dc2a773eeb2..e7cef0247c7 100644
--- a/Master/texmf-dist/tex/latex/hyperref/puarenc.def
+++ b/Master/texmf-dist/tex/latex/hyperref/puarenc.def
@@ -24,7 +24,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{puarenc.def}
-  [2009/10/09 v6.79a
+  [2009/11/14 v6.79e
   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 4f9a89058d0..b347a983281 100644
--- a/Master/texmf-dist/tex/latex/hyperref/puenc.def
+++ b/Master/texmf-dist/tex/latex/hyperref/puenc.def
@@ -24,7 +24,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{puenc.def}
-  [2009/10/09 v6.79a
+  [2009/11/14 v6.79e
   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 682668a85e9..ae92c05991f 100644
--- a/Master/texmf-dist/tex/latex/hyperref/puvnenc.def
+++ b/Master/texmf-dist/tex/latex/hyperref/puvnenc.def
@@ -24,7 +24,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{puvnenc.def}
-  [2009/10/09 v6.79a
+  [2009/11/14 v6.79e
   Hyperref: Additions to puenc.def for VnTeX]
 \DeclareTextCommand{\abreve}{PU}{\81\003}
 \DeclareTextCommand{\acircumflex}{PU}{\80\342}