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/pdfmark.def | 104 ++++++++++++++++------- 1 file changed, 71 insertions(+), 33 deletions(-) (limited to 'Master/texmf-dist/tex/latex/hyperref/pdfmark.def') 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 -- cgit v1.2.3