hyperref update

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

27 files changed, 324 insertions, 97 deletions

diff --git a/Master/texmf-dist/doc/latex/hyperref/ChangeLog b/Master/texmf-dist/doc/latex/hyperref/ChangeLog
index 847aeb22970..13567762b48 100644
--- a/Master/texmf-dist/doc/latex/hyperref/ChangeLog
+++ b/Master/texmf-dist/doc/latex/hyperref/ChangeLog
@@ -1,4 +1,15 @@
+2007-06-14  6.76i  Heiko Oberdiek
+    * 6.76i
+    * `pdfencoding=auto' a little more efficient.
+
+2007-06-12  6.76h  Heiko Oberdiek
+    * 6.76h
+    * Fix for default of \theHequation (class `foils'
+      do not know counter `section').
+    * New option `pdfencoding' added (uses package `stringenc').
+
 2007-05-29  6.76g  Heiko Oberdiek
+    * 6.76g
     * The color of launch annotations are set by options
       `runcolor' and `runbordercolor'. (Previously `filecolor'
        was used.)
@@ -8,9 +19,11 @@
     * nameref 2.31: Some fixes in \NR@@vpageref.
 
 2007-05-09  6.76f  Heiko Oberdiek
+    * 6.76f
     * Use of package `etexcmds' for \unexpanded.
 
 2007-05-03  6.76e  Heiko Oberdiek
+    * 6.76e
     * hyperref: ConTeXt's base/syst-gen.tex redefines e-TeX's \unexpanded.
     * Some support for amsmath's environment `subequations'.
     * nameref 2.30: \label is supported after longtable's \caption.
diff --git a/Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf b/Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf
index dd0f1076485..ad59f115d2e 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/README b/Master/texmf-dist/doc/latex/hyperref/README
index bf8971f335f..090d8c39286 100644
--- a/Master/texmf-dist/doc/latex/hyperref/README
+++ b/Master/texmf-dist/doc/latex/hyperref/README
@@ -1,4 +1,4 @@
-README for hyperref bundle, 2007/02/08
+README for hyperref bundle, 2007/05/31
 
 
 TABLE OF CONTENTS
@@ -138,6 +138,18 @@ apart from nameref and backref:
 5 NEW FEATURES
 ==============
 
