From 1518aef65389272c79c68a75ed8f9af5ff98d83c Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Fri, 16 Nov 2007 11:07:29 +0000 Subject: hyperref v6.77e git-svn-id: svn://tug.org/texlive/trunk@5453 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def | 42 +++-- Master/texmf-dist/tex/latex/hyperref/hdvips.def | 2 +- Master/texmf-dist/tex/latex/hyperref/hdvipson.def | 25 ++- Master/texmf-dist/tex/latex/hyperref/hdviwind.def | 47 ++++-- Master/texmf-dist/tex/latex/hyperref/hpdftex.def | 174 +++++++++++++-------- 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 | 76 ++++++--- Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def | 10 +- Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def | 2 +- Master/texmf-dist/tex/latex/hyperref/hyperref.sty | 73 +++++++-- Master/texmf-dist/tex/latex/hyperref/hypertex.def | 22 ++- .../texmf-dist/tex/latex/hyperref/nohyperref.sty | 6 +- Master/texmf-dist/tex/latex/hyperref/pd1enc.def | 2 +- Master/texmf-dist/tex/latex/hyperref/pdfmark.def | 104 ++++++++---- 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 +- 19 files changed, 414 insertions(+), 183 deletions(-) (limited to 'Master/texmf-dist/tex/latex') diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def b/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def index c649201dedd..cbc4ee63ea1 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} - [2007/10/30 v6.77b + [2007/11/12 v6.77e Hyperref driver for dvipdfm] \def\Hy@PutCatalog#1{\@pdfm@mark{docview << #1 >>}} \ifHy@pagelabels @@ -58,8 +58,9 @@ }% }% \fi +\RequirePackage{pdftexcmds}[2007/11/11] \begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname pdfescapestring\endcsname\relax +\expandafter\ifx\csname pdf@escapestring\endcsname\relax \begingroup \catcode`\|=0 % \@makeother\\% @@ -104,7 +105,7 @@ }% \else \def\Hy@pstringdef#1#2{% - \edef#1{\pdfescapestring{#2}}% + \edef#1{\pdf@escapestring{#2}}% }% \fi \newsavebox{\pdfm@box} @@ -300,6 +301,11 @@ } \ifx\@pdfproducer\relax \def\@pdfproducer{dvipdfm}% + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname XeTeXversion\endcsname\relax + \else + \edef\@pdfproducer{XeTeX \the\XeTeXversion\XeTeXrevision}% + \fi \fi \def\PDF@FinishDoc{% \Hy@UseMaketitleInfos @@ -365,9 +371,12 @@ \Hy@pstringdef\Hy@pstringB{\@baseurl}% \@pdfm@mark{% docview<<% - \ifx\@pdfstartview\@empty + \ifx\@pdfstartpage\@empty \else - /OpenAction[@page\@pdfstartpage\@pdfstartview]% + \ifx\@pdfstartview\@empty + \else + /OpenAction[@page\@pdfstartpage\@pdfstartview]% + \fi \fi \ifx\@baseurl\@empty \else @@ -1008,7 +1017,8 @@ /BS<>% /A<>% } -\def\Hy@writebookmark#1#2#3#4#5{% section number, text, label, level, file +\def\Hy@writebookmark#1#2#3#4#5{% + % section number, text, label, level, file \ifx\WriteBookmarks\relax% \else \ifnum#4>\Hy@bookmarksdepth\relax @@ -1170,7 +1180,9 @@ \let\@mkboth\@gobbletwo \Hy@GlobalStepCount\Hy@linkcounter \xdef\@currentHref{\Hy@chapapp*.\the\Hy@linkcounter}% - \Hy@raisedlink{\hyper@anchorstart{\@currentHref}\hyper@anchorend}% + \Hy@raisedlink{% + \hyper@anchorstart{\@currentHref}\hyper@anchorend + }% \endgroup } \@ifundefined{@chapter}{}{% @@ -1179,7 +1191,9 @@ \def\Hy@next{% \Hy@GlobalStepCount\Hy@linkcounter \xdef\@currentHref{\Hy@chapapp*.\the\Hy@linkcounter}% - \Hy@raisedlink{\hyper@anchorstart{\@currentHref}\hyper@anchorend}% + \Hy@raisedlink{% + \hyper@anchorstart{\@currentHref}\hyper@anchorend + }% }% \ifnum\c@secnumdepth>\m@ne \@ifundefined{if@mainmatter}% @@ -1209,7 +1223,9 @@ \H@old@spart{#1}% \Hy@GlobalStepCount\Hy@linkcounter \xdef\@currentHref{part*.\the\Hy@linkcounter}% - \Hy@raisedlink{\hyper@anchorstart{\@currentHref}\hyper@anchorend}% + \Hy@raisedlink{% + \hyper@anchorstart{\@currentHref}\hyper@anchorend + }% } \let\H@old@sect\@sect \def\@sect#1#2#3#4#5#6[#7]#8{% @@ -1219,7 +1235,9 @@ \fi \H@old@sect{#1}{#2}{#3}{#4}{#5}{#6}[{#7}]{#8}% \ifnum #2>\c@secnumdepth - \Hy@raisedlink{\hyper@anchorstart{\@currentHref}\hyper@anchorend}% + \Hy@raisedlink{% + \hyper@anchorstart{\@currentHref}\hyper@anchorend + }% \fi } \expandafter\def\csname Parent-4\endcsname{} @@ -1243,7 +1261,9 @@ \addtocontents{lot}{\protect\addvspace{10\p@}}% \Hy@GlobalStepCount\Hy@linkcounter \xdef\@currentHref{\Hy@chapapp*.\the\Hy@linkcounter}% - \Hy@raisedlink{\hyper@anchorstart{\@currentHref}\hyper@anchorend}% + \Hy@raisedlink{% + \hyper@anchorstart{\@currentHref}\hyper@anchorend + }% \if@twocolumn \@topnewpage[\@makeschapterhead{##2}]% \else diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvips.def b/Master/texmf-dist/tex/latex/hyperref/hdvips.def index 75bb21712fd..7b4d51dafaa 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} - [2007/10/30 v6.77b + [2007/11/12 v6.77e Hyperref driver for dvips] \input{pdfmark.def}% \ifx\@pdfproducer\relax diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvipson.def b/Master/texmf-dist/tex/latex/hyperref/hdvipson.def index ba6f62c6ea6..329bf0abd3e 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} - [2007/10/30 v6.77b + [2007/11/12 v6.77e Hyperref driver for dvipsone] \providecommand*\@pdfborder{0 0 1} \providecommand*\@pdfborderstyle{} @@ -63,12 +63,25 @@ \Hy@DisableOption{pdfkeywords}% } \def\PDF@SetupDoc{% - \pdfmark{% - pdfmark=/DOCVIEW,% - Page=\@pdfstartpage,% - View=\@pdfstartview,% - PageMode=/\@pdfpagemode + \def\Hy@temp{}% + \ifx\@pdfstartpage\@empty + \else + \ifx\@pdfstartview\@empty + \else + \edef\Hy@temp{% + ,Page=\@pdfstartpage + ,View=\@pdfstartview + }% + \fi + \fi + \edef\Hy@temp{% + \noexpand\pdfmark{% + pdfmark=/DOCVIEW,% + PageMode=/\@pdfpagemode + \Hy@temp + }% }% + \Hy@temp \ifx\@pdfpagescrop\@empty \else \pdfmark{pdfmark=/PAGES,CropBox=\@pdfpagescrop}% diff --git a/Master/texmf-dist/tex/latex/hyperref/hdviwind.def b/Master/texmf-dist/tex/latex/hyperref/hdviwind.def index 292050a626f..bbba4a61007 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} - [2007/10/30 v6.77b + [2007/11/12 v6.77e Hyperref driver for dviwindo] \def\Hy@PutCatalog#1{% \pdfmark{pdfmark=/PUT,Raw={\string{Catalog\string} << #1 >>}}% @@ -60,8 +60,9 @@ }% }% \fi +\RequirePackage{pdftexcmds}[2007/11/11] \begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname pdfescapestring\endcsname\relax +\expandafter\ifx\csname pdf@escapestring\endcsname\relax \begingroup \catcode`\|=0 % \@makeother\\% @@ -106,7 +107,7 @@ }% \else \def\Hy@pstringdef#1#2{% - \edef#1{\pdfescapestring{#2}}% + \edef#1{\pdf@escapestring{#2}}% }% \fi \providecommand*\wwwbrowser{c:\string\netscape\string\netscape} @@ -164,7 +165,8 @@ \number\ht\@tempboxa\space #2% }% - \exandafter\Hy@colorlink\csname @#1color\endcsname#3\Hy@endcolorlink + \exandafter\Hy@colorlink\csname @#1color\endcsname#3% + \Hy@endcolorlink \fi } \def\hyper@linkurl#1#2{% @@ -266,11 +268,25 @@ \ifx\@pdfpagescrop\@empty\else \special{PDF: BBox \@pdfpagescrop}% \fi - \pdfmark{pdfmark=/DOCVIEW,% - Page=\@pdfstartpage,% - View=\@pdfstartview,% - PageMode=/\@pdfpagemode + \def\Hy@temp{}% + \ifx\@pdfstartpage\@empty + \else + \ifx\@pdfstartview\@empty + \else + \edef\Hy@temp{% + ,Page=\@pdfstartpage + ,View=\@pdfstartview + }% + \fi + \fi + \edef\Hy@temp{% + \noexpand\pdfmark{% + pdfmark=/DOCVIEW,% + PageMode=/\@pdfpagemode + \Hy@temp + }% }% + \Hy@temp \ifx\@pdfpagescrop\@empty \else \pdfmark{pdfmark=/PAGES,CropBox=\@pdfpagescrop}% @@ -363,10 +379,15 @@ \else \ifx\pdf@type\relax \Hy@WarningNoLine{no pdfmark type specified in #2!!}% - \ifx\\#1\\\relax\else\pdf@rect{#1}\fi + \ifx\\#1\\% + \else + \pdf@rect{#1}% + \fi \else - \ifx\\#1\\\relax - \literalps@out{[\the\pdf@toks\space\pdf@type\space pdfmark}% + \ifx\\#1\\% + \literalps@out{% + [\the\pdf@toks\space\pdf@type\space pdfmark% + }% \else \@ifundefined{@\pdf@linktype color}{% \Hy@colorlink\@linkcolor @@ -375,7 +396,9 @@ \csname @\pdf@linktype color\endcsname }% \pdf@rect{#1}% - \literalps@out{[\the\pdf@toks\space\pdf@type\space pdfmark}% + \literalps@out{% + [\the\pdf@toks\space\pdf@type\space pdfmark% + }% \Hy@endcolorlink \fi \fi diff --git a/Master/texmf-dist/tex/latex/hyperref/hpdftex.def b/Master/texmf-dist/tex/latex/hyperref/hpdftex.def index 311a7d8f55b..137a4ab9687 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} - [2007/10/30 v6.77b + [2007/11/12 v6.77e Hyperref driver for pdfTeX] \let\Hy@PutCatalog\pdfcatalog \ifHy@pagelabels @@ -41,8 +41,9 @@ \AtEndDocument{\clearpage\HyPL@SetPageLabels}% }% \fi +\RequirePackage{pdftexcmds}[2007/11/11] \begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname pdfescapestring\endcsname\relax +\expandafter\ifx\csname pdf@escapestring\endcsname\relax \begingroup \catcode`\|=0 % \@makeother\\% @@ -87,7 +88,7 @@ }% \else \def\Hy@pstringdef#1#2{% - \edef#1{\pdfescapestring{#2}}% + \edef#1{\pdf@escapestring{#2}}% }% \fi \let\Hy@pdfminorversion\relax @@ -112,7 +113,8 @@ \Hy@pdfminorversion=\Hy@pdfversion\relax \fi \PackageInfo{hyperref}{% - \expandafter\string\Hy@pdfminorversion:=\number\Hy@pdfversion\space + \expandafter\string\Hy@pdfminorversion + :=\number\Hy@pdfversion\space }% \fi \edef\Hy@pdfversion{\number\Hy@pdfminorversion}% @@ -291,44 +293,61 @@ \endgroup } \ifx\@pdfproducer\relax - \def\@pdfproducer{pdfTeX}% - \ifx\eTeXversion\@undefined - \else - \ifx\eTeXversion\relax + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname luatexversion\endcsname\relax + \def\@pdfproducer{pdfTeX}% + \ifx\eTeXversion\@undefined \else - \ifnum\eTeXversion>0 % - \def\@pdfproducer{pdfeTeX}% + \ifx\eTeXversion\relax + \else + \ifnum\eTeXversion>0 % + \def\@pdfproducer{pdfeTeX}% + \fi \fi \fi - \fi - \ifx\pdftexversion\@undefined - \else - \ifnum\pdftexversion<100 % - \edef\@pdfproducer{% - \@pdfproducer - \the\pdftexversion.\pdftexrevision - }% + \ifx\pdftexversion\@undefined \else - \ifnum\pdftexversion<130 % + \ifnum\pdftexversion<100 % \edef\@pdfproducer{% - \@pdfproducer-% - \expandafter\@car\the\pdftexversion\@empty\@nil.% - \expandafter\@cdr\the\pdftexversion\@empty\@nil - \pdftexrevision + \@pdfproducer + \the\pdftexversion.\pdftexrevision }% \else - \ifnum\pdftexversion<140 % + \ifnum\pdftexversion<130 % + \edef\@pdfproducer{% + \@pdfproducer-% + \expandafter\@car\the\pdftexversion\@empty\@nil.% + \expandafter\@cdr\the\pdftexversion\@empty\@nil + \pdftexrevision + }% \else - \def\@pdfproducer{pdfTeX}% + \ifnum\pdftexversion<140 % + \else + \def\@pdfproducer{pdfTeX}% + \fi + \edef\@pdfproducer{% + \@pdfproducer-% + \expandafter\@car\the\pdftexversion\@empty\@nil.% + \expandafter\@cdr\the\pdftexversion\@empty\@nil.% + \pdftexrevision + }% \fi - \edef\@pdfproducer{% - \@pdfproducer-% - \expandafter\@car\the\pdftexversion\@empty\@nil.% - \expandafter\@cdr\the\pdftexversion\@empty\@nil.% - \pdftexrevision - }% \fi \fi + \else + \begingroup + \count@=\luatexversion + \divide\count@ by 100 % + \edef\x{\the\count@}% + \count@=-\x\relax + \multiply\count@ by 100 % + \advance\count@ by \luatexversion + \edef\x{\endgroup + \def\noexpand\@pdfproducer{% + LuaTeX-\x.\the\count@.\luatexrevision + }% + }% + \x \fi \fi \def\PDF@SetupDoc{% @@ -353,9 +372,12 @@ /URI<>% \fi }% - \ifx\@pdfstartview\@empty + \ifx\@pdfstartpage\@empty \else - openaction goto page \@pdfstartpage {\@pdfstartview}% + \ifx\@pdfstartview\@empty + \else + openaction goto page\@pdfstartpage{\@pdfstartview}% + \fi \fi \edef\Hy@temp{% \ifHy@toolbar\else /HideToolbar true\fi @@ -430,7 +452,8 @@ \def\hyper@pagetransition{% \ifx\@pdfpagetransition\relax \else - \expandafter\Hy@RemoveTransPageAttr\the\pdfpageattr^^J/Trans{}>>\END + \expandafter\Hy@RemoveTransPageAttr + \the\pdfpageattr^^J/Trans{}>>\END \ifx\@pdfpagetransition\@empty \else \edef\@processme{% @@ -606,8 +629,12 @@ \char123 % \endgroup }{Ding}% - \MakeFieldObject{\fbox{\textcolor{yellow}{\textsf{Submit}}}}{Submit}% - \MakeFieldObject{\fbox{\textcolor{yellow}{\textsf{SubmitP}}}}{SubmitP}% + \MakeFieldObject{% + \fbox{\textcolor{yellow}{\textsf{Submit}}}% + }{Submit}% + \MakeFieldObject{% + \fbox{\textcolor{yellow}{\textsf{SubmitP}}}% + }{SubmitP}% } \def\@endForm{} \def\@TextField[#1]#2{% parameters, label @@ -817,26 +844,38 @@ }% \endgroup } -\pdfobj { << /Type /Encoding /Differences [ 24 /breve /caron -/circumflex /dotaccent /hungarumlaut /ogonek /ring /tilde 39 -/quotesingle 96 /grave 128 /bullet /dagger /daggerdbl /ellipsis -/emdash /endash /florin /fraction /guilsinglleft /guilsinglright -/minus /perthousand /quotedblbase /quotedblleft /quotedblright -/quoteleft /quoteright /quotesinglbase /trademark /fi /fl /Lslash /OE -/Scaron /Ydieresis /Zcaron /dotlessi /lslash /oe /scaron /zcaron 164 -/currency 166 /brokenbar 168 /dieresis /copyright /ordfeminine 172 -/logicalnot /.notdef /registered /macron /degree /plusminus -/twosuperior /threesuperior /acute /mu 183 /periodcentered /cedilla -/onesuperior /ordmasculine 188 /onequarter /onehalf /threequarters 192 -/Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla -/Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex -/Idieresis /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde -/Odieresis /multiply /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis -/Yacute /Thorn /germandbls /agrave /aacute /acircumflex /atilde -/adieresis /aring /ae /ccedilla /egrave /eacute /ecircumflex -/edieresis /igrave /iacute /icircumflex /idieresis /eth /ntilde -/ograve /oacute /ocircumflex /otilde /odieresis /divide /oslash -/ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis ] >> +\pdfobj {% + <<% + /Type/Encoding% + /Differences[% + 24/breve/caron/circumflex/dotaccent/hungarumlaut/ogonek% + /ring/tilde % + 39/quotesingle % + 96/grave % + 128/bullet/dagger/daggerdbl/ellipsis/emdash/endash/florin% + /fraction/guilsinglleft/guilsinglright/minus/perthousand% + /quotedblbase/quotedblleft/quotedblright/quoteleft% + /quoteright/quotesinglbase/trademark/fi/fl/Lslash/OE% + /Scaron/Ydieresis/Zcaron/dotlessi/lslash/oe/scaron/zcaron % + 164/currency % + 166/brokenbar % + 168/dieresis/copyright/ordfeminine % + 172/logicalnot/.notdef/registered/macron/degree/plusminus% + /twosuperior/threesuperior/acute/mu % + 183/periodcentered/cedilla/onesuperior/ordmasculine % + 188/onequarter/onehalf/threequarters % + 192/Agrave/Aacute/Acircumflex/Atilde/Adieresis/Aring/AE% + /Ccedilla/Egrave/Eacute/Ecircumflex/Edieresis/Igrave% + /Iacute/Icircumflex/Idieresis/Eth/Ntilde/Ograve/Oacute% + /Ocircumflex/Otilde/Odieresis/multiply/Oslash/Ugrave% + /Uacute/Ucircumflex/Udieresis/Yacute/Thorn/germandbls% + /agrave/aacute/acircumflex/atilde/adieresis/aring/ae% + /ccedilla/egrave/eacute/ecircumflex/edieresis/igrave% + /iacute/icircumflex/idieresis/eth/ntilde/ograve/oacute% + /ocircumflex/otilde/odieresis/divide/oslash/ugrave% + /uacute/ucircumflex/udieresis/yacute/thorn/ydieresis% + ]% + >>% } \edef\OBJ@pdfdocencoding{\the\pdflastobj} \pdfobj{% @@ -1156,7 +1195,8 @@ /BS<>% /A<>% } -\def\Hy@writebookmark#1#2#3#4#5{% section number, text, label, level, file +\def\Hy@writebookmark#1#2#3#4#5{% + % section number, text, label, level, file \ifx\WriteBookmarks\relax% \else \ifnum#4>\Hy@bookmarksdepth\relax @@ -1309,7 +1349,9 @@ \let\@mkboth\@gobbletwo \Hy@GlobalStepCount\Hy@linkcounter \xdef\@currentHref{\Hy@chapapp*.\the\Hy@linkcounter}% - \Hy@raisedlink{\hyper@anchorstart{\@currentHref}\hyper@anchorend}% + \Hy@raisedlink{% + \hyper@anchorstart{\@currentHref}\hyper@anchorend + }% \endgroup } \@ifundefined{@chapter}{}{% @@ -1318,7 +1360,9 @@ \def\Hy@next{% \Hy@GlobalStepCount\Hy@linkcounter \xdef\@currentHref{\Hy@chapapp*.\the\Hy@linkcounter}% - \Hy@raisedlink{\hyper@anchorstart{\@currentHref}\hyper@anchorend}% + \Hy@raisedlink{% + \hyper@anchorstart{\@currentHref}\hyper@anchorend + }% }% \ifnum\c@secnumdepth>\m@ne \@ifundefined{if@mainmatter}% @@ -1348,7 +1392,9 @@ \H@old@spart{#1}% \Hy@GlobalStepCount\Hy@linkcounter \xdef\@currentHref{part*.\the\Hy@linkcounter}% - \Hy@raisedlink{\hyper@anchorstart{\@currentHref}\hyper@anchorend}% + \Hy@raisedlink{% + \hyper@anchorstart{\@currentHref}\hyper@anchorend + }% } \let\H@old@sect\@sect \def\@sect#1#2#3#4#5#6[#7]#8{% @@ -1358,7 +1404,9 @@ \fi \H@old@sect{#1}{#2}{#3}{#4}{#5}{#6}[{#7}]{#8}% \ifnum #2>\c@secnumdepth - \Hy@raisedlink{\hyper@anchorstart{\@currentHref}\hyper@anchorend}% + \Hy@raisedlink{% + \hyper@anchorstart{\@currentHref}\hyper@anchorend + }% \fi } \expandafter\def\csname Parent-4\endcsname{} @@ -1382,7 +1430,9 @@ \addtocontents{lot}{\protect\addvspace{10\p@}}% \Hy@GlobalStepCount\Hy@linkcounter \xdef\@currentHref{\Hy@chapapp*.\the\Hy@linkcounter}% - \Hy@raisedlink{\hyper@anchorstart{\@currentHref}\hyper@anchorend}% + \Hy@raisedlink{% + \hyper@anchorstart{\@currentHref}\hyper@anchorend + }% \if@twocolumn \@topnewpage[\@makeschapterhead{##2}]% \else diff --git a/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg b/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg index 5753b85fb53..70ac3c883b4 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} - [2007/10/30 v6.77b + [2007/11/12 v6.77e 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 1f01772ae4e..dd10da5844f 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} - [2007/10/30 v6.77b + [2007/11/12 v6.77e Hyperref driver for TeX4ht] \@ifpackageloaded{tex4ht}{% \typeout{hyperref tex4ht: tex4ht already loaded}% diff --git a/Master/texmf-dist/tex/latex/hyperref/htexture.def b/Master/texmf-dist/tex/latex/hyperref/htexture.def index 1ea8bee0899..c8b7fb03fd3 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} - [2007/10/30 v6.77b + [2007/11/12 v6.77e Hyperref driver for Textures] \begingroup \obeylines % diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtex.def b/Master/texmf-dist/tex/latex/hyperref/hvtex.def index dd598129ca0..6db9a1e1513 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} - [2007/10/30 v6.77b + [2007/11/12 v6.77e Hyperref driver for VTeX in PDF/PS mode] \edef\Hy@VTeXversion{% \ifx\VTeXversion\@undefined @@ -70,8 +70,9 @@ \AtEndDocument{\clearpage\HyPL@SetPageLabels}% }% \fi +\RequirePackage{pdftexcmds}[2007/11/11] \begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname pdfescapestring\endcsname\relax +\expandafter\ifx\csname pdf@escapestring\endcsname\relax \begingroup \catcode`\|=0 % \@makeother\\% @@ -116,7 +117,7 @@ }% \else \def\Hy@pstringdef#1#2{% - \edef#1{\pdfescapestring{#2}}% + \edef#1{\pdf@escapestring{#2}}% }% \fi \ifx\mediaheight\@undefined @@ -395,18 +396,26 @@ \if S\hvtex@trans@code \edef\vtex@trans@special{\hvtex@trans@code \hvtex@param@dimension\hvtex@param@motion}% - \else \if B\hvtex@trans@code - \edef\vtex@trans@special{\hvtex@trans@code\hvtex@param@dimension}% - \else \if X\hvtex@trans@code - \edef\vtex@trans@special{\hvtex@trans@code\hvtex@param@motion}% - \else \if W\hvtex@trans@code - \edef\vtex@trans@special{\hvtex@trans@code\hvtex@param@direction}% - \else \if D\hvtex@trans@code + \else\if B\hvtex@trans@code + \edef\vtex@trans@special{% + \hvtex@trans@code\hvtex@param@dimension + }% + \else\if X\hvtex@trans@code + \edef\vtex@trans@special{% + \hvtex@trans@code\hvtex@param@motion + }% + \else\if W\hvtex@trans@code + \edef\vtex@trans@special{% + \hvtex@trans@code\hvtex@param@direction + }% + \else\if D\hvtex@trans@code \let\vtex@trans@special\hvtex@trans@code - \else \if R\hvtex@trans@code + \else\if R\hvtex@trans@code \let\vtex@trans@special\hvtex@trans@code - \else \if G\hvtex@trans@code - \edef\vtex@trans@special{\hvtex@trans@code\hvtex@param@direction}% + \else\if G\hvtex@trans@code + \edef\vtex@trans@special{% + \hvtex@trans@code\hvtex@param@direction + }% \fi\fi\fi\fi\fi\fi\fi \ifx\vtex@trans@special\@empty \else @@ -414,7 +423,9 @@ \else \setlength{\dimen@}{\hvtex@param@duration\p@}% \multiply\dimen@\@m - \edef\vtex@trans@special{\vtex@trans@special,\strip@pt\dimen@}% + \edef\vtex@trans@special{% + \vtex@trans@special,\strip@pt\dimen@ + }% \fi \special{!trans \vtex@trans@special}% \fi @@ -476,7 +487,13 @@ \else \special{!pdfinfo b=<\@pdfpagescrop>}% \fi - \special{!onopen Page\@pdfstartpage}% + \ifx\@pdfstartpage\@empty + \else + \ifx\@pdfstartview\@empty + \else + \special{!onopen Page\@pdfstartpage}% + \fi + \fi \special{!pdfinfo p=}% \ifx\@baseurl\@empty \else @@ -535,7 +552,8 @@ \Hy@DisableOption{pdfproducer}% \Hy@DisableOption{pdfkeywords}% } -\def\Hy@writebookmark#1#2#3#4#5{% section number, text, label, level, file +\def\Hy@writebookmark#1#2#3#4#5{% + % section number, text, label, level, file \ifx\WriteBookmarks\relax% \else \ifnum#4>\Hy@bookmarksdepth\relax @@ -679,8 +697,10 @@ \csname @count@#5\endcsname \fi }% - \immediate\special{!outline #3;p=\@parcount,i=\@mycount,s=\ifx#2-c\else -o\fi,t=#4}% + \immediate\special{% + !outline #3;p=\@parcount,i=\@mycount,% + s=\ifx#2-c\else o\fi,t=#4% + }% }% \def\ReadBookmarks{% \begingroup @@ -725,7 +745,9 @@ o\fi,t=#4}% \let\@mkboth\@gobbletwo \Hy@GlobalStepCount\Hy@linkcounter \xdef\@currentHref{\Hy@chapapp*.\the\Hy@linkcounter}% - \Hy@raisedlink{\hyper@anchorstart{\@currentHref}\hyper@anchorend}% + \Hy@raisedlink{% + \hyper@anchorstart{\@currentHref}\hyper@anchorend + }% \endgroup } \@ifundefined{@chapter}{}{% @@ -734,7 +756,9 @@ o\fi,t=#4}% \def\Hy@next{% \Hy@GlobalStepCount\Hy@linkcounter \xdef\@currentHref{\Hy@chapapp*.\the\Hy@linkcounter}% - \Hy@raisedlink{\hyper@anchorstart{\@currentHref}\hyper@anchorend}% + \Hy@raisedlink{% + \hyper@anchorstart{\@currentHref}\hyper@anchorend + }% }% \ifnum\c@secnumdepth>\m@ne \@ifundefined{if@mainmatter}% @@ -764,7 +788,9 @@ o\fi,t=#4}% \H@old@spart{#1}% \Hy@GlobalStepCount\Hy@linkcounter \xdef\@currentHref{part*.\the\Hy@linkcounter}% - \Hy@raisedlink{\hyper@anchorstart{\@currentHref}\hyper@anchorend}% + \Hy@raisedlink{% + \hyper@anchorstart{\@currentHref}\hyper@anchorend + }% } \let\H@old@sect\@sect \def\@sect#1#2#3#4#5#6[#7]#8{% @@ -774,7 +800,9 @@ o\fi,t=#4}% \fi \H@old@sect{#1}{#2}{#3}{#4}{#5}{#6}[{#7}]{#8}% \ifnum #2>\c@secnumdepth - \Hy@raisedlink{\hyper@anchorstart{\@currentHref}\hyper@anchorend}% + \Hy@raisedlink{% + \hyper@anchorstart{\@currentHref}\hyper@anchorend + }% \fi } \expandafter\def\csname Parent-4\endcsname{} @@ -798,7 +826,9 @@ o\fi,t=#4}% \addtocontents{lot}{\protect\addvspace{10\p@}}% \Hy@GlobalStepCount\Hy@linkcounter \xdef\@currentHref{\Hy@chapapp*.\the\Hy@linkcounter}% - \Hy@raisedlink{\hyper@anchorstart{\@currentHref}\hyper@anchorend}% + \Hy@raisedlink{% + \hyper@anchorstart{\@currentHref}\hyper@anchorend + }% \if@twocolumn \@topnewpage[\@makeschapterhead{##2}]% \else diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def b/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def index e881747961e..fe893424d28 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} - [2007/10/30 v6.77b + [2007/11/12 v6.77e Hyperref driver for VTeX in HTML mode] \RequirePackage{vtexhtml} \newif\if@Localurl @@ -121,8 +121,12 @@ \def\@PushButton[#1]#2{% parameters, label \typeout{Sorry, TeXpider does not yet support FORM pushbuttons}% } -\def\@Reset[#1]#2{\typeout{Sorry, TeXpider does not yet support FORMs}} -\def\@Submit[#1]#2{\typeout{Sorry, TeXpider does not yet support FORMs}} +\def\@Reset[#1]#2{% + \typeout{Sorry, TeXpider does not yet support FORMs}% +} +\def\@Submit[#1]#2{% + \typeout{Sorry, TeXpider does not yet support FORMs}% +} \endinput %% %% End of file `hvtexhtm.def'. diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def b/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def index 54246fb1f63..699ebd2c7e2 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} - [2007/10/30 v6.77b + [2007/11/12 v6.77e Hyperref driver for VTeX in PDF/PS mode (pdfmark specials)] \input{pdfmark.def}% \ifx\@pdfproducer\relax diff --git a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty index 609099a2c39..5e6a3ca684f 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} - [2007/10/30 v6.77b + [2007/11/12 v6.77e Hypertext links for LaTeX] \begingroup \@makeother\`% @@ -875,7 +875,8 @@ \expandafter\ifx\csname r@#1\endcsname\relax ??% \else - \expandafter\expandafter\expandafter\@car\csname r@#1\endcsname\@nil + \expandafter\expandafter\expandafter + \@car\csname r@#1\endcsname\@nil \fi } \def\HyPsd@pageref#1{\HyPsd@@pageref#1*\END} @@ -910,7 +911,8 @@ \else \expandafter\expandafter\expandafter\HyPsd@autorefname \csname r@#1\endcsname{}{}{}{}\@nil - \expandafter\expandafter\expandafter\@car\csname r@#1\endcsname\@nil + \expandafter\expandafter\expandafter + \@car\csname r@#1\endcsname\@nil \fi } \def\HyPsd@autorefname#1#2#3#4#5\@nil{% @@ -984,7 +986,7 @@ \Hy@Warning{#1}% \endgroup } -\RequirePackage{etexcmds} +\RequirePackage{etexcmds}[2007/09/09] \ifetex@unexpanded \expandafter\@secondoftwo \else @@ -1448,19 +1450,22 @@ \number\dimexpr.015625\dimexpr#1sp\relax\relax \expandafter\HyPsd@unichar@octtwo\expandafter{% \number - \numexpr#1-64*\number\dimexpr.015625\dimexpr#1sp\relax\relax\relax + \numexpr#1-64*\number\dimexpr.015625\dimexpr#1sp% + \relax\relax\relax }% }% \def\HyPsd@unichar@second@byte#1{% \csname\number\dimexpr.015625\dimexpr#1sp\relax\relax\endcsname \expandafter\HyPsd@unichar@octtwo\expandafter{% \number - \numexpr#1-64*\number\dimexpr.015625\dimexpr#1sp\relax\relax\relax + \numexpr#1-64*\number\dimexpr.015625\dimexpr#1sp% + \relax\relax\relax }% }% \def\HyPsd@unichar@octtwo#1{% \number\dimexpr.125\dimexpr#1sp\relax\relax - \number\numexpr#1-8*\number\dimexpr.125\dimexpr#1sp\relax\relax\relax + \number\numexpr#1-8*\number\dimexpr.125\dimexpr#1sp% + \relax\relax\relax }% \fi \@ifclassloaded{memoir}{% @@ -1482,7 +1487,10 @@ \string\newlabel{sub@#1}{% {\@nameuse{@@thesub\@captype}}% {\thepage}% - {\expandafter\strip@period\@currentlabstr\relax.\relax\@@@}% + {% + \expandafter\strip@period\@currentlabstr + \relax.\relax\@@@% + }% {\@currentHref}% {}% }% @@ -2509,7 +2517,23 @@ \def\@pdfviewparams{ #2}% \fi } -\define@key{Hyp}{pdfstartpage}{\def\@pdfstartpage{#1}} +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname numexpr\endcsname\relax + \def\Hy@number#1{% + \expandafter\@firstofone\expandafter{\number#1}% + }% +\else + \def\Hy@number#1{% + \the\numexpr#1\relax + }% +\fi +\define@key{Hyp}{pdfstartpage}{% + \ifx\\#1\\% + \def\@pdfstartpage{}% + \else + \edef\@pdfstartpage{\Hy@number{#1}}% + \fi +}% \define@key{Hyp}{pdfstartview}{% \ifx\\#1\\% \def\@pdfstartview{}% @@ -2599,7 +2623,7 @@ \fi \fi }{% - \ifdim\stockwith>\z@ + \ifdim\stockwidth>\z@ \ifdim\stockheight>\z@ \edef\special@paper{\the\stockwidth,\the\stockheight}% \fi @@ -3136,7 +3160,15 @@ \fi } \def\@hyper@launch run:#1\\#2#3{% filename, anchor text, linkname - \hyper@linkurl{#2}{\Hy@linkfileprefix#1\ifx\\#3\\\else\hyper@hash#3\fi}% + \hyper@linkurl{#2}{% + \Hy@linkfileprefix + #1% + \ifx\\#3\\% + \else + \hyper@hash + #3% + \fi + }% } \def\@hyper@linkfile file:#1\\#2#3{% %file url,link string, name @@ -4467,12 +4499,16 @@ \Hy@GlobalStepCount\Hy@linkcounter \xdef\@currentHref{#1*.\the\Hy@linkcounter}% \def\ttl@Hy@saveanchor{% - \Hy@raisedlink{\hyper@anchorstart{\@currentHref}\hyper@anchorend}% + \Hy@raisedlink{% + \hyper@anchorstart{\@currentHref}\hyper@anchorend + }% }% }% \def\ttl@Hy@refstepcounter#1{% \let\ttl@b\Hy@raisedlink - \def\Hy@raisedlink##1{\def\ttl@Hy@saveanchor{\Hy@raisedlink{##1}}}% + \def\Hy@raisedlink##1{% + \def\ttl@Hy@saveanchor{\Hy@raisedlink{##1}}% + }% \refstepcounter{#1}% \let\Hy@raisedlink\ttl@b }% @@ -4790,7 +4826,8 @@ \let\Hy@tempa\@caption \@ifundefined{float@caption}{% }{% - \expandafter\ifx\csname @float@c@\@captype\endcsname\float@caption + \expandafter\ifx\csname @float@c@\@captype\endcsname + \float@caption \let\Hy@tempa\Hy@float@caption \fi }% @@ -5168,7 +5205,9 @@ \begingroup \def\Hy@tempa{#1}% \ifx\Hy@tempa\Hy@bookmarkstype - \Hy@WarningNoLine{bookmark level for unknown #2 defaults to 0}% + \Hy@WarningNoLine{% + bookmark level for unknown #2 defaults to 0% + }% \else \Hy@Info{bookmark level for unknown #2 defaults to 0}% \fi @@ -5699,7 +5738,9 @@ \def\HyRef@autosetref#1#2#3{% link command, csname, refname \HyRef@ShowKeysRef{#2}% \ifcase 0\ifx#1\relax 1\fi\ifx#1\Hy@varioref@undefined 1\fi\relax - \edef\HyRef@thisref{\expandafter\@fourthoffive#1\@empty\@empty\@empty}% + \edef\HyRef@thisref{% + \expandafter\@fourthoffive#1\@empty\@empty\@empty + }% \expandafter\HyRef@testreftype\HyRef@thisref.\\% \Hy@safe@activesfalse #3{% diff --git a/Master/texmf-dist/tex/latex/hyperref/hypertex.def b/Master/texmf-dist/tex/latex/hyperref/hypertex.def index 2198b6a0fd4..4d443673a63 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} - [2007/10/30 v6.77b + [2007/11/12 v6.77e Hyperref driver for HyperTeX specials] \def\PDF@FinishDoc{} \def\PDF@SetupDoc{% @@ -143,7 +143,9 @@ \let\@mkboth\@gobbletwo \Hy@GlobalStepCount\Hy@linkcounter \xdef\@currentHref{\Hy@chapapp*.\the\Hy@linkcounter}% - \Hy@raisedlink{\hyper@anchorstart{\@currentHref}\hyper@anchorend}% + \Hy@raisedlink{% + \hyper@anchorstart{\@currentHref}\hyper@anchorend + }% \endgroup } \@ifundefined{@chapter}{}{% @@ -152,7 +154,9 @@ \def\Hy@next{% \Hy@GlobalStepCount\Hy@linkcounter \xdef\@currentHref{\Hy@chapapp*.\the\Hy@linkcounter}% - \Hy@raisedlink{\hyper@anchorstart{\@currentHref}\hyper@anchorend}% + \Hy@raisedlink{% + \hyper@anchorstart{\@currentHref}\hyper@anchorend + }% }% \ifnum\c@secnumdepth>\m@ne \@ifundefined{if@mainmatter}% @@ -182,7 +186,9 @@ \H@old@spart{#1}% \Hy@GlobalStepCount\Hy@linkcounter \xdef\@currentHref{part*.\the\Hy@linkcounter}% - \Hy@raisedlink{\hyper@anchorstart{\@currentHref}\hyper@anchorend}% + \Hy@raisedlink{% + \hyper@anchorstart{\@currentHref}\hyper@anchorend + }% } \let\H@old@sect\@sect \def\@sect#1#2#3#4#5#6[#7]#8{% @@ -192,7 +198,9 @@ \fi \H@old@sect{#1}{#2}{#3}{#4}{#5}{#6}[{#7}]{#8}% \ifnum #2>\c@secnumdepth - \Hy@raisedlink{\hyper@anchorstart{\@currentHref}\hyper@anchorend}% + \Hy@raisedlink{% + \hyper@anchorstart{\@currentHref}\hyper@anchorend + }% \fi } \def\Hy@tempa{% @@ -207,7 +215,9 @@ \addtocontents{lot}{\protect\addvspace{10\p@}}% \Hy@GlobalStepCount\Hy@linkcounter \xdef\@currentHref{\Hy@chapapp*.\the\Hy@linkcounter}% - \Hy@raisedlink{\hyper@anchorstart{\@currentHref}\hyper@anchorend}% + \Hy@raisedlink{% + \hyper@anchorstart{\@currentHref}\hyper@anchorend + }% \if@twocolumn \@topnewpage[\@makeschapterhead{##2}]% \else diff --git a/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty b/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty index 8107ee0b510..b330124bf03 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} - [2007/10/30 v6.77b + [2007/11/12 v6.77e Dummy hyperref (SR)] \let\hyper@@anchor\@gobble \def\hyper@link#1#2#3{#3}% @@ -50,7 +50,9 @@ \let\hyperdef\@gobbletwo \let\hyperlink\@gobble \let\hypertarget\@gobble -\def\hyperref{\@ifnextchar[\@gobbleopt{\expandafter\@gobbletwo\@gobble}} +\def\hyperref{% + \@ifnextchar[\@gobbleopt{\expandafter\@gobbletwo\@gobble}% +} \long\def\@gobbleopt[#1]{} \let\hyperpage\@empty \endinput diff --git a/Master/texmf-dist/tex/latex/hyperref/pd1enc.def b/Master/texmf-dist/tex/latex/hyperref/pd1enc.def index 1d2eba5d5ac..8090165c91b 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} - [2007/10/30 v6.77b + [2007/11/12 v6.77e Hyperref: PDFDocEncoding definition (HO)] \DeclareFontEncoding{PD1}{}{} \DeclareTextCommand{\textLF}{PD1}{\012} % line feed diff --git a/Master/texmf-dist/tex/latex/hyperref/pdfmark.def b/Master/texmf-dist/tex/latex/hyperref/pdfmark.def index 29505d09755..2a5b8f1c120 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} - [2007/10/30 v6.77b + [2007/11/12 v6.77e Hyperref definitions for pdfmark specials] \def\Hy@PutCatalog#1{% \pdfmark{pdfmark=/PUT,Raw={\string{Catalog\string} << #1 >>}}% @@ -60,8 +60,9 @@ }% }% \fi +\RequirePackage{pdftexcmds}[2007/11/11] \begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname pdfescapestring\endcsname\relax +\expandafter\ifx\csname pdf@escapestring\endcsname\relax \begingroup \catcode`\|=0 % \@makeother\\% @@ -106,7 +107,7 @@ }% \else \def\Hy@pstringdef#1#2{% - \edef#1{\pdfescapestring{#2}}% + \edef#1{\pdf@escapestring{#2}}% }% \fi \def\Hy@DistillerDestFix{% @@ -185,7 +186,9 @@ \@ifundefined{@\hyper@currentlinktype bordercolor}{% \let\Hy@tempcolor\relax }{% - \edef\Hy@tempcolor{\csname @\hyper@currentlinktype bordercolor\endcsname}% + \edef\Hy@tempcolor{% + \csname @\hyper@currentlinktype bordercolor\endcsname + }% }% \pdfmark{% pdfmark=/ANN,% @@ -330,12 +333,25 @@ \Hy@DisableOption{pdfkeywords}% } \def\PDF@SetupDoc{% - \pdfmark{% - pdfmark=/DOCVIEW,% - Page=\@pdfstartpage,% - View=\@pdfstartview,% - PageMode=/\@pdfpagemode + \def\Hy@temp{}% + \ifx\@pdfstartpage\@empty + \else + \ifx\@pdfstartview\@empty + \else + \edef\Hy@temp{% + ,Page=\@pdfstartpage + ,View=\@pdfstartview + }% + \fi + \fi + \edef\Hy@temp{% + \noexpand\pdfmark{% + pdfmark=/DOCVIEW,% + PageMode=/\@pdfpagemode + \Hy@temp + }% }% + \Hy@temp \ifx\@pdfpagescrop\@empty \else \pdfmark{pdfmark=/PAGES,CropBox=\@pdfpagescrop}% @@ -402,10 +418,15 @@ \else \ifx\pdf@type\relax \Hy@WarningNoLine{no pdfmark type specified in #2!!}% - \ifx\\#1\\\relax\else\pdf@rect{#1}\fi + \ifx\\#1\\% + \else + \pdf@rect{#1}% + \fi \else - \ifx\\#1\\\relax - \literalps@out{[\the\pdf@toks\space\pdf@type\space pdfmark}% + \ifx\\#1\\% + \literalps@out{% + [\the\pdf@toks\space\pdf@type\space pdfmark% + }% \else \@ifundefined{@\pdf@linktype color}{% \Hy@colorlink\@linkcolor @@ -414,7 +435,9 @@ \csname @\pdf@linktype color\endcsname }% \pdf@rect{#1}% - \literalps@out{[\the\pdf@toks\space\pdf@type\space pdfmark}% + \literalps@out{% + [\the\pdf@toks\space\pdf@type\space pdfmark% + }% \Hy@endcolorlink \fi \fi @@ -673,25 +696,29 @@ <<% /Type/Encoding% /Differences[% - 24/breve/caron/circumflex/dotaccent/hungarumlaut/ogonek/ring/tilde % + 24/breve/caron/circumflex/dotaccent/hungarumlaut/ogonek/ring% + /tilde % 39/quotesingle % 96/grave % - 128/bullet/dagger/daggerdbl/ellipsis/emdash/endash/florin/fraction% - /guilsinglleft/guilsinglright/minus/perthousand/quotedblbase% - /quotedblleft/quotedblright/quoteleft/quoteright/quotesinglbase% - /trademark/fi/fl/Lslash/OE/Scaron/Ydieresis/Zcaron/dotlessi% - /lslash/oe/scaron/zcaron164/currency166/brokenbar % + 128/bullet/dagger/daggerdbl/ellipsis/emdash/endash/florin% + /fraction/guilsinglleft/guilsinglright/minus/perthousand% + /quotedblbase/quotedblleft/quotedblright/quoteleft% + /quoteright/quotesinglbase/trademark/fi/fl/Lslash/OE/Scaron% + /Ydieresis/Zcaron/dotlessi/lslash/oe/scaron/zcaron % + 164/currency % + 166/brokenbar % 168/dieresis/copyright/ordfeminine % 172/logicalnot/.notdef/registered/macron/degree/plusminus% /twosuperior/threesuperior/acute/mu % 183/periodcentered/cedilla/onesuperior/ordmasculine % 188/onequarter/onehalf/threequarters % - 192/Agrave/Aacute/Acircumflex/Atilde/Adieresis/Aring/AE/Ccedilla% - /Egrave/Eacute/Ecircumflex/Edieresis/Igrave/Iacute/Icircumflex% - /Idieresis/Eth/Ntilde/Ograve/Oacute/Ocircumflex/Otilde/Odieresis% - /multiply/Oslash/Ugrave/Uacute/Ucircumflex/Udieresis/Yacute% - /Thorn/germandbls/agrave/aacute/acircumflex/atilde/adieresis% - /aring/ae/ccedilla/egrave/eacute/ecircumflex/edieresis/igrave% + 192/Agrave/Aacute/Acircumflex/Atilde/Adieresis/Aring/AE% + /Ccedilla/Egrave/Eacute/Ecircumflex/Edieresis/Igrave% + /Iacute/Icircumflex/Idieresis/Eth/Ntilde/Ograve/Oacute% + /Ocircumflex/Otilde/Odieresis/multiply/Oslash/Ugrave% + /Uacute/Ucircumflex/Udieresis/Yacute/Thorn/germandbls% + /agrave/aacute/acircumflex/atilde/adieresis/aring/ae% + /ccedilla/egrave/eacute/ecircumflex/edieresis/igrave% /iacute/icircumflex/idieresis/eth/ntilde/ograve/oacute% /ocircumflex/otilde/odieresis/divide/oslash/ugrave/uacute% /ucircumflex/udieresis/yacute/thorn/ydieresis% @@ -712,7 +739,7 @@ >>% /PUT pdfmark% [% - /_objdef {Helv}% + /_objdef{Helv}% /type/dict% /OBJ pdfmark% [% @@ -726,7 +753,7 @@ >>% /PUT pdfmark% [% - /_objdef {aform}% + /_objdef{aform}% /type/dict% /OBJ pdfmark% [% @@ -1312,7 +1339,8 @@ /BS<>% /A<>% } -\def\Hy@writebookmark#1#2#3#4#5{% section number, text, label, level, file +\def\Hy@writebookmark#1#2#3#4#5{% + % section number, text, label, level, file \ifx\WriteBookmarks\relax% \else \ifnum#4>\Hy@bookmarksdepth\relax @@ -1463,7 +1491,9 @@ \let\@mkboth\@gobbletwo \Hy@GlobalStepCount\Hy@linkcounter \xdef\@currentHref{\Hy@chapapp*.\the\Hy@linkcounter}% - \Hy@raisedlink{\hyper@anchorstart{\@currentHref}\hyper@anchorend}% + \Hy@raisedlink{% + \hyper@anchorstart{\@currentHref}\hyper@anchorend + }% \endgroup } \@ifundefined{@chapter}{}{% @@ -1472,7 +1502,9 @@ \def\Hy@next{% \Hy@GlobalStepCount\Hy@linkcounter \xdef\@currentHref{\Hy@chapapp*.\the\Hy@linkcounter}% - \Hy@raisedlink{\hyper@anchorstart{\@currentHref}\hyper@anchorend}% + \Hy@raisedlink{% + \hyper@anchorstart{\@currentHref}\hyper@anchorend + }% }% \ifnum\c@secnumdepth>\m@ne \@ifundefined{if@mainmatter}% @@ -1502,7 +1534,9 @@ \H@old@spart{#1}% \Hy@GlobalStepCount\Hy@linkcounter \xdef\@currentHref{part*.\the\Hy@linkcounter}% - \Hy@raisedlink{\hyper@anchorstart{\@currentHref}\hyper@anchorend}% + \Hy@raisedlink{% + \hyper@anchorstart{\@currentHref}\hyper@anchorend + }% } \let\H@old@sect\@sect \def\@sect#1#2#3#4#5#6[#7]#8{% @@ -1512,7 +1546,9 @@ \fi \H@old@sect{#1}{#2}{#3}{#4}{#5}{#6}[{#7}]{#8}% \ifnum #2>\c@secnumdepth - \Hy@raisedlink{\hyper@anchorstart{\@currentHref}\hyper@anchorend}% + \Hy@raisedlink{% + \hyper@anchorstart{\@currentHref}\hyper@anchorend + }% \fi } \expandafter\def\csname Parent-4\endcsname{} @@ -1536,7 +1572,9 @@ \addtocontents{lot}{\protect\addvspace{10\p@}}% \Hy@GlobalStepCount\Hy@linkcounter \xdef\@currentHref{\Hy@chapapp*.\the\Hy@linkcounter}% - \Hy@raisedlink{\hyper@anchorstart{\@currentHref}\hyper@anchorend}% + \Hy@raisedlink{% + \hyper@anchorstart{\@currentHref}\hyper@anchorend + }% \if@twocolumn \@topnewpage[\@makeschapterhead{##2}]% \else diff --git a/Master/texmf-dist/tex/latex/hyperref/puarenc.def b/Master/texmf-dist/tex/latex/hyperref/puarenc.def index b3ac43bd5d7..3d37d1ef176 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} - [2007/10/30 v6.77b + [2007/11/12 v6.77e 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 f180d6748fc..45667d1d1b9 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} - [2007/10/30 v6.77b + [2007/11/12 v6.77e Hyperref: PDF Unicode definition (HO)] \DeclareFontEncoding{PU}{}{} \DeclareTextCommand{\textLF}{PU}{\80\012} % line feed diff --git a/Master/texmf-dist/tex/latex/hyperref/puvnenc.def b/Master/texmf-dist/tex/latex/hyperref/puvnenc.def index 95a15e57e73..be71e4d96c8 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} - [2007/10/30 v6.77b + [2007/11/12 v6.77e Hyperref: Additions to puenc.def for VnTeX] \DeclareTextCommand{\abreve}{PU}{\81\003} \DeclareTextCommand{\acircumflex}{PU}{\80\342} -- cgit v1.2.3