hyperref update (14mar10)

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

27 files changed, 144 insertions, 61 deletions

diff --git a/Master/texmf-dist/doc/latex/hyperref/ChangeLog b/Master/texmf-dist/doc/latex/hyperref/ChangeLog
index a2b36be2f2e..d8a4cbcb0e3 100644
--- a/Master/texmf-dist/doc/latex/hyperref/ChangeLog
+++ b/Master/texmf-dist/doc/latex/hyperref/ChangeLog
@@ -1,3 +1,14 @@
+2010-03-16  6.80p  Heiko Oberdiek
+    * 6.80p
+    * Bookmark output for \CJKnumber fixed.
+    * Bookmark implementation of \CJKnumber changed.
+      \CJK@one is suppressed before \CJK@ten, if the
+      number starts with this.
+
+2010-03-13  6.80o  Heiko Oberdiek
+    * 6.80o
+    * Typo fixed in CJK bookmark code (Jinsong Zhao).
+
 2010-03-11  6.80n  Heiko Oberdiek
     * 6.80n: \undefined relaced by \@undefined.
     * backref 1.35: \undefined replaced by \@undefined.
diff --git a/Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf b/Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf
index 8a3e95a4888..003afb98a80 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/backref.pdf b/Master/texmf-dist/doc/latex/hyperref/backref.pdf
index 3baecfa74fd..b12ea6dd9bb 100644
--- a/Master/texmf-dist/doc/latex/hyperref/backref.pdf
+++ b/Master/texmf-dist/doc/latex/hyperref/backref.pdf
@@ -10,7 +10,7 @@ endobj
 endobj
 5 0 obj<</D[13 0 R/FitBH 752.95145]/S/GoTo>>
 endobj
-6 0 obj<</ModDate(D:20100311105244+01'00')/Subject(Bibliographical back referencing)/Creator(LaTeX with hyperref package)/Author(David Carlisle and Sebastian Rahtz)/Trapped/False/Producer(pdfTeX-1.40.10)/CreationDate(D:20100311105244+01'00')/PTEX.Fullbanner(This is pdfTeX, Version 3.1415926-1.40.10-2.2 (TeX Live 2009) kpathsea version 5.0.0)/Title(Back referencing from bibliographical citations)>>
+6 0 obj<</ModDate(D:20100316183641+01'00')/Subject(Bibliographical back referencing)/Creator(LaTeX with hyperref package)/Author(David Carlisle and Sebastian Rahtz)/Trapped/False/Producer(pdfTeX-1.40.10)/CreationDate(D:20100316183641+01'00')/PTEX.Fullbanner(This is pdfTeX, Version 3.1415926-1.40.10-2.2 (TeX Live 2009) kpathsea version 5.0.0)/Title(Back referencing from bibliographical citations)>>
 endobj
 7 0 obj<</Type/Pages/Kids[13 0 R 14 0 R 15 0 R 16 0 R 17 0 R 18 0 R]/Parent 2 0 R/Count 6>>
 endobj
@@ -5384,7 +5384,7 @@ xref
 0000385083 00000 n 
 0000385122 00000 n 
 trailer
