diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex')
20 files changed, 1178 insertions, 579 deletions
diff --git a/Master/texmf-dist/tex/latex/hyperref/backref.sty b/Master/texmf-dist/tex/latex/hyperref/backref.sty index affd2410cab..97680806677 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/09/05 v1.28 Bibliographical back referencing]% \newif\ifBR@verbose \@ifundefined{ifHy@verbose}{% \BR@verbosefalse @@ -258,7 +258,7 @@ \let\bibitem\BR@bibitem \let\BRorg@thebibliography\thebibliography \def\thebibliography{% - \@starttoc{brf}{}% + \BR@starttoc \BRorg@thebibliography }% \@ifundefined{NAT@parse}{% @@ -271,6 +271,22 @@ \PackageInfo{backref}{** backref set up for natbib **}% }% } +\def\BR@starttoc{% + \begingroup + \makeatletter + \@input{\jobname.brf}% + \if@filesw + \@ifundefined{tf@brf}{% + \expandafter\newwrite\csname tf@brf\endcsname + }{}% + \@ifundefined{tf@brf@open}{% + \immediate\openout\csname tf@brf\endcsname\jobname.brf\relax + \gdef\tf@brf@open{}% + }{}% + \fi + \@nobreakfalse + \endgroup +} \def\BR@citex[#1]#2{% \BRorg@citex[{#1}]{#2}% \ifBR@verbose diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def b/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def index 86ec105c217..c649201dedd 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def +++ b/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def @@ -7,6 +7,8 @@ %% hyperref.dtx (with options: `dvipdfm,pdfform,outlines') %% %% File: hyperref.dtx Copyright 1995-2001 Sebastian Rahtz, +%% with portions written by David Carlisle and Heiko Oberdiek, +%% 2001-2007 Heiko Oberdiek. %% %% This file is part of the `Hyperref Bundle'. %% ------------------------------------------- @@ -22,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hdvipdfm.def} - [2007/06/14 v6.76i + [2007/10/30 v6.77b Hyperref driver for dvipdfm] \def\Hy@PutCatalog#1{\@pdfm@mark{docview << #1 >>}} \ifHy@pagelabels @@ -221,7 +223,7 @@ /S/GoToR% /F(\Hy@pstringF)% /D\ifx\\#3\\[0 \@pdfstartview]\else(\Hy@pstringD)\fi - \ifHy@newwindow /NewWindow true\fi + \Hy@SetNewWindow >>% >>% }% @@ -244,7 +246,7 @@ /A<<% /S/Launch% /F(\Hy@pstringF)% - \ifHy@newwindow /NewWindow true\fi + \Hy@SetNewWindow \ifx\\#3\\% \else /Win<</P(\Hy@pstringP)/F(\Hy@pstringF)>>% @@ -418,38 +420,50 @@ width \the\wd\pdfm@box\space depth \the\dp\pdfm@box\space } +\newcount\HyField@AnnotCount +\HyField@AnnotCount=\z@ +\def\HyField@AdvanceAnnotCount{% + \global\advance\HyField@AnnotCount\@ne +} +\def\HyField@TheAnnotCount{% + \the\HyField@AnnotCount +} \def\@TextField[#1]#2{% parameters, label \def\Fld@name{#2}% \def\Fld@default{}% \let\Fld@value\@empty \def\Fld@width{\DefaultWidthofText}% - \def\Fld@height{\DefaultHeightofText}% - \ifFld@multiline - \begingroup - \dimen@=\DefaultHeightofText - \dimen@=4\dimen@ - \edef\x{\endgroup - \def\noexpand\Fld@height{\the\dimen@}% - }% - \x - \fi - \bgroup + \def\Fld@height{% + \ifFld@multiline + \DefaultHeightofTextMultiline + \else + \DefaultHeightofText + \fi + }% + \begingroup \Field@toks={ }% - \setkeys{Field}{#1}% + \expandafter\HyField@SetKeys\expandafter{% + \DefaultOptionsofText,#1% + }% + \PDFForm@Name + \HyField@FlagsText \ifFld@hidden\def\Fld@width{1sp}\fi \ifx\Fld@value\@empty\def\Fld@value{\Fld@default}\fi \setbox\pdfm@box=\hbox{% \MakeTextField{\Fld@width}{\Fld@height}% }% + \HyField@AdvanceAnnotCount \LayoutTextField{#2}{% \Hy@escapeform\PDFForm@Text \@pdfm@mark{% - ann @\Fld@name\space \dvipdfm@setdim << \PDFForm@Text >>% + ann @text\HyField@TheAnnotCount\space + \dvipdfm@setdim << \PDFForm@Text >>% }% }% \unhbox\pdfm@box - \@pdfm@mark{put @afields @\Fld@name}% record in @afields array - \egroup + \@pdfm@mark{put @afields @text\HyField@TheAnnotCount}% + % record in @afields array + \endgroup } \def\@ChoiceMenu[#1]#2#3{% parameters, label, choices \def\Fld@name{#2}% @@ -457,7 +471,7 @@ \let\Fld@value\relax \def\Fld@width{\DefaultWidthofChoiceMenu}% \def\Fld@height{\DefaultHeightofChoiceMenu}% - \bgroup + \begingroup \Fld@menulength=0 % \@tempdima\z@ \@for\@curropt:=#3\do{% @@ -468,34 +482,58 @@ }% \advance\@tempdima by 15\p@ \Field@toks={ }% - \setkeys{Field}{#1}% + \begingroup + \HyField@SetKeys{#1}% + \edef\x{\endgroup + \noexpand\expandafter + \noexpand\HyField@SetKeys + \noexpand\expandafter{% + \expandafter\noexpand\csname DefaultOptionsof% + \ifFld@radio + Radio% + \else + \ifFld@combo + \ifFld@popdown + PopdownBox% + \else + ComboBox% + \fi + \else + ListBox% + \fi + \fi + \endcsname + }% + }\x + \HyField@SetKeys{#1}% + \PDFForm@Name \ifFld@hidden\def\Fld@width{1sp}\fi \ifx\Fld@value\relax \let\Fld@value\Fld@default \fi \LayoutChoiceField{#2}{% \ifFld@radio + \HyField@FlagsRadioButton \@@Radio{#3}% \else - {% + \begingroup + \HyField@FlagsChoice \ifdim\Fld@width<\@tempdima \ifdim\@tempdima<1cm\@tempdima1cm\fi \edef\Fld@width{\the\@tempdima}% \fi - \def\Fld@flags{}% - \ifFld@combo\def\Fld@flags{/Ff 917504}\fi - \ifFld@popdown\def\Fld@flags{/Ff 131072}\fi - \ifx\Fld@flags\@empty + \ifFld@combo + \else \@tempdima=\the\Fld@menulength\Fld@charsize \advance\@tempdima by \Fld@borderwidth bp % \advance\@tempdima by \Fld@borderwidth bp % \edef\Fld@height{\the\@tempdima}% \fi \@@Listbox{#3}% - }% + \endgroup \fi }% - \egroup + \endgroup } \def\@@Radio#1{% \Fld@listcount=0 % @@ -506,8 +544,11 @@ \@currDisplay\space \leavevmode \Hy@escapeform\PDFForm@Radio + \ifnum\Fld@listcount=1 % + \HyField@AdvanceAnnotCount + \fi \@pdfm@mark{% - ann \ifnum\Fld@listcount=1 @\Fld@name\space\fi + ann \ifnum\Fld@listcount=1 @radio\HyField@TheAnnotCount\space\fi \dvipdfm@setdim <<% \PDFForm@Radio @@ -515,107 +556,124 @@ >>% }% \unhcopy\pdfm@box\space% deliberate space between radio buttons - \ifnum\Fld@listcount=1\@pdfm@mark{put @afields @\Fld@name}\fi + \ifnum\Fld@listcount=1 % + \@pdfm@mark{put @afields @radio\HyField@TheAnnotCount}% + \fi }% } \newcount\Fld@listcount \def\@@Listbox#1{% - \Choice@toks={ }% - \Fld@listcount=0 % - \@for\@curropt:=#1\do{% - \expandafter\Fld@checkequals\@curropt==\\% - \Hy@StepCount\Fld@listcount - \edef\@processme{% - \Choice@toks{\the\Choice@toks [(\@currValue) (\@currDisplay)]}% - }\@processme - }% + \HyField@PDFChoices{#1}% \setbox\pdfm@box=\hbox{\MakeChoiceField{\Fld@width}{\Fld@height}}% \leavevmode \Hy@escapeform\PDFForm@List + \HyField@AdvanceAnnotCount \@pdfm@mark{% - ann @\Fld@name\space\dvipdfm@setdim - << \PDFForm@List >>% + ann @list\HyField@TheAnnotCount\space + \dvipdfm@setdim + <<\PDFForm@List>>% }% \unhbox\pdfm@box - \@pdfm@mark{put @afields @\Fld@name}% + \@pdfm@mark{put @afields @list\HyField@TheAnnotCount}% } \def\@PushButton[#1]#2{% parameters, label \def\Fld@name{#2}% - \bgroup + \begingroup \Field@toks={ }% - \setkeys{Field}{#1}% + \expandafter\HyField@SetKeys\expandafter{% + \DefaultOptionsofPushButton,#1% + }% + \PDFForm@Name + \HyField@FlagsPushButton \ifFld@hidden\def\Fld@width{1sp}\fi \setbox\pdfm@box=\hbox{\MakeButtonField{#2}}% + \HyField@AdvanceAnnotCount \LayoutPushButtonField{% \leavevmode \Hy@escapeform\PDFForm@Push \@pdfm@mark{% - ann @\Fld@name\space\dvipdfm@setdim - << \PDFForm@Push >>% + ann @push\HyField@TheAnnotCount\space + \dvipdfm@setdim + <<\PDFForm@Push>>% }% }% \unhbox\pdfm@box - \@pdfm@mark{put @afields @\Fld@name}% - \egroup + \@pdfm@mark{put @afields @push\HyField@TheAnnotCount}% + \endgroup } \def\@Submit[#1]#2{% \Field@toks={ }% \def\Fld@width{\DefaultWidthofSubmit}% \def\Fld@height{\DefaultHeightofSubmit}% - \bgroup - \def\Fld@name{Submit}% - \setkeys{Field}{#1}% + \begingroup + \expandafter\HyField@SetKeys\expandafter{% + \DefaultOptionsofSubmit,#1% + }% + \HyField@FlagsPushButton + \HyField@FlagsSubmit \ifFld@hidden\def\Fld@width{1sp}\fi \setbox\pdfm@box=\hbox{\MakeButtonField{#2}}% \leavevmode \Hy@escapeform\PDFForm@Submit + \HyField@AdvanceAnnotCount \@pdfm@mark{% - ann @\Fld@name\space\dvipdfm@setdim - << \PDFForm@Submit >>% + ann @submit\HyField@TheAnnotCount\space + \dvipdfm@setdim + <<\PDFForm@Submit>>% }% \unhbox\pdfm@box% - \@pdfm@mark{put @afields @\Fld@name}% - \egroup + \@pdfm@mark{put @afields @submit\HyField@TheAnnotCount}% + \endgroup } \def\@Reset[#1]#2{% \Field@toks={ }% \def\Fld@width{\DefaultWidthofReset}% \def\Fld@height{\DefaultHeightofReset}% - \bgroup - \def\Fld@name{Reset}% - \setkeys{Field}{#1}% + \begingroup + \expandafter\HyField@SetKeys\expandafter{% + \DefaultOptionsofReset,#1% + }% + \HyField@FlagsPushButton \ifFld@hidden\def\Fld@width{1sp}\fi \setbox\pdfm@box=\hbox{\MakeButtonField{#2}}% \leavevmode \Hy@escapeform\PDFForm@Reset + \HyField@AdvanceAnnotCount \@pdfm@mark{% - ann @\Fld@name\space\dvipdfm@setdim - << \PDFForm@Reset >>% + ann @reset\HyField@TheAnnotCount\space + \dvipdfm@setdim + <<\PDFForm@Reset>>% }% \unhbox\pdfm@box - \@pdfm@mark{put @afields @\Fld@name}% - \egroup + \@pdfm@mark{put @afields @reset\HyField@TheAnnotCount}% + \endgroup } \def\@CheckBox[#1]#2{% parameters, label \def\Fld@name{#2}% \def\Fld@default{0}% - \bgroup + \begingroup \def\Fld@width{\DefaultWidthofCheckBox}% \def\Fld@height{\DefaultHeightofCheckBox}% \Field@toks={ }% - \setkeys{Field}{#1}% + \expandafter\HyField@SetKeys\expandafter{% + \DefaultOptionsofCheckBox,#1% + }% + \PDFForm@Name + \HyField@FlagsCheckBox \ifFld@hidden\def\Fld@width{1sp}\fi \setbox\pdfm@box=\hbox{\MakeCheckField{\Fld@width}{\Fld@height}}% + \HyField@AdvanceAnnotCount \LayoutCheckField{#2}{% \Hy@escapeform\PDFForm@Check \@pdfm@mark{% - ann @\Fld@name\space\dvipdfm@setdim - << \PDFForm@Check >>% + ann @check\HyField@TheAnnotCount\space + \dvipdfm@setdim + <<\PDFForm@Check>>% }% \unhbox\pdfm@box - \@pdfm@mark{put @afields @\Fld@name}% + \@pdfm@mark{put @afields @check\HyField@TheAnnotCount}% }% - \egroup + \endgroup } \@pdfm@mark{obj @OBJpdfdocencoding% <<% @@ -707,10 +765,23 @@ }% \Hy@escapeform{}% \fi +\def\PDFForm@Name{% + \begingroup + \ifnum\Hy@pdfversion<5 % implementation note 117, PDF spec 1.7 + \ifHy@unicode + \Hy@unicodefalse + \fi + \fi + \pdfstringdef\Hy@gtemp\Fld@name + \endgroup + \let\Fld@name\Hy@gtemp +} \def\PDFForm@Check{% /Subtype/Widget% - \ifFld@hidden /F 6\else /F 4\fi - /T(\Hy@escapestring{\Fld@name})% + \Fld@annotflags + /T(\Fld@name)% + /FT/Btn% + \Fld@flags /Q \Fld@align /BS<</W \Fld@borderwidth /S/\Fld@borderstyle>>% /MK<<% @@ -730,16 +801,15 @@ >>% /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% - \ifFld@hidden /F 6\else /F 4\fi - /T(\Hy@escapestring{\Fld@name})% + \Fld@annotflags + /T(\Fld@name)% /FT/Btn% - /Ff 65540% + \HyField@flags /H/P% /BS<</W \Fld@borderwidth/S/\Fld@borderstyle>>% /MK<<% @@ -804,11 +874,12 @@ } \def\PDFForm@List{% /Subtype/Widget% - \ifFld@hidden /F 6\else /F 4\fi - /T(\Hy@escapestring{\Fld@name})% + \Fld@annotflags + /T(\Fld@name)% /FT/Ch% + \Fld@flags /Q \Fld@align - /BS<</W \Fld@borderwidth /S/\Fld@borderstyle>>% + /BS<</W \Fld@borderwidth/S/\Fld@borderstyle>>% /MK<<% \ifnum\Fld@rotation=\z@ \else @@ -825,24 +896,15 @@ >>% /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 - /DV(\Hy@escapestring{\Fld@default})% - \fi - \ifx\Fld@value\relax - \else - /V(\Hy@escapestring{\Fld@value})% - \fi + \Fld@choices \Fld@additionalactions - \Fld@flags } \def\PDFForm@Radio{% /Subtype/Widget% - \ifFld@hidden /F 6\else /F 4\fi - /T(\Hy@escapestring{\Fld@name})% + \Fld@annotflags + /T(\Fld@name)% /FT/Btn% - /Ff 49152% + \Fld@flags /H/P% /BS<</W \Fld@borderwidth/S/\Fld@borderstyle>>% /MK<<% @@ -871,10 +933,11 @@ } \def\PDFForm@Text{% /Subtype/Widget% - \ifFld@hidden /F 6\else /F 4\fi - /T(\Hy@escapestring{\Fld@name})% - /Q \Fld@align + \Fld@annotflags + /T(\Fld@name)% /FT/Tx% + \Fld@flags + /Q \Fld@align /BS<</W \Fld@borderwidth\space /S /\Fld@borderstyle>>% /MK<<% \ifnum\Fld@rotation=\z@ @@ -895,23 +958,14 @@ /DV(\Hy@escapestring{\Fld@default})% /V(\Hy@escapestring{\Fld@value})% \Fld@additionalactions - \ifFld@multiline - \ifFld@readonly /Ff 4097\else /Ff 4096\fi - \else - \ifFld@password - \ifFld@readonly /Ff 8193\else /Ff 8192\fi - \else - \ifFld@readonly /Ff 1\fi - \fi - \fi \ifnum\Fld@maxlen>\z@/MaxLen \Fld@maxlen \fi } \def\PDFForm@Submit{% /Subtype/Widget% - \ifFld@hidden /F 6\else /F 4\fi - /T(\Hy@escapestring{\Fld@name})% + \Fld@annotflags + /T(\Fld@name)% /FT/Btn% - /Ff 65540% + \Fld@flags /H/P% /BS<</W \Fld@borderwidth/S/\Fld@borderstyle>>% /MK<<% @@ -930,17 +984,17 @@ /FS/URL% /F(\Hy@escapestring{\Form@action})% >>% - \ifForm@html /Flags 4\fi + \Fld@submitflags >>% } \def\PDFForm@Reset{% /Subtype/Widget% - \ifFld@hidden /F 6\else /F 4\fi - /T(\Hy@escapestring{\Fld@name})% + \Fld@annotflags + /T(\Fld@name)% /FT/Btn% + \Fld@flags /H/P% /DA(/Helv \strip@pt\Fld@charsize\space Tf 0 0 1 rg)% - /Ff 65540% /MK<<% \ifnum\Fld@rotation=\z@ \else @@ -1102,11 +1156,6 @@ } \ifHy@implicit \else - \def\@begindvi{% - \unvbox\@begindvibox - \HyPL@EveryPage - \global\let\@begindvi\HyPL@EveryPage - }% \expandafter\endinput \fi \let\H@old@ssect\@ssect diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvips.def b/Master/texmf-dist/tex/latex/hyperref/hdvips.def index 04ffee08537..75bb21712fd 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hdvips.def +++ b/Master/texmf-dist/tex/latex/hyperref/hdvips.def @@ -7,6 +7,8 @@ %% hyperref.dtx (with options: `dvips') %% %% File: hyperref.dtx Copyright 1995-2001 Sebastian Rahtz, +%% with portions written by David Carlisle and Heiko Oberdiek, +%% 2001-2007 Heiko Oberdiek. %% %% This file is part of the `Hyperref Bundle'. %% ------------------------------------------- @@ -22,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hdvips.def} - [2007/06/14 v6.76i + [2007/10/30 v6.77b Hyperref driver for dvips] \input{pdfmark.def}% \ifx\@pdfproducer\relax @@ -35,7 +37,7 @@ \providecommand*\@pdfview{XYZ} \providecommand*\@pdfviewparams{ H.V} \def\Hy@BorderArrayPatch{BorderArrayPatch} -\AtBeginDvi{% +\AtBeginShipoutFirst{% \headerps@out{% /DvipsToPDF{72.27 mul Resolution div} def% /PDFToDvips{72.27 div Resolution mul} def% diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvipson.def b/Master/texmf-dist/tex/latex/hyperref/hdvipson.def index 93cbca7b2ef..ba6f62c6ea6 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hdvipson.def +++ b/Master/texmf-dist/tex/latex/hyperref/hdvipson.def @@ -7,6 +7,8 @@ %% hyperref.dtx (with options: `dvipsone') %% %% File: hyperref.dtx Copyright 1995-2001 Sebastian Rahtz, +%% with portions written by David Carlisle and Heiko Oberdiek, +%% 2001-2007 Heiko Oberdiek. %% %% This file is part of the `Hyperref Bundle'. %% ------------------------------------------- @@ -22,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hdvipson.def} - [2007/06/14 v6.76i + [2007/10/30 v6.77b Hyperref driver for dvipsone] \providecommand*\@pdfborder{0 0 1} \providecommand*\@pdfborderstyle{} diff --git a/Master/texmf-dist/tex/latex/hyperref/hdviwind.def b/Master/texmf-dist/tex/latex/hyperref/hdviwind.def index f89c985834d..292050a626f 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hdviwind.def +++ b/Master/texmf-dist/tex/latex/hyperref/hdviwind.def @@ -7,6 +7,8 @@ %% hyperref.dtx (with options: `dviwindo,pdfmarkbase') %% %% File: hyperref.dtx Copyright 1995-2001 Sebastian Rahtz, +%% with portions written by David Carlisle and Heiko Oberdiek, +%% 2001-2007 Heiko Oberdiek. %% %% This file is part of the `Hyperref Bundle'. %% ------------------------------------------- @@ -22,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hdviwind.def} - [2007/06/14 v6.76i + [2007/10/30 v6.77b Hyperref driver for dviwindo] \def\Hy@PutCatalog#1{% \pdfmark{pdfmark=/PUT,Raw={\string{Catalog\string} << #1 >>}}% diff --git a/Master/texmf-dist/tex/latex/hyperref/hpdftex.def b/Master/texmf-dist/tex/latex/hyperref/hpdftex.def index 55e6d3f3a65..311a7d8f55b 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hpdftex.def +++ b/Master/texmf-dist/tex/latex/hyperref/hpdftex.def @@ -7,6 +7,8 @@ %% hyperref.dtx (with options: `pdftex,pdfform,outlines') %% %% File: hyperref.dtx Copyright 1995-2001 Sebastian Rahtz, +%% with portions written by David Carlisle and Heiko Oberdiek, +%% 2001-2007 Heiko Oberdiek. %% %% This file is part of the `Hyperref Bundle'. %% ------------------------------------------- @@ -22,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hpdftex.def} - [2007/06/14 v6.76i + [2007/10/30 v6.77b Hyperref driver for pdfTeX] \let\Hy@PutCatalog\pdfcatalog \ifHy@pagelabels @@ -33,7 +35,11 @@ \the\Hy@abspage<<#1>>% }% }% - \AtEndDocument{\clearpage\HyPL@SetPageLabels}% + \@ifclassloaded{revtex4}{% + \g@addto@macro\clear@document{\HyPL@SetPageLabels}% + }{% + \AtEndDocument{\clearpage\HyPL@SetPageLabels}% + }% \fi \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname pdfescapestring\endcsname\relax @@ -84,6 +90,34 @@ \edef#1{\pdfescapestring{#2}}% }% \fi +\let\Hy@pdfminorversion\relax +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname pdfminorversion\endcsname\relax + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname pdfoptionpdfminorversion\endcsname\relax + \else + \def\Hy@pdfminorversion{\pdfoptionpdfminorversion}% + \fi +\else + \def\Hy@pdfminorversion{\pdfminorversion}% +\fi +\@ifundefined{Hy@pdfminorversion}{% + \PackageInfo{hyperref}{% + PDF version is not set, because pdfTeX is too old (<1.10a)% + }% +}{% + \ifHy@setpdfversion + \ifnum\Hy@pdfminorversion=\Hy@pdfversion\relax + \else + \Hy@pdfminorversion=\Hy@pdfversion\relax + \fi + \PackageInfo{hyperref}{% + \expandafter\string\Hy@pdfminorversion:=\number\Hy@pdfversion\space + }% + \fi + \edef\Hy@pdfversion{\number\Hy@pdfminorversion}% + \Hy@DisableOption{pdfversion}% +} \def\setpdflinkmargin#1{\pdflinkmargin#1} \ifx\pdfstartlink\@undefined% less than version 14 \let\pdfstartlink\pdfannotlink @@ -209,7 +243,7 @@ /A<<% /F(\Hy@pstringF)% /S/GoToR% - \ifHy@newwindow /NewWindow true\fi + \Hy@SetNewWindow \ifx\\#3\\% /D[0 \@pdfstartview]% \else @@ -244,7 +278,7 @@ /A<<% /F(\Hy@pstringF)% /S/Launch% - \ifHy@newwindow /NewWindow true\fi + \Hy@SetNewWindow \ifx\\#3\\% \else /Win<</P(\Hy@pstringP)/F(\Hy@pstringF)>>% @@ -460,6 +494,11 @@ \Hy@RemoveHidPageAttr#1#4\END \fi } +\g@addto@macro\Hy@EveryPageHook{% + \hyper@pagetransition + \hyper@pageduration + \hyper@pagehidden +} \pdfoutput=1 \pdfcompresslevel=9 \AtBeginDocument{% @@ -576,19 +615,20 @@ \def\Fld@default{}% \let\Fld@value\@empty \def\Fld@width{\DefaultWidthofText}% - \def\Fld@height{\DefaultHeightofText}% - \ifFld@multiline - \begingroup - \dimen@=\DefaultHeightofText - \dimen@=4\dimen@ - \edef\x{\endgroup - \def\noexpand\Fld@height{\the\dimen@}% - }% - \x - \fi - \bgroup + \def\Fld@height{% + \ifFld@multiline + \DefaultHeightofTextMultiline + \else + \DefaultHeightofText + \fi + }% + \begingroup \Field@toks={ }% - \setkeys{Field}{#1}% + \expandafter\HyField@SetKeys\expandafter{% + \DefaultOptionsofText,#1% + }% + \PDFForm@Name + \HyField@FlagsText \ifFld@hidden\def\Fld@width{1sp}\fi \ifx\Fld@value\@empty\def\Fld@value{\Fld@default}\fi \LayoutTextField{#2}{% @@ -596,7 +636,7 @@ \pdfstartlink user {\PDFForm@Text}\relax \MakeTextField{\Fld@width}{\Fld@height}\pdfendlink }% - \egroup + \endgroup } \def\@ChoiceMenu[#1]#2#3{% parameters, label, choices \def\Fld@name{#2}% @@ -604,7 +644,7 @@ \let\Fld@value\relax \def\Fld@width{\DefaultWidthofChoiceMenu}% \def\Fld@height{\DefaultHeightofChoiceMenu}% - \bgroup + \begingroup \Fld@menulength=0 % \@tempdima\z@ \@for\@curropt:=#3\do{% @@ -615,34 +655,58 @@ }% \advance\@tempdima by 15\p@ \Field@toks={ }% - \setkeys{Field}{#1}% + \begingroup + \HyField@SetKeys{#1}% + \edef\x{\endgroup + \noexpand\expandafter + \noexpand\HyField@SetKeys + \noexpand\expandafter{% + \expandafter\noexpand\csname DefaultOptionsof% + \ifFld@radio + Radio% + \else + \ifFld@combo + \ifFld@popdown + PopdownBox% + \else + ComboBox% + \fi + \else + ListBox% + \fi + \fi + \endcsname + }% + }\x + \HyField@SetKeys{#1}% + \PDFForm@Name \ifFld@hidden\def\Fld@width{1sp}\fi \ifx\Fld@value\relax \let\Fld@value\Fld@default \fi \LayoutChoiceField{#2}{% \ifFld@radio + \HyField@FlagsRadioButton \@@Radio{#3}% \else - {% + \begingroup + \HyField@FlagsChoice \ifdim\Fld@width<\@tempdima \ifdim\@tempdima<1cm\@tempdima1cm\fi \edef\Fld@width{\the\@tempdima}% \fi - \def\Fld@flags{}% - \ifFld@combo\def\Fld@flags{/Ff 917504}\fi - \ifFld@popdown\def\Fld@flags{/Ff 131072}\fi - \ifx\Fld@flags\@empty + \ifFld@combo + \else \@tempdima=\the\Fld@menulength\Fld@charsize \advance\@tempdima by \Fld@borderwidth bp % \advance\@tempdima by \Fld@borderwidth bp % \edef\Fld@height{\the\@tempdima}% \fi \@@Listbox{#3}% - }% + \endgroup \fi }% - \egroup + \endgroup } \def\@@Radio#1{% \Fld@listcount=0 % @@ -667,15 +731,7 @@ } \newcount\Fld@listcount \def\@@Listbox#1{% - \Choice@toks={ }% - \Fld@listcount=0 % - \@for\@curropt:=#1\do{% - \expandafter\Fld@checkequals\@curropt==\\% - \Hy@StepCount\Fld@listcount - \edef\@processme{% - \Choice@toks{\the\Choice@toks [(\@currValue) (\@currDisplay)]}% - }\@processme - }% + \HyField@PDFChoices{#1}% \leavevmode \Hy@escapeform\PDFForm@List \pdfstartlink user {\PDFForm@List}\relax @@ -684,9 +740,13 @@ } \def\@PushButton[#1]#2{% parameters, label \def\Fld@name{#2}% - \bgroup + \begingroup \Field@toks={ }% - \setkeys{Field}{#1}% + \expandafter\HyField@SetKeys\expandafter{% + \DefaultOptionsofPushButton,#1% + }% + \PDFForm@Name + \HyField@FlagsPushButton \ifFld@hidden\def\Fld@width{1sp}\fi \LayoutPushButtonField{% \leavevmode @@ -695,15 +755,18 @@ \MakeButtonField{#2}% \pdfendlink }% - \egroup + \endgroup } \def\@Submit[#1]#2{% \Field@toks={ }% \def\Fld@width{\DefaultWidthofSubmit}% \def\Fld@height{\DefaultHeightofSubmit}% - \bgroup - \def\Fld@name{Submit}% - \setkeys{Field}{#1}% + \begingroup + \expandafter\HyField@SetKeys\expandafter{% + \DefaultOptionsofSubmit,#1% + }% + \HyField@FlagsPushButton + \HyField@FlagsSubmit \ifFld@hidden\def\Fld@width{1sp}\fi \leavevmode \Hy@escapeform\PDFForm@Submit @@ -714,31 +777,37 @@ \relax \MakeButtonField{#2}% \pdfendlink - \egroup + \endgroup } \def\@Reset[#1]#2{% \Field@toks={ }% \def\Fld@width{\DefaultWidthofReset}% \def\Fld@height{\DefaultHeightofReset}% - \bgroup - \def\Fld@name{Reset}% - \setkeys{Field}{#1}% + \begingroup + \expandafter\HyField@SetKeys\expandafter{% + \DefaultOptionsofReset,#1% + }% + \HyField@FlagsPushButton \ifFld@hidden\def\Fld@width{1sp}\fi \leavevmode \Hy@escapeform\PDFForm@Reset \pdfstartlink user {\PDFForm@Reset}\relax \MakeButtonField{#2}% \pdfendlink - \egroup + \endgroup } \def\@CheckBox[#1]#2{% parameters, label \def\Fld@name{#2}% \def\Fld@default{0}% - \bgroup + \begingroup \def\Fld@width{\DefaultWidthofCheckBox}% \def\Fld@height{\DefaultHeightofCheckBox}% \Field@toks={ }% - \setkeys{Field}{#1}% + \expandafter\HyField@SetKeys\expandafter{% + \DefaultOptionsofCheckBox,#1% + }% + \PDFForm@Name + \HyField@FlagsCheckBox \ifFld@hidden\def\Fld@width{1sp}\fi \LayoutCheckField{#2}{% \Hy@escapeform\PDFForm@Check @@ -746,7 +815,7 @@ \MakeCheckField{\Fld@width}{\Fld@height}% \pdfendlink }% - \egroup + \endgroup } \pdfobj { << /Type /Encoding /Differences [ 24 /breve /caron /circumflex /dotaccent /hungarumlaut /ogonek /ring /tilde 39 @@ -844,10 +913,23 @@ }% \Hy@escapeform{}% \fi +\def\PDFForm@Name{% + \begingroup + \ifnum\Hy@pdfversion<5 % implementation note 117, PDF spec 1.7 + \ifHy@unicode + \Hy@unicodefalse + \fi + \fi + \pdfstringdef\Hy@gtemp\Fld@name + \endgroup + \let\Fld@name\Hy@gtemp +} \def\PDFForm@Check{% /Subtype/Widget% - \ifFld@hidden /F 6\else /F 4\fi - /T(\Hy@escapestring{\Fld@name})% + \Fld@annotflags + /T(\Fld@name)% + /FT/Btn% + \Fld@flags /Q \Fld@align /BS<</W \Fld@borderwidth /S/\Fld@borderstyle>>% /MK<<% @@ -867,16 +949,15 @@ >>% /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% - \ifFld@hidden /F 6\else /F 4\fi - /T(\Hy@escapestring{\Fld@name})% + \Fld@annotflags + /T(\Fld@name)% /FT/Btn% - /Ff 65540% + \HyField@flags /H/P% /BS<</W \Fld@borderwidth/S/\Fld@borderstyle>>% /MK<<% @@ -941,11 +1022,12 @@ } \def\PDFForm@List{% /Subtype/Widget% - \ifFld@hidden /F 6\else /F 4\fi - /T(\Hy@escapestring{\Fld@name})% + \Fld@annotflags + /T(\Fld@name)% /FT/Ch% + \Fld@flags /Q \Fld@align - /BS<</W \Fld@borderwidth /S/\Fld@borderstyle>>% + /BS<</W \Fld@borderwidth/S/\Fld@borderstyle>>% /MK<<% \ifnum\Fld@rotation=\z@ \else @@ -962,24 +1044,15 @@ >>% /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 - /DV(\Hy@escapestring{\Fld@default})% - \fi - \ifx\Fld@value\relax - \else - /V(\Hy@escapestring{\Fld@value})% - \fi + \Fld@choices \Fld@additionalactions - \Fld@flags } \def\PDFForm@Radio{% /Subtype/Widget% - \ifFld@hidden /F 6\else /F 4\fi - /T(\Hy@escapestring{\Fld@name})% + \Fld@annotflags + /T(\Fld@name)% /FT/Btn% - /Ff 49152% + \Fld@flags /H/P% /BS<</W \Fld@borderwidth/S/\Fld@borderstyle>>% /MK<<% @@ -1008,10 +1081,11 @@ } \def\PDFForm@Text{% /Subtype/Widget% - \ifFld@hidden /F 6\else /F 4\fi - /T(\Hy@escapestring{\Fld@name})% - /Q \Fld@align + \Fld@annotflags + /T(\Fld@name)% /FT/Tx% + \Fld@flags + /Q \Fld@align /BS<</W \Fld@borderwidth\space /S /\Fld@borderstyle>>% /MK<<% \ifnum\Fld@rotation=\z@ @@ -1032,23 +1106,14 @@ /DV(\Hy@escapestring{\Fld@default})% /V(\Hy@escapestring{\Fld@value})% \Fld@additionalactions - \ifFld@multiline - \ifFld@readonly /Ff 4097\else /Ff 4096\fi - \else - \ifFld@password - \ifFld@readonly /Ff 8193\else /Ff 8192\fi - \else - \ifFld@readonly /Ff 1\fi - \fi - \fi \ifnum\Fld@maxlen>\z@/MaxLen \Fld@maxlen \fi } \def\PDFForm@Submit{% /Subtype/Widget% - \ifFld@hidden /F 6\else /F 4\fi - /T(\Hy@escapestring{\Fld@name})% + \Fld@annotflags + /T(\Fld@name)% /FT/Btn% - /Ff 65540% + \Fld@flags /H/P% /BS<</W \Fld@borderwidth/S/\Fld@borderstyle>>% /MK<<% @@ -1067,17 +1132,17 @@ /FS/URL% /F(\Hy@escapestring{\Form@action})% >>% - \ifForm@html /Flags 4\fi + \Fld@submitflags >>% } \def\PDFForm@Reset{% /Subtype/Widget% - \ifFld@hidden /F 6\else /F 4\fi - /T(\Hy@escapestring{\Fld@name})% + \Fld@annotflags + /T(\Fld@name)% /FT/Btn% + \Fld@flags /H/P% /DA(/Helv \strip@pt\Fld@charsize\space Tf 0 0 1 rg)% - /Ff 65540% /MK<<% \ifnum\Fld@rotation=\z@ \else @@ -1230,11 +1295,6 @@ } \ifHy@implicit \else - \def\@begindvi{% - \unvbox\@begindvibox - \HyPL@EveryPage - \global\let\@begindvi\HyPL@EveryPage - }% \expandafter\endinput \fi \let\H@old@ssect\@ssect diff --git a/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg b/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg index 59949a533d2..5753b85fb53 100644 --- a/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg +++ b/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg @@ -7,6 +7,8 @@ %% hyperref.dtx (with options: `tex4htcfg') %% %% File: hyperref.dtx Copyright 1995-2001 Sebastian Rahtz, +%% with portions written by David Carlisle and Heiko Oberdiek, +%% 2001-2007 Heiko Oberdiek. %% %% This file is part of the `Hyperref Bundle'. %% ------------------------------------------- @@ -22,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{htex4ht.cfg} - [2007/06/14 v6.76i + [2007/10/30 v6.77b Hyperref configuration file for TeX4ht] \IfFileExists{\jobname.cfg}{\endinput}{} \Preamble{html} diff --git a/Master/texmf-dist/tex/latex/hyperref/htex4ht.def b/Master/texmf-dist/tex/latex/hyperref/htex4ht.def index 3d2c14ce9ba..1f01772ae4e 100644 --- a/Master/texmf-dist/tex/latex/hyperref/htex4ht.def +++ b/Master/texmf-dist/tex/latex/hyperref/htex4ht.def @@ -7,6 +7,8 @@ %% hyperref.dtx (with options: `tex4ht') %% %% File: hyperref.dtx Copyright 1995-2001 Sebastian Rahtz, +%% with portions written by David Carlisle and Heiko Oberdiek, +%% 2001-2007 Heiko Oberdiek. %% %% This file is part of the `Hyperref Bundle'. %% ------------------------------------------- @@ -22,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{htex4ht.def} - [2007/06/14 v6.76i + [2007/10/30 v6.77b Hyperref driver for TeX4ht] \@ifpackageloaded{tex4ht}{% \typeout{hyperref tex4ht: tex4ht already loaded}% @@ -68,7 +70,10 @@ \ifx\Hy@tempa\@urltype \special{t4ht=<a href=\hyper@quote#2\hyper@quote>}% \else - {\hyper@chars\special{t4ht=<a href=\hyper@quote\##2\hyper@quote>}}% + \begingroup + \hyper@chars + \special{t4ht=<a href=\hyper@quote\##2\hyper@quote>}% + \endgroup \fi } \def\hyper@linkend{% @@ -175,17 +180,17 @@ \def\Fld@name{#2}% \def\Fld@default{}% \let\Hy@reserved@a\relax - \bgroup - \expandafter\Fld@findlength#3\\% - \Field@toks={ }% - \setkeys{Field}{#1}% - #2% - \ifFld@radio - \expandafter\@@Radio#3\\% - \else - \expandafter\@@Menu#3\\% - \fi - \egroup + \begingroup + \expandafter\Fld@findlength#3\\% + \Field@toks={ }% + \setkeys{Field}{#1}% + #2% + \ifFld@radio + \expandafter\@@Radio#3\\% + \else + \expandafter\@@Menu#3\\% + \fi + \endgroup } \def\Fld@findlength#1\\{% \Fld@menulength=0 % diff --git a/Master/texmf-dist/tex/latex/hyperref/htexture.def b/Master/texmf-dist/tex/latex/hyperref/htexture.def index 256808d2a25..1ea8bee0899 100644 --- a/Master/texmf-dist/tex/latex/hyperref/htexture.def +++ b/Master/texmf-dist/tex/latex/hyperref/htexture.def @@ -7,6 +7,8 @@ %% hyperref.dtx (with options: `textures') %% %% File: hyperref.dtx Copyright 1995-2001 Sebastian Rahtz, +%% with portions written by David Carlisle and Heiko Oberdiek, +%% 2001-2007 Heiko Oberdiek. %% %% This file is part of the `Hyperref Bundle'. %% ------------------------------------------- @@ -22,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{htexture.def} - [2007/06/14 v6.76i + [2007/10/30 v6.77b Hyperref driver for Textures] \begingroup \obeylines % @@ -40,7 +42,7 @@ end% }% }% -\AtBeginDvi{% +\AtBeginShipoutFirst{% \headerps@out{% /betterpdfmark {% systemdict begin % @@ -62,7 +64,7 @@ }% ifelse% }% end of \headerps@out -}% end of \AtBeginDvi +}% end of \AtBeginShipoutFirst \input{pdfmark.def}% \ifx\@pdfproducer\relax \def\@pdfproducer{Textures + Distiller}% diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtex.def b/Master/texmf-dist/tex/latex/hyperref/hvtex.def index 840c673eb0b..dd598129ca0 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hvtex.def +++ b/Master/texmf-dist/tex/latex/hyperref/hvtex.def @@ -7,6 +7,8 @@ %% hyperref.dtx (with options: `vtex,outlines') %% %% File: hyperref.dtx Copyright 1995-2001 Sebastian Rahtz, +%% with portions written by David Carlisle and Heiko Oberdiek, +%% 2001-2007 Heiko Oberdiek. %% %% This file is part of the `Hyperref Bundle'. %% ------------------------------------------- @@ -22,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hvtex.def} - [2007/06/14 v6.76i + [2007/10/30 v6.77b Hyperref driver for VTeX in PDF/PS mode] \edef\Hy@VTeXversion{% \ifx\VTeXversion\@undefined @@ -62,7 +64,11 @@ \the\Hy@abspage<<#1>>% }% }% - \AtEndDocument{\clearpage\HyPL@SetPageLabels}% + \@ifclassloaded{revtex4}{% + \g@addto@macro\clear@document{\HyPL@SetPageLabels}% + }{% + \AtEndDocument{\clearpage\HyPL@SetPageLabels}% + }% \fi \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname pdfescapestring\endcsname\relax @@ -283,7 +289,7 @@ /Type/Action% /S/Launch% /F(\Hy@pstringF)% - \ifHy@newwindow /NewWindow true \fi + \Hy@SetNewWindow \ifx\\#3\\\else /Win<</F(\Hy@pstringF)/P(\Hy@pstringP)>>\fi% >;% a=<% @@ -428,6 +434,11 @@ \special{!hidden\ifHy@pdfpagehidden +\else -\fi}% \fi }% + \g@addto@macro\Hy@EveryPageBoxHook{% + \hyper@pagetransition + \hyper@pageduration + \hyper@pagehidden + }% \fi \ifx\@pdfproducer\relax \def\@pdfproducer{VTeX}% @@ -700,11 +711,6 @@ o\fi,t=#4}% } \ifHy@implicit \else - \def\@begindvi{% - \unvbox\@begindvibox - \HyPL@EveryPage - \global\let\@begindvi\HyPL@EveryPage - }% \expandafter\endinput \fi \let\H@old@ssect\@ssect diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def b/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def index 1049b87ddc9..e881747961e 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def +++ b/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def @@ -7,6 +7,8 @@ %% hyperref.dtx (with options: `vtexhtml') %% %% File: hyperref.dtx Copyright 1995-2001 Sebastian Rahtz, +%% with portions written by David Carlisle and Heiko Oberdiek, +%% 2001-2007 Heiko Oberdiek. %% %% This file is part of the `Hyperref Bundle'. %% ------------------------------------------- @@ -22,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hvtexhtml.def} - [2007/06/14 v6.76i + [2007/10/30 v6.77b Hyperref driver for VTeX in HTML mode] \RequirePackage{vtexhtml} \newif\if@Localurl diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def b/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def index 2149cefe25a..54246fb1f63 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def +++ b/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def @@ -7,6 +7,8 @@ %% hyperref.dtx (with options: `vtexpdfmark') %% %% File: hyperref.dtx Copyright 1995-2001 Sebastian Rahtz, +%% with portions written by David Carlisle and Heiko Oberdiek, +%% 2001-2007 Heiko Oberdiek. %% %% This file is part of the `Hyperref Bundle'. %% ------------------------------------------- @@ -22,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hvtexmrk.def} - [2007/06/14 v6.76i + [2007/10/30 v6.77b Hyperref driver for VTeX in PDF/PS mode (pdfmark specials)] \input{pdfmark.def}% \ifx\@pdfproducer\relax @@ -38,7 +40,7 @@ \providecommand*\@pdfborderstyle{} \providecommand*\@pdfview{XYZ} \providecommand*\@pdfviewparams{ H.V} -\AtBeginDvi{% +\AtBeginShipoutFirst{% \headerps@out{% /vsize {\Hy@pageheight} def% /HyperBorder {1} def% diff --git a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty index d43d9003303..609099a2c39 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty +++ b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty @@ -7,6 +7,8 @@ %% hyperref.dtx (with options: `package') %% %% File: hyperref.dtx Copyright 1995-2001 Sebastian Rahtz, +%% with portions written by David Carlisle and Heiko Oberdiek, +%% 2001-2007 Heiko Oberdiek. %% %% This file is part of the `Hyperref Bundle'. %% ------------------------------------------- @@ -23,7 +25,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{hyperref} - [2007/06/14 v6.76i + [2007/10/30 v6.77b Hypertext links for LaTeX] \begingroup \@makeother\`% @@ -125,6 +127,7 @@ \newif\ifHy@menubar \newif\ifHy@naturalnames \newif\ifHy@nesting +\newif\ifHy@newwindowset \newif\ifHy@newwindow \newif\ifHy@pageanchor \newif\ifHy@pagelabels @@ -160,6 +163,7 @@ \Hy@menubartrue \Hy@naturalnamesfalse \Hy@nestingfalse +\Hy@newwindowsetfalse \Hy@newwindowfalse \Hy@pageanchortrue \Hy@pagelabelstrue @@ -272,21 +276,27 @@ \def\MF{Metafont}% \def\MP{Metapost}% \let\emph\@firstofone - \let\textbf\@firstofone - \let\textit\@firstofone - \let\textmd\@firstofone \let\textnormal\@firstofone \let\textrm\@firstofone - \let\textsc\@firstofone \let\textsf\@firstofone - \let\textsl\@firstofone \let\texttt\@firstofone + \let\textbf\@firstofone + \let\textmd\@firstofone + \let\textit\@firstofone + \let\textsc\@firstofone + \let\textsl\@firstofone \let\textup\@firstofone - \let\ttfamily\@empty + \let\normalfont\@empty + \let\rmfamily\@empty \let\sffamily\@empty + \let\ttfamily\@empty + \let\bfseries\@empty + \let\mdseries\@empty \let\itshape\@empty + \let\scshape\@empty + \let\slshape\@empty \let\upshape\@empty - \let\bfseries\@empty + \let\em\@empty \let\rm\@empty \let\Huge\@empty \let\LARGE\@empty @@ -298,6 +308,7 @@ \let\scriptsize\@empty \let\small\@empty \let\tiny\@empty + \let\mathversion\@gobble \def\textcolor##1##{\@secondoftwo}% \let\textlatin\@firstofone \@ifundefined{language@group}{}{% @@ -323,6 +334,7 @@ \let\index\@gobble \let\glossary\@gobble \let\href\@secondoftwo + \let\@mkboth\@gobbletwo \let\ref\HyPsd@ref \let\pageref\HyPsd@pageref \let\autoref\HyPsd@autoref @@ -457,6 +469,10 @@ \pdfstringdefPostHook#1% \endgroup } +\def\Hy@pdfstringdef#1#2{% + \pdfstringdef\Hy@gtemp{#2}% + \let#1\Hy@gtemp +} \@ifundefined{T@PD1}{\input{pd1enc.def}}{} \DeclareFontFamily{PD1}{pdf}{} \DeclareFontShape{PD1}{pdf}{m}{n}{ <-> cmr10 }{} @@ -1168,7 +1184,13 @@ } \def\HyPsd@CatcodeWarning#1{% \HyPsd@Warning{% - Token not allowed in a PDFDocEncoded string,% + Token not allowed in a PDF string (% + \ifHy@unicode + Unicode% + \else + PDFDocEncoding% + \fi + ),% \MessageBreak removing `\HyPsd@RemoveCmdPrefix#1'% }% } @@ -1492,17 +1514,21 @@ \newcommand\pdfbookmark[3][]{} \let\Acrobatmenu\@gobble \def\Hy@writebookmark#1#2#3#4#5{}% -\let\HyperRaiseLinkLength\@tempdima \let\HyperRaiseLinkHook\@empty \def\HyperRaiseLinkDefault{\baselineskip} \def\Hy@raisedlink#1{% - \setlength\HyperRaiseLinkLength\HyperRaiseLinkDefault - \HyperRaiseLinkHook \ifvmode #1% \else \penalty\@M - \smash{\raise\HyperRaiseLinkLength\hbox{#1}}% + \smash{% + \begingroup + \let\HyperRaiseLinkLength\@tempdima + \setlength\HyperRaiseLinkLength\HyperRaiseLinkDefault + \HyperRaiseLinkHook + \expandafter\endgroup + \expandafter\raise\the\HyperRaiseLinkLength\hbox{#1}% + }% \fi } \def\Hy@SaveLastskip{% @@ -1781,7 +1807,7 @@ \def\HyPsd@pdfencoding@unicode{unicode} \let\HyPsd@pdfencoding\Hy@pdfencoding@pdfdoc \def\HyPsd@LoadStringEnc{% - \RequirePackage{stringenc}[2007/06/14] + \RequirePackage{stringenc}[2007/06/14]% \let\HyPsd@LoadStringEnc\relax } \AtBeginDocument{% @@ -1796,6 +1822,25 @@ }% }% } +\newif\ifHy@setpdfversion +\define@key{Hyp}{pdfversion}{% + \@ifundefined{Hy@pdfversion@#1}{% + \PackageWarning{hyperref}{% + Unsupported PDF version `#1'.\MessageBreak + Valid values: 1.2 until 1.7% + }% + }{% + \Hy@setpdfversiontrue + \edef\Hy@pdfversion{\@nameuse{Hy@pdfversion@#1}}% + }% +} +\@namedef{Hy@pdfversion@1.2}{2}% +\@namedef{Hy@pdfversion@1.3}{3}% +\@namedef{Hy@pdfversion@1.4}{4}% +\@namedef{Hy@pdfversion@1.5}{5}% +\@namedef{Hy@pdfversion@1.6}{6}% +\@namedef{Hy@pdfversion@1.7}{7}% +\def\Hy@pdfversion{2} \define@key{Hyp}{hyperref}[true]{} \define@key{Hyp}{tex4ht}[true]{% \def\XR@ext{html}% @@ -1806,7 +1851,10 @@ \def\Hy@driver{htex4ht}% \def\MaybeStopEarly{% \typeout{Hyperref stopped early}% - \AfterBeginDocument{\PDF@FinishDoc}% + \AfterBeginDocument{% + \PDF@FinishDoc + \gdef\PDF@FinishDoc{}% + }% \endinput }% } @@ -1880,7 +1928,10 @@ \def\Hy@driver{hvtexhtm}% \def\MaybeStopEarly{% \typeout{Hyperref stopped early}% - \AfterBeginDocument{\PDF@FinishDoc}% + \AfterBeginDocument{% + \PDF@FinishDoc + \gdef\PDF@FinishDoc{}% + }% \endinput }% \else @@ -2082,6 +2133,24 @@ \def\theoremautorefname{Teorema}% \def\pageautorefname{Pag.\@}% } +\def\HyLang@magyar{% + \def\equationautorefname{Egyenlet}% + \def\footnoteautorefname{l\'abjegyzet}% + \def\itemautorefname{Elem}% + \def\figureautorefname{\'Abra}% + \def\tableautorefname{T\'abl\'azat}% + \def\partautorefname{R\'esz}% + \def\appendixautorefname{F\"uggel\'ek}% + \def\chapterautorefname{fejezet}% + \def\sectionautorefname{szakasz}% + \def\subsectionautorefname{alszakasz}% + \def\subsubsectionautorefname{alalszakasz}% + \def\paragraphautorefname{bekezd\'es}% + \def\subparagraphautorefname{albekezd\'es}% + \def\FancyVerbLineautorefname{sor}% + \def\theoremautorefname{T\'etel}% + \def\pageautorefname{oldal}% +} \def\HyLang@portuges{% \def\equationautorefname{Equa\c c\~ao}% \def\footnoteautorefname{Nota de rodap\'e}% @@ -2184,6 +2253,8 @@ \HyLang@DeclareLang{acadian}{french} \HyLang@DeclareLang{canadien}{french} \HyLang@DeclareLang{italian}{italian} +\HyLang@DeclareLang{magyar}{magyar} +\HyLang@DeclareLang{hungarian}{magyar} \define@key{Hyp}{vietnamese}[]{% \HyLang@addto\extrasvietnamese\HyLang@vietnamese \AtEndOfPackage{% @@ -2466,7 +2537,19 @@ \Hy@boolkey[pdfdisplaydoctitle]{displaydoctitle}{#1}% } \define@key{Hyp}{pdfnewwindow}[true]{% - \Hy@boolkey[pdfnewwindow]{newwindow}{#1}% + \def\Hy@temp{#1}% + \ifx\Hy@temp\@empty + \Hy@newwindowsetfalse + \else + \Hy@newwindowsettrue + \Hy@boolkey[pdfnewwindow]{newwindow}{#1}% + \fi +} +\def\Hy@SetNewWindow{% + \ifHy@newwindowset + /NewWindow % + \ifHy@newwindow true\else false\fi + \fi } \Hy@DefNameKey{pdfpagelayout}{% \do{SinglePage}{}% @@ -2508,13 +2591,32 @@ \let\PDF@SetupDoc\@empty \let\PDF@FinishDoc\@empty \let\phantomsection\@empty +\let\special@paper\@empty \@ifundefined{stockwidth}{% - \edef\special@paper{\the\paperwidth,\the\paperheight}% + \ifdim\paperwidth>\z@ + \ifdim\paperheight>\z@ + \edef\special@paper{\the\paperwidth,\the\paperheight}% + \fi + \fi }{% - \edef\special@paper{\the\stockwidth,\the\stockheight}% + \ifdim\stockwith>\z@ + \ifdim\stockheight>\z@ + \edef\special@paper{\the\stockwidth,\the\stockheight}% + \fi + \fi } \begingroup - \dimen@=\@ifundefined{stockheight}{\paperheight}{\stockheight}\relax + \edef\x{\@ifundefined{stockheight}\paperheight\stockheight}% + \dimen@=\x\relax + \ifdim\dimen@>\z@ + \else + \dimen@=11in\relax + \Hy@WarningNoLine{% + Height of page (\expandafter\string\x) % + is invalid (\the\x),\MessageBreak + using 11in% + }% + \fi \dimen@=0.99626401\dimen@ \xdef\Hy@pageheight{\strip@pt\dimen@}% \endgroup @@ -2545,6 +2647,7 @@ \let\hyper@linkend\@empty \def\hyper@linkurl#1#2{#1}% \def\hyper@linkfile#1#2#3{#1}% + \def\hyper@link@[#1]#2#3{}% \def\Acrobatmenu#1#2{#2}% \let\PDF@SetupDoc\@empty \let\PDF@FinishDoc\@empty @@ -2557,7 +2660,8 @@ \Hy@DisableOption{draft}% \Hy@DisableOption{nolinks}% \Hy@DisableOption{final}% -}% +} +\Hy@DisableOption{pdfversion}% \Hy@nextfalse \@ifundefined{spanish@sh@"@sel}{}{\Hy@nexttrue} \@ifundefined{galician@sh@"@sel}{}{\Hy@nexttrue} @@ -2603,7 +2707,10 @@ \typeout{Implicit mode OFF; no redefinition of LaTeX internals}% \def\MaybeStopEarly{% \typeout{Hyperref stopped early}% - \AfterBeginDocument{\PDF@FinishDoc}% + \AfterBeginDocument{% + \PDF@FinishDoc + \gdef\PDF@FinishDoc{}% + }% \endinput }% \AtBeginDocument{% @@ -2647,7 +2754,10 @@ \def\Hy@driver{hvtexhtm}% \def\MaybeStopEarly{% \typeout{Hyperref stopped early}% - \AfterBeginDocument{\PDF@FinishDoc}% + \AfterBeginDocument{% + \PDF@FinishDoc + \gdef\PDF@FinishDoc{}% + }% \endinput }% \else @@ -2884,6 +2994,7 @@ \providecommand*\hyper@chars{% \let\#\hyper@hash \let\%\@percentchar + \Hy@safe@activestrue } \def\hyperlink#1#2{% \hyper@@link{}{#1}{#2}% @@ -2905,7 +3016,8 @@ \RequirePackage{url} \let\HyOrg@url\url \def\Hurl{\begingroup \Url} -\let\nolinkurl\Hurl +\DeclareRobustCommand*{\nolinkurl}{\hyper@normalise\nolinkurl@} +\def\nolinkurl@#1{\Hurl{#1}} \DeclareRobustCommand*{\url}{\hyper@normalise\url@} \def\url@#1{\hyper@linkurl{\Hurl{#1}}{#1}} \DeclareRobustCommand*{\hyperimage}{\hyper@normalise\hyper@image} @@ -3090,24 +3202,408 @@ ##2\ref{##4}##3% }% } +\RequirePackage{bitset} +\def\HyField@NewFlag#1#2{% + \lowercase{\HyField@NewOption{#2}}% + \lowercase{\HyField@NewBitsetFlag{#2}}{#2}{#1}% +} +\def\HyField@NewFlagOnly#1#2{% + \lowercase{\HyField@NewBitsetFlag{#2}}{#2}{#1}% +} +\def\HyField@NewOption#1{% + \expandafter\newif\csname ifFld@#1\endcsname + \define@key{Field}{#1}[true]{% + \lowercase{\Field@boolkey{##1}}{#1}% + }% +} +\def\HyField@NewBitsetFlag#1#2#3#4{% + \begingroup + \count@=#4\relax + \advance\count@\m@ne + \def\x##1{% + \endgroup + \expandafter\def\csname HyField@#3@#1\endcsname{##1}% + \expandafter\ifx\csname HyField@#3@##1\endcsname\relax + \expandafter\edef\csname HyField@#3@##1\endcsname{% + (\number#4) #2% + }% + \else + \expandafter\edef\csname HyField@#3@##1\endcsname{% + \csname HyField@#3@##1\endcsname + /#2% + }% + \fi + }% + \expandafter\x\expandafter{\the\count@}% +} +\def\HyField@UseFlag#1#2{% + \lowercase{\HyField@@UseFlag{#2}}{#1}% +} +\def\HyField@@UseFlag#1#2{% + \bitsetSetValue{HyField@#2}{% + \csname HyField@#2@#1\endcsname + }{% + \csname ifFld@#1\endcsname 1\else 0\fi + }% +} +\def\HyField@SetFlag#1#2{% + \lowercase{\HyField@@SetFlag{#2}}{#1}% +} +\def\HyField@@SetFlag#1#2{% + \bitsetSetValue{HyField@#2}{% + \csname HyField@#2@#1\endcsname + }{1}% +} +\def\HyField@PrintFlags#1#2{% + \ifHy@verbose + \begingroup + \let\Hy@temp\@empty + \let\MessageBreak\relax + \expandafter\@for\expandafter\x\expandafter:\expandafter=% + \bitsetGetSetBitList{HyField@#1}\do{% + \edef\Hy@temp{% + \Hy@temp + \csname HyField@#1@\x\endcsname\MessageBreak + }% + }% + \edef\x{\endgroup + \noexpand\Hy@Info{% + Field flags: % + \expandafter\ifx\@car#1\@nil S\else/\fi + #1 % + \bitsetGetDec{HyField@#1} % + (0x\bitsetGetHex{HyField@#1}{32})\MessageBreak + \Hy@temp + for #2% + }% + }\x + \fi +} +\HyField@NewFlag{Ff}{ReadOnly}{1} +\HyField@NewFlag{Ff}{Required}{2} +\HyField@NewFlag{Ff}{NoExport}{3} +\HyField@NewFlag{Ff}{NoToggleToOff}{15} +\HyField@NewFlag{Ff}{Radio}{16} +\HyField@NewFlag{Ff}{Pushbutton}{17} +\HyField@NewFlag{Ff}{RadiosInUnison}{26} +\HyField@NewFlag{Ff}{Multiline}{13} +\HyField@NewFlag{Ff}{Password}{14} +\HyField@NewFlag{Ff}{FileSelect}{21}% PDF 1.4 +\HyField@NewFlag{Ff}{DoNotSpellCheck}{23}% PDF 1.4 +\HyField@NewFlag{Ff}{DoNotScroll}{24}% PDF 1.4 +\HyField@NewFlag{Ff}{Comb}{25}% PDF 1.4 +\HyField@NewFlag{Ff}{RichText}{26}% PDF 1.5 +\HyField@NewFlag{Ff}{Combo}{18} +\HyField@NewFlag{Ff}{Edit}{19} +\HyField@NewFlag{Ff}{Sort}{20} +\HyField@NewFlag{Ff}{MultiSelect}{22}% PDF 1.4 +\HyField@NewFlag{Ff}{CommitOnSelChange}{27}% PDF 1.5 +\newif\ifFld@popdown +\define@key{Field}{popdown}[true]{% + \lowercase{\Field@boolkey{#1}}{popdown}% +} +\HyField@NewFlag{F}{Invisible}{1} +\HyField@NewFlag{F}{Hidden}{2}% PDF 1.2 +\HyField@NewFlag{F}{Print}{3}% PDF 1.2 +\HyField@NewFlag{F}{NoZoom}{4}% PDF 1.2 +\HyField@NewFlag{F}{NoRotate}{5}% PDF 1.3 +\HyField@NewFlag{F}{NoView}{6}% PDF 1.3 +\HyField@NewFlag{F}{Locked}{8}% PDF 1.4 +\HyField@NewFlag{F}{ToggleNoView}{9}% PDF 1.5 +\HyField@NewFlag{F}{LockedContents}{10}% PDF 1.7 +\HyField@NewFlag{Submit}{IncludeNoValueFields}{2} +\HyField@NewFlagOnly{Submit}{ExportFormat}{3} +\HyField@NewFlag{Submit}{GetMethod}{4} +\HyField@NewFlag{Submit}{SubmitCoordinates}{5} +\HyField@NewFlagOnly{Submit}{XFDF}{6} +\HyField@NewFlag{Submit}{IncludeAppendSaves}{7} +\HyField@NewFlag{Submit}{IncludeAnnotations}{8} +\HyField@NewFlagOnly{Submit}{SubmitPDF}{9} +\HyField@NewFlag{Submit}{CanonicalFormat}{10} +\HyField@NewFlag{Submit}{ExclNonUserAnnots}{11} +\HyField@NewFlag{Submit}{ExclFKey}{12} +\HyField@NewFlag{Submit}{EmbedForm}{14} +\define@key{Field}{export}{% + \lowercase{\def\Hy@temp{#1}}% + \@ifundefined{Fld@export@\Hy@temp}{% + \@onelevel@sanitize\Hy@temp + \PackageError{hyperref}{% + Unknown export format `\Hy@temp'.\MessageBreak + Known formats are `FDF', `HTML', `XFDF', and `PDF'% + }\@ehc + }{% + \let\Fld@export\Hy@temp + }% +} +\def\Fld@export{fdf} +\@namedef{Fld@export@fdf}{0}% +\@namedef{Fld@export@html}{1}% +\@namedef{Fld@export@xfdf}{2}% +\@namedef{Fld@export@pdf}{3}% +\def\HyField@FlagsSubmit{% + \bitsetReset{HyField@Submit}% + \ifcase\@nameuse{Fld@export@\Fld@export} % + % FDF + \HyField@UseFlag{Submit}{IncludeNoValueFields}% + \HyField@UseFlag{Submit}{SubmitCoordinates}% + \HyField@UseFlag{Submit}{IncludeAppendSaves}% + \HyField@UseFlag{Submit}{IncludeAnnotations}% + \HyField@UseFlag{Submit}{CanonicalFormat}% + \HyField@UseFlag{Submit}{ExclNonUserAnnots}% + \HyField@UseFlag{Submit}{ExclFKey}% + \HyField@UseFlag{Submit}{EmbedForm}% + \or % HTML + \HyField@SetFlag{Submit}{ExportFormat}% + \HyField@UseFlag{Submit}{IncludeNoValueFields}% + \HyField@UseFlag{Submit}{GetMethod}% + \HyField@UseFlag{Submit}{SubmitCoordinates}% + \HyField@UseFlag{Submit}{CanonicalFormat}% + \or % XFDF + \HyField@SetFlag{Submit}{XFDF}% + \HyField@UseFlag{Submit}{IncludeNoValueFields}% + \HyField@UseFlag{Submit}{SubmitCoordinates}% + \HyField@UseFlag{Submit}{CanonicalFormat}% + \or % PDF + \HyField@SetFlag{Submit}{SubmitPDF}% + \HyField@UseFlag{Submit}{GetMethod}% + \fi + \HyField@PrintFlags{Submit}{submit button field}% + \bitsetIsEmpty{HyField@Submit}{% + \def\Fld@submitflags{}% + }{% + \edef\Fld@submitflags{/Flags \bitsetGetDec{HyField@Submit}}% + }% +} +\def\HyField@FlagsAnnot#1{% + \bitsetReset{HyField@F}% + \HyField@UseFlag{F}{Invisible}% + \HyField@UseFlag{F}{Hidden}% + \HyField@UseFlag{F}{Print}% + \HyField@UseFlag{F}{NoZoom}% + \HyField@UseFlag{F}{NoRotate}% + \HyField@UseFlag{F}{NoView}% + \HyField@UseFlag{F}{Locked}% + \HyField@UseFlag{F}{ToggleNoView}% + \HyField@UseFlag{F}{LockedContents}% + \HyField@PrintFlags{F}{#1}% + \bitsetIsEmpty{HyField@F}{% + \def\Fld@annotflags{}% + }{% + \edef\Fld@annotflags{/F \bitsetGetDec{HyField@F}}% + }% +} +\def\HyField@FlagsPushButton{% + \HyField@FlagsAnnot{push button field}% + \bitsetReset{HyField@Ff}% + \HyField@UseFlag{Ff}{ReadOnly}% + \HyField@UseFlag{Ff}{Required}% + \HyField@UseFlag{Ff}{NoExport}% + \HyField@SetFlag{Ff}{Pushbutton}% + \HyField@PrintFlags{Ff}{push button field}% + \bitsetIsEmpty{HyField@Ff}{% + \def\Fld@flags{}% + }{% + \edef\Fld@flags{/Ff \bitsetGetDec{HyField@Ff}}% + }% +} +\def\HyField@FlagsCheckBox{% + \HyField@FlagsAnnot{check box field}% + \bitsetReset{HyField@Ff}% + \HyField@UseFlag{Ff}{ReadOnly}% + \HyField@UseFlag{Ff}{Required}% + \HyField@UseFlag{Ff}{NoExport}% + \HyField@PrintFlags{Ff}{check box field}% + \bitsetIsEmpty{HyField@Ff}{% + \def\Fld@flags{}% + }{% + \edef\Fld@flags{/Ff \bitsetGetDec{HyField@Ff}}% + }% +} +\def\HyField@FlagsRadioButton{% + \HyField@FlagsAnnot{radio button field}% + \bitsetReset{HyField@Ff}% + \HyField@UseFlag{Ff}{ReadOnly}% + \HyField@UseFlag{Ff}{Required}% + \HyField@UseFlag{Ff}{NoExport}% + \HyField@UseFlag{Ff}{NoToggleToOff}% + \HyField@SetFlag{Ff}{Radio}% + \HyField@UseFlag{Ff}{RadiosInUnison}% + \HyField@PrintFlags{Ff}{radio button field}% + \bitsetIsEmpty{HyField@Ff}{% + \def\Fld@flags{}% + }{% + \edef\Fld@flags{/Ff \bitsetGetDec{HyField@Ff}}% + }% +} +\def\HyField@FlagsText{% + \HyField@FlagsAnnot{text field}% + \bitsetReset{HyField@Ff}% + \HyField@UseFlag{Ff}{ReadOnly}% + \HyField@UseFlag{Ff}{Required}% + \HyField@UseFlag{Ff}{NoExport}% + \HyField@UseFlag{Ff}{Multiline}% + \HyField@UseFlag{Ff}{Password}% + \HyField@UseFlag{Ff}{FileSelect}% + \HyField@UseFlag{Ff}{DoNotSpellCheck}% + \HyField@UseFlag{Ff}{DoNotScroll}% + \ifFld@comb + \ifcase0\ifFld@multiline + \else\ifFld@password + \else\ifFld@fileselect + \else 1\fi\fi\fi\relax + \PackageError{hyperref}{% + Field option `comb' cannot used together with\MessageBreak + `multiline', `password', or `fileselect'% + }\@ehc + \else + \HyField@UseFlag{Ff}{Comb}% + \fi + \fi + \HyField@UseFlag{Ff}{RichText}% + \HyField@PrintFlags{Ff}{text field}% + \bitsetIsEmpty{HyField@Ff}{% + \def\Fld@flags{}% + }{% + \edef\Fld@flags{/Ff \bitsetGetDec{HyField@Ff}}% + }% +} +\def\HyField@FlagsChoice{% + \HyField@FlagsAnnot{choice field}% + \bitsetReset{HyField@Ff}% + \HyField@UseFlag{Ff}{ReadOnly}% + \HyField@UseFlag{Ff}{Required}% + \HyField@UseFlag{Ff}{NoExport}% + \HyField@UseFlag{Ff}{Combo}% + \ifFld@combo + \HyField@UseFlag{Ff}{Edit}% + \fi + \HyField@UseFlag{Ff}{Sort}% + \HyField@UseFlag{Ff}{MultiSelect}% + \ifFld@combo + \ifFld@edit + \HyField@UseFlag{Ff}{DoNotSpellCheck}% + \fi + \fi + \HyField@UseFlag{Ff}{CommitOnSelChange}% + \HyField@PrintFlags{Ff}{choice field}% + \bitsetIsEmpty{HyField@Ff}{% + \def\Fld@flags{}% + }{% + \edef\Fld@flags{/Ff \bitsetGetDec{HyField@Ff}}% + }% +} +\RequirePackage{kvsetkeys}[2007/09/29] +\def\HyField@PDFChoices#1{% + \begingroup + \gdef\Fld@choices{}% + \def\HyTmp@optlist{}% + \let\HyTmp@optitem\relax + \count@=0 % + \kv@parse{#1}{% + \Hy@pdfstringdef\kv@key\kv@key + \ifx\kv@value\relax + \ifnum\Hy@pdfversion<3 % implementation note 122, PDF spec 1.7 + \xdef\Fld@choices{\Fld@choices[(\kv@key)(\kv@key)]}% + \else + \xdef\Fld@choices{\Fld@choices(\kv@key)}% + \fi + \else + \Hy@pdfstringdef\kv@value\kv@value + \xdef\Fld@choices{\Fld@choices[(\kv@key)(\kv@value)]}% + \fi + \edef\HyTmp@optlist{% + \HyTmp@optlist + \HyTmp@optitem{\the\count@}{\kv@key}0% + }% + \advance\count@ by 1 % + \@gobbletwo + }% + \xdef\Fld@choices{/Opt[\Fld@choices]}% + \ifFld@multiselect + \HyField@@PDFChoices{DV}\Fld@default + \HyField@@PDFChoices{V}\Fld@value + \else + \ifx\Fld@default\relax + \else + \pdfstringdef\Hy@gtemp\Fld@default + \xdef\Fld@choices{\Fld@choices/DV(\Hy@gtemp)}% + \fi + \ifx\Fld@value\relax + \else + \pdfstringdef\Hy@gtemp\Fld@value + \xdef\Fld@choices{\Fld@choices/V(\Hy@gtemp)}% + \fi + \fi + \endgroup +} +\def\HyField@@PDFChoices#1#2{% + \ifx#2\relax + \else + \count@=0 % + \def\HyTmp@optitem##1##2##3{% + \def\HyTmp@key{##2}% + \ifx\HyTmp@key\Hy@gtemp + \expandafter\def\expandafter\HyTmp@optlist\expandafter{% + \HyTmp@optlist + \HyTmp@optitem{##1}{##2}1% + }% + \let\HyTmp@found=Y% + \else + \expandafter\def\expandafter\HyTmp@optlist\expandafter{% + \HyTmp@optlist + \HyTmp@optitem{##1}{##2}##3% + }% + \fi + }% + \expandafter\comma@parse\expandafter{#2}{% + \pdfstringdef\Hy@gtemp\comma@entry + \let\HyTmp@found=N % + \expandafter\let\expandafter\HyTmp@optlist\expandafter\@empty + \HyTmp@optlist + \ifx\HyTmp@found Y% + \advance\count@ by 1 % + \else + \@onelevel@sanitize\comma@entry + \PackageWarning{hyperref}{% + \string\ChoiceBox: Ignoring value `\comma@entry',% + \MessageBreak + it cannot be found in the choices% + }% + \fi + \@gobble + }% + \def\HyTmp@optitem##1##2##3{% + \ifnum##3=1 % + (##2)% + \fi + }% + \ifcase\count@ + \or + \xdef\Fld@choices{\Fld@choices/#1\HyTmp@optlist}% + \else + \xdef\Fld@choices{\Fld@choices/#1[\HyTmp@optlist]}% + \ifx#1V% + \def\HyTmp@optitem##1##2##3{% + \ifnum##3=1 % + \@firstofone{ ##1}% + \fi + }% + \edef\HyTmp@optlist{\HyTmp@optlist}% + \xdef\Fld@choices{% + \Fld@choices + /I[\expandafter\@firstofone\HyTmp@optlist]% + }% + \fi + \fi + \fi +} +\def\HyField@SetKeys{% + \setkeys{Field}% +} \newif\ifFld@checked -\newif\ifFld@hidden -\newif\ifFld@multiline -\newif\ifFld@readonly \newif\ifFld@disabled -\newif\ifFld@password -\newif\ifFld@radio -\newif\ifFld@combo -\newif\ifFld@popdown -\Fld@multilinefalse \Fld@checkedfalse -\Fld@hiddenfalse -\Fld@readonlyfalse \Fld@disabledfalse -\Fld@radiofalse -\Fld@combofalse -\Fld@popdownfalse -\Fld@passwordfalse \newcount\Fld@menulength \newdimen\Field@Width \newdimen\Fld@charsize @@ -3122,7 +3618,6 @@ \def\Fld@borderstyle{S} \def\Fld@cbsymbol{4} \def\Fld@rotation{0} -\newtoks\Choice@toks \def\Form{\@ifnextchar[{\@Form}{\@Form[]}} \def\endForm{\@endForm} \newif\ifForm@html @@ -3139,6 +3634,7 @@ \def\Hy@tempa{#1}% \ifx\Hy@tempa\enc@@html \Form@htmltrue + \def\Fld@export{html}% \else \typeout{hyperref: form `encoding' key set to #1 % -- unknown type% @@ -3147,9 +3643,25 @@ \fi } \define@key{Form}{method}{% - \def\Form@method{#1}% + \lowercase{\def\Hy@temp{#1}}% + \@ifundefined{Form@method@\Hy@temp}{% + \@onelevel@sanitize\Hy@temp + \PackageError{hyperref}{% + Unknown method `\Hy@temp'.\MessageBreak + Known values are `post' and `get'% + }\@ehc + }{% + \let\Form@method\Hy@temp + \ifcase\@nameuse{Form@method@\Hy@temp} % + \Fld@getmethodfalse + \else + \Fld@getmethodtrue + \fi + }% } \def\Form@method{} +\@namedef{Form@method@post}{0} +\@namedef{Form@method@get}{1} \def\Field@boolkey#1#2{% \csname Fld@#2\ifx\relax#1\relax true\else#1\fi\endcsname } @@ -3170,33 +3682,12 @@ \define@key{Field}{loc}{% \def\Fld@loc{#1}% } -\define@key{Field}{multiline}[true]{% - \lowercase{\Field@boolkey{#1}}{multiline}% -} \define@key{Field}{checked}[true]{% \lowercase{\Field@boolkey{#1}}{checked}% } -\define@key{Field}{hidden}[true]{% - \lowercase{\Field@boolkey{#1}}{hidden}% -} -\define@key{Field}{readonly}[true]{% - \lowercase{\Field@boolkey{#1}}{readonly}% -} \define@key{Field}{disabled}[true]{% \lowercase{\Field@boolkey{#1}}{disabled}% } -\define@key{Field}{password}[true]{% - \lowercase{\Field@boolkey{#1}}{password}% -} -\define@key{Field}{radio}[true]{% - \lowercase{\Field@boolkey{#1}}{radio}% -} -\define@key{Field}{combo}[true]{% - \lowercase{\Field@boolkey{#1}}{combo}% -} -\define@key{Field}{popdown}[true]{% - \lowercase{\Field@boolkey{#1}}{popdown}% -} \define@key{Field}{accesskey}{% \Field@addtoks{accesskey}{#1}% } @@ -3386,7 +3877,17 @@ \def\DefaultHeightofChoiceMenu{\baselineskip} \def\DefaultWidthofChoiceMenu{\baselineskip} \def\DefaultHeightofText{\baselineskip} +\def\DefaultHeightofTextMultiline{4\baselineskip} \def\DefaultWidthofText{3cm} +\def\DefaultOptionsofSubmit{print,name=Submit,noexport} +\def\DefaultOptionsofReset{print,name=Reset,noexport} +\def\DefaultOptionsofPushButton{print} +\def\DefaultOptionsofCheckBox{print} +\def\DefaultOptionsofText{print} +\def\DefaultOptionsofListBox{print} +\def\DefaultOptionsofComboBox{print,edit,sort} +\def\DefaultOptionsofPopdownBox{print} +\def\DefaultOptionsofRadio{print,notoggletooff} \ifHy@figures \Hy@Info{Hyper figures ON}% \else @@ -3459,6 +3960,7 @@ \let\hyper@linkend\@empty \def\hyper@linkurl##1##2{##1}% \def\hyper@linkfile##1##2##3{##1}% + \def\hyper@link@[##1]##2##3{}% \let\Hy@backout\@gobble } \def\stop@hyper{% @@ -3472,6 +3974,7 @@ \let\hyper@linkend\@empty \def\hyper@linkurl##1##2{##1}% \def\hyper@linkfile##1##2##3{##1}% + \def\hyper@link@[##1]##2##3{}% } \def\endNoHyper{% \global\let\hyper@link\hyper@livelink @@ -3585,6 +4088,28 @@ \Hy@UseMaketitleString{title}% \Hy@UseMaketitleString{author}% } +\RequirePackage{atbegshi}[2007/09/09] +\def\Hy@EveryPageHook{} +\def\Hy@EveryPageBoxHook{} +\def\Hy@FirstPageHook{} +\AtBeginShipout{% + \Hy@EveryPageHook + \ifx\Hy@EveryPageBoxHook\@empty + \else + \setbox\AtBeginShipoutBox=\vbox{% + \offinterlineskip + \Hy@EveryPageBoxHook + \box\AtBeginShipoutBox + }% + \fi +} +\AtBeginShipoutFirst{% + \Hy@FirstPageHook +} +\g@addto@macro\Hy@FirstPageHook{% + \PDF@FinishDoc + \gdef\PDF@FinishDoc{}% +} \ifHy@pagelabels \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname thepage\endcsname\relax @@ -3732,8 +4257,7 @@ \fi \fi }% -\else - \let\HyPL@EveryPage\@empty + \g@addto@macro\Hy@EveryPageHook{\HyPL@EveryPage}% \fi \Hy@DisableOption{pdfpagelabels} \MaybeStopEarly @@ -3885,6 +4409,9 @@ }% }{} \AtBeginDocument{% + \@ifclassloaded{revtex4}{% + \@namedef{ver@lastpage.sty}{1994/06/25}% + }{}% \@ifpackageloaded{lastpage}{% \ifHy@pageanchor \else @@ -3919,6 +4446,18 @@ \fi \addtocounter{page}{1}% }% + \@ifclassloaded{revtex4}{% + \begingroup + \toks@\expandafter{\lastpage@putlabel}% + \edef\x{\endgroup + \def\noexpand\lastpage@putlabel{% + \noexpand\stepcounter{page}% + \the\toks@ + \noexpand\addtocounter{page}\noexpand\m@ne + }% + }% + \x + }{}% }{}% } \def\hypergetref#1{\getrefbykeydefault{#1}{}{??}} @@ -3959,6 +4498,8 @@ \expandafter\def\y[##1]##2{% \H@refstepcounter{#1}% \hyper@makecurrent{table}% + \let\Hy@LT@currentHlabel\@currentHlabel + \let\Hy@LT@currentHref\@currentHref #2\@sharp#####4% }% }% @@ -3968,7 +4509,11 @@ \endgroup \def\LT@start{% #1% - \hyper@refstepcounter{table}% + \let\@currentHlabel\Hy@LT@currentHlabel + \let\@currentHref\Hy@LT@currentHref + \Hy@raisedlink{% + \hyper@anchorstart{\@currentHref}\hyper@anchorend + }% \ifvoid\LT@firsthead\copy #2% }% @@ -4242,10 +4787,12 @@ \expandafter\@gobble \else \H@refstepcounter\@captype - \@ifundefined{fst@\@captype}{% - \let\Hy@tempa\@caption + \let\Hy@tempa\@caption + \@ifundefined{float@caption}{% }{% - \let\Hy@tempa\Hy@float@caption + \expandafter\ifx\csname @float@c@\@captype\endcsname\float@caption + \let\Hy@tempa\Hy@float@caption + \fi }% \expandafter\@firstofone \fi @@ -4288,17 +4835,23 @@ \let\Hy@float@caption\@caption \@ifpackageloaded{float}{% \def\Hy@float@caption{% - \hyper@makecurrent{\@captype}% + \ifx\Hy@float@currentHref\@undefined + \hyper@makecurrent{\@captype}% + \global\let\Hy@float@currentHref\@currentHref + \else + \let\@currentHref\Hy@float@currentHref + \fi \float@caption }% \let\HyOrg@float@makebox\float@makebox \renewcommand{\float@makebox}[1]{% \HyOrg@float@makebox{% #1\relax - \begingroup - \hyper@makecurrent{\@captype}% - \hyper@@anchor{\@currentHref}{\relax}% - \endgroup + \ifx\Hy@float@currentHref\@undefined + \else + \hyper@@anchor{\Hy@float@currentHref}{\relax}% + \global\let\Hy@float@currentHref\@undefined + \fi }% }% }{} @@ -4538,187 +5091,46 @@ \@citedatax[{#1}]% }% }{} -\def\@begindvi{% - \unvbox \@begindvibox - \Hy@begindvi - \global\let\@begindvi\Hy@begindvi -} -\def\Hy@begindvi{% - \@hyperfixhead - \HyPL@EveryPage -} -\def\pagenumbering#1{% - \global\c@page \@ne - \gdef\thepage{\csname @#1\endcsname\c@page}% -} -\let\HYPERPAGEANCHOR\hyperpageanchor -\providecommand*\hyper@pagetransition{} -\providecommand*\hyper@pageduration{} -\providecommand*\hyper@pagehidden{} -\def\@hyperfixhead{% +\def\Hy@EveryPageAnchor{% \Hy@DistillerDestFix \ifHy@pageanchor \ifHy@hypertexnames \ifHy@plainpages - \gdef\Hy@TempPageAnchor{\hyper@@anchor{page.\the\c@page}}% + \def\Hy@TempPageAnchor{\hyper@@anchor{page.\the\c@page}}% \else \begingroup \let\@number\@firstofone \Hy@unicodefalse \pdfstringdef\@the@H@page{\thepage}% \endgroup - \gdef\Hy@TempPageAnchor{\hyper@@anchor{page.\@the@H@page}}% + \def\Hy@TempPageAnchor{\hyper@@anchor{page.\@the@H@page}}% \fi \else \Hy@GlobalStepCount\Hy@pagecounter - \gdef\Hy@TempPageAnchor{\hyper@@anchor{page.\the\Hy@pagecounter}}% + \def\Hy@TempPageAnchor{\hyper@@anchor{page.\the\Hy@pagecounter}}% \fi - \else - \let\Hy@TempPageAnchor\@empty - \fi - \let\H@old@thehead\@thehead - \if^\@thehead^% - \def\H@old@thehead{\hfil}% - \fi - \ifHy@texht - \def\@thehead{}% - \else - \ifHy@seminarslides - \begingroup - \let\leavevmode\relax - \Hy@TempPageAnchor\relax - \hyper@pagetransition - \hyper@pageduration - \hyper@pagehidden - \endgroup - \else - \def\@thehead{% - \Hy@TempPageAnchor\relax - \hyper@pagetransition - \hyper@pageduration - \hyper@pagehidden - \H@old@thehead + \vbox to 0pt{% + \kern\voffset + \kern\topmargin + \kern-1bp\relax + \hbox to 0pt{% + \kern\hoffset + \kern\ifodd\value{page}% + \oddsidemargin + \else + \evensidemargin + \fi + \kern-1bp\relax + \Hy@TempPageAnchor + \hss }% - \fi - \fi - \ifx\PDF@FinishDoc\@empty - \else - \PDF@FinishDoc - \gdef\PDF@FinishDoc{}% + \vss + }% \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 - }% -}{} +\g@addto@macro\Hy@EveryPageBoxHook{% + \Hy@EveryPageAnchor +} \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname chapter\endcsname\relax \def\toclevel@part{0}% diff --git a/Master/texmf-dist/tex/latex/hyperref/hypertex.def b/Master/texmf-dist/tex/latex/hyperref/hypertex.def index b9c1115caa4..2198b6a0fd4 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hypertex.def +++ b/Master/texmf-dist/tex/latex/hyperref/hypertex.def @@ -7,6 +7,8 @@ %% hyperref.dtx (with options: `hypertex') %% %% File: hyperref.dtx Copyright 1995-2001 Sebastian Rahtz, +%% with portions written by David Carlisle and Heiko Oberdiek, +%% 2001-2007 Heiko Oberdiek. %% %% This file is part of the `Hyperref Bundle'. %% ------------------------------------------- @@ -22,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hypertex.def} - [2007/06/14 v6.76i + [2007/10/30 v6.77b Hyperref driver for HyperTeX specials] \def\PDF@FinishDoc{} \def\PDF@SetupDoc{% diff --git a/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty b/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty index 8008fac2f1d..8107ee0b510 100644 --- a/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty +++ b/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty @@ -7,6 +7,8 @@ %% hyperref.dtx (with options: `nohyperref') %% %% File: hyperref.dtx Copyright 1995-2001 Sebastian Rahtz, +%% with portions written by David Carlisle and Heiko Oberdiek, +%% 2001-2007 Heiko Oberdiek. %% %% This file is part of the `Hyperref Bundle'. %% ------------------------------------------- @@ -23,7 +25,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{nohyperref} - [2007/06/14 v6.76i + [2007/10/30 v6.77b Dummy hyperref (SR)] \let\hyper@@anchor\@gobble \def\hyper@link#1#2#3{#3}% @@ -33,6 +35,7 @@ \let\hyper@linkend\@empty \def\hyper@linkurl#1#2{#1}% \def\hyper@linkfile#1#2#3{#1}% +\def\hyper@link@[#1]#2#3{}% \let\PDF@SetupDoc\@empty \let\PDF@FinishDoc\@empty \let\Acrobatmenu\@gobble diff --git a/Master/texmf-dist/tex/latex/hyperref/pd1enc.def b/Master/texmf-dist/tex/latex/hyperref/pd1enc.def index b303058e896..1d2eba5d5ac 100644 --- a/Master/texmf-dist/tex/latex/hyperref/pd1enc.def +++ b/Master/texmf-dist/tex/latex/hyperref/pd1enc.def @@ -7,6 +7,8 @@ %% hyperref.dtx (with options: `pd1enc') %% %% File: hyperref.dtx Copyright 1995-2001 Sebastian Rahtz, +%% with portions written by David Carlisle and Heiko Oberdiek, +%% 2001-2007 Heiko Oberdiek. %% %% This file is part of the `Hyperref Bundle'. %% ------------------------------------------- @@ -22,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{pd1enc.def} - [2007/06/14 v6.76i + [2007/10/30 v6.77b Hyperref: PDFDocEncoding definition (HO)] \DeclareFontEncoding{PD1}{}{} \DeclareTextCommand{\textLF}{PD1}{\012} % line feed diff --git a/Master/texmf-dist/tex/latex/hyperref/pdfmark.def b/Master/texmf-dist/tex/latex/hyperref/pdfmark.def index dcb307d2f3b..29505d09755 100644 --- a/Master/texmf-dist/tex/latex/hyperref/pdfmark.def +++ b/Master/texmf-dist/tex/latex/hyperref/pdfmark.def @@ -7,6 +7,8 @@ %% hyperref.dtx (with options: `pdfmark,pdfmarkbase,pdfform,outlines') %% %% File: hyperref.dtx Copyright 1995-2001 Sebastian Rahtz, +%% with portions written by David Carlisle and Heiko Oberdiek, +%% 2001-2007 Heiko Oberdiek. %% %% This file is part of the `Hyperref Bundle'. %% ------------------------------------------- @@ -22,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{pdfmark.def} - [2007/06/14 v6.76i + [2007/10/30 v6.77b Hyperref definitions for pdfmark specials] \def\Hy@PutCatalog#1{% \pdfmark{pdfmark=/PUT,Raw={\string{Catalog\string} << #1 >>}}% @@ -254,6 +256,11 @@ }% \fi } +\g@addto@macro\Hy@EveryPageBoxHook{% + \hyper@pagetransition + \hyper@pageduration + \hyper@pagehidden +} \def\hyper@image#1#2{% \hyper@linkurl{#2}{#1}% } @@ -619,7 +626,7 @@ Action={% <<% /S/GoToR% - \ifHy@newwindow /NewWindow true\fi + \Hy@SetNewWindow /F(\Hy@pstringF)% /D\ifx\\#3\\[0 \@pdfstartview]\else(\Hy@pstringD)cvn\fi >>% @@ -643,7 +650,7 @@ Action={% <<% /S/Launch% - \ifHy@newwindow /NewWindow true\fi + \Hy@SetNewWindow /F(\Hy@pstringF)% \ifx\\#3\\% \else @@ -655,7 +662,7 @@ \endgroup } \long\def\@Form[#1]{% -\AtBeginDvi{% +\AtBeginShipoutFirst{% \headerps@out{% [% /_objdef{pdfDocEncoding}% @@ -837,19 +844,19 @@ \def\Fld@default{}% \let\Fld@value\@empty \def\Fld@width{\DefaultWidthofText}% - \def\Fld@height{\DefaultHeightofText}% - \ifFld@multiline - \begingroup - \dimen@=\DefaultHeightofText - \dimen@=4\dimen@ - \edef\x{\endgroup - \def\noexpand\Fld@height{\the\dimen@}% - }% - \x - \fi - \bgroup + \def\Fld@height{% + \ifFld@multiline + \DefaultHeightofTextMultiline + \else + \DefaultHeightofText + \fi + }% + \begingroup \Field@toks={ }% - \setkeys{Field}{#1}% + \expandafter\HyField@SetKeys\expandafter{% + \DefaultOptionsofText,#1% + }% + \HyField@FlagsText \ifFld@hidden\def\Fld@width{1sp}\fi \ifx\Fld@value\@empty\def\Fld@value{\Fld@default}\fi \LayoutTextField{#2}{% @@ -858,7 +865,7 @@ pdfmark=/ANN,Raw={\PDFForm@Text}% }% }% - \egroup + \endgroup } \def\@ChoiceMenu[#1]#2#3{% parameters, label, choices \def\Fld@name{#2}% @@ -866,7 +873,7 @@ \let\Fld@value\relax \def\Fld@width{\DefaultWidthofChoiceMenu}% \def\Fld@height{\DefaultHeightofChoiceMenu}% - \bgroup + \begingroup \Fld@menulength=0 % \@tempdima\z@ \@for\@curropt:=#3\do{% @@ -877,34 +884,57 @@ }% \advance\@tempdima by 15\p@ \Field@toks={ }% - \setkeys{Field}{#1}% + \begingroup + \HyField@SetKeys{#1}% + \edef\x{\endgroup + \noexpand\expandafter + \noexpand\HyField@SetKeys + \noexpand\expandafter{% + \expandafter\noexpand\csname DefaultOptionsof% + \ifFld@radio + Radio% + \else + \ifFld@combo + \ifFld@popdown + PopdownBox% + \else + ComboBox% + \fi + \else + ListBox% + \fi + \fi + \endcsname + }% + }\x + \HyField@SetKeys{#1}% \ifFld@hidden\def\Fld@width{1sp}\fi \ifx\Fld@value\relax \let\Fld@value\Fld@default \fi \LayoutChoiceField{#2}{% \ifFld@radio + \HyField@FlagsRadioButton \@@Radio{#3}% \else - {% + \begingroup + \HyField@FlagsChoice \ifdim\Fld@width<\@tempdima \ifdim\@tempdima<1cm\@tempdima1cm\fi \edef\Fld@width{\the\@tempdima}% \fi - \def\Fld@flags{}% - \ifFld@combo\def\Fld@flags{/Ff 917504}\fi - \ifFld@popdown\def\Fld@flags{/Ff 131072}\fi - \ifx\Fld@flags\@empty + \ifFld@combo + \else \@tempdima=\the\Fld@menulength\Fld@charsize \advance\@tempdima by \Fld@borderwidth bp % \advance\@tempdima by \Fld@borderwidth bp % \edef\Fld@height{\the\@tempdima}% \fi \@@Listbox{#3}% - }% + \endgroup \fi }% - \egroup + \endgroup } \def\@@Radio#1{% \Fld@listcount=0 % @@ -921,15 +951,7 @@ } \newcount\Fld@listcount \def\@@Listbox#1{% - \Choice@toks={ }% - \Fld@listcount=0 % - \@for\@curropt:=#1\do{% - \expandafter\Fld@checkequals\@curropt==\\% - \Hy@StepCount\Fld@listcount - \edef\@processme{% - \Choice@toks{\the\Choice@toks [(\@currValue) (\@currDisplay)]}% - }\@processme - }% + \HyField@PDFChoices{#1}% \Hy@escapeform\PDFForm@List \pdfmark[\MakeChoiceField{\Fld@width}{\Fld@height}]{% pdfmark=/ANN,Raw={\PDFForm@List}% @@ -937,9 +959,12 @@ } \def\@PushButton[#1]#2{% parameters, label \def\Fld@name{#2}% - \bgroup + \begingroup \Field@toks={ }% - \setkeys{Field}{#1}% + \expandafter\HyField@SetKeys\expandafter{% + \DefaultOptionsofPushButton,#1% + }% + \HyField@FlagsPushButton \ifFld@hidden\def\Fld@width{1sp}\fi \LayoutPushButtonField{% \Hy@escapeform\PDFForm@Push @@ -947,45 +972,53 @@ pdfmark=/ANN,Raw={\PDFForm@Push}% }% }% - \egroup + \endgroup } \def\@Submit[#1]#2{% \Field@toks={ }% \def\Fld@width{\DefaultWidthofSubmit}% \def\Fld@height{\DefaultHeightofSubmit}% - \bgroup - \def\Fld@name{Submit}% - \setkeys{Field}{#1}% + \begingroup + \expandafter\HyField@SetKeys\expandafter{% + \DefaultOptionsofSubmit,#1% + }% + \HyField@FlagsPushButton + \HyField@FlagsSubmit \ifFld@hidden\def\Fld@width{1sp}\fi \Hy@escapeform\PDFForm@Submit \pdfmark[\MakeButtonField{#2}]{% pdfmark=/ANN,% Raw={\PDFForm@Submit /AP << /N {Submit} /D {SubmitP} >>}% }% - \egroup + \endgroup } \def\@Reset[#1]#2{% \Field@toks={ }% \def\Fld@width{\DefaultWidthofReset}% \def\Fld@height{\DefaultHeightofReset}% - \bgroup - \def\Fld@name{Reset}% - \setkeys{Field}{#1}% + \begingroup + \expandafter\HyField@SetKeys\expandafter{% + \DefaultOptionsofReset,#1% + }% + \HyField@FlagsPushButton \ifFld@hidden\def\Fld@width{1sp}\fi \Hy@escapeform\PDFForm@Reset \pdfmark[\MakeButtonField{#2}]{% pdfmark=/ANN,Raw={\PDFForm@Reset}% }% - \egroup + \endgroup } \def\@CheckBox[#1]#2{% parameters, label \def\Fld@name{#2}% \def\Fld@default{0}% - \bgroup + \begingroup \def\Fld@width{\DefaultWidthofCheckBox}% \def\Fld@height{\DefaultHeightofCheckBox}% \Field@toks={ }% - \setkeys{Field}{#1}% + \expandafter\HyField@SetKeys\expandafter{% + \DefaultOptionsofCheckBox,#1% + }% + \HyField@FlagsCheckBox \ifFld@hidden\def\Fld@width{1sp}\fi \LayoutCheckField{#2}{% \Hy@escapeform\PDFForm@Check @@ -993,7 +1026,7 @@ pdfmark=/ANN,Raw={\PDFForm@Check}% }% }% - \egroup + \endgroup } \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname pdfescapestring\endcsname\relax @@ -1036,10 +1069,23 @@ }% \Hy@escapeform{}% \fi +\def\PDFForm@Name{% + \begingroup + \ifnum\Hy@pdfversion<5 % implementation note 117, PDF spec 1.7 + \ifHy@unicode + \Hy@unicodefalse + \fi + \fi + \pdfstringdef\Hy@gtemp\Fld@name + \endgroup + \let\Fld@name\Hy@gtemp +} \def\PDFForm@Check{% /Subtype/Widget% - \ifFld@hidden /F 6\else /F 4\fi - /T(\Hy@escapestring{\Fld@name})% + \Fld@annotflags + /T(\Fld@name)% + /FT/Btn% + \Fld@flags /Q \Fld@align /BS<</W \Fld@borderwidth /S/\Fld@borderstyle>>% /MK<<% @@ -1059,16 +1105,15 @@ >>% /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% - \ifFld@hidden /F 6\else /F 4\fi - /T(\Hy@escapestring{\Fld@name})% + \Fld@annotflags + /T(\Fld@name)% /FT/Btn% - /Ff 65540% + \HyField@flags /H/P% /BS<</W \Fld@borderwidth/S/\Fld@borderstyle>>% /MK<<% @@ -1133,11 +1178,12 @@ } \def\PDFForm@List{% /Subtype/Widget% - \ifFld@hidden /F 6\else /F 4\fi - /T(\Hy@escapestring{\Fld@name})% + \Fld@annotflags + /T(\Fld@name)% /FT/Ch% + \Fld@flags /Q \Fld@align - /BS<</W \Fld@borderwidth /S/\Fld@borderstyle>>% + /BS<</W \Fld@borderwidth/S/\Fld@borderstyle>>% /MK<<% \ifnum\Fld@rotation=\z@ \else @@ -1154,24 +1200,15 @@ >>% /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 - /DV(\Hy@escapestring{\Fld@default})% - \fi - \ifx\Fld@value\relax - \else - /V(\Hy@escapestring{\Fld@value})% - \fi + \Fld@choices \Fld@additionalactions - \Fld@flags } \def\PDFForm@Radio{% /Subtype/Widget% - \ifFld@hidden /F 6\else /F 4\fi - /T(\Hy@escapestring{\Fld@name})% + \Fld@annotflags + /T(\Fld@name)% /FT/Btn% - /Ff 49152% + \Fld@flags /H/P% /BS<</W \Fld@borderwidth/S/\Fld@borderstyle>>% /MK<<% @@ -1200,10 +1237,11 @@ } \def\PDFForm@Text{% /Subtype/Widget% - \ifFld@hidden /F 6\else /F 4\fi - /T(\Hy@escapestring{\Fld@name})% - /Q \Fld@align + \Fld@annotflags + /T(\Fld@name)% /FT/Tx% + \Fld@flags + /Q \Fld@align /BS<</W \Fld@borderwidth\space /S /\Fld@borderstyle>>% /MK<<% \ifnum\Fld@rotation=\z@ @@ -1224,23 +1262,14 @@ /DV(\Hy@escapestring{\Fld@default})% /V(\Hy@escapestring{\Fld@value})% \Fld@additionalactions - \ifFld@multiline - \ifFld@readonly /Ff 4097\else /Ff 4096\fi - \else - \ifFld@password - \ifFld@readonly /Ff 8193\else /Ff 8192\fi - \else - \ifFld@readonly /Ff 1\fi - \fi - \fi \ifnum\Fld@maxlen>\z@/MaxLen \Fld@maxlen \fi } \def\PDFForm@Submit{% /Subtype/Widget% - \ifFld@hidden /F 6\else /F 4\fi - /T(\Hy@escapestring{\Fld@name})% + \Fld@annotflags + /T(\Fld@name)% /FT/Btn% - /Ff 65540% + \Fld@flags /H/P% /BS<</W \Fld@borderwidth/S/\Fld@borderstyle>>% /MK<<% @@ -1259,17 +1288,17 @@ /FS/URL% /F(\Hy@escapestring{\Form@action})% >>% - \ifForm@html /Flags 4\fi + \Fld@submitflags >>% } \def\PDFForm@Reset{% /Subtype/Widget% - \ifFld@hidden /F 6\else /F 4\fi - /T(\Hy@escapestring{\Fld@name})% + \Fld@annotflags + /T(\Fld@name)% /FT/Btn% + \Fld@flags /H/P% /DA(/Helv \strip@pt\Fld@charsize\space Tf 0 0 1 rg)% - /Ff 65540% /MK<<% \ifnum\Fld@rotation=\z@ \else @@ -1420,11 +1449,6 @@ } \ifHy@implicit \else - \def\@begindvi{% - \unvbox\@begindvibox - \HyPL@EveryPage - \global\let\@begindvi\HyPL@EveryPage - }% \expandafter\endinput \fi \let\H@old@ssect\@ssect diff --git a/Master/texmf-dist/tex/latex/hyperref/puarenc.def b/Master/texmf-dist/tex/latex/hyperref/puarenc.def index e4da5bce854..b3ac43bd5d7 100644 --- a/Master/texmf-dist/tex/latex/hyperref/puarenc.def +++ b/Master/texmf-dist/tex/latex/hyperref/puarenc.def @@ -7,6 +7,8 @@ %% hyperref.dtx (with options: `puarenc') %% %% File: hyperref.dtx Copyright 1995-2001 Sebastian Rahtz, +%% with portions written by David Carlisle and Heiko Oberdiek, +%% 2001-2007 Heiko Oberdiek. %% %% This file is part of the `Hyperref Bundle'. %% ------------------------------------------- @@ -22,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{puarenc.def} - [2007/06/14 v6.76i + [2007/10/30 v6.77b 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 f32a6b14fe6..f180d6748fc 100644 --- a/Master/texmf-dist/tex/latex/hyperref/puenc.def +++ b/Master/texmf-dist/tex/latex/hyperref/puenc.def @@ -7,6 +7,8 @@ %% hyperref.dtx (with options: `puenc') %% %% File: hyperref.dtx Copyright 1995-2001 Sebastian Rahtz, +%% with portions written by David Carlisle and Heiko Oberdiek, +%% 2001-2007 Heiko Oberdiek. %% %% This file is part of the `Hyperref Bundle'. %% ------------------------------------------- @@ -22,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{puenc.def} - [2007/06/14 v6.76i + [2007/10/30 v6.77b Hyperref: PDF Unicode definition (HO)] \DeclareFontEncoding{PU}{}{} \DeclareTextCommand{\textLF}{PU}{\80\012} % line feed diff --git a/Master/texmf-dist/tex/latex/hyperref/puvnenc.def b/Master/texmf-dist/tex/latex/hyperref/puvnenc.def index 51f54824aa3..95a15e57e73 100644 --- a/Master/texmf-dist/tex/latex/hyperref/puvnenc.def +++ b/Master/texmf-dist/tex/latex/hyperref/puvnenc.def @@ -7,6 +7,8 @@ %% hyperref.dtx (with options: `puvnenc') %% %% File: hyperref.dtx Copyright 1995-2001 Sebastian Rahtz, +%% with portions written by David Carlisle and Heiko Oberdiek, +%% 2001-2007 Heiko Oberdiek. %% %% This file is part of the `Hyperref Bundle'. %% ------------------------------------------- @@ -22,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{puvnenc.def} - [2007/06/14 v6.76i + [2007/10/30 v6.77b Hyperref: Additions to puenc.def for VnTeX] \DeclareTextCommand{\abreve}{PU}{\81\003} \DeclareTextCommand{\acircumflex}{PU}{\80\342} |