hyperref update (30mar10)

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

1 files changed, 77 insertions, 22 deletions

diff --git a/Master/texmf-dist/tex/latex/hyperref/hxetex.def b/Master/texmf-dist/tex/latex/hyperref/hxetex.def
index 496aaf12074..bf43bdc7a84 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}
-  [2010/03/19 v6.80r
+  [2010/03/30 v6.80u
   Hyperref driver for XeTeX]
 \HyPsd@LoadUnicode
 \Hy@unicodetrue
@@ -57,10 +57,10 @@
     \ifx\HyPsd@temp\HyPsd@pdfencoding@auto
       \let\HyPsd@pdfencoding\HyPsd@temp
     \else
-      \HyWarning{%
-        XeTeX driver only supports `pdfencoding=unicode|auto.%
-        \MessageBreak
-        Ignoring option setting `pdfencoding=\HyPsd@temp'%
+      \Hy@Warning{%
+        XeTeX driver only supports\MessageBreak
+        `pdfencoding=unicode|auto'. Ignoring option\MessageBreak
+        setting `pdfencoding=\HyPsd@temp'%
       }%
     \fi
   \fi
@@ -78,7 +78,7 @@
       \endgroup
     \fi
   }%
-  \AfterBeginDocument{%
+  \Hy@AtBeginDocument{%
     \if@filesw
       \immediate\write\@mainaux{%
         \string\providecommand\string*\string\HyPL@Entry[1]{}%
@@ -156,7 +156,7 @@
     \let#1\Hy@gtemp
   }%
 \fi
-\AtBeginDocument{%
+\Hy@AtBeginDocument{%
   \ifHy@setpagesize
     \expandafter\@firstofone
   \else
@@ -356,7 +356,7 @@
       }%
     }%
   }%
-  \AtBeginDocument{%
+  \Hy@AtBeginDocument{%
     \def\Hy@colorlink#1{%
       \begingroup
         \ifHy@ocgcolorlinks
@@ -1376,6 +1376,7 @@
       \fi
       \HyPsd@XeTeXBigCharstrue
       \pdfstringdef\Hy@tempa{#2}%
+      \HyPsd@SanitizeForOutFile\Hy@tempa
       \if@filesw
         \stepcounter{bookmark@seq@number}%
         \@ifundefined{@outlinefile}{%
@@ -1392,6 +1393,55 @@
   \endgroup
 }
 \newcounter{bookmark@seq@number}
+\begingroup
+  \lccode`(=`{%
+  \lccode`)=`}%
+  \lccode`1=\z@
+  \lccode`2=\z@
+  \lccode`3=\z@
+  \lccode`5=\z@
+  \lccode`7=\z@
+  \lccode`\#=\z@
+  \lccode`\`=\z@
+  \lccode`\{=\z@
+  \lccode`\}=\z@
+\lowercase{%
+  \endgroup
+  \def\HyPsd@SanitizeForOutFile#1{%
+    \@onelevel@sanitize\Hy@tempa
+    \escapechar`\\%
+    \edef\Hy@tempa{%
+      \expandafter\HyPsd@SanitizeOut@BraceLeft\Hy@tempa(\@nil
+    }%
+    \edef\Hy@tempa{%
+      \expandafter\HyPsd@SanitizeOut@BraceRight\Hy@tempa)\@nil
+    }%
+  }%
+  \def\HyPsd@SanitizeOut@BraceLeft#1(#2\@nil{%
+    #1%
+    \ifx\\#2\\%
+      \expandafter\ltx@gobble
+    \else
+      \expandafter\ltx@firstofone
+    \fi
+    {%
+      \string\173%
+      \HyPsd@SanitizeOut@BraceLeft#2\@nil
+    }%
+  }%
+  \def\HyPsd@SanitizeOut@BraceRight#1)#2\@nil{%
+    #1%
+    \ifx\\#2\\%
+      \expandafter\ltx@gobble
+    \else
+      \expandafter\ltx@firstofone
+    \fi
+    {%
+      \string\175%
+      \HyPsd@SanitizeOut@BraceRight#2\@nil
+    }%
+  }%
+}
 \newcommand{\currentpdfbookmark}{%
   \pdfbookmark[\Hy@currentbookmarklevel]%
 }
@@ -1428,6 +1478,17 @@
 }
 \def\ReadBookmarks{%
   \begingroup
+    \def\do##1{%
+      \ifnum\catcode`##1=\active
+        \@makeother##1%
+      \else
+        \ifnum\catcode`##1=6 %
+          \@makeother##1%
+        \fi
+      \fi
+    }%
+    \dospecials
+    \Hy@safe@activestrue
     \escapechar=`\\%
     \let\escapechar\@gobble %
     \def\@@BOOKMARK[##1][##2]##3##4##5{%
@@ -1459,8 +1520,8 @@
       }%
    }%
    {%
-    \def\WriteBookmarks{0}%
-    \InputIfFileExists{\jobname.out}{}{}%
+     \def\WriteBookmarks{0}%
+     \InputIfFileExists{\jobname.out}{}{}%
    }%
    %{\escapechar\m@ne\InputIfFileExists{\jobname.out}{}{}}%
    \ifx\WriteBookmarks\relax
@@ -1510,8 +1571,7 @@
 }
 \let\H@old@ssect\@ssect
 \def\@ssect#1#2#3#4#5{%
-  \Hy@GlobalStepCount\Hy@linkcounter
-  \xdef\@currentHref{section*.\the\Hy@linkcounter}%
+  \Hy@MakeCurrentHrefAuto{section*}%
   \setlength{\Hy@SectionHShift}{#1}%
   \begingroup
     \toks@{\H@old@ssect{#1}{#2}{#3}{#4}}%
@@ -1527,8 +1587,7 @@
 \def\@schapter#1{%
   \begingroup
     \let\@mkboth\@gobbletwo
-    \Hy@GlobalStepCount\Hy@linkcounter
-    \xdef\@currentHref{\Hy@chapapp*.\the\Hy@linkcounter}%
+    \Hy@MakeCurrentHrefAuto{\Hy@chapapp*}%
     \Hy@raisedlink{%
       \hyper@anchorstart{\@currentHref}\hyper@anchorend
     }%
@@ -1539,8 +1598,7 @@
   \let\Hy@org@chapter\@chapter
   \def\@chapter{%
     \def\Hy@next{%
-      \Hy@GlobalStepCount\Hy@linkcounter
-      \xdef\@currentHref{\Hy@chapapp*.\the\Hy@linkcounter}%
+      \Hy@MakeCurrentHrefAuto{\Hy@chapapp*}%
       \Hy@raisedlink{%
         \hyper@anchorstart{\@currentHref}\hyper@anchorend
       }%
@@ -1570,8 +1628,7 @@
 }
 \let\H@old@spart\@spart
 \def\@spart#1{%
-  \Hy@GlobalStepCount\Hy@linkcounter
-  \xdef\@currentHref{part*.\the\Hy@linkcounter}%
+  \Hy@MakeCurrentHrefAuto{part*}%
   \Hy@raisedlink{%
     \hyper@anchorstart{\@currentHref}\hyper@anchorend
   }%
@@ -1585,8 +1642,7 @@
     \expandafter\@secondoftwo
   \fi
   {%
-    \Hy@GlobalStepCount\Hy@linkcounter
-    \xdef\@currentHref{section*.\the\Hy@linkcounter}%
+    \Hy@MakeCurrentHrefAuto{section*}%
     \setlength{\Hy@SectionHShift}{#3}%
     \begingroup
       \toks@{\H@old@sect{#1}{#2}{#3}{#4}{#5}{#6}[{#7}]}%
@@ -1620,8 +1676,7 @@
     \fi
     \addtocontents{lof}{\protect\addvspace{10\p@}}%
     \addtocontents{lot}{\protect\addvspace{10\p@}}%
-    \Hy@GlobalStepCount\Hy@linkcounter
-    \xdef\@currentHref{\Hy@chapapp*.\the\Hy@linkcounter}%
+    \Hy@MakeCurrentHrefAuto{\Hy@chapapp*}%
     \Hy@raisedlink{%
       \hyper@anchorstart{\@currentHref}\hyper@anchorend
     }%