diff options
| author | Karl Berry <karl@freefriends.org> | 2007-06-01 16:58:52 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2007-06-01 16:58:52 +0000 |
| commit | 4d027ddb699c57025992eccbdd3cef0ec2836ee1 (patch) | |
| tree | 7c9a8e252aa5133aa4c986aa37af12b8484ec44b /Master/texmf-dist/tex/latex/hyperref | |
| parent | ab8a652a0280de02179bbbdd79296f2bbd4073f7 (diff) | |
hyperref update (30may07)
git-svn-id: svn://tug.org/texlive/trunk@4399 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/hyperref')
21 files changed, 2374 insertions, 1419 deletions
diff --git a/Master/texmf-dist/tex/latex/hyperref/backref.sty b/Master/texmf-dist/tex/latex/hyperref/backref.sty index 6c9cf799383..affd2410cab 100644 --- a/Master/texmf-dist/tex/latex/hyperref/backref.sty +++ b/Master/texmf-dist/tex/latex/hyperref/backref.sty @@ -21,7 +21,7 @@ %% given in the file `manifest.txt'. \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{backref} - [2006/10/06 v1.27 Bibliographical back referencing] + [2006/10/06 v1.27 Bibliographical back referencing]% \newif\ifBR@verbose \@ifundefined{ifHy@verbose}{% \BR@verbosefalse diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def b/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def index 602b243bb2a..9da39dce159 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def +++ b/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def @@ -22,20 +22,20 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hdvipdfm.def} - [2007/02/27 v6.75t + [2007/05/29 v6.76g Hyperref driver for dvipdfm] \def\Hy@PutCatalog#1{\@pdfm@mark{docview << #1 >>}} \ifHy@pagelabels \def\HyPL@StorePageLabel#1{% \if@filesw \begingroup - \edef\Hy@tempa{\the\Hy@abspage\space<< #1 >> }% + \edef\Hy@tempa{\the\Hy@abspage<<#1>>}% \immediate\write\@mainaux{% \string\HyPL@Entry{\Hy@tempa}% }% \endgroup \fi - } + }% \AfterBeginDocument{% \if@filesw \immediate\write\@mainaux{% @@ -54,7 +54,7 @@ \HyPL@Labels #1% }% - } + }% \fi \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname pdfescapestring\endcsname\relax @@ -71,7 +71,7 @@ }% |def|Hy@ExchangeBackslash#1\#2|@nil{% #1% - |ifx|\#2|\% + |ifx|\#2|\%% |else \\% |Hy@ReturnAfterFi{% @@ -79,7 +79,7 @@ }% |fi }% - } + }% \def\Hy@ExchangeLeftParenthesis#1(#2\@nil{% #1% \ifx\\#2\\% @@ -89,7 +89,7 @@ \Hy@ExchangeLeftParenthesis#2\@nil }% \fi - } + }% \def\Hy@ExchangeRightParenthesis#1)#2\@nil{% #1% \ifx\\#2\\% @@ -99,7 +99,7 @@ \Hy@ExchangeRightParenthesis#2\@nil }% \fi - } + }% \else \def\Hy@pstringdef#1#2{% \edef#1{\pdfescapestring{#2}}% @@ -181,16 +181,19 @@ \Hy@pstringdef\Hy@testname\Hy@testname \fi \@pdfm@mark{% - bann << - /Type /Annot - /Subtype /Link + bann<<% + /Type/Annot% + /Subtype/Link% \Hy@setpdfborder - /C [\csname @#1bordercolor\endcsname] - /A << - /S /GoTo - /D (\Hy@testname) - >> - >> + \expandafter\ifx\csname @#1bordercolor\endcsname\relax + \else + /C[\csname @#1bordercolor\endcsname]% + \fi + /A<<% + /S/GoTo% + /D(\Hy@testname)% + >>% + >>% }% \expandafter\Hy@colorlink\csname @#1color\endcsname } @@ -206,17 +209,20 @@ \Hy@pstringdef\Hy@pstringD{#3}% \leavevmode \@pdfm@mark{% - bann << - /Type /Annot - /Subtype /Link + bann<<% + /Type/Annot% + /Subtype/Link% \Hy@setpdfborder - /C [\@filebordercolor] - /A << - /S /GoToR - /F (\Hy@pstringF) - /D \ifx\\#3\\[0 \@pdfstartview]\else(\Hy@pstringD)\fi\space - \ifHy@newwindow /NewWindow true \fi - >> + \ifx\@filebordercolor\relax + \else + /C[\@filebordercolor]% + \fi + /A<<% + /S/GoToR% + /F(\Hy@pstringF)% + /D\ifx\\#3\\[0 \@pdfstartview]\else(\Hy@pstringD)\fi + \ifHy@newwindow /NewWindow true\fi + >>% >>% }% \Hy@colorlink\@filecolor#1\Hy@endcolorlink @@ -227,38 +233,44 @@ \Hy@pstringdef\Hy@pstringP{#3}% \leavevmode \@pdfm@mark{% - bann << - /Type /Annot - /Subtype /Link + bann<<% + /Type/Annot% + /Subtype/Link% \Hy@setpdfborder - /C [\@filebordercolor] - /A << - /S /Launch - /F (\Hy@pstringF) - \ifHy@newwindow /NewWindow true \fi + \ifx\@runbordercolor\relax + \else + /C[\@runbordercolor]% + \fi + /A<<% + /S/Launch% + /F(\Hy@pstringF)% + \ifHy@newwindow /NewWindow true\fi \ifx\\#3\\% \else - /Win << /P (\Hy@pstringP) /F (\Hy@pstringF) >> + /Win<</P(\Hy@pstringP)/F(\Hy@pstringF)>>% \fi - >> + >>% >>% }% - \Hy@colorlink\@filecolor#2\Hy@endcolorlink + \Hy@colorlink\@runcolor#2\Hy@endcolorlink \@pdfm@mark{eann}% } \def\hyper@linkurl#1#2{% \Hy@pstringdef\Hy@pstringURI{#2}% \leavevmode \@pdfm@mark{% - bann << - /Type /Annot - /Subtype /Link + bann<<% + /Type/Annot% + /Subtype/Link% \Hy@setpdfborder - /C [\@urlbordercolor] - /A << - /S /URI - /URI (\Hy@pstringURI) - >> + \ifx\@urlbordercolor\relax + \else + /C[\@urlbordercolor]% + \fi + /A<<% + /S/URI% + /URI(\Hy@pstringURI)% + >>% >>% }% \Hy@colorlink\@urlcolor#1\Hy@endcolorlink @@ -267,44 +279,47 @@ \def\Acrobatmenu#1#2{% \leavevmode \@pdfm@mark{% - bann << - /Type /Annot - /Subtype /Link - /A << - /S /Named - /N /#1 - >> + bann<<% + /Type/Annot% + /Subtype/Link% + /A<<% + /S/Named% + /N/#1% + >>% \Hy@setpdfborder - /C [\@menubordercolor] + \ifx\@menubordercolor\relax + \relax + /C[\@menubordercolor]% + \fi >>% }% \Hy@colorlink\@menucolor#2\Hy@endcolorlink \@pdfm@mark{eann}% } \ifx\@pdfproducer\relax - \def\@pdfproducer{dvipdfm} + \def\@pdfproducer{dvipdfm}% \fi \def\PDF@FinishDoc{% \Hy@UseMaketitleInfos \@pdfm@mark{% - docinfo << - /Title (\@pdftitle) - /Subject (\@pdfsubject) - /Creator (\@pdfcreator) + docinfo<<% + /Title(\@pdftitle)% + /Subject(\@pdfsubject)% + /Creator(\@pdfcreator)% \ifx\@pdfcreationdate\@empty \else - /CreationDate(\@pdfcreationdate) % + /CreationDate(\@pdfcreationdate)% \fi \ifx\@pdfmoddate\@empty \else - /ModDate(\@pdfmoddate) % + /ModDate(\@pdfmoddate)% \fi - /Author (\@pdfauthor) + /Author(\@pdfauthor)% \ifx\@pdfproducer\relax \else - /Producer (\@pdfproducer) + /Producer(\@pdfproducer)% \fi - /Keywords (\@pdfkeywords) + /Keywords(\@pdfkeywords)% >>% }% \Hy@DisableOption{pdfauthor}% @@ -347,7 +362,7 @@ }% \Hy@pstringdef\Hy@pstringB{\@baseurl}% \@pdfm@mark{% - docview <<% + docview<<% \ifx\@pdfstartview\@empty \else /OpenAction[@page\@pdfstartpage\@pdfstartview]% @@ -370,7 +385,7 @@ }% \ifx\@pdfpagescrop\@empty \else - \@pdfm@mark{put @pages <</CropBox[\@pdfpagescrop]>>} + \@pdfm@mark{put @pages <</CropBox[\@pdfpagescrop]>>}% \fi } \def\@Gauge[#1]#2#3#4{% parameters, label, minimum, maximum @@ -379,18 +394,23 @@ \def\@Form[#1]{% \@ifundefined{textcolor}{\let\textcolor\@gobble}{}% \setkeys{Form}{#1}% - \@pdfm@mark{obj @afields [ ]}% - \@pdfm@mark{obj @corder [ ]}% + \@pdfm@mark{obj @afields []}% + \@pdfm@mark{obj @corder []}% \@pdfm@mark{% - obj @aform << - /Fields @afields - /DR << /Font << /ZaDb @OBJZaDb /Helv @OBJHelv >> >> - /DA (/Helv 10 Tf 0 g ) - /CO @corder - /NeedAppearances true + obj @aform <<% + /Fields @afields% + /DR<<% + /Font<<% + /ZaDb @OBJZaDb% + /Helv @OBJHelv% + >>% + >>% + /DA(/Helv 10 Tf 0 g)% + /CO @corder% + /NeedAppearances true% >>% }% - \@pdfm@mark{put @catalog << /AcroForm @aform >>}% + \@pdfm@mark{put @catalog <</AcroForm @aform>>}% } \def\@endForm{} \def\dvipdfm@setdim{% @@ -438,7 +458,7 @@ \def\Fld@width{\DefaultWidthofChoiceMenu}% \def\Fld@height{\DefaultHeightofChoiceMenu}% \bgroup - \Fld@menulength=0 + \Fld@menulength=0 % \@tempdima\z@ \@for\@curropt:=#3\do{% \expandafter\Fld@checkequals\@curropt==\\% @@ -450,6 +470,9 @@ \Field@toks={ }% \setkeys{Field}{#1}% \ifFld@hidden\def\Fld@width{1sp}\fi + \ifx\Fld@value\relax + \let\Fld@value\Fld@default + \fi \LayoutChoiceField{#2}{% \ifFld@radio \@@Radio{#3}% @@ -464,8 +487,8 @@ \ifFld@popdown\def\Fld@flags{/Ff 131072}\fi \ifx\Fld@flags\@empty \@tempdima=\the\Fld@menulength\Fld@charsize - \advance\@tempdima by \Fld@borderwidth bp - \advance\@tempdima by \Fld@borderwidth bp + \advance\@tempdima by \Fld@borderwidth bp % + \advance\@tempdima by \Fld@borderwidth bp % \edef\Fld@height{\the\@tempdima}% \fi \@@Listbox{#3}% @@ -475,7 +498,7 @@ \egroup } \def\@@Radio#1{% - \Fld@listcount=0 + \Fld@listcount=0 % \setbox\pdfm@box=\hbox{\MakeRadioField{\Fld@width}{\Fld@height}}% \@for\@curropt:=#1\do{% \expandafter\Fld@checkequals\@curropt==\\% @@ -486,9 +509,9 @@ \@pdfm@mark{% ann \ifnum\Fld@listcount=1 @\Fld@name\space\fi \dvipdfm@setdim - << - \PDFForm@Radio\space - /AP << /N << /\@currValue /null >> >> + <<% + \PDFForm@Radio + /AP<</N<</\@currValue /null>>>>% >>% }% \unhcopy\pdfm@box\space% deliberate space between radio buttons @@ -498,7 +521,7 @@ \newcount\Fld@listcount \def\@@Listbox#1{% \Choice@toks={ }% - \Fld@listcount=0 + \Fld@listcount=0 % \@for\@curropt:=#1\do{% \expandafter\Fld@checkequals\@curropt==\\% \Hy@StepCount\Fld@listcount @@ -594,51 +617,54 @@ }% \egroup } -\@pdfm@mark{obj @OBJpdfdocencoding << /Type /Encoding /Differences [% - 24 /breve /caron /circumflex /dotaccent /hungarumlaut /ogonek /ring - /tilde - 39 /quotesingle - 96 /grave - 128 /bullet /dagger /daggerdbl /ellipsis /emdash /endash /florin - /fraction /guilsinglleft /guilsinglright /minus /perthousand - /quotedblbase /quotedblleft /quotedblright /quoteleft /quoteright - /quotesinglbase /trademark /fi /fl /Lslash /OE /Scaron /Ydieresis - /Zcaron /dotlessi /lslash /oe /scaron /zcaron - 164 /currency - 166 /brokenbar - 168 /dieresis /copyright /ordfeminine - 172 /logicalnot /.notdef /registered /macron /degree /plusminus - /twosuperior /threesuperior /acute /mu - 183 /periodcentered /cedilla /onesuperior /ordmasculine - 188 /onequarter /onehalf /threequarters - 192 /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE - /Ccedilla /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute - /Icircumflex /Idieresis /Eth /Ntilde /Ograve /Oacute /Ocircumflex - /Otilde /Odieresis /multiply /Oslash /Ugrave /Uacute /Ucircumflex - /Udieresis /Yacute /Thorn /germandbls /agrave /aacute /acircumflex - /atilde /adieresis /aring /ae /ccedilla /egrave /eacute - /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis - /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis - /divide /oslash /ugrave /uacute /ucircumflex /udieresis /yacute - /thorn /ydieresis% - ] >> +\@pdfm@mark{obj @OBJpdfdocencoding% + <<% + /Type/Encoding% + /Differences[% + 24/breve/caron/circumflex/dotaccent/hungarumlaut/ogonek/ring/tilde % + 39/quotesingle % + 96/grave % + 128/bullet/dagger/daggerdbl/ellipsis/emdash/endash/florin% + /fraction/guilsinglleft/guilsinglright/minus/perthousand% + /quotedblbase/quotedblleft/quotedblright/quoteleft/quoteright% + /quotesinglbase/trademark/fi/fl/Lslash/OE/Scaron/Ydieresis% + /Zcaron/dotlessi/lslash/oe/scaron/zcaron % + 164/currency % + 166/brokenbar % + 168/dieresis/copyright/ordfeminine % + 172/logicalnot/.notdef/registered/macron/degree/plusminus% + /twosuperior/threesuperior/acute/mu % + 183/periodcentered/cedilla/onesuperior/ordmasculine % + 188/onequarter/onehalf/threequarters % + 192/Agrave/Aacute/Acircumflex/Atilde/Adieresis/Aring/AE% + /Ccedilla/Egrave/Eacute/Ecircumflex/Edieresis/Igrave/Iacute% + /Icircumflex/Idieresis/Eth/Ntilde/Ograve/Oacute/Ocircumflex% + /Otilde/Odieresis/multiply/Oslash/Ugrave/Uacute/Ucircumflex% + /Udieresis/Yacute/Thorn/germandbls/agrave/aacute/acircumflex% + /atilde/adieresis/aring/ae/ccedilla/egrave/eacute% + /ecircumflex/edieresis/igrave/iacute/icircumflex/idieresis% + /eth/ntilde/ograve/oacute/ocircumflex/otilde/odieresis% + /divide/oslash/ugrave/uacute/ucircumflex/udieresis/yacute% + /thorn/ydieresis% + ]% + >>% } -\@pdfm@mark{obj @OBJZaDb - << - /Type /Font - /Subtype /Type1 - /Name /ZaDb - /BaseFont /ZapfDingbats - >> +\@pdfm@mark{obj @OBJZaDb% + <<% + /Type/Font% + /Subtype/Type1% + /Name/ZaDb% + /BaseFont/ZapfDingbats% + >>% } -\@pdfm@mark{obj @OBJHelv - << - /Type /Font - /Subtype /Type1 - /Name /Helv - /BaseFont /Helvetica - /Encoding @OBJpdfdocencoding - >> +\@pdfm@mark{obj @OBJHelv% + <<% + /Type/Font% + /Subtype/Type1% + /Name/Helv% + /BaseFont/Helvetica% + /Encoding @OBJpdfdocencoding% + >>% } \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname pdfescapestring\endcsname\relax @@ -682,80 +708,99 @@ \Hy@escapeform{}% \fi \def\PDFForm@Check{% - /Subtype /Widget - \ifFld@hidden /F 6 \else /F 4 \fi - /T (\Hy@escapestring{\Fld@name}) - /Q \Fld@align\space - /BS << /W \Fld@borderwidth\space /S /\Fld@borderstyle\space >> - /MK << - /BC [\Fld@bordercolor] - \ifx\Fld@bcolor\@empty + /Subtype/Widget% + \ifFld@hidden /F 6\else /F 4\fi + /T(\Hy@escapestring{\Fld@name})% + /Q \Fld@align + /BS<</W \Fld@borderwidth /S/\Fld@borderstyle>>% + /MK<<% + \ifnum\Fld@rotation=\z@ + \else + /R \Fld@rotation + \fi + \ifx\Fld@bordercolor\relax \else - /BG [\Fld@bcolor] + /BC[\Fld@bordercolor]% + \fi + \ifx\Fld@bcolor\relax + \else + /BG[\Fld@bcolor]% \fi - /CA (\Hy@escapestring{\Fld@cbsymbol}) - >> - /DA (/ZaDb \strip@pt\Fld@charsize\space Tf \Fld@color\space rg) - /FT /Btn - /H /P - \ifFld@checked /V /Yes \else /V /Off \fi + /CA(\Hy@escapestring{\Fld@cbsymbol})% + >>% + /DA(/ZaDb \strip@pt\Fld@charsize\space Tf% + \ifx\Fld@color\@empty\else\space\Fld@color\fi)% + /FT/Btn% + /H/P% + \ifFld@checked /V/Yes\else /V/Off\fi } \def\PDFForm@Push{% - /Subtype/Widget + /Subtype/Widget% \ifFld@hidden /F 6\else /F 4\fi /T(\Hy@escapestring{\Fld@name})% /FT/Btn% - /Ff 65540 + /Ff 65540% /H/P% /BS<</W \Fld@borderwidth/S/\Fld@borderstyle>>% /MK<<% - /BC[\Fld@bordercolor]% - >>% - /A<</S/JavaScript/JS(\Hy@escapestring{\Fld@onclick})>>% -} -\def\Fld@additionalactions{% - /AA << - \ifx\Fld@keystroke@code\@empty - \else - /K<</S/JavaScript/JS(\Hy@escapestring{\Fld@keystroke@code})>>% - \fi - \ifx\Fld@format@code\@empty - \else - /F<</S/JavaScript/JS(\Hy@escapestring{\Fld@format@code})>>% - \fi - \ifx\Fld@validate@code\@empty - \else - /V<</S/JavaScript/JS(\Hy@escapestring{\Fld@validate@code})>>% - \fi - \ifx\Fld@calculate@code\@empty - \else - /C<</S/JavaScript/JS(\Hy@escapestring{\Fld@calculate@code})>>% - \fi - \ifx\Fld@onfocus@code\@empty - \else - /Fo<</S/JavaScript/JS(\Hy@escapestring{\Fld@onfocus@code})>>% - \fi - \ifx\Fld@onblur@code\@empty - \else - /Bl<</S/JavaScript/JS(\Hy@escapestring{\Fld@onblur@code})>>% - \fi - \ifx\Fld@onmousedown@code\@empty + \ifnum\Fld@rotation=\z@ \else - /D<</S/JavaScript/JS(\Hy@escapestring{\Fld@onmousedown@code})>>% + /R \Fld@rotation \fi - \ifx\Fld@onmouseup@code\@empty + \ifx\Fld@bordercolor\relax \else - /U<</S/JavaScript/JS(\Hy@escapestring{\Fld@onmouseup@code})>>% - \fi - \ifx\Fld@onenter@code\@empty - \else - /E<</S/JavaScript/JS(\Hy@escapestring{\Fld@onenter@code})>>% - \fi - \ifx\Fld@onexit@code\@empty - \else - /X<</S/JavaScript/JS(\Hy@escapestring{\Fld@onexit@code})>>% + /BC[\Fld@bordercolor]% \fi >>% + /A<</S/JavaScript/JS(\Hy@escapestring{\Fld@onclick})>>% +} +\def\Fld@@additionalactions{% + \ifx\Fld@keystroke@code\@empty + \else + /K<</S/JavaScript/JS(\Hy@escapestring{\Fld@keystroke@code})>>% + \fi + \ifx\Fld@format@code\@empty + \else + /F<</S/JavaScript/JS(\Hy@escapestring{\Fld@format@code})>>% + \fi + \ifx\Fld@validate@code\@empty + \else + /V<</S/JavaScript/JS(\Hy@escapestring{\Fld@validate@code})>>% + \fi + \ifx\Fld@calculate@code\@empty + \else + /C<</S/JavaScript/JS(\Hy@escapestring{\Fld@calculate@code})>>% + \fi + \ifx\Fld@onfocus@code\@empty + \else + /Fo<</S/JavaScript/JS(\Hy@escapestring{\Fld@onfocus@code})>>% + \fi + \ifx\Fld@onblur@code\@empty + \else + /Bl<</S/JavaScript/JS(\Hy@escapestring{\Fld@onblur@code})>>% + \fi + \ifx\Fld@onmousedown@code\@empty + \else + /D<</S/JavaScript/JS(\Hy@escapestring{\Fld@onmousedown@code})>>% + \fi + \ifx\Fld@onmouseup@code\@empty + \else + /U<</S/JavaScript/JS(\Hy@escapestring{\Fld@onmouseup@code})>>% + \fi + \ifx\Fld@onenter@code\@empty + \else + /E<</S/JavaScript/JS(\Hy@escapestring{\Fld@onenter@code})>>% + \fi + \ifx\Fld@onexit@code\@empty + \else + /X<</S/JavaScript/JS(\Hy@escapestring{\Fld@onexit@code})>>% + \fi +} +\def\Fld@additionalactions{% + \if-\Fld@@additionalactions-% + \else + /AA<<\Fld@@additionalactions>>% + \fi } \def\PDFForm@List{% /Subtype/Widget% @@ -765,13 +810,21 @@ /Q \Fld@align /BS<</W \Fld@borderwidth /S/\Fld@borderstyle>>% /MK<<% - /BC[\Fld@bordercolor]% - \ifx\Fld@bcolor\@empty + \ifnum\Fld@rotation=\z@ + \else + /R \Fld@rotation + \fi + \ifx\Fld@bordercolor\relax + \else + /BC[\Fld@bordercolor]% + \fi + \ifx\Fld@bcolor\relax \else /BG[\Fld@bcolor]% \fi >>% - /DA(/Helv \strip@pt\Fld@charsize\space Tf \Fld@color\space rg)% + /DA(/Helv \strip@pt\Fld@charsize\space Tf% + \ifx\Fld@color\@empty\else\space\Fld@color\fi)% /Opt[\the\Choice@toks]% \ifx\Fld@default\relax \else @@ -790,17 +843,25 @@ /T(\Hy@escapestring{\Fld@name})% /FT/Btn% /Ff 49152% - /H/P + /H/P% /BS<</W \Fld@borderwidth/S/\Fld@borderstyle>>% /MK<<% - /BC[\Fld@bordercolor]% - \ifx\Fld@bcolor\@empty + \ifnum\Fld@rotation=\z@ + \else + /R \Fld@rotation + \fi + \ifx\Fld@bordercolor\relax + \else + /BC[\Fld@bordercolor]% + \fi + \ifx\Fld@bcolor\relax \else /BG[\Fld@bcolor]% \fi /CA(H)% >>% - /DA(/ZaDb \strip@pt\Fld@charsize\space Tf \Fld@color\space rg)% + /DA(/ZaDb \strip@pt\Fld@charsize\space Tf% + \ifx\Fld@color\@empty\else\space\Fld@color\fi)% \ifx\@currValue\Fld@default /V/\Fld@default \else @@ -811,18 +872,26 @@ \def\PDFForm@Text{% /Subtype/Widget% \ifFld@hidden /F 6\else /F 4\fi - /T(\Hy@escapestring{\Fld@name}) + /T(\Hy@escapestring{\Fld@name})% /Q \Fld@align /FT/Tx% /BS<</W \Fld@borderwidth\space /S /\Fld@borderstyle>>% /MK<<% - /BC[\Fld@bordercolor]% - \ifx\Fld@bcolor\@empty + \ifnum\Fld@rotation=\z@ + \else + /R \Fld@rotation + \fi + \ifx\Fld@bordercolor\relax + \else + /BC[\Fld@bordercolor]% + \fi + \ifx\Fld@bcolor\relax \else /BG[\Fld@bcolor]% \fi >>% - /DA(/Helv \strip@pt\Fld@charsize\space Tf \Fld@color\space rg)% + /DA(/Helv \strip@pt\Fld@charsize\space Tf% + \ifx\Fld@color\@empty\else\space\Fld@color\fi)% /DV(\Hy@escapestring{\Fld@default})% /V(\Hy@escapestring{\Fld@value})% \Fld@additionalactions @@ -835,7 +904,7 @@ \ifFld@readonly /Ff 1\fi \fi \fi - \ifnum\Fld@maxlen>0/MaxLen \Fld@maxlen \fi + \ifnum\Fld@maxlen>\z@/MaxLen \Fld@maxlen \fi } \def\PDFForm@Submit{% /Subtype/Widget% @@ -846,7 +915,14 @@ /H/P% /BS<</W \Fld@borderwidth/S/\Fld@borderstyle>>% /MK<<% - /BC[\Fld@bordercolor]% + \ifnum\Fld@rotation=\z@ + \else + /R \Fld@rotation + \fi + \ifx\Fld@bordercolor\relax + \else + /BC[\Fld@bordercolor]% + \fi >>% /A<<% /S/SubmitForm% @@ -866,7 +942,14 @@ /DA(/Helv \strip@pt\Fld@charsize\space Tf 0 0 1 rg)% /Ff 65540% /MK<<% - /BC[\Fld@bordercolor]% + \ifnum\Fld@rotation=\z@ + \else + /R \Fld@rotation + \fi + \ifx\Fld@bordercolor\relax + \else + /BC[\Fld@bordercolor]% + \fi >>% /BS<</W \Fld@borderwidth/S/\Fld@borderstyle>>% /A<</S/ResetForm>>% @@ -878,7 +961,8 @@ \else \@@writetorep{#1}{#2}{#3}{#4}{#5}% \fi - \fi} + \fi +} \def\Hy@currentbookmarklevel{0} \def\Hy@numberline#1{#1 } \def\@@writetorep#1#2#3#4#5{% @@ -888,16 +972,16 @@ \edef\Hy@level{#4}% \ifx\Hy@levelcheck Y% \@tempcnta\Hy@level\relax - \advance\@tempcnta by -1 + \advance\@tempcnta by -1 % \ifnum\Hy@currentbookmarklevel<\@tempcnta \advance\@tempcnta by -\Hy@currentbookmarklevel\relax - \advance\@tempcnta by 1 + \advance\@tempcnta by 1 % \Hy@Warning{% Difference (\the\@tempcnta) between bookmark levels is % greater \MessageBreak than one, level fixed% }% \@tempcnta\Hy@currentbookmarklevel - \advance\@tempcnta by 1 + \advance\@tempcnta by 1 % \edef\Hy@level{\the\@tempcnta}% \fi \else @@ -906,7 +990,7 @@ \global\let\Hy@currentbookmarklevel\Hy@level \@tempcnta\Hy@level\relax \expandafter\xdef\csname Parent\Hy@level\endcsname{#3}% - \advance\@tempcnta by -1 + \advance\@tempcnta by -1 % \edef\Hy@tempa{#3}% \edef\Hy@tempb{\csname Parent\the\@tempcnta\endcsname}% \ifx\Hy@tempa\Hy@tempb @@ -948,7 +1032,7 @@ \@tempcnta\Hy@currentbookmarklevel \Hy@StepCount\@tempcnta \expandafter\pdfbookmark\expandafter[\the\@tempcnta]{#1}{#2}% - \advance\@tempcnta by -1 + \advance\@tempcnta by -1 % \xdef\Hy@currentbookmarklevel{\the\@tempcnta}% } \renewcommand\pdfbookmark[3][0]{% @@ -970,13 +1054,21 @@ \def\Hy@temp{##4}% \Hy@pstringdef\Hy@pstringName{##3}% \@pdfm@mark{% - outline ##1 << - /Title (\expandafter\strip@prefix\meaning\Hy@temp) - /A << - /S /GoTo - /D (\Hy@pstringName) - >> - >> + outline \ifHy@DvipdfmxOutlineOpen + [% + \ifnum##21>\z@ + \else + -% + \fi + ] % + \fi + ##1<<% + /Title(\expandafter\strip@prefix\meaning\Hy@temp)% + /A<<% + /S/GoTo% + /D(\Hy@pstringName)% + >>% + >>% }% }% {% @@ -988,7 +1080,7 @@ \else \if@filesw \newwrite\@outlinefile - \immediate\openout\@outlinefile=\jobname.out + \immediate\openout\@outlinefile=\jobname.out\relax \ifHy@typexml \immediate\write\@outlinefile{<relaxxml>\relax}% \fi @@ -1005,7 +1097,7 @@ } \def\calc@bm@number#1{% \@tempcnta=\check@bm@number{#1}\relax - \advance\@tempcnta by1 + \advance\@tempcnta by 1 % \expandafter\xdef\csname B_#1\endcsname{\the\@tempcnta}% } \ifHy@implicit diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvips.def b/Master/texmf-dist/tex/latex/hyperref/hdvips.def index ed2e290daa2..faeb37b7d4b 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hdvips.def +++ b/Master/texmf-dist/tex/latex/hyperref/hdvips.def @@ -22,61 +22,69 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hdvips.def} - [2007/02/27 v6.75t + [2007/05/29 v6.76g Hyperref driver for dvips] \input{pdfmark.def}% \ifx\@pdfproducer\relax - \def\@pdfproducer{dvips + Distiller} + \def\@pdfproducer{dvips + Distiller}% \fi \def\literalps@out#1{\special{ps:SDict begin #1 end}}% \def\headerps@out#1{\special{! #1}}% -\providecommand*\@pdfborder{0 0 12} +\providecommand*\@pdfborder{0 0 1} \providecommand*\@pdfborderstyle{} \providecommand*\@pdfview{XYZ} \providecommand*\@pdfviewparams{ H.V} +\def\Hy@BorderArrayPatch{BorderArrayPatch} \AtBeginDvi{% \headerps@out{% - /DvipsToPDF { 72.27 mul Resolution div } def - /PDFToDvips { 72.27 div Resolution mul } def - /HyperBorder { 1 PDFToDvips } def - /H.V {pdf@hoff pdf@voff null} def - /H.B {/Rect[pdf@llx pdf@lly pdf@urx pdf@ury]} def - /H.S { - currentpoint - HyperBorder add /pdf@lly exch def - dup DvipsToPDF /pdf@hoff exch def - HyperBorder sub /pdf@llx exch def - } def - /H.L { - 2 sub dup - /HyperBasePt exch def - PDFToDvips /HyperBaseDvips exch def - currentpoint - HyperBaseDvips sub /pdf@ury exch def - /pdf@urx exch def - } def - /H.A { - H.L - currentpoint exch pop - vsize 72 sub exch DvipsToPDF + /DvipsToPDF{72.27 mul Resolution div} def% + /PDFToDvips{72.27 div Resolution mul} def% + /BPToDvips{72 div Resolution mul}def% + /BorderArrayPatch{% + [exch{% + dup dup type/integertype eq exch type/realtype eq or% + {BPToDvips}if% + }forall]% + }def% + /HyperBorder {1 PDFToDvips} def% + /H.V {pdf@hoff pdf@voff null} def% + /H.B {/Rect[pdf@llx pdf@lly pdf@urx pdf@ury]} def% + /H.S {% + currentpoint % + HyperBorder add /pdf@lly exch def % + dup DvipsToPDF 72 add /pdf@hoff exch def % + HyperBorder sub /pdf@llx exch def% + } def% + /H.L {% + 2 sub dup% + /HyperBasePt exch def % + PDFToDvips /HyperBaseDvips exch def % + currentpoint % + HyperBaseDvips sub /pdf@ury exch def% + /pdf@urx exch def% + } def% + /H.A {% + H.L % + currentpoint exch pop % + vsize 72 sub exch DvipsToPDF % HyperBasePt sub % baseline skip - sub /pdf@voff exch def - } def - /H.R { - currentpoint - HyperBorder sub /pdf@ury exch def - HyperBorder add /pdf@urx exch def - currentpoint exch pop vsize 72 sub - exch DvipsToPDF sub /pdf@voff exch def - } def - systemdict /pdfmark known - { - userdict /?pdfmark systemdict /exec get put - }{ - userdict /?pdfmark systemdict /pop get put - userdict /pdfmark systemdict /cleartomark get put - } - ifelse + sub /pdf@voff exch def% + } def% + /H.R {% + currentpoint % + HyperBorder sub /pdf@ury exch def % + HyperBorder add /pdf@urx exch def % + currentpoint exch pop vsize 72 sub % + exch DvipsToPDF sub /pdf@voff exch def% + } def % + systemdict /pdfmark known% + {% + userdict /?pdfmark systemdict /exec get put% + }{% + userdict /?pdfmark systemdict /pop get put % + userdict /pdfmark systemdict /cleartomark get put% + }% + ifelse% }% } \AfterBeginDocument{% diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvipson.def b/Master/texmf-dist/tex/latex/hyperref/hdvipson.def index 960cff7b647..26c40d254fc 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hdvipson.def +++ b/Master/texmf-dist/tex/latex/hyperref/hdvipson.def @@ -22,13 +22,13 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hdvipson.def} - [2007/02/27 v6.75t + [2007/05/29 v6.76g Hyperref driver for dvipsone] -\providecommand*\@pdfborder{0 0 65781} +\providecommand*\@pdfborder{0 0 1} \providecommand*\@pdfborderstyle{} \input{pdfmark.def}% \ifx\@pdfproducer\relax - \def\@pdfproducer{dvipsone + Distiller} + \def\@pdfproducer{dvipsone + Distiller}% \fi \def\literalps@out#1{\special{ps:#1}}% \def\headerps@out#1{\special{! #1}}% @@ -62,9 +62,9 @@ } \def\PDF@SetupDoc{% \pdfmark{% - pdfmark=/DOCVIEW, - Page=\@pdfstartpage, - View=\@pdfstartview, + pdfmark=/DOCVIEW,% + Page=\@pdfstartpage,% + View=\@pdfstartview,% PageMode=/\@pdfpagemode }% \ifx\@pdfpagescrop\@empty @@ -103,7 +103,7 @@ \pdfmark{% pdfmark=/PUT,% Raw={% - \string{Catalog\string} << + \string{Catalog\string}<<% \ifx\Hy@temp\@empty \else /ViewerPreferences<<\Hy@temp>>% @@ -115,7 +115,7 @@ \fi \ifx\@baseurl\@empty \else - /URI << /Base (\Hy@pstringB) >>% + /URI<</Base(\Hy@pstringB)>>% \fi >>% }% @@ -123,48 +123,56 @@ } \providecommand*\@pdfview{XYZ} \providecommand*\@pdfviewparams{ % - gsave revscl currentpoint grestore - 72 add exch pop null exch null + gsave revscl currentpoint grestore % + 72 add exch pop null exch null% } -\special{headertext= - /DvipsToPDF { 65781 div } def - /PDFToDvips { 65781 mul } def - /HyperBorder { 1 PDFToDvips } def - /H.B {/Rect[pdf@llx pdf@lly pdf@urx pdf@ury]} def - /H.S { - currentpoint - HyperBorder add /pdf@lly exch def - dup DvipsToPDF /pdf@hoff exch def - HyperBorder sub /pdf@llx exch def - } def - /H.L { - 2 sub - PDFToDvips /HyperBase exch def - currentpoint - HyperBase sub /pdf@ury exch def - /pdf@urx exch def - } def - /H.A { - H.L - currentpoint exch pop +\def\Hy@BorderArrayPatch{BorderArrayPatch} +\special{headertext=% + /DvipsToPDF { 65781 div } def% + /PDFToDvips { 65781 mul } def% + /BPToDvips{65781 mul}def% + /HyperBorder { 1 PDFToDvips } def% + /H.B {/Rect[pdf@llx pdf@lly pdf@urx pdf@ury]} def% + /BorderArrayPatch{% + [exch{% + dup dup type/integertype eq exch type/realtype eq or% + {BPToDvips}if% + }forall]% + }def% + /H.S {% + currentpoint % + HyperBorder add /pdf@lly exch def % + dup DvipsToPDF 72 add /pdf@hoff exch def % + HyperBorder sub /pdf@llx exch def% + } def% + /H.L {% + 2 sub % + PDFToDvips /HyperBase exch def % + currentpoint % + HyperBase sub /pdf@ury exch def% + /pdf@urx exch def% + } def% + /H.A {% + H.L % + currentpoint exch pop % HyperBase sub % baseline skip - DvipsToPDF /pdf@voff exch def - } def - /H.R { - currentpoint - HyperBorder sub /pdf@ury exch def - HyperBorder add /pdf@urx exch def - currentpoint exch pop DvipsToPDF /pdf@voff exch def - } def - systemdict - /pdfmark known - { - userdict /?pdfmark /exec load put - }{ - userdict /?pdfmark /pop load put - userdict /pdfmark systemdict /cleartomark get put - } - ifelse + DvipsToPDF /pdf@voff exch def% + } def% + /H.R {% + currentpoint % + HyperBorder sub /pdf@ury exch def % + HyperBorder add /pdf@urx exch def % + currentpoint exch pop DvipsToPDF /pdf@voff exch def% + } def % + systemdict% + /pdfmark known% + {% + userdict /?pdfmark /exec load put% + }{% + userdict /?pdfmark /pop load put % + userdict /pdfmark systemdict /cleartomark get put% + }% + ifelse% } \endinput %% diff --git a/Master/texmf-dist/tex/latex/hyperref/hdviwind.def b/Master/texmf-dist/tex/latex/hyperref/hdviwind.def index 41e6f5740c6..408bbd53ac9 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/02/27 v6.75t + [2007/05/29 v6.76g Hyperref driver for dviwindo] \def\Hy@PutCatalog#1{% \pdfmark{pdfmark=/PUT,Raw={\string{Catalog\string} << #1 >>}}% @@ -31,13 +31,13 @@ \def\HyPL@StorePageLabel#1{% \if@filesw \begingroup - \edef\Hy@tempa{\the\Hy@abspage\space<< #1 >> }% + \edef\Hy@tempa{\the\Hy@abspage<<#1>>}% \immediate\write\@mainaux{% \string\HyPL@Entry{\Hy@tempa}% }% \endgroup \fi - } + }% \AfterBeginDocument{% \if@filesw \immediate\write\@mainaux{% @@ -56,7 +56,7 @@ \HyPL@Labels #1% }% - } + }% \fi \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname pdfescapestring\endcsname\relax @@ -73,7 +73,7 @@ }% |def|Hy@ExchangeBackslash#1\#2|@nil{% #1% - |ifx|\#2|\% + |ifx|\#2|\%% |else \\% |Hy@ReturnAfterFi{% @@ -81,7 +81,7 @@ }% |fi }% - } + }% \def\Hy@ExchangeLeftParenthesis#1(#2\@nil{% #1% \ifx\\#2\\% @@ -91,7 +91,7 @@ \Hy@ExchangeLeftParenthesis#2\@nil }% \fi - } + }% \def\Hy@ExchangeRightParenthesis#1)#2\@nil{% #1% \ifx\\#2\\% @@ -101,7 +101,7 @@ \Hy@ExchangeRightParenthesis#2\@nil }% \fi - } + }% \else \def\Hy@pstringdef#1#2{% \edef#1{\pdfescapestring{#2}}% @@ -130,8 +130,8 @@ } \def\hyper@linkstart#1#2{% \expandafter\Hy@colorlink\csname @#1color\endcsname - \special{button: - 10000000 + \special{button: % + 10000000 % \number\baselineskip\space #2% }% @@ -145,7 +145,7 @@ \ifHy@raiselinks \@linkdim\dp\@tempboxa \lower\@linkdim\hbox{% - \special{button: + \special{button: % \number\wd\@tempboxa\space \number\ht\@tempboxa\space #2% @@ -157,7 +157,7 @@ \advance\@linkdim by -6.5\p@ \raise\@linkdim\hbox{}% \else - \special{button: + \special{button: % \number\wd\@tempboxa\space \number\ht\@tempboxa\space #2% @@ -173,7 +173,7 @@ \ifHy@raiselinks \@linkdim\dp\@tempboxa \lower\@linkdim\hbox{% - \special{button: + \special{button: % \number\wd\@tempboxa\space \number\ht\@tempboxa\space launch: \wwwbrowser\space @@ -185,7 +185,7 @@ \advance\@linkdim by -6.5\p@ \raise\@linkdim\hbox{}% \else - \special{button: + \special{button: % \number\wd\@tempboxa\space \number\ht\@tempboxa\space launch: \wwwbrowser\space @@ -203,10 +203,10 @@ \ifHy@raiselinks \@linkdim\dp\@tempboxa \lower\@linkdim\hbox{% - \special{button: + \special{button: % \number\wd\@tempboxa\space \number\ht\@tempboxa\space - #3, + #3,% file: #2% }% \Hy@colorlink\@filecolor#1\Hy@endcolorlink @@ -215,18 +215,18 @@ \advance\@linkdim by -6.5\p@ \raise\@linkdim\hbox{}% \else - \special{button: + \special{button: % \number\wd\@tempboxa\space \number\ht\@tempboxa\space - #3, - file: #2 + #3,% + file: #2% }% \Hy@colorlink\@filecolor#1\Hy@endcolorlink \fi \endgroup } \ifx\@pdfproducer\relax - \def\@pdfproducer{dviwindo + Distiller} + \def\@pdfproducer{dviwindo + Distiller}% \fi \def\PDF@FinishDoc{% \Hy@UseMaketitleInfos @@ -264,9 +264,9 @@ \ifx\@pdfpagescrop\@empty\else \special{PDF: BBox \@pdfpagescrop}% \fi - \pdfmark{pdfmark=/DOCVIEW, - Page=\@pdfstartpage, - View=\@pdfstartview, + \pdfmark{pdfmark=/DOCVIEW,% + Page=\@pdfstartpage,% + View=\@pdfstartview,% PageMode=/\@pdfpagemode }% \ifx\@pdfpagescrop\@empty @@ -301,9 +301,9 @@ /NumCopies \@pdfnumcopies \fi }% - \pdfmark{pdfmark=/PUT, + \pdfmark{pdfmark=/PUT,% Raw={% - \string{Catalog\string} << + \string{Catalog\string}<<% \ifx\Hy@temp\@empty \else /ViewerPreferences<<\Hy@temp>>% @@ -382,6 +382,7 @@ \newsavebox{\pdf@box} \providecommand*{\Hy@setouterhbox}{\sbox} \providecommand*{\Hy@breaklinksunhbox}{\unhbox} +\def\Hy@DEST{/DEST} \def\pdf@rect#1{% \leavevmode \ifHy@breaklinks @@ -406,7 +407,10 @@ \else \raise\dimen@\hbox{\literalps@out{H.R}}% \fi - \pdf@addtoksx{H.B}% + \ifx\pdf@type\Hy@DEST + \else + \pdf@addtoksx{H.B}% + \fi } \newtoks\pdf@toks \newtoks\pdf@defaulttoks @@ -431,9 +435,10 @@ \edef\Hy@temp{#1}% \ifx\Hy@temp\@empty \else - \pdf@addtoks{[#1]}{Border}% + \pdf@addtoks{[#1]\Hy@BorderArrayPatch}{Border}% \fi } +\let\Hy@BorderArrayPatch\@empty \define@key{PDF}{BorderStyle}{% \edef\Hy@temp{#1}% \ifx\Hy@temp\@empty @@ -441,7 +446,12 @@ \pdf@addtoks{<<#1>>}{BS}% \fi } -\define@key{PDF}{Color}{\pdf@addtoks{[#1]}{Color}} +\define@key{PDF}{Color}{% + \ifx\relax#1\relax + \else + \pdf@addtoks{[#1]}{Color}% + \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}} diff --git a/Master/texmf-dist/tex/latex/hyperref/hpdftex.def b/Master/texmf-dist/tex/latex/hyperref/hpdftex.def index e10044dc4c3..33ffc752337 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/02/27 v6.75t + [2007/05/29 v6.76g Hyperref driver for pdfTeX] \let\Hy@PutCatalog\pdfcatalog \ifHy@pagelabels @@ -30,10 +30,10 @@ \toks@\expandafter{\HyPL@Labels}% \xdef\HyPL@Labels{% \the\toks@ - \the\Hy@abspage\space<< #1 >> % + \the\Hy@abspage<<#1>>% }% - } - \AtEndDocument{\clearpage\HyPL@SetPageLabels} + }% + \AtEndDocument{\clearpage\HyPL@SetPageLabels}% \fi \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname pdfescapestring\endcsname\relax @@ -50,7 +50,7 @@ }% |def|Hy@ExchangeBackslash#1\#2|@nil{% #1% - |ifx|\#2|\% + |ifx|\#2|\%% |else \\% |Hy@ReturnAfterFi{% @@ -58,7 +58,7 @@ }% |fi }% - } + }% \def\Hy@ExchangeLeftParenthesis#1(#2\@nil{% #1% \ifx\\#2\\% @@ -68,7 +68,7 @@ \Hy@ExchangeLeftParenthesis#2\@nil }% \fi - } + }% \def\Hy@ExchangeRightParenthesis#1)#2\@nil{% #1% \ifx\\#2\\% @@ -78,7 +78,7 @@ \Hy@ExchangeRightParenthesis#2\@nil }% \fi - } + }% \else \def\Hy@pstringdef#1#2{% \edef#1{\pdfescapestring{#2}}% @@ -92,7 +92,7 @@ \let\pdflastxform\pdflastform \let\pdfrefxform\pdfrefform \else - \pdflinkmargin1pt + \pdflinkmargin1pt % \fi \providecommand*\@pdfview{XYZ} \def\new@pdflink#1{% @@ -125,7 +125,10 @@ \else /H\@pdfhighlight \fi - /C[\CurrentBorderColor]% + \ifx\CurrentBorderColor\relax + \else + /C[\CurrentBorderColor]% + \fi }\Hy@testname \expandafter\Hy@colorlink\csname @#1color\endcsname } @@ -137,14 +140,23 @@ \def\hyper@anchorstart#1{\new@pdflink{#1}\Hy@activeanchortrue} \def\hyper@anchorend{\pdf@endanchor\Hy@activeanchorfalse} \def\hyper@linkstart#1#2{% - \edef\CurrentBorderColor{\csname @#1bordercolor\endcsname}% - \find@pdflink{#1}{#2}} + \@ifundefined{@#1bordercolor}{% + \let\CurrentBorderColor\relax + }{% + \edef\CurrentBorderColor{\csname @#1bordercolor\endcsname}% + }% + \find@pdflink{#1}{#2}% +} \def\hyper@linkend{\close@pdflink} \def\hyper@link#1#2#3{% - \edef\CurrentBorderColor{\csname @#1bordercolor\endcsname}% + \@ifundefined{@#1bordercolor}{% + \let\CurrentBorderColor\relax + }{% + \edef\CurrentBorderColor{\csname @#1bordercolor\endcsname}% + }% \find@pdflink{#1}{#2}#3\close@pdflink } -\def\CurrentBorderColor{\@linkbordercolor} +\let\CurrentBorderColor\@linkbordercolor \def\hyper@linkurl#1#2{% \begingroup \Hy@pstringdef\Hy@pstringURI{#2}% @@ -157,7 +169,10 @@ \else /H\@pdfhighlight \fi - /C[\@urlbordercolor]% + \ifx\@urlbordercolor\relax + \else + /C[\@urlbordercolor]% + \fi }% user{% /Subtype/Link% @@ -184,7 +199,10 @@ \else /H\@pdfhighlight \fi - /C[\@filebordercolor]% + \ifx\@filebordercolor\relax + \else + /C[\@filebordercolor]% + \fi }% user {% /Subtype/Link% @@ -216,7 +234,10 @@ \else /H\@pdfhighlight \fi - /C[\@runbordercolor]% + \ifx\@runbordercolor\relax + \else + /C[\@runbordercolor]% + \fi }% user {% /Subtype/Link% @@ -231,18 +252,18 @@ >>% }% \relax - \Hy@colorlink\@filecolor#2% + \Hy@colorlink\@runcolor#2% \close@pdflink \endgroup } \ifx\@pdfproducer\relax - \def\@pdfproducer{pdfTeX} + \def\@pdfproducer{pdfTeX}% \ifx\eTeXversion\@undefined \else \ifx\eTeXversion\relax \else \ifnum\eTeXversion>0 % - \def\@pdfproducer{pdfeTeX} + \def\@pdfproducer{pdfeTeX}% \fi \fi \fi @@ -252,7 +273,7 @@ \edef\@pdfproducer{% \@pdfproducer \the\pdftexversion.\pdftexrevision - } + }% \else \ifnum\pdftexversion<130 % \edef\@pdfproducer{% @@ -260,7 +281,7 @@ \expandafter\@car\the\pdftexversion\@empty\@nil.% \expandafter\@cdr\the\pdftexversion\@empty\@nil \pdftexrevision - } + }% \else \ifnum\pdftexversion<140 % \else @@ -503,10 +524,13 @@ \else /H\@pdfhighlight \fi - /C[\@menubordercolor]% + \ifx\@menubordercolor\relax + \else + /C[\@menubordercolor]% + \fi }% - user{ - /Subtype /Link + user{% + /Subtype/Link% /A<<% /S/Named/N/#1% >>% @@ -526,7 +550,7 @@ \def\@Form[#1]{% \@ifundefined{textcolor}{\let\textcolor\@gobble}{}% \setkeys{Form}{#1}% - \ifnum\pdftexversion>13 + \ifnum\pdftexversion>13 % \pdfrefobj\OBJ@pdfdocencoding \pdfrefobj\OBJ@ZaDb \pdfrefobj\OBJ@Helv @@ -581,7 +605,7 @@ \def\Fld@width{\DefaultWidthofChoiceMenu}% \def\Fld@height{\DefaultHeightofChoiceMenu}% \bgroup - \Fld@menulength=0 + \Fld@menulength=0 % \@tempdima\z@ \@for\@curropt:=#3\do{% \expandafter\Fld@checkequals\@curropt==\\% @@ -610,8 +634,8 @@ \ifFld@popdown\def\Fld@flags{/Ff 131072}\fi \ifx\Fld@flags\@empty \@tempdima=\the\Fld@menulength\Fld@charsize - \advance\@tempdima by \Fld@borderwidth bp - \advance\@tempdima by \Fld@borderwidth bp + \advance\@tempdima by \Fld@borderwidth bp % + \advance\@tempdima by \Fld@borderwidth bp % \edef\Fld@height{\the\@tempdima}% \fi \@@Listbox{#3}% @@ -621,7 +645,7 @@ \egroup } \def\@@Radio#1{% - \Fld@listcount=0 + \Fld@listcount=0 % \@for\@curropt:=#1\do{% \expandafter\Fld@checkequals\@curropt==\\% \Hy@StepCount\Fld@listcount @@ -630,21 +654,21 @@ \Hy@escapeform\PDFForm@Radio \pdfstartlink user {% \PDFForm@Radio - /AP << - /N << + /AP<<% + /N<<% /\@currValue\space \DingObject - >> - >> + >>% + >>% }% \relax \MakeRadioField{\Fld@width}{\Fld@height}\pdfendlink - \space% deliberate space between radio buttons + \space % deliberate space between radio buttons }% } \newcount\Fld@listcount \def\@@Listbox#1{% \Choice@toks={ }% - \Fld@listcount=0 + \Fld@listcount=0 % \@for\@curropt:=#1\do{% \expandafter\Fld@checkequals\@curropt==\\% \Hy@StepCount\Fld@listcount @@ -685,7 +709,7 @@ \Hy@escapeform\PDFForm@Submit \pdfstartlink user {% \PDFForm@Submit - /AP << /N \SubmitObject\space /D \SubmitPObject >> + /AP<</N \SubmitObject/D \SubmitPObject>>% }% \relax \MakeButtonField{#2}% @@ -746,33 +770,37 @@ /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis ] >> } \edef\OBJ@pdfdocencoding{\the\pdflastobj} -\pdfobj { - << - /Type /Font - /Subtype /Type1 - /Name /ZaDb - /BaseFont /ZapfDingbats ->> +\pdfobj{% + <<% + /Type/Font% + /Subtype/Type1% + /Name/ZaDb% + /BaseFont/ZapfDingbats% + >>% } \edef\OBJ@ZaDb{\the\pdflastobj} -\pdfobj { << - /Type /Font - /Subtype /Type1 - /Name /Helv - /BaseFont /Helvetica - /Encoding \OBJ@pdfdocencoding\space 0 R - >> +\pdfobj{% + <<% + /Type/Font% + /Subtype/Type1% + /Name/Helv% + /BaseFont/Helvetica% + /Encoding \OBJ@pdfdocencoding\space 0 R% + >>% } \edef\OBJ@Helv{\the\pdflastobj} -\pdfobj { - << - /Fields [] - /DR << - /Font << /ZaDb \OBJ@ZaDb\space 0 R /Helv \OBJ@Helv\space0 R >> - >> - /DA (/Helv 10 Tf 0 g ) - /NeedAppearances true - >> +\pdfobj{% + <<% + /Fields[]% + /DR<<% + /Font<<% + /ZaDb \OBJ@ZaDb\space 0 R% + /Helv \OBJ@Helv\space0 R% + >>% + >>% + /DA(/Helv 10 Tf 0 g)% + /NeedAppearances true% + >>% } \edef\OBJ@acroform{\the\pdflastobj} \begingroup\expandafter\expandafter\expandafter\endgroup @@ -817,80 +845,99 @@ \Hy@escapeform{}% \fi \def\PDFForm@Check{% - /Subtype /Widget - \ifFld@hidden /F 6 \else /F 4 \fi - /T (\Hy@escapestring{\Fld@name}) - /Q \Fld@align\space - /BS << /W \Fld@borderwidth\space /S /\Fld@borderstyle\space >> - /MK << - /BC [\Fld@bordercolor] - \ifx\Fld@bcolor\@empty + /Subtype/Widget% + \ifFld@hidden /F 6\else /F 4\fi + /T(\Hy@escapestring{\Fld@name})% + /Q \Fld@align + /BS<</W \Fld@borderwidth /S/\Fld@borderstyle>>% + /MK<<% + \ifnum\Fld@rotation=\z@ + \else + /R \Fld@rotation + \fi + \ifx\Fld@bordercolor\relax \else - /BG [\Fld@bcolor] + /BC[\Fld@bordercolor]% \fi - /CA (\Hy@escapestring{\Fld@cbsymbol}) - >> - /DA (/ZaDb \strip@pt\Fld@charsize\space Tf \Fld@color\space rg) - /FT /Btn - /H /P - \ifFld@checked /V /Yes \else /V /Off \fi + \ifx\Fld@bcolor\relax + \else + /BG[\Fld@bcolor]% + \fi + /CA(\Hy@escapestring{\Fld@cbsymbol})% + >>% + /DA(/ZaDb \strip@pt\Fld@charsize\space Tf% + \ifx\Fld@color\@empty\else\space\Fld@color\fi)% + /FT/Btn% + /H/P% + \ifFld@checked /V/Yes\else /V/Off\fi } \def\PDFForm@Push{% - /Subtype/Widget + /Subtype/Widget% \ifFld@hidden /F 6\else /F 4\fi /T(\Hy@escapestring{\Fld@name})% /FT/Btn% - /Ff 65540 + /Ff 65540% /H/P% /BS<</W \Fld@borderwidth/S/\Fld@borderstyle>>% /MK<<% - /BC[\Fld@bordercolor]% - >>% - /A<</S/JavaScript/JS(\Hy@escapestring{\Fld@onclick})>>% -} -\def\Fld@additionalactions{% - /AA << - \ifx\Fld@keystroke@code\@empty - \else - /K<</S/JavaScript/JS(\Hy@escapestring{\Fld@keystroke@code})>>% - \fi - \ifx\Fld@format@code\@empty + \ifnum\Fld@rotation=\z@ \else - /F<</S/JavaScript/JS(\Hy@escapestring{\Fld@format@code})>>% + /R \Fld@rotation \fi - \ifx\Fld@validate@code\@empty + \ifx\Fld@bordercolor\relax \else - /V<</S/JavaScript/JS(\Hy@escapestring{\Fld@validate@code})>>% - \fi - \ifx\Fld@calculate@code\@empty - \else - /C<</S/JavaScript/JS(\Hy@escapestring{\Fld@calculate@code})>>% - \fi - \ifx\Fld@onfocus@code\@empty - \else - /Fo<</S/JavaScript/JS(\Hy@escapestring{\Fld@onfocus@code})>>% - \fi - \ifx\Fld@onblur@code\@empty - \else - /Bl<</S/JavaScript/JS(\Hy@escapestring{\Fld@onblur@code})>>% - \fi - \ifx\Fld@onmousedown@code\@empty - \else - /D<</S/JavaScript/JS(\Hy@escapestring{\Fld@onmousedown@code})>>% - \fi - \ifx\Fld@onmouseup@code\@empty - \else - /U<</S/JavaScript/JS(\Hy@escapestring{\Fld@onmouseup@code})>>% - \fi - \ifx\Fld@onenter@code\@empty - \else - /E<</S/JavaScript/JS(\Hy@escapestring{\Fld@onenter@code})>>% - \fi - \ifx\Fld@onexit@code\@empty - \else - /X<</S/JavaScript/JS(\Hy@escapestring{\Fld@onexit@code})>>% + /BC[\Fld@bordercolor]% \fi >>% + /A<</S/JavaScript/JS(\Hy@escapestring{\Fld@onclick})>>% +} +\def\Fld@@additionalactions{% + \ifx\Fld@keystroke@code\@empty + \else + /K<</S/JavaScript/JS(\Hy@escapestring{\Fld@keystroke@code})>>% + \fi + \ifx\Fld@format@code\@empty + \else + /F<</S/JavaScript/JS(\Hy@escapestring{\Fld@format@code})>>% + \fi + \ifx\Fld@validate@code\@empty + \else + /V<</S/JavaScript/JS(\Hy@escapestring{\Fld@validate@code})>>% + \fi + \ifx\Fld@calculate@code\@empty + \else + /C<</S/JavaScript/JS(\Hy@escapestring{\Fld@calculate@code})>>% + \fi + \ifx\Fld@onfocus@code\@empty + \else + /Fo<</S/JavaScript/JS(\Hy@escapestring{\Fld@onfocus@code})>>% + \fi + \ifx\Fld@onblur@code\@empty + \else + /Bl<</S/JavaScript/JS(\Hy@escapestring{\Fld@onblur@code})>>% + \fi + \ifx\Fld@onmousedown@code\@empty + \else + /D<</S/JavaScript/JS(\Hy@escapestring{\Fld@onmousedown@code})>>% + \fi + \ifx\Fld@onmouseup@code\@empty + \else + /U<</S/JavaScript/JS(\Hy@escapestring{\Fld@onmouseup@code})>>% + \fi + \ifx\Fld@onenter@code\@empty + \else + /E<</S/JavaScript/JS(\Hy@escapestring{\Fld@onenter@code})>>% + \fi + \ifx\Fld@onexit@code\@empty + \else + /X<</S/JavaScript/JS(\Hy@escapestring{\Fld@onexit@code})>>% + \fi +} +\def\Fld@additionalactions{% + \if-\Fld@@additionalactions-% + \else + /AA<<\Fld@@additionalactions>>% + \fi } \def\PDFForm@List{% /Subtype/Widget% @@ -900,13 +947,21 @@ /Q \Fld@align /BS<</W \Fld@borderwidth /S/\Fld@borderstyle>>% /MK<<% - /BC[\Fld@bordercolor]% - \ifx\Fld@bcolor\@empty + \ifnum\Fld@rotation=\z@ + \else + /R \Fld@rotation + \fi + \ifx\Fld@bordercolor\relax + \else + /BC[\Fld@bordercolor]% + \fi + \ifx\Fld@bcolor\relax \else /BG[\Fld@bcolor]% \fi >>% - /DA(/Helv \strip@pt\Fld@charsize\space Tf \Fld@color\space rg)% + /DA(/Helv \strip@pt\Fld@charsize\space Tf% + \ifx\Fld@color\@empty\else\space\Fld@color\fi)% /Opt[\the\Choice@toks]% \ifx\Fld@default\relax \else @@ -925,17 +980,25 @@ /T(\Hy@escapestring{\Fld@name})% /FT/Btn% /Ff 49152% - /H/P + /H/P% /BS<</W \Fld@borderwidth/S/\Fld@borderstyle>>% /MK<<% - /BC[\Fld@bordercolor]% - \ifx\Fld@bcolor\@empty + \ifnum\Fld@rotation=\z@ + \else + /R \Fld@rotation + \fi + \ifx\Fld@bordercolor\relax + \else + /BC[\Fld@bordercolor]% + \fi + \ifx\Fld@bcolor\relax \else /BG[\Fld@bcolor]% \fi /CA(H)% >>% - /DA(/ZaDb \strip@pt\Fld@charsize\space Tf \Fld@color\space rg)% + /DA(/ZaDb \strip@pt\Fld@charsize\space Tf% + \ifx\Fld@color\@empty\else\space\Fld@color\fi)% \ifx\@currValue\Fld@default /V/\Fld@default \else @@ -946,18 +1009,26 @@ \def\PDFForm@Text{% /Subtype/Widget% \ifFld@hidden /F 6\else /F 4\fi - /T(\Hy@escapestring{\Fld@name}) + /T(\Hy@escapestring{\Fld@name})% /Q \Fld@align /FT/Tx% /BS<</W \Fld@borderwidth\space /S /\Fld@borderstyle>>% /MK<<% - /BC[\Fld@bordercolor]% - \ifx\Fld@bcolor\@empty + \ifnum\Fld@rotation=\z@ + \else + /R \Fld@rotation + \fi + \ifx\Fld@bordercolor\relax + \else + /BC[\Fld@bordercolor]% + \fi + \ifx\Fld@bcolor\relax \else /BG[\Fld@bcolor]% \fi >>% - /DA(/Helv \strip@pt\Fld@charsize\space Tf \Fld@color\space rg)% + /DA(/Helv \strip@pt\Fld@charsize\space Tf% + \ifx\Fld@color\@empty\else\space\Fld@color\fi)% /DV(\Hy@escapestring{\Fld@default})% /V(\Hy@escapestring{\Fld@value})% \Fld@additionalactions @@ -970,7 +1041,7 @@ \ifFld@readonly /Ff 1\fi \fi \fi - \ifnum\Fld@maxlen>0/MaxLen \Fld@maxlen \fi + \ifnum\Fld@maxlen>\z@/MaxLen \Fld@maxlen \fi } \def\PDFForm@Submit{% /Subtype/Widget% @@ -981,7 +1052,14 @@ /H/P% /BS<</W \Fld@borderwidth/S/\Fld@borderstyle>>% /MK<<% - /BC[\Fld@bordercolor]% + \ifnum\Fld@rotation=\z@ + \else + /R \Fld@rotation + \fi + \ifx\Fld@bordercolor\relax + \else + /BC[\Fld@bordercolor]% + \fi >>% /A<<% /S/SubmitForm% @@ -1001,7 +1079,14 @@ /DA(/Helv \strip@pt\Fld@charsize\space Tf 0 0 1 rg)% /Ff 65540% /MK<<% - /BC[\Fld@bordercolor]% + \ifnum\Fld@rotation=\z@ + \else + /R \Fld@rotation + \fi + \ifx\Fld@bordercolor\relax + \else + /BC[\Fld@bordercolor]% + \fi >>% /BS<</W \Fld@borderwidth/S/\Fld@borderstyle>>% /A<</S/ResetForm>>% @@ -1013,7 +1098,8 @@ \else \@@writetorep{#1}{#2}{#3}{#4}{#5}% \fi - \fi} + \fi +} \def\Hy@currentbookmarklevel{0} \def\Hy@numberline#1{#1 } \def\@@writetorep#1#2#3#4#5{% @@ -1023,16 +1109,16 @@ \edef\Hy@level{#4}% \ifx\Hy@levelcheck Y% \@tempcnta\Hy@level\relax - \advance\@tempcnta by -1 + \advance\@tempcnta by -1 % \ifnum\Hy@currentbookmarklevel<\@tempcnta \advance\@tempcnta by -\Hy@currentbookmarklevel\relax - \advance\@tempcnta by 1 + \advance\@tempcnta by 1 % \Hy@Warning{% Difference (\the\@tempcnta) between bookmark levels is % greater \MessageBreak than one, level fixed% }% \@tempcnta\Hy@currentbookmarklevel - \advance\@tempcnta by 1 + \advance\@tempcnta by 1 % \edef\Hy@level{\the\@tempcnta}% \fi \else @@ -1041,7 +1127,7 @@ \global\let\Hy@currentbookmarklevel\Hy@level \@tempcnta\Hy@level\relax \expandafter\xdef\csname Parent\Hy@level\endcsname{#3}% - \advance\@tempcnta by -1 + \advance\@tempcnta by -1 % \edef\Hy@tempa{#3}% \edef\Hy@tempb{\csname Parent\the\@tempcnta\endcsname}% \ifx\Hy@tempa\Hy@tempb @@ -1083,7 +1169,7 @@ \@tempcnta\Hy@currentbookmarklevel \Hy@StepCount\@tempcnta \expandafter\pdfbookmark\expandafter[\the\@tempcnta]{#1}{#2}% - \advance\@tempcnta by -1 + \advance\@tempcnta by -1 % \xdef\Hy@currentbookmarklevel{\the\@tempcnta}% } \renewcommand\pdfbookmark[3][0]{% @@ -1119,7 +1205,7 @@ \else \if@filesw \newwrite\@outlinefile - \immediate\openout\@outlinefile=\jobname.out + \immediate\openout\@outlinefile=\jobname.out\relax \ifHy@typexml \immediate\write\@outlinefile{<relaxxml>\relax}% \fi @@ -1139,7 +1225,7 @@ } \def\calc@bm@number#1{% \@tempcnta=\check@bm@number{#1}\relax - \advance\@tempcnta by1 + \advance\@tempcnta by 1 % \expandafter\xdef\csname B_#1\endcsname{\the\@tempcnta}% } \ifHy@implicit diff --git a/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg b/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg index a2b22936ba6..af002e47e95 100644 --- a/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg +++ b/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg @@ -22,11 +22,11 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{htex4ht.cfg} - [2007/02/27 v6.75t + [2007/05/29 v6.76g Hyperref configuration file for TeX4ht] \IfFileExists{\jobname.cfg}{\endinput}{} \Preamble{html} - \begin{document} + \begin{document}% \EndPreamble \def\TeX{TeX} \def\OMEGA{Omega} diff --git a/Master/texmf-dist/tex/latex/hyperref/htex4ht.def b/Master/texmf-dist/tex/latex/hyperref/htex4ht.def index 405d7f88b3b..17eea744c04 100644 --- a/Master/texmf-dist/tex/latex/hyperref/htex4ht.def +++ b/Master/texmf-dist/tex/latex/hyperref/htex4ht.def @@ -22,11 +22,14 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{htex4ht.def} - [2007/02/27 v6.75t + [2007/05/29 v6.76g Hyperref driver for TeX4ht] -\@ifpackageloaded{tex4ht} - {\typeout{hyperref tex4ht: tex4ht already loaded}}% - {\RequirePackage[htex4ht]{tex4ht}} +\@ifpackageloaded{tex4ht}{% + \typeout{hyperref tex4ht: tex4ht already loaded}% +}{% + \RequirePackage[htex4ht]{tex4ht}% +} +\hyperlinkfileprefix{} \def\PDF@FinishDoc{} \def\PDF@SetupDoc{% \ifx\@baseurl\@empty @@ -137,33 +140,34 @@ } \def\@@PasswordField{% \HCode{% - <input type="password" - id="\Fld@name" - name="\Fld@name" - \ifFld@hidden type="hidden"\fi - value="\Fld@default" + <input type="password" % + id="\Fld@name" % + name="\Fld@name" % + \ifFld@hidden type="hidden" \fi + value="\Fld@default" % \the\Field@toks >% }% } \def\@@TextField{% \ifFld@multiline - \HCode{<textarea + \HCode{<textarea % \ifFld@readonly readonly \fi - id="\Fld@name" - name="\Fld@name" - \ifFld@hidden type="hidden"\fi + id="\Fld@name" % + name="\Fld@name" % + \ifFld@hidden type="hidden" \fi \the\Field@toks>% }% \Fld@default \HCode{</textarea>}% \else - \HCode{<input type="textbox" + \HCode{<input type="textbox" % \ifFld@readonly readonly \fi - id="\Fld@name" - name="\Fld@name" - \ifFld@hidden type="hidden"\fi - value="\Fld@default" \the\Field@toks> + id="\Fld@name" % + name="\Fld@name" % + \ifFld@hidden type="hidden" \fi + value="\Fld@default" % + \the\Field@toks>% }% \fi } @@ -184,15 +188,17 @@ \egroup } \def\Fld@findlength#1\\{% - \Fld@menulength=0 + \Fld@menulength=0 % \@for\@curropt:=#1\do{\Hy@StepCount\Fld@menulength}% } \def\@@Menu#1\\{% - \HCode{<select size="\the\Fld@menulength" - name="\Fld@name" \the\Field@toks>}% + \HCode{<select size="\the\Fld@menulength" % + name="\Fld@name" % + \the\Field@toks>% + }% \@for\@curropt:=#1\do{% \expandafter\Fld@checkequals\@curropt==\\% - \HCode{<option + \HCode{<option % \ifx\@curropt\Fld@default selected \fi value="\@currValue">\@currDisplay</option>% }% @@ -202,10 +208,10 @@ \def\@@Radio#1\\{% \@for\@curropt:=#1\do{% \expandafter\Fld@checkequals\@curropt==\\% - \HCode{<input type="radio" + \HCode{<input type="radio" % \ifx\@curropt\Fld@default checked \fi - name="\Fld@name" - value="\@currValue" + name="\Fld@name" % + value="\@currValue" % \the\Field@toks>% }% \@currDisplay @@ -216,9 +222,9 @@ \bgroup \Field@toks={ }% \setkeys{Field}{#1}% - \HCode{<input type="button" - name="\Fld@name" - value="#2" + \HCode{<input type="button" % + name="\Fld@name" % + value="#2" % \the\Field@toks>% }% \HCode{</button>}% @@ -237,13 +243,13 @@ \bgroup \Field@toks={ }% \setkeys{Field}{#1}% - \HCode{<input type="checkbox" + \HCode{<input type="checkbox" % \ifFld@checked checked \fi \ifFld@disabled disabled \fi \ifFld@readonly readonly \fi - name="\Fld@name" - \ifFld@hidden type="hidden"\fi - value="\Fld@default" + name="\Fld@name" % + \ifFld@hidden type="hidden" \fi + value="\Fld@default" % \the\Field@toks>% #2% }% diff --git a/Master/texmf-dist/tex/latex/hyperref/htexture.def b/Master/texmf-dist/tex/latex/hyperref/htexture.def index 767dd283d31..1d1b9fe7af3 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/02/27 v6.75t + [2007/05/29 v6.76g Hyperref driver for Textures] \begingroup \obeylines % @@ -43,24 +43,24 @@ \AtBeginDvi{% \headerps@out{% /betterpdfmark {% - systemdict begin - dup /BP eq - {cleartomark gsave nulldevice [} - {dup /EP eq - {cleartomark cleartomark grestore} - {cleartomark} - ifelse - }ifelse - end + systemdict begin % + dup /BP eq% + {cleartomark gsave nulldevice [}% + {dup /EP eq% + {cleartomark cleartomark grestore}% + {cleartomark}% + ifelse% + }ifelse % + end% }def\Hy@ps@CR - __pdfmark__ not{/pdfmark /betterpdfmark load def}if - systemdict /pdfmark known - { - userdict /?pdfmark systemdict /load get put - }{ - userdict /?pdfmark systemdict /pop get put - } - ifelse + __pdfmark__ not{/pdfmark /betterpdfmark load def}if % + systemdict /pdfmark known% + {% + userdict /?pdfmark systemdict /load get put% + }{% + userdict /?pdfmark systemdict /pop get put% + }% + ifelse% }% end of \headerps@out }% end of \AtBeginDvi \input{pdfmark.def}% @@ -72,38 +72,39 @@ \providecommand*\@pdfview{XYZ} \providecommand*\@pdfviewparams{ H.V} \headerps@out{% - /vsize {\Hy@pageheight} def - /DvipsToPDF {} def - /PDFToDvips {} def + /vsize {\Hy@pageheight} def% + /DvipsToPDF {} def% + /PDFToDvips {} def% + /BPToDvips {} def% /HyperBorder { 1 PDFToDvips } def\Hy@ps@CR /H.V {pdf@hoff pdf@voff null} def\Hy@ps@CR /H.B {/Rect[pdf@llx pdf@lly pdf@urx pdf@ury]} def\Hy@ps@CR - /H.S { - currentpoint - HyperBorder add /pdf@lly exch def - dup DvipsToPDF /pdf@hoff exch def - HyperBorder sub /pdf@llx exch def + /H.S {% + currentpoint % + HyperBorder add /pdf@lly exch def % + dup DvipsToPDF 72 add /pdf@hoff exch def % + HyperBorder sub /pdf@llx exch def% } def\Hy@ps@CR - /H.L { - 2 sub - PDFToDvips /HyperBase exch def - currentpoint - HyperBase sub /pdf@ury exch def - /pdf@urx exch def + /H.L {% + 2 sub % + PDFToDvips /HyperBase exch def % + currentpoint % + HyperBase sub /pdf@ury exch def% + /pdf@urx exch def% } def\Hy@ps@CR - /H.A { - H.L - currentpoint exch pop - vsize 72 sub exch DvipsToPDF + /H.A {% + H.L % + currentpoint exch pop % + vsize 72 sub exch DvipsToPDF % HyperBase sub % baseline skip - sub /pdf@voff exch def + sub /pdf@voff exch def% } def\Hy@ps@CR - /H.R { - currentpoint - HyperBorder sub /pdf@ury exch def - HyperBorder add /pdf@urx exch def - currentpoint exch pop vsize 72 sub - exch DvipsToPDF sub /pdf@voff exch def + /H.R {% + currentpoint % + HyperBorder sub /pdf@ury exch def % + HyperBorder add /pdf@urx exch def % + currentpoint exch pop vsize 72 sub % + exch DvipsToPDF sub /pdf@voff exch def% } def\Hy@ps@CR } \AfterBeginDocument{% diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtex.def b/Master/texmf-dist/tex/latex/hyperref/hvtex.def index dc2edcde006..e3dec84dce8 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/02/27 v6.75t + [2007/05/29 v6.76g Hyperref driver for VTeX in PDF/PS mode] \edef\Hy@VTeXversion{% \ifx\VTeXversion\@undefined @@ -41,17 +41,17 @@ \Hy@WarningNoLine{% VTeX 6.59g or above required for pdfpagelabels% }% - } + }% \else \gdef\Hy@PutCatalog#1{% - \Hy@vt@PutCatalog#1/PageLabels <<>>\@nil - } - \gdef\Hy@vt@PutCatalog#1/PageLabels <<#2>>#3\@nil{% + \Hy@vt@PutCatalog#1/PageLabels<<>>\@nil + }% + \gdef\Hy@vt@PutCatalog#1/PageLabels<<#2>>#3\@nil{% \ifx\\#2\\% \else \immediate\special{!pdfpagelabels #2}% \fi - } + }% \fi \endgroup \ifHy@pagelabels @@ -59,10 +59,10 @@ \toks@\expandafter{\HyPL@Labels}% \xdef\HyPL@Labels{% \the\toks@ - \the\Hy@abspage\space<< #1 >> % + \the\Hy@abspage<<#1>>% }% - } - \AtEndDocument{\clearpage\HyPL@SetPageLabels} + }% + \AtEndDocument{\clearpage\HyPL@SetPageLabels}% \fi \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname pdfescapestring\endcsname\relax @@ -79,7 +79,7 @@ }% |def|Hy@ExchangeBackslash#1\#2|@nil{% #1% - |ifx|\#2|\% + |ifx|\#2|\%% |else \\% |Hy@ReturnAfterFi{% @@ -87,7 +87,7 @@ }% |fi }% - } + }% \def\Hy@ExchangeLeftParenthesis#1(#2\@nil{% #1% \ifx\\#2\\% @@ -97,7 +97,7 @@ \Hy@ExchangeLeftParenthesis#2\@nil }% \fi - } + }% \def\Hy@ExchangeRightParenthesis#1)#2\@nil{% #1% \ifx\\#2\\% @@ -107,7 +107,7 @@ \Hy@ExchangeRightParenthesis#2\@nil }% \fi - } + }% \else \def\Hy@pstringdef#1#2{% \edef#1{\pdfescapestring{#2}}% @@ -143,7 +143,7 @@ \providecommand*\@pdfview{xyz} \providecommand*\@pdfborder{0 0 1} \providecommand*\@pdfborderstyle{} -\def\CurrentBorderColor{\@linkbordercolor} +\let\CurrentBorderColor\@linkbordercolor \def\hyper@anchor#1{% \Hy@SaveLastskip \begingroup @@ -173,12 +173,22 @@ \def\hyper@linkstart#1#2{% \Hy@pstringdef\Hy@pstringURI{#2}% \expandafter\Hy@colorlink\csname @#1color\endcsname - \edef\CurrentBorderColor{\csname @#1bordercolor\endcsname}% + \@ifundefined{@#1bordercolor}{% + \let\CurrentBorderColor\relax + }{% + \edef\CurrentBorderColor{\csname @#1bordercolor\endcsname}% + }% \def\Hy@tempa{#1}% \ifx\Hy@tempa\@urltype \special{!% aref <u=/Type /Action /S /URI /URI (\Hy@pstringURI)>;% - a=<\Hy@setpdfborder /C [\CurrentBorderColor]>% + a=<% + \Hy@setpdfborder + \ifx\CurrentBorderColor\relax + \else + /C [\CurrentBorderColor]% + \fi + >% }% \else \protected@edef\Hy@testname{#2}% @@ -187,7 +197,13 @@ \fi \special{!% aref \Hy@testname;% - a=<\Hy@setpdfborder /C [\CurrentBorderColor]>% + a=<% + \Hy@setpdfborder + \ifx\CurrentBorderColor\relax + \else + /C [\CurrentBorderColor]% + \fi + >% }% \fi } @@ -201,7 +217,13 @@ aref <% \ifnum\Hy@VTeXversion>753 \ifHy@newwindow n\fi\fi f=#2>#3;% - a=<\Hy@setpdfborder /C [\@filebordercolor]>% + a=<% + \Hy@setpdfborder + \ifx\@filebordercolor\relax + \else + /C [\@filebordercolor]% + \fi + >% }% \Hy@colorlink\@filecolor#1\Hy@endcolorlink \special{!endaref}% @@ -213,14 +235,24 @@ \leavevmode \special{!% aref <u=/Type /Action /S /URI /URI (\Hy@pstringURI)>;% - a=<\Hy@setpdfborder /C [\@urlbordercolor]>% + a=<% + \Hy@setpdfborder + \ifx\@urlbordercolor\relax + \else + /C [\@urlbordercolor]% + \fi + >% }% \Hy@colorlink\@urlcolor#1\Hy@endcolorlink \special{!endaref}% \endgroup } \def\hyper@link#1#2#3{% - \edef\CurrentBorderColor{\csname @#1bordercolor\endcsname}% + \@ifundefined{@#1bordercolor}{% + \let\CurrentBorderColor\relax + }{% + \edef\CurrentBorderColor{\csname @#1bordercolor\endcsname}% + }% \leavevmode \protected@edef\Hy@testname{#2}% \ifx\Hy@testname\@empty @@ -228,7 +260,13 @@ \fi \special{!% aref \Hy@testname;% - a=<\Hy@setpdfborder /C [\CurrentBorderColor]>% + a=<% + \Hy@setpdfborder + \ifx\CurrentBorderColor\relax + \else + /C [\CurrentBorderColor]% + \fi + >% }% \expandafter\Hy@colorlink\csname @#1color\endcsname#3\Hy@endcolorlink \special{!endaref}% @@ -240,24 +278,36 @@ \Hy@pstringdef\Hy@pstringF{#1}% \Hy@pstringdef\Hy@pstringP{#3}% \leavevmode - \special{!aref + \special{!aref % <u=% - /Type /Action - /S /Launch - /F (\Hy@pstringF) + /Type/Action% + /S/Launch% + /F(\Hy@pstringF)% \ifHy@newwindow /NewWindow true \fi - \ifx\\#3\\\else /Win << /F (\Hy@pstringF) /P (\Hy@pstringP) >> \fi% + \ifx\\#3\\\else /Win<</F(\Hy@pstringF)/P(\Hy@pstringP)>>\fi% >;% - a=<\Hy@setpdfborder /C [\@runbordercolor]>% + a=<% + \Hy@setpdfborder + \ifx\@runbordercolor\relax + \else + /C[\@runbordercolor]% + \fi + >% }% - \Hy@colorlink\@filecolor#2\Hy@endcolorlink + \Hy@colorlink\@runcolor#2\Hy@endcolorlink \special{!endaref}% } \def\Acrobatmenu#1#2{% \leavevmode \special{!% aref <u=/S /Named /N /#1>;% - a=<\Hy@setpdfborder /C [\@menubordercolor]>% + a=<% + \Hy@setpdfborder + \ifx\@menubordercolor\relax + \else + /C[\@menubordercolor]% + \fi + >% }% \Hy@colorlink\@menucolor#2\Hy@endcolorlink \special{!endaref}% @@ -272,23 +322,23 @@ \hvtex@parse@trans\@pdfpagetransition \fi \fi - } - \def\hvtex@trans@effect@Blinds{\def\hvtex@trans@code{B}} - \def\hvtex@trans@effect@Box{\def\hvtex@trans@code{X}} - \def\hvtex@trans@effect@Dissolve{\def\hvtex@trans@code{D}} - \def\hvtex@trans@effect@Glitter{\def\hvtex@trans@code{G}} - \def\hvtex@trans@effect@Split{\def\hvtex@trans@code{S}} - \def\hvtex@trans@effect@Wipe{\def\hvtex@trans@code{W}} - \def\hvtex@trans@effect@R{\def\hvtex@trans@code{R}} - \def\hvtex@par@dimension{/Dm} - \def\hvtex@par@direction{/Di} - \def\hvtex@par@duration{/D} - \def\hvtex@par@motion{/M} - \def\hvtex@gettoken{\expandafter\hvtex@gettoken@\hvtex@buffer\@nil} + }% + \def\hvtex@trans@effect@Blinds{\def\hvtex@trans@code{B}}% + \def\hvtex@trans@effect@Box{\def\hvtex@trans@code{X}}% + \def\hvtex@trans@effect@Dissolve{\def\hvtex@trans@code{D}}% + \def\hvtex@trans@effect@Glitter{\def\hvtex@trans@code{G}}% + \def\hvtex@trans@effect@Split{\def\hvtex@trans@code{S}}% + \def\hvtex@trans@effect@Wipe{\def\hvtex@trans@code{W}}% + \def\hvtex@trans@effect@R{\def\hvtex@trans@code{R}}% + \def\hvtex@par@dimension{/Dm}% + \def\hvtex@par@direction{/Di}% + \def\hvtex@par@duration{/D}% + \def\hvtex@par@motion{/M}% + \def\hvtex@gettoken{\expandafter\hvtex@gettoken@\hvtex@buffer\@nil}% \def\hvtex@gettoken@#1 #2\@nil{% \edef\hvtex@token{#1}% \edef\hvtex@buffer{#2}% - } + }% \def\hvtex@parse@trans#1{% \let\hvtex@trans@code\@empty \let\hvtex@param@dimension\@empty @@ -305,7 +355,7 @@ \fi \csname hvtex@trans@effect@\hvtex@token\endcsname \hvtex@trans@params - } + }% \def\hvtex@trans@params{% \ifx\hvtex@buffer\@empty \else @@ -333,7 +383,7 @@ \let\next\hvtex@trans@params \fi \next - } + }% \def\hvtex@produce@trans{% \let\vtex@trans@special\@empty \if S\hvtex@trans@code @@ -362,7 +412,7 @@ \fi \special{!trans \vtex@trans@special}% \fi - } + }% \def\hyper@pageduration{% \ifx\@pdfpageduration\relax \else @@ -372,20 +422,20 @@ \special{!duration \@pdfpageduration}% \fi \fi - } + }% \def\hyper@pagehidden{% \ifHy@useHidKey \special{!hidden\ifHy@pdfpagehidden +\else -\fi}% \fi - } + }% \fi \ifx\@pdfproducer\relax - \def\@pdfproducer{VTeX} + \def\@pdfproducer{VTeX}% \ifnum\Hy@VTeXversion>\z@ \count@\VTeXversion - \divide\count@ 100 - \edef\@pdfproducer{\@pdfproducer\space v\the\count@} - \multiply\count@ -100 + \divide\count@ 100 % + \edef\@pdfproducer{\@pdfproducer\space v\the\count@}% + \multiply\count@ -100 % \advance\count@\VTeXversion \edef\@pdfproducer{% \@pdfproducer @@ -407,7 +457,7 @@ \ifx\gexmode\@undefined\else \ifnum\gexmode>\z@\space with GeX\fi \fi - } + }% \fi \fi \def\PDF@SetupDoc{% @@ -481,7 +531,8 @@ \else \@@writetorep{#1}{#2}{#3}{#4}{#5}% \fi - \fi} + \fi +} \def\Hy@currentbookmarklevel{0} \def\Hy@numberline#1{#1 } \def\@@writetorep#1#2#3#4#5{% @@ -491,16 +542,16 @@ \edef\Hy@level{#4}% \ifx\Hy@levelcheck Y% \@tempcnta\Hy@level\relax - \advance\@tempcnta by -1 + \advance\@tempcnta by -1 % \ifnum\Hy@currentbookmarklevel<\@tempcnta \advance\@tempcnta by -\Hy@currentbookmarklevel\relax - \advance\@tempcnta by 1 + \advance\@tempcnta by 1 % \Hy@Warning{% Difference (\the\@tempcnta) between bookmark levels is % greater \MessageBreak than one, level fixed% }% \@tempcnta\Hy@currentbookmarklevel - \advance\@tempcnta by 1 + \advance\@tempcnta by 1 % \edef\Hy@level{\the\@tempcnta}% \fi \else @@ -509,7 +560,7 @@ \global\let\Hy@currentbookmarklevel\Hy@level \@tempcnta\Hy@level\relax \expandafter\xdef\csname Parent\Hy@level\endcsname{#3}% - \advance\@tempcnta by -1 + \advance\@tempcnta by -1 % \edef\Hy@tempa{#3}% \edef\Hy@tempb{\csname Parent\the\@tempcnta\endcsname}% \ifx\Hy@tempa\Hy@tempb @@ -551,7 +602,7 @@ \@tempcnta\Hy@currentbookmarklevel \Hy@StepCount\@tempcnta \expandafter\pdfbookmark\expandafter[\the\@tempcnta]{#1}{#2}% - \advance\@tempcnta by -1 + \advance\@tempcnta by -1 % \xdef\Hy@currentbookmarklevel{\the\@tempcnta}% } \renewcommand\pdfbookmark[3][0]{% @@ -562,12 +613,12 @@ \def\@BOOKMARK[#1]{\@ifnextchar[{\@@BOOKMARK[#1]}{\@@BOOKMARK[#1][-]}} \newcount\@serial@counter\@serial@counter=1\relax \begingroup - \catcode`\'=12 + \catcode`\'=12 % \ifnum\Hy@VTeXversion<650 % - \catcode`\"=12 + \catcode`\"=12 % \gdef\hv@pdf@char#1#2#3{% \char - \ifcase'#1#2#3 + \ifcase'#1#2#3 % "00\or"01\or"02\or"03\or"04\or"05\or"06\or"07% \or"08\or"09\or"0A\or"0B\or"0C\or"0D\or"0E\or"0F% \or"10\or"11\or"12\or"13\or"14\or"15\or"16\or"17% @@ -601,9 +652,9 @@ \or"F0\or"F1\or"F2\or"F3\or"F4\or"F5\or"F6\or"F7% \or"F8\or"F9\or"FA\or"FB\or"FC\or"FD\or"FE\or"FF% \fi - } + }% \else - \gdef\hv@pdf@char{\char'} + \gdef\hv@pdf@char{\char'}% \fi \endgroup \def\@@BOOKMARK[#1][#2]#3#4#5{% @@ -640,7 +691,7 @@ o\fi,t=#4}% \else \if@filesw \newwrite\@outlinefile - \immediate\openout\@outlinefile=\jobname.out + \immediate\openout\@outlinefile=\jobname.out\relax \ifHy@typexml \immediate\write\@outlinefile{<relaxxml>\relax}% \fi diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def b/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def index bfa0c593f2c..14551657ac6 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/02/27 v6.75t + [2007/05/29 v6.76g Hyperref driver for VTeX in HTML mode] \RequirePackage{vtexhtml} \newif\if@Localurl @@ -109,10 +109,10 @@ } \def\@TextField[#1]#2{% parameters, label \typeout{Sorry, TeXpider does not yet support FORM text fields}% - } +} \def\@CheckBox[#1]#2{% parameters, label \typeout{Sorry, TeXpider does not yet support FORM checkboxes}% - } +} \def\@ChoiceMenu[#1]#2#3{% parameters, label, choices \typeout{Sorry, TeXpider does not yet support FORM choice menus}% } diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def b/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def index c6214f4f354..f044af75fbe 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def +++ b/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def @@ -22,14 +22,14 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hvtexmrk.def} - [2007/02/27 v6.75t + [2007/05/29 v6.76g Hyperref driver for VTeX in PDF/PS mode (pdfmark specials)] \input{pdfmark.def}% \ifx\@pdfproducer\relax \ifnum\OpMode=\@ne - \def\@pdfproducer{VTeX} + \def\@pdfproducer{VTeX}% \else - \def\@pdfproducer{VTeX + Distiller} + \def\@pdfproducer{VTeX + Distiller}% \fi \fi \def\literalps@out#1{\special{pS:#1}}% @@ -40,51 +40,51 @@ \providecommand*\@pdfviewparams{ H.V} \AtBeginDvi{% \headerps@out{% - /vsize {\Hy@pageheight} def - /HyperBorder {1} def - /H.V {pdf@hoff pdf@voff null} def - /H.B {/Rect[pdf@llx pdf@lly pdf@urx pdf@ury]} def - /H.S { - currentpoint - HyperBorder sub - /pdf@lly exch def - dup 72 add /pdf@hoff exch def - HyperBorder sub - /pdf@llx exch def - } def - /H.L { - 2 sub - /HyperBasePt exch def - currentpoint - HyperBasePt add HyperBorder add - /pdf@ury exch def - HyperBorder add - /pdf@urx exch def - } def - /H.A { - H.L - currentpoint exch pop - vsize 72 sub exch - HyperBasePt add add - /pdf@voff exch def - } def - /H.R { - currentpoint - HyperBorder add - /pdf@ury exch def - HyperBorder add - /pdf@urx exch def - currentpoint exch pop vsize 72 sub add - /pdf@voff exch def - } def - systemdict /pdfmark known - { - userdict /?pdfmark systemdict /exec get put - }{ - userdict /?pdfmark systemdict /pop get put - userdict /pdfmark systemdict /cleartomark get put - } - ifelse + /vsize {\Hy@pageheight} def% + /HyperBorder {1} def% + /H.V {pdf@hoff pdf@voff null} def% + /H.B {/Rect[pdf@llx pdf@lly pdf@urx pdf@ury]} def% + /H.S {% + currentpoint % + HyperBorder sub% + /pdf@lly exch def % + dup 72 add /pdf@hoff exch def % + HyperBorder sub% + /pdf@llx exch def% + } def% + /H.L {% + 2 sub% + /HyperBasePt exch def % + currentpoint % + HyperBasePt add HyperBorder add% + /pdf@ury exch def % + HyperBorder add% + /pdf@urx exch def% + } def% + /H.A {% + H.L % + currentpoint exch pop % + vsize 72 sub exch % + HyperBasePt add add% + /pdf@voff exch def% + } def% + /H.R {% + currentpoint % + HyperBorder add% + /pdf@ury exch def % + HyperBorder add% + /pdf@urx exch def % + currentpoint exch pop vsize 72 sub add% + /pdf@voff exch def% + } def % + systemdict /pdfmark known% + {% + userdict /?pdfmark systemdict /exec get put% + }{% + userdict /?pdfmark systemdict /pop get put % + userdict /pdfmark systemdict /cleartomark get put% + }% + ifelse% }% } \endinput diff --git a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty index 245ba22d0a0..980ea5b7e7a 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/02/27 v6.75t + [2007/05/29 v6.76g Hypertext links for LaTeX] \begingroup \@makeother\`% @@ -44,10 +44,10 @@ \def\Hy@SetCatcodes{% \@makeother\`% \@makeother\=% - \catcode`\$=3 - \catcode`\&=4 - \catcode`\^=7 - \catcode`\_=8 + \catcode`\$=3 % + \catcode`\&=4 % + \catcode`\^=7 % + \catcode`\_=8 % \@makeother\|% \@makeother\:% \@makeother\(% @@ -93,6 +93,7 @@ \endgroup \Hy@SetCatcodes \RequirePackage{keyval}[1997/11/10] +\RequirePackage{hycolor} \def\Hy@Warning#1{\PackageWarning{hyperref}{#1}} \def\Hy@WarningNoLine#1{\PackageWarningNoLine{hyperref}{#1}} \def\Hy@Info#1{\PackageInfo{hyperref}{#1}} @@ -186,6 +187,9 @@ \Hy@pagecounter0 \long\def\Hy@ReturnAfterElseFi#1\else#2\fi{\fi#1} \long\def\Hy@ReturnAfterFi#1\fi{\fi#1} +\let\Hy@ReturnEnd\@empty +\long\def\Hy@ReturnAfterFiFiEnd#1\fi#2\Hy@ReturnEnd{\fi\fi#1} +\long\def\Hy@ReturnAfterElseFiFiEnd#1\else#2\Hy@ReturnEnd{\fi\fi#1} \def\Hy@safe@activestrue{\csname @safe@activestrue\endcsname} \def\Hy@safe@activesfalse{\csname @safe@activesfalse\endcsname} \begingroup\expandafter\expandafter\expandafter\endgroup @@ -196,7 +200,7 @@ \HyCal@scan#2\hypercalcbp\@nil \expandafter\endgroup \expandafter\def\expandafter#1\expandafter{\the\toks@}% - } + }% \def\HyCal@scan#1\hypercalcbp#2\@nil{% \toks@\expandafter{\the\toks@ #1}% \ifx\\#2\\% @@ -205,7 +209,7 @@ \HyCal@do#2\@nil }% \fi - } + }% \def\HyCal@do#1#2\@nil{% \@ifpackageloaded{calc}{}{% \Hy@Warning{% @@ -222,12 +226,12 @@ }% }\x \HyCal@scan#2\@nil - } + }% \else \def\hypercalcbp#1{% \strip@pt\dimexpr 0.99626401\dimexpr #1\relax\relax - } - \def\hypercalcbpdef{\def} + }% + \def\hypercalcbpdef{\def}% \fi \def\pdfstringdef#1#2{% \begingroup @@ -299,6 +303,7 @@ \@ifundefined{language@group}{}{% \csname HyPsd@babel@\language@group\endcsname }% + \HyPsd@GreekPatch \let\@safe@activestrue\relax \let\@safe@activesfalse\relax \let\cyr\relax @@ -477,109 +482,229 @@ \expandafter\noexpand\csname<>-\string#1\endcsname } \newif\ifHy@next -\@ifpackagewith{babel}{danish}{% +\@ifundefined{danish@sh@"@sel}{}{% \def\HyPsd@babel@danish{% \declare@shorthand{danish}{"|}{}% \declare@shorthand{danish}{"~}{-}% }% -}{} -\Hy@nextfalse -\@ifpackagewith{babel}{dutch}{\Hy@nexttrue}{}% -\@ifpackagewith{babel}{afrikaans}{\Hy@nexttrue}{}% -\ifHy@next +} +\@ifundefined{dutch@sh@"@sel}{}{% \def\HyPsd@babel@dutch{% \declare@shorthand{dutch}{"|}{}% \declare@shorthand{dutch}{"~}{-}% }% -\fi -\@ifpackagewith{babel}{finnish}{% +} +\@ifundefined{finnish@sh@"@sel}{}{% \def\HyPsd@babel@finnish{% \declare@shorthand{finnish}{"|}{}% }% -}{} -\Hy@nextfalse -\@ifpackagewith{babel}{frenchb}{\Hy@nexttrue}{} -\@ifpackagewith{babel}{francais}{\Hy@nexttrue}{} -\ifHy@next +} +\@ifundefined{french@sh@:@sel}{}{% \def\HyPsd@babel@frenchb{% \def\guill@spacing{ }% }% -\fi -\Hy@nextfalse -\@ifpackagewith{babel}{german}{\Hy@nexttrue}{}% -\@ifpackagewith{babel}{germanb}{\Hy@nexttrue}{}% -\@ifpackagewith{babel}{austrian}{\Hy@nexttrue}{}% -\ifHy@next +} +\@ifundefined{german@sh@"@sel}{}{% \def\HyPsd@babel@german{% \declare@shorthand{german}{"f}{f}% \declare@shorthand{german}{"|}{}% \declare@shorthand{german}{"~}{-}% }% -\fi -\Hy@nextfalse -\@ifpackagewith{babel}{ngerman}{\Hy@nexttrue}{}% -\@ifpackagewith{babel}{ngermanb}{\Hy@nexttrue}{}% -\@ifpackagewith{babel}{naustrian}{\Hy@nexttrue}{}% -\ifHy@next - \def\HyPsd@babel@ngerman{% - \declare@shorthand{german}{"|}{}% - \declare@shorthand{german}{"~}{-}% +} +\@ifundefined{macedonian@sh@"@sel}{}{% + \def\HyPsd@babel@macedonian{% + \declare@shorthand{macedonian}{"|}{}% + \declare@shorthand{macedonian}{"~}{-}% }% -\fi -\Hy@nextfalse -\@ifpackagewith{babel}{usorbian}{\Hy@nexttrue}{}% -\@ifpackagewith{babel}{uppersorbian}{\Hy@nexttrue}{}% -\ifHy@next - \def\HyPsd@babel@usorbian{% - \declare@shorthand{usorbian}{"f}{f}% - \declare@shorthand{usorbian}{"|}{}% +}{} +\@ifundefined{ngerman@sh@"@sel}{}{% + \def\HyPsd@babel@ngerman{% + \declare@shorthand{ngerman}{"|}{}% + \declare@shorthand{ngerman}{"~}{-}% }% -\fi -\Hy@nextfalse -\@ifpackagewith{babel}{brazil}{\Hy@nexttrue}{}% -\@ifpackagewith{babel}{brazilian}{\Hy@nexttrue}{}% -\@ifpackagewith{babel}{portuges}{\Hy@nexttrue}{}% -\@ifpackagewith{babel}{portuguese}{\Hy@nexttrue}{}% -\ifHy@next +} +\@ifundefined{portuges@sh@"@sel}{}{% \def\HyPsd@babel@portuges{% \declare@shorthand{portuges}{"|}{}% }% -\fi -\Hy@nextfalse -\@ifpackagewith{babel}{russian}{\Hy@nexttrue}{} -\@ifpackagewith{babel}{russianb}{\Hy@nexttrue}{} -\ifHy@next +} +\@ifundefined{russian@sh@"@sel}{}{% \def\HyPsd@babel@russian{% \declare@shorthand{russian}{"|}{}% \declare@shorthand{russian}{"~}{-}% }% -\fi -\Hy@nextfalse -\@ifpackagewith{babel}{ukrainian}{\Hy@nexttrue}{} -\@ifpackagewith{babel}{ukraineb}{\Hy@nexttrue}{} -\ifHy@next - \def\HyPsd@babel@ukrainian{% - \declare@shorthand{ukrainian}{"|}{}% - \declare@shorthand{ukrainian}{"~}{-}% - }% -\fi -\@ifpackagewith{babel}{macedonian}{% - \def\HyPsd@babel@macedonian{% - \declare@shorthand{macedonian}{"|}{}% - \declare@shorthand{macedonian}{"~}{-}% - }% -}{} -\@ifpackagewith{babel}{slovene}{% +} +\@ifundefined{slovene@sh@"@sel}{}{% \def\HyPsd@babel@slovene{% \declare@shorthand{slovene}{"|}{}% }% -}{} -\@ifpackagewith{babel}{swedish}{% +} +\@ifundefined{spanish@sh@>@sel}{}{% + \def\HyPsd@babel@spanish{% + \declare@shorthand{spanish}{<<}{\guillemotleft}% + \declare@shorthand{spanish}{>>}{\guillemotright}% + \declare@shorthand{spanish}{"=}{-}% + \declare@shorthand{spanish}{"~}{-}% + \declare@shorthand{spanish}{"!}{\textexclamdown}% + \declare@shorthand{spanish}{"?}{\textquestiondown}% + }% +} +\@ifundefined{swedish@sh@"@sel}{}{% \def\HyPsd@babel@swedish{% \declare@shorthand{swedish}{"|}{}% \declare@shorthand{swedish}{"~}{-}% }% -}{} +} +\@ifundefined{ukrainian@sh@"@sel}{}{% + \def\HyPsd@babel@ukrainian{% + \declare@shorthand{ukrainian}{"|}{}% + \declare@shorthand{ukrainian}{"~}{-}% + }% +} +\@ifundefined{usorbian@sh@"@sel}{}{% + \def\HyPsd@babel@usorbian{% + \declare@shorthand{usorbian}{"f}{f}% + \declare@shorthand{usorbian}{"|}{}% + }% +} +\@ifundefined{greek@sh@\string~@sel}{% + \let\HyPsd@GreekPatch\@empty +}{% + \def\HyPsd@GreekPatch{% + \let\greeknumeral\HyPsd@greeknumeral + \let\Greeknumeral\HyPsd@Greeknumeral + }% +} +\def\HyPsd@greeknumeral#1{% + \HyPsd@GreekNum\@firstoftwo{#1}% +} +\def\HyPsd@Greeknumeral#1{% + \HyPsd@GreekNum\@secondoftwo{#1}% +} +\def\HyPsd@GreekNum#1#2{% + \ifHy@unicode + \ifnum#2<\@ne + \@arabic{#2}% + \else + \ifnum#2<1000000 % + \HyPsd@@GreekNum#1{#2}% + \else + \@arabic{#2}% + \fi + \fi + \else + \@arabic{#2}% + \fi +} +\def\HyPsd@@GreekNum#1#2{% + \ifnum#2<\@m + \ifnum#2<10 % + \expandafter\HyPsd@GreekNumI + \expandafter\@gobble\expandafter#1\number#2% + \else + \ifnum#2<100 % + \expandafter\HyPsd@GreekNumII + \expandafter\@gobble\expandafter#1\number#2% + \else + \expandafter\HyPsd@GreekNumIII + \expandafter\@gobble\expandafter#1\number#2% + \fi + \fi + \ifnum#2>\z@ + \textnumeralsigngreek + \fi + \else + \ifnum#2<\@M + \expandafter\HyPsd@GreekNumIV\expandafter#1\number#2% + \else + \ifnum#2<100000 % + \expandafter\HyPsd@GreekNumV\expandafter#1\number#2% + \else + \expandafter\HyPsd@GreekNumVI\expandafter#1\number#2% + \fi + \fi + \fi +} +\def\HyPsd@GreekNumI#1#2#3{% + #1{% + \ifnum#3>\z@ + \textnumeralsignlowergreek + \fi + }% + \expandafter#2% + \ifcase#3 % + {}{}% + \or\textalpha\textAlpha + \or\textbeta\textBeta + \or\textgamma\textGamma + \or\textdelta\textDelta + \or\textepsilon\textEpsilon + \or\textstigmagreek\textStigmagreek + \or\textzeta\textZeta + \or\texteta\textEta + \or\texttheta\textTheta + \else + {}{}% + \fi +} +\def\HyPsd@GreekNumII#1#2#3#4{% + #1{% + \ifnum#3>\z@ + \textnumeralsignlowergreek + \fi + }% + \expandafter#2% + \ifcase#3 % + {}{}% + \or\textiota\textIota + \or\textkappa\textKappa + \or\textlambda\textLambda + \or\textmu\textMu + \or\textnu\textNu + \or\textxi\textXi + \or\textomicron\textOmicron + \or\textpi\textPi + \or\textkoppagreek\textKoppagreek + \else + {}{}% + \fi + \HyPsd@GreekNumI#1#2#4% +} +\def\HyPsd@GreekNumIII#1#2#3#4#5{% + #1{% + \ifnum#3>\z@ + \textnumeralsignlowergreek + \fi + }% + \expandafter#2% + \ifcase#3 % + {}{}% + \or\textrho\textRho + \or\textsigma\textSigma + \or\texttau\textTau + \or\textupsilon\textUpsilon + \or\textphi\textPhi + \or\textchi\textChi + \or\textpsi\textPsi + \or\textomega\textOmega + \or\textsampigreek\textSampigreek + \else + {}{}% + \fi + \HyPsd@GreekNumII#1#2#4#5% +} +\def\HyPsd@GreekNumIV#1#2#3#4#5{% + \HyPsd@GreekNumI\@firstofone#1#2% + \HyPsd@@GreekNum#1{#3#4#5}% +} +\def\HyPsd@GreekNumV#1#2#3#4#5#6{% + \HyPsd@GreekNumII\@firstofone#1#2#3% + \HyPsd@@GreekNum#1{#4#5#6}% +} +\def\HyPsd@GreekNumVI#1#2#3#4#5#6#7{% + \HyPsd@GreekNumIII\@firstofone#1#2#3#4% + \HyPsd@@GreekNum#1{#5#6#7}% +} \begingroup \catcode"7F=\active \toks@{% @@ -600,9 +725,9 @@ \fi \HyPsd@CJKActiveChars }% - \count@=127 + \count@=127 % \@whilenum\count@<255 \do{% - \advance\count@ by 1 + \advance\count@ by 1 % \lccode`\~=\count@ \lowercase{% \toks@\expandafter{\the\toks@ ~}% @@ -829,65 +954,92 @@ \Hy@Warning{#1}% \endgroup } -\def\HyPsd@ProtectSpaces#1{% - \expandafter\HyPsd@@ProtectSpaces - \expandafter|\expandafter\@empty#1| \HyPsd@End#1% -} -\def\HyPsd@@ProtectSpaces#1 #2\HyPsd@End#3{% - \ifx\scrollmode#2\scrollmode - \HyPsd@RemoveMask#1\HyPsd@End#3% - \else - \gdef#3{#1\HyPsd@UnexpandableSpace#2}% - \Hy@ReturnAfterFi{% - \expandafter\HyPsd@@ProtectSpaces#3\HyPsd@End#3% +\RequirePackage{etexcmds} +\ifetex@unexpanded + \expandafter\@secondoftwo +\else + \expandafter\@firstoftwo +\fi +{% + \def\HyPsd@ProtectSpaces#1{% + \iftrue + \expandafter\HyPsd@@ProtectSpacesFi + \expandafter|\expandafter\@empty#1| \HyPsd@End#1% + \fi + }% + \def\HyPsd@@ProtectSpacesFi#1 #2\HyPsd@End#3\fi{% + \fi + \ifx\scrollmode#2\scrollmode + \HyPsd@RemoveMask#1\HyPsd@End#3% + \else + \gdef#3{#1\HyPsd@UnexpandableSpace#2}% + \expandafter\HyPsd@@ProtectSpacesFi#3\HyPsd@End#3% + \fi + }% + \def\HyPsd@RemoveMask|#1|\HyPsd@End#2{% + \toks@\expandafter{#1}% + \xdef#2{\the\toks@}% + }% +}{% + \let\HyPsd@fi\fi + \def\HyPsd@ProtectSpaces#1{% + \xdef#1{% + \iftrue + \expandafter\HyPsd@@ProtectSpacesFi + \expandafter|\expandafter\@empty#1| % + \HyPsd@fi }% - \fi -} -\def\HyPsd@RemoveMask|#1|\HyPsd@End#2{% - \toks@\expandafter{#1}% - \xdef#2{\the\toks@}% + \expandafter\HyPsd@RemoveMask#1\HyPsd@End#1% + }% + \def\HyPsd@@ProtectSpacesFi#1 #2\HyPsd@fi{% + \fi + \etex@unexpanded{#1}% + \ifx\scrollmode#2\scrollmode + \else + \HyPsd@@ProtectSpacesFi\HyPsd@UnexpandableSpace#2% + \HyPsd@fi + }% + \def\HyPsd@RemoveMask|#1|\HyPsd@End#2{% + \xdef#2{\etex@unexpanded\expandafter{#1}}% + }% } \def\HyPsd@RemoveBraces#1{% \ifx\scrollmode#1\scrollmode \else - \Hy@ReturnAfterFi{% - \HyPsd@@RemoveBraces#1\HyPsd@End{#1}% - }% + \HyPsd@@RemoveBracesFi#1\HyPsd@End{#1}% \fi } -\def\HyPsd@@RemoveBraces#1#2\HyPsd@End#3{% +\def\HyPsd@@RemoveBracesFi#1#2\HyPsd@End#3\fi{% + \fi \def\Hy@temp@A{#1#2}% \def\Hy@temp@B{#3}% \ifx\Hy@temp@A\Hy@temp@B \expandafter\def\expandafter\HyPsd@String\expandafter{% \HyPsd@String#1% }% - \Hy@ReturnAfterElseFi{% - \ifx\scrollmode#2\scrollmode - \else - \Hy@ReturnAfterFi{% - \HyPsd@RemoveBraces{#2}% - }% - \fi - }% + \ifx\scrollmode#2\scrollmode + \else + \Hy@ReturnAfterFiFiEnd{% + \HyPsd@RemoveBraces{#2}% + }% + \fi \else \def\Hy@temp@A{#1}% \HyPsd@AppendItalcorr\HyPsd@String - \Hy@ReturnAfterFi{% - \ifx\Hy@temp@A\@empty - \Hy@ReturnAfterElseFi{% - \HyPsd@RemoveBraces{#2}% - }% - \else - \Hy@ReturnAfterFi{% - \HyPsd@ProtectSpaces\Hy@temp@A - \HyPsd@AppendItalcorr\Hy@temp@A - \expandafter\HyPsd@RemoveBraces\expandafter - {\Hy@temp@A#2}% - }% - \fi - }% + \ifx\Hy@temp@A\@empty + \Hy@ReturnAfterElseFiFiEnd{% + \HyPsd@RemoveBraces{#2}% + }% + \else + \HyPsd@ProtectSpaces\Hy@temp@A + \HyPsd@AppendItalcorr\Hy@temp@A + \Hy@ReturnAfterFiFiEnd{% + \expandafter\HyPsd@RemoveBraces\expandafter + {\Hy@temp@A#2}% + }% + \fi \fi + \Hy@ReturnEnd } \def\HyPsd@AppendItalcorr#1{% \expandafter\HyPsd@@AppendItalcorr\expandafter{\/}#1% @@ -924,26 +1076,32 @@ \fi \fi \else - \ifcat#1 %SPACE + \ifcat#1A% letter \expandafter\def\expandafter\HyPsd@String\expandafter{% - \HyPsd@String\HyPsd@SPACEOPTI + \HyPsd@String#1% }% \else - \ifcat$#1% - \HyPsd@CatcodeWarning{math shift}% + \ifcat#1 % SPACE + \expandafter\def\expandafter\HyPsd@String\expandafter{% + \HyPsd@String\HyPsd@SPACEOPTI + }% \else - \ifcat% - \HyPsd@CatcodeWarning{alignment tab}% + \ifcat$#1% + \HyPsd@CatcodeWarning{math shift}% \else - \ifcat^#1% - \HyPsd@CatcodeWarning{superscript}% + \ifcat% + \HyPsd@CatcodeWarning{alignment tab}% \else - \ifcat_#1% - \HyPsd@CatcodeWarning{subscript}% + \ifcat^#1% + \HyPsd@CatcodeWarning{superscript}% \else - \expandafter\def\expandafter\HyPsd@String\expandafter{% - \HyPsd@String#1% - }% + \ifcat_#1% + \HyPsd@CatcodeWarning{subscript}% + \else + \expandafter\def\expandafter\HyPsd@String\expandafter{% + \HyPsd@String#1% + }% + \fi \fi \fi \fi @@ -951,28 +1109,27 @@ \fi \fi \ifx\HyPsd@Rest\relax - \Hy@ReturnAfterElseFi{% - \ifx\scrollmode#2\scrollmode - \else - \Hy@ReturnAfterFi{% - \HyPsd@CheckCatcodes#2\HyPsd@End - }% - \fi - }% + \ifx\scrollmode#2\scrollmode + \else + \Hy@ReturnAfterFiFiEnd{% + \HyPsd@CheckCatcodes#2\HyPsd@End + }% + \fi \else - \Hy@ReturnAfterFi{% - \ifx\HyPsd@Rest\@empty - \else + \ifx\HyPsd@Rest\@empty + \else + \Hy@ReturnAfterFiFiEnd{% \expandafter\HyPsd@CheckCatcodes\HyPsd@Rest\HyPsd@End - \fi - }% + }% + \fi \fi + \Hy@ReturnEnd } \def\HyPsd@AfterCountRemove#1\HyPsd@End{% \gdef\HyPsd@Rest{#1}% } \def\HyPsd@AfterDimenRemove#1\HyPsd@End{% - \ifdim\ifx\HyPsd@String\@empty\z@\else\dimen@\fi>1ex + \ifdim\ifx\HyPsd@String\@empty\z@\else\dimen@\fi>1ex % \HyPsd@ReplaceSpaceWarning{\string\kern\space\the\dimen@}% \gdef\HyPsd@Rest{\HyPsd@UnexpandableSpace #1}% \else @@ -984,7 +1141,7 @@ \fi } \def\HyPsd@AfterSkipRemove#1\HyPsd@End{% - \ifdim\ifx\HyPsd@String\@empty\z@\else\skip@\fi>1ex + \ifdim\ifx\HyPsd@String\@empty\z@\else\skip@\fi>1ex % \HyPsd@ReplaceSpaceWarning{\string\hskip\space\the\skip@}% \gdef\HyPsd@Rest{\HyPsd@UnexpandableSpace #1}% \else @@ -1002,8 +1159,8 @@ }% } \begingroup - \catcode`\|=0 - \catcode`\\=12 + \catcode`\|=0 % + \catcode`\\=12 % |gdef|HyPsd@RemoveCmdPrefix#1{% |expandafter|HyPsd@@RemoveCmdPrefix |string#1|@empty\<>-|@empty|@empty @@ -1051,18 +1208,19 @@ \fi }% \def\HyPsd@Subst#1#2#3{% - \def\HyPsd@@Replace##1#1##2\END{% + \def\HyPsd@@ReplaceFi##1#1##2\END\fi{% + \fi ##1% - \ifx\\##2\\% + \ifx\scrollmode##2\scrollmode \else #2% - \Hy@ReturnAfterFi{% - \HyPsd@@Replace##2\END - }% + \HyPsd@@ReplaceFi##2\END \fi }% \xdef#3{% - \expandafter\HyPsd@@Replace#3#1\END + \iftrue + \expandafter\HyPsd@@ReplaceFi#3#1\END + \fi }% } \def\HyPsd@StringSubst#1{% @@ -1093,26 +1251,26 @@ #1% }% \begingroup - \catcode`\|=0 - \catcode`\\=12 + \catcode`\|=0 % + \catcode`\\=12 % |gdef|HyPsd@ConvertToUnicode#1{% |xdef#1{% |expandafter|HyPsd@DoConvert#1|@empty|@empty|@empty }% - |xdef#1{% - |ifx#1|@empty - |else + |ifx#1|@empty + |else + |xdef#1{% \376\377% #1% - |fi - }% - } + }% + |fi + }% |gdef|HyPsd@DoConvert#1{% |ifx#1|@empty |else |Hy@ReturnAfterFi{% - |ifx#1\% - \% + |ifx#1\%% + \%% |expandafter|HyPsd@DoEscape |else \000#1% @@ -1120,7 +1278,7 @@ |fi }% |fi - } + }% |gdef|HyPsd@DoEscape#1{% |ifx#19% |expandafter|HyPsd@GetTwoBytes @@ -1135,15 +1293,15 @@ |fi }% |fi - } + }% |gdef|HyPsd@GetTwoBytes#1\#2#3#4{% #1\#2#3#4% |HyPsd@DoConvert - } + }% |gdef|HyPsd@GetOneByte#1#2{% #1#2% |HyPsd@DoConvert - } + }% |endgroup \def\HyPsd@GetNextTwoTokens#1#2#3\END#4{% \xdef#4{#4#1#2}% @@ -1197,7 +1355,7 @@ }% \def\HyPsd@UTFviii@@four#1|#2#3#4{% \expandafter\HyPsd@UTFviii@@@four\number#1\expandafter|% - \number`#2\expandafter| + \number`#2\expandafter|% \number\dimexpr.03125\dimexpr`#2sp\expandafter|% \number`#3\expandafter|% \number\dimexpr.03125\dimexpr`#3sp\expandafter|% @@ -1249,7 +1407,7 @@ .% unsupported (Unicode -> PDF Doc Encoding) \fi }% - \def\HyPsd@UnicodeReplacementCharacter{\9377\375} + \def\HyPsd@UnicodeReplacementCharacter{\9377\375}% \def\HyPsd@unichar@first@byte#1{% \number\dimexpr.015625\dimexpr#1sp\relax\relax \expandafter\HyPsd@unichar@octtwo\expandafter{% @@ -1400,7 +1558,7 @@ Unexpected value `#1'\MessageBreak of option `#2' instead of\MessageBreak #3% - } + }% } \def\Hy@DisableOption#1{% \@ifundefined{KV@Hyp@#1@default}{% @@ -1581,6 +1739,14 @@ \def\XR@ext{pdf}% \Hy@breaklinkstrue } +\define@key{Hyp}{dvipdfmx-outline-open}[true]{% + \expandafter\ifx\csname if#1\expandafter\endcsname + \csname iftrue\endcsname + \chardef\SpecialDvipdfmxOutlineOpen\@ne + \else + \chardef\SpecialDvipdfmxOutlineOpen\z@ + \fi +} \define@key{Hyp}{xetex}[true]{% \def\Hy@driver{hdvipdfm}% \def\XR@ext{pdf}% @@ -1728,6 +1894,24 @@ \define@key{Hyp}{encap}[\|]{% \def\HyInd@EncapChar{#1}% } +\def\HyLang@afrikaans{% + \def\equationautorefname{Vergelyking}% + \def\footnoteautorefname{Voetnota}% + \def\itemautorefname{Item}% + \def\figureautorefname{Figuur}% + \def\tableautorefname{Tabel}% + \def\partautorefname{Deel}% + \def\appendixautorefname{Bylae}% + \def\chapterautorefname{Hoofstuk}% + \def\sectionautorefname{Afdeling}% + \def\subsectionautorefname{Subafdeling}% + \def\subsubsectionautorefname{Subsubafdeling}% + \def\paragraphautorefname{Paragraaf}% + \def\subparagraphautorefname{Subparagraaf}% + \def\FancyVerbLineautorefname{Lyn}% + \def\theoremautorefname{Teorema}% + \def\pageautorefname{Bladsy}% +} \def\HyLang@english{% \def\equationautorefname{Equation}% \def\footnoteautorefname{footnote}% @@ -1744,6 +1928,25 @@ \def\subparagraphautorefname{subparagraph}% \def\FancyVerbLineautorefname{line}% \def\theoremautorefname{Theorem}% + \def\pageautorefname{page}% +} +\def\HyLang@french{% + \def\equationautorefname{\'Equation}% + \def\footnoteautorefname{note}% + \def\itemautorefname{item}% + \def\figureautorefname{Figure}% + \def\tableautorefname{Tableau}% + \def\partautorefname{Partie}% + \def\appendixautorefname{Appendice}% + \def\chapterautorefname{chapitre}% + \def\sectionautorefname{section}% + \def\subsectionautorefname{sous-section}% + \def\subsubsectionautorefname{sous-sous-section}% + \def\paragraphautorefname{paragraphe}% + \def\subparagraphautorefname{sous-paragraphe}% + \def\FancyVerbLineautorefname{ligne}% + \def\theoremautorefname{Th\'eor\`eme}% + \def\pageautorefname{page}% } \def\HyLang@german{% \def\equationautorefname{Gleichung}% @@ -1761,6 +1964,25 @@ \def\subparagraphautorefname{Unterabsatz}% \def\FancyVerbLineautorefname{Zeile}% \def\theoremautorefname{Theorem}% + \def\pageautorefname{Seite}% +} +\def\HyLang@italian{% + \def\equationautorefname{Equazione}% + \def\footnoteautorefname{nota}% + \def\itemautorefname{punto}% + \def\figureautorefname{Figura}% + \def\tableautorefname{Tabella}% + \def\partautorefname{Parte}% + \def\appendixautorefname{Appendice}% + \def\chapterautorefname{Capitolo}% + \def\sectionautorefname{sezione}% + \def\subsectionautorefname{sottosezione}% + \def\subsubsectionautorefname{sottosottosezione}% + \def\paragraphautorefname{paragrafo}% + \def\subparagraphautorefname{sottoparagrafo}% + \def\FancyVerbLineautorefname{linea}% + \def\theoremautorefname{Teorema}% + \def\pageautorefname{Pag.\@}% } \def\HyLang@portuges{% \def\equationautorefname{Equa\c c\~ao}% @@ -1778,6 +2000,7 @@ \def\subparagraphautorefname{subpar\'agrafo}% \def\FancyVerbLineautorefname{linha}% \def\theoremautorefname{Teorema}% + \def\pageautorefname{P\'agina}% } \def\HyLang@spanish{% \def\equationautorefname{Ecuaci\'on}% @@ -1795,40 +2018,7 @@ \def\subparagraphautorefname{Subp\'arrafo}% \def\FancyVerbLineautorefname{L\'inea}% \def\theoremautorefname{Teorema}% -} -\def\HyLang@afrikaans{% - \def\equationautorefname{Vergelyking}% - \def\footnoteautorefname{Voetnota}% - \def\itemautorefname{Item}% - \def\figureautorefname{Figuur}% - \def\tableautorefname{Tabel}% - \def\partautorefname{Deel}% - \def\appendixautorefname{Bylae}% - \def\chapterautorefname{Hoofstuk}% - \def\sectionautorefname{Afdeling}% - \def\subsectionautorefname{Subafdeling}% - \def\subsubsectionautorefname{Subsubafdeling}% - \def\paragraphautorefname{Paragraaf}% - \def\subparagraphautorefname{Subparagraaf}% - \def\FancyVerbLineautorefname{Lyn}% - \def\theoremautorefname{Teorema}% -} -\def\HyLang@french{% - \def\equationautorefname{\'Equation}% - \def\footnoteautorefname{note}% - \def\itemautorefname{item}% - \def\figureautorefname{Figure}% - \def\tableautorefname{Tableau}% - \def\partautorefname{Partie}% - \def\appendixautorefname{Appendice}% - \def\chapterautorefname{chapitre}% - \def\sectionautorefname{section}% - \def\subsectionautorefname{sous-section}% - \def\subsubsectionautorefname{sous-sous-section}% - \def\paragraphautorefname{paragraphe}% - \def\subparagraphautorefname{sous-paragraphe}% - \def\FancyVerbLineautorefname{ligne}% - \def\theoremautorefname{Th\'eor\`eme}% + \def\pageautorefname{P\'agina}% } \def\HyLang@vietnamese{% \def\equationautorefname{Ph\uhorn{}\ohorn{}ng tr\`inh}% @@ -1846,6 +2036,7 @@ \def\subparagraphautorefname{\dj{}o\d{a}n}% \def\FancyVerbLineautorefname{d\`ong}% \def\theoremautorefname{\DJ{}\d{i}nh l\'y}% + \def\pageautorefname{Trang}% } \def\HyLang@addto#1#2{% #2% @@ -1894,6 +2085,7 @@ \HyLang@DeclareLang{francais}{french} \HyLang@DeclareLang{acadian}{french} \HyLang@DeclareLang{canadien}{french} +\HyLang@DeclareLang{italian}{italian} \define@key{Hyp}{vietnamese}[]{% \HyLang@addto\extrasvietnamese\HyLang@vietnamese \AtEndOfPackage{% @@ -1976,20 +2168,29 @@ \define@key{Hyp}{CJKbookmarks}[true]{% \Hy@boolkey{CJKbookmarks}{#1}% } -\define@key{Hyp}{linkcolor}{\def\@linkcolor{#1}} -\define@key{Hyp}{anchorcolor}{\def\@anchorcolor{#1}} -\define@key{Hyp}{citecolor}{\def\@citecolor{#1}} -\define@key{Hyp}{urlcolor}{\def\@urlcolor{#1}} -\define@key{Hyp}{menucolor}{\def\@menucolor{#1}} -\define@key{Hyp}{filecolor}{\def\@filecolor{#1}} -\define@key{Hyp}{pagecolor}{\def\@pagecolor{#1}} -\def\@linkcolor{red} -\def\@anchorcolor{black} -\def\@citecolor{green} -\def\@filecolor{cyan} -\def\@urlcolor{magenta} -\def\@menucolor{red} -\def\@pagecolor{red} +\def\Hy@temp#1{% + \expandafter\Hy@@temp\csname @#1color\endcsname{#1}% +} +\def\Hy@@temp#1#2#3{% + \define@key{Hyp}{#2color}{% + \HyColor@HyperrefColor{##1}#1% + }% + \def#1{#3}% +} +\Hy@temp{link}{red} +\Hy@temp{anchor}{black} +\Hy@temp{cite}{green} +\Hy@temp{file}{cyan} +\Hy@temp{url}{magenta} +\Hy@temp{menu}{red} +\Hy@temp{run}{\@filecolor} +\define@key{Hyp}{pagecolor}{% + \Hy@WarningPageColor +} +\def\Hy@WarningPageColor{% + \Hy@WarningNoLine{Option `pagecolor' is not available anymore}% + \global\let\Hy@WarningPageColor\relax +} \def\hyperbaseurl#1{\def\@baseurl{#1}} \define@key{Hyp}{baseurl}{\hyperbaseurl{#1}} \let\@baseurl\@empty @@ -2008,38 +2209,25 @@ \global\Hy@useHidKeytrue \fi } -\def\Hy@ColorList{cite,file,link,menu,page,run,url} +\def\Hy@ColorList{cite,file,link,menu,run,url} \@for\Hy@temp:=\Hy@ColorList\do{% \edef\Hy@temp{% \noexpand\define@key{Hyp}{\Hy@temp bordercolor}{% - \noexpand\Hy@bordercolor{\Hy@temp}{##1}{ }% + \noexpand\HyColor@HyperrefBorderColor + {##1}% + \expandafter\noexpand\csname @\Hy@temp bordercolor\endcsname + {hyperref}% + {\Hy@temp bordercolor}% }% }% \Hy@temp } -\def\Hy@bordercolor#1#2#3{% - \begingroup - \Hy@safe@activestrue - \@ifundefined{XC@edef}{\edef}{\XC@edef}\x{#2}% - \expandafter\Hy@CheckColorSpec\x#3#3\@nil{#1}{#2}% +\define@key{Hyp}{pagebordercolor}{% + \Hy@WarningPageBorderColor } -\def\Hy@CheckColorSpec#1 #2 #3\@nil#4#5{% - \ifx\\#3\\% - \@ifundefined{XC@bordercolor}{% - \Hy@Warning{% - Unsupported color specification (#4bordercolor).\MessageBreak - Load package `xcolor' (version >= 2.11) first.\MessageBreak - Ignoring color specification% - }% - \endgroup - }{% - \endgroup - \XC@bordercolor{#4}{#5}% - }% - \else - \endgroup - \@namedef{@#4bordercolor}{#5}% - \fi +\def\Hy@WarningPageBorderColor{% + \Hy@WarningNoLine{Option `pagebordercolor' is not available anymore}% + \global\let\Hy@WarningPageBorderColor\relax } \define@key{Hyp}{pdfhighlight}{\def\@pdfhighlight{#1}} \Hy@DefNameKey{pdfhighlight}{% @@ -2205,7 +2393,6 @@ \def\@filebordercolor{0 .5 .5} \def\@runbordercolor{0 .7 .7} \def\@citebordercolor{0 1 0} -\def\@pagebordercolor{1 1 0} \def\@pdfhighlight{/I} \def\@pdftitle{} \def\@pdfauthor{} @@ -2224,14 +2411,14 @@ \let\PDF@FinishDoc\@empty \let\phantomsection\@empty \@ifundefined{stockwidth}{% - \edef\special@paper{\the\paperwidth,\the\paperheight} + \edef\special@paper{\the\paperwidth,\the\paperheight}% }{% - \edef\special@paper{\the\stockwidth,\the\stockheight} + \edef\special@paper{\the\stockwidth,\the\stockheight}% } \begingroup \dimen@=\@ifundefined{stockheight}{\paperheight}{\stockheight}\relax \dimen@=0.99626401\dimen@ - \xdef\Hy@pageheight{\strip@pt\dimen@} + \xdef\Hy@pageheight{\strip@pt\dimen@}% \endgroup \def\HyInd@EncapChar{\|} \def\hypersetup{\setkeys{Hyp}} @@ -2276,7 +2463,7 @@ \ifx\HyPsd@InitUnicode\relax \define@key{Hyp}{unicode}[true]{% \Hy@boolkey{unicode}{#1}% - } + }% \else \define@key{Hyp}{unicode}[true]{% \Hy@boolkey{unicode}{#1}% @@ -2286,43 +2473,46 @@ }% \Hy@unicodefalse \fi - } + }% \fi \let\HyPsd@InitUnicode\@undefined \Hy@nextfalse -\@ifpackagewith{babel}{spanish}{\Hy@nexttrue}{} -\@ifpackagewith{babel}{galician}{\Hy@nexttrue}{} -\@ifpackagewith{babel}{estonian}{\Hy@nexttrue}{} +\@ifundefined{spanish@sh@"@sel}{}{\Hy@nexttrue} +\@ifundefined{galician@sh@"@sel}{}{\Hy@nexttrue} +\@ifundefined{estonian@sh@"@sel}{}{\Hy@nexttrue} \ifHy@next \let\texttilde\~% \fi \ifHy@figures - \Hy@Info{Hyper figures ON} + \Hy@Info{Hyper figures ON}% \else - \Hy@Info{Hyper figures OFF} + \Hy@Info{Hyper figures OFF}% \fi \ifHy@nesting - \Hy@Info{Link nesting ON} + \Hy@Info{Link nesting ON}% \else - \Hy@Info{Link nesting OFF} + \Hy@Info{Link nesting OFF}% \fi \ifHy@hyperindex - \Hy@Info{Hyper index ON} + \Hy@Info{Hyper index ON}% \else - \Hy@Info{Hyper index OFF} + \Hy@Info{Hyper index OFF}% \fi \ifHy@plainpages - \Hy@Info{Plain pages ON} + \Hy@Info{Plain pages ON}% \else - \Hy@Info{Plain pages OFF} + \Hy@Info{Plain pages OFF}% \fi \ifHy@backref - \Hy@Info{Backreferencing ON} + \Hy@Info{Backreferencing ON}% \else - \Hy@Info{Backreferencing OFF} + \Hy@Info{Backreferencing OFF}% \fi \ifHy@typexml - \AtEndOfPackage{\RequirePackage{color}\RequirePackage{nameref}} + \AtEndOfPackage{% + \RequirePackage{color}% + \RequirePackage{nameref}% + }% \fi \Hy@DisableOption{typexml} \ifHy@implicit @@ -2336,6 +2526,7 @@ }% \AtBeginDocument{% \let\autoref\ref + \let\autopageref\pageref \ifx\@pdfpagemode\@empty \gdef\@pdfpagemode{UseNone}% \fi @@ -2426,11 +2617,21 @@ \let\@unprocessedoptions\relax \Hy@RestoreCatcodes } +\newif\ifHy@DvipdfmxOutlineOpen +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname SpecialDvipdfmxOutlineOpen\endcsname\relax +\else + \ifnum\SpecialDvipdfmxOutlineOpen>\z@ + \Hy@DvipdfmxOutlineOpentrue + \fi +\fi \Hy@DisableOption{tex4ht} \Hy@DisableOption{pdftex} \Hy@DisableOption{dvipdf} \Hy@DisableOption{nativepdf} \Hy@DisableOption{dvipdfm} +\Hy@DisableOption{dvipdfmx} +\Hy@DisableOption{dvipdfmx-outline-open} \Hy@DisableOption{pdfmark} \Hy@DisableOption{dvips} \Hy@DisableOption{hypertex} @@ -2465,7 +2666,7 @@ \AtEndOfPackage{% \global\let\ReadBookmarks\relax \global\let\WriteBookmarks\relax - } + }% \ifx\@pdfpagemode\@empty \def\@pdfpagemode{UseNone}% \fi @@ -2473,20 +2674,14 @@ \Hy@DisableOption{bookmarks} \AtBeginDocument{% \ifHy@colorlinks - \ifHy@typexml\else\RequirePackage{color}\fi + \ifHy@typexml + \else + \RequirePackage{color}% + \fi \def\Hy@colorlink#1{% \begingroup - \expandafter\Hy@colorscan\expandafter#1#1\@nil% + \HyColor@UseColor#1% }% - \def\Hy@colorscan#1{% - \@ifnextchar[% ] - {% - \Hy@@colorscan - }{% - \expandafter\color\expandafter#1\@car{}% - }% - }% - \def\Hy@@colorscan#1\@nil{\color#1}% \def\Hy@endcolorlink{\endgroup}% \Hy@Info{Link coloring ON}% \else @@ -2535,7 +2730,7 @@ \fi } \ifHy@backref - \RequirePackage{backref} + \RequirePackage{backref}% \else \let\Hy@backout\@gobble \fi @@ -2543,24 +2738,25 @@ \Hy@DisableOption{pagebackref} \Hy@activeanchorfalse \begingroup - \endlinechar=-1 + \endlinechar=-1 % + \catcode`\^^A=14 % \catcode`\^^M\active \catcode`\%\active \catcode`\#\active \catcode`\_\active \catcode`\$\active - \gdef\hyper@normalise{ + \gdef\hyper@normalise{^^A \begingroup \catcode`\^^M\active - \def^^M{ } + \def^^M{ }^^A \catcode`\%\active \let%\@percentchar \let\%\@percentchar \catcode`\#\active - \def#{\hyper@hash} - \def\#{\hyper@hash} - \@makeother\& - \edef\textunderscore{\string_} + \def#{\hyper@hash}^^A + \def\#{\hyper@hash}^^A + \@makeother\&^^A + \edef\textunderscore{\string_}^^A \let\_\textunderscore \catcode`\_\active \let_\textunderscore @@ -2568,27 +2764,40 @@ \let\~\hyper@tilde \let\textasciitilde\hyper@tilde \let\\\@backslashchar - \edef${\string$} + \edef${\string$}^^A \Hy@safe@activestrue \hyper@n@rmalise - } - \catcode`\#=6 - \gdef\hyper@n@rmalise#1#2{ - \edef\Hy@tempa{ + }^^A + \catcode`\#=6 ^^A + \gdef\Hy@ActiveCarriageReturn{^^M}^^A + \gdef\hyper@n@rmalise#1#2{^^A + \def\Hy@tempa{#2}^^A + \ifx\Hy@tempa\Hy@ActiveCarriageReturn + \Hy@ReturnAfterElseFi{^^A + \hyper@@normalise{#1}^^A + }^^A + \else + \Hy@ReturnAfterFi{^^A + \hyper@@normalise{#1}{#2}^^A + }^^A + \fi + }^^A + \gdef\hyper@@normalise#1#2{^^A + \edef\Hy@tempa{^^A \endgroup - \noexpand#1{\Hy@RemovePercentCr#2%^^M\@nil} - } + \noexpand#1{\Hy@RemovePercentCr#2%^^M\@nil}^^A + }^^A \Hy@tempa - } - \gdef\Hy@RemovePercentCr#1%^^M#2\@nil{ - #1 + }^^A + \gdef\Hy@RemovePercentCr#1%^^M#2\@nil{^^A + #1^^A \ifx\limits#2\limits \else - \Hy@ReturnAfterFi{ + \Hy@ReturnAfterFi{^^A \Hy@RemovePercentCr #2\@nil - } + }^^A \fi - } + }^^A \endgroup \providecommand*\hyper@chars{% \let\#\hyper@hash @@ -2597,14 +2806,19 @@ \def\hyperlink#1#2{% \hyper@@link{}{#1}{#2}% } -\DeclareRobustCommand*{\href}{\hyper@normalise\href@} +\DeclareRobustCommand*{\href}{% + \@ifnextchar\bgroup\Hy@href{\hyper@normalise\href@}% +} +\def\Hy@href#{% + \hyper@normalise\href@ +} \begingroup - \catcode`\$=6 - \catcode`\#=12 - \gdef\href@$1{\expandafter\href@split$1##\\} + \catcode`\$=6 % + \catcode`\#=12 % + \gdef\href@$1{\expandafter\href@split$1##\\}% \gdef\href@split$1#$2#$3\\{% \hyper@@link{$1}{$2}% - } + }% \endgroup \RequirePackage{url} \let\HyOrg@url\url @@ -2818,13 +3032,14 @@ \Fld@charsize=10\p@ \def\Fld@maxlen{0} \def\Fld@align{0} -\def\Fld@color{0 0 0} +\def\Fld@color{0 0 0 rg} \def\Fld@bcolor{1 1 1} \def\Fld@bordercolor{1 0 0} \def\Fld@bordersep{1\p@} \def\Fld@borderwidth{1} \def\Fld@borderstyle{S} \def\Fld@cbsymbol{4} +\def\Fld@rotation{0} \newtoks\Choice@toks \def\Form{\@ifnextchar[{\@Form}{\@Form[]}} \def\endForm{\@endForm} @@ -2925,9 +3140,6 @@ \define@key{Field}{charsize}{% \Fld@charsize#1% } -\define@key{Field}{fillcolor}{% - \def\Fld@fillcolor{#1}% -} \define@key{Field}{borderwidth}{% \def\Fld@borderwidth{#1}% } @@ -2949,39 +3161,17 @@ \define@key{Field}{checkboxsymbol}{% \def\Fld@cbsymbol{#1}% } +\define@key{Field}{rotation}{% + \def\Fld@rotation{#1}% +} \define@key{Field}{backgroundcolor}{% - \Hy@fieldcolor{bcolor}{#1}{ }{backgroundcolor}% + \HyColor@FieldBColor{#1}\Fld@bcolor{hyperref}{backgroundcolor}% } \define@key{Field}{bordercolor}{% - \Hy@fieldcolor{bordercolor}{#1}{ }{bordercolor}% + \HyColor@FieldBColor{#1}\Fld@bordercolor{hyperref}{bordercolor}% } \define@key{Field}{color}{% - \Hy@fieldcolor{color}{#1}{ }{color}% -} -\def\Hy@fieldcolor#1#2#3#4{% - \begingroup - \Hy@safe@activestrue - \@ifundefined{XC@edef}{\edef}{\XC@edef}\x{#2}% - \expandafter\Hy@FieldCheckColorSpec\x#3#3\@nil{#1}{#2}{#4}% -} -\def\Hy@FieldCheckColorSpec#1 #2 #3\@nil#4#5#6{% - \ifx\\#3\\% - \@ifundefined{XC@bordercolor}{% - \Hy@Warning{% - Unsupported color specification (#6).\MessageBreak - Load package `xcolor' (version >= 2.11) first.\MessageBreak - Ignoring color specification% - }% - \endgroup - }{% - \endgroup - \XC@bordercolor{temp}{#5}% - \expandafter\let\csname Fld@#4\endcsname\@tempbordercolor - }% - \else - \endgroup - \@namedef{Fld@#4}{#5}% - \fi + \HyColor@FieldColor{#1}\Fld@color{hyperref}{color}% } \def\Fld@format@code{} \def\Fld@validate@code{} @@ -3095,13 +3285,13 @@ \sbox0{% \hskip\Fld@borderwidth bp#1\hskip\Fld@borderwidth bp% }% - \@tempdima\ht0 - \advance\@tempdima by \Fld@borderwidth bp - \advance\@tempdima by \Fld@borderwidth bp + \@tempdima\ht0 % + \advance\@tempdima by \Fld@borderwidth bp % + \advance\@tempdima by \Fld@borderwidth bp % \ht0\@tempdima - \@tempdima\dp0 - \advance\@tempdima by \Fld@borderwidth bp - \advance\@tempdima by \Fld@borderwidth bp + \@tempdima\dp0 % + \advance\@tempdima by \Fld@borderwidth bp % + \advance\@tempdima by \Fld@borderwidth bp % \dp0\@tempdima \box0\relax } @@ -3116,29 +3306,29 @@ \def\DefaultHeightofText{\baselineskip} \def\DefaultWidthofText{3cm} \ifHy@figures - \Hy@Info{Hyper figures ON} + \Hy@Info{Hyper figures ON}% \else - \Hy@Info{Hyper figures OFF} + \Hy@Info{Hyper figures OFF}% \fi \ifHy@nesting - \Hy@Info{Link nesting ON} + \Hy@Info{Link nesting ON}% \else - \Hy@Info{Link nesting OFF} + \Hy@Info{Link nesting OFF}% \fi \ifHy@hyperindex - \Hy@Info{Hyper index ON} + \Hy@Info{Hyper index ON}% \else - \Hy@Info{Hyper index OFF} + \Hy@Info{Hyper index OFF}% \fi \ifHy@backref - \Hy@Info{backreferencing ON} + \Hy@Info{backreferencing ON}% \else - \Hy@Info{backreferencing OFF} + \Hy@Info{backreferencing OFF}% \fi \ifHy@colorlinks - \Hy@Info{Link coloring ON} + \Hy@Info{Link coloring ON}% \else - \Hy@Info{Link coloring OFF} + \Hy@Info{Link coloring OFF}% \fi \edef\hyper@hash{\string#} \edef\hyper@tilde{\string~} @@ -3208,7 +3398,7 @@ \if@filesw \ifHy@typexml \immediate\closeout\@mainaux - \immediate\openout\@mainaux\jobname.aux + \immediate\openout\@mainaux\jobname.aux\relax \immediate\write\@auxout{<relaxxml>\relax}% \fi \immediate\write\@auxout{% @@ -3262,7 +3452,7 @@ \def\Hy@scantitle#1{% \gdef\Hy@title{#1}% \HyOrg@title{#1}% - } + }% \def\author{\@ifnextchar[{\Hy@scanoptauthor}{\Hy@scanauthor}}% \def\Hy@scanoptauthor[#1]{% \gdef\Hy@author{#1}% @@ -3271,7 +3461,7 @@ \def\Hy@scanauthor#1{% \gdef\Hy@author{#1}% \HyOrg@author{#1}% - } + }% \begingroup \def\process@me#1\@nil#2{% \expandafter\let\expandafter\x\csname @#2\endcsname @@ -3326,11 +3516,11 @@ \fi \def\thispdfpagelabel#1{% \gdef\HyPL@thisLabel{#1}% - } + }% \global\let\HyPL@thisLabel\relax - \def\HyPL@Labels{} + \def\HyPL@Labels{}% \newcount\Hy@abspage - \Hy@abspage=0 + \Hy@abspage=0 % \def\HyPL@LastType{init}% \def\HyPL@LastNumber{0}% \def\HyPL@LastPrefix{}% @@ -3348,7 +3538,7 @@ \global\let\HyPL@thisLabel\relax \fi \let\HyPL@Type\relax - \ifnum\the\c@page>0 + \ifnum\the\c@page>0 % \expandafter\HyPL@CheckThePage\HyPL@page\@nil \fi \let\Hy@temp Y% @@ -3366,7 +3556,7 @@ \let\Hy@temp N% \fi \if Y\Hy@temp - \advance\c@page by -1 + \advance\c@page by -1 % \ifnum\HyPL@LastNumber=\the\c@page\relax \else \let\Hy@temp N% @@ -3375,15 +3565,15 @@ \fi \if N\Hy@temp \ifx\HyPL@Type\relax - \HyPL@StorePageLabel{/P (\HyPL@Prefix)}% + \HyPL@StorePageLabel{/P(\HyPL@Prefix)}% \else \HyPL@StorePageLabel{% \ifx\HyPL@Prefix\@empty \else - /P (\HyPL@Prefix) + /P(\HyPL@Prefix)% \fi - /S /\csname HyPL\HyPL@Type\endcsname - \ifnum\the\c@page=1 + /S/\csname HyPL\HyPL@Type\endcsname + \ifnum\the\c@page=1 % \else \space/St \the\c@page \fi @@ -3395,10 +3585,10 @@ \global\let\HyPL@LastPrefix\HyPL@Prefix \endgroup \Hy@GlobalStepCount\Hy@abspage - } + }% \def\HyPL@CheckThePage#1\@nil{% \HyPL@@CheckThePage{#1}#1\csname\endcsname\c@page\@nil - } + }% \def\HyPL@@CheckThePage#1#2\csname#3\endcsname\c@page#4\@nil{% \def\Hy@tempa{#4}% \def\Hy@tempb{\csname\endcsname\c@page}% @@ -3427,7 +3617,7 @@ \fi \Hy@next \fi - } + }% \def\HyPL@Format#1#2{% \ifx\HyPL@found\@undefined \expandafter\ifx\csname c@#2\endcsname\c@page @@ -3438,7 +3628,7 @@ \else \expandafter\noexpand\csname#1\endcsname{#2}% \fi - } + }% \def\HyPL@@@CheckThePage#1\HyPL@found#2#3\@nil{% \def\Hy@tempa{#3}% \def\Hy@tempb{\HyPL@found\relax}% @@ -3446,9 +3636,9 @@ \def\HyPL@Type{@#2}% \def\HyPL@Prefix{#1}% \fi - } - \providecommand*{\HyPL@StorePageLabel}[1]{} - \def\HyPL@Useless{0 << /S /D >> }% + }% + \providecommand*{\HyPL@StorePageLabel}[1]{}% + \def\HyPL@Useless{0<</S/D>>}% \@onelevel@sanitize\HyPL@Useless \def\HyPL@SetPageLabels{% \@onelevel@sanitize\HyPL@Labels @@ -3456,10 +3646,10 @@ \else \ifx\HyPL@Labels\HyPL@Useless \else - \Hy@PutCatalog{/PageLabels << /Nums [\HyPL@Labels] >>}% + \Hy@PutCatalog{/PageLabels<</Nums[\HyPL@Labels]>>}% \fi \fi - } + }% \else \let\HyPL@EveryPage\@empty \fi @@ -3468,14 +3658,14 @@ \newcommand\theHequation{\theHsection.\arabic{equation}} \@ifundefined{thepart}{}{\newcommand\theHpart{\arabic{part}}} \@ifundefined{thechapter}{% - \newcommand\theHsection {\arabic{section}} - \newcommand\theHfigure {\arabic{figure}} - \newcommand\theHtable {\arabic{table}} + \newcommand\theHsection {\arabic{section}}% + \newcommand\theHfigure {\arabic{figure}}% + \newcommand\theHtable {\arabic{table}}% }{% - \newcommand\theHchapter {\arabic{chapter}} - \newcommand\theHfigure {\theHchapter.\arabic{figure}} - \newcommand\theHtable {\theHchapter.\arabic{table}} - \newcommand\theHsection {\theHchapter.\arabic{section}} + \newcommand\theHchapter {\arabic{chapter}}% + \newcommand\theHfigure {\theHchapter.\arabic{figure}}% + \newcommand\theHtable {\theHchapter.\arabic{table}}% + \newcommand\theHsection {\theHchapter.\arabic{section}}% } \newcommand\theHsubsection {\theHsection.\arabic{subsection}} \newcommand\theHsubsubsection{\theHsubsection.\arabic{subsubsection}} @@ -3528,8 +3718,10 @@ \def\hyper@refstepcounter#1{% \edef\This@name{#1}% \ifx\This@name\name@of@eq - \make@stripped@name{\theequation}% - \let\theHequation\newname + \@ifundefined{theHequation}{% + \make@stripped@name{\theequation}% + \let\theHequation\newname + }{}% \fi \@ifundefined{theH#1}{% \expandafter\def\csname theH#1\endcsname{\arabic{#1}}% @@ -3566,6 +3758,11 @@ \fi \ifHy@hypertexnames \let\@number\@firstofone + \@ifundefined{latin@Alph}{}{% + \ifx\@Alph\greek@Alph + \def\@Alph{Alph\@arabic}% + \fi + }% \ifHy@naturalnames \let\textlatin\@firstofone \xdef\@currentHlabel{\csname the#1\endcsname}% @@ -3645,7 +3842,7 @@ \@ifpackageloaded{titletoc}{% \def\ttl@gobblecontents#1#2#3#4{\ignorespaces}% }{} -\def\Hy@varioref@undefined{{???}{??}{}{}{}} +\def\Hy@varioref@undefined{{??}{??}{}{}{}} \@ifpackageloaded{varioref}{% \def\vref@pagenum#1#2{% \@ifundefined{r@#2}{% @@ -3705,8 +3902,10 @@ \def\equation{% \let\refstepcounter\H@refstepcounter \H@equation - \make@stripped@name{\theequation}% - \let\theHequation\newname + \@ifundefined{theHequation}{% + \make@stripped@name{\theequation}% + \let\theHequation\newname + }{}% \hyper@makecurrent{equation}% \Hy@raisedlink{\hyper@anchorstart{\@currentHref}}% \let\refstepcounter\new@refstepcounter @@ -3725,8 +3924,10 @@ \else \ifx\\\@currentHref\\% \else - \make@stripped@name{\theequation}% - \let\theHequation\newname + \@ifundefined{theHequation}{% + \make@stripped@name{\theequation}% + \let\theHequation\newname + }{}% \hyper@makecurrent{equation}% \hyper@anchorstart{\@currentHref}{}\hyper@anchorend \fi @@ -3747,8 +3948,10 @@ \def\subeqnarray{% \let\Hy@reserved@a\relax \H@subeqnarray - \make@stripped@name{\theequation}% - \let\theHequation\newname + \@ifundefined{theHequation}{% + \make@stripped@name{\theequation}% + \let\theHequation\newname + }{}% \hyper@makecurrent{equation}% \hyper@anchorstart{\@currentHref}{}\hyper@anchorend }% @@ -3775,9 +3978,24 @@ }% \endgroup } +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname subequations\endcsname\relax +\else + \let\HyOrg@subequations\subequations + \def\subequations{% + \stepcounter{equation}% + \protected@edef\theHparentequation{% + \@ifundefined{theHequation}\theequation\theHequation + }% + \addtocounter{equation}{-1}% + \HyOrg@subequations + \def\theHequation{\theHparentequation\alph{equation}}% + \ignorespaces + }% +\fi \@ifpackageloaded{tabularx}{\Hy@hyperfootnotesfalse}{} \ifHy@hyperfootnotes - \newcounter{Hfootnote} + \newcounter{Hfootnote}% \let\H@@footnotetext\@footnotetext \let\H@@footnotemark\@footnotemark \def\@xfootnotenext[#1]{% @@ -3935,7 +4153,12 @@ {\@dblarg{\Hy@tempa\@captype}}% } \long\def\@caption#1[#2]#3{% - \hyper@makecurrent{\@captype}% + \expandafter\ifx\csname if@capstart\expandafter\endcsname + \csname iftrue\endcsname + \global\let\@currentHref\hc@currentHref + \else + \hyper@makecurrent{\@captype}% + \fi \def\@currentlabelname{#2}% \par\addcontentsline{\csname ext@#1\endcsname}{#1}{% \protect\numberline{\csname the#1\endcsname}{\ignorespaces #2}% @@ -3946,14 +4169,20 @@ \@setminipage \fi \normalsize - \@makecaption{\csname fnum@#1\endcsname}{% - \ignorespaces - \ifHy@nesting - \hyper@@anchor{\@currentHref}{#3}% - \else - \Hy@raisedlink{\hyper@@anchor{\@currentHref}{\relax}}#3% - \fi - }% + \expandafter\ifx\csname if@capstart\expandafter\endcsname + \csname iftrue\endcsname + \global\@capstartfalse + \@makecaption{\csname fnum@#1\endcsname}{\ignorespaces#3}% + \else + \@makecaption{\csname fnum@#1\endcsname}{% + \ignorespaces + \ifHy@nesting + \hyper@@anchor{\@currentHref}{#3}% + \else + \Hy@raisedlink{\hyper@@anchor{\@currentHref}{\relax}}#3% + \fi + }% + \fi \par \endgroup } @@ -3962,7 +4191,7 @@ \def\Hy@float@caption{% \hyper@makecurrent{\@captype}% \float@caption - } + }% \let\HyOrg@float@makebox\float@makebox \renewcommand{\float@makebox}[1]{% \HyOrg@float@makebox{% @@ -3990,8 +4219,12 @@ } \def\hyper@natanchorend{\hyper@anchorend} \@ifundefined{NAT@parse}{% + \providecommand*\@extra@binfo{}% + \providecommand*\@extra@b@citeb{}% \def\bibcite#1#2{% - \@newl@bel{b}{#1\@extra@binfo}{\hyper@@link[cite]{}{cite.#1}{#2}}% + \@newl@bel{b}{#1\@extra@binfo}{% + \hyper@@link[cite]{}{cite.#1\@extra@b@citeb}{#2}% + }% }% \gdef\@extra@binfo{}% \let\Hy@bibcite\bibcite @@ -4007,9 +4240,13 @@ \@skiphyperreftrue \H@item[% \ifx\Hy@raisedlink\@empty - \hyper@anchorstart{cite.#2}\@BIBLABEL{#1}\hyper@anchorend + \hyper@anchorstart{cite.#2\@extra@b@citeb}% + \@BIBLABEL{#1}% + \hyper@anchorend \else - \Hy@raisedlink{\hyper@anchorstart{cite.#2}\hyper@anchorend}% + \Hy@raisedlink{% + \hyper@anchorstart{cite.#2\@extra@b@citeb}\hyper@anchorend + }% \@BIBLABEL{#1}% \fi \hfill @@ -4027,7 +4264,9 @@ }% \def\@bibitem#1{% \@skiphyperreftrue\H@item\@skiphyperreffalse - \Hy@raisedlink{\hyper@anchorstart{cite.#1}\relax\hyper@anchorend}% + \Hy@raisedlink{% + \hyper@anchorstart{cite.#1\@extra@b@citeb}\relax\hyper@anchorend + }% \if@filesw \begingroup \let\protect\noexpand @@ -4198,7 +4437,7 @@ \def\@citedatax@opt[#1]{% \def\@cite@opt{, #1}% \@citedatax[{#1}]% - } + }% }{} \def\@begindvi{% \unvbox \@begindvibox @@ -4269,11 +4508,123 @@ \gdef\PDF@FinishDoc{}% \fi } +\@ifpackageloaded{fancybox}{% + \def\fb@outputpage{% + \begingroup + \catcode`\ =10 % + \let\-\@dischyph + \let\'\@acci + \let\`\@accii + \let\=\@acciii + \if@specialpage + \global\@specialpagefalse\@nameuse{ps@\@specialstyle}% + \fi + \if@twoside + \ifodd\count\z@ + \let\@thehead\@oddhead + \let\@thefoot\@oddfoot + \let\@themargin\oddsidemargin + \else + \let\@thehead\@evenhead + \let\@thefoot\@evenfoot + \let\@themargin\evensidemargin + \fi + \fi + \csname reset@font\endcsname + \normalsize + \baselineskip\z@ + \lineskip\z@ + \let\par\@@par + \ifx\this@fancypage\@empty\else + \this@fancypage + \gdef\this@fancypage{}% + \fi + \ifx\the@fancypage\@empty\else + \setbox\@outputbox\hbox{\the@fancypage{\box\@outputbox}}% + \fi + \ifx\fb@@rotatepage\@empty\else + \setbox\@outputbox\hbox{\fb@@rotatepage{\box\@outputbox}}% + \fi + \setbox\@outputbox\vbox{% + \@tempdima=\wd\@outputbox + \setbox\@tempboxa=\hbox to\@tempdima{% + \let\label\@gobble + \let\index\@gobble + \let\glossary\@gobble + \@thehead + }% + \ht\@tempboxa\headheight + \dp\@tempboxa\z@ + \box\@tempboxa + \vskip\headsep + \box\@outputbox + \baselineskip\footskip + \hbox to\@tempdima{% + \let\label\@gobble + \let\index\@gobble + \let\glossary\@gobble + \@thefoot + }% + }% + \ifx\the@@fancypage\@empty\else + \setbox\@outputbox\hbox{\the@@fancypage{\box\@outputbox}}% + \fi + \setbox\@outputbox\vbox{% + \ifnum\fancyput@flag>-1 \do@fancyput\fi + \@begindvi + \Hy@TempPageAnchor\relax + \hyper@pagetransition + \hyper@pageduration + \hyper@pagehidden + \vskip\topmargin + \moveright\@themargin\box\@outputbox + }% + \ifx\fb@rotatepage\@empty\else + \setbox\@outputbox\hbox{\lower\ht\@outputbox\box\@outputbox}% + \dp\@outputbox\z@ + \wd\@outputbox\z@ + \setbox\@outputbox\hbox{\fb@rotatepage{\box\@outputbox}}% + \expandafter\fb@setoffsets\fb@theoffsets + \fi + \let\protect\noexpand + \shipout\box\@outputbox + \global\@colht\textheight + \endgroup + \stepcounter{page}% + \let\firstmark\botmark + }% + \def\fancypage#1#2{% + \def\the@fancypage{#1}% + \def\the@@fancypage{#2}% + \def\@outputpage{\fb@outputpage}% + }% + \def\thisfancypage#1#2{% + \gdef\@outputpage{\fb@outputpage}% + \gdef\this@fancypage{\def\the@fancypage{#1}\def\the@@fancypage{#2}}% + }% + \def\fancyput{% + \def\@outputpage{\fb@outputpage}% + \@ifstar{\@testtrue\@fancyput}{\@testfalse\@fancyput}% + }% + \def\thisfancyput{% + \gdef\@outputpage{\fb@outputpage}% + \@ifstar{\@testtrue\@thisfancyput}{\@testfalse\@thisfancyput}% + }% + \def\LandScape#1{% + \clearpage + \def\fb@@rotatepage{#1}% + \def\@outputpage{\fb@outputpage}% + \@tempdima\textheight + \textheight\textwidth + \textwidth\@tempdima + \UsePageParameters + }% +}{} \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname chapter\endcsname\relax - \def\toclevel@part{0} + \def\toclevel@part{0}% \else - \def\toclevel@part{-1} + \def\toclevel@part{-1}% \fi \def\toclevel@chapter{0} \def\toclevel@section{1} @@ -4322,9 +4673,9 @@ \ifHy@verbose \def\Hy@tempa{#3}% \@onelevel@sanitize\Hy@tempa - \typeout{pdftex: bookmark at \the\inputlineno: - {\csname the#2\endcsname} - {\Hy@tempa} + \typeout{pdftex: bookmark at \the\inputlineno: % + {\csname the#2\endcsname}% + {\Hy@tempa}% {\@currentHref}% {\Hy@toclevel}% {#1}% @@ -4412,17 +4763,17 @@ }% }{% \Hy@WarningNoLine{% - \string\numberwithin\space of package `amsmath' + \string\numberwithin\space of package `amsmath' % only fixed\MessageBreak for version 2000/06/06 v2.12 or newer% }% - } + }% }{} \ifHy@figures \let\Hy@Gin@setfile\Gin@setfile \def\Gin@setfile#1#2#3{% \hyperimage{#3}{\Hy@Gin@setfile{#1}{#2}{#3}}% - } + }% \fi \Hy@DisableOption{hyperfigures} \ifHy@hyperindex @@ -4452,7 +4803,7 @@ \fi }% \else - \def\@wrindex#1{\@@wrindex#1||\\} + \def\@wrindex#1{\@@wrindex#1||\\}% \def\@@wrindex#1|#2|#3\\{% \if@filesw \ifx\\#2\\% @@ -4703,7 +5054,7 @@ \fi }% \def\l@subslide##1##2##3##4{% - \ifnum\lslide@flag=1 + \ifnum\lslide@flag=1 % \@undottedtocline{2}{3.8em}{3.2em}{\hyperlink{##4}{##2}}{}% \fi }% @@ -4749,17 +5100,83 @@ {\expandafter\@secondoffive#1}% \fi } +\def\HyRef@StarSetRef#1{% + \begingroup + \Hy@safe@activestrue + \edef\x{#1}% + \@onelevel@sanitize\x + \edef\x{\endgroup + \noexpand\HyRef@@StarSetRef + \expandafter\noexpand\csname r@\x\endcsname{\x}% + }% + \x +} +\def\HyRef@@StarSetRef#1#2#3{% + \ifx#1\@undefined + \let#1\relax + \fi + \real@setref#1#3{#2}% +} \def\@refstar#1{% - \Hy@safe@activestrue - \expandafter\real@setref\csname r@#1\endcsname\@firstoffive{#1}% - \Hy@safe@activesfalse + \HyRef@StarSetRef{#1}\@firstoffive } \def\@pagerefstar#1{% - \Hy@safe@activestrue - \expandafter\real@setref\csname r@#1\endcsname\@secondoffive{#1}% - \Hy@safe@activesfalse + \HyRef@StarSetRef{#1}\@secondoffive +} +\AtBeginDocument{% + \@ifpackageloaded{varioref}{% + \def\@Refstar#1{% + \HyRef@StarSetRef{#1}\HyRef@MakeUppercaseFirstOfFive + }% + \def\HyRef@MakeUppercaseFirstOfFive#1#2#3#4#5{% + \MakeUppercase#1% + }% + \DeclareRobustCommand*{\Ref}{% + \@ifstar\@Refstar\HyRef@Ref + }% + \def\HyRef@Ref#1{% + \hyperref[{#1}]{\Ref*{#1}}% + }% + \def\Vr@f#1{% + \leavevmode\unskip\vref@space + \hyperref[{#1}]{% + \Ref*{#1}% + \let\vref@space\nobreakspace + \@vpageref[\unskip]{#1}% + }% + }% + \def\vr@f#1{% + \leavevmode\unskip\vref@space + \begingroup + \let\T@pageref\@pagerefstar + \hyperref[{#1}]{% + \ref*{#1}% + \vpageref[\unskip]{#1}% + }% + \endgroup + }% + }{}% } -\DeclareRobustCommand\autoref{% +\DeclareRobustCommand*{\autopageref}{% + \@ifstar{% + \HyRef@autopagerefname\pageref*% + }\HyRef@autopageref +} +\def\HyRef@autopageref#1{% + \hyperref[{#1}]{\HyRef@autopagerefname\pageref*{#1}}% +} +\def\HyRef@autopagerefname{% + \@ifundefined{pageautorefname}{% + \@ifundefined{pagename}{% + \Hy@Warning{No autoref name for `page'}% + }{% + \pagename\nobreakspace + }% + }{% + \pageautorefname\nobreakspace + }% +} +\DeclareRobustCommand*{\autoref}{% \@ifstar{\HyRef@autoref\@gobbletwo}{\HyRef@autoref\hyper@@link}% } \def\HyRef@autoref#1#2{% @@ -4769,12 +5186,13 @@ \endgroup } \def\HyRef@autosetref#1#2#3{% link command, csname, refname + \HyRef@ShowKeysRef{#2}% \ifcase 0\ifx#1\relax 1\fi\ifx#1\Hy@varioref@undefined 1\fi\relax \edef\HyRef@thisref{\expandafter\@fourthoffive#1\@empty\@empty\@empty}% - \expandafter\HyRef@testreftype\HyRef@thisref\\% + \expandafter\HyRef@testreftype\HyRef@thisref.\\% \Hy@safe@activesfalse #3{% - \expandafter\@fifthoffive#1% + \expandafter\@fifthoffive#1\@empty\@empty\@empty }{% \expandafter\@fourthoffive#1\@empty\@empty\@empty }{% @@ -4793,8 +5211,23 @@ \def\HyRef@testreftype#1.#2\\{% \@ifundefined{#1autorefname}{% \@ifundefined{#1name}{% - \def\HyRef@currentHtag{}% - \@latex@warning{no tag name for #1 at \the\inputlineno}% + \HyRef@StripStar#1\\*\\\@nil{#1}% + \@ifundefined{\HyRef@name autorefname}{% + \@ifundefined{\HyRef@name name}{% + \def\HyRef@currentHtag{}% + \Hy@Warning{No autoref name for `#1'}% + }{% + \edef\HyRef@currentHtag{% + \expandafter\noexpand\csname\HyRef@name name\endcsname + \noexpand~% + }% + }% + }{% + \edef\HyRef@currentHtag{% + \expandafter\noexpand\csname\HyRef@name autorefname\endcsname + \noexpand~% + }% + }% }{% \edef\HyRef@currentHtag{% \expandafter\noexpand\csname#1name\endcsname @@ -4808,7 +5241,38 @@ }% }% } +\def\HyRef@StripStar#1*\\#2\@nil#3{% + \def\HyRef@name{#2}% + \ifx\HyRef@name\HyRef@CaseStar + \def\HyRef@name{#1}% + \else + \def\HyRef@name{#3}% + \fi +} +\def\HyRef@CaseStar{*\\} \def\HyRef@currentHtag{} +\let\HyRef@ShowKeysRef\@gobble +\def\HyRef@ShowKeysInit{% + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname SK@@label\endcsname\relax + \else + \ifx\SK@ref\@empty + \else + \def\HyRef@ShowKeysRef{% + \SK@\SK@@ref + }% + \fi + \fi +} +\@ifpackageloaded{showkeys}{% + \HyRef@ShowKeysInit +}{% + \AtBeginDocument{% + \@ifpackageloaded{showkeys}{% + \HyRef@ShowKeysInit + }{}% + }% +} \providecommand*\AMSautorefname{\equationautorefname} \providecommand*\Hfootnoteautorefname{\footnoteautorefname} \providecommand*\Itemautorefname{\itemautorefname} @@ -4828,6 +5292,7 @@ \providecommand*\subparagraphautorefname{subparagraph} \providecommand*\FancyVerbLineautorefname{line} \providecommand*\theoremautorefname{Theorem} +\providecommand*\pageautorefname{page} \providecommand*{\Hy@DistillerDestFix}{} \def\phantomsection{% \Hy@GlobalStepCount\Hy@linkcounter diff --git a/Master/texmf-dist/tex/latex/hyperref/hypertex.def b/Master/texmf-dist/tex/latex/hyperref/hypertex.def index 4d7b943422a..3162482ee0f 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/02/27 v6.75t + [2007/05/29 v6.76g 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 d878781e7fe..b6cadb0937c 100644 --- a/Master/texmf-dist/tex/latex/hyperref/nameref.sty +++ b/Master/texmf-dist/tex/latex/hyperref/nameref.sty @@ -20,7 +20,7 @@ %% given in the file `manifest.txt'. \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{nameref} - [2006/12/27 v2.28 Cross-referencing by name of section] + [2007/05/29 v2.31 Cross-referencing by name of section]% \RequirePackage{refcount}[2006/02/12] \def\strip@period#1.\relax#2\@@@{#1} \newif\ifNR@showkeys @@ -111,7 +111,8 @@ }% }% }% - \endgroup} + \endgroup +} \let\NR@sect\@sect \newcounter{section@level} \def\@sect#1#2#3#4#5#6[#7]#8{% @@ -145,6 +146,19 @@ \NR@@caption{#1}[{#2}]% } \AtBeginDocument{% + \@ifpackageloaded{longtable}{% + \let\NRorg@LT@c@ption\LT@c@ption + \def\LT@c@ption#1[#2]#3{% + \NRorg@LT@c@ption{#1}[{#2}]{#3}% + \def\@tempa{#2}% + \ifx\@tempa\@empty + \else + \def\@currentlabelname{#2}% + \fi + }% + }{}% +} +\AtBeginDocument{% \@ifpackageloaded{titlesec}{% \let\NRorg@ttl@sect@i\ttl@sect@i \def\ttl@sect@i#1#2[#3]#4{% @@ -153,6 +167,23 @@ }% }{}% } +\@ifclassloaded{beamer}{% + \def\NR@PatchBeamer#1{% + \expandafter\let\csname NRorg@beamer@#1\expandafter\endcsname + \csname beamer@#1\endcsname + \begingroup + \edef\x{\endgroup + \long\def\expandafter\noexpand\csname beamer@#1\endcsname[####1]{% + \def\noexpand\@currentlabelname{####1}% + \expandafter\noexpand\csname NRorg@beamer@#1\endcsname[{####1}]% + }% + }% + \x + }% + \NR@PatchBeamer{section}% + \NR@PatchBeamer{subsection}% + \NR@PatchBeamer{subsubsection}% +}{} \def\@currentlabelname{} \def\@currentHref{} \long\def\@firstoffive#1#2#3#4#5{#1} @@ -240,91 +271,139 @@ \def\pageref##1{\getrefbykeydefault{##1}{page}{0}}% }% }{} -\ifx\csname @@vpageref\endcsname\relax -\else - \def\@@vpageref#1[#2]#3{% - \leavevmode\unskip - \global\advance\c@vrcnt\@ne - \@ifundefined{r@\the\c@vrcnt @vr}% - {\@namedef{r@\the\c@vrcnt @vr}{{??}{??}{??}{??}{??}}}{}% - \edef\@tempa{% - \expandafter\expandafter\expandafter - \@secondoffive\csname r@\the\c@vrcnt @vr\endcsname - }% - \@ifundefined{r@\the\c@vrcnt @xvr}% - {\@namedef{r@\the\c@vrcnt @xvr}{{??}{??}{??}{??}{??}}}{}% - \edef\@tempb{% - \expandafter\expandafter\expandafter - \@secondoffive\csname r@\the\c@vrcnt @xvr\endcsname - }% - {% - \let\@currentlabel\@empty - \expandafter\label\expandafter{\the\c@vrcnt @xvr}% +\AtBeginDocument{% + \ifx\csname @@vpageref\endcsname\relax + \else + \def\@@vpageref#1[#2]#3{% + \begingroup + \csname @safe@activestrue\endcsname + \edef\x{#3}% + \@onelevel@sanitize\x + \toks@{% + \NR@@vpageref{#1}[{#2}]% + }% + \edef\x{\endgroup + \the\toks@{\x}% + }% + \x }% - \ifx\@tempa\@tempb - \else - \vref@err{% - \noexpand\vref at page boundary - \@tempb-\@tempa\space (may loop)% + \def\NR@@vpageref#1[#2]#3{% + \leavevmode\unskip + \global\advance\c@vrcnt\@ne + \@ifundefined{r@\the\c@vrcnt @vr}% + {\@namedef{r@\the\c@vrcnt @vr}{{??}{??}{}{}{}}}{}% + \edef\@tempa{% + \expandafter\expandafter\expandafter + \@secondoffive\csname r@\the\c@vrcnt @vr\endcsname }% - \fi - \@ifundefined{r@#3}{\@namedef{r@#3}{{??}{??}{??}{??}{??}}}{}% - \edef\@tempb{% - \expandafter\expandafter\expandafter - \@secondoffive\csname r@#3\endcsname - }% - \space - \ifx\@tempa\@tempb - #1% - \else - #2% - \is@pos@number\@tempb{% - \is@pos@number\@tempa{% - \@tempcnta\@tempa - \advance\@tempcnta\@ne - }{% - \@tempcnta\maxdimen + \@ifundefined{r@\the\c@vrcnt @xvr}% + {\@namedef{r@\the\c@vrcnt @xvr}{{??}{??}{}{}{}}}{}% + \edef\@tempb{% + \expandafter\expandafter\expandafter + \@secondoffive\csname r@\the\c@vrcnt @xvr\endcsname + }% + {% + \let\@currentlabel\@empty + \expandafter\label\expandafter{\the\c@vrcnt @xvr}% + }% + \ifx\@tempa\@tempb + \else + \vref@err{% + \noexpand\vref at page boundary % + \@tempb-\@tempa\space (may loop)% }% - \ifnum \@tempb =\@tempcnta - \ifodd\@tempcnta - \if@twoside - \reftextfaceafter + \fi + \@ifundefined{r@#3}{\@namedef{r@#3}{{??}{??}{}{}{}}}{}% + \edef\thevpagerefnum{% + \expandafter\expandafter\expandafter + \@secondoffive\csname r@#3\endcsname + }% + \ifx\vref@space\@undefined + \space + \else + \vref@space + \fi + \ifx\@tempa\thevpagerefnum + #1% + \else + #2% + \is@pos@number\thevpagerefnum{% + \is@pos@number\@tempa{% + \@tempcnta\@tempa + \advance\@tempcnta\@ne + }{% + \@tempcnta\maxdimen + }% + \ifnum \thevpagerefnum =\@tempcnta + \ifodd\@tempcnta + \if@twoside + \reftextfaceafter + \else + \reftextafter + \fi \else \reftextafter \fi \else - \reftextafter - \fi - \else - \advance\@tempcnta-2 - \ifnum \@tempb =\@tempcnta - \ifodd\@tempcnta - \reftextbefore - \else - \if@twoside - \reftextfacebefore - \else + \advance\@tempcnta-2 % + \ifnum \thevpagerefnum =\@tempcnta + \ifodd\@tempcnta \reftextbefore + \else + \if@twoside + \reftextfacebefore + \else + \reftextbefore + \fi \fi + \else + \reftextfaraway{#3}% \fi - \else - \reftextfaraway{#3}% \fi - \fi - }{% - \reftextfaraway{#3}% + }{% + \reftextfaraway{#3}% + }% + \fi + {% + \let\@currentlabel\@empty + \expandafter\label\expandafter{\the\c@vrcnt @vr}% }% - \fi - {% - \let\@currentlabel\@empty - \expandafter\label\expandafter{\the\c@vrcnt @vr}% }% + \DeclareRobustCommand\vnameref[1]{% + \unskip~\nameref{#1}% + \@vpageref[\unskip]{#1}% + }% + \fi +} +\@ifundefined{@Refstar}{% + \def\T@Ref#1{% + \NR@setref{#1}\NR@MakeUppercaseFirstOfFive{#1}% }% - \DeclareRobustCommand\vnameref[1]{% - \unskip~\nameref{#1}% - \@vpageref[\unskip]{#1}% - } -\fi + \def\NR@MakeUppercaseFirstOfFive#1#2#3#4#5{% + \MakeUppercase#1% + }% +}{}% +\AtBeginDocument{% + \@ifpackageloaded{varioref}{% + \@ifundefined{@Refstar}{% + \DeclareRobustCommand*{\Ref}[1]{% + \T@Ref{#1}% + }% + }{}% + }{}% +}% +\AtBeginDocument{% + \@ifpackageloaded{listings}{% + \let\NROrg@lst@MakeCaption\lst@MakeCaption + \def\lst@MakeCaption{% + \ifx\lst@label\@empty + \else + \let\@currentlabelname\lst@@caption + \fi + \NROrg@lst@MakeCaption + }% + }{}% +} \endinput %% %% End of file `nameref.sty'. diff --git a/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty b/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty index 792d0035020..3827b9bc120 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/02/27 v6.75t + [2007/05/29 v6.76g 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 c2df6d78b67..f6936acef60 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/02/27 v6.75t + [2007/05/29 v6.76g Hyperref: PDFDocEncoding definition (HO)] \DeclareFontEncoding{PD1}{}{} \DeclareTextCommand{\textLF}{PD1}{\012} % line feed @@ -82,7 +82,7 @@ \DeclareTextCommand{\textemdash}{PD1}{\204} % emdash \DeclareTextCommand{\textendash}{PD1}{\205} % endash \DeclareTextCommand{\textflorin}{PD1}{\206} % florin -\DeclareTextCommand{\textfractionmark}{PD1}{/} % fraction, \207 +\DeclareTextCommand{\textfractionmark}{PD1}{\207} % fraction, \207 \DeclareTextCommand{\guilsinglleft}{PD1}{\210} % guilsinglleft \DeclareTextCommand{\guilsinglright}{PD1}{\211} % guilsinglright \DeclareTextCommand{\textminus}{PD1}{-} % minus, \212 @@ -94,19 +94,19 @@ \DeclareTextCommand{\textquoteright}{PD1}{\220} % quoteright \DeclareTextCommand{\quotesinglbase}{PD1}{\221} % quotesinglbase \DeclareTextCommand{\texttrademark}{PD1}{\222} % trademark -\DeclareTextCommand{\textfi}{PD1}{fi} % fi ?? \223 -\DeclareTextCommand{\textfl}{PD1}{fl} % fl ?? \224 -\DeclareTextCommand{\L}{PD1}{L} % Lslash, \225 +\DeclareTextCommand{\textfi}{PD1}{\223} % fi ?? \223 +\DeclareTextCommand{\textfl}{PD1}{\224} % fl ?? \224 +\DeclareTextCommand{\L}{PD1}{\225} % Lslash, \225 \DeclareTextCommand{\OE}{PD1}{\226} % OE \DeclareTextCompositeCommand{\v}{PD1}{S}{\227} % Scaron \DeclareTextCompositeCommand{\"}{PD1}{Y}{\230} % Ydieresis \DeclareTextCommand{\IJ}{PD1}{\230} -\DeclareTextCompositeCommand{\v}{PD1}{Z}{Z} % Zcaron, \231 -\DeclareTextCommand{\i}{PD1}{i} % dotlessi, \232 -\DeclareTextCommand{\l}{PD1}{l} % lslash, \233 +\DeclareTextCompositeCommand{\v}{PD1}{Z}{\231} % Zcaron, \231 +\DeclareTextCommand{\i}{PD1}{\232} % dotlessi, \232 +\DeclareTextCommand{\l}{PD1}{\233} % lslash, \233 \DeclareTextCommand{\oe}{PD1}{\234} % oe \DeclareTextCompositeCommand{\v}{PD1}{s}{\235} % scaron -\DeclareTextCompositeCommand{\v}{PD1}{z}{z} % zcaron, 236 +\DeclareTextCompositeCommand{\v}{PD1}{z}{\236} % zcaron, 236 \DeclareTextCommand{\texteuro}{PD1}{\240} % Euro \DeclareTextCommand{\textexclamdown}{PD1}{\241} % exclamdown \DeclareTextCommand{\textcent}{PD1}{\242} % cent diff --git a/Master/texmf-dist/tex/latex/hyperref/pdfmark.def b/Master/texmf-dist/tex/latex/hyperref/pdfmark.def index 8e9af78628c..413cd24ae97 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/02/27 v6.75t + [2007/05/29 v6.76g Hyperref definitions for pdfmark specials] \def\Hy@PutCatalog#1{% \pdfmark{pdfmark=/PUT,Raw={\string{Catalog\string} << #1 >>}}% @@ -31,13 +31,13 @@ \def\HyPL@StorePageLabel#1{% \if@filesw \begingroup - \edef\Hy@tempa{\the\Hy@abspage\space<< #1 >> }% + \edef\Hy@tempa{\the\Hy@abspage<<#1>>}% \immediate\write\@mainaux{% \string\HyPL@Entry{\Hy@tempa}% }% \endgroup \fi - } + }% \AfterBeginDocument{% \if@filesw \immediate\write\@mainaux{% @@ -56,7 +56,7 @@ \HyPL@Labels #1% }% - } + }% \fi \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname pdfescapestring\endcsname\relax @@ -73,7 +73,7 @@ }% |def|Hy@ExchangeBackslash#1\#2|@nil{% #1% - |ifx|\#2|\% + |ifx|\#2|\%% |else \\% |Hy@ReturnAfterFi{% @@ -81,7 +81,7 @@ }% |fi }% - } + }% \def\Hy@ExchangeLeftParenthesis#1(#2\@nil{% #1% \ifx\\#2\\% @@ -91,7 +91,7 @@ \Hy@ExchangeLeftParenthesis#2\@nil }% \fi - } + }% \def\Hy@ExchangeRightParenthesis#1)#2\@nil{% #1% \ifx\\#2\\% @@ -101,7 +101,7 @@ \Hy@ExchangeRightParenthesis#2\@nil }% \fi - } + }% \else \def\Hy@pstringdef#1#2{% \edef#1{\pdfescapestring{#2}}% @@ -164,7 +164,6 @@ linktype=anchor,% View=/\@pdfview \@pdfviewparams,% DestAnchor=\hyper@currentanchor,% - Raw=H.B% }% \Hy@activeanchorfalse \Hy@RestoreLastskip @@ -181,7 +180,11 @@ } \def\hyper@linkend{% \literalps@out{\strip@pt@and@otherjunk\baselineskip\space H.L}% - \edef\Hy@tempcolor{\csname @\hyper@currentlinktype bordercolor\endcsname}% + \@ifundefined{@\hyper@currentlinktype bordercolor}{% + \let\Hy@tempcolor\relax + }{% + \edef\Hy@tempcolor{\csname @\hyper@currentlinktype bordercolor\endcsname}% + }% \pdfmark{% pdfmark=/ANN,% linktype=link,% @@ -200,8 +203,8 @@ \fi } \begingroup - \catcode`P=12 - \catcode`T=12 + \catcode`P=12 % + \catcode`T=12 % \lowercase{\endgroup \gdef\rem@ptetc#1.#2PT#3!{#1\ifnum#2>\z@.#2\fi}% } @@ -252,10 +255,15 @@ \fi } \def\hyper@image#1#2{% - \hyper@linkurl{#2}{#1}} + \hyper@linkurl{#2}{#1}% +} \def\Hy@undefinedname{UNDEFINED} \def\hyper@link#1#2#3{% - \edef\Hy@tempcolor{\csname @#1bordercolor\endcsname}% + \@ifundefined{@#1bordercolor}{% + \let\Hy@tempcolor\relax + }{% + \edef\Hy@tempcolor{\csname @#1bordercolor\endcsname}% + }% \begingroup \protected@edef\Hy@testname{#2}% \ifx\Hy@testname\@empty @@ -357,7 +365,7 @@ \pdfmark{% pdfmark=/PUT,% Raw={% - \string{Catalog\string} << + \string{Catalog\string}<<% \ifx\Hy@temp\@empty \else /ViewerPreferences<<\Hy@temp>>% @@ -369,7 +377,7 @@ \fi \ifx\@baseurl\@empty \else - /URI << /Base (\Hy@pstringB) >>% + /URI<</Base(\Hy@pstringB)>>% \fi >>% }% @@ -408,6 +416,7 @@ \newsavebox{\pdf@box} \providecommand*{\Hy@setouterhbox}{\sbox} \providecommand*{\Hy@breaklinksunhbox}{\unhbox} +\def\Hy@DEST{/DEST} \def\pdf@rect#1{% \leavevmode \ifHy@breaklinks @@ -432,7 +441,10 @@ \else \raise\dimen@\hbox{\literalps@out{H.R}}% \fi - \pdf@addtoksx{H.B}% + \ifx\pdf@type\Hy@DEST + \else + \pdf@addtoksx{H.B}% + \fi } \newtoks\pdf@toks \newtoks\pdf@defaulttoks @@ -457,9 +469,10 @@ \edef\Hy@temp{#1}% \ifx\Hy@temp\@empty \else - \pdf@addtoks{[#1]}{Border}% + \pdf@addtoks{[#1]\Hy@BorderArrayPatch}{Border}% \fi } +\let\Hy@BorderArrayPatch\@empty \define@key{PDF}{BorderStyle}{% \edef\Hy@temp{#1}% \ifx\Hy@temp\@empty @@ -467,7 +480,12 @@ \pdf@addtoks{<<#1>>}{BS}% \fi } -\define@key{PDF}{Color}{\pdf@addtoks{[#1]}{Color}} +\define@key{PDF}{Color}{% + \ifx\relax#1\relax + \else + \pdf@addtoks{[#1]}{Color}% + \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}} @@ -545,7 +563,7 @@ #1,% Border=\@pdfborder,% BorderStyle=\@pdfborderstyle,% - Color=.2 .1 .5, + Color=.2 .1 .5,% pdfmark=/ANN,% Subtype=/Link,% Page=/Next% @@ -568,27 +586,6 @@ \def\PDFOpen#1{% \pdfmark{#1,pdfmark=/DOCVIEW}% } -\def\PDFPage{\@ifnextchar[{\PDFPage@}{\PDFPage@[]}} -\def\PDFPage@[#1]#2#3{% - \let\pageref\simple@pageref - \pdfmark[{#3}]{% - #1,% - Page={#2},% - AcroHighlight=\@pdfhighlight,% - Border=\@pdfborder,% - BorderStyle=\@pdfborderstyle,% - Color=\@pagebordercolor,% - pdfmark=/ANN,% - Subtype=/Link% - }% -} -\def\simple@pageref#1{% - \expandafter\ifx\csname r@#1\endcsname\relax - 0% - \else - \expandafter\expandafter\expandafter - \@secondoffive\csname r@#1\endcsname - \fi} \def\hyper@linkurl#1#2{% \begingroup \Hy@pstringdef\Hy@pstringURI{#2}% @@ -613,18 +610,20 @@ \leavevmode \pdfmark[{#1}]{% pdfmark=/ANN,% - Subtype=/Link, + Subtype=/Link,% AcroHighlight=\@pdfhighlight,% Border=\@pdfborder,% BorderStyle=\@pdfborderstyle,% linktype=file,% Color=\@filebordercolor,% - Action={<< - /S /GoToR - \ifHy@newwindow /NewWindow true \fi - /F (\Hy@pstringF) - /D \ifx\\#3\\[0 \@pdfstartview]\else(\Hy@pstringD) cvn\fi - >>}% + Action={% + <<% + /S/GoToR% + \ifHy@newwindow /NewWindow true\fi + /F(\Hy@pstringF)% + /D\ifx\\#3\\[0 \@pdfstartview]\else(\Hy@pstringD)cvn\fi + >>% + }% }% \endgroup } @@ -639,116 +638,195 @@ AcroHighlight=\@pdfhighlight,% Border=\@pdfborder,% BorderStyle=\@pdfborderstyle,% - linktype=file,% - Color=\@filebordercolor,% - Action={<< - /S /Launch - \ifHy@newwindow /NewWindow true \fi - /F (\Hy@pstringF) - \ifx\\#3\\% - \else - /Win << /P (\Hy@pstringP) /F (\Hy@pstringF) >> - \fi - >>}% + linktype=run,% + Color=\@runbordercolor,% + Action={% + <<% + /S/Launch% + \ifHy@newwindow /NewWindow true\fi + /F(\Hy@pstringF)% + \ifx\\#3\\% + \else + /Win<</P(\Hy@pstringP)/F(\Hy@pstringF)>>% + \fi + >>% + }% }% \endgroup } \long\def\@Form[#1]{% \AtBeginDvi{% \headerps@out{% -[ /_objdef {pdfDocEncoding} - /type /dict -/OBJ pdfmark -[ {pdfDocEncoding} - << /Type /Encoding - /Differences [ 24 /breve /caron /circumflex /dotaccent -/hungarumlaut /ogonek /ring /tilde 39 /quotesingle 96 /grave 128 -/bullet /dagger /daggerdbl /ellipsis /emdash /endash /florin /fraction -/guilsinglleft /guilsinglright /minus /perthousand /quotedblbase -/quotedblleft /quotedblright /quoteleft /quoteright /quotesinglbase -/trademark /fi /fl /Lslash /OE /Scaron /Ydieresis /Zcaron /dotlessi -/lslash /oe /scaron /zcaron 164 /currency 166 /brokenbar 168 /dieresis -/copyright /ordfeminine 172 /logicalnot /.notdef /registered /macron -/degree /plusminus /twosuperior /threesuperior /acute /mu 183 -/periodcentered /cedilla /onesuperior /ordmasculine 188 /onequarter -/onehalf /threequarters 192 /Agrave /Aacute /Acircumflex /Atilde -/Adieresis /Aring /AE /Ccedilla /Egrave /Eacute /Ecircumflex -/Edieresis /Igrave /Iacute /Icircumflex /Idieresis /Eth /Ntilde -/Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply /Oslash -/Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls -/agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla -/egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex -/idieresis /eth /ntilde /ograve /oacute /ocircumflex /otilde -/odieresis /divide /oslash /ugrave /uacute /ucircumflex /udieresis -/yacute /thorn /ydieresis ] ->> -/PUT pdfmark -[ /_objdef {ZaDb} - /type /dict -/OBJ pdfmark -[ {ZaDb} - << - /Type /Font - /Subtype /Type1 - /Name /ZaDb - /BaseFont /ZapfDingbats - >> -/PUT pdfmark -[ /_objdef {Helv} - /type /dict -/OBJ pdfmark -[ {Helv} - << - /Type /Font - /Subtype /Type1 - /Name /Helv - /BaseFont /Helvetica - /Encoding {pdfDocEncoding} - >> -/PUT pdfmark -[ /_objdef {aform} - /type /dict -/OBJ pdfmark -[ /_objdef {afields} - /type /array -/OBJ pdfmark -{ - [/BBox [0 0 100 100] /_objdef {Check} /BP pdfmark - 1 0 0 setrgbcolor /ZapfDingbats 80 selectfont 20 20 moveto (4) show - [/EP pdfmark - [/BBox [0 0 100 100] /_objdef {Cross} /BP pdfmark - 1 0 0 setrgbcolor /ZapfDingbats 80 selectfont 20 20 moveto (8) show - [/EP pdfmark - [/BBox [0 0 250 100] /_objdef {Submit} /BP pdfmark 0.6 setgray 0 0 250 - 100 rectfill 1 setgray 2 2 moveto 2 98 lineto 248 98 lineto 246 96 - lineto 4 96 lineto 4 4 lineto fill 0.34 setgray 248 98 moveto 248 2 - lineto 2 2 lineto 4 4 lineto 246 4 lineto 246 96 lineto fill - /Helvetica 76 selectfont 0 setgray 8 22.5 moveto (Submit) show - [/EP pdfmark - [/BBox [0 0 250 100] /_objdef {SubmitP} /BP pdfmark 0.6 setgray 0 0 - 250 100 rectfill 0.34 setgray 2 2 moveto 2 98 lineto 248 98 lineto 246 - 96 lineto 4 96 lineto 4 4 lineto fill 1 setgray 248 98 moveto 248 2 - lineto 2 2 lineto 4 4 lineto 246 4 lineto 246 96 lineto fill - /Helvetica 76 selectfont 0 setgray 10 20.5 moveto (Submit) show - [/EP pdfmark -} ?pdfmark -[ {aform} - << - /Fields {afields} - /DR << /Font << /ZaDb {ZaDb} /Helv {Helv} >> >> - /DA (/Helv 10 Tf 0 g ) - /CO {corder} - /NeedAppearances true - >> -/PUT pdfmark -[ \string{Catalog\string} - << - /AcroForm {aform} - >> -/PUT pdfmark -[ /_objdef {corder} /type /array /OBJ pdfmark % dps +[% + /_objdef{pdfDocEncoding}% + /type/dict% +/OBJ pdfmark% +[% + {pdfDocEncoding}% + <<% + /Type/Encoding% + /Differences[% + 24/breve/caron/circumflex/dotaccent/hungarumlaut/ogonek/ring/tilde % + 39/quotesingle % + 96/grave % + 128/bullet/dagger/daggerdbl/ellipsis/emdash/endash/florin/fraction% + /guilsinglleft/guilsinglright/minus/perthousand/quotedblbase% + /quotedblleft/quotedblright/quoteleft/quoteright/quotesinglbase% + /trademark/fi/fl/Lslash/OE/Scaron/Ydieresis/Zcaron/dotlessi% + /lslash/oe/scaron/zcaron164/currency166/brokenbar % + 168/dieresis/copyright/ordfeminine % + 172/logicalnot/.notdef/registered/macron/degree/plusminus% + /twosuperior/threesuperior/acute/mu % + 183/periodcentered/cedilla/onesuperior/ordmasculine % + 188/onequarter/onehalf/threequarters % + 192/Agrave/Aacute/Acircumflex/Atilde/Adieresis/Aring/AE/Ccedilla% + /Egrave/Eacute/Ecircumflex/Edieresis/Igrave/Iacute/Icircumflex% + /Idieresis/Eth/Ntilde/Ograve/Oacute/Ocircumflex/Otilde/Odieresis% + /multiply/Oslash/Ugrave/Uacute/Ucircumflex/Udieresis/Yacute% + /Thorn/germandbls/agrave/aacute/acircumflex/atilde/adieresis% + /aring/ae/ccedilla/egrave/eacute/ecircumflex/edieresis/igrave% + /iacute/icircumflex/idieresis/eth/ntilde/ograve/oacute% + /ocircumflex/otilde/odieresis/divide/oslash/ugrave/uacute% + /ucircumflex/udieresis/yacute/thorn/ydieresis% + ]% + >>% +/PUT pdfmark% +[% + /_objdef{ZaDb}% + /type/dict% +/OBJ pdfmark% +[% + {ZaDb}% + <<% + /Type/Font% + /Subtype/Type1% + /Name/ZaDb% + /BaseFont/ZapfDingbats% + >>% +/PUT pdfmark% +[% + /_objdef {Helv}% + /type/dict% +/OBJ pdfmark% +[% + {Helv}% + <<% + /Type/Font% + /Subtype/Type1% + /Name/Helv% + /BaseFont/Helvetica% + /Encoding{pdfDocEncoding}% + >>% +/PUT pdfmark% +[% + /_objdef {aform}% + /type/dict% +/OBJ pdfmark% +[% + /_objdef{afields}% + /type/array% +/OBJ pdfmark% +{% + [% + /BBox[0 0 100 100]% + /_objdef{Check}% + /BP pdfmark % + 1 0 0 setrgbcolor% + /ZapfDingbats 80 selectfont % + 20 20 moveto% + (4)show% + [/EP pdfmark% + [% + /BBox[0 0 100 100]% + /_objdef{Cross}% + /BP pdfmark % + 1 0 0 setrgbcolor% + /ZapfDingbats 80 selectfont % + 20 20 moveto% + (8)show% + [/EP pdfmark% + [% + /BBox[0 0 250 100]% + /_objdef{Submit}% + /BP pdfmark % + 0.6 setgray % + 0 0 250 100 rectfill % + 1 setgray % + 2 2 moveto % + 2 98 lineto % + 248 98 lineto % + 246 96 lineto % + 4 96 lineto % + 4 4 lineto % + fill % + 0.34 setgray % + 248 98 moveto % + 248 2 lineto % + 2 2 lineto % + 4 4 lineto % + 246 4 lineto % + 246 96 lineto % + fill% + /Helvetica 76 selectfont % + 0 setgray % + 8 22.5 moveto% + (Submit)show% + [/EP pdfmark% + [% + /BBox[0 0 250 100]% + /_objdef{SubmitP}% + /BP pdfmark % + 0.6 setgray % + 0 0 250 100 rectfill % + 0.34 setgray % + 2 2 moveto % + 2 98 lineto % + 248 98 lineto % + 246 96 lineto % + 4 96 lineto % + 4 4 lineto % + fill % + 1 setgray % + 248 98 moveto % + 248 2 lineto % + 2 2 lineto % + 4 4 lineto % + 246 4 lineto % + 246 96 lineto % + fill% + /Helvetica 76 selectfont % + 0 setgray % + 10 20.5 moveto% + (Submit)show% + [/EP pdfmark% +} ?pdfmark% +[% + {aform}% + <<% + /Fields{afields}% + /DR<<% + /Font<<% + /ZaDb{ZaDb}% + /Helv{Helv}% + >>% + >>% + /DA(/Helv 10 Tf 0 g)% + /CO{corder}% + /NeedAppearances true% + >>% +/PUT pdfmark% +[% + {Catalog}% + <<% + /AcroForm{aform}% + >>% +/PUT pdfmark% +[% + /_objdef{corder}% + /type/array% +/OBJ pdfmark% dps }}% - \setkeys{Form}{#1}% + \setkeys{Form}{#1}% } \def\@endForm{} \def\@Gauge[#1]#2#3#4{% parameters, label, minimum, maximum @@ -789,7 +867,7 @@ \def\Fld@width{\DefaultWidthofChoiceMenu}% \def\Fld@height{\DefaultHeightofChoiceMenu}% \bgroup - \Fld@menulength=0 + \Fld@menulength=0 % \@tempdima\z@ \@for\@curropt:=#3\do{% \expandafter\Fld@checkequals\@curropt==\\% @@ -801,6 +879,9 @@ \Field@toks={ }% \setkeys{Field}{#1}% \ifFld@hidden\def\Fld@width{1sp}\fi + \ifx\Fld@value\relax + \let\Fld@value\Fld@default + \fi \LayoutChoiceField{#2}{% \ifFld@radio \@@Radio{#3}% @@ -815,8 +896,8 @@ \ifFld@popdown\def\Fld@flags{/Ff 131072}\fi \ifx\Fld@flags\@empty \@tempdima=\the\Fld@menulength\Fld@charsize - \advance\@tempdima by \Fld@borderwidth bp - \advance\@tempdima by \Fld@borderwidth bp + \advance\@tempdima by \Fld@borderwidth bp % + \advance\@tempdima by \Fld@borderwidth bp % \edef\Fld@height{\the\@tempdima}% \fi \@@Listbox{#3}% @@ -826,7 +907,7 @@ \egroup } \def\@@Radio#1{% - \Fld@listcount=0 + \Fld@listcount=0 % \@for\@curropt:=#1\do{% \expandafter\Fld@checkequals\@curropt==\\% \Hy@StepCount\Fld@listcount @@ -841,7 +922,7 @@ \newcount\Fld@listcount \def\@@Listbox#1{% \Choice@toks={ }% - \Fld@listcount=0 + \Fld@listcount=0 % \@for\@curropt:=#1\do{% \expandafter\Fld@checkequals\@curropt==\\% \Hy@StepCount\Fld@listcount @@ -956,80 +1037,99 @@ \Hy@escapeform{}% \fi \def\PDFForm@Check{% - /Subtype /Widget - \ifFld@hidden /F 6 \else /F 4 \fi - /T (\Hy@escapestring{\Fld@name}) - /Q \Fld@align\space - /BS << /W \Fld@borderwidth\space /S /\Fld@borderstyle\space >> - /MK << - /BC [\Fld@bordercolor] - \ifx\Fld@bcolor\@empty + /Subtype/Widget% + \ifFld@hidden /F 6\else /F 4\fi + /T(\Hy@escapestring{\Fld@name})% + /Q \Fld@align + /BS<</W \Fld@borderwidth /S/\Fld@borderstyle>>% + /MK<<% + \ifnum\Fld@rotation=\z@ \else - /BG [\Fld@bcolor] + /R \Fld@rotation \fi - /CA (\Hy@escapestring{\Fld@cbsymbol}) - >> - /DA (/ZaDb \strip@pt\Fld@charsize\space Tf \Fld@color\space rg) - /FT /Btn - /H /P - \ifFld@checked /V /Yes \else /V /Off \fi + \ifx\Fld@bordercolor\relax + \else + /BC[\Fld@bordercolor]% + \fi + \ifx\Fld@bcolor\relax + \else + /BG[\Fld@bcolor]% + \fi + /CA(\Hy@escapestring{\Fld@cbsymbol})% + >>% + /DA(/ZaDb \strip@pt\Fld@charsize\space Tf% + \ifx\Fld@color\@empty\else\space\Fld@color\fi)% + /FT/Btn% + /H/P% + \ifFld@checked /V/Yes\else /V/Off\fi } \def\PDFForm@Push{% - /Subtype/Widget + /Subtype/Widget% \ifFld@hidden /F 6\else /F 4\fi /T(\Hy@escapestring{\Fld@name})% /FT/Btn% - /Ff 65540 + /Ff 65540% /H/P% /BS<</W \Fld@borderwidth/S/\Fld@borderstyle>>% /MK<<% - /BC[\Fld@bordercolor]% - >>% - /A<</S/JavaScript/JS(\Hy@escapestring{\Fld@onclick})>>% -} -\def\Fld@additionalactions{% - /AA << - \ifx\Fld@keystroke@code\@empty - \else - /K<</S/JavaScript/JS(\Hy@escapestring{\Fld@keystroke@code})>>% - \fi - \ifx\Fld@format@code\@empty + \ifnum\Fld@rotation=\z@ \else - /F<</S/JavaScript/JS(\Hy@escapestring{\Fld@format@code})>>% + /R \Fld@rotation \fi - \ifx\Fld@validate@code\@empty + \ifx\Fld@bordercolor\relax \else - /V<</S/JavaScript/JS(\Hy@escapestring{\Fld@validate@code})>>% - \fi - \ifx\Fld@calculate@code\@empty - \else - /C<</S/JavaScript/JS(\Hy@escapestring{\Fld@calculate@code})>>% - \fi - \ifx\Fld@onfocus@code\@empty - \else - /Fo<</S/JavaScript/JS(\Hy@escapestring{\Fld@onfocus@code})>>% - \fi - \ifx\Fld@onblur@code\@empty - \else - /Bl<</S/JavaScript/JS(\Hy@escapestring{\Fld@onblur@code})>>% - \fi - \ifx\Fld@onmousedown@code\@empty - \else - /D<</S/JavaScript/JS(\Hy@escapestring{\Fld@onmousedown@code})>>% - \fi - \ifx\Fld@onmouseup@code\@empty - \else - /U<</S/JavaScript/JS(\Hy@escapestring{\Fld@onmouseup@code})>>% - \fi - \ifx\Fld@onenter@code\@empty - \else - /E<</S/JavaScript/JS(\Hy@escapestring{\Fld@onenter@code})>>% - \fi - \ifx\Fld@onexit@code\@empty - \else - /X<</S/JavaScript/JS(\Hy@escapestring{\Fld@onexit@code})>>% + /BC[\Fld@bordercolor]% \fi >>% + /A<</S/JavaScript/JS(\Hy@escapestring{\Fld@onclick})>>% +} +\def\Fld@@additionalactions{% + \ifx\Fld@keystroke@code\@empty + \else + /K<</S/JavaScript/JS(\Hy@escapestring{\Fld@keystroke@code})>>% + \fi + \ifx\Fld@format@code\@empty + \else + /F<</S/JavaScript/JS(\Hy@escapestring{\Fld@format@code})>>% + \fi + \ifx\Fld@validate@code\@empty + \else + /V<</S/JavaScript/JS(\Hy@escapestring{\Fld@validate@code})>>% + \fi + \ifx\Fld@calculate@code\@empty + \else + /C<</S/JavaScript/JS(\Hy@escapestring{\Fld@calculate@code})>>% + \fi + \ifx\Fld@onfocus@code\@empty + \else + /Fo<</S/JavaScript/JS(\Hy@escapestring{\Fld@onfocus@code})>>% + \fi + \ifx\Fld@onblur@code\@empty + \else + /Bl<</S/JavaScript/JS(\Hy@escapestring{\Fld@onblur@code})>>% + \fi + \ifx\Fld@onmousedown@code\@empty + \else + /D<</S/JavaScript/JS(\Hy@escapestring{\Fld@onmousedown@code})>>% + \fi + \ifx\Fld@onmouseup@code\@empty + \else + /U<</S/JavaScript/JS(\Hy@escapestring{\Fld@onmouseup@code})>>% + \fi + \ifx\Fld@onenter@code\@empty + \else + /E<</S/JavaScript/JS(\Hy@escapestring{\Fld@onenter@code})>>% + \fi + \ifx\Fld@onexit@code\@empty + \else + /X<</S/JavaScript/JS(\Hy@escapestring{\Fld@onexit@code})>>% + \fi +} +\def\Fld@additionalactions{% + \if-\Fld@@additionalactions-% + \else + /AA<<\Fld@@additionalactions>>% + \fi } \def\PDFForm@List{% /Subtype/Widget% @@ -1039,13 +1139,21 @@ /Q \Fld@align /BS<</W \Fld@borderwidth /S/\Fld@borderstyle>>% /MK<<% - /BC[\Fld@bordercolor]% - \ifx\Fld@bcolor\@empty + \ifnum\Fld@rotation=\z@ + \else + /R \Fld@rotation + \fi + \ifx\Fld@bordercolor\relax + \else + /BC[\Fld@bordercolor]% + \fi + \ifx\Fld@bcolor\relax \else /BG[\Fld@bcolor]% \fi >>% - /DA(/Helv \strip@pt\Fld@charsize\space Tf \Fld@color\space rg)% + /DA(/Helv \strip@pt\Fld@charsize\space Tf% + \ifx\Fld@color\@empty\else\space\Fld@color\fi)% /Opt[\the\Choice@toks]% \ifx\Fld@default\relax \else @@ -1064,17 +1172,25 @@ /T(\Hy@escapestring{\Fld@name})% /FT/Btn% /Ff 49152% - /H/P + /H/P% /BS<</W \Fld@borderwidth/S/\Fld@borderstyle>>% /MK<<% - /BC[\Fld@bordercolor]% - \ifx\Fld@bcolor\@empty + \ifnum\Fld@rotation=\z@ + \else + /R \Fld@rotation + \fi + \ifx\Fld@bordercolor\relax + \else + /BC[\Fld@bordercolor]% + \fi + \ifx\Fld@bcolor\relax \else /BG[\Fld@bcolor]% \fi /CA(H)% >>% - /DA(/ZaDb \strip@pt\Fld@charsize\space Tf \Fld@color\space rg)% + /DA(/ZaDb \strip@pt\Fld@charsize\space Tf% + \ifx\Fld@color\@empty\else\space\Fld@color\fi)% \ifx\@currValue\Fld@default /V/\Fld@default \else @@ -1085,18 +1201,26 @@ \def\PDFForm@Text{% /Subtype/Widget% \ifFld@hidden /F 6\else /F 4\fi - /T(\Hy@escapestring{\Fld@name}) + /T(\Hy@escapestring{\Fld@name})% /Q \Fld@align /FT/Tx% /BS<</W \Fld@borderwidth\space /S /\Fld@borderstyle>>% /MK<<% - /BC[\Fld@bordercolor]% - \ifx\Fld@bcolor\@empty + \ifnum\Fld@rotation=\z@ + \else + /R \Fld@rotation + \fi + \ifx\Fld@bordercolor\relax + \else + /BC[\Fld@bordercolor]% + \fi + \ifx\Fld@bcolor\relax \else /BG[\Fld@bcolor]% \fi >>% - /DA(/Helv \strip@pt\Fld@charsize\space Tf \Fld@color\space rg)% + /DA(/Helv \strip@pt\Fld@charsize\space Tf% + \ifx\Fld@color\@empty\else\space\Fld@color\fi)% /DV(\Hy@escapestring{\Fld@default})% /V(\Hy@escapestring{\Fld@value})% \Fld@additionalactions @@ -1109,7 +1233,7 @@ \ifFld@readonly /Ff 1\fi \fi \fi - \ifnum\Fld@maxlen>0/MaxLen \Fld@maxlen \fi + \ifnum\Fld@maxlen>\z@/MaxLen \Fld@maxlen \fi } \def\PDFForm@Submit{% /Subtype/Widget% @@ -1120,7 +1244,14 @@ /H/P% /BS<</W \Fld@borderwidth/S/\Fld@borderstyle>>% /MK<<% - /BC[\Fld@bordercolor]% + \ifnum\Fld@rotation=\z@ + \else + /R \Fld@rotation + \fi + \ifx\Fld@bordercolor\relax + \else + /BC[\Fld@bordercolor]% + \fi >>% /A<<% /S/SubmitForm% @@ -1140,7 +1271,14 @@ /DA(/Helv \strip@pt\Fld@charsize\space Tf 0 0 1 rg)% /Ff 65540% /MK<<% - /BC[\Fld@bordercolor]% + \ifnum\Fld@rotation=\z@ + \else + /R \Fld@rotation + \fi + \ifx\Fld@bordercolor\relax + \else + /BC[\Fld@bordercolor]% + \fi >>% /BS<</W \Fld@borderwidth/S/\Fld@borderstyle>>% /A<</S/ResetForm>>% @@ -1152,7 +1290,8 @@ \else \@@writetorep{#1}{#2}{#3}{#4}{#5}% \fi - \fi} + \fi +} \def\Hy@currentbookmarklevel{0} \def\Hy@numberline#1{#1 } \def\@@writetorep#1#2#3#4#5{% @@ -1162,16 +1301,16 @@ \edef\Hy@level{#4}% \ifx\Hy@levelcheck Y% \@tempcnta\Hy@level\relax - \advance\@tempcnta by -1 + \advance\@tempcnta by -1 % \ifnum\Hy@currentbookmarklevel<\@tempcnta \advance\@tempcnta by -\Hy@currentbookmarklevel\relax - \advance\@tempcnta by 1 + \advance\@tempcnta by 1 % \Hy@Warning{% Difference (\the\@tempcnta) between bookmark levels is % greater \MessageBreak than one, level fixed% }% \@tempcnta\Hy@currentbookmarklevel - \advance\@tempcnta by 1 + \advance\@tempcnta by 1 % \edef\Hy@level{\the\@tempcnta}% \fi \else @@ -1180,7 +1319,7 @@ \global\let\Hy@currentbookmarklevel\Hy@level \@tempcnta\Hy@level\relax \expandafter\xdef\csname Parent\Hy@level\endcsname{#3}% - \advance\@tempcnta by -1 + \advance\@tempcnta by -1 % \edef\Hy@tempa{#3}% \edef\Hy@tempb{\csname Parent\the\@tempcnta\endcsname}% \ifx\Hy@tempa\Hy@tempb @@ -1222,7 +1361,7 @@ \@tempcnta\Hy@currentbookmarklevel \Hy@StepCount\@tempcnta \expandafter\pdfbookmark\expandafter[\the\@tempcnta]{#1}{#2}% - \advance\@tempcnta by -1 + \advance\@tempcnta by -1 % \xdef\Hy@currentbookmarklevel{\the\@tempcnta}% } \renewcommand\pdfbookmark[3][0]{% @@ -1259,7 +1398,7 @@ \else \if@filesw \newwrite\@outlinefile - \immediate\openout\@outlinefile=\jobname.out + \immediate\openout\@outlinefile=\jobname.out\relax \ifHy@typexml \immediate\write\@outlinefile{<relaxxml>\relax}% \fi @@ -1276,7 +1415,7 @@ } \def\calc@bm@number#1{% \@tempcnta=\check@bm@number{#1}\relax - \advance\@tempcnta by1 + \advance\@tempcnta by 1 % \expandafter\xdef\csname B_#1\endcsname{\the\@tempcnta}% } \ifHy@implicit diff --git a/Master/texmf-dist/tex/latex/hyperref/puarenc.def b/Master/texmf-dist/tex/latex/hyperref/puarenc.def index cbfc04d2d74..e5ee7a7d838 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/02/27 v6.75t + [2007/05/29 v6.76g 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 57eb7e741d1..ccbb58f6021 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/02/27 v6.75t + [2007/05/29 v6.76g Hyperref: PDF Unicode definition (HO)] \DeclareFontEncoding{PU}{}{} \DeclareTextCommand{\textLF}{PU}{\80\012} % line feed @@ -345,6 +345,8 @@ \DeclareTextCompositeCommand{\v}{PU}{k}{\81\351} % kcaron \DeclareTextCompositeCommand{\k}{PU}{O}{\81\352} % Oogonek \DeclareTextCompositeCommand{\k}{PU}{o}{\81\353} % oogonek +\DeclareTextCommand{\textnumeralsigngreek}{PU}{\83\164} +\DeclareTextCommand{\textnumeralsignlowergreek}{PU}{\83\165} \DeclareTextCompositeCommand{\'}{PU}{\textAlpha}{\83\206} \DeclareTextCompositeCommand{\'}{PU}{\textEpsilon}{\83\210} \DeclareTextCompositeCommand{\'}{PU}{\textEta}{\83\211} @@ -416,6 +418,14 @@ \DeclareTextCompositeCommand{\'}{PU}{\textomicron}{\83\314} \DeclareTextCompositeCommand{\'}{PU}{\textupsilon}{\83\315} \DeclareTextCompositeCommand{\'}{PU}{\textomega}{\83\316} +\DeclareTextCommand{\textStigmagreek}{PU}{\83\332} +\DeclareTextCommand{\textstigmagreek}{PU}{\83\333} +\DeclareTextCommand{\textDigammagreek}{PU}{\83\334} +\DeclareTextCommand{\textdigammagreek}{PU}{\83\335} +\DeclareTextCommand{\textKoppagreek}{PU}{\83\336} +\DeclareTextCommand{\textkoppagreek}{PU}{\83\337} +\DeclareTextCommand{\textSampigreek}{PU}{\83\340} +\DeclareTextCommand{\textsampigreek}{PU}{\83\341} \DeclareTextCommand{\CYRYO}{PU}{\84\001}% IO \DeclareTextCompositeCommand{\"}{PU}{\CYRE}{\84\001}% \DeclareTextCommand{\CYRDJE}{PU}{\84\002}% DJE diff --git a/Master/texmf-dist/tex/latex/hyperref/puvnenc.def b/Master/texmf-dist/tex/latex/hyperref/puvnenc.def index 8926ecc87aa..cf63bbbfaf1 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/02/27 v6.75t + [2007/05/29 v6.76g Hyperref: Additions to puenc.def for VnTeX] \DeclareTextCommand{\abreve}{PU}{\81\003} \DeclareTextCommand{\acircumflex}{PU}{\80\342} |