+Option pdfencoding
+------------------
+  The PDF format allows two encodings for bookmarks and entries
+  in the information dictionary: PDFDocEncoding and Unicode
+  as UTF-16BE. Option "pdfencoding" selects between these encodings:
+  * "pdfdoc" uses PDFDocEncoding. It uses just one byte per character,
+     but the supported characters are limited (244 in PDF-1.7).
+  * "unicode" sets Unicode. It is encoded as UTF-16BE. Two bytes
+    are used for most characters, surrogates need four bytes.
+  * "auto" PDFDocEncoding if the string does not contain characters
+    outside the encoding and Unicode otherwise.
+
 Color options/package hycolor
 -----------------------------
   See documentation of package `hycolor'.
@@ -378,6 +390,13 @@ amsmath
   \let\equation\gather
   \let\endequation\endgather
 
+amsrefs
+-------
+  Package loading order:
+
+  \usepackage{hyperref}
+  \usepackage{amsrefs}
+
 arydshln, longtable
 --------,----------
   Package longtable must be put before hyperref and arydshln,
diff --git a/Master/texmf-dist/doc/latex/hyperref/README.pdf b/Master/texmf-dist/doc/latex/hyperref/README.pdf
index 75652968275..1f91cca5561 100644
--- a/Master/texmf-dist/doc/latex/hyperref/README.pdf
+++ b/Master/texmf-dist/doc/latex/hyperref/README.pdf
diff --git a/Master/texmf-dist/doc/latex/hyperref/hyperref.pdf b/Master/texmf-dist/doc/latex/hyperref/hyperref.pdf
index 481a1a59452..e7aeb2a946e 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/source/latex/hyperref/hyperref.dtx b/Master/texmf-dist/source/latex/hyperref/hyperref.dtx
index 858d82ba132..0f87ca726b4 100644
--- a/Master/texmf-dist/source/latex/hyperref/hyperref.dtx
+++ b/Master/texmf-dist/source/latex/hyperref/hyperref.dtx
@@ -39,7 +39,7 @@
 %<puenc>\ProvidesFile{puenc.def}
 %<puvnenc>\ProvidesFile{puvnenc.def}
 %<puarenc>\ProvidesFile{puarenc.def}
-%<!none>  [2007/05/29 v6.76g
+%<!none>  [2007/06/14 v6.76i
 %<package>  Hypertext links for LaTeX]
 %<nohyperref>  Dummy hyperref (SR)]
 %<driver>  Hyperref documentation driver file]
@@ -116,7 +116,7 @@
 \end{document}
 %</driver>
 % \fi
-% \CheckSum{20970}
+% \CheckSum{21126}
 %
 % \MakeShortVerb{|}
 % \StopEventually{}
@@ -321,7 +321,7 @@
 %    of a \LaTeX\ definition (number of arguments).
 %    \begin{macrocode}
 \def\HyC@nc@opt[#1]{%
-  \def\HyC@param{[#1]}%
+  \def\HyC@param{[{#1}]}%
   \@ifnextchar[\HyC@nc@default\HyC@nc@noopt
 }
 %    \end{macrocode}
@@ -1544,8 +1544,27 @@
 %    the masks \cs{8} and \cs{9} are removed and the Unicode
 %    marker is added.
 %    \begin{macrocode}
+  \endgroup
+  \begingroup
     \ifHy@unicode
       \HyPsd@ConvertToUnicode#1%
+%    \end{macrocode}
+%
+% \paragraph{Try conversion back to PDFDocEncoding.}
+%
+%    \begin{macrocode}
+      \ifx\HyPsd@pdfencoding\HyPsd@pdfencoding@auto
+        \@ifundefined{StringEncodingConvertTest}{%
+        }{%
+          \EdefUnescapeString\HyPsd@temp#1%
+          \StringEncodingConvertTest\HyPsd@temp\HyPsd@temp
+                                    {utf16be}{pdfdoc}{%
+            \EdefEscapeString\HyPsd@temp\HyPsd@temp
+            \global\let#1\HyPsd@temp
+            \Hy@unicodefalse
+          }{}%
+        }%
+      \fi
     \fi
 %    \end{macrocode}
 %
@@ -3728,7 +3747,93 @@
 %    \begin{macrocode}
 \define@key{Hyp}{unicode}[true]{%
   \Hy@boolkey{unicode}{#1}%
-  \HyPsd@InitUnicode
+  \ifHy@unicode
+    \def\HyPsd@pdfencoding{unicode}%
+  \else
+    \def\HyPsd@pdfencoding{pdfdoc}%
+  \fi
+  \HyPsd@LoadUnicode
+}
+\def\HyPsd@LoadUnicode{%
+  \@ifundefined{T@PU}{\input{puenc.def}}{}%
+  \DeclareFontFamily{PU}{pdf}{}%
+  \DeclareFontShape{PU}{pdf}{m}{n}{ <-> cmr10 }{}%
+  \DeclareFontSubstitution{PU}{pdf}{m}{n}%
+  \global\let\HyPsd@LoadUnicode\relax
+}
+\AtBeginDocument{%
+  \ifx\HyPsd@LoadUnicode\relax
+  \else
+    \def\HyPsd@LoadUnicode{%
+      \PackageError{hyperref}{%
+        Unicode support for bookmarks is not available.\MessageBreak
+        Activate unicode support by using one of the options\MessageBreak
+        `unicode', `pdfencoding=unicode', `pdfencoding=auto'\MessageBreak
+        in the preamble%
+      }\@ehc
+      \global\let\HyPsd@LoadUnicode\relax
+      \global\Hy@unicodefalse
+      \global\let\Hy@unicodetrue\Hy@unicodefalse
+    }%
+  \fi
+}
+%    \end{macrocode}
+%    \begin{macrocode}
+\define@key{Hyp}{pdfencoding}{%
+  \edef\HyPsd@temp{#1}%
+  \ifx\HyPsd@temp\HyPsd@pdfencoding@pdfdoc
+    \let\HyPsd@pdfencoding\HyPsd@temp
+    \Hy@unicodefalse
+  \else
+    \ifcase\ifx\HyPsd@temp\HyPsd@pdfencoding@unicode
+             \z@
+           \else
+             \ifx\HyPsd@temp\HyPsd@pdfencoding@auto
+               \z@
+             \else
+               \@ne
+             \fi
+           \fi
+      \let\HyPsd@pdfencoding\HyPsd@temp
+      \hypersetup{unicode}%
+      \ifHy@unicode
+        \def\HyPsd@pdfencoding{#1}%
+        \ifx\HyPsd@pdfencoding\HyPsd@pdfencoding@auto
+          \HyPsd@LoadStringEnc
+        \fi
+      \else
+        \Hy@Warning{Cannot switch to unicode bookmarks}%
+        \let\HyPsd@pdfencoding\HyPsd@pdfencoding@pdfdoc
+      \fi
+    \else
+      \@onelevel@sanitize\HyPsd@temp
+      \Hy@Warning{%
+        Values of option `pdfencoding':\MessageBreak
+        `pdfdoc', `unicode', `auto'.\MessageBreak
+        Ignoring unknown value `\HyPsd@temp'%
+      }%
+    \fi
+  \fi
+}
+\def\HyPsd@pdfencoding@auto{auto}
+\def\HyPsd@pdfencoding@pdfdoc{pdfdoc}
+\def\HyPsd@pdfencoding@unicode{unicode}
+\let\HyPsd@pdfencoding\Hy@pdfencoding@pdfdoc
+\def\HyPsd@LoadStringEnc{%
+  \RequirePackage{stringenc}[2007/06/14]
+  \let\HyPsd@LoadStringEnc\relax
+}
+\AtBeginDocument{%
+  \@ifpackageloaded{stringenc}{%
+    \let\HyPsd@LoadStringEnc\relax
+  }{%
+    \def\HyPsd@LoadStringEnc{%
+      \Hy@WarningNoLine{%
+        Missing package `stringenc'. Use `pdfencoding=auto'\MessageBreak
+        in the preamble or load the package there%
+      }%
+    }%
+  }%
 }
 %    \end{macrocode}
 %
@@ -4674,32 +4779,6 @@
 }%
 %    \end{macrocode}
 %
