From 83316e68b48213a76b799581c3fdfa3b49602578 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 17 Dec 2009 00:53:48 +0000 Subject: hyperref update (16dec09) git-svn-id: svn://tug.org/texlive/trunk@16430 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/hyperref/ChangeLog | 20 ++ Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf | Bin 325762 -> 327585 bytes Master/texmf-dist/doc/latex/hyperref/backref.pdf | 4 +- Master/texmf-dist/doc/latex/hyperref/hyperref.pdf | Bin 3811498 -> 3888431 bytes Master/texmf-dist/doc/latex/hyperref/nameref.pdf | 4 +- .../texmf-dist/source/latex/hyperref/hyperref.dtx | 301 ++++++++++++++------- Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def | 47 +++- 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 | 29 +- Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg | 2 +- Master/texmf-dist/tex/latex/hyperref/htex4ht.def | 7 +- Master/texmf-dist/tex/latex/hyperref/htexture.def | 12 +- Master/texmf-dist/tex/latex/hyperref/hvtex.def | 30 +- Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def | 6 +- Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def | 2 +- Master/texmf-dist/tex/latex/hyperref/hxetex.def | 52 +++- Master/texmf-dist/tex/latex/hyperref/hyperref.sty | 143 ++++++---- 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 | 6 +- Master/texmf-dist/tex/latex/hyperref/pdfmark.def | 21 +- 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, 492 insertions(+), 210 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 198ecd0354e..708e4fe1e37 100644 --- a/Master/texmf-dist/doc/latex/hyperref/ChangeLog +++ b/Master/texmf-dist/doc/latex/hyperref/ChangeLog @@ -1,3 +1,23 @@ +2009-12-16 6.79u Heiko Oberdiek + * 6.79u + * Babel patch of 6.77o rewritten that babel can be loaded + after hyperref. + +2009-12-15 6.79t Heiko Oberdiek + * 6.79t + * hxetex: Using encoding `ascii-print' for + `pdfencoding=auto'. + +2009-12-15 6.79s Heiko Oberdiek + * 6.79s + * Removed paper options of 6.79o now generate a warning + instead of an error. + +2009-12-15 6.79r Heiko Oberdiek + * 6.79r + * hxetex: default is now `pdfencoding=auto' because of + bug of AR7/Linux regarding page labels. + 2009-12-15 6.79p Heiko Oberdiek * 6.79p * hxetex: PDFDocEncoding is not supported, only diff --git a/Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf b/Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf index 70272208b22..e757f476e0d 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 721cb689d19..5a930322c6a 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 @@ -4536,7 +4536,7 @@ xref 0000354372 00000 n 0000354411 00000 n trailer -<>/Info 6 0 R/ID[(-a̵!6\rE> )(nBd}'ɉXh:t)]>> +<>/Info 6 0 R/ID[(Z:Nj@u)(F\) \).Jv[)]>> startxref 354450 %%EOF diff --git a/Master/texmf-dist/doc/latex/hyperref/hyperref.pdf b/Master/texmf-dist/doc/latex/hyperref/hyperref.pdf index c1386eb4860..11a3e2019cd 100644 Binary files a/Master/texmf-dist/doc/latex/hyperref/hyperref.pdf and b/Master/texmf-dist/doc/latex/hyperref/hyperref.pdf differ diff --git a/Master/texmf-dist/doc/latex/hyperref/nameref.pdf b/Master/texmf-dist/doc/latex/hyperref/nameref.pdf index 667fe7946a1..aae45f1d2e6 100644 --- a/Master/texmf-dist/doc/latex/hyperref/nameref.pdf +++ b/Master/texmf-dist/doc/latex/hyperref/nameref.pdf @@ -10,7 +10,7 @@ endobj endobj 5 0 obj<> endobj -6 0 obj<> +6 0 obj<> endobj 7 0 obj<> endobj @@ -4497,7 +4497,7 @@ xref 0000349458 00000 n 0000349497 00000 n trailer -<>/Info 6 0 R/ID[(]z.;:)(rnXI_72T)]>> +<>/Info 6 0 R/ID[(B|9[)(6|/OW|)]>> startxref 349536 %%EOF diff --git a/Master/texmf-dist/source/latex/hyperref/hyperref.dtx b/Master/texmf-dist/source/latex/hyperref/hyperref.dtx index 35fd59c0e66..d5b13be5ebb 100644 --- a/Master/texmf-dist/source/latex/hyperref/hyperref.dtx +++ b/Master/texmf-dist/source/latex/hyperref/hyperref.dtx @@ -39,7 +39,7 @@ %\ProvidesFile{puenc.def} %\ProvidesFile{puvnenc.def} %\ProvidesFile{puarenc.def} -% [2009/12/15 v6.79p +% [2009/12/16 v6.79u % Hypertext links for LaTeX] % Dummy hyperref (SR)] % Hyperref documentation driver file] @@ -65,7 +65,8 @@ %<*driver> \documentclass{ltxdoc} \usepackage{array,times} -\def\ttdefault{cmtt} +\usepackage[T1]{fontenc} +\renewcommand*{\ttdefault}{lmvtt} \usepackage[% colorlinks,% hyperindex=false,% done by hypdoc @@ -77,6 +78,7 @@ \pdfstringdefDisableCommands{\let\\\textbackslash}% \EnableCrossrefs \CodelineIndex +\setlength{\hfuzz}{2pt} \begin{document} % % title @@ -108,7 +110,7 @@ % % source code documentation % - \let\Email\texttt + \let\Email\nolinkurl \DocInput{hyperref.dtx}% % % index @@ -117,7 +119,7 @@ \end{document} % % \fi -% \CheckSum{24974} +% \CheckSum{25011} % % \MakeShortVerb{|} % \StopEventually{} @@ -1080,8 +1082,8 @@ % % \paragraph{Upper- and lowercase.} % \begin{macrocode} - \def\MakeUppercase{\MakeUppercaseIsNotSupportedInPdfStrings}% - \def\MakeLowercase{\MakeLowercaseIsNotSupportedInPdfStrings}% + \def\MakeUppercase{\MakeUppercaseUnsupportedInPdfStrings}% + \def\MakeLowercase{\MakeLowercaseUnsupportedInPdfStrings}% % \end{macrocode} % % \paragraph{Package babel.} @@ -1095,6 +1097,9 @@ }% \HyPsd@GreekPatch % \end{macrocode} +% \begin{macrocode} + \HyPsd@BabelPatch +% \end{macrocode} % % \begin{macrocode} \let\@safe@activestrue\relax @@ -1180,7 +1185,7 @@ \let\ignorespaces\HyPsd@ignorespaces % \end{macrocode} % \begin{macrocode} -\let\Hy@SectionAnchor\@empty + \let\Hy@SectionAnchor\@empty % \end{macrocode} % % \paragraph{Patch for cjk bookmarks.} @@ -1620,7 +1625,7 @@ \EdefUnescapeString\HyPsd@temp#1% \ifxetex \StringEncodingConvertTest\HyPsd@temp\HyPsd@temp - {utf16be}{ascii}{% + {utf16be}{ascii-print}{% \EdefEscapeString\HyPsd@temp\HyPsd@temp \global\let#1\HyPsd@temp \Hy@unicodefalse @@ -1852,6 +1857,67 @@ % \end{macro} % % \subsubsection{Babel languages} +% +% Since version 2008/03/16 v3.8j babel uses inside \cs{AtBeginDocument}: +%\begin{quote} +%\begin{verbatim} +%\pdfstringdefDisableCommands{% +% \languageshorthands{system}% +%} +%\end{verbatim} +%\end{quote} +% As consequence the shorthands are shown in the bookmarks, +% not its result. Therefore \cs{languageshorthands} is +% disabled before the user hook. If there is a need to +% use the command, then \cs{HyOrg@languageshorthands} +% can be used inside \cs{pdfstringdefDisableCommands}. +% \begin{macrocode} +\def\HyPsd@BabelPatch{% + \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 + \def\HyPsd@LanguageShorthands#1{% + \expandafter\ifx\csname HyPsd@langshort@#1\endcsname + \HyPsd@langshort@system + \expandafter\@gobble + \else + \expandafter\@firstofone + \fi + {% + \HyOrg@languageshorthands{#1}% + }% + }% +\else + \def\HyPsd@LanguageShorthands#1{% + \ifnum\pdf@strcmp{#1}{system}=\z@ + \expandafter\@gobble + \else + \expandafter\@firstofone + \fi + {% + \HyOrg@languageshorthands{#1}% + }% + }% +\fi +\def\Hy@temp{% + \@ifpackageloaded{babel}{% + \@ifpackagelater{babel}{2008/03/16}{% + \let\Hy@temp\@empty + }{% + \def\HyPsd@BabelPatch{% + \let\HyOrg@languageshorthands\languageshorthands + }% + }% + }{}% +} +\Hy@temp +\expandafter\AtBeginDocument\expandafter{\Hy@temp} +% \end{macrocode} +% % \begin{macrocode} \newif\ifHy@next % \end{macrocode} @@ -3905,6 +3971,25 @@ \let\KV@Hyp@nolinks\KV@Hyp@draft % \end{macrocode} % \begin{macrocode} +\def\Hy@ObsoletePaperOption#1{% + \Hy@WarningNoLine{% + Option `#1' is no longer used% + }% + \define@key{Hyp}{#1}[true]{}% +} +\def\Hy@temp#1{% + \define@key{Hyp}{#1}[true]{% + \Hy@ObsoletePaperOption{#1}% + }% +} +\Hy@temp{a4paper} +\Hy@temp{a5paper} +\Hy@temp{b5paper} +\Hy@temp{letterpaper} +\Hy@temp{legalpaper} +\Hy@temp{executivepaper} +% \end{macrocode} +% \begin{macrocode} \define@key{Hyp}{setpagesize}[true]{% \Hy@boolkey{setpagesize}{#1}% } @@ -4101,7 +4186,7 @@ \def\HyPsd@pdfencoding@unicode{unicode} \let\HyPsd@pdfencoding\Hy@pdfencoding@pdfdoc \def\HyPsd@LoadStringEnc{% - \RequirePackage{stringenc}[2007/06/14]% + \RequirePackage{stringenc}[2009/12/15]% \let\HyPsd@LoadStringEnc\relax } \AtBeginDocument{% @@ -5430,43 +5515,6 @@ \fi % \end{macrocode} % -% \subsection{Patch for babel 3.8j} -% Babel 2008/03/16 v3.8j adds a patch to disable shorthands -% for bookmarks. That reduces warnings, but the bookmarks -% are ugly. Therefore the following patch tries to undo this. -% \begin{macrocode} -\@ifpackageloaded{babel}{% - \@ifpackagelater{babel}{2008/03/16}{% - \def\Hy@PatchLanguageShorthands#1{% - \begingroup - \edef\x{#1}% - \@onelevel@sanitize\x - \def\y{system}% - \@onelevel@sanitize\y - \expandafter\endgroup - \ifx\x\y - \else - \HyOrg@languageshorthands{#1}% - \fi - }% - \AtBeginDocument{% - \begingroup - \toks0=\expandafter{\pdfstringdefPreHook}% - \xdef\pdfstringdefPreHook{% - \let\noexpand\HyOrg@languageshorthands - \noexpand\languageshorthands - \let\noexpand\languageshorthands - \noexpand\Hy@PatchLanguageShorthands - \the\toks0 % - \let\noexpand\languageshorthands - \noexpand\HyOrg@languageshorthands - }% - \endgroup - }% - }{}% -}{} -% \end{macrocode} -% % \begin{macrocode} \ifHy@figures \Hy@Info{Hyper figures ON}% @@ -8042,10 +8090,11 @@ %<*xetex> \HyPsd@LoadUnicode \Hy@unicodetrue -\ifx\HyPsd@pdfencoding\HyPsd@pdfencoding@auto +\ifx\HyPsd@pdfencoding\HyPsd@pdfencoding@unicode \else - \let\HyPsd@pdfencoding\HyPsd@pdfencoding@unicode + \let\HyPsd@pdfencoding\HyPsd@pdfencoding@auto \fi +\HyPsd@LoadStringEnc \define@key{Hyp}{unicode}[true]{% \Hy@boolkey{unicode}{#1}% \ifHy@unicode @@ -8865,10 +8914,14 @@ \long\def\@mpfootnotetext#1{% \H@@mpfootnotetext{% \ifHy@nesting - \expandafter\hyper@@anchor\expandafter{\Hy@footnote@currentHref}{#1}% + \expandafter\hyper@@anchor\expandafter{% + \Hy@footnote@currentHref + }{#1}% \else \Hy@raisedlink{% - \expandafter\hyper@@anchor\expandafter{\Hy@footnote@currentHref}{\relax}% + \expandafter\hyper@@anchor\expandafter{% + \Hy@footnote@currentHref + }{\relax}% }#1% \fi }% @@ -8876,10 +8929,14 @@ \long\def\@footnotetext#1{% \H@@footnotetext{% \ifHy@nesting - \expandafter\hyper@@anchor\expandafter{\Hy@footnote@currentHref}{#1}% + \expandafter\hyper@@anchor\expandafter{% + \Hy@footnote@currentHref + }{#1}% \else \Hy@raisedlink{% - \expandafter\hyper@@anchor\expandafter{\Hy@footnote@currentHref}{\relax}% + \expandafter\hyper@@anchor\expandafter{% + \Hy@footnote@currentHref + }{\relax}% }% \let\@currentHlabel\Hy@footnote@currentHlabel \let\@currentHref\Hy@footnote@currentHref @@ -8988,7 +9045,9 @@ \bgroup \aftergroup\V@@@footnotetext \Hy@raisedlink{% - \expandafter\hyper@@anchor\expandafter{\Hy@footnote@currentHref}{\relax}% + \expandafter\hyper@@anchor\expandafter{% + \Hy@footnote@currentHref + }{\relax}% }% \let\@currentHlabel\Hy@footnote@currentHlabel \let\@currentHref\Hy@footnote@currentHref @@ -9131,7 +9190,9 @@ \expandafter\hyper@@anchor\expandafter{\@currentHref}{#3}% \else \Hy@raisedlink{% - \expandafter\hyper@@anchor\expandafter{\@currentHref}{\relax}% + \expandafter\hyper@@anchor\expandafter{% + \@currentHref + }{\relax}% }% #3% \fi @@ -9163,7 +9224,9 @@ #1\relax \ifx\Hy@float@currentHref\@undefined \else - \expandafter\hyper@@anchor\expandafter{\Hy@float@currentHref}{\relax}% + \expandafter\hyper@@anchor\expandafter{% + \Hy@float@currentHref + }{\relax}% \global\let\Hy@float@currentHref\@undefined \fi }% @@ -9187,8 +9250,9 @@ } \checkcommand\long\def\@caption#1[#2]#3{% \par - \addcontentsline{\csname ext@#1\endcsname}{#1}% - {\protect\numberline{\csname the#1\endcsname}{\ignorespaces #2}}% + \addcontentsline{\csname ext@#1\endcsname}{#1}{% + \protect\numberline{\csname the#1\endcsname}{\ignorespaces #2}% + }% \begingroup \@parboxrestore \if@minipage @@ -9213,7 +9277,7 @@ % % However, lets make an attempt to get \emph{natbib} right, because % thats a powerful, important package. -% Patrick Daly (\Email{daly@linmpi.mpg.de}) has +% Patrick Daly (\Email{daly@linmpi.mpg.de}) has % provided hooks for us, so all we need to do is activate them. % \begin{macrocode} \def\hyper@natlinkstart#1{% @@ -9598,7 +9662,9 @@ \fi \else \Hy@GlobalStepCount\Hy@pagecounter - \def\Hy@TempPageAnchor{\hyper@@anchor{page.\the\Hy@pagecounter}}% + \def\Hy@TempPageAnchor{% + \hyper@@anchor{page.\the\Hy@pagecounter}% + }% \fi \vbox to 0pt{% \kern\voffset @@ -9777,7 +9843,9 @@ \def\@seteqlabel#1{% \H@seteqlabel{#1}% \xdef\@currentHref{AMS.\the\Hy@linkcounter}% - \Hy@raisedlink{\hyper@anchorstart{\@currentHref}\hyper@anchorend}% + \Hy@raisedlink{% + \hyper@anchorstart{\@currentHref}\hyper@anchorend + }% }% }{} % \end{macrocode} @@ -10459,7 +10527,8 @@ }% }{% \edef\HyRef@currentHtag{% - \expandafter\noexpand\csname\HyRef@name autorefname\endcsname + \expandafter\noexpand + \csname\HyRef@name autorefname\endcsname \noexpand~% }% }% @@ -11224,7 +11293,8 @@ \def\hyper@pageduration{% \ifx\@pdfpageduration\relax \else - \expandafter\Hy@RemoveDurPageAttr\the\pdfpageattr^^J/Dur{} \END + \expandafter + \Hy@RemoveDurPageAttr\the\pdfpageattr^^J/Dur{} \END \ifx\@pdfpageduration\@empty \else \edef\@processme{% @@ -11267,7 +11337,8 @@ % \begin{macrocode} \def\hyper@pagehidden{% \ifHy@useHidKey - \expandafter\Hy@RemoveHidPageAttr\the\pdfpageattr^^J/Hid{} \END + \expandafter + \Hy@RemoveHidPageAttr\the\pdfpageattr^^J/Hid{} \END \ifHy@pdfpagehidden \edef\@processme{% \global\pdfpageattr{% @@ -11866,7 +11937,9 @@ \def\x{XYZ @xpos @ypos null}% \else \@onelevel@sanitize\@pdfview - \Hy@Warning{Unknown value `\@pdfview' for pdfview}% + \Hy@Warning{% + Unknown value `\@pdfview' for pdfview% + }% \def\x{XYZ @xpos @ypos null}% \fi \fi @@ -12037,7 +12110,9 @@ \let\Hy@testname\Hy@undefinedname \else \Hy@pstringdef\Hy@testname{% - \expandafter\HyperDestNameFilter\expandafter{\Hy@testname}% + \expandafter\HyperDestNameFilter\expandafter{% + \Hy@testname + }% }% \fi \@pdfm@mark{% @@ -12365,7 +12440,9 @@ \Hy@activeanchorfalse \Hy@RestoreLastskip } -\def\@Form[#1]{\typeout{Sorry, TeXpider does not yet support FORMs}} +\def\@Form[#1]{% + \typeout{Sorry, TeXpider does not yet support FORMs}% +} \def\@endForm{} \def\@Gauge[#1]#2#3#4{% parameters, label, minimum, maximum \typeout{Sorry, TeXpider does not yet support FORM gauges}% @@ -12464,7 +12541,9 @@ \@ifundefined{@#1bordercolor}{% \let\CurrentBorderColor\relax }{% - \edef\CurrentBorderColor{\csname @#1bordercolor\endcsname}% + \edef\CurrentBorderColor{% + \csname @#1bordercolor\endcsname + }% }% \def\Hy@tempa{#1}% \ifx\Hy@tempa\@urltype @@ -12571,7 +12650,8 @@ \fi >% }% - \expandafter\Hy@colorlink\csname @#1color\endcsname#3\Hy@endcolorlink + \expandafter + \Hy@colorlink\csname @#1color\endcsname#3\Hy@endcolorlink \special{!endaref}% } \def\hyper@image#1#2{% @@ -12587,7 +12667,10 @@ /S/Launch% /F(\Hy@pstringF)% \Hy@SetNewWindow - \ifx\\#3\\\else /Win<>\fi% + \ifx\\#3\\% + \else + /Win<>% + \fi% >;% a=<% \ifHy@pdfa /F 4\fi @@ -12690,7 +12773,9 @@ % % Tokenizer: % \begin{macrocode} - \def\hvtex@gettoken{\expandafter\hvtex@gettoken@\hvtex@buffer\@nil}% + \def\hvtex@gettoken{% + \expandafter\hvtex@gettoken@\hvtex@buffer\@nil + }% % \end{macrocode} % % Notice that tokens in the input buffer must be space delimited. @@ -14217,8 +14302,10 @@ \else \begingroup \hyper@chars - \special{html:}% + \special{% + html:% + }% \endgroup \fi } @@ -14227,7 +14314,9 @@ \Hy@endcolorlink } \def\hyper@linkfile#1#2#3{% - \hyper@linkurl{#1}{\Hy@linkfileprefix#2\ifx\\#3\\\else\##3\fi}% + \hyper@linkurl{#1}{% + \Hy@linkfileprefix#2\ifx\\#3\\\else\##3\fi + }% } \def\hyper@linkurl#1#2{% \leavevmode @@ -14527,7 +14616,10 @@ \@linkdim\dp\@tempboxa \lower\@linkdim\hbox{% \begingroup - \hyper@chars\special{t4ht=}% + \hyper@chars + \special{% + t4ht=% + }% \endgroup }% \Hy@colorlink\@urlcolor#1\Hy@endcolorlink @@ -14871,7 +14963,9 @@ \Hy@escapeform\PDFForm@Radio \pdfmark[\MakeRadioField{\Fld@width}{\Fld@height}]{% pdfmark=/ANN,% - Raw={\PDFForm@Radio /AP <> >>}% + Raw={% + \PDFForm@Radio /AP <> >>% + }% } % deliberate space between radio buttons }% } @@ -15164,8 +15258,10 @@ \expandafter\ifx\csname pdflastlink\endcsname\relax \let\HyField@AddToFields\relax \PackageInfo{hyperref}{% - You need pdfTeX 1.40.0 for setting the /Fields entry.\MessageBreak - Adobe Reader/Acrobat accepts an empty /Field array,\MessageBreak + You need pdfTeX 1.40.0 for setting the /Fields entry.% + \MessageBreak + Adobe Reader/Acrobat accepts an empty /Field array,% + \MessageBreak but other PDF viewers might complain% }% \else @@ -15732,7 +15828,9 @@ % \begin{macrocode} \def\@@Radio#1{% \Fld@listcount=0 % - \setbox\pdfm@box=\hbox{\MakeRadioField{\Fld@width}{\Fld@height}}% + \setbox\pdfm@box=\hbox{% + \MakeRadioField{\Fld@width}{\Fld@height}% + }% \@for\@curropt:=#1\do{% \expandafter\Fld@checkequals\@curropt==\\% \Hy@StepCount\Fld@listcount @@ -15743,7 +15841,11 @@ \HyField@AdvanceAnnotCount \fi \@pdfm@mark{% - ann \ifnum\Fld@listcount=1 @radio\HyField@TheAnnotCount\space\fi + ann % + \ifnum\Fld@listcount=1 % + @radio\HyField@TheAnnotCount% + \space + \fi \dvipdfm@setdim <<% \PDFForm@Radio @@ -15752,7 +15854,9 @@ }% \unhcopy\pdfm@box\space% deliberate space between radio buttons \ifnum\Fld@listcount=1 % - \@pdfm@mark{put @afields @radio\HyField@TheAnnotCount}% + \@pdfm@mark{% + put @afields @radio\HyField@TheAnnotCount + }% \fi }% } @@ -15768,7 +15872,9 @@ % \begin{macrocode} \def\@@Listbox#1{% \HyField@PDFChoices{#1}% - \setbox\pdfm@box=\hbox{\MakeChoiceField{\Fld@width}{\Fld@height}}% + \setbox\pdfm@box=\hbox{% + \MakeChoiceField{\Fld@width}{\Fld@height}% + }% \leavevmode \Hy@escapeform\PDFForm@List \HyField@AdvanceAnnotCount @@ -15902,7 +16008,9 @@ \PDFForm@Name \HyField@FlagsCheckBox \ifFld@hidden\def\Fld@width{1sp}\fi - \setbox\pdfm@box=\hbox{\MakeCheckField{\Fld@width}{\Fld@height}}% + \setbox\pdfm@box=\hbox{% + \MakeCheckField{\Fld@width}{\Fld@height}% + }% \HyField@AdvanceAnnotCount \LayoutCheckField{#2}{% \Hy@escapeform\PDFForm@Check @@ -16007,7 +16115,8 @@ \def\Hy@@escapeform#1\Hy@escapestring#2#3\@nil{% \ifx\\#3\\% \else - \expandafter\Hy@pstringdef\csname Hy@esc@\string#2\endcsname{#2}% + \expandafter + \Hy@pstringdef\csname Hy@esc@\string#2\endcsname{#2}% \Hy@ReturnAfterFi{% \Hy@@escapeform#3\@nil }% @@ -16531,8 +16640,12 @@ \Hy@writebookmark{}{#2}{#3.#1}{#1}{toc}% \hyper@anchorstart{#3.#1}\hyper@anchorend } -\def\BOOKMARK{\@ifnextchar[{\@BOOKMARK}{\@@BOOKMARK[1][-]}} -\def\@BOOKMARK[#1]{\@ifnextchar[{\@@BOOKMARK[#1]}{\@@BOOKMARK[#1][-]}} +\def\BOOKMARK{% + \@ifnextchar[{\@BOOKMARK}{\@@BOOKMARK[1][-]}% +} +\def\@BOOKMARK[#1]{% + \@ifnextchar[{\@@BOOKMARK[{#1}]}{\@@BOOKMARK[{#1}][-]}% +} % \end{macrocode} % The macros for calculating structure of outlines % are derived from those by Petr Olsak used in the texinfopdf macros. @@ -16622,7 +16735,9 @@ % \begin{macro}{\@@BOOKMARK} % \begin{macrocode} \def\@@BOOKMARK[#1][#2]#3#4#5{% - \expandafter\edef\csname @count@#3\endcsname{\the\@serial@counter}% + \expandafter\edef\csname @count@#3\endcsname{% + \the\@serial@counter + }% \edef\@mycount{\the\@serial@counter}% \Hy@StepCount\@serial@counter \edef\@parcount{% @@ -16680,7 +16795,9 @@ \begingroup \escapechar=`\\% \let\escapechar\@gobble % - \def\@@BOOKMARK[##1][##2]##3##4##5{\calc@bm@number{##5}}% + \def\@@BOOKMARK[##1][##2]##3##4##5{% + \calc@bm@number{##5}% + }% \InputIfFileExists{\jobname.out}{}{}% \ifx\WriteBookmarks\relax \global\let\WriteBookmarks\relax @@ -16906,7 +17023,7 @@ % \end{macrocode} % % Hard-wire in an unpleasant over-ride of komascript `scrbook' class -% for \Email{Tobias.Isenberg@gmx.de}. +% for Tobias Isenberg (\Email{Tobias.Isenberg@gmx.de}). % With version 6.71b the hack is also applied to `scrreprt' class % and is removed for koma-script versions since 2001/01/01, % because Markus Kohm supports hyperref in komascript. @@ -16957,7 +17074,7 @@ % % \section{Encoding definition files for encodings of PDF strings} % This was contributed by -% Heiko Oberdiek \Email{oberdiek@ruf.uni-freiburg.de} +% Heiko Oberdiek. % % \subsection{PD1 encoding} % \begin{macrocode} @@ -17004,7 +17121,9 @@ \DeclareTextCompositeCommand{\d}{PD1}{\ }{\textdotbelow} \DeclareTextCommand{\k}{PD1}[1]{\TextSymbolUnavailable{\k{#1}}#1} \DeclareTextCommand{\t}{PD1}[1]{\TextSymbolUnavailable{\t{#1}}#1} -\DeclareTextCommand{\newtie}{PD1}[1]{\TextSymbolUnavailable{\newtie{#1}}#1} +\DeclareTextCommand{\newtie}{PD1}[1]{% + \TextSymbolUnavailable{\newtie{#1}}#1% +} % \end{macrocode} % Special white space escape characters % not for use in bookmarks but for other PDF strings. @@ -17418,7 +17537,7 @@ % \end{macrocode} % Polish aliases. PDF encoding does not have the characters, but it % is useful to Poles to have the plain letters regardless. Requested by -% Wojciech Myszka +% Wojciech Myszka (\Email{W.Myszka@immt.pwr.wroc.pl}). % \begin{macrocode} \DeclareTextCompositeCommand{\k}{PD1}{a}{a}% aogonek \DeclareTextCompositeCommand{\'}{PD1}{c}{c}% cacute diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def b/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def index c8b98a996d2..dd7a818a939 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def +++ b/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def @@ -24,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hdvipdfm.def} - [2009/12/15 v6.79p + [2009/12/16 v6.79u Hyperref driver for dvipdfm] \def\Hy@PutCatalog#1{\@pdfm@mark{docview << #1 >>}} \ifHy@pagelabels @@ -158,7 +158,9 @@ \def\x{XYZ @xpos @ypos null}% \else \@onelevel@sanitize\@pdfview - \Hy@Warning{Unknown value `\@pdfview' for pdfview}% + \Hy@Warning{% + Unknown value `\@pdfview' for pdfview% + }% \def\x{XYZ @xpos @ypos null}% \fi \fi @@ -321,7 +323,9 @@ \let\Hy@testname\Hy@undefinedname \else \Hy@pstringdef\Hy@testname{% - \expandafter\HyperDestNameFilter\expandafter{\Hy@testname}% + \expandafter\HyperDestNameFilter\expandafter{% + \Hy@testname + }% }% \fi \@pdfm@mark{% @@ -696,7 +700,9 @@ } \def\@@Radio#1{% \Fld@listcount=0 % - \setbox\pdfm@box=\hbox{\MakeRadioField{\Fld@width}{\Fld@height}}% + \setbox\pdfm@box=\hbox{% + \MakeRadioField{\Fld@width}{\Fld@height}% + }% \@for\@curropt:=#1\do{% \expandafter\Fld@checkequals\@curropt==\\% \Hy@StepCount\Fld@listcount @@ -707,7 +713,11 @@ \HyField@AdvanceAnnotCount \fi \@pdfm@mark{% - ann \ifnum\Fld@listcount=1 @radio\HyField@TheAnnotCount\space\fi + ann % + \ifnum\Fld@listcount=1 % + @radio\HyField@TheAnnotCount% + \space + \fi \dvipdfm@setdim <<% \PDFForm@Radio @@ -716,14 +726,18 @@ }% \unhcopy\pdfm@box\space% deliberate space between radio buttons \ifnum\Fld@listcount=1 % - \@pdfm@mark{put @afields @radio\HyField@TheAnnotCount}% + \@pdfm@mark{% + put @afields @radio\HyField@TheAnnotCount + }% \fi }% } \newcount\Fld@listcount \def\@@Listbox#1{% \HyField@PDFChoices{#1}% - \setbox\pdfm@box=\hbox{\MakeChoiceField{\Fld@width}{\Fld@height}}% + \setbox\pdfm@box=\hbox{% + \MakeChoiceField{\Fld@width}{\Fld@height}% + }% \leavevmode \Hy@escapeform\PDFForm@List \HyField@AdvanceAnnotCount @@ -837,7 +851,9 @@ \PDFForm@Name \HyField@FlagsCheckBox \ifFld@hidden\def\Fld@width{1sp}\fi - \setbox\pdfm@box=\hbox{\MakeCheckField{\Fld@width}{\Fld@height}}% + \setbox\pdfm@box=\hbox{% + \MakeCheckField{\Fld@width}{\Fld@height}% + }% \HyField@AdvanceAnnotCount \LayoutCheckField{#2}{% \Hy@escapeform\PDFForm@Check @@ -928,7 +944,8 @@ \def\Hy@@escapeform#1\Hy@escapestring#2#3\@nil{% \ifx\\#3\\% \else - \expandafter\Hy@pstringdef\csname Hy@esc@\string#2\endcsname{#2}% + \expandafter + \Hy@pstringdef\csname Hy@esc@\string#2\endcsname{#2}% \Hy@ReturnAfterFi{% \Hy@@escapeform#3\@nil }% @@ -1312,8 +1329,12 @@ \Hy@writebookmark{}{#2}{#3.#1}{#1}{toc}% \hyper@anchorstart{#3.#1}\hyper@anchorend } -\def\BOOKMARK{\@ifnextchar[{\@BOOKMARK}{\@@BOOKMARK[1][-]}} -\def\@BOOKMARK[#1]{\@ifnextchar[{\@@BOOKMARK[#1]}{\@@BOOKMARK[#1][-]}} +\def\BOOKMARK{% + \@ifnextchar[{\@BOOKMARK}{\@@BOOKMARK[1][-]}% +} +\def\@BOOKMARK[#1]{% + \@ifnextchar[{\@@BOOKMARK[{#1}]}{\@@BOOKMARK[{#1}][-]}% +} \RequirePackage{rerunfilecheck}[2009/12/10] \def\Hy@OutlineRerunCheck{% \RerunFileCheck{\jobname.out}{% @@ -1327,7 +1348,9 @@ \begingroup \escapechar=`\\% \let\escapechar\@gobble % - \def\@@BOOKMARK[##1][##2]##3##4##5{\calc@bm@number{##5}}% + \def\@@BOOKMARK[##1][##2]##3##4##5{% + \calc@bm@number{##5}% + }% \InputIfFileExists{\jobname.out}{}{}% \ifx\WriteBookmarks\relax \global\let\WriteBookmarks\relax diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvips.def b/Master/texmf-dist/tex/latex/hyperref/hdvips.def index a9a45cdc943..93aea84a7b2 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hdvips.def +++ b/Master/texmf-dist/tex/latex/hyperref/hdvips.def @@ -24,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hdvips.def} - [2009/12/15 v6.79p + [2009/12/16 v6.79u Hyperref driver for dvips] \providecommand*{\XR@ext}{pdf} \def\Hy@raisedlink{} diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvipson.def b/Master/texmf-dist/tex/latex/hyperref/hdvipson.def index c42ddee914f..878aef2486a 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hdvipson.def +++ b/Master/texmf-dist/tex/latex/hyperref/hdvipson.def @@ -24,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hdvipson.def} - [2009/12/15 v6.79p + [2009/12/16 v6.79u Hyperref driver for dvipsone] \providecommand*{\XR@ext}{pdf} \def\Hy@raisedlink{} diff --git a/Master/texmf-dist/tex/latex/hyperref/hdviwind.def b/Master/texmf-dist/tex/latex/hyperref/hdviwind.def index 5a0db4c4782..74a553e942a 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hdviwind.def +++ b/Master/texmf-dist/tex/latex/hyperref/hdviwind.def @@ -24,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hdviwind.def} - [2009/12/15 v6.79p + [2009/12/16 v6.79u Hyperref driver for dviwindo] \begingroup \toks@\expandafter{\Hy@FirstPageHook}% diff --git a/Master/texmf-dist/tex/latex/hyperref/hpdftex.def b/Master/texmf-dist/tex/latex/hyperref/hpdftex.def index 92b897eb473..6dfe9bdd97f 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hpdftex.def +++ b/Master/texmf-dist/tex/latex/hyperref/hpdftex.def @@ -24,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hpdftex.def} - [2009/12/15 v6.79p + [2009/12/16 v6.79u Hyperref driver for pdfTeX] \let\Hy@PutCatalog\pdfcatalog \ifHy@pagelabels @@ -603,7 +603,8 @@ \def\hyper@pageduration{% \ifx\@pdfpageduration\relax \else - \expandafter\Hy@RemoveDurPageAttr\the\pdfpageattr^^J/Dur{} \END + \expandafter + \Hy@RemoveDurPageAttr\the\pdfpageattr^^J/Dur{} \END \ifx\@pdfpageduration\@empty \else \edef\@processme{% @@ -625,7 +626,8 @@ } \def\hyper@pagehidden{% \ifHy@useHidKey - \expandafter\Hy@RemoveHidPageAttr\the\pdfpageattr^^J/Hid{} \END + \expandafter + \Hy@RemoveHidPageAttr\the\pdfpageattr^^J/Hid{} \END \ifHy@pdfpagehidden \edef\@processme{% \global\pdfpageattr{% @@ -746,8 +748,10 @@ \expandafter\ifx\csname pdflastlink\endcsname\relax \let\HyField@AddToFields\relax \PackageInfo{hyperref}{% - You need pdfTeX 1.40.0 for setting the /Fields entry.\MessageBreak - Adobe Reader/Acrobat accepts an empty /Field array,\MessageBreak + You need pdfTeX 1.40.0 for setting the /Fields entry.% + \MessageBreak + Adobe Reader/Acrobat accepts an empty /Field array,% + \MessageBreak but other PDF viewers might complain% }% \else @@ -1123,7 +1127,8 @@ \def\Hy@@escapeform#1\Hy@escapestring#2#3\@nil{% \ifx\\#3\\% \else - \expandafter\Hy@pstringdef\csname Hy@esc@\string#2\endcsname{#2}% + \expandafter + \Hy@pstringdef\csname Hy@esc@\string#2\endcsname{#2}% \Hy@ReturnAfterFi{% \Hy@@escapeform#3\@nil }% @@ -1507,8 +1512,12 @@ \Hy@writebookmark{}{#2}{#3.#1}{#1}{toc}% \hyper@anchorstart{#3.#1}\hyper@anchorend } -\def\BOOKMARK{\@ifnextchar[{\@BOOKMARK}{\@@BOOKMARK[1][-]}} -\def\@BOOKMARK[#1]{\@ifnextchar[{\@@BOOKMARK[#1]}{\@@BOOKMARK[#1][-]}} +\def\BOOKMARK{% + \@ifnextchar[{\@BOOKMARK}{\@@BOOKMARK[1][-]}% +} +\def\@BOOKMARK[#1]{% + \@ifnextchar[{\@@BOOKMARK[{#1}]}{\@@BOOKMARK[{#1}][-]}% +} \RequirePackage{rerunfilecheck}[2009/12/10] \def\Hy@OutlineRerunCheck{% \RerunFileCheck{\jobname.out}{% @@ -1522,7 +1531,9 @@ \begingroup \escapechar=`\\% \let\escapechar\@gobble % - \def\@@BOOKMARK[##1][##2]##3##4##5{\calc@bm@number{##5}}% + \def\@@BOOKMARK[##1][##2]##3##4##5{% + \calc@bm@number{##5}% + }% \InputIfFileExists{\jobname.out}{}{}% \ifx\WriteBookmarks\relax \global\let\WriteBookmarks\relax diff --git a/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg b/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg index 1ddec45b157..7fd16ede471 100644 --- a/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg +++ b/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg @@ -24,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{htex4ht.cfg} - [2009/12/15 v6.79p + [2009/12/16 v6.79u 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 5324716ce5b..56597ab35a0 100644 --- a/Master/texmf-dist/tex/latex/hyperref/htex4ht.def +++ b/Master/texmf-dist/tex/latex/hyperref/htex4ht.def @@ -24,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{htex4ht.def} - [2009/12/15 v6.79p + [2009/12/16 v6.79u Hyperref driver for TeX4ht] \providecommand*{\XR@ext}{html} \def\Hy@raisedlink{} @@ -95,7 +95,10 @@ \@linkdim\dp\@tempboxa \lower\@linkdim\hbox{% \begingroup - \hyper@chars\special{t4ht=}% + \hyper@chars + \special{% + t4ht=% + }% \endgroup }% \Hy@colorlink\@urlcolor#1\Hy@endcolorlink diff --git a/Master/texmf-dist/tex/latex/hyperref/htexture.def b/Master/texmf-dist/tex/latex/hyperref/htexture.def index 783d2e3d25b..a161c670c49 100644 --- a/Master/texmf-dist/tex/latex/hyperref/htexture.def +++ b/Master/texmf-dist/tex/latex/hyperref/htexture.def @@ -24,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{htexture.def} - [2009/12/15 v6.79p + [2009/12/16 v6.79u Hyperref driver for Textures] \providecommand*{\XR@ext}{pdf} \begingroup @@ -155,8 +155,10 @@ \else \begingroup \hyper@chars - \special{html:}% + \special{% + html:% + }% \endgroup \fi } @@ -165,7 +167,9 @@ \Hy@endcolorlink } \def\hyper@linkfile#1#2#3{% - \hyper@linkurl{#1}{\Hy@linkfileprefix#2\ifx\\#3\\\else\##3\fi}% + \hyper@linkurl{#1}{% + \Hy@linkfileprefix#2\ifx\\#3\\\else\##3\fi + }% } \def\hyper@linkurl#1#2{% \leavevmode diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtex.def b/Master/texmf-dist/tex/latex/hyperref/hvtex.def index 4f6ab7c133d..0aece0678e5 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hvtex.def +++ b/Master/texmf-dist/tex/latex/hyperref/hvtex.def @@ -24,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hvtex.def} - [2009/12/15 v6.79p + [2009/12/16 v6.79u Hyperref driver for VTeX in PDF/PS mode] \providecommand*{\XR@ext}{pdf} \edef\Hy@VTeXversion{% @@ -191,7 +191,9 @@ \@ifundefined{@#1bordercolor}{% \let\CurrentBorderColor\relax }{% - \edef\CurrentBorderColor{\csname @#1bordercolor\endcsname}% + \edef\CurrentBorderColor{% + \csname @#1bordercolor\endcsname + }% }% \def\Hy@tempa{#1}% \ifx\Hy@tempa\@urltype @@ -298,7 +300,8 @@ \fi >% }% - \expandafter\Hy@colorlink\csname @#1color\endcsname#3\Hy@endcolorlink + \expandafter + \Hy@colorlink\csname @#1color\endcsname#3\Hy@endcolorlink \special{!endaref}% } \def\hyper@image#1#2{% @@ -314,7 +317,10 @@ /S/Launch% /F(\Hy@pstringF)% \Hy@SetNewWindow - \ifx\\#3\\\else /Win<>\fi% + \ifx\\#3\\% + \else + /Win<>% + \fi% >;% a=<% \ifHy@pdfa /F 4\fi @@ -367,7 +373,9 @@ \def\hvtex@par@direction{/Di}% \def\hvtex@par@duration{/D}% \def\hvtex@par@motion{/M}% - \def\hvtex@gettoken{\expandafter\hvtex@gettoken@\hvtex@buffer\@nil}% + \def\hvtex@gettoken{% + \expandafter\hvtex@gettoken@\hvtex@buffer\@nil + }% \def\hvtex@gettoken@#1 #2\@nil{% \edef\hvtex@token{#1}% \edef\hvtex@buffer{#2}% @@ -667,8 +675,12 @@ \Hy@writebookmark{}{#2}{#3.#1}{#1}{toc}% \hyper@anchorstart{#3.#1}\hyper@anchorend } -\def\BOOKMARK{\@ifnextchar[{\@BOOKMARK}{\@@BOOKMARK[1][-]}} -\def\@BOOKMARK[#1]{\@ifnextchar[{\@@BOOKMARK[#1]}{\@@BOOKMARK[#1][-]}} +\def\BOOKMARK{% + \@ifnextchar[{\@BOOKMARK}{\@@BOOKMARK[1][-]}% +} +\def\@BOOKMARK[#1]{% + \@ifnextchar[{\@@BOOKMARK[{#1}]}{\@@BOOKMARK[{#1}][-]}% +} \RequirePackage{rerunfilecheck}[2009/12/10] \def\Hy@OutlineRerunCheck{% \RerunFileCheck{\jobname.out}{% @@ -725,7 +737,9 @@ \fi \endgroup \def\@@BOOKMARK[#1][#2]#3#4#5{% - \expandafter\edef\csname @count@#3\endcsname{\the\@serial@counter}% + \expandafter\edef\csname @count@#3\endcsname{% + \the\@serial@counter + }% \edef\@mycount{\the\@serial@counter}% \Hy@StepCount\@serial@counter \edef\@parcount{% diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def b/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def index 3bcbe4a6d6a..2979cb2da05 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def +++ b/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def @@ -24,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hvtexhtml.def} - [2009/12/15 v6.79p + [2009/12/16 v6.79u Hyperref driver for VTeX in HTML mode] \providecommand*{\XR@ext}{htm} \RequirePackage{vtexhtml} @@ -109,7 +109,9 @@ \Hy@activeanchorfalse \Hy@RestoreLastskip } -\def\@Form[#1]{\typeout{Sorry, TeXpider does not yet support FORMs}} +\def\@Form[#1]{% + \typeout{Sorry, TeXpider does not yet support FORMs}% +} \def\@endForm{} \def\@Gauge[#1]#2#3#4{% parameters, label, minimum, maximum \typeout{Sorry, TeXpider does not yet support FORM gauges}% diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def b/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def index 0701d9c7594..8d304e85b0e 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def +++ b/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def @@ -24,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hvtexmrk.def} - [2009/12/15 v6.79p + [2009/12/16 v6.79u Hyperref driver for VTeX in PDF/PS mode (pdfmark specials)] \providecommand*{\XR@ext}{pdf} \def\Hy@raisedlink{} diff --git a/Master/texmf-dist/tex/latex/hyperref/hxetex.def b/Master/texmf-dist/tex/latex/hyperref/hxetex.def index 396ded8546c..fc8ae2e6cea 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hxetex.def +++ b/Master/texmf-dist/tex/latex/hyperref/hxetex.def @@ -24,14 +24,15 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hxetex.def} - [2009/12/15 v6.79p + [2009/12/16 v6.79u Hyperref driver for XeTeX] \HyPsd@LoadUnicode \Hy@unicodetrue -\ifx\HyPsd@pdfencoding\HyPsd@pdfencoding@auto +\ifx\HyPsd@pdfencoding\HyPsd@pdfencoding@unicode \else - \let\HyPsd@pdfencoding\HyPsd@pdfencoding@unicode + \let\HyPsd@pdfencoding\HyPsd@pdfencoding@auto \fi +\HyPsd@LoadStringEnc \define@key{Hyp}{unicode}[true]{% \Hy@boolkey{unicode}{#1}% \ifHy@unicode @@ -239,7 +240,9 @@ \def\x{XYZ @xpos @ypos null}% \else \@onelevel@sanitize\@pdfview - \Hy@Warning{Unknown value `\@pdfview' for pdfview}% + \Hy@Warning{% + Unknown value `\@pdfview' for pdfview% + }% \def\x{XYZ @xpos @ypos null}% \fi \fi @@ -402,7 +405,9 @@ \let\Hy@testname\Hy@undefinedname \else \Hy@pstringdef\Hy@testname{% - \expandafter\HyperDestNameFilter\expandafter{\Hy@testname}% + \expandafter\HyperDestNameFilter\expandafter{% + \Hy@testname + }% }% \fi \@pdfm@mark{% @@ -757,7 +762,9 @@ } \def\@@Radio#1{% \Fld@listcount=0 % - \setbox\pdfm@box=\hbox{\MakeRadioField{\Fld@width}{\Fld@height}}% + \setbox\pdfm@box=\hbox{% + \MakeRadioField{\Fld@width}{\Fld@height}% + }% \@for\@curropt:=#1\do{% \expandafter\Fld@checkequals\@curropt==\\% \Hy@StepCount\Fld@listcount @@ -768,7 +775,11 @@ \HyField@AdvanceAnnotCount \fi \@pdfm@mark{% - ann \ifnum\Fld@listcount=1 @radio\HyField@TheAnnotCount\space\fi + ann % + \ifnum\Fld@listcount=1 % + @radio\HyField@TheAnnotCount% + \space + \fi \dvipdfm@setdim <<% \PDFForm@Radio @@ -777,14 +788,18 @@ }% \unhcopy\pdfm@box\space% deliberate space between radio buttons \ifnum\Fld@listcount=1 % - \@pdfm@mark{put @afields @radio\HyField@TheAnnotCount}% + \@pdfm@mark{% + put @afields @radio\HyField@TheAnnotCount + }% \fi }% } \newcount\Fld@listcount \def\@@Listbox#1{% \HyField@PDFChoices{#1}% - \setbox\pdfm@box=\hbox{\MakeChoiceField{\Fld@width}{\Fld@height}}% + \setbox\pdfm@box=\hbox{% + \MakeChoiceField{\Fld@width}{\Fld@height}% + }% \leavevmode \Hy@escapeform\PDFForm@List \HyField@AdvanceAnnotCount @@ -898,7 +913,9 @@ \PDFForm@Name \HyField@FlagsCheckBox \ifFld@hidden\def\Fld@width{1sp}\fi - \setbox\pdfm@box=\hbox{\MakeCheckField{\Fld@width}{\Fld@height}}% + \setbox\pdfm@box=\hbox{% + \MakeCheckField{\Fld@width}{\Fld@height}% + }% \HyField@AdvanceAnnotCount \LayoutCheckField{#2}{% \Hy@escapeform\PDFForm@Check @@ -989,7 +1006,8 @@ \def\Hy@@escapeform#1\Hy@escapestring#2#3\@nil{% \ifx\\#3\\% \else - \expandafter\Hy@pstringdef\csname Hy@esc@\string#2\endcsname{#2}% + \expandafter + \Hy@pstringdef\csname Hy@esc@\string#2\endcsname{#2}% \Hy@ReturnAfterFi{% \Hy@@escapeform#3\@nil }% @@ -1373,8 +1391,12 @@ \Hy@writebookmark{}{#2}{#3.#1}{#1}{toc}% \hyper@anchorstart{#3.#1}\hyper@anchorend } -\def\BOOKMARK{\@ifnextchar[{\@BOOKMARK}{\@@BOOKMARK[1][-]}} -\def\@BOOKMARK[#1]{\@ifnextchar[{\@@BOOKMARK[#1]}{\@@BOOKMARK[#1][-]}} +\def\BOOKMARK{% + \@ifnextchar[{\@BOOKMARK}{\@@BOOKMARK[1][-]}% +} +\def\@BOOKMARK[#1]{% + \@ifnextchar[{\@@BOOKMARK[{#1}]}{\@@BOOKMARK[{#1}][-]}% +} \RequirePackage{rerunfilecheck}[2009/12/10] \def\Hy@OutlineRerunCheck{% \RerunFileCheck{\jobname.out}{% @@ -1388,7 +1410,9 @@ \begingroup \escapechar=`\\% \let\escapechar\@gobble % - \def\@@BOOKMARK[##1][##2]##3##4##5{\calc@bm@number{##5}}% + \def\@@BOOKMARK[##1][##2]##3##4##5{% + \calc@bm@number{##5}% + }% \InputIfFileExists{\jobname.out}{}{}% \ifx\WriteBookmarks\relax \global\let\WriteBookmarks\relax diff --git a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty index 8dee55e1f6d..da9b80b7afc 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty +++ b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty @@ -25,7 +25,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{hyperref} - [2009/12/15 v6.79p + [2009/12/16 v6.79u Hypertext links for LaTeX] \begingroup \@makeother\`% @@ -322,13 +322,14 @@ \let\vphantom\@gobble \let\hphantom\@gobble \def\textcolor##1##{\@secondoftwo}% - \def\MakeUppercase{\MakeUppercaseIsNotSupportedInPdfStrings}% - \def\MakeLowercase{\MakeLowercaseIsNotSupportedInPdfStrings}% + \def\MakeUppercase{\MakeUppercaseUnsupportedInPdfStrings}% + \def\MakeLowercase{\MakeLowercaseUnsupportedInPdfStrings}% \let\textlatin\@firstofone \@ifundefined{language@group}{}{% \csname HyPsd@babel@\language@group\endcsname }% \HyPsd@GreekPatch + \HyPsd@BabelPatch \let\@safe@activestrue\relax \let\@safe@activesfalse\relax \let\cyr\relax @@ -357,7 +358,7 @@ \let\mbox\@empty \def\halign{\pdfstringdefWarn\halign\@gobble}% \let\ignorespaces\HyPsd@ignorespaces -\let\Hy@SectionAnchor\@empty + \let\Hy@SectionAnchor\@empty \ifHy@CJKbookmarks \HyPsd@CJKhook \fi @@ -480,7 +481,7 @@ \EdefUnescapeString\HyPsd@temp#1% \ifxetex \StringEncodingConvertTest\HyPsd@temp\HyPsd@temp - {utf16be}{ascii}{% + {utf16be}{ascii-print}{% \EdefEscapeString\HyPsd@temp\HyPsd@temp \global\let#1\HyPsd@temp \Hy@unicodefalse @@ -569,6 +570,50 @@ }% }% \x +\def\HyPsd@BabelPatch{% + \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 + \def\HyPsd@LanguageShorthands#1{% + \expandafter\ifx\csname HyPsd@langshort@#1\endcsname + \HyPsd@langshort@system + \expandafter\@gobble + \else + \expandafter\@firstofone + \fi + {% + \HyOrg@languageshorthands{#1}% + }% + }% +\else + \def\HyPsd@LanguageShorthands#1{% + \ifnum\pdf@strcmp{#1}{system}=\z@ + \expandafter\@gobble + \else + \expandafter\@firstofone + \fi + {% + \HyOrg@languageshorthands{#1}% + }% + }% +\fi +\def\Hy@temp{% + \@ifpackageloaded{babel}{% + \@ifpackagelater{babel}{2008/03/16}{% + \let\Hy@temp\@empty + }{% + \def\HyPsd@BabelPatch{% + \let\HyOrg@languageshorthands\languageshorthands + }% + }% + }{}% +} +\Hy@temp +\expandafter\AtBeginDocument\expandafter{\Hy@temp} \newif\ifHy@next \@ifundefined{danish@sh@"@sel}{}{% \def\HyPsd@babel@danish{% @@ -1846,6 +1891,23 @@ \Hy@boolkey{final}{#1}% } \let\KV@Hyp@nolinks\KV@Hyp@draft +\def\Hy@ObsoletePaperOption#1{% + \Hy@WarningNoLine{% + Option `#1' is no longer used% + }% + \define@key{Hyp}{#1}[true]{}% +} +\def\Hy@temp#1{% + \define@key{Hyp}{#1}[true]{% + \Hy@ObsoletePaperOption{#1}% + }% +} +\Hy@temp{a4paper} +\Hy@temp{a5paper} +\Hy@temp{b5paper} +\Hy@temp{letterpaper} +\Hy@temp{legalpaper} +\Hy@temp{executivepaper} \define@key{Hyp}{setpagesize}[true]{% \Hy@boolkey{setpagesize}{#1}% } @@ -2001,7 +2063,7 @@ \def\HyPsd@pdfencoding@unicode{unicode} \let\HyPsd@pdfencoding\Hy@pdfencoding@pdfdoc \def\HyPsd@LoadStringEnc{% - \RequirePackage{stringenc}[2007/06/14]% + \RequirePackage{stringenc}[2009/12/15]% \let\HyPsd@LoadStringEnc\relax } \AtBeginDocument{% @@ -2988,36 +3050,6 @@ \ifHy@next \let\texttilde\~% \fi -\@ifpackageloaded{babel}{% - \@ifpackagelater{babel}{2008/03/16}{% - \def\Hy@PatchLanguageShorthands#1{% - \begingroup - \edef\x{#1}% - \@onelevel@sanitize\x - \def\y{system}% - \@onelevel@sanitize\y - \expandafter\endgroup - \ifx\x\y - \else - \HyOrg@languageshorthands{#1}% - \fi - }% - \AtBeginDocument{% - \begingroup - \toks0=\expandafter{\pdfstringdefPreHook}% - \xdef\pdfstringdefPreHook{% - \let\noexpand\HyOrg@languageshorthands - \noexpand\languageshorthands - \let\noexpand\languageshorthands - \noexpand\Hy@PatchLanguageShorthands - \the\toks0 % - \let\noexpand\languageshorthands - \noexpand\HyOrg@languageshorthands - }% - \endgroup - }% - }{}% -}{} \ifHy@figures \Hy@Info{Hyper figures ON}% \else @@ -5302,10 +5334,14 @@ \long\def\@mpfootnotetext#1{% \H@@mpfootnotetext{% \ifHy@nesting - \expandafter\hyper@@anchor\expandafter{\Hy@footnote@currentHref}{#1}% + \expandafter\hyper@@anchor\expandafter{% + \Hy@footnote@currentHref + }{#1}% \else \Hy@raisedlink{% - \expandafter\hyper@@anchor\expandafter{\Hy@footnote@currentHref}{\relax}% + \expandafter\hyper@@anchor\expandafter{% + \Hy@footnote@currentHref + }{\relax}% }#1% \fi }% @@ -5313,10 +5349,14 @@ \long\def\@footnotetext#1{% \H@@footnotetext{% \ifHy@nesting - \expandafter\hyper@@anchor\expandafter{\Hy@footnote@currentHref}{#1}% + \expandafter\hyper@@anchor\expandafter{% + \Hy@footnote@currentHref + }{#1}% \else \Hy@raisedlink{% - \expandafter\hyper@@anchor\expandafter{\Hy@footnote@currentHref}{\relax}% + \expandafter\hyper@@anchor\expandafter{% + \Hy@footnote@currentHref + }{\relax}% }% \let\@currentHlabel\Hy@footnote@currentHlabel \let\@currentHref\Hy@footnote@currentHref @@ -5404,7 +5444,9 @@ \bgroup \aftergroup\V@@@footnotetext \Hy@raisedlink{% - \expandafter\hyper@@anchor\expandafter{\Hy@footnote@currentHref}{\relax}% + \expandafter\hyper@@anchor\expandafter{% + \Hy@footnote@currentHref + }{\relax}% }% \let\@currentHlabel\Hy@footnote@currentHlabel \let\@currentHref\Hy@footnote@currentHref @@ -5494,7 +5536,9 @@ \expandafter\hyper@@anchor\expandafter{\@currentHref}{#3}% \else \Hy@raisedlink{% - \expandafter\hyper@@anchor\expandafter{\@currentHref}{\relax}% + \expandafter\hyper@@anchor\expandafter{% + \@currentHref + }{\relax}% }% #3% \fi @@ -5520,7 +5564,9 @@ #1\relax \ifx\Hy@float@currentHref\@undefined \else - \expandafter\hyper@@anchor\expandafter{\Hy@float@currentHref}{\relax}% + \expandafter\hyper@@anchor\expandafter{% + \Hy@float@currentHref + }{\relax}% \global\let\Hy@float@currentHref\@undefined \fi }% @@ -5778,7 +5824,9 @@ \fi \else \Hy@GlobalStepCount\Hy@pagecounter - \def\Hy@TempPageAnchor{\hyper@@anchor{page.\the\Hy@pagecounter}}% + \def\Hy@TempPageAnchor{% + \hyper@@anchor{page.\the\Hy@pagecounter}% + }% \fi \vbox to 0pt{% \kern\voffset @@ -5911,7 +5959,9 @@ \def\@seteqlabel#1{% \H@seteqlabel{#1}% \xdef\@currentHref{AMS.\the\Hy@linkcounter}% - \Hy@raisedlink{\hyper@anchorstart{\@currentHref}\hyper@anchorend}% + \Hy@raisedlink{% + \hyper@anchorstart{\@currentHref}\hyper@anchorend + }% }% }{} \let\HyOrg@addtoreset\@addtoreset @@ -6462,7 +6512,8 @@ }% }{% \edef\HyRef@currentHtag{% - \expandafter\noexpand\csname\HyRef@name autorefname\endcsname + \expandafter\noexpand + \csname\HyRef@name autorefname\endcsname \noexpand~% }% }% diff --git a/Master/texmf-dist/tex/latex/hyperref/hypertex.def b/Master/texmf-dist/tex/latex/hyperref/hypertex.def index 8ef2ce1ff1c..70f9bbeeda4 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hypertex.def +++ b/Master/texmf-dist/tex/latex/hyperref/hypertex.def @@ -24,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hypertex.def} - [2009/12/15 v6.79p + [2009/12/16 v6.79u Hyperref driver for HyperTeX specials] \providecommand*{\XR@ext}{dvi} \def\PDF@FinishDoc{} diff --git a/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty b/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty index 1c80f023a74..7ab67b07479 100644 --- a/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty +++ b/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty @@ -25,7 +25,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{nohyperref} - [2009/12/15 v6.79p + [2009/12/16 v6.79u Dummy hyperref (SR)] \let\hyper@@anchor\@gobble \def\hyper@link#1#2#3{#3}% diff --git a/Master/texmf-dist/tex/latex/hyperref/pd1enc.def b/Master/texmf-dist/tex/latex/hyperref/pd1enc.def index 77e00246d36..30b22b1bd87 100644 --- a/Master/texmf-dist/tex/latex/hyperref/pd1enc.def +++ b/Master/texmf-dist/tex/latex/hyperref/pd1enc.def @@ -24,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{pd1enc.def} - [2009/12/15 v6.79p + [2009/12/16 v6.79u Hyperref: PDFDocEncoding definition (HO)] \DeclareFontEncoding{PD1}{}{} \DeclareTextAccent{\`}{PD1}{\textasciigrave} @@ -65,7 +65,9 @@ \DeclareTextCompositeCommand{\d}{PD1}{\ }{\textdotbelow} \DeclareTextCommand{\k}{PD1}[1]{\TextSymbolUnavailable{\k{#1}}#1} \DeclareTextCommand{\t}{PD1}[1]{\TextSymbolUnavailable{\t{#1}}#1} -\DeclareTextCommand{\newtie}{PD1}[1]{\TextSymbolUnavailable{\newtie{#1}}#1} +\DeclareTextCommand{\newtie}{PD1}[1]{% + \TextSymbolUnavailable{\newtie{#1}}#1% +} \DeclareTextCommand{\textHT}{PD1}{\011}% U+0009 \DeclareTextCommand{\textLF}{PD1}{\012}% U+000A \DeclareTextCommand{\textCR}{PD1}{\015}% U+000D diff --git a/Master/texmf-dist/tex/latex/hyperref/pdfmark.def b/Master/texmf-dist/tex/latex/hyperref/pdfmark.def index d9f64658817..4d4b56f2d6a 100644 --- a/Master/texmf-dist/tex/latex/hyperref/pdfmark.def +++ b/Master/texmf-dist/tex/latex/hyperref/pdfmark.def @@ -24,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{pdfmark.def} - [2009/12/15 v6.79p + [2009/12/16 v6.79u Hyperref definitions for pdfmark specials] \begingroup \toks@\expandafter{\Hy@FirstPageHook}% @@ -1019,7 +1019,9 @@ \Hy@escapeform\PDFForm@Radio \pdfmark[\MakeRadioField{\Fld@width}{\Fld@height}]{% pdfmark=/ANN,% - Raw={\PDFForm@Radio /AP <> >>}% + Raw={% + \PDFForm@Radio /AP <> >>% + }% } % deliberate space between radio buttons }% } @@ -1146,7 +1148,8 @@ \def\Hy@@escapeform#1\Hy@escapestring#2#3\@nil{% \ifx\\#3\\% \else - \expandafter\Hy@pstringdef\csname Hy@esc@\string#2\endcsname{#2}% + \expandafter + \Hy@pstringdef\csname Hy@esc@\string#2\endcsname{#2}% \Hy@ReturnAfterFi{% \Hy@@escapeform#3\@nil }% @@ -1530,8 +1533,12 @@ \Hy@writebookmark{}{#2}{#3.#1}{#1}{toc}% \hyper@anchorstart{#3.#1}\hyper@anchorend } -\def\BOOKMARK{\@ifnextchar[{\@BOOKMARK}{\@@BOOKMARK[1][-]}} -\def\@BOOKMARK[#1]{\@ifnextchar[{\@@BOOKMARK[#1]}{\@@BOOKMARK[#1][-]}} +\def\BOOKMARK{% + \@ifnextchar[{\@BOOKMARK}{\@@BOOKMARK[1][-]}% +} +\def\@BOOKMARK[#1]{% + \@ifnextchar[{\@@BOOKMARK[{#1}]}{\@@BOOKMARK[{#1}][-]}% +} \RequirePackage{rerunfilecheck}[2009/12/10] \def\Hy@OutlineRerunCheck{% \RerunFileCheck{\jobname.out}{% @@ -1545,7 +1552,9 @@ \begingroup \escapechar=`\\% \let\escapechar\@gobble % - \def\@@BOOKMARK[##1][##2]##3##4##5{\calc@bm@number{##5}}% + \def\@@BOOKMARK[##1][##2]##3##4##5{% + \calc@bm@number{##5}% + }% \InputIfFileExists{\jobname.out}{}{}% \ifx\WriteBookmarks\relax \global\let\WriteBookmarks\relax diff --git a/Master/texmf-dist/tex/latex/hyperref/puarenc.def b/Master/texmf-dist/tex/latex/hyperref/puarenc.def index ad34661d288..dad3534c5a6 100644 --- a/Master/texmf-dist/tex/latex/hyperref/puarenc.def +++ b/Master/texmf-dist/tex/latex/hyperref/puarenc.def @@ -24,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{puarenc.def} - [2009/12/15 v6.79p + [2009/12/16 v6.79u 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 f3806c45047..e65a8460e6f 100644 --- a/Master/texmf-dist/tex/latex/hyperref/puenc.def +++ b/Master/texmf-dist/tex/latex/hyperref/puenc.def @@ -24,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{puenc.def} - [2009/12/15 v6.79p + [2009/12/16 v6.79u 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 96cd22f62bb..f296ee3d0f6 100644 --- a/Master/texmf-dist/tex/latex/hyperref/puvnenc.def +++ b/Master/texmf-dist/tex/latex/hyperref/puvnenc.def @@ -24,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{puvnenc.def} - [2009/12/15 v6.79p + [2009/12/16 v6.79u Hyperref: Additions to puenc.def for VnTeX] \DeclareTextCommand{\abreve}{PU}{\81\003} \DeclareTextCommand{\acircumflex}{PU}{\80\342} -- cgit v1.2.3