diff options
author | Karl Berry <karl@freefriends.org> | 2011-09-29 23:41:46 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2011-09-29 23:41:46 +0000 |
commit | 10fc6c0ec6e0691ba4d017ae0ca44d04a379fbfb (patch) | |
tree | dfe783c60a67ebcc524bccab17b20f38b13d9e40 /Master/texmf-dist/tex | |
parent | 953dbb42038c276aea20982b20d60fface9890d9 (diff) |
hyperref (29sep11)
git-svn-id: svn://tug.org/texlive/trunk@24144 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
20 files changed, 145 insertions, 144 deletions
diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def b/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def index 202b9b9e344..8aa082ca635 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def +++ b/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def @@ -29,11 +29,11 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hdvipdfm.def} - [2011/08/19 v6.82h % + [2011/09/28 v6.82i % Hyperref driver for dvipdfm] \Hy@VersionCheck{hdvipdfm.def} \def\Hy@PutCatalog#1{\@pdfm@mark{docview << #1 >>}} -\ifHy@pagelabels +\ifHy@pdfpagelabels \def\HyPL@StorePageLabel#1{% \if@filesw \begingroup @@ -537,12 +537,12 @@ } \def\PDF@SetupDoc{% \edef\Hy@temp{% - \ifHy@toolbar\else /HideToolbar true\fi - \ifHy@menubar\else /HideMenubar true\fi - \ifHy@windowui\else /HideWindowUI true\fi - \ifHy@fitwindow /FitWindow true\fi - \ifHy@centerwindow /CenterWindow true\fi - \ifHy@displaydoctitle /DisplayDocTitle true\fi + \ifHy@pdftoolbar\else /HideToolbar true\fi + \ifHy@pdfmenubar\else /HideMenubar true\fi + \ifHy@pdfwindowui\else /HideWindowUI true\fi + \ifHy@pdffitwindow /FitWindow true\fi + \ifHy@pdfcenterwindow /CenterWindow true\fi + \ifHy@pdfdisplaydoctitle /DisplayDocTitle true\fi \Hy@UseNameKey{NonFullScreenPageMode}\@pdfnonfullscreenpagemode \Hy@UseNameKey{Direction}\@pdfdirection \Hy@UseNameKey{ViewArea}\@pdfviewarea @@ -1021,7 +1021,7 @@ \expandafter\ifx\csname pdfescapestring\endcsname\relax \let\Hy@escapestring\@firstofone \def\Hy@escapeform#1{% - \ifHy@escapeform + \ifHy@pdfescapeform \def\Hy@escapestring##1{% \noexpand\Hy@escapestring{\noexpand##1}% }% @@ -1051,7 +1051,7 @@ }% \else \def\Hy@escapeform#1{% - \ifHy@escapeform + \ifHy@pdfescapeform \let\Hy@escapestring\pdfescapestring \else \let\Hy@escapestring\@firstofone diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvips.def b/Master/texmf-dist/tex/latex/hyperref/hdvips.def index a7be985cad8..78214a3e53f 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hdvips.def +++ b/Master/texmf-dist/tex/latex/hyperref/hdvips.def @@ -29,7 +29,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hdvips.def} - [2011/08/19 v6.82h % + [2011/09/28 v6.82i % Hyperref driver for dvips] \Hy@VersionCheck{hdvips.def} \providecommand*{\XR@ext}{pdf} diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvipson.def b/Master/texmf-dist/tex/latex/hyperref/hdvipson.def index d79f916a0fa..8f6f54cddc4 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hdvipson.def +++ b/Master/texmf-dist/tex/latex/hyperref/hdvipson.def @@ -29,7 +29,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hdvipson.def} - [2011/08/19 v6.82h % + [2011/09/28 v6.82i % Hyperref driver for dvipsone] \Hy@VersionCheck{hdvipson.def} \providecommand*{\XR@ext}{pdf} @@ -99,12 +99,12 @@ \pdfmark{pdfmark=/PAGES,CropBox=\@pdfpagescrop}% \fi \edef\Hy@temp{% - \ifHy@toolbar\else /HideToolbar true\fi - \ifHy@menubar\else /HideMenubar true\fi - \ifHy@windowui\else /HideWindowUI true\fi - \ifHy@fitwindow /FitWindow true\fi - \ifHy@centerwindow /CenterWindow true\fi - \ifHy@displaydoctitle /DisplayDocTitle true\fi + \ifHy@pdftoolbar\else /HideToolbar true\fi + \ifHy@pdfmenubar\else /HideMenubar true\fi + \ifHy@pdfwindowui\else /HideWindowUI true\fi + \ifHy@pdffitwindow /FitWindow true\fi + \ifHy@pdfcenterwindow /CenterWindow true\fi + \ifHy@pdfdisplaydoctitle /DisplayDocTitle true\fi \Hy@UseNameKey{NonFullScreenPageMode}\@pdfnonfullscreenpagemode \Hy@UseNameKey{Direction}\@pdfdirection \Hy@UseNameKey{ViewArea}\@pdfviewarea diff --git a/Master/texmf-dist/tex/latex/hyperref/hdviwind.def b/Master/texmf-dist/tex/latex/hyperref/hdviwind.def index 31f438b88a3..6f832275009 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hdviwind.def +++ b/Master/texmf-dist/tex/latex/hyperref/hdviwind.def @@ -29,7 +29,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hdviwind.def} - [2011/08/19 v6.82h % + [2011/09/28 v6.82i % Hyperref driver for dviwindo] \Hy@VersionCheck{hdviwind.def} \begingroup @@ -53,7 +53,7 @@ \def\Hy@PutCatalog#1{% \pdfmark{pdfmark=/PUT,Raw={\string{Catalog\string} << #1 >>}}% } -\ifHy@pagelabels +\ifHy@pdfpagelabels \def\HyPL@StorePageLabel#1{% \if@filesw \begingroup @@ -360,12 +360,12 @@ \pdfmark{pdfmark=/PAGES,CropBox=\@pdfpagescrop}% \fi \edef\Hy@temp{% - \ifHy@toolbar\else /HideToolbar true\fi - \ifHy@menubar\else /HideMenubar true\fi - \ifHy@windowui\else /HideWindowUI true\fi - \ifHy@fitwindow /FitWindow true\fi - \ifHy@centerwindow /CenterWindow true\fi - \ifHy@displaydoctitle /DisplayDocTitle true\fi + \ifHy@pdftoolbar\else /HideToolbar true\fi + \ifHy@pdfmenubar\else /HideMenubar true\fi + \ifHy@pdfwindowui\else /HideWindowUI true\fi + \ifHy@pdffitwindow /FitWindow true\fi + \ifHy@pdfcenterwindow /CenterWindow true\fi + \ifHy@pdfdisplaydoctitle /DisplayDocTitle true\fi \Hy@UseNameKey{NonFullScreenPageMode}\@pdfnonfullscreenpagemode \Hy@UseNameKey{Direction}\@pdfdirection \Hy@UseNameKey{ViewArea}\@pdfviewarea diff --git a/Master/texmf-dist/tex/latex/hyperref/hpdftex.def b/Master/texmf-dist/tex/latex/hyperref/hpdftex.def index cf5c862db5d..2468101701b 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hpdftex.def +++ b/Master/texmf-dist/tex/latex/hyperref/hpdftex.def @@ -29,7 +29,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hpdftex.def} - [2011/08/19 v6.82h % + [2011/09/28 v6.82i % Hyperref driver for pdfTeX] \Hy@VersionCheck{hpdftex.def} \pdf@ifdraftmode{% @@ -37,7 +37,7 @@ }{% \let\Hy@PutCatalog\pdfcatalog } -\ifHy@pagelabels +\ifHy@pdfpagelabels \def\HyPL@StorePageLabel#1{% \toks@\expandafter{\HyPL@Labels}% \xdef\HyPL@Labels{% @@ -548,12 +548,12 @@ \fi \fi \edef\Hy@temp{% - \ifHy@toolbar\else /HideToolbar true\fi - \ifHy@menubar\else /HideMenubar true\fi - \ifHy@windowui\else /HideWindowUI true\fi - \ifHy@fitwindow /FitWindow true\fi - \ifHy@centerwindow /CenterWindow true\fi - \ifHy@displaydoctitle /DisplayDocTitle true\fi + \ifHy@pdftoolbar\else /HideToolbar true\fi + \ifHy@pdfmenubar\else /HideMenubar true\fi + \ifHy@pdfwindowui\else /HideWindowUI true\fi + \ifHy@pdffitwindow /FitWindow true\fi + \ifHy@pdfcenterwindow /CenterWindow true\fi + \ifHy@pdfdisplaydoctitle /DisplayDocTitle true\fi \Hy@UseNameKey{NonFullScreenPageMode}\@pdfnonfullscreenpagemode \Hy@UseNameKey{Direction}\@pdfdirection \Hy@UseNameKey{ViewArea}\@pdfviewarea @@ -1185,7 +1185,7 @@ \expandafter\ifx\csname pdfescapestring\endcsname\relax \let\Hy@escapestring\@firstofone \def\Hy@escapeform#1{% - \ifHy@escapeform + \ifHy@pdfescapeform \def\Hy@escapestring##1{% \noexpand\Hy@escapestring{\noexpand##1}% }% @@ -1215,7 +1215,7 @@ }% \else \def\Hy@escapeform#1{% - \ifHy@escapeform + \ifHy@pdfescapeform \let\Hy@escapestring\pdfescapestring \else \let\Hy@escapestring\@firstofone diff --git a/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg b/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg index 25f0c0c8f51..587a197e00a 100644 --- a/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg +++ b/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg @@ -29,7 +29,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{htex4ht.cfg} - [2011/08/19 v6.82h % + [2011/09/28 v6.82i % 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 21579ca59dc..5bc1404d4a8 100644 --- a/Master/texmf-dist/tex/latex/hyperref/htex4ht.def +++ b/Master/texmf-dist/tex/latex/hyperref/htex4ht.def @@ -29,7 +29,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{htex4ht.def} - [2011/08/19 v6.82h % + [2011/09/28 v6.82i % Hyperref driver for TeX4ht] \Hy@VersionCheck{htex4ht.def} \providecommand*{\XR@ext}{html} diff --git a/Master/texmf-dist/tex/latex/hyperref/htexture.def b/Master/texmf-dist/tex/latex/hyperref/htexture.def index fc2327d8e88..eab3b5fc761 100644 --- a/Master/texmf-dist/tex/latex/hyperref/htexture.def +++ b/Master/texmf-dist/tex/latex/hyperref/htexture.def @@ -29,7 +29,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{htexture.def} - [2011/08/19 v6.82h % + [2011/09/28 v6.82i % Hyperref driver for Textures] \Hy@VersionCheck{htexture.def} \providecommand*{\XR@ext}{pdf} diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtex.def b/Master/texmf-dist/tex/latex/hyperref/hvtex.def index 781a1d7035e..448108cfec4 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hvtex.def +++ b/Master/texmf-dist/tex/latex/hyperref/hvtex.def @@ -29,7 +29,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hvtex.def} - [2011/08/19 v6.82h % + [2011/09/28 v6.82i % Hyperref driver for VTeX in PDF/PS mode] \Hy@VersionCheck{hvtex.def} \providecommand*{\XR@ext}{pdf} @@ -63,7 +63,7 @@ }% \fi \endgroup -\ifHy@pagelabels +\ifHy@pdfpagelabels \def\HyPL@StorePageLabel#1{% \toks@\expandafter{\HyPL@Labels}% \xdef\HyPL@Labels{% @@ -254,7 +254,7 @@ \Hy@CleanupFile\Hy@pstringF \special{!% aref <% - \ifnum\Hy@VTeXversion>753 \ifHy@newwindow n\fi\fi + \ifnum\Hy@VTeXversion>753 \ifHy@pdfnewwindow n\fi\fi f=\Hy@pstringF>#3;% a=<% \ifHy@pdfa /F 4\fi @@ -566,12 +566,12 @@ \special{!pdfinfo u=<<</Base (\@baseurl)>>>}% \fi \special{!pdfinfo v=<<<% - \ifHy@toolbar\else /HideToolbar true\fi - \ifHy@menubar\else /HideMenubar true\fi - \ifHy@windowui\else /HideWindowUI true\fi - \ifHy@fitwindow /FitWindow true\fi - \ifHy@centerwindow /CenterWindow true\fi - \ifHy@displaydoctitle /DisplayDocTitle true\fi + \ifHy@pdftoolbar\else /HideToolbar true\fi + \ifHy@pdfmenubar\else /HideMenubar true\fi + \ifHy@pdfwindowui\else /HideWindowUI true\fi + \ifHy@pdffitwindow /FitWindow true\fi + \ifHy@pdfcenterwindow /CenterWindow true\fi + \ifHy@pdfdisplaydoctitle /DisplayDocTitle true\fi \Hy@UseNameKey{NonFullScreenPageMode}\@pdfnonfullscreenpagemode \Hy@UseNameKey{Direction}\@pdfdirection \Hy@UseNameKey{ViewArea}\@pdfviewarea diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def b/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def index 33a33482d3d..de9edfcea74 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def +++ b/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def @@ -29,7 +29,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hvtexhtml.def} - [2011/08/19 v6.82h % + [2011/09/28 v6.82i % Hyperref driver for VTeX in HTML mode] \Hy@VersionCheck{hvtexhtm.def} \providecommand*{\XR@ext}{htm} diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def b/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def index bf5b733cd2d..ae98fb715e3 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def +++ b/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def @@ -29,7 +29,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hvtexmrk.def} - [2011/08/19 v6.82h % + [2011/09/28 v6.82i % Hyperref driver for VTeX in PDF/PS mode (pdfmark specials)] \Hy@VersionCheck{hvtexmrk.def} \providecommand*{\XR@ext}{pdf} diff --git a/Master/texmf-dist/tex/latex/hyperref/hxetex.def b/Master/texmf-dist/tex/latex/hyperref/hxetex.def index 11c499e576c..038fa89ab41 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hxetex.def +++ b/Master/texmf-dist/tex/latex/hyperref/hxetex.def @@ -29,7 +29,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hxetex.def} - [2011/08/19 v6.82h % + [2011/09/28 v6.82i % Hyperref driver for XeTeX] \Hy@VersionCheck{hxetex.def} \HyPsd@LoadUnicode @@ -68,7 +68,7 @@ } \let\HyXeTeX@CheckUnicode\relax \def\Hy@PutCatalog#1{\@pdfm@mark{docview << #1 >>}} -\ifHy@pagelabels +\ifHy@pdfpagelabels \def\HyPL@StorePageLabel#1{% \if@filesw \begingroup @@ -619,12 +619,12 @@ } \def\PDF@SetupDoc{% \edef\Hy@temp{% - \ifHy@toolbar\else /HideToolbar true\fi - \ifHy@menubar\else /HideMenubar true\fi - \ifHy@windowui\else /HideWindowUI true\fi - \ifHy@fitwindow /FitWindow true\fi - \ifHy@centerwindow /CenterWindow true\fi - \ifHy@displaydoctitle /DisplayDocTitle true\fi + \ifHy@pdftoolbar\else /HideToolbar true\fi + \ifHy@pdfmenubar\else /HideMenubar true\fi + \ifHy@pdfwindowui\else /HideWindowUI true\fi + \ifHy@pdffitwindow /FitWindow true\fi + \ifHy@pdfcenterwindow /CenterWindow true\fi + \ifHy@pdfdisplaydoctitle /DisplayDocTitle true\fi \Hy@UseNameKey{NonFullScreenPageMode}\@pdfnonfullscreenpagemode \Hy@UseNameKey{Direction}\@pdfdirection \Hy@UseNameKey{ViewArea}\@pdfviewarea @@ -1083,7 +1083,7 @@ \expandafter\ifx\csname pdfescapestring\endcsname\relax \let\Hy@escapestring\@firstofone \def\Hy@escapeform#1{% - \ifHy@escapeform + \ifHy@pdfescapeform \def\Hy@escapestring##1{% \noexpand\Hy@escapestring{\noexpand##1}% }% @@ -1113,7 +1113,7 @@ }% \else \def\Hy@escapeform#1{% - \ifHy@escapeform + \ifHy@pdfescapeform \let\Hy@escapestring\pdfescapestring \else \let\Hy@escapestring\@firstofone 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}}% diff --git a/Master/texmf-dist/tex/latex/hyperref/hypertex.def b/Master/texmf-dist/tex/latex/hyperref/hypertex.def index 8dabca25b98..1048e2dc475 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hypertex.def +++ b/Master/texmf-dist/tex/latex/hyperref/hypertex.def @@ -29,7 +29,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hypertex.def} - [2011/08/19 v6.82h % + [2011/09/28 v6.82i % Hyperref driver for HyperTeX specials] \Hy@VersionCheck{hypertex.def} \providecommand*{\XR@ext}{dvi} diff --git a/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty b/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty index efd2c3ec171..499d690eaac 100644 --- a/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty +++ b/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty @@ -30,7 +30,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{nohyperref} - [2011/08/19 v6.82h % + [2011/09/28 v6.82i % Dummy hyperref (SR)] \RequirePackage{letltxmacro}[2008/06/13] \let\hyper@@anchor\@gobble diff --git a/Master/texmf-dist/tex/latex/hyperref/pd1enc.def b/Master/texmf-dist/tex/latex/hyperref/pd1enc.def index f5335ebc4df..76b84000c27 100644 --- a/Master/texmf-dist/tex/latex/hyperref/pd1enc.def +++ b/Master/texmf-dist/tex/latex/hyperref/pd1enc.def @@ -29,7 +29,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{pd1enc.def} - [2011/08/19 v6.82h % + [2011/09/28 v6.82i % Hyperref: PDFDocEncoding definition (HO)] \DeclareFontEncoding{PD1}{}{} \DeclareTextAccent{\`}{PD1}{\textasciigrave} diff --git a/Master/texmf-dist/tex/latex/hyperref/pdfmark.def b/Master/texmf-dist/tex/latex/hyperref/pdfmark.def index da541eaed73..df4cc781f13 100644 --- a/Master/texmf-dist/tex/latex/hyperref/pdfmark.def +++ b/Master/texmf-dist/tex/latex/hyperref/pdfmark.def @@ -29,7 +29,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{pdfmark.def} - [2011/08/19 v6.82h % + [2011/09/28 v6.82i % Hyperref definitions for pdfmark specials] \Hy@VersionCheck{pdfmark.def} \begingroup @@ -53,7 +53,7 @@ \def\Hy@PutCatalog#1{% \pdfmark{pdfmark=/PUT,Raw={\string{Catalog\string} << #1 >>}}% } -\ifHy@pagelabels +\ifHy@pdfpagelabels \def\HyPL@StorePageLabel#1{% \if@filesw \begingroup @@ -427,12 +427,12 @@ \pdfmark{pdfmark=/PAGES,CropBox=\@pdfpagescrop}% \fi \edef\Hy@temp{% - \ifHy@toolbar\else /HideToolbar true\fi - \ifHy@menubar\else /HideMenubar true\fi - \ifHy@windowui\else /HideWindowUI true\fi - \ifHy@fitwindow /FitWindow true\fi - \ifHy@centerwindow /CenterWindow true\fi - \ifHy@displaydoctitle /DisplayDocTitle true\fi + \ifHy@pdftoolbar\else /HideToolbar true\fi + \ifHy@pdfmenubar\else /HideMenubar true\fi + \ifHy@pdfwindowui\else /HideWindowUI true\fi + \ifHy@pdffitwindow /FitWindow true\fi + \ifHy@pdfcenterwindow /CenterWindow true\fi + \ifHy@pdfdisplaydoctitle /DisplayDocTitle true\fi \Hy@UseNameKey{NonFullScreenPageMode}\@pdfnonfullscreenpagemode \Hy@UseNameKey{Direction}\@pdfdirection \Hy@UseNameKey{ViewArea}\@pdfviewarea @@ -1230,7 +1230,7 @@ \expandafter\ifx\csname pdfescapestring\endcsname\relax \let\Hy@escapestring\@firstofone \def\Hy@escapeform#1{% - \ifHy@escapeform + \ifHy@pdfescapeform \def\Hy@escapestring##1{% \noexpand\Hy@escapestring{\noexpand##1}% }% @@ -1260,7 +1260,7 @@ }% \else \def\Hy@escapeform#1{% - \ifHy@escapeform + \ifHy@pdfescapeform \let\Hy@escapestring\pdfescapestring \else \let\Hy@escapestring\@firstofone diff --git a/Master/texmf-dist/tex/latex/hyperref/puarenc.def b/Master/texmf-dist/tex/latex/hyperref/puarenc.def index 170df2da7f5..000cb86ffc6 100644 --- a/Master/texmf-dist/tex/latex/hyperref/puarenc.def +++ b/Master/texmf-dist/tex/latex/hyperref/puarenc.def @@ -29,7 +29,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{puarenc.def} - [2011/08/19 v6.82h % + [2011/09/28 v6.82i % 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 779fe19d59b..91e8e1e8372 100644 --- a/Master/texmf-dist/tex/latex/hyperref/puenc.def +++ b/Master/texmf-dist/tex/latex/hyperref/puenc.def @@ -29,7 +29,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{puenc.def} - [2011/08/19 v6.82h % + [2011/09/28 v6.82i % Hyperref: PDF Unicode definition (HO)] \DeclareFontEncoding{PU}{}{} \DeclareTextCommand{\`}{PU}[1]{#1\83\000}% U+0300 diff --git a/Master/texmf-dist/tex/latex/hyperref/puvnenc.def b/Master/texmf-dist/tex/latex/hyperref/puvnenc.def index ecf087b368f..143e3b4f926 100644 --- a/Master/texmf-dist/tex/latex/hyperref/puvnenc.def +++ b/Master/texmf-dist/tex/latex/hyperref/puvnenc.def @@ -29,7 +29,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{puvnenc.def} - [2011/08/19 v6.82h % + [2011/09/28 v6.82i % Hyperref: Additions to puenc.def for VnTeX] \DeclareTextCommand{\abreve}{PU}{\81\003} \DeclareTextCommand{\acircumflex}{PU}{\80\342} |