From c74d9648abb6877ccf4c69fdd39bb8d3763574bf Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 23 Aug 2012 22:38:37 +0000 Subject: hyperref (23aug12) git-svn-id: svn://tug.org/texlive/trunk@27508 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def | 17 ++- Master/texmf-dist/tex/latex/hyperref/hdvips.def | 2 +- Master/texmf-dist/tex/latex/hyperref/hdvipson.def | 2 +- Master/texmf-dist/tex/latex/hyperref/hdviwind.def | 2 +- Master/texmf-dist/tex/latex/hyperref/hpdftex.def | 49 +++++++- Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg | 2 +- Master/texmf-dist/tex/latex/hyperref/htex4ht.def | 2 +- Master/texmf-dist/tex/latex/hyperref/htexture.def | 2 +- Master/texmf-dist/tex/latex/hyperref/hvtex.def | 2 +- Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def | 2 +- Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def | 2 +- Master/texmf-dist/tex/latex/hyperref/hxetex.def | 17 ++- Master/texmf-dist/tex/latex/hyperref/hyperref.sty | 124 +++++++++++---------- Master/texmf-dist/tex/latex/hyperref/hypertex.def | 2 +- .../texmf-dist/tex/latex/hyperref/nohyperref.sty | 2 +- Master/texmf-dist/tex/latex/hyperref/pd1enc.def | 2 +- Master/texmf-dist/tex/latex/hyperref/pdfmark.def | 17 ++- Master/texmf-dist/tex/latex/hyperref/psdextra.def | 2 +- Master/texmf-dist/tex/latex/hyperref/puarenc.def | 2 +- Master/texmf-dist/tex/latex/hyperref/puenc.def | 2 +- Master/texmf-dist/tex/latex/hyperref/puvnenc.def | 2 +- 21 files changed, 163 insertions(+), 93 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def b/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def index ed9dc0194bd..ed8ea53d910 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def +++ b/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def @@ -29,7 +29,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hdvipdfm.def} - [2012/08/18 v6.83b % + [2012/08/21 v6.83c % Hyperref driver for dvipdfm] \Hy@VersionCheck{hdvipdfm.def} \def\Hy@PutCatalog#1{\@pdfm@mark{docview << #1 >>}} @@ -694,6 +694,7 @@ \def\HyField@TheAnnotCount{% \the\HyField@AnnotCount } +\def\Fld@pageobjref{/P @thispage}% \def\@TextField[#1]#2{% parameters, label \def\Fld@name{#2}% \let\Fld@default\ltx@empty @@ -1020,8 +1021,9 @@ }% \global\let\Hy@FormObjects\relax } +\providecommand*{\Fld@pageobjref}{} \begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname pdfescapestring\endcsname\relax +\expandafter\ifx\csname pdf@escapestring\endcsname\relax \let\Hy@escapestring\@firstofone \def\Hy@escapeform#1{% \ifHy@pdfescapeform @@ -1150,6 +1152,7 @@ \def\PDFForm@Check{% /Subtype/Widget% \Fld@annotflags + \Fld@pageobjref \Fld@annotnames /FT/Btn% \Fld@flags @@ -1173,7 +1176,7 @@ /DA(/ZaDb \strip@pt\Fld@charsize\space Tf% \ifx\Fld@color\@empty\else\space\Fld@color\fi)% /H/P% - \ifFld@checked /V/Yes\else /V/Off\fi + \ifFld@checked /V/Yes/AS/Yes\else /V/Off/AS/Off\fi \Fld@additionalactions } \ifHy@pdfa @@ -1181,6 +1184,7 @@ \def\PDFForm@Push{% /Subtype/Widget% \Fld@annotflags + \Fld@pageobjref \Fld@annotnames /FT/Btn% \Fld@flags @@ -1208,6 +1212,7 @@ \def\PDFForm@List{% /Subtype/Widget% \Fld@annotflags + \Fld@pageobjref \Fld@annotnames /FT/Ch% \Fld@flags @@ -1241,6 +1246,7 @@ \def\PDFForm@Radio{% /Subtype/Widget% \Fld@annotflags + \Fld@pageobjref \Fld@annotnames /FT/Btn% \Fld@flags @@ -1259,7 +1265,7 @@ \else /BG[\Fld@bcolor]% \fi - /CA(\Fld@radiosymbol)% + /CA(\Hy@escapestring{\Fld@radiosymbol})% >>% /DA(/ZaDb \strip@pt\Fld@charsize\space Tf% \ifx\Fld@color\@empty\else\space\Fld@color\fi)% @@ -1275,6 +1281,7 @@ \def\PDFForm@Text{% /Subtype/Widget% \Fld@annotflags + \Fld@pageobjref \Fld@annotnames /FT/Tx% \Fld@flags @@ -1310,6 +1317,7 @@ \def\PDFForm@Submit{% /Subtype/Widget% \Fld@annotflags + \Fld@pageobjref \Fld@annotnames /FT/Btn% \Fld@flags @@ -1345,6 +1353,7 @@ \def\PDFForm@Reset{% /Subtype/Widget% \Fld@annotflags + \Fld@pageobjref \Fld@annotnames /FT/Btn% \Fld@flags diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvips.def b/Master/texmf-dist/tex/latex/hyperref/hdvips.def index a3aec4555ec..f4c89c96cd5 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} - [2012/08/18 v6.83b % + [2012/08/21 v6.83c % 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 f6a7f763ac7..c609a5b1d41 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} - [2012/08/18 v6.83b % + [2012/08/21 v6.83c % Hyperref driver for dvipsone] \Hy@VersionCheck{hdvipson.def} \providecommand*{\XR@ext}{pdf} diff --git a/Master/texmf-dist/tex/latex/hyperref/hdviwind.def b/Master/texmf-dist/tex/latex/hyperref/hdviwind.def index d09a5a72cc3..f81b774eefe 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} - [2012/08/18 v6.83b % + [2012/08/21 v6.83c % Hyperref driver for dviwindo] \Hy@VersionCheck{hdviwind.def} \begingroup diff --git a/Master/texmf-dist/tex/latex/hyperref/hpdftex.def b/Master/texmf-dist/tex/latex/hyperref/hpdftex.def index 9470923ad4d..69139479d48 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} - [2012/08/18 v6.83b % + [2012/08/21 v6.83c % Hyperref driver for pdfTeX] \Hy@VersionCheck{hpdftex.def} \pdf@ifdraftmode{% @@ -969,6 +969,32 @@ }{SubmitP}% } \let\@endForm\ltx@empty +\let\HyAnn@AbsPageLabel\ltx@empty +\let\Fld@pageobjref\ltx@empty +\ltx@IfUndefined{pdfpageref}{% +}{% + \ltx@ifpackageloaded{zref-abspage}{% + \newcount\HyAnn@Count + \HyAnn@Count=\ltx@zero + \def\HyAnn@AbsPageLabel{% + \global\advance\HyAnn@Count by\ltx@one + \zref@labelbyprops{HyAnn@\the\HyAnn@Count}{abspage}% + \zref@refused{HyAnn@\the\HyAnn@Count}% + }% + \def\Fld@pageobjref{% + \zref@ifrefundefined{HyAnn@\the\HyAnn@Count}{% + }{% + \zref@ifrefcontainsprop{HyAnn@\the\HyAnn@Count}{abspage}{% + /P \pdfpageref + \zref@extractdefault{HyAnn@\the\HyAnn@Count}{abspage}{1} % + \space 0 R% + }{% + }% + }% + }% + }{% + }% +} \def\@TextField[#1]#2{% parameters, label \def\Fld@name{#2}% \let\Fld@default\ltx@empty @@ -991,6 +1017,7 @@ \ifx\Fld@value\@empty\def\Fld@value{\Fld@default}\fi \LayoutTextField{#2}{% \leavevmode + \HyAnn@AbsPageLabel \Hy@escapeform\PDFForm@Text \pdfstartlink user {\PDFForm@Text}\relax \MakeTextField{\Fld@width}{\Fld@height}\pdfendlink @@ -1076,6 +1103,7 @@ \Hy@StepCount\Fld@listcount \@currDisplay\space \leavevmode + \HyAnn@AbsPageLabel \Hy@escapeform\PDFForm@Radio \pdfstartlink user {% \PDFForm@Radio @@ -1097,6 +1125,7 @@ \def\@@Listbox#1{% \HyField@PDFChoices{#1}% \leavevmode + \HyAnn@AbsPageLabel \Hy@escapeform\PDFForm@List \pdfstartlink user {\PDFForm@List}\relax \MakeChoiceField{\Fld@width}{\Fld@height}% @@ -1123,6 +1152,7 @@ \ifFld@hidden\def\Fld@width{1sp}\fi \LayoutPushButtonField{% \leavevmode + \HyAnn@AbsPageLabel \Hy@escapeform\PDFForm@Push \pdfstartlink user {\PDFForm@Push}\relax \MakeButtonField{#2}% @@ -1143,6 +1173,7 @@ \HyField@FlagsSubmit \ifFld@hidden\def\Fld@width{1sp}\fi \leavevmode + \HyAnn@AbsPageLabel \Hy@escapeform\PDFForm@Submit \pdfstartlink user {% \PDFForm@Submit @@ -1170,6 +1201,7 @@ \else \HyField@FlagsPushButton \ifFld@hidden\def\Fld@width{1sp}\fi + \HyAnn@AbsPageLabel \Hy@escapeform\PDFForm@Reset \pdfstartlink user {\PDFForm@Reset}\relax \MakeButtonField{#2}% @@ -1192,6 +1224,7 @@ \ifFld@hidden\def\Fld@width{1sp}\fi \LayoutCheckField{#2}{% \leavevmode + \HyAnn@AbsPageLabel \Hy@escapeform\PDFForm@Check \pdfstartlink user {\PDFForm@Check}\relax \MakeCheckField{\Fld@width}{\Fld@height}% @@ -1256,8 +1289,9 @@ \xdef\OBJ@Helv{\the\pdflastobj}% \global\let\Hy@FormObjects\relax } +\providecommand*{\Fld@pageobjref}{} \begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname pdfescapestring\endcsname\relax +\expandafter\ifx\csname pdf@escapestring\endcsname\relax \let\Hy@escapestring\@firstofone \def\Hy@escapeform#1{% \ifHy@pdfescapeform @@ -1386,6 +1420,7 @@ \def\PDFForm@Check{% /Subtype/Widget% \Fld@annotflags + \Fld@pageobjref \Fld@annotnames /FT/Btn% \Fld@flags @@ -1409,7 +1444,7 @@ /DA(/ZaDb \strip@pt\Fld@charsize\space Tf% \ifx\Fld@color\@empty\else\space\Fld@color\fi)% /H/P% - \ifFld@checked /V/Yes\else /V/Off\fi + \ifFld@checked /V/Yes/AS/Yes\else /V/Off/AS/Off\fi \Fld@additionalactions } \ifHy@pdfa @@ -1417,6 +1452,7 @@ \def\PDFForm@Push{% /Subtype/Widget% \Fld@annotflags + \Fld@pageobjref \Fld@annotnames /FT/Btn% \Fld@flags @@ -1444,6 +1480,7 @@ \def\PDFForm@List{% /Subtype/Widget% \Fld@annotflags + \Fld@pageobjref \Fld@annotnames /FT/Ch% \Fld@flags @@ -1477,6 +1514,7 @@ \def\PDFForm@Radio{% /Subtype/Widget% \Fld@annotflags + \Fld@pageobjref \Fld@annotnames /FT/Btn% \Fld@flags @@ -1495,7 +1533,7 @@ \else /BG[\Fld@bcolor]% \fi - /CA(\Fld@radiosymbol)% + /CA(\Hy@escapestring{\Fld@radiosymbol})% >>% /DA(/ZaDb \strip@pt\Fld@charsize\space Tf% \ifx\Fld@color\@empty\else\space\Fld@color\fi)% @@ -1511,6 +1549,7 @@ \def\PDFForm@Text{% /Subtype/Widget% \Fld@annotflags + \Fld@pageobjref \Fld@annotnames /FT/Tx% \Fld@flags @@ -1546,6 +1585,7 @@ \def\PDFForm@Submit{% /Subtype/Widget% \Fld@annotflags + \Fld@pageobjref \Fld@annotnames /FT/Btn% \Fld@flags @@ -1581,6 +1621,7 @@ \def\PDFForm@Reset{% /Subtype/Widget% \Fld@annotflags + \Fld@pageobjref \Fld@annotnames /FT/Btn% \Fld@flags diff --git a/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg b/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg index 614e18a8226..333e36098e1 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} - [2012/08/18 v6.83b % + [2012/08/21 v6.83c % 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 ce12e8a20f7..e9dcd851c75 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} - [2012/08/18 v6.83b % + [2012/08/21 v6.83c % 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 2df1c217e4d..6727a1886d2 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} - [2012/08/18 v6.83b % + [2012/08/21 v6.83c % 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 c02d81aff22..35c9b4c72d2 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} - [2012/08/18 v6.83b % + [2012/08/21 v6.83c % Hyperref driver for VTeX in PDF/PS mode] \Hy@VersionCheck{hvtex.def} \providecommand*{\XR@ext}{pdf} diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def b/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def index ff5e3f4ac4b..f9f64dd6cfb 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} - [2012/08/18 v6.83b % + [2012/08/21 v6.83c % 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 23ee561b0cc..492355703f9 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} - [2012/08/18 v6.83b % + [2012/08/21 v6.83c % 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 92fcede83d9..f9433a88b27 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} - [2012/08/18 v6.83b % + [2012/08/21 v6.83c % Hyperref driver for XeTeX] \Hy@VersionCheck{hxetex.def} \HyPsd@LoadUnicode @@ -756,6 +756,7 @@ \def\HyField@TheAnnotCount{% \the\HyField@AnnotCount } +\def\Fld@pageobjref{/P @thispage}% \def\@TextField[#1]#2{% parameters, label \def\Fld@name{#2}% \let\Fld@default\ltx@empty @@ -1082,8 +1083,9 @@ }% \global\let\Hy@FormObjects\relax } +\providecommand*{\Fld@pageobjref}{} \begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname pdfescapestring\endcsname\relax +\expandafter\ifx\csname pdf@escapestring\endcsname\relax \let\Hy@escapestring\@firstofone \def\Hy@escapeform#1{% \ifHy@pdfescapeform @@ -1212,6 +1214,7 @@ \def\PDFForm@Check{% /Subtype/Widget% \Fld@annotflags + \Fld@pageobjref \Fld@annotnames /FT/Btn% \Fld@flags @@ -1235,7 +1238,7 @@ /DA(/ZaDb \strip@pt\Fld@charsize\space Tf% \ifx\Fld@color\@empty\else\space\Fld@color\fi)% /H/P% - \ifFld@checked /V/Yes\else /V/Off\fi + \ifFld@checked /V/Yes/AS/Yes\else /V/Off/AS/Off\fi \Fld@additionalactions } \ifHy@pdfa @@ -1243,6 +1246,7 @@ \def\PDFForm@Push{% /Subtype/Widget% \Fld@annotflags + \Fld@pageobjref \Fld@annotnames /FT/Btn% \Fld@flags @@ -1270,6 +1274,7 @@ \def\PDFForm@List{% /Subtype/Widget% \Fld@annotflags + \Fld@pageobjref \Fld@annotnames /FT/Ch% \Fld@flags @@ -1303,6 +1308,7 @@ \def\PDFForm@Radio{% /Subtype/Widget% \Fld@annotflags + \Fld@pageobjref \Fld@annotnames /FT/Btn% \Fld@flags @@ -1321,7 +1327,7 @@ \else /BG[\Fld@bcolor]% \fi - /CA(\Fld@radiosymbol)% + /CA(\Hy@escapestring{\Fld@radiosymbol})% >>% /DA(/ZaDb \strip@pt\Fld@charsize\space Tf% \ifx\Fld@color\@empty\else\space\Fld@color\fi)% @@ -1337,6 +1343,7 @@ \def\PDFForm@Text{% /Subtype/Widget% \Fld@annotflags + \Fld@pageobjref \Fld@annotnames /FT/Tx% \Fld@flags @@ -1372,6 +1379,7 @@ \def\PDFForm@Submit{% /Subtype/Widget% \Fld@annotflags + \Fld@pageobjref \Fld@annotnames /FT/Btn% \Fld@flags @@ -1407,6 +1415,7 @@ \def\PDFForm@Reset{% /Subtype/Widget% \Fld@annotflags + \Fld@pageobjref \Fld@annotnames /FT/Btn% \Fld@flags diff --git a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty index 72f4d947935..0344cb8e09c 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} - [2012/08/18 v6.83b % + [2012/08/21 v6.83c % Hypertext links for LaTeX] \begingroup \@makeother\`% @@ -1793,69 +1793,71 @@ \def\HyPsd@@AppendItalcorr#1#2{% \expandafter\def\expandafter#2\expandafter{#2#1}% } -\catcode`\Q=\active -\let Q\ltx@empty -\def\HyPsd@CheckCatcodes#1#2\HyPsd@End{% - \global\let\HyPsd@Rest\relax - \ifcat\relax\noexpand#1\relax - \ifx#1\protect - \else - \ifx#1\penalty - \setbox\z@=\hbox{% - \afterassignment\HyPsd@AfterCountRemove - \count@=#2\HyPsd@End - }% +\begingroup + \catcode`\Q=\active + \let Q\ltx@empty + \gdef\HyPsd@CheckCatcodes#1#2\HyPsd@End{% + \global\let\HyPsd@Rest\relax + \ifcat\relax\noexpand#1\relax + \ifx#1\protect \else - \ifx#1\kern + \ifx#1\penalty \setbox\z@=\hbox{% - \afterassignment\HyPsd@AfterDimenRemove - \dimen@=#2\HyPsd@End + \afterassignment\HyPsd@AfterCountRemove + \count@=#2\HyPsd@End }% \else - \ifx#1\hskip + \ifx#1\kern \setbox\z@=\hbox{% - \afterassignment\HyPsd@AfterSkipRemove - \skip@=#2\HyPsd@End + \afterassignment\HyPsd@AfterDimenRemove + \dimen@=#2\HyPsd@End }% \else - \HyPsd@CatcodeWarning{#1}% + \ifx#1\hskip + \setbox\z@=\hbox{% + \afterassignment\HyPsd@AfterSkipRemove + \skip@=#2\HyPsd@End + }% + \else + \HyPsd@CatcodeWarning{#1}% + \fi \fi \fi \fi - \fi - \else - \ifcat\noexpand#1\noexpandQ% active character - \expandafter\expandafter\expandafter\def - \expandafter\expandafter\expandafter\HyPsd@String - \expandafter\expandafter\expandafter{% - \expandafter\HyPsd@String\string#1% - }% \else - \ifcat#1A% letter - \expandafter\def\expandafter\HyPsd@String\expandafter{% - \HyPsd@String#1% + \ifcat\noexpand#1\noexpandQ% active character + \expandafter\expandafter\expandafter\def + \expandafter\expandafter\expandafter\HyPsd@String + \expandafter\expandafter\expandafter{% + \expandafter\HyPsd@String\string#1% }% \else - \ifcat#1 % SPACE + \ifcat#1A% letter \expandafter\def\expandafter\HyPsd@String\expandafter{% - \HyPsd@String\HyPsd@SPACEOPTI + \HyPsd@String#1% }% \else - \ifcat$#1% - \HyPsd@CatcodeWarning{math shift}% + \ifcat#1 % SPACE + \expandafter\def\expandafter\HyPsd@String\expandafter{% + \HyPsd@String\HyPsd@SPACEOPTI + }% \else - \ifcat% - \HyPsd@CatcodeWarning{alignment tab}% + \ifcat$#1% + \HyPsd@CatcodeWarning{math shift}% \else - \ifcat^#1% - \HyPsd@CatcodeWarning{superscript}% + \ifcat% + \HyPsd@CatcodeWarning{alignment tab}% \else - \ifcat_#1% - \HyPsd@CatcodeWarning{subscript}% + \ifcat^#1% + \HyPsd@CatcodeWarning{superscript}% \else - \expandafter\def\expandafter\HyPsd@String\expandafter{% - \HyPsd@String#1% - }% + \ifcat_#1% + \HyPsd@CatcodeWarning{subscript}% + \else + \expandafter\def\expandafter\HyPsd@String\expandafter{% + \HyPsd@String#1% + }% + \fi \fi \fi \fi @@ -1863,25 +1865,24 @@ \fi \fi \fi - \fi - \ifx\HyPsd@Rest\relax - \ifx\scrollmode#2\scrollmode - \else - \Hy@ReturnAfterFiFiEnd{% - \HyPsd@CheckCatcodes#2\HyPsd@End - }% - \fi - \else - \ifx\HyPsd@Rest\@empty + \ifx\HyPsd@Rest\relax + \ifx\scrollmode#2\scrollmode + \else + \Hy@ReturnAfterFiFiEnd{% + \HyPsd@CheckCatcodes#2\HyPsd@End + }% + \fi \else - \Hy@ReturnAfterFiFiEnd{% - \expandafter\HyPsd@CheckCatcodes\HyPsd@Rest\HyPsd@End - }% + \ifx\HyPsd@Rest\@empty + \else + \Hy@ReturnAfterFiFiEnd{% + \expandafter\HyPsd@CheckCatcodes\HyPsd@Rest\HyPsd@End + }% + \fi \fi - \fi - \Hy@ReturnEnd -} -\catcode`\Q=11 % + \Hy@ReturnEnd + }% +\endgroup \def\HyPsd@AfterCountRemove#1\HyPsd@End{% \gdef\HyPsd@Rest{#1}% } @@ -6237,6 +6238,7 @@ \def\@starttoc#1{% \begingroup \makeatletter + \ltx@ifpackageloaded{parskip}{\parskip\z@}{}% \IfFileExists{\jobname.#1}{% \Hy@WarningNoLine{% old #1 file detected, not used; run LaTeX again% diff --git a/Master/texmf-dist/tex/latex/hyperref/hypertex.def b/Master/texmf-dist/tex/latex/hyperref/hypertex.def index 00669c95f7d..eec35c9d475 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} - [2012/08/18 v6.83b % + [2012/08/21 v6.83c % 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 842c70fd9bd..1beedebb991 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} - [2012/08/18 v6.83b % + [2012/08/21 v6.83c % 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 02e4e48083f..f9ea8522d7b 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} - [2012/08/18 v6.83b % + [2012/08/21 v6.83c % 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 f0b61b70793..3af2216a9ea 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} - [2012/08/18 v6.83b % + [2012/08/21 v6.83c % Hyperref definitions for pdfmark specials] \Hy@VersionCheck{pdfmark.def} \begingroup @@ -1022,6 +1022,7 @@ \def\@Gauge[#1]#2#3#4{% parameters, label, minimum, maximum \Hy@Message{Sorry, pdfmark drivers do not support FORM gauges}% } +\edef\Fld@pageobjref{/P\string{ThisPage\string}} \def\@TextField[#1]#2{% parameters, label \def\Fld@name{#2}% \let\Fld@default\ltx@empty @@ -1230,8 +1231,9 @@ }% \endgroup } +\providecommand*{\Fld@pageobjref}{} \begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname pdfescapestring\endcsname\relax +\expandafter\ifx\csname pdf@escapestring\endcsname\relax \let\Hy@escapestring\@firstofone \def\Hy@escapeform#1{% \ifHy@pdfescapeform @@ -1360,6 +1362,7 @@ \def\PDFForm@Check{% /Subtype/Widget% \Fld@annotflags + \Fld@pageobjref \Fld@annotnames /FT/Btn% \Fld@flags @@ -1383,7 +1386,7 @@ /DA(/ZaDb \strip@pt\Fld@charsize\space Tf% \ifx\Fld@color\@empty\else\space\Fld@color\fi)% /H/P% - \ifFld@checked /V/Yes\else /V/Off\fi + \ifFld@checked /V/Yes/AS/Yes\else /V/Off/AS/Off\fi \Fld@additionalactions } \ifHy@pdfa @@ -1391,6 +1394,7 @@ \def\PDFForm@Push{% /Subtype/Widget% \Fld@annotflags + \Fld@pageobjref \Fld@annotnames /FT/Btn% \Fld@flags @@ -1418,6 +1422,7 @@ \def\PDFForm@List{% /Subtype/Widget% \Fld@annotflags + \Fld@pageobjref \Fld@annotnames /FT/Ch% \Fld@flags @@ -1451,6 +1456,7 @@ \def\PDFForm@Radio{% /Subtype/Widget% \Fld@annotflags + \Fld@pageobjref \Fld@annotnames /FT/Btn% \Fld@flags @@ -1469,7 +1475,7 @@ \else /BG[\Fld@bcolor]% \fi - /CA(\Fld@radiosymbol)% + /CA(\Hy@escapestring{\Fld@radiosymbol})% >>% /DA(/ZaDb \strip@pt\Fld@charsize\space Tf% \ifx\Fld@color\@empty\else\space\Fld@color\fi)% @@ -1485,6 +1491,7 @@ \def\PDFForm@Text{% /Subtype/Widget% \Fld@annotflags + \Fld@pageobjref \Fld@annotnames /FT/Tx% \Fld@flags @@ -1520,6 +1527,7 @@ \def\PDFForm@Submit{% /Subtype/Widget% \Fld@annotflags + \Fld@pageobjref \Fld@annotnames /FT/Btn% \Fld@flags @@ -1555,6 +1563,7 @@ \def\PDFForm@Reset{% /Subtype/Widget% \Fld@annotflags + \Fld@pageobjref \Fld@annotnames /FT/Btn% \Fld@flags diff --git a/Master/texmf-dist/tex/latex/hyperref/psdextra.def b/Master/texmf-dist/tex/latex/hyperref/psdextra.def index e31f5c32c97..a8fc275d8b2 100644 --- a/Master/texmf-dist/tex/latex/hyperref/psdextra.def +++ b/Master/texmf-dist/tex/latex/hyperref/psdextra.def @@ -29,7 +29,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{psdextra.def} - [2012/08/18 v6.83b % + [2012/08/21 v6.83c % Hyperref: Additions to PDF string support] \Hy@VersionCheck{psdextra.def} \newcommand*{\psdmapshortnames}{% diff --git a/Master/texmf-dist/tex/latex/hyperref/puarenc.def b/Master/texmf-dist/tex/latex/hyperref/puarenc.def index e69382abae4..b3489476576 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} - [2012/08/18 v6.83b % + [2012/08/21 v6.83c % Hyperref: Additions to puenc.def for Arabi] \DeclareTextCommand{\hamza}{PU}{\86\041}% U+0621 \DeclareTextCommand{\alefmadda}{PU}{\86\042}% U+0622 diff --git a/Master/texmf-dist/tex/latex/hyperref/puenc.def b/Master/texmf-dist/tex/latex/hyperref/puenc.def index 52846bc85dd..66f24619e8d 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} - [2012/08/18 v6.83b % + [2012/08/21 v6.83c % 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 e39e27cf8d9..23402d1a527 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} - [2012/08/18 v6.83b % + [2012/08/21 v6.83c % Hyperref: Additions to puenc.def for VnTeX] \DeclareTextCommand{\abreve}{PU}{\81\003}% U+0103 \DeclareTextCommand{\acircumflex}{PU}{\80\342}% U+00E2 -- cgit v1.2.3