From 160d4e9edc8db0aa14b4865744b6fca79846d78b Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 25 Nov 2010 23:32:40 +0000 Subject: hyperref (25nov10) git-svn-id: svn://tug.org/texlive/trunk@20566 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/hyperref/ChangeLog | 6 + Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf | Bin 323380 -> 323701 bytes Master/texmf-dist/doc/latex/hyperref/backref.pdf | 4 +- Master/texmf-dist/doc/latex/hyperref/hyperref.pdf | Bin 3696871 -> 3709922 bytes Master/texmf-dist/doc/latex/hyperref/nameref.pdf | 5 +- .../texmf-dist/source/latex/hyperref/hyperref.dtx | 335 +++++++++++++-------- Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def | 7 +- 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 | 12 +- Master/texmf-dist/tex/latex/hyperref/hpdftex.def | 249 +++++++-------- 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 | 3 +- 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 | 7 +- Master/texmf-dist/tex/latex/hyperref/hyperref.sty | 56 +++- 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 | 23 +- 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 +- 26 files changed, 446 insertions(+), 287 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/hyperref/ChangeLog b/Master/texmf-dist/doc/latex/hyperref/ChangeLog index c7fd8b5f3d0..8de73dbf347 100644 --- a/Master/texmf-dist/doc/latex/hyperref/ChangeLog +++ b/Master/texmf-dist/doc/latex/hyperref/ChangeLog @@ -1,3 +1,9 @@ +2010-11-22 6.81u Heiko Oberdiek + * 6.81u + * Driver hpdftex.def: Use of \pdfdraftmode. + * Driver pdfmark.def: Math mode respected in links. + * Some unnecessary code removed in \LT@p@ftntext (GL). + 2010-10-30 6.81t Heiko Oberdiek * 6.81t * Radio buttons: small fix, escaping values and adding /DV. diff --git a/Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf b/Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf index 4fd4aeb5a4e..d584b468d3e 100644 Binary files a/Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf and b/Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf differ diff --git a/Master/texmf-dist/doc/latex/hyperref/backref.pdf b/Master/texmf-dist/doc/latex/hyperref/backref.pdf index ca212ccef58..258d4ea020c 100644 --- a/Master/texmf-dist/doc/latex/hyperref/backref.pdf +++ b/Master/texmf-dist/doc/latex/hyperref/backref.pdf @@ -10,7 +10,7 @@ endobj endobj 5 0 obj<> endobj -6 0 obj<> +6 0 obj<> endobj 7 0 obj<> endobj @@ -3899,7 +3899,7 @@ endobj endobj 1477 0 obj<> endobj -1478 0 obj<>/Info 6 0 R/DecodeParms<>/Size 1479/Length 1078>>stream +1478 0 obj<>/Info 6 0 R/DecodeParms<>/Size 1479/Length 1078>>stream xڽXMlMAGņ і&TIKh J{>I %(j"% ?D$vb#;j#!!T|͹j;s̙3g~1 C0^4 &J-QA;"X9B>;_hv> endobj -6 0 obj<> +6 0 obj<> endobj 7 0 obj<> endobj @@ -3775,8 +3775,7 @@ endobj endobj 1411 0 obj<> endobj -1412 0 obj<>/Info 6 0 R/DecodeParms<>/Size 1413/Length 1022>>stream +1412 0 obj<)]/Compress<>/Info 6 0 R/DecodeParms<>/Size 1413/Length 1022>>stream xڽXoMAT*,BiRTJ|DhGЅ ‚ZՏ H,l|$""Bkw}o:w~j̙3gΙ;W0cs!& Y6grgi%;f?amQw8\ >p|u+!,_QY 06~em=S(o@=3^!]n-`!{`:Ҧq m-݆p!`U.1%+c@qK|3qs \O$&&_ Xr`O)Eϫ)w^97y˶+>lT n!$o/o0&^.|[u0a/C60R'8LҹЗMlj-0W&hIM)ʚ^95Voڒok7LGɖ]ȷx0!Iz#7\>!?u8_wrjM ?l2/|o)(J]^Gi}m|ꪙ[;XO(GLvvBn7BղS)YSHXq:4ԩ0_j9ҟZTk>i^qR`UK9 X$X#6Cnԭ.f ͅJOZpp-M#b!Bk^f+; 9VVj diff --git a/Master/texmf-dist/source/latex/hyperref/hyperref.dtx b/Master/texmf-dist/source/latex/hyperref/hyperref.dtx index 9c9a690c4f8..6ec0881f8da 100644 --- a/Master/texmf-dist/source/latex/hyperref/hyperref.dtx +++ b/Master/texmf-dist/source/latex/hyperref/hyperref.dtx @@ -44,7 +44,7 @@ %\ProvidesFile{puenc.def} %\ProvidesFile{puvnenc.def} %\ProvidesFile{puarenc.def} -% [2010/10/30 v6.81t +% [2010/11/22 v6.81u % % Hypertext links for LaTeX] % Dummy hyperref (SR)] % Hyperref documentation driver file] @@ -139,7 +139,7 @@ \end{document} % % \fi -% \CheckSum{27991} +% \CheckSum{28073} % % \MakeShortVerb{|} % \StopEventually{} @@ -598,11 +598,31 @@ } % \end{macrocode} % \begin{macrocode} +\RequirePackage{ifpdf}[2006/02/20] +\RequirePackage{pdftexcmds}[2009/04/10] +\@ifpackagelater{pdftexcmds}{2010/11/04}{}{% + \ltx@IfUndefined{pdfdraftmode}{% + \let\pdf@ifdraftmode\ltx@secondoftwo + }{% + \ifpdf + \def\pdf@ifdraftmode{% + \ifnum\pdf@draftmode=\ltx@one + \expandafter\ltx@firstoftwo + \else + \expandafter\ltx@secondoftwo + \fi + }% + \else + \let\pdf@ifdraftmode\ltx@secondoftwo + \fi + }% +} +% \end{macrocode} +% \begin{macrocode} \RequirePackage{infwarerr}[2010/04/08] \RequirePackage{keyval}[1997/11/10] \RequirePackage{kvsetkeys}[2007/09/29] \RequirePackage{pdfescape}[2007/11/11] -\RequirePackage{ifpdf}[2006/02/20] \RequirePackage{ifvtex} \RequirePackage{ifxetex}[2006/08/21] \RequirePackage{hycolor} @@ -2190,7 +2210,6 @@ \let\HyOrg@languageshorthands\languageshorthands \let\languageshorthands\HyPsd@LanguageShorthands } -\RequirePackage{pdftexcmds}[2009/04/10] \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname pdf@strcmp\endcsname\relax \let\HyPsd@langshort@system\@empty @@ -7002,8 +7021,8 @@ \Hy@AtBeginDocument{% \ifHy@texht \else - \Hy@CatcodeWrapper{% - \ReadBookmarks + \pdf@ifdraftmode{}{% + \Hy@CatcodeWrapper\ReadBookmarks }% \fi } @@ -8349,6 +8368,32 @@ \def\Form@method{} \@namedef{Form@method@post}{0} \@namedef{Form@method@get}{1} +% \end{macrocode} +% \begin{macrocode} +\newif\ifHyField@NeedAppearances +\def\HyField@NeedAppearancesfalse{% + \global\let\ifHyField@NeedAppearances\iffalse +} +\def\HyField@NeedAppearancestrue{% + \global\let\ifHyField@NeedAppearances\iftrue +} +\HyField@NeedAppearancestrue +\define@key{Form}{NeedAppearances}[true]{% + \edef\Hy@tempa{#1}% + \ifx\Hy@tempa\Hy@true + \HyField@NeedAppearancestrue + \else + \ifx\Hy@tempa\Hy@false + \HyField@NeedAppearancesfalse + \else + \Hy@Error{% + Unexpected value `\Hy@tempa'\MessageBreak + of option `NeedAppearances' instead of\MessageBreak + `true' or `false'% + }\@ehc + \fi + \fi +} \def\Field@boolkey#1#2{% \csname Fld@#2\ifx\relax#1\relax true\else#1\fi\endcsname } @@ -9351,7 +9396,13 @@ % % \begin{macro}{\Hy@PutCatalog} % \begin{macrocode} -%\let\Hy@PutCatalog\pdfcatalog +%<*pdftex> +\pdf@ifdraftmode{% + \let\Hy@PutCatalog\ltx@gobble +}{% + \let\Hy@PutCatalog\pdfcatalog +} +% % \end{macrocode} % The code for VTeX is more complicate, because it does % not allow the direct access to the /Catalog object. @@ -10435,13 +10486,10 @@ \the\LT@p@ftn \begingroup \noexpand\c@footnote=\the\c@footnote\relax - \noexpand\protected@xdef - \noexpand\@thefnmark{\noexpand\thempfn}% \noexpand\protected@xdef\noexpand\@thefnmark{% \noexpand\thempfn }% - \expandafter\noexpand\expandafter\Hy@LT@footnotetext - \expandafter{% + \noexpand\Hy@LT@footnotetext{% \Hy@footnote@currentHref }% }% @@ -12096,7 +12144,6 @@ % Since version 1.30.0 pdf\TeX\ offers \cs{pdfescapestring}. % \begin{macrocode} %<*pdftex|dvipdfm|xetex|vtex|pdfmarkbase|dviwindo> -\RequirePackage{pdftexcmds}[2009/04/10] \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname pdf@escapestring\endcsname\relax \begingroup @@ -12218,77 +12265,79 @@ % % \begin{macrocode} \ifHy@ocgcolorlinks - \immediate\pdfobj{% - <<% - /Type/OCG% - /Name(View)% - /Usage<<% - /Print<<% - /PrintState/OFF% - >>% - /View<<% - /ViewState/ON% - >>% - >>% - >>% - }% - \edef\OBJ@OCG@view{\the\pdflastobj\space 0 R}% - \immediate\pdfobj{% - <<% - /Type/OCG% - /Name(Print)% - /Usage<<% - /Print<<% - /PrintState/ON% - >>% - /View<<% - /ViewState/OFF% + \pdf@ifdraftmode{}{% + \immediate\pdfobj{% + <<% + /Type/OCG% + /Name(View)% + /Usage<<% + /Print<<% + /PrintState/OFF% + >>% + /View<<% + /ViewState/ON% + >>% >>% >>% - >>% - }% - \edef\OBJ@OCG@print{\the\pdflastobj\space 0 R}% - \immediate\pdfobj{% - [% - \OBJ@OCG@view\space\OBJ@OCG@print - ]% - }% - \edef\OBJ@OCGs{\the\pdflastobj\space 0 R}% - \pdfcatalog{% - /OCProperties<<% - /OCGs \OBJ@OCGs - /D<<% - /OFF[\OBJ@OCG@print]% - /AS[% - <<% - /Event/View% - /OCGs \OBJ@OCGs - /Category[/View]% - >>% - <<% - /Event/Print% - /OCGs \OBJ@OCGs - /Category[/Print]% + }% + \edef\OBJ@OCG@view{\the\pdflastobj\space 0 R}% + \immediate\pdfobj{% + <<% + /Type/OCG% + /Name(Print)% + /Usage<<% + /Print<<% + /PrintState/ON% >>% - <<% - /Event/Export% - /OCGs \OBJ@OCGs - /Category[/Print]% + /View<<% + /ViewState/OFF% >>% - ]% + >>% >>% - >>% - }% - \begingroup - \edef\x{\endgroup - \pdfpageresources{% - /Properties<<% - /OCView \OBJ@OCG@view - /OCPrint \OBJ@OCG@print + }% + \edef\OBJ@OCG@print{\the\pdflastobj\space 0 R}% + \immediate\pdfobj{% + [% + \OBJ@OCG@view\space\OBJ@OCG@print + ]% + }% + \edef\OBJ@OCGs{\the\pdflastobj\space 0 R}% + \pdfcatalog{% + /OCProperties<<% + /OCGs \OBJ@OCGs + /D<<% + /OFF[\OBJ@OCG@print]% + /AS[% + <<% + /Event/View% + /OCGs \OBJ@OCGs + /Category[/View]% + >>% + <<% + /Event/Print% + /OCGs \OBJ@OCGs + /Category[/Print]% + >>% + <<% + /Event/Export% + /OCGs \OBJ@OCGs + /Category[/Print]% + >>% + ]% >>% - }% + >>% }% - \x + \begingroup + \edef\x{\endgroup + \pdfpageresources{% + /Properties<<% + /OCView \OBJ@OCG@view + /OCPrint \OBJ@OCG@print + >>% + }% + }% + \x + }% \Hy@AtBeginDocument{% \def\Hy@colorlink#1{% \begingroup @@ -12706,31 +12755,33 @@ % \begin{macro}{\PDF@FinishDoc} % \begin{macrocode} \def\PDF@FinishDoc{% - \Hy@UseMaketitleInfos - \HyInfo@GenerateAddons - \pdfinfo{% - /Author(\@pdfauthor)% - /Title(\@pdftitle)% - /Subject(\@pdfsubject)% - /Creator(\@pdfcreator)% - \ifx\@pdfcreationdate\@empty - \else - /CreationDate(\@pdfcreationdate)% - \fi - \ifx\@pdfmoddate\@empty - \else - /ModDate(\@pdfmoddate)% - \fi - \ifx\@pdfproducer\relax - \else - /Producer(\@pdfproducer)% - \fi - /Keywords(\@pdfkeywords)% - \ifx\@pdftrapped\@empty - \else - /Trapped/\@pdftrapped - \fi - \HyInfo@Addons + \pdf@ifdraftmode{}{% + \Hy@UseMaketitleInfos + \HyInfo@GenerateAddons + \pdfinfo{% + /Author(\@pdfauthor)% + /Title(\@pdftitle)% + /Subject(\@pdfsubject)% + /Creator(\@pdfcreator)% + \ifx\@pdfcreationdate\@empty + \else + /CreationDate(\@pdfcreationdate)% + \fi + \ifx\@pdfmoddate\@empty + \else + /ModDate(\@pdfmoddate)% + \fi + \ifx\@pdfproducer\relax + \else + /Producer(\@pdfproducer)% + \fi + /Keywords(\@pdfkeywords)% + \ifx\@pdftrapped\@empty + \else + /Trapped/\@pdftrapped + \fi + \HyInfo@Addons + }% }% \Hy@DisableOption{pdfauthor}% \Hy@DisableOption{pdftitle}% @@ -12877,10 +12928,12 @@ % \end{macro} % % \begin{macrocode} -\g@addto@macro\Hy@EveryPageHook{% - \hyper@pagetransition - \hyper@pageduration - \hyper@pagehidden +\pdf@ifdraftmode{}{% + \g@addto@macro\Hy@EveryPageHook{% + \hyper@pagetransition + \hyper@pageduration + \hyper@pagehidden + }% } % \end{macrocode} % @@ -14811,9 +14864,15 @@ \ifHy@breaklinks \else \leavevmode + \ifmmode + \def\Hy@LinkMath{$}% + \else + \def\Hy@LinkMath{}% + \fi \Hy@SaveSpaceFactor \hbox\bgroup \Hy@RestoreSpaceFactor + \Hy@LinkMath \fi \expandafter\Hy@colorlink\csname @#1color\endcsname \literalps@out{H.S}% @@ -14845,6 +14904,7 @@ \Hy@endcolorlink \ifHy@breaklinks \else + \Hy@LinkMath \Hy@SaveSpaceFactor \egroup \Hy@RestoreSpaceFactor @@ -15183,16 +15243,25 @@ \else \leavevmode \Hy@SaveSpaceFactor + \ifmmode + \def\Hy@LinkMath{$}% + \else + \def\Hy@LinkMath{}% + \fi \ifHy@breaklinks \Hy@setouterhbox\pdf@box{% \Hy@RestoreSpaceFactor + \Hy@LinkMath \Hy@AllowHyphens#1% + \Hy@LinkMath \Hy@SaveSpaceFactor }% \else \sbox\pdf@box{% \Hy@RestoreSpaceFactor + \Hy@LinkMath #1% + \Hy@LinkMath \Hy@SaveSpaceFactor }% \fi @@ -16564,7 +16633,9 @@ /CO{corder}% \ifHy@pdfa \else - /NeedAppearances true% + \ifHyField@NeedAppearances + /NeedAppearances true% + \fi \fi >>% /PUT pdfmark% @@ -17027,31 +17098,35 @@ \def\@Form[#1]{% \@ifundefined{textcolor}{\let\textcolor\@gobble}{}% \kvsetkeys{Form}{#1}% - \Hy@FormObjects - \ifnum\pdftexversion>13 % - \pdfrefobj\OBJ@pdfdocencoding - \pdfrefobj\OBJ@ZaDb - \pdfrefobj\OBJ@Helv - \fi - \AtVeryEndDocument{% - \immediate\pdfobj{% - <<% - /Fields[\HyField@afields]% - /DR<<% - /Font<<% - /ZaDb \OBJ@ZaDb\space 0 R% - /Helv \OBJ@Helv\space 0 R% + \pdf@ifdraftmode{}{% + \Hy@FormObjects + \ifnum\pdftexversion>13 % + \pdfrefobj\OBJ@pdfdocencoding + \pdfrefobj\OBJ@ZaDb + \pdfrefobj\OBJ@Helv + \fi + \AtVeryEndDocument{% + \immediate\pdfobj{% + <<% + /Fields[\HyField@afields]% + /DR<<% + /Font<<% + /ZaDb \OBJ@ZaDb\space 0 R% + /Helv \OBJ@Helv\space 0 R% + >>% >>% + /DA(/Helv 10 Tf 0 g)% + \ifHy@pdfa + \else + \ifHyField@NeedAppearances + /NeedAppearances true% + \fi + \fi >>% - /DA(/Helv 10 Tf 0 g)% - \ifHy@pdfa - \else - /NeedAppearances true% - \fi - >>% + }% + \edef\OBJ@acroform{\the\pdflastobj}% + \pdfcatalog{/AcroForm \OBJ@acroform\space 0 R}% }% - \edef\OBJ@acroform{\the\pdflastobj}% - \pdfcatalog{/AcroForm \OBJ@acroform\space 0 R}% }% \MakeFieldObject{% % \end{macrocode} @@ -17404,7 +17479,9 @@ /CO @corder% \ifHy@pdfa \else - /NeedAppearances true% + \ifHyField@NeedAppearances + /NeedAppearances true% + \fi \fi >>% }% diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def b/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def index 55ed3a62354..3595276ac97 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} - [2010/10/30 v6.81t + [2010/11/22 v6.81u % Hyperref driver for dvipdfm] \Hy@VersionCheck{hdvipdfm.def} \def\Hy@PutCatalog#1{\@pdfm@mark{docview << #1 >>}} @@ -64,7 +64,6 @@ }% }% \fi -\RequirePackage{pdftexcmds}[2009/04/10] \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname pdf@escapestring\endcsname\relax \begingroup @@ -605,7 +604,9 @@ /CO @corder% \ifHy@pdfa \else - /NeedAppearances true% + \ifHyField@NeedAppearances + /NeedAppearances true% + \fi \fi >>% }% diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvips.def b/Master/texmf-dist/tex/latex/hyperref/hdvips.def index 960ff26e68c..b086610ceb5 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} - [2010/10/30 v6.81t + [2010/11/22 v6.81u % 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 e78e50c0e44..42b2d758396 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} - [2010/10/30 v6.81t + [2010/11/22 v6.81u % 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 e58bba64bc2..26c553d490a 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} - [2010/10/30 v6.81t + [2010/11/22 v6.81u % Hyperref driver for dviwindo] \Hy@VersionCheck{hdviwind.def} \begingroup @@ -84,7 +84,6 @@ }% }% \fi -\RequirePackage{pdftexcmds}[2009/04/10] \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname pdf@escapestring\endcsname\relax \begingroup @@ -495,16 +494,25 @@ \else \leavevmode \Hy@SaveSpaceFactor + \ifmmode + \def\Hy@LinkMath{$}% + \else + \def\Hy@LinkMath{}% + \fi \ifHy@breaklinks \Hy@setouterhbox\pdf@box{% \Hy@RestoreSpaceFactor + \Hy@LinkMath \Hy@AllowHyphens#1% + \Hy@LinkMath \Hy@SaveSpaceFactor }% \else \sbox\pdf@box{% \Hy@RestoreSpaceFactor + \Hy@LinkMath #1% + \Hy@LinkMath \Hy@SaveSpaceFactor }% \fi diff --git a/Master/texmf-dist/tex/latex/hyperref/hpdftex.def b/Master/texmf-dist/tex/latex/hyperref/hpdftex.def index 8df0ed6e15e..96392393148 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hpdftex.def +++ b/Master/texmf-dist/tex/latex/hyperref/hpdftex.def @@ -29,10 +29,14 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hpdftex.def} - [2010/10/30 v6.81t + [2010/11/22 v6.81u % Hyperref driver for pdfTeX] \Hy@VersionCheck{hpdftex.def} -\let\Hy@PutCatalog\pdfcatalog +\pdf@ifdraftmode{% + \let\Hy@PutCatalog\ltx@gobble +}{% + \let\Hy@PutCatalog\pdfcatalog +} \ifHy@pagelabels \def\HyPL@StorePageLabel#1{% \toks@\expandafter{\HyPL@Labels}% @@ -46,7 +50,6 @@ \HyPL@SetPageLabels }% \fi -\RequirePackage{pdftexcmds}[2009/04/10] \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname pdf@escapestring\endcsname\relax \begingroup @@ -144,77 +147,79 @@ } \Hy@DisableOption{pdfversion}% \ifHy@ocgcolorlinks - \immediate\pdfobj{% - <<% - /Type/OCG% - /Name(View)% - /Usage<<% - /Print<<% - /PrintState/OFF% - >>% - /View<<% - /ViewState/ON% - >>% - >>% - >>% - }% - \edef\OBJ@OCG@view{\the\pdflastobj\space 0 R}% - \immediate\pdfobj{% - <<% - /Type/OCG% - /Name(Print)% - /Usage<<% - /Print<<% - /PrintState/ON% - >>% - /View<<% - /ViewState/OFF% + \pdf@ifdraftmode{}{% + \immediate\pdfobj{% + <<% + /Type/OCG% + /Name(View)% + /Usage<<% + /Print<<% + /PrintState/OFF% + >>% + /View<<% + /ViewState/ON% + >>% >>% >>% - >>% - }% - \edef\OBJ@OCG@print{\the\pdflastobj\space 0 R}% - \immediate\pdfobj{% - [% - \OBJ@OCG@view\space\OBJ@OCG@print - ]% - }% - \edef\OBJ@OCGs{\the\pdflastobj\space 0 R}% - \pdfcatalog{% - /OCProperties<<% - /OCGs \OBJ@OCGs - /D<<% - /OFF[\OBJ@OCG@print]% - /AS[% - <<% - /Event/View% - /OCGs \OBJ@OCGs - /Category[/View]% - >>% - <<% - /Event/Print% - /OCGs \OBJ@OCGs - /Category[/Print]% + }% + \edef\OBJ@OCG@view{\the\pdflastobj\space 0 R}% + \immediate\pdfobj{% + <<% + /Type/OCG% + /Name(Print)% + /Usage<<% + /Print<<% + /PrintState/ON% >>% - <<% - /Event/Export% - /OCGs \OBJ@OCGs - /Category[/Print]% + /View<<% + /ViewState/OFF% >>% - ]% + >>% >>% - >>% - }% - \begingroup - \edef\x{\endgroup - \pdfpageresources{% - /Properties<<% - /OCView \OBJ@OCG@view - /OCPrint \OBJ@OCG@print + }% + \edef\OBJ@OCG@print{\the\pdflastobj\space 0 R}% + \immediate\pdfobj{% + [% + \OBJ@OCG@view\space\OBJ@OCG@print + ]% + }% + \edef\OBJ@OCGs{\the\pdflastobj\space 0 R}% + \pdfcatalog{% + /OCProperties<<% + /OCGs \OBJ@OCGs + /D<<% + /OFF[\OBJ@OCG@print]% + /AS[% + <<% + /Event/View% + /OCGs \OBJ@OCGs + /Category[/View]% + >>% + <<% + /Event/Print% + /OCGs \OBJ@OCGs + /Category[/Print]% + >>% + <<% + /Event/Export% + /OCGs \OBJ@OCGs + /Category[/Print]% + >>% + ]% >>% - }% + >>% }% - \x + \begingroup + \edef\x{\endgroup + \pdfpageresources{% + /Properties<<% + /OCView \OBJ@OCG@view + /OCPrint \OBJ@OCG@print + >>% + }% + }% + \x + }% \Hy@AtBeginDocument{% \def\Hy@colorlink#1{% \begingroup @@ -583,31 +588,33 @@ }% } \def\PDF@FinishDoc{% - \Hy@UseMaketitleInfos - \HyInfo@GenerateAddons - \pdfinfo{% - /Author(\@pdfauthor)% - /Title(\@pdftitle)% - /Subject(\@pdfsubject)% - /Creator(\@pdfcreator)% - \ifx\@pdfcreationdate\@empty - \else - /CreationDate(\@pdfcreationdate)% - \fi - \ifx\@pdfmoddate\@empty - \else - /ModDate(\@pdfmoddate)% - \fi - \ifx\@pdfproducer\relax - \else - /Producer(\@pdfproducer)% - \fi - /Keywords(\@pdfkeywords)% - \ifx\@pdftrapped\@empty - \else - /Trapped/\@pdftrapped - \fi - \HyInfo@Addons + \pdf@ifdraftmode{}{% + \Hy@UseMaketitleInfos + \HyInfo@GenerateAddons + \pdfinfo{% + /Author(\@pdfauthor)% + /Title(\@pdftitle)% + /Subject(\@pdfsubject)% + /Creator(\@pdfcreator)% + \ifx\@pdfcreationdate\@empty + \else + /CreationDate(\@pdfcreationdate)% + \fi + \ifx\@pdfmoddate\@empty + \else + /ModDate(\@pdfmoddate)% + \fi + \ifx\@pdfproducer\relax + \else + /Producer(\@pdfproducer)% + \fi + /Keywords(\@pdfkeywords)% + \ifx\@pdftrapped\@empty + \else + /Trapped/\@pdftrapped + \fi + \HyInfo@Addons + }% }% \Hy@DisableOption{pdfauthor}% \Hy@DisableOption{pdftitle}% @@ -690,10 +697,12 @@ \Hy@RemoveHidPageAttr#1#4\END \fi } -\g@addto@macro\Hy@EveryPageHook{% - \hyper@pagetransition - \hyper@pageduration - \hyper@pagehidden +\pdf@ifdraftmode{}{% + \g@addto@macro\Hy@EveryPageHook{% + \hyper@pagetransition + \hyper@pageduration + \hyper@pagehidden + }% } \Hy@AtBeginDocument{% \ifHy@setpagesize @@ -839,31 +848,35 @@ \def\@Form[#1]{% \@ifundefined{textcolor}{\let\textcolor\@gobble}{}% \kvsetkeys{Form}{#1}% - \Hy@FormObjects - \ifnum\pdftexversion>13 % - \pdfrefobj\OBJ@pdfdocencoding - \pdfrefobj\OBJ@ZaDb - \pdfrefobj\OBJ@Helv - \fi - \AtVeryEndDocument{% - \immediate\pdfobj{% - <<% - /Fields[\HyField@afields]% - /DR<<% - /Font<<% - /ZaDb \OBJ@ZaDb\space 0 R% - /Helv \OBJ@Helv\space 0 R% + \pdf@ifdraftmode{}{% + \Hy@FormObjects + \ifnum\pdftexversion>13 % + \pdfrefobj\OBJ@pdfdocencoding + \pdfrefobj\OBJ@ZaDb + \pdfrefobj\OBJ@Helv + \fi + \AtVeryEndDocument{% + \immediate\pdfobj{% + <<% + /Fields[\HyField@afields]% + /DR<<% + /Font<<% + /ZaDb \OBJ@ZaDb\space 0 R% + /Helv \OBJ@Helv\space 0 R% + >>% >>% + /DA(/Helv 10 Tf 0 g)% + \ifHy@pdfa + \else + \ifHyField@NeedAppearances + /NeedAppearances true% + \fi + \fi >>% - /DA(/Helv 10 Tf 0 g)% - \ifHy@pdfa - \else - /NeedAppearances true% - \fi - >>% + }% + \edef\OBJ@acroform{\the\pdflastobj}% + \pdfcatalog{/AcroForm \OBJ@acroform\space 0 R}% }% - \edef\OBJ@acroform{\the\pdflastobj}% - \pdfcatalog{/AcroForm \OBJ@acroform\space 0 R}% }% \MakeFieldObject{% \begingroup diff --git a/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg b/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg index 5fb6acd0072..ec46ecf361e 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} - [2010/10/30 v6.81t + [2010/11/22 v6.81u % 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 682e64a66f3..7ac12a94990 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} - [2010/10/30 v6.81t + [2010/11/22 v6.81u % 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 56209a62513..0927468bd2c 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} - [2010/10/30 v6.81t + [2010/11/22 v6.81u % 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 ffb92551704..4ea51392ff7 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} - [2010/10/30 v6.81t + [2010/11/22 v6.81u % Hyperref driver for VTeX in PDF/PS mode] \Hy@VersionCheck{hvtex.def} \providecommand*{\XR@ext}{pdf} @@ -76,7 +76,6 @@ \HyPL@SetPageLabels }% \fi -\RequirePackage{pdftexcmds}[2009/04/10] \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname pdf@escapestring\endcsname\relax \begingroup diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def b/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def index 7cd07839ae9..92a472ca5a4 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} - [2010/10/30 v6.81t + [2010/11/22 v6.81u % 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 2fcf4c3222d..2fb6efb8ec3 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} - [2010/10/30 v6.81t + [2010/11/22 v6.81u % 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 61162629635..6f376181f56 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} - [2010/10/30 v6.81t + [2010/11/22 v6.81u % Hyperref driver for XeTeX] \Hy@VersionCheck{hxetex.def} \HyPsd@LoadUnicode @@ -99,7 +99,6 @@ }% }% \fi -\RequirePackage{pdftexcmds}[2009/04/10] \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname pdf@escapestring\endcsname\relax \begingroup @@ -667,7 +666,9 @@ /CO @corder% \ifHy@pdfa \else - /NeedAppearances true% + \ifHyField@NeedAppearances + /NeedAppearances true% + \fi \fi >>% }% diff --git a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty index bd83f370d31..1e51500f0bb 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} \ProvidesPackage{hyperref} - [2010/10/30 v6.81t + [2010/11/22 v6.81u % Hypertext links for LaTeX] \begingroup \@makeother\`% @@ -117,11 +117,29 @@ \let#1\LTXcmds@gtemp }% } +\RequirePackage{ifpdf}[2006/02/20] +\RequirePackage{pdftexcmds}[2009/04/10] +\@ifpackagelater{pdftexcmds}{2010/11/04}{}{% + \ltx@IfUndefined{pdfdraftmode}{% + \let\pdf@ifdraftmode\ltx@secondoftwo + }{% + \ifpdf + \def\pdf@ifdraftmode{% + \ifnum\pdf@draftmode=\ltx@one + \expandafter\ltx@firstoftwo + \else + \expandafter\ltx@secondoftwo + \fi + }% + \else + \let\pdf@ifdraftmode\ltx@secondoftwo + \fi + }% +} \RequirePackage{infwarerr}[2010/04/08] \RequirePackage{keyval}[1997/11/10] \RequirePackage{kvsetkeys}[2007/09/29] \RequirePackage{pdfescape}[2007/11/11] -\RequirePackage{ifpdf}[2006/02/20] \RequirePackage{ifvtex} \RequirePackage{ifxetex}[2006/08/21] \RequirePackage{hycolor} @@ -814,7 +832,6 @@ \let\HyOrg@languageshorthands\languageshorthands \let\languageshorthands\HyPsd@LanguageShorthands } -\RequirePackage{pdftexcmds}[2009/04/10] \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname pdf@strcmp\endcsname\relax \let\HyPsd@langshort@system\@empty @@ -4345,8 +4362,8 @@ \Hy@AtBeginDocument{% \ifHy@texht \else - \Hy@CatcodeWrapper{% - \ReadBookmarks + \pdf@ifdraftmode{}{% + \Hy@CatcodeWrapper\ReadBookmarks }% \fi } @@ -5320,6 +5337,30 @@ \def\Form@method{} \@namedef{Form@method@post}{0} \@namedef{Form@method@get}{1} +\newif\ifHyField@NeedAppearances +\def\HyField@NeedAppearancesfalse{% + \global\let\ifHyField@NeedAppearances\iffalse +} +\def\HyField@NeedAppearancestrue{% + \global\let\ifHyField@NeedAppearances\iftrue +} +\HyField@NeedAppearancestrue +\define@key{Form}{NeedAppearances}[true]{% + \edef\Hy@tempa{#1}% + \ifx\Hy@tempa\Hy@true + \HyField@NeedAppearancestrue + \else + \ifx\Hy@tempa\Hy@false + \HyField@NeedAppearancesfalse + \else + \Hy@Error{% + Unexpected value `\Hy@tempa'\MessageBreak + of option `NeedAppearances' instead of\MessageBreak + `true' or `false'% + }\@ehc + \fi + \fi +} \def\Field@boolkey#1#2{% \csname Fld@#2\ifx\relax#1\relax true\else#1\fi\endcsname } @@ -6627,13 +6668,10 @@ \the\LT@p@ftn \begingroup \noexpand\c@footnote=\the\c@footnote\relax - \noexpand\protected@xdef - \noexpand\@thefnmark{\noexpand\thempfn}% \noexpand\protected@xdef\noexpand\@thefnmark{% \noexpand\thempfn }% - \expandafter\noexpand\expandafter\Hy@LT@footnotetext - \expandafter{% + \noexpand\Hy@LT@footnotetext{% \Hy@footnote@currentHref }% }% diff --git a/Master/texmf-dist/tex/latex/hyperref/hypertex.def b/Master/texmf-dist/tex/latex/hyperref/hypertex.def index 56a3d86f6c9..60769849e46 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} - [2010/10/30 v6.81t + [2010/11/22 v6.81u % 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 cd3b01ecbaf..6c25ab7a030 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} \ProvidesPackage{nohyperref} - [2010/10/30 v6.81t + [2010/11/22 v6.81u % 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 7437e52af6e..02c07c010ed 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} - [2010/10/30 v6.81t + [2010/11/22 v6.81u % 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 99322a0cb88..ba86f3bdea1 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} - [2010/10/30 v6.81t + [2010/11/22 v6.81u % Hyperref definitions for pdfmark specials] \Hy@VersionCheck{pdfmark.def} \begingroup @@ -84,7 +84,6 @@ }% }% \fi -\RequirePackage{pdftexcmds}[2009/04/10] \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname pdf@escapestring\endcsname\relax \begingroup @@ -215,9 +214,15 @@ \ifHy@breaklinks \else \leavevmode + \ifmmode + \def\Hy@LinkMath{$}% + \else + \def\Hy@LinkMath{}% + \fi \Hy@SaveSpaceFactor \hbox\bgroup \Hy@RestoreSpaceFactor + \Hy@LinkMath \fi \expandafter\Hy@colorlink\csname @#1color\endcsname \literalps@out{H.S}% @@ -249,6 +254,7 @@ \Hy@endcolorlink \ifHy@breaklinks \else + \Hy@LinkMath \Hy@SaveSpaceFactor \egroup \Hy@RestoreSpaceFactor @@ -533,16 +539,25 @@ \else \leavevmode \Hy@SaveSpaceFactor + \ifmmode + \def\Hy@LinkMath{$}% + \else + \def\Hy@LinkMath{}% + \fi \ifHy@breaklinks \Hy@setouterhbox\pdf@box{% \Hy@RestoreSpaceFactor + \Hy@LinkMath \Hy@AllowHyphens#1% + \Hy@LinkMath \Hy@SaveSpaceFactor }% \else \sbox\pdf@box{% \Hy@RestoreSpaceFactor + \Hy@LinkMath #1% + \Hy@LinkMath \Hy@SaveSpaceFactor }% \fi @@ -979,7 +994,9 @@ /CO{corder}% \ifHy@pdfa \else - /NeedAppearances true% + \ifHyField@NeedAppearances + /NeedAppearances true% + \fi \fi >>% /PUT pdfmark% diff --git a/Master/texmf-dist/tex/latex/hyperref/puarenc.def b/Master/texmf-dist/tex/latex/hyperref/puarenc.def index 5738b6db95a..44afc18014e 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} - [2010/10/30 v6.81t + [2010/11/22 v6.81u % 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 9c1f52648a0..b094b46177d 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} - [2010/10/30 v6.81t + [2010/11/22 v6.81u % 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 47253d09cbd..dfab0884d0b 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} - [2010/10/30 v6.81t + [2010/11/22 v6.81u % Hyperref: Additions to puenc.def for VnTeX] \DeclareTextCommand{\abreve}{PU}{\81\003} \DeclareTextCommand{\acircumflex}{PU}{\80\342} -- cgit v1.2.3