diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/hyperref/hyperref.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/hyperref/hyperref.sty | 137 |
1 files changed, 69 insertions, 68 deletions
diff --git a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty index 2f296f98701..76ff83212c0 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty +++ b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty @@ -30,7 +30,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{hyperref} - [2011/08/19 v6.82h % + [2011/09/28 v6.82i % Hypertext links for LaTeX] \begingroup \@makeother\`% @@ -256,15 +256,15 @@ \newif\ifHy@bookmarksnumbered \newif\ifHy@bookmarksopen \newif\ifHy@breaklinks -\newif\ifHy@centerwindow +\newif\ifHy@pdfcenterwindow \newif\ifHy@CJKbookmarks \newif\ifHy@colorlinks \newif\ifHy@draft \let\Hy@finaltrue\Hy@draftfalse \let\Hy@finalfalse\Hy@drafttrue -\newif\ifHy@escapeform -\newif\ifHy@figures -\newif\ifHy@fitwindow +\newif\ifHy@pdfescapeform +\newif\ifHy@hyperfigures +\newif\ifHy@pdffitwindow \newif\ifHy@frenchlinks \newif\ifHy@hyperfootnotes \newif\ifHy@hyperindex @@ -272,14 +272,14 @@ \newif\ifHy@implicit \newif\ifHy@linktocpage \newif\ifHy@localanchorname -\newif\ifHy@menubar +\newif\ifHy@pdfmenubar \newif\ifHy@naturalnames \newif\ifHy@nesting -\newif\ifHy@newwindowset -\newif\ifHy@newwindow +\newif\ifHy@pdfnewwindowset +\newif\ifHy@pdfnewwindow \newif\ifHy@ocgcolorlinks \newif\ifHy@pageanchor -\newif\ifHy@pagelabels +\newif\ifHy@pdfpagelabels \newif\ifHy@pdfpagehidden \newif\ifHy@pdfstring \newif\ifHy@plainpages @@ -288,49 +288,51 @@ \newif\ifHy@seminarslides \newif\ifHy@setpagesize \newif\ifHy@texht -\newif\ifHy@toolbar +\newif\ifHy@pdftoolbar \newif\ifHy@unicode -\newif\ifHy@usetitle +\newif\ifHy@pdfusetitle \newif\ifHy@verbose -\newif\ifHy@windowui -\newif\ifHy@displaydoctitle +\let\Hy@debugtrue\Hy@verbosetrue +\let\Hy@debugfalse\Hy@verbosefalse +\newif\ifHy@pdfwindowui +\newif\ifHy@pdfdisplaydoctitle \newif\ifHy@pdfa \Hy@backreffalse \Hy@bookmarksnumberedfalse \Hy@bookmarksopenfalse \Hy@bookmarkstrue \Hy@breaklinksfalse -\Hy@centerwindowfalse +\Hy@pdfcenterwindowfalse \Hy@CJKbookmarksfalse -\Hy@escapeformfalse -\Hy@figuresfalse -\Hy@fitwindowfalse +\Hy@pdfescapeformfalse +\Hy@hyperfiguresfalse +\Hy@pdffitwindowfalse \Hy@hyperfootnotestrue \Hy@hyperindextrue \Hy@hypertexnamestrue \Hy@implicittrue \Hy@linktocpagefalse \Hy@localanchornamefalse -\Hy@menubartrue +\Hy@pdfmenubartrue \Hy@naturalnamesfalse \Hy@nestingfalse -\Hy@newwindowsetfalse -\Hy@newwindowfalse +\Hy@pdfnewwindowsetfalse +\Hy@pdfnewwindowfalse \Hy@pageanchortrue -\Hy@pagelabelstrue +\Hy@pdfpagelabelstrue \Hy@pdfpagehiddenfalse \Hy@pdfstringfalse \Hy@plainpagesfalse \Hy@raiselinksfalse \Hy@setpagesizetrue \Hy@texhtfalse -\Hy@toolbartrue +\Hy@pdftoolbartrue \Hy@typexmlfalse \Hy@unicodefalse -\Hy@usetitlefalse +\Hy@pdfusetitlefalse \Hy@verbosefalse -\Hy@windowuitrue -\Hy@displaydoctitlefalse +\Hy@pdfwindowuitrue +\Hy@pdfdisplaydoctitlefalse \Hy@pdfafalse \def\Hy@StepCount#1{\advance#1 by 1 }% \def\Hy@GlobalStepCount#1{\global\advance#1 by 1 }% @@ -2359,8 +2361,11 @@ prefix=HyOpt% } \def\IfHyperBooleanExists#1{% - \ltx@ifundefined{ifHy@#1}\ltx@secondoftwo\ltx@firstoftwo + \ltx@ifundefined{Hy@#1false}\ltx@secondoftwo{% + \ltx@ifundefined{KV@Hyp@#1@default}\ltx@secondoftwo\ltx@firstoftwo + }% } +\@namedef{KV@Hyp@stoppedearly@default}{} \def\IfHyperBoolean#1{% \IfHyperBooleanExists{#1}{% \csname ifHy@#1\endcsname @@ -2370,9 +2375,8 @@ \fi }\ltx@secondoftwo } -\def\Hy@boolkey{\@dblarg\Hy@@boolkey} -\def\Hy@@boolkey[#1]#2#3{% - \edef\Hy@tempa{#3}% +\def\Hy@boolkey#1#2{% + \edef\Hy@tempa{#2}% \lowercase\expandafter{% \expandafter\def\expandafter\Hy@tempa\expandafter{\Hy@tempa}% }% @@ -2387,21 +2391,10 @@ \fi \fi \ifx\Hy@tempa\relax - \Hy@WarnOptionValue{#3}{#1}{`true' or 'false'}% + \Hy@WarnOptionValue{#2}{#1}{`true' or 'false'}% \else \Hy@Info{Option `#1' set `\Hy@tempa'}% - \csname Hy@#2\Hy@tempa\endcsname - \fi - \begingroup - \def\x{#1}% - \def\y{#2}% - \expandafter\endgroup - \ifx\x\y - \else - \expandafter\def\csname ifHy@#1\expandafter\endcsname - \expandafter{% - \csname ifHy@#2\endcsname - }% + \csname Hy@#1\Hy@tempa\endcsname \fi } \def\Hy@WarnOptionValue#1#2#3{% @@ -2412,7 +2405,7 @@ }% } \def\Hy@DisableOption#1{% - \@ifundefined{KV@Hyp@#1@default}{% + \ltx@ifundefined{KV@Hyp@#1@default}{% \define@key{Hyp}{#1}% }{% \define@key{Hyp}{#1}[]% @@ -2504,7 +2497,7 @@ \Hy@boolkey{setpagesize}{#1}% } \define@key{Hyp}{debug}[true]{% - \Hy@boolkey[debug]{verbose}{#1}% + \Hy@boolkey{debug}{#1}% } \define@key{Hyp}{linktocpage}[true]{% \Hy@boolkey{linktocpage}{#1}% @@ -2884,7 +2877,7 @@ \fi } \define@key{Hyp}{hyperfigures}[true]{% - \Hy@boolkey[hyperfigures]{figures}{#1}% + \Hy@boolkey{hyperfigures}{#1}% } \define@key{Hyp}{hyperfootnotes}[true]{% \Hy@boolkey{hyperfootnotes}{#1}% @@ -3538,7 +3531,7 @@ \do{5}{five copies}% } \define@key{Hyp}{pdfusetitle}[true]{% - \Hy@boolkey[pdfusetitle]{usetitle}{#1}% + \Hy@boolkey{pdfusetitle}{#1}% } \def\HyXeTeX@CheckUnicode{% \ifxetex @@ -3810,22 +3803,22 @@ } \define@key{Hyp}{pdfpagescrop}{\edef\@pdfpagescrop{#1}} \define@key{Hyp}{pdftoolbar}[true]{% - \Hy@boolkey[pdftoolbar]{toolbar}{#1}% + \Hy@boolkey{pdftoolbar}{#1}% } \define@key{Hyp}{pdfmenubar}[true]{% - \Hy@boolkey[pdfmenubar]{menubar}{#1}% + \Hy@boolkey{pdfmenubar}{#1}% } \define@key{Hyp}{pdfwindowui}[true]{% - \Hy@boolkey[pdfwindowui]{windowui}{#1}% + \Hy@boolkey{pdfwindowui}{#1}% } \define@key{Hyp}{pdffitwindow}[true]{% - \Hy@boolkey[pdffitwindow]{fitwindow}{#1}% + \Hy@boolkey{pdffitwindow}{#1}% } \define@key{Hyp}{pdfcenterwindow}[true]{% - \Hy@boolkey[pdfcenterwindow]{centerwindow}{#1}% + \Hy@boolkey{pdfcenterwindow}{#1}% } \define@key{Hyp}{pdfdisplaydoctitle}[true]{% - \Hy@boolkey[pdfdisplaydoctitle]{displaydoctitle}{#1}% + \Hy@boolkey{pdfdisplaydoctitle}{#1}% } \define@key{Hyp}{pdfa}[true]{% \Hy@boolkey{pdfa}{#1}% @@ -3833,16 +3826,16 @@ \define@key{Hyp}{pdfnewwindow}[true]{% \def\Hy@temp{#1}% \ifx\Hy@temp\@empty - \Hy@newwindowsetfalse + \Hy@pdfnewwindowsetfalse \else - \Hy@newwindowsettrue - \Hy@boolkey[pdfnewwindow]{newwindow}{#1}% + \Hy@pdfnewwindowsettrue + \Hy@boolkey{pdfnewwindow}{#1}% \fi } \def\Hy@SetNewWindow{% - \ifHy@newwindowset + \ifHy@pdfnewwindowset /NewWindow % - \ifHy@newwindow true\else false\fi + \ifHy@pdfnewwindow true\else false\fi \fi } \Hy@DefNameKey{pdfpagelayout}{% @@ -3857,10 +3850,10 @@ \def\@pdflang{#1}% } \define@key{Hyp}{pdfpagelabels}[true]{% - \Hy@boolkey[pdfpagelabels]{pagelabels}{#1}% + \Hy@boolkey{pdfpagelabels}{#1}% } \define@key{Hyp}{pdfescapeform}[true]{% - \Hy@boolkey[pdfescapeform]{escapeform}{#1}% + \Hy@boolkey{pdfescapeform}{#1}% } \def\@linkbordercolor{1 0 0} \def\@urlbordercolor{0 1 1} @@ -4047,7 +4040,7 @@ }% \expandafter\def\Hy@gtemp } -\ifHy@figures +\ifHy@hyperfigures \Hy@Info{Hyper figures ON}% \else \Hy@Info{Hyper figures OFF}% @@ -4594,8 +4587,8 @@ \fi \ifx\Hy@href@nextactionraw\@empty \else - \Hy@newwindowsettrue - \Hy@newwindowtrue + \Hy@pdfnewwindowsettrue + \Hy@pdfnewwindowtrue \fi } \define@key{href}{pdfremotestartview}{% @@ -5724,7 +5717,7 @@ \def\DefaultOptionsofComboBox{print,edit,sort} \def\DefaultOptionsofPopdownBox{print} \def\DefaultOptionsofRadio{print,notoggletooff} -\ifHy@figures +\ifHy@hyperfigures \Hy@Info{Hyper figures ON}% \else \Hy@Info{Hyper figures OFF}% @@ -5889,7 +5882,7 @@ \def\newlabel#1#2{\@newl@bel r{#1}{#2{}{}{}{}}}% \fi } -\ifHy@usetitle +\ifHy@pdfusetitle \let\HyOrg@title\title \let\HyOrg@author\author \def\title{\@ifnextchar[{\Hy@scanopttitle}{\Hy@scantitle}}% @@ -5973,10 +5966,10 @@ \PDF@FinishDoc \global\let\PDF@FinishDoc\ltx@empty } -\ifHy@pagelabels +\ifHy@pdfpagelabels \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname thepage\endcsname\relax - \Hy@pagelabelsfalse + \Hy@pdfpagelabelsfalse \Hy@WarningNoLine{% Option `pdfpagelabels' is turned off\MessageBreak because \string\thepage\space is undefined% @@ -6733,7 +6726,6 @@ \fi }% }{} -\@ifpackageloaded{tabularx}{\Hy@hyperfootnotesfalse}{} \ifHy@hyperfootnotes \newcounter{Hfootnote}% \let\H@@footnotetext\@footnotetext @@ -6804,6 +6796,15 @@ \ifhmode\spacefactor\@x@sf\fi \relax }% + \@ifpackageloaded{tabularx}{% + \let\HyOrg@TX@endtabularx\TX@endtabularx + \def\TX@endtabularx{% + \let\@footnotetext\H@@footnotetext + \let\@footnotemark\H@@footnotemark + \let\@mpfootnotetext\H@@mpfootnotetext + \HyOrg@TX@endtabularx + }% + }{}% \@ifpackageloaded{longtable}{% \CheckCommand*{\LT@p@ftntext}[1]{% \edef\@tempa{% @@ -7490,7 +7491,7 @@ }% }% }{} -\ifHy@figures +\ifHy@hyperfigures \let\Hy@Gin@setfile\Gin@setfile \def\Gin@setfile#1#2#3{% \hyperimage{#3}{\Hy@Gin@setfile{#1}{#2}{#3}}% |