-<</Root 1 0 R/ID[(hJ�*����+�ΗJ)(<6�@ki�����jKb)]/Compress<</SpecO/1.4/LengthO 435517>>/Info 6 0 R/Size 1478>>
+<</Root 1 0 R/ID[(e����#�=���;o�)(K'	*	�%3:G�9=<)]/Compress<</SpecO/1.4/LengthO 435517>>/Info 6 0 R/Size 1478>>
 startxref
 385161
 %%EOF
diff --git a/Master/texmf-dist/doc/latex/hyperref/hyperref.pdf b/Master/texmf-dist/doc/latex/hyperref/hyperref.pdf
index 7418a39b433..8ef61f1b561 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/doc/latex/hyperref/nameref.pdf b/Master/texmf-dist/doc/latex/hyperref/nameref.pdf
index 6d722e4ef47..7786cd77d15 100644
--- a/Master/texmf-dist/doc/latex/hyperref/nameref.pdf
+++ b/Master/texmf-dist/doc/latex/hyperref/nameref.pdf
@@ -10,7 +10,7 @@ endobj
 endobj
 5 0 obj<</D[12 0 R/FitBH 752.95145]/S/GoTo>>
 endobj
-6 0 obj<</ModDate(D:20100311105250+01'00')/Subject(Cross-referencing by name of section)/Creator(LaTeX with hyperref package)/Author(Sebastian Rahtz)/Trapped/False/Producer(pdfTeX-1.40.10)/CreationDate(D:20100311105250+01'00')/PTEX.Fullbanner(This is pdfTeX, Version 3.1415926-1.40.10-2.2 (TeX Live 2009) kpathsea version 5.0.0)/Title(Section name references in LaTeX)>>
+6 0 obj<</ModDate(D:20100316183659+01'00')/Subject(Cross-referencing by name of section)/Creator(LaTeX with hyperref package)/Author(Sebastian Rahtz)/Trapped/False/Producer(pdfTeX-1.40.10)/CreationDate(D:20100316183659+01'00')/PTEX.Fullbanner(This is pdfTeX, Version 3.1415926-1.40.10-2.2 (TeX Live 2009) kpathsea version 5.0.0)/Title(Section name references in LaTeX)>>
 endobj
 7 0 obj<</Type/Pages/Kids[12 0 R 13 0 R 14 0 R 15 0 R 16 0 R 17 0 R]/Parent 2 0 R/Count 6>>
 endobj
@@ -4539,8 +4539,7 @@ xref
 0000348616 00000 n 
 0000348655 00000 n 
 trailer
-<</Root 1 0 R/ID[(��9��Q�_<�\r
-}�5'u?�)]/Compress<</SpecO/1.4/LengthO 388932>>/Info 6 0 R/Size 1202>>
+<</Root 1 0 R/ID[(��VJ�m
 startxref
 348694
 %%EOF
diff --git a/Master/texmf-dist/source/latex/hyperref/hyperref.dtx b/Master/texmf-dist/source/latex/hyperref/hyperref.dtx
index 5373466dbe9..f9095185175 100644
--- a/Master/texmf-dist/source/latex/hyperref/hyperref.dtx
+++ b/Master/texmf-dist/source/latex/hyperref/hyperref.dtx
@@ -44,7 +44,7 @@
 %<puenc>\ProvidesFile{puenc.def}
 %<puvnenc>\ProvidesFile{puvnenc.def}
 %<puarenc>\ProvidesFile{puarenc.def}
-%<!none>  [2010/03/11 v6.80n
+%<!none>  [2010/03/16 v6.80p
 %<package>  Hypertext links for LaTeX]
 %<nohyperref>  Dummy hyperref (SR)]
 %<driver>  Hyperref documentation driver file]
@@ -126,7 +126,7 @@
 \end{document}
 %</driver>
 % \fi
-% \CheckSum{26245}
+% \CheckSum{26760}
 %
 % \MakeShortVerb{|}
 % \StopEventually{}
@@ -2281,7 +2281,7 @@
     \let\CJKkern\relax
     \let\CJK@CJK\relax
     \ifHy@CJKbookmarks
-      \HyPsd@@CJKhook@bookmarks
+      \HyPsd@CJKhook@bookmarks
     \fi
     \HyPsd@CJKhook@unicode
   }{}%
@@ -2415,7 +2415,7 @@
 \def\HyPsd@CJK@Unicode#1#2{%
   \ifnum#1<256 %
     \HyPsd@DecimalToOctalFirst{#1}%
-    \HyPsd@DecimalToOctal{#2}%
+    \HyPsd@DecimalToOctalSecond{#2}%
   \else
     \933%
     \expandafter\expandafter\expandafter\HyPsd@HighA
@@ -2424,7 +2424,7 @@
     \ifcase\intcalcMod{#1}{4} %
       4\or 5\or 6\or 7%
     \fi
-    \HyPsd@DecimalToOctal{#2}%
+    \HyPsd@DecimalToOctalSecond{#2}%
   \fi
 }
 %    \end{macrocode}
@@ -2490,6 +2490,42 @@
     \or 370\or 371\or 372\or 373\or 374\or 375\or 376\or 377%
   \fi
 }
+\def\HyPsd@DecimalToOctalSecond#1{%
+  \ifcase #1 %
+        \000\or \001\or \002\or \003\or \004\or \005\or \006\or \007%
+    \or \010\or \011\or \012\or \013\or \014\or \015\or \016\or \017%
+    \or \020\or \021\or \022\or \023\or \024\or \025\or \026\or \027%
+    \or \030\or \031\or \032\or \033\or \034\or \035\or \036\or \037%
+    \or \040\or \041\or \042\or \043\or \044\or \045\or \046\or \047%
+    \or \050\or \051\or \052\or \053\or \054\or \055\or \056\or \057%
+    \or \060\or \061\or \062\or \063\or \064\or \065\or \066\or \067%
+    \or \070\or \071\or \072\or \073\or \074\or \075\or \076\or \077%
+    \or \100\or \101\or \102\or \103\or \104\or \105\or \106\or \107%
+    \or \110\or \111\or \112\or \113\or \114\or \115\or \116\or \117%
+    \or \120\or \121\or \122\or \123\or \124\or \125\or \126\or \127%
+    \or \130\or \131\or \132\or \133\or \134\or \135\or \136\or \137%
+    \or \140\or \141\or \142\or \143\or \144\or \145\or \146\or \147%
+    \or \150\or \151\or \152\or \153\or \154\or \155\or \156\or \157%
+    \or \160\or \161\or \162\or \163\or \164\or \165\or \166\or \167%
+    \or \170\or \171\or \172\or \173\or \174\or \175\or \176\or \177%
+    \or \200\or \201\or \202\or \203\or \204\or \205\or \206\or \207%
+    \or \210\or \211\or \212\or \213\or \214\or \215\or \216\or \217%
+    \or \220\or \221\or \222\or \223\or \224\or \225\or \226\or \227%
+    \or \230\or \231\or \232\or \233\or \234\or \235\or \236\or \237%
+    \or \240\or \241\or \242\or \243\or \244\or \245\or \246\or \247%
+    \or \250\or \251\or \252\or \253\or \254\or \255\or \256\or \257%
+    \or \260\or \261\or \262\or \263\or \264\or \265\or \266\or \267%
+    \or \270\or \271\or \272\or \273\or \274\or \275\or \276\or \277%
+    \or \300\or \301\or \302\or \303\or \304\or \305\or \306\or \307%
+    \or \310\or \311\or \312\or \313\or \314\or \315\or \316\or \317%
+    \or \320\or \321\or \322\or \323\or \324\or \325\or \326\or \327%
+    \or \330\or \331\or \332\or \333\or \334\or \335\or \336\or \337%
+    \or \340\or \341\or \342\or \343\or \344\or \345\or \346\or \347%
+    \or \350\or \351\or \352\or \353\or \354\or \355\or \356\or \357%
+    \or \360\or \361\or \362\or \363\or \364\or \365\or \366\or \367%
+    \or \370\or \371\or \372\or \373\or \374\or \375\or \376\or \377%
+  \fi
+}
 %    \end{macrocode}
 %    \begin{macrocode}
 \def\HyPsd@CJKnumber#1{%
@@ -2510,17 +2546,17 @@
     \CJK@ten\CJK@nine
   \else
     \ifnum#1<10000 %
-      \HyPsd@CJKnumberFour#1!\@empty
+      \HyPsd@CJKnumberFour#1!\@empty{20}%
       \@empty
     \else
       \ifnum#1<100000000 %
         \expandafter\expandafter\expandafter\HyPsd@CJKnumberFour
           \IntCalcDiv#1!10000!%
-        !{}%
+        !{}{20}%
         \CJK@tenthousand
         \expandafter\expandafter\expandafter\HyPsd@CJKnumberFour
           \IntCalcMod#1!10000!%
-        !\CJK@zero
+        !\CJK@zero{10}%
         \@empty
       \else
         \expandafter\HyPsd@CJKnumberLarge
@@ -2531,55 +2567,55 @@
   \fi
 }
 \def\HyPsd@CJKnumberLarge#1!#2!{%
-  \HyPsd@CJKnumberFour#1!{}%
+  \HyPsd@CJKnumberFour#1!{}{20}%
   \CJK@hundredmillion
   \ifnum#2=\z@
   \else
     \expandafter\expandafter\expandafter\HyPsd@CJKnumberFour
       \IntCalcDiv#2!10000!%
-    !\CJK@zero
+    !\CJK@zero{10}%
     \CJK@tenthousand
     \expandafter\expandafter\expandafter\HyPsd@CJKnumberFour
       \IntCalcMod#2!10000!%
-    !\CJK@zero
+    !\CJK@zero{10}%
     \@empty
   \fi
 }
-\def\HyPsd@CJKnumberFour#1!#2{%
+\def\HyPsd@CJKnumberFour#1!#2#3{%
   \ifnum#1=\z@
     \expandafter\@gobble
   \else
     \ifnum#1<1000 %
       #2%
-      \HyPsd@CJKnumberThree#1!{}%
+      \HyPsd@CJKnumberThree#1!{}{#3}%
     \else
       \HyPsd@@CJKnumber{\IntCalcDiv#1!1000!}%
       \CJK@thousand
       \expandafter\expandafter\expandafter\HyPsd@CJKnumberThree
         \IntCalcMod#1!1000!%
-      !\CJK@zero
+      !\CJK@zero{10}%
     \fi
   \fi
 }
-\def\HyPsd@CJKnumberThree#1!#2{%
+\def\HyPsd@CJKnumberThree#1!#2#3{%
   \ifnum#1=\z@
   \else
     \ifnum#1<100 %
       #2%
-      \HyPsd@CJKnumberTwo#1!{}%
+      \HyPsd@CJKnumberTwo#1!{}{#3}%
     \else
       \HyPsd@@CJKnumber{\IntCalcDiv#1!100!}%
       \CJK@hundred
       \expandafter\expandafter\expandafter\HyPsd@CJKnumberTwo
         \IntCalcMod#1!100!%
-      !\CJK@zero
+      !\CJK@zero{10}%
     \fi
   \fi
 }
-\def\HyPsd@CJKnumberTwo#1!#2{%
+\def\HyPsd@CJKnumberTwo#1!#2#3{%
   \ifnum#1=\z@
   \else
-    \ifnum#1<10 %
+    \ifnum#1<#3 %
       #2%
       \HyPsd@@CJKnumber{#1}%
     \else
diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def b/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def
index b014e24b316..83d208f2e42 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}
-  [2010/03/11 v6.80n
+  [2010/03/16 v6.80p
   Hyperref driver for dvipdfm]
 \def\Hy@PutCatalog#1{\@pdfm@mark{docview << #1 >>}}
 \ifHy@pagelabels
diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvips.def b/Master/texmf-dist/tex/latex/hyperref/hdvips.def
index c445a838f88..70d6d8d2546 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}
-  [2010/03/11 v6.80n
+  [2010/03/16 v6.80p
   Hyperref driver for dvips]
 \providecommand*{\XR@ext}{pdf}
 \def\Hy@raisedlink{}
diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvipson.def b/Master/texmf-dist/tex/latex/hyperref/hdvipson.def
index aea743d6466..55a7a9c8b17 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}
-  [2010/03/11 v6.80n
+  [2010/03/16 v6.80p
   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 0fc4b41eb86..d02b4ba6a1b 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}
-  [2010/03/11 v6.80n
+  [2010/03/16 v6.80p
   Hyperref driver for dviwindo]
 \begingroup
   \@ifundefined{headerps@out}{}{%
diff --git a/Master/texmf-dist/tex/latex/hyperref/hpdftex.def b/Master/texmf-dist/tex/latex/hyperref/hpdftex.def
index 37aaabe3700..325466135ff 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}
-  [2010/03/11 v6.80n
+  [2010/03/16 v6.80p
   Hyperref driver for pdfTeX]
 \let\Hy@PutCatalog\pdfcatalog
 \ifHy@pagelabels
diff --git a/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg b/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg
index fdd9495e2bd..140fe952c03 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}
-  [2010/03/11 v6.80n
+  [2010/03/16 v6.80p
   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 04678f0cdb3..566e1c14aaa 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}
-  [2010/03/11 v6.80n
+  [2010/03/16 v6.80p
   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 cdaddeae432..95caf024fa8 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}
-  [2010/03/11 v6.80n
+  [2010/03/16 v6.80p
   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 988f7e075bc..543ff7fe881 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}
-  [2010/03/11 v6.80n
+  [2010/03/16 v6.80p
   Hyperref driver for VTeX in PDF/PS mode]
 \providecommand*{\XR@ext}{pdf}
 \edef\Hy@VTeXversion{%
diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def b/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def
index f1a42d26fdc..0116422e7b1 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}
-  [2010/03/11 v6.80n
+  [2010/03/16 v6.80p
   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 df7ac9e0856..19fcd71e4a6 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}
-  [2010/03/11 v6.80n
+  [2010/03/16 v6.80p
  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/hxetex.def b/Master/texmf-dist/tex/latex/hyperref/hxetex.def
index e47c3f08695..509ce01fdb0 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/11 v6.80n
+  [2010/03/16 v6.80p
   Hyperref driver for XeTeX]
 \HyPsd@LoadUnicode
 \Hy@unicodetrue
diff --git a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty
index 348144e159d..13f830f7067 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}
 \ProvidesPackage{hyperref}
-  [2010/03/11 v6.80n
+  [2010/03/16 v6.80p
   Hypertext links for LaTeX]
 \begingroup
   \@makeother\`%
@@ -950,7 +950,7 @@
     \let\CJKkern\relax
     \let\CJK@CJK\relax
     \ifHy@CJKbookmarks
-      \HyPsd@@CJKhook@bookmarks
+      \HyPsd@CJKhook@bookmarks
     \fi
     \HyPsd@CJKhook@unicode
   }{}%
@@ -1040,7 +1040,7 @@
 \def\HyPsd@CJK@Unicode#1#2{%
   \ifnum#1<256 %
     \HyPsd@DecimalToOctalFirst{#1}%
-    \HyPsd@DecimalToOctal{#2}%
+    \HyPsd@DecimalToOctalSecond{#2}%
   \else
     \933%
     \expandafter\expandafter\expandafter\HyPsd@HighA
@@ -1049,7 +1049,7 @@
     \ifcase\intcalcMod{#1}{4} %
       4\or 5\or 6\or 7%
     \fi
-    \HyPsd@DecimalToOctal{#2}%
+    \HyPsd@DecimalToOctalSecond{#2}%
   \fi
 }
 \def\HyPsd@HighA#1!{%
@@ -1112,6 +1112,42 @@
     \or 370\or 371\or 372\or 373\or 374\or 375\or 376\or 377%
   \fi
 }
+\def\HyPsd@DecimalToOctalSecond#1{%
+  \ifcase #1 %
+        \000\or \001\or \002\or \003\or \004\or \005\or \006\or \007%
+    \or \010\or \011\or \012\or \013\or \014\or \015\or \016\or \017%
+    \or \020\or \021\or \022\or \023\or \024\or \025\or \026\or \027%
+    \or \030\or \031\or \032\or \033\or \034\or \035\or \036\or \037%
+    \or \040\or \041\or \042\or \043\or \044\or \045\or \046\or \047%
+    \or \050\or \051\or \052\or \053\or \054\or \055\or \056\or \057%
+    \or \060\or \061\or \062\or \063\or \064\or \065\or \066\or \067%
+    \or \070\or \071\or \072\or \073\or \074\or \075\or \076\or \077%
+    \or \100\or \101\or \102\or \103\or \104\or \105\or \106\or \107%
+    \or \110\or \111\or \112\or \113\or \114\or \115\or \116\or \117%
+    \or \120\or \121\or \122\or \123\or \124\or \125\or \126\or \127%
+    \or \130\or \131\or \132\or \133\or \134\or \135\or \136\or \137%
+    \or \140\or \141\or \142\or \143\or \144\or \145\or \146\or \147%
+    \or \150\or \151\or \152\or \153\or \154\or \155\or \156\or \157%
+    \or \160\or \161\or \162\or \163\or \164\or \165\or \166\or \167%
+    \or \170\or \171\or \172\or \173\or \174\or \175\or \176\or \177%
+    \or \200\or \201\or \202\or \203\or \204\or \205\or \206\or \207%
+    \or \210\or \211\or \212\or \213\or \214\or \215\or \216\or \217%
+    \or \220\or \221\or \222\or \223\or \224\or \225\or \226\or \227%
+    \or \230\or \231\or \232\or \233\or \234\or \235\or \236\or \237%
+    \or \240\or \241\or \242\or \243\or \244\or \245\or \246\or \247%
+    \or \250\or \251\or \252\or \253\or \254\or \255\or \256\or \257%
+    \or \260\or \261\or \262\or \263\or \264\or \265\or \266\or \267%
+    \or \270\or \271\or \272\or \273\or \274\or \275\or \276\or \277%
+    \or \300\or \301\or \302\or \303\or \304\or \305\or \306\or \307%
+    \or \310\or \311\or \312\or \313\or \314\or \315\or \316\or \317%
+    \or \320\or \321\or \322\or \323\or \324\or \325\or \326\or \327%
+    \or \330\or \331\or \332\or \333\or \334\or \335\or \336\or \337%
+    \or \340\or \341\or \342\or \343\or \344\or \345\or \346\or \347%
+    \or \350\or \351\or \352\or \353\or \354\or \355\or \356\or \357%
+    \or \360\or \361\or \362\or \363\or \364\or \365\or \366\or \367%
+    \or \370\or \371\or \372\or \373\or \374\or \375\or \376\or \377%
+  \fi
+}
 \def\HyPsd@CJKnumber#1{%
   \ifnum#1<\z@
     \CJK@minus
@@ -1130,17 +1166,17 @@
     \CJK@ten\CJK@nine
   \else
     \ifnum#1<10000 %
-      \HyPsd@CJKnumberFour#1!\@empty
+      \HyPsd@CJKnumberFour#1!\@empty{20}%
       \@empty
     \else
       \ifnum#1<100000000 %
         \expandafter\expandafter\expandafter\HyPsd@CJKnumberFour
           \IntCalcDiv#1!10000!%
-        !{}%
+        !{}{20}%
         \CJK@tenthousand
         \expandafter\expandafter\expandafter\HyPsd@CJKnumberFour
           \IntCalcMod#1!10000!%
-        !\CJK@zero
+        !\CJK@zero{10}%
         \@empty
       \else
         \expandafter\HyPsd@CJKnumberLarge
@@ -1151,55 +1187,55 @@
   \fi
 }
 \def\HyPsd@CJKnumberLarge#1!#2!{%
-  \HyPsd@CJKnumberFour#1!{}%
+  \HyPsd@CJKnumberFour#1!{}{20}%
   \CJK@hundredmillion
   \ifnum#2=\z@
   \else
     \expandafter\expandafter\expandafter\HyPsd@CJKnumberFour
       \IntCalcDiv#2!10000!%
-    !\CJK@zero
+    !\CJK@zero{10}%
     \CJK@tenthousand
     \expandafter\expandafter\expandafter\HyPsd@CJKnumberFour
       \IntCalcMod#2!10000!%
-    !\CJK@zero
+    !\CJK@zero{10}%
     \@empty
   \fi
 }
-\def\HyPsd@CJKnumberFour#1!#2{%
+\def\HyPsd@CJKnumberFour#1!#2#3{%
   \ifnum#1=\z@
     \expandafter\@gobble
   \else
     \ifnum#1<1000 %
       #2%
-      \HyPsd@CJKnumberThree#1!{}%
+      \HyPsd@CJKnumberThree#1!{}{#3}%
     \else
       \HyPsd@@CJKnumber{\IntCalcDiv#1!1000!}%
       \CJK@thousand
       \expandafter\expandafter\expandafter\HyPsd@CJKnumberThree
         \IntCalcMod#1!1000!%
-      !\CJK@zero
+      !\CJK@zero{10}%
     \fi
   \fi
 }
-\def\HyPsd@CJKnumberThree#1!#2{%
+\def\HyPsd@CJKnumberThree#1!#2#3{%
   \ifnum#1=\z@
   \else
     \ifnum#1<100 %
       #2%
-      \HyPsd@CJKnumberTwo#1!{}%
+      \HyPsd@CJKnumberTwo#1!{}{#3}%
     \else
       \HyPsd@@CJKnumber{\IntCalcDiv#1!100!}%
       \CJK@hundred
       \expandafter\expandafter\expandafter\HyPsd@CJKnumberTwo
         \IntCalcMod#1!100!%
-      !\CJK@zero
+      !\CJK@zero{10}%
     \fi
   \fi
 }
-\def\HyPsd@CJKnumberTwo#1!#2{%
+\def\HyPsd@CJKnumberTwo#1!#2#3{%
   \ifnum#1=\z@
   \else
-    \ifnum#1<10 %
+    \ifnum#1<#3 %
       #2%
       \HyPsd@@CJKnumber{#1}%
     \else
diff --git a/Master/texmf-dist/tex/latex/hyperref/hypertex.def b/Master/texmf-dist/tex/latex/hyperref/hypertex.def
index f2060397473..ce749e9a85d 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}
-  [2010/03/11 v6.80n
+  [2010/03/16 v6.80p
   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 1fd15a885a8..b66721c0761 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}
 \ProvidesPackage{nohyperref}
-  [2010/03/11 v6.80n
+  [2010/03/16 v6.80p
   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 928d3eb38d1..ece8fa28e50 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}
-  [2010/03/11 v6.80n
+  [2010/03/16 v6.80p
   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 57f51c280c9..a5523697460 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}
-  [2010/03/11 v6.80n
+  [2010/03/16 v6.80p
   Hyperref definitions for pdfmark specials]
 \begingroup
   \@ifundefined{headerps@out}{}{%
diff --git a/Master/texmf-dist/tex/latex/hyperref/puarenc.def b/Master/texmf-dist/tex/latex/hyperref/puarenc.def
index a960345e9cf..d5f91b50e88 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}
-  [2010/03/11 v6.80n
+  [2010/03/16 v6.80p
   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 1297a248070..69b1b61dc9f 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}
-  [2010/03/11 v6.80n
+  [2010/03/16 v6.80p
   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 8b5f0bae5c0..9a571e35288 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}
-  [2010/03/11 v6.80n
+  [2010/03/16 v6.80p
   Hyperref: Additions to puenc.def for VnTeX]
 \DeclareTextCommand{\abreve}{PU}{\81\003}
 \DeclareTextCommand{\acircumflex}{PU}{\80\342}
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 1e289a68736..87f18f46bee 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -91,6 +91,7 @@ $Master = "$mydir/../..";
  'babelbib',	"&MAKEcopy",
  'backgammon',	"die 'skipping, nonfree license'",
  'bangtex',	"&MAKEflatten",
+ 'bardi',	"die 'skipping, nonfree license'",
  'bardiag',	"&MAKEbardiag",
  'bbm-macros',	"&MAKEnosymlinks",
  'bclogo',	"&MAKEflatten",