diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex')
20 files changed, 248 insertions, 25 deletions
diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def b/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def index 0315d3caa82..22bd57a8144 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/04 v6.80k + [2010/03/09 v6.80l 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 87c0bf8f8b7..e2e565227f8 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/04 v6.80k + [2010/03/09 v6.80l 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 315a2d33b15..bf32781c4f7 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/04 v6.80k + [2010/03/09 v6.80l 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 694463ca14b..932aabefc36 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/04 v6.80k + [2010/03/09 v6.80l 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 b166c94242c..c1aa20cb7da 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/04 v6.80k + [2010/03/09 v6.80l 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 8692882176f..d25365784a8 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/04 v6.80k + [2010/03/09 v6.80l 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 7b25fd8d850..e6aea51cf3b 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/04 v6.80k + [2010/03/09 v6.80l 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 095327a594f..df7e7d0d114 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/04 v6.80k + [2010/03/09 v6.80l 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 7aafbf63ebb..71e215657b6 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/04 v6.80k + [2010/03/09 v6.80l 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 5c0e8902b63..c1774eab4c0 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/04 v6.80k + [2010/03/09 v6.80l 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 9056888c12d..39740bcbc63 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/04 v6.80k + [2010/03/09 v6.80l 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 f771fa8138a..336af716d62 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/04 v6.80k + [2010/03/09 v6.80l 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 331b3e661bc..a9b59303fb3 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/04 v6.80k + [2010/03/09 v6.80l Hypertext links for LaTeX] \begingroup \@makeother\`% @@ -375,9 +375,7 @@ \def\halign{\pdfstringdefWarn\halign\@gobble}% \let\ignorespaces\HyPsd@ignorespaces \let\Hy@SectionAnchorHref\@gobble - \ifHy@CJKbookmarks - \HyPsd@CJKhook - \fi + \HyPsd@CJKhook \Hy@pdfstringtrue \pdfstringdefPreHook \HyPsd@LetUnexpandableSpace\space @@ -944,6 +942,19 @@ \let\.\es@save@dot \fi } +\RequirePackage{intcalc}[2007/09/27] +\RequirePackage{ltxcmds}[2010/03/09] +\def\HyPsd@CJKhook{% + \ltx@ifpackageloaded{CJK}{% + \let\CJK@kern\relax + \let\CJKkern\relax + \let\CJK@CJK\relax + \ifHy@CJKbookmarks + \HyPsd@@CJKhook@bookmarks + \fi + \HyPsd@CJKhook@unicode + }{}% +} \begingroup \catcode"7F=\active \toks@{% @@ -973,7 +984,9 @@ }% }% \toks@\expandafter{\the\toks@ !}% - \xdef\HyPsd@CJKhook{\the\toks@}% + \xdef\HyPsd@CJKhook@bookmarks{% + \the\toks@ + }% \endgroup \def\HyPsd@CJKActiveChars#1{% \ifx#1!% @@ -1019,6 +1032,217 @@ \or \370\or \371\or \372\or \373\or \374\or \375\or \376\or \377% \fi } +\def\HyPsd@CJKhook@unicode{% + \let\Unicode\HyPsd@CJK@Unicode + \let\CJKnumber\HyPsd@CJKnumber + \let\CJKdigits\HyPsd@CJKdigits +} +\def\HyPsd@CJK@Unicode#1#2{% + \ifnum#1<256 % + \HyPsd@DecimalToOctalFirst{#1}% + \HyPsd@DecimalToOctal{#2}% + \else + \933% + \expandafter\expandafter\expandafter\HyPsd@HighA + \intcalcDiv{#1}{4}!% + \933% + \ifcase\intcalcMod{#1}{4} % + 4\or 5\or 6\or 7% + \fi + \HyPsd@DecimalToOctal{#2}% + \fi +} +\def\HyPsd@HighA#1!{% + \expandafter\expandafter\expandafter\HyPsd@HighB + \IntCalcDiv#1!64!!% + \expandafter\expandafter\expandafter\HyPsd@HighD + \IntCalcMod#1!64!!% +} +\def\HyPsd@HighB#1!{% + \expandafter\expandafter\expandafter\HyPsd@HighC + \IntCalcDec#1!!% +} +\def\HyPsd@HighC#1!{% + \IntCalcDiv#1!4!% + \@backslashchar + \IntCalcMod#1!4!% +} +\def\HyPsd@HighD#1!{% + \ifcase\IntCalcDiv#1!8! % + 0\or 1\or 2\or 3\or 4\or 5\or 6\or 7% + \fi + \ifcase\IntCalcMod#1!8! % + 0\or 1\or 2\or 3\or 4\or 5\or 6\or 7% + \fi +} +\def\HyPsd@DecimalToOctalFirst#1{% + \9% + \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 120\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 + \expandafter\HyPsd@@CJKnumber\expandafter{\number-\number#1}% + \else + \expandafter\HyPsd@@CJKnumber\expandafter{\number#1}% + \fi +} +\def\HyPsd@@CJKnumber#1{% + \ifcase#1 % + \CJK@zero\or\CJK@one\or\CJK@two\or\CJK@three\or\CJK@four\or + \CJK@five\or\CJK@six\or\CJK@seven\or\CJK@eight\or\CJK@nine\or + \CJK@ten\or\CJK@ten\CJK@one\or\CJK@ten\CJK@two\or + \CJK@ten\CJK@three\or\CJK@ten\CJK@four\or\CJK@ten\CJK@five\or + \CJK@ten\CJK@six\or\CJK@ten\CJK@seven\or\CJK@ten\CJK@eight\or + \CJK@ten\CJK@nine + \else + \ifnum#1<10000 % + \HyPsd@CJKnumberFour#1!\@empty + \@empty + \else + \ifnum#1<100000000 % + \expandafter\expandafter\expandafter\HyPsd@CJKnumberFour + \IntCalcDiv#1!10000!% + !{}% + \CJK@tenthousand + \expandafter\expandafter\expandafter\HyPsd@CJKnumberFour + \IntCalcMod#1!10000!% + !\CJK@zero + \@empty + \else + \expandafter\HyPsd@CJKnumberLarge + \number\IntCalcDiv#1!100000000!\expandafter!% + \number\IntCalcMod#1!100000000!!% + \fi + \fi + \fi +} +\def\HyPsd@CJKnumberLarge#1!#2!{% + \HyPsd@CJKnumberFour#1!{}% + \CJK@hundredmillion + \ifnum#2=\z@ + \else + \expandafter\expandafter\expandafter\HyPsd@CJKnumberFour + \IntCalcDiv#2!10000!% + !\CJK@zero + \CJK@tenthousand + \expandafter\expandafter\expandafter\HyPsd@CJKnumberFour + \IntCalcMod#2!10000!% + !\CJK@zero + \@empty + \fi +} +\def\HyPsd@CJKnumberFour#1!#2{% + \ifnum#1=\z@ + \expandafter\@gobble + \else + \ifnum#1<1000 % + #2% + \HyPsd@CJKnumberThree#1!{}% + \else + \HyPsd@@CJKnumber{\IntCalcDiv#1!1000!}% + \CJK@thousand + \expandafter\expandafter\expandafter\HyPsd@CJKnumberThree + \IntCalcMod#1!1000!% + !\CJK@zero + \fi + \fi +} +\def\HyPsd@CJKnumberThree#1!#2{% + \ifnum#1=\z@ + \else + \ifnum#1<100 % + #2% + \HyPsd@CJKnumberTwo#1!{}% + \else + \HyPsd@@CJKnumber{\IntCalcDiv#1!100!}% + \CJK@hundred + \expandafter\expandafter\expandafter\HyPsd@CJKnumberTwo + \IntCalcMod#1!100!% + !\CJK@zero + \fi + \fi +} +\def\HyPsd@CJKnumberTwo#1!#2{% + \ifnum#1=\z@ + \else + \ifnum#1<10 % + #2% + \HyPsd@@CJKnumber{#1}% + \else + \HyPsd@@CJKnumber{\IntCalcDiv#1!10!}% + \CJK@ten + \ifnum\IntCalcMod#1!10!=\z@ + \else + \HyPsd@@CJKnumber{\IntCalcMod#1!10!}% + \fi + \fi + \fi +} +\def\HyPsd@CJKdigits#1{% + \ifx*#1\relax + \expandafter\HyPsd@@CJKdigits\expandafter\CJK@zero + \else + \HyPsd@@CJKdigits\CJK@null{#1}% + \fi +} +\def\HyPsd@@CJKdigits#1#2{% + \ifx\\#2\\% + \else + \HyPsd@@@CJKdigits#1#2\@nil + \fi +}% +\def\HyPsd@@@CJKdigits#1#2#3\@nil{% + \HyPsd@CJKdigit#1{#2}% + \ifx\\#3\\% + \expandafter\@gobble + \else + \expandafter\@firstofone + \fi + {% + \HyPsd@@@CJKdigits#1#3\@nil + }% +} +\def\HyPsd@CJKdigit#1#2{% + \ifcase#2 % + #1\or + \CJK@one\or\CJK@two\or\CJK@three\or\CJK@four\or + \CJK@five\or\CJK@six\or\CJK@seven\or\CJK@eight\or\CJK@nine + \fi +} \def\HyPsd@inmathwarn#1#2{% \ifx#2\expandafter \expandafter\ifx\csname\cf@encoding\string#1\endcsname\relax @@ -1592,7 +1816,6 @@ \xdef#4{#4#1#2}% \HyPsd@@ConvertToUnicode#3\END#4% } -\RequirePackage{intcalc}[2007/09/27] \begingroup \catcode0=9 % \catcode`\^=7 % diff --git a/Master/texmf-dist/tex/latex/hyperref/hypertex.def b/Master/texmf-dist/tex/latex/hyperref/hypertex.def index ab553d4b363..54ee7f3def3 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/04 v6.80k + [2010/03/09 v6.80l 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 bf827d36265..488806c19b4 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/04 v6.80k + [2010/03/09 v6.80l 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 fa0c2b2d286..0e289230728 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/04 v6.80k + [2010/03/09 v6.80l 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 321fe2fc5e0..f69fcb21126 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/04 v6.80k + [2010/03/09 v6.80l 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 fbe20715538..71d1d867a5a 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/04 v6.80k + [2010/03/09 v6.80l 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 5ea215188e9..7dc0b16e0ff 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/04 v6.80k + [2010/03/09 v6.80l 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 bce9c0dbec1..38f2b81acce 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/04 v6.80k + [2010/03/09 v6.80l Hyperref: Additions to puenc.def for VnTeX] \DeclareTextCommand{\abreve}{PU}{\81\003} \DeclareTextCommand{\acircumflex}{PU}{\80\342} |