diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/hyperref/hyperref.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/hyperref/hyperref.sty | 62 |
1 files changed, 37 insertions, 25 deletions
diff --git a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty index 4fe241da4c6..fe8d0462c76 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty +++ b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty @@ -10,7 +10,8 @@ %% with portions written by David Carlisle and Heiko Oberdiek, %% 2001-2012 Heiko Oberdiek. %% 2016-2019 Oberdiek Package Suport Group -%% https://github.com/ho-tex/hyperref/issues +%% 2019 LaTeX3 Project +%% https://github.com/latex3/hyperref/issues %% %% This file is part of the `Hyperref Bundle'. %% ------------------------------------------- @@ -25,14 +26,14 @@ %% %% This work has the LPPL maintenance status `maintained'. %% -%% The Current Maintainer of this work is Heiko Oberdiek. +%% The Current Maintainer of this work is the LaTeX3 Project. %% %% The list of all files belonging to the `Hyperref Bundle' is %% given in the file `manifest.txt'. %% \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{hyperref} - [2019/09/12 v6.88i % + [2019/09/28 v7.00a % Hypertext links for LaTeX] \begingroup \@makeother\`% @@ -2632,7 +2633,7 @@ #3% }% } -\def\Hy@realDisableOption#1{% +\def\Hy@DisableOption#1{% \ltx@ifundefined{KV@Hyp@#1@default}{% \define@key{Hyp}{#1}% }{% @@ -2641,17 +2642,6 @@ {\Hy@WarnOptionDisabled{#1}}% } -\def\Hy@DisableOption#1{% - \ifnum\currentgrouplevel>0 - \expandafter\@firstoftwo - \else - \expandafter\@secondoftwo - \fi - {% - \expandafter\gdef\csname Hy@smuggleout#1\endcsname{\Hy@DisableOption{#1}}% - \expandafter\aftergroup\csname Hy@smuggleout#1\endcsname - } - {\Hy@realDisableOption{#1}}} \def\Hy@WarnOptionDisabled#1{% \Hy@Warning{% Option `#1' has already been used,\MessageBreak @@ -4933,6 +4923,12 @@ \DeclareRobustCommand*{\nameref}{% \@ifstar\@namerefstar\T@nameref }% + \ifHy@implicit + \else + \let \@pagerefstar\T@pageref + \let \@refstar\T@ref + \let \@namerefstar\T@nameref + \fi } \Hy@AtBeginDocument{% \ifHy@texht @@ -6092,6 +6088,7 @@ \else \def\@currValue{#2}% \fi + \expandafter\Hy@pdfstringdef\expandafter\@currValue\expandafter{\@currValue}% } \define@key{Field}{loc}{% \def\Fld@loc{#1}% @@ -6201,7 +6198,7 @@ \def\Fld@bordersep{#1}% } \define@key{Field}{default}{% - \def\Fld@default{#1}% + \Hy@pdfstringdef\Fld@default{#1}% } \define@key{Field}{align}{% \def\Fld@align{#1}% @@ -6356,13 +6353,28 @@ \@ifnextchar[{\@Reset}{\@Reset[]}% } \def\LayoutTextField#1#2{% label, field - #1 #2% + \def\Hy@temp{#1}% + \ifx\Hy@temp\@empty + #2% + \else + #1 #2% + \fi } \def\LayoutChoiceField#1#2{% label, field - #1 #2% + \def\Hy@temp{#1}% + \ifx\Hy@temp\@empty + #2% + \else + #1 #2% + \fi } \def\LayoutCheckField#1#2{% label, field - #1 #2% + \def\Hy@temp{#1}% + \ifx\Hy@temp\@empty + #2% + \else + #1 #2% + \fi } \def\LayoutPushButtonField#1{% button #1% @@ -6389,12 +6401,12 @@ \def\DefaultWidthofSubmit{2cm} \def\DefaultHeightofReset{14pt} \def\DefaultWidthofReset{2cm} -\def\DefaultHeightofCheckBox{\baselineskip} -\def\DefaultWidthofCheckBox{\baselineskip} -\def\DefaultHeightofChoiceMenu{\baselineskip} -\def\DefaultWidthofChoiceMenu{\baselineskip} -\def\DefaultHeightofText{\baselineskip} -\def\DefaultHeightofTextMultiline{4\baselineskip} +\def\DefaultHeightofCheckBox{\normalbaselineskip} +\def\DefaultWidthofCheckBox{\normalbaselineskip} +\def\DefaultHeightofChoiceMenu{\normalbaselineskip} +\def\DefaultWidthofChoiceMenu{\normalbaselineskip} +\def\DefaultHeightofText{\normalbaselineskip} +\def\DefaultHeightofTextMultiline{4\normalbaselineskip} \def\DefaultWidthofText{3cm} \def\DefaultOptionsofSubmit{print,name=Submit,noexport} \def\DefaultOptionsofReset{print,name=Reset,noexport} |