-%    If option |unicode| is already processed, then the
-%    command \cs{HyPsd@InitUnicode} is cleared after
-%    execution. Then the option code only sets
-%    the meaning of the switch \cs{ifHy@unicode}.
-%    \begin{macrocode}
-\ifx\HyPsd@InitUnicode\relax
-  \define@key{Hyp}{unicode}[true]{%
-    \Hy@boolkey{unicode}{#1}%
-  }%
-\else
-  \define@key{Hyp}{unicode}[true]{%
-    \Hy@boolkey{unicode}{#1}%
-    \ifHy@unicode
-      \Hy@WarningNoLine{Set package option `unicode' first\MessageBreak
-                  in order to load unicode support%
-      }%
-      \Hy@unicodefalse
-    \fi
-  }%
-\fi
-%    \end{macrocode}
-%    The macro \cs{HyPsd@InitUnicode} is no longer needed.
-%    \begin{macrocode}
-\let\HyPsd@InitUnicode\@undefined
-%    \end{macrocode}
-%
 % \subsection{Patch for babel's
 %    \texorpdfstring{\cs{texttilde}}{\\texttilde}}
 %    Babel does not define \cmd{\texttilde} in NFSS2 manner,
@@ -6532,8 +6611,25 @@
 %
 % Start with a fallback for equations
 %    \begin{macrocode}
-\newcommand\theHequation{\theHsection.\arabic{equation}}
-\@ifundefined{thepart}{}{\newcommand\theHpart{\arabic{part}}}
+\def\Hy@CounterExists#1{%
+  \begingroup\expandafter\expandafter\expandafter\endgroup
+  \expandafter\ifx\csname c@#1\endcsname\relax
+    \expandafter\@gobble
+  \else
+    \begingroup\expandafter\expandafter\expandafter\endgroup
+    \expandafter\ifx\csname the#1\endcsname\relax
+      \expandafter\expandafter\expandafter\@gobble
+    \else
+      \expandafter\expandafter\expandafter\@firstofone
+    \fi
+  \fi
+}
+\Hy@CounterExists{section}{%
+  \newcommand\theHequation{\theHsection.\arabic{equation}}%
+}
+\Hy@CounterExists{part}{%
+  \newcommand\theHpart{\arabic{part}}%
+}
 \@ifundefined{thechapter}{%
   \newcommand\theHsection    {\arabic{section}}%
   \newcommand\theHfigure     {\arabic{figure}}%
@@ -6863,7 +6959,7 @@
         #2\@sharp#####4%
       }%
     }%
-  \expandafter\expandafter\expandafter\x\y[#1]{#2}\@nil
+  \expandafter\expandafter\expandafter\x\y[{#1}]{#2}\@nil
 %    \end{macrocode}
 %    Patch of \cmd{\LT@start}:
 %    add anchor before first line after \verb|\vskip\LTpre|
@@ -11332,7 +11428,7 @@
   \edef\Hy@temp{#1}%
   \ifx\Hy@temp\@empty
   \else
-    \pdf@addtoks{[#1]\Hy@BorderArrayPatch}{Border}%
+    \pdf@addtoks{[#1]\Hy@BorderArrayPatch}{Border}% hash-ok
   \fi
 }
 \let\Hy@BorderArrayPatch\@empty
@@ -11348,7 +11444,7 @@
 \define@key{PDF}{Color}{%
   \ifx\relax#1\relax
   \else
-    \pdf@addtoks{[#1]}{Color}%
+    \pdf@addtoks{[#1]}{Color}% hash-ok
   \fi
 }
 % parameter is a string
@@ -11356,7 +11452,7 @@
 % parameter is a integer
 \define@key{PDF}{Count}{\pdf@addtoks{#1}{Count}}
 % parameter is a array
-\define@key{PDF}{CropBox}{\pdf@addtoks{[#1]}{CropBox}}
+\define@key{PDF}{CropBox}{\pdf@addtoks{[#1]}{CropBox}}% hash-ok
 % parameter is a string
 \define@key{PDF}{DOSFile}{\pdf@addtoks{(#1)}{DOSFile}}
 % parameter is a string or file
@@ -11396,7 +11492,7 @@
   \fi
 }
 % parameter is a string
-\define@key{PDF}{ID}{\pdf@addtoks{[#1]}{ID}}
+\define@key{PDF}{ID}{\pdf@addtoks{[#1]}{ID}}% hash-ok
 % parameter is a string
 \define@key{PDF}{MacFile}{\pdf@addtoks{(#1)}{MacFile}}
 % parameter is a string
@@ -11412,7 +11508,7 @@
 % parameter is a string
 \define@key{PDF}{Params}{\pdf@addtoks{(#1)}{Params}}
 % parameter is a array
-\define@key{PDF}{Rect}{\pdf@addtoks{[#1]}{Rect}}
+\define@key{PDF}{Rect}{\pdf@addtoks{[#1]}{Rect}}% hash-ok
 % parameter is a integer
 \define@key{PDF}{SrcPg}{\pdf@addtoks{#1}{SrcPg}}
 % parameter is a name
@@ -11425,7 +11521,7 @@
 % parameter is a string
 \define@key{PDF}{UnixFile}{\pdf@addtoks{(#1)}{UnixFile}}
 % parameter is an array
-\define@key{PDF}{View}{\pdf@addtoks{[#1]}{View}}
+\define@key{PDF}{View}{\pdf@addtoks{[#1]}{View}}% hash-ok
 % parameter is a string
 \define@key{PDF}{WinFile}{\pdf@addtoks{(#1)}{WinFile}}
 %    \end{macrocode}
@@ -14211,7 +14307,7 @@ o\fi,t=#4}%
   \begingroup
     \escapechar=`\\%
     \let\escapechar\@gobble %
-    \def\@@BOOKMARK [##1][##2]##3##4##5{\calc@bm@number{##5}}%
+    \def\@@BOOKMARK[##1][##2]##3##4##5{\calc@bm@number{##5}}%
     \InputIfFileExists{\jobname.out}{}{}%
     \ifx\WriteBookmarks\relax
       \global\let\WriteBookmarks\relax
diff --git a/Master/texmf-dist/source/latex/hyperref/nameref.dtx b/Master/texmf-dist/source/latex/hyperref/nameref.dtx
index 891bd49257a..fab18a70baf 100644
--- a/Master/texmf-dist/source/latex/hyperref/nameref.dtx
+++ b/Master/texmf-dist/source/latex/hyperref/nameref.dtx
@@ -300,7 +300,7 @@
                     \csname beamer@#1\endcsname
     \begingroup
       \edef\x{\endgroup
-        \long\def\expandafter\noexpand\csname beamer@#1\endcsname[####1]{%
+        \long\def\expandafter\noexpand\csname beamer@#1\endcsname[####1]{% hash-ok
           \def\noexpand\@currentlabelname{####1}%
           \expandafter\noexpand\csname NRorg@beamer@#1\endcsname[{####1}]%
         }%
diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def b/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def
index 9da39dce159..86ec105c217 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def
@@ -22,7 +22,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{hdvipdfm.def}
-  [2007/05/29 v6.76g
+  [2007/06/14 v6.76i
   Hyperref driver for dvipdfm]
 \def\Hy@PutCatalog#1{\@pdfm@mark{docview << #1 >>}}
 \ifHy@pagelabels
@@ -1045,7 +1045,7 @@
   \begingroup
     \escapechar=`\\%
     \let\escapechar\@gobble %
-    \def\@@BOOKMARK [##1][##2]##3##4##5{\calc@bm@number{##5}}%
+    \def\@@BOOKMARK[##1][##2]##3##4##5{\calc@bm@number{##5}}%
     \InputIfFileExists{\jobname.out}{}{}%
     \ifx\WriteBookmarks\relax
       \global\let\WriteBookmarks\relax
diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvips.def b/Master/texmf-dist/tex/latex/hyperref/hdvips.def
index faeb37b7d4b..04ffee08537 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hdvips.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hdvips.def
@@ -22,7 +22,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{hdvips.def}
-  [2007/05/29 v6.76g
+  [2007/06/14 v6.76i
   Hyperref driver for dvips]
 \input{pdfmark.def}%
 \ifx\@pdfproducer\relax
diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvipson.def b/Master/texmf-dist/tex/latex/hyperref/hdvipson.def
index 26c40d254fc..93cbca7b2ef 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hdvipson.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hdvipson.def
@@ -22,7 +22,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{hdvipson.def}
-  [2007/05/29 v6.76g
+  [2007/06/14 v6.76i
   Hyperref driver for dvipsone]
 \providecommand*\@pdfborder{0 0 1}
 \providecommand*\@pdfborderstyle{}
diff --git a/Master/texmf-dist/tex/latex/hyperref/hdviwind.def b/Master/texmf-dist/tex/latex/hyperref/hdviwind.def
index 408bbd53ac9..f89c985834d 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hdviwind.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hdviwind.def
@@ -22,7 +22,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{hdviwind.def}
-  [2007/05/29 v6.76g
+  [2007/06/14 v6.76i
   Hyperref driver for dviwindo]
 \def\Hy@PutCatalog#1{%
   \pdfmark{pdfmark=/PUT,Raw={\string{Catalog\string} << #1 >>}}%
@@ -435,7 +435,7 @@
   \edef\Hy@temp{#1}%
   \ifx\Hy@temp\@empty
   \else
-    \pdf@addtoks{[#1]\Hy@BorderArrayPatch}{Border}%
+    \pdf@addtoks{[#1]\Hy@BorderArrayPatch}{Border}% hash-ok
   \fi
 }
 \let\Hy@BorderArrayPatch\@empty
@@ -449,12 +449,12 @@
 \define@key{PDF}{Color}{%
   \ifx\relax#1\relax
   \else
-    \pdf@addtoks{[#1]}{Color}%
+    \pdf@addtoks{[#1]}{Color}% hash-ok
   \fi
 }
 \define@key{PDF}{Contents}{\pdf@addtoks{(#1)}{Contents}}
 \define@key{PDF}{Count}{\pdf@addtoks{#1}{Count}}
-\define@key{PDF}{CropBox}{\pdf@addtoks{[#1]}{CropBox}}
+\define@key{PDF}{CropBox}{\pdf@addtoks{[#1]}{CropBox}}% hash-ok
 \define@key{PDF}{DOSFile}{\pdf@addtoks{(#1)}{DOSFile}}
 \define@key{PDF}{DataSource}{\pdf@addtoks{(#1)}{DataSource}}
 \define@key{PDF}{Dest}{%
@@ -486,7 +486,7 @@
     \pdf@addtoks{#1}{H}%
   \fi
 }
-\define@key{PDF}{ID}{\pdf@addtoks{[#1]}{ID}}
+\define@key{PDF}{ID}{\pdf@addtoks{[#1]}{ID}}% hash-ok
 \define@key{PDF}{MacFile}{\pdf@addtoks{(#1)}{MacFile}}
 \define@key{PDF}{ModDate}{\pdf@addtoks{(#1)}{ModDate}}
 \define@key{PDF}{Op}{\pdf@addtoks{(#1)}{Op}}
@@ -494,13 +494,13 @@
 \define@key{PDF}{Page}{\pdf@addtoks{#1}{Page}}
 \define@key{PDF}{PageMode}{\pdf@addtoks{#1}{PageMode}}
 \define@key{PDF}{Params}{\pdf@addtoks{(#1)}{Params}}
-\define@key{PDF}{Rect}{\pdf@addtoks{[#1]}{Rect}}
+\define@key{PDF}{Rect}{\pdf@addtoks{[#1]}{Rect}}% hash-ok
 \define@key{PDF}{SrcPg}{\pdf@addtoks{#1}{SrcPg}}
 \define@key{PDF}{Subtype}{\pdf@addtoks{#1}{Subtype}}
 \define@key{PDF}{Title}{\pdf@addtoks{(#1)}{Title}}
 \define@key{PDF}{Unix}{\pdf@addtoks{(#1)}{Unix}}
 \define@key{PDF}{UnixFile}{\pdf@addtoks{(#1)}{UnixFile}}
-\define@key{PDF}{View}{\pdf@addtoks{[#1]}{View}}
+\define@key{PDF}{View}{\pdf@addtoks{[#1]}{View}}% hash-ok
 \define@key{PDF}{WinFile}{\pdf@addtoks{(#1)}{WinFile}}
 \define@key{PDF}{Author}{\pdf@addtoks{(#1)}{Author}}
 \define@key{PDF}{Creator}{\pdf@addtoks{(#1)}{Creator}}
diff --git a/Master/texmf-dist/tex/latex/hyperref/hpdftex.def b/Master/texmf-dist/tex/latex/hyperref/hpdftex.def
index 33ffc752337..55e6d3f3a65 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hpdftex.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hpdftex.def
@@ -22,7 +22,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{hpdftex.def}
-  [2007/05/29 v6.76g
+  [2007/06/14 v6.76i
   Hyperref driver for pdfTeX]
 \let\Hy@PutCatalog\pdfcatalog
 \ifHy@pagelabels
@@ -1182,7 +1182,7 @@
   \begingroup
     \escapechar=`\\%
     \let\escapechar\@gobble %
-    \def\@@BOOKMARK [##1][##2]##3##4##5{\calc@bm@number{##5}}%
+    \def\@@BOOKMARK[##1][##2]##3##4##5{\calc@bm@number{##5}}%
     \InputIfFileExists{\jobname.out}{}{}%
     \ifx\WriteBookmarks\relax
       \global\let\WriteBookmarks\relax
diff --git a/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg b/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg
index af002e47e95..59949a533d2 100644
--- a/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg
+++ b/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg
@@ -22,7 +22,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{htex4ht.cfg}
-  [2007/05/29 v6.76g
+  [2007/06/14 v6.76i
   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 17eea744c04..3d2c14ce9ba 100644
--- a/Master/texmf-dist/tex/latex/hyperref/htex4ht.def
+++ b/Master/texmf-dist/tex/latex/hyperref/htex4ht.def
@@ -22,7 +22,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{htex4ht.def}
-  [2007/05/29 v6.76g
+  [2007/06/14 v6.76i
   Hyperref driver for TeX4ht]
 \@ifpackageloaded{tex4ht}{%
   \typeout{hyperref tex4ht: tex4ht already loaded}%
diff --git a/Master/texmf-dist/tex/latex/hyperref/htexture.def b/Master/texmf-dist/tex/latex/hyperref/htexture.def
index 1d1b9fe7af3..256808d2a25 100644
--- a/Master/texmf-dist/tex/latex/hyperref/htexture.def
+++ b/Master/texmf-dist/tex/latex/hyperref/htexture.def
@@ -22,7 +22,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{htexture.def}
-  [2007/05/29 v6.76g
+  [2007/06/14 v6.76i
   Hyperref driver for Textures]
 \begingroup
   \obeylines %
diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtex.def b/Master/texmf-dist/tex/latex/hyperref/hvtex.def
index e3dec84dce8..840c673eb0b 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hvtex.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hvtex.def
@@ -22,7 +22,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{hvtex.def}
-  [2007/05/29 v6.76g
+  [2007/06/14 v6.76i
   Hyperref driver for VTeX in PDF/PS mode]
 \edef\Hy@VTeXversion{%
   \ifx\VTeXversion\@undefined
diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def b/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def
index 14551657ac6..1049b87ddc9 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def
@@ -22,7 +22,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{hvtexhtml.def}
-  [2007/05/29 v6.76g
+  [2007/06/14 v6.76i
   Hyperref driver for VTeX in HTML mode]
 \RequirePackage{vtexhtml}
 \newif\if@Localurl
diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def b/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def
index f044af75fbe..2149cefe25a 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def
@@ -22,7 +22,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{hvtexmrk.def}
-  [2007/05/29 v6.76g
+  [2007/06/14 v6.76i
  Hyperref driver for VTeX in PDF/PS mode (pdfmark specials)]
 \input{pdfmark.def}%
 \ifx\@pdfproducer\relax
diff --git a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty
index 980ea5b7e7a..d43d9003303 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty
+++ b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty
@@ -23,7 +23,7 @@
 %%
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{hyperref}
-  [2007/05/29 v6.76g
+  [2007/06/14 v6.76i
   Hypertext links for LaTeX]
 \begingroup
   \@makeother\`%
@@ -437,8 +437,22 @@
       \fi
       \xdef#1{#1\@empty}%
     \fi
+  \endgroup
+  \begingroup
     \ifHy@unicode
       \HyPsd@ConvertToUnicode#1%
+      \ifx\HyPsd@pdfencoding\HyPsd@pdfencoding@auto
+        \@ifundefined{StringEncodingConvertTest}{%
+        }{%
+          \EdefUnescapeString\HyPsd@temp#1%
+          \StringEncodingConvertTest\HyPsd@temp\HyPsd@temp
+                                    {utf16be}{pdfdoc}{%
+            \EdefEscapeString\HyPsd@temp\HyPsd@temp
+            \global\let#1\HyPsd@temp
+            \Hy@unicodefalse
+          }{}%
+        }%
+      \fi
     \fi
     \pdfstringdefPostHook#1%
   \endgroup
@@ -1696,7 +1710,91 @@
 }
 \define@key{Hyp}{unicode}[true]{%
   \Hy@boolkey{unicode}{#1}%
-  \HyPsd@InitUnicode
+  \ifHy@unicode
+    \def\HyPsd@pdfencoding{unicode}%
+  \else
+    \def\HyPsd@pdfencoding{pdfdoc}%
+  \fi
+  \HyPsd@LoadUnicode
+}
+\def\HyPsd@LoadUnicode{%
+  \@ifundefined{T@PU}{\input{puenc.def}}{}%
+  \DeclareFontFamily{PU}{pdf}{}%
+  \DeclareFontShape{PU}{pdf}{m}{n}{ <-> cmr10 }{}%
+  \DeclareFontSubstitution{PU}{pdf}{m}{n}%
+  \global\let\HyPsd@LoadUnicode\relax
+}
+\AtBeginDocument{%
+  \ifx\HyPsd@LoadUnicode\relax
+  \else
+    \def\HyPsd@LoadUnicode{%
+      \PackageError{hyperref}{%
+        Unicode support for bookmarks is not available.\MessageBreak
+        Activate unicode support by using one of the options\MessageBreak
+        `unicode', `pdfencoding=unicode', `pdfencoding=auto'\MessageBreak
+        in the preamble%
+      }\@ehc
+      \global\let\HyPsd@LoadUnicode\relax
+      \global\Hy@unicodefalse
+      \global\let\Hy@unicodetrue\Hy@unicodefalse
+    }%
+  \fi
+}
+\define@key{Hyp}{pdfencoding}{%
+  \edef\HyPsd@temp{#1}%
+  \ifx\HyPsd@temp\HyPsd@pdfencoding@pdfdoc
+    \let\HyPsd@pdfencoding\HyPsd@temp
+    \Hy@unicodefalse
+  \else
+    \ifcase\ifx\HyPsd@temp\HyPsd@pdfencoding@unicode
+             \z@
+           \else
+             \ifx\HyPsd@temp\HyPsd@pdfencoding@auto
+               \z@
+             \else
+               \@ne
+             \fi
+           \fi
+      \let\HyPsd@pdfencoding\HyPsd@temp
+      \hypersetup{unicode}%
+      \ifHy@unicode
+        \def\HyPsd@pdfencoding{#1}%
+        \ifx\HyPsd@pdfencoding\HyPsd@pdfencoding@auto
+          \HyPsd@LoadStringEnc
+        \fi
+      \else
+        \Hy@Warning{Cannot switch to unicode bookmarks}%
+        \let\HyPsd@pdfencoding\HyPsd@pdfencoding@pdfdoc
+      \fi
+    \else
+      \@onelevel@sanitize\HyPsd@temp
+      \Hy@Warning{%
+        Values of option `pdfencoding':\MessageBreak
+        `pdfdoc', `unicode', `auto'.\MessageBreak
+        Ignoring unknown value `\HyPsd@temp'%
+      }%
+    \fi
+  \fi
+}
+\def\HyPsd@pdfencoding@auto{auto}
+\def\HyPsd@pdfencoding@pdfdoc{pdfdoc}
+\def\HyPsd@pdfencoding@unicode{unicode}
+\let\HyPsd@pdfencoding\Hy@pdfencoding@pdfdoc
+\def\HyPsd@LoadStringEnc{%
+  \RequirePackage{stringenc}[2007/06/14]
+  \let\HyPsd@LoadStringEnc\relax
+}
+\AtBeginDocument{%
+  \@ifpackageloaded{stringenc}{%
+    \let\HyPsd@LoadStringEnc\relax
+  }{%
+    \def\HyPsd@LoadStringEnc{%
+      \Hy@WarningNoLine{%
+        Missing package `stringenc'. Use `pdfencoding=auto'\MessageBreak
+        in the preamble or load the package there%
+      }%
+    }%
+  }%
 }
 \define@key{Hyp}{hyperref}[true]{}
 \define@key{Hyp}{tex4ht}[true]{%
@@ -2460,22 +2558,6 @@
   \Hy@DisableOption{nolinks}%
   \Hy@DisableOption{final}%
 }%
-\ifx\HyPsd@InitUnicode\relax
-  \define@key{Hyp}{unicode}[true]{%
-    \Hy@boolkey{unicode}{#1}%
-  }%
-\else
-  \define@key{Hyp}{unicode}[true]{%
-    \Hy@boolkey{unicode}{#1}%
-    \ifHy@unicode
-      \Hy@WarningNoLine{Set package option `unicode' first\MessageBreak
-                  in order to load unicode support%
-      }%
-      \Hy@unicodefalse
-    \fi
-  }%
-\fi
-\let\HyPsd@InitUnicode\@undefined
 \Hy@nextfalse
 \@ifundefined{spanish@sh@"@sel}{}{\Hy@nexttrue}
 \@ifundefined{galician@sh@"@sel}{}{\Hy@nexttrue}
@@ -3655,8 +3737,25 @@
 \fi
 \Hy@DisableOption{pdfpagelabels}
 \MaybeStopEarly
-\newcommand\theHequation{\theHsection.\arabic{equation}}
-\@ifundefined{thepart}{}{\newcommand\theHpart{\arabic{part}}}
+\def\Hy@CounterExists#1{%
+  \begingroup\expandafter\expandafter\expandafter\endgroup
+  \expandafter\ifx\csname c@#1\endcsname\relax
+    \expandafter\@gobble
+  \else
+    \begingroup\expandafter\expandafter\expandafter\endgroup
+    \expandafter\ifx\csname the#1\endcsname\relax
+      \expandafter\expandafter\expandafter\@gobble
+    \else
+      \expandafter\expandafter\expandafter\@firstofone
+    \fi
+  \fi
+}
+\Hy@CounterExists{section}{%
+  \newcommand\theHequation{\theHsection.\arabic{equation}}%
+}
+\Hy@CounterExists{part}{%
+  \newcommand\theHpart{\arabic{part}}%
+}
 \@ifundefined{thechapter}{%
   \newcommand\theHsection    {\arabic{section}}%
   \newcommand\theHfigure     {\arabic{figure}}%
@@ -3863,7 +3962,7 @@
         #2\@sharp#####4%
       }%
     }%
-  \expandafter\expandafter\expandafter\x\y[#1]{#2}\@nil
+  \expandafter\expandafter\expandafter\x\y[{#1}]{#2}\@nil
   \begingroup
     \def\x#1\ifvoid\LT@firsthead\copy#2\@nil{%
       \endgroup
diff --git a/Master/texmf-dist/tex/latex/hyperref/hypertex.def b/Master/texmf-dist/tex/latex/hyperref/hypertex.def
index 3162482ee0f..b9c1115caa4 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hypertex.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hypertex.def
@@ -22,7 +22,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{hypertex.def}
-  [2007/05/29 v6.76g
+  [2007/06/14 v6.76i
   Hyperref driver for HyperTeX specials]
 \def\PDF@FinishDoc{}
 \def\PDF@SetupDoc{%
diff --git a/Master/texmf-dist/tex/latex/hyperref/nameref.sty b/Master/texmf-dist/tex/latex/hyperref/nameref.sty
index b6cadb0937c..bf8aa9e242c 100644
--- a/Master/texmf-dist/tex/latex/hyperref/nameref.sty
+++ b/Master/texmf-dist/tex/latex/hyperref/nameref.sty
@@ -173,7 +173,7 @@
                     \csname beamer@#1\endcsname
     \begingroup
       \edef\x{\endgroup
-        \long\def\expandafter\noexpand\csname beamer@#1\endcsname[####1]{%
+        \long\def\expandafter\noexpand\csname beamer@#1\endcsname[####1]{% hash-ok
           \def\noexpand\@currentlabelname{####1}%
           \expandafter\noexpand\csname NRorg@beamer@#1\endcsname[{####1}]%
         }%
diff --git a/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty b/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty
index 3827b9bc120..8008fac2f1d 100644
--- a/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty
+++ b/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty
@@ -23,7 +23,7 @@
 %%
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{nohyperref}
-  [2007/05/29 v6.76g
+  [2007/06/14 v6.76i
   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 f6936acef60..b303058e896 100644
--- a/Master/texmf-dist/tex/latex/hyperref/pd1enc.def
+++ b/Master/texmf-dist/tex/latex/hyperref/pd1enc.def
@@ -22,7 +22,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{pd1enc.def}
-  [2007/05/29 v6.76g
+  [2007/06/14 v6.76i
   Hyperref: PDFDocEncoding definition (HO)]
 \DeclareFontEncoding{PD1}{}{}
 \DeclareTextCommand{\textLF}{PD1}{\012} % line feed
diff --git a/Master/texmf-dist/tex/latex/hyperref/pdfmark.def b/Master/texmf-dist/tex/latex/hyperref/pdfmark.def
index 413cd24ae97..dcb307d2f3b 100644
--- a/Master/texmf-dist/tex/latex/hyperref/pdfmark.def
+++ b/Master/texmf-dist/tex/latex/hyperref/pdfmark.def
@@ -22,7 +22,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{pdfmark.def}
-  [2007/05/29 v6.76g
+  [2007/06/14 v6.76i
   Hyperref definitions for pdfmark specials]
 \def\Hy@PutCatalog#1{%
   \pdfmark{pdfmark=/PUT,Raw={\string{Catalog\string} << #1 >>}}%
@@ -469,7 +469,7 @@
   \edef\Hy@temp{#1}%
   \ifx\Hy@temp\@empty
   \else
-    \pdf@addtoks{[#1]\Hy@BorderArrayPatch}{Border}%
+    \pdf@addtoks{[#1]\Hy@BorderArrayPatch}{Border}% hash-ok
   \fi
 }
 \let\Hy@BorderArrayPatch\@empty
@@ -483,12 +483,12 @@
 \define@key{PDF}{Color}{%
   \ifx\relax#1\relax
   \else
-    \pdf@addtoks{[#1]}{Color}%
+    \pdf@addtoks{[#1]}{Color}% hash-ok
   \fi
 }
 \define@key{PDF}{Contents}{\pdf@addtoks{(#1)}{Contents}}
 \define@key{PDF}{Count}{\pdf@addtoks{#1}{Count}}
-\define@key{PDF}{CropBox}{\pdf@addtoks{[#1]}{CropBox}}
+\define@key{PDF}{CropBox}{\pdf@addtoks{[#1]}{CropBox}}% hash-ok
 \define@key{PDF}{DOSFile}{\pdf@addtoks{(#1)}{DOSFile}}
 \define@key{PDF}{DataSource}{\pdf@addtoks{(#1)}{DataSource}}
 \define@key{PDF}{Dest}{%
@@ -520,7 +520,7 @@
     \pdf@addtoks{#1}{H}%
   \fi
 }
-\define@key{PDF}{ID}{\pdf@addtoks{[#1]}{ID}}
+\define@key{PDF}{ID}{\pdf@addtoks{[#1]}{ID}}% hash-ok
 \define@key{PDF}{MacFile}{\pdf@addtoks{(#1)}{MacFile}}
 \define@key{PDF}{ModDate}{\pdf@addtoks{(#1)}{ModDate}}
 \define@key{PDF}{Op}{\pdf@addtoks{(#1)}{Op}}
@@ -528,13 +528,13 @@
 \define@key{PDF}{Page}{\pdf@addtoks{#1}{Page}}
 \define@key{PDF}{PageMode}{\pdf@addtoks{#1}{PageMode}}
 \define@key{PDF}{Params}{\pdf@addtoks{(#1)}{Params}}
-\define@key{PDF}{Rect}{\pdf@addtoks{[#1]}{Rect}}
+\define@key{PDF}{Rect}{\pdf@addtoks{[#1]}{Rect}}% hash-ok
 \define@key{PDF}{SrcPg}{\pdf@addtoks{#1}{SrcPg}}
 \define@key{PDF}{Subtype}{\pdf@addtoks{#1}{Subtype}}
 \define@key{PDF}{Title}{\pdf@addtoks{(#1)}{Title}}
 \define@key{PDF}{Unix}{\pdf@addtoks{(#1)}{Unix}}
 \define@key{PDF}{UnixFile}{\pdf@addtoks{(#1)}{UnixFile}}
-\define@key{PDF}{View}{\pdf@addtoks{[#1]}{View}}
+\define@key{PDF}{View}{\pdf@addtoks{[#1]}{View}}% hash-ok
 \define@key{PDF}{WinFile}{\pdf@addtoks{(#1)}{WinFile}}
 \define@key{PDF}{Author}{\pdf@addtoks{(#1)}{Author}}
 \define@key{PDF}{Creator}{\pdf@addtoks{(#1)}{Creator}}
@@ -1374,7 +1374,7 @@
   \begingroup
     \escapechar=`\\%
     \let\escapechar\@gobble %
-    \def\@@BOOKMARK [##1][##2]##3##4##5{\calc@bm@number{##5}}%
+    \def\@@BOOKMARK[##1][##2]##3##4##5{\calc@bm@number{##5}}%
     \InputIfFileExists{\jobname.out}{}{}%
     \ifx\WriteBookmarks\relax
       \global\let\WriteBookmarks\relax
diff --git a/Master/texmf-dist/tex/latex/hyperref/puarenc.def b/Master/texmf-dist/tex/latex/hyperref/puarenc.def
index e5ee7a7d838..e4da5bce854 100644
--- a/Master/texmf-dist/tex/latex/hyperref/puarenc.def
+++ b/Master/texmf-dist/tex/latex/hyperref/puarenc.def
@@ -22,7 +22,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{puarenc.def}
-  [2007/05/29 v6.76g
+  [2007/06/14 v6.76i
   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 ccbb58f6021..f32a6b14fe6 100644
--- a/Master/texmf-dist/tex/latex/hyperref/puenc.def
+++ b/Master/texmf-dist/tex/latex/hyperref/puenc.def
@@ -22,7 +22,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{puenc.def}
-  [2007/05/29 v6.76g
+  [2007/06/14 v6.76i
   Hyperref: PDF Unicode definition (HO)]
 \DeclareFontEncoding{PU}{}{}
 \DeclareTextCommand{\textLF}{PU}{\80\012} % line feed
diff --git a/Master/texmf-dist/tex/latex/hyperref/puvnenc.def b/Master/texmf-dist/tex/latex/hyperref/puvnenc.def
index cf63bbbfaf1..51f54824aa3 100644
--- a/Master/texmf-dist/tex/latex/hyperref/puvnenc.def
+++ b/Master/texmf-dist/tex/latex/hyperref/puvnenc.def
@@ -22,7 +22,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{puvnenc.def}
-  [2007/05/29 v6.76g
+  [2007/06/14 v6.76i
   Hyperref: Additions to puenc.def for VnTeX]
 \DeclareTextCommand{\abreve}{PU}{\81\003}
 \DeclareTextCommand{\acircumflex}{PU}{\80\342}