diff options
Diffstat (limited to 'Master')
16 files changed, 254 insertions, 269 deletions
diff --git a/Master/texmf-dist/doc/latex/hypdvips/README b/Master/texmf-dist/doc/latex/hypdvips/README index 882ab91cb4e..5d2b1486057 100644 --- a/Master/texmf-dist/doc/latex/hypdvips/README +++ b/Master/texmf-dist/doc/latex/hypdvips/README @@ -1,13 +1,21 @@ -LaTeX package hypdvips 2009/03/25 v1.06 +LaTeX package hypdvips 2010/06/22 v2.00 -The hypdvips package fixes some problems when using hyperref with dvips. It -also adds support for breaking links, hyperlinked tablenotes, file attachments, -embedded documents and different types of GoTo-links. The cooperation of -hyperref with cleveref is improved, which in addition allows an enhanced back- -referencing system. +The hypdvips package is a collection of add-ons and fixes for problems when +using hyperref with dvips. It adds support for breaking links, hyperlinked +tablenotes, file attachments, embedded documents and different types of GoTo- +links. The cooperation of hyperref with cleveref is improved, which in addition +allows an enhanced back-referencing system. History: +v2.00 - supports newer versions of hyperref and cleveref + - new package option `emptypagelabels': allows to choose whether empty + PDF pagelabels are created if pagestyle is set to `empty' (thanks to + Sebastian Bomberg for the suggestion) + - uses \backrefalt for back-referencing system (thanks to Benedikt Leinss + for the bug-report) + - changes \bmstyle to use \bookmarkdefinestyle + v1.06 - new package option `nlwarning': allows to suppress warnings concerning nested links (thanks to Marco Daniel for the suggestion) - fixes duplicate warnings about nested links when option `evenboxes' diff --git a/Master/texmf-dist/doc/latex/hypdvips/hypdvips.pdf b/Master/texmf-dist/doc/latex/hypdvips/hypdvips.pdf Binary files differindex 8c4a43306a7..5cc7451644f 100644 --- a/Master/texmf-dist/doc/latex/hypdvips/hypdvips.pdf +++ b/Master/texmf-dist/doc/latex/hypdvips/hypdvips.pdf diff --git a/Master/texmf-dist/doc/latex/hypdvips/images/ex1.eps b/Master/texmf-dist/doc/latex/hypdvips/images/ex1.eps Binary files differindex 0292d0da571..64fc560fa8f 100644 --- a/Master/texmf-dist/doc/latex/hypdvips/images/ex1.eps +++ b/Master/texmf-dist/doc/latex/hypdvips/images/ex1.eps diff --git a/Master/texmf-dist/doc/latex/hypdvips/images/ex2.eps b/Master/texmf-dist/doc/latex/hypdvips/images/ex2.eps Binary files differindex ef50a59141d..9e4bdc04387 100644 --- a/Master/texmf-dist/doc/latex/hypdvips/images/ex2.eps +++ b/Master/texmf-dist/doc/latex/hypdvips/images/ex2.eps diff --git a/Master/texmf-dist/doc/latex/hypdvips/images/ex3.eps b/Master/texmf-dist/doc/latex/hypdvips/images/ex3.eps Binary files differindex 538ec0508f9..ff94ae01314 100644 --- a/Master/texmf-dist/doc/latex/hypdvips/images/ex3.eps +++ b/Master/texmf-dist/doc/latex/hypdvips/images/ex3.eps diff --git a/Master/texmf-dist/doc/latex/hypdvips/images/ex4.eps b/Master/texmf-dist/doc/latex/hypdvips/images/ex4.eps Binary files differindex dcba41e4642..781c718a3d6 100644 --- a/Master/texmf-dist/doc/latex/hypdvips/images/ex4.eps +++ b/Master/texmf-dist/doc/latex/hypdvips/images/ex4.eps diff --git a/Master/texmf-dist/doc/latex/hypdvips/images/ex5.eps b/Master/texmf-dist/doc/latex/hypdvips/images/ex5.eps Binary files differindex 13e41c1601a..ce42b347e9a 100644 --- a/Master/texmf-dist/doc/latex/hypdvips/images/ex5.eps +++ b/Master/texmf-dist/doc/latex/hypdvips/images/ex5.eps diff --git a/Master/texmf-dist/doc/latex/hypdvips/images/ex6.eps b/Master/texmf-dist/doc/latex/hypdvips/images/ex6.eps Binary files differindex c44d83cb7ab..3394d69e7ad 100644 --- a/Master/texmf-dist/doc/latex/hypdvips/images/ex6.eps +++ b/Master/texmf-dist/doc/latex/hypdvips/images/ex6.eps diff --git a/Master/texmf-dist/doc/latex/hypdvips/images/ex7.eps b/Master/texmf-dist/doc/latex/hypdvips/images/ex7.eps Binary files differindex a513d0c1098..e16e4becdb3 100644 --- a/Master/texmf-dist/doc/latex/hypdvips/images/ex7.eps +++ b/Master/texmf-dist/doc/latex/hypdvips/images/ex7.eps diff --git a/Master/texmf-dist/doc/latex/hypdvips/images/graph.eps b/Master/texmf-dist/doc/latex/hypdvips/images/graph.eps Binary files differindex d9741025386..14b1b8cd74c 100644 --- a/Master/texmf-dist/doc/latex/hypdvips/images/graph.eps +++ b/Master/texmf-dist/doc/latex/hypdvips/images/graph.eps diff --git a/Master/texmf-dist/doc/latex/hypdvips/images/ids.eps b/Master/texmf-dist/doc/latex/hypdvips/images/ids.eps Binary files differindex db3c4d58125..f765b3d7440 100644 --- a/Master/texmf-dist/doc/latex/hypdvips/images/ids.eps +++ b/Master/texmf-dist/doc/latex/hypdvips/images/ids.eps diff --git a/Master/texmf-dist/doc/latex/hypdvips/images/openmsg_six.eps b/Master/texmf-dist/doc/latex/hypdvips/images/openmsg_six.eps Binary files differindex 8e52a6bf6ff..3b3ff85f1a4 100644 --- a/Master/texmf-dist/doc/latex/hypdvips/images/openmsg_six.eps +++ b/Master/texmf-dist/doc/latex/hypdvips/images/openmsg_six.eps diff --git a/Master/texmf-dist/doc/latex/hypdvips/images/paperclip.eps b/Master/texmf-dist/doc/latex/hypdvips/images/paperclip.eps Binary files differindex f5292628131..57e55cf24fc 100644 --- a/Master/texmf-dist/doc/latex/hypdvips/images/paperclip.eps +++ b/Master/texmf-dist/doc/latex/hypdvips/images/paperclip.eps diff --git a/Master/texmf-dist/doc/latex/hypdvips/images/pushpin.eps b/Master/texmf-dist/doc/latex/hypdvips/images/pushpin.eps Binary files differindex a5deb04451a..5bc011c1338 100644 --- a/Master/texmf-dist/doc/latex/hypdvips/images/pushpin.eps +++ b/Master/texmf-dist/doc/latex/hypdvips/images/pushpin.eps diff --git a/Master/texmf-dist/doc/latex/hypdvips/images/tag.eps b/Master/texmf-dist/doc/latex/hypdvips/images/tag.eps Binary files differindex 72f28af8096..f12ebea4632 100644 --- a/Master/texmf-dist/doc/latex/hypdvips/images/tag.eps +++ b/Master/texmf-dist/doc/latex/hypdvips/images/tag.eps diff --git a/Master/texmf-dist/tex/latex/hypdvips/hypdvips.sty b/Master/texmf-dist/tex/latex/hypdvips/hypdvips.sty index 15f8deb7f87..1d9006e56cc 100644 --- a/Master/texmf-dist/tex/latex/hypdvips/hypdvips.sty +++ b/Master/texmf-dist/tex/latex/hypdvips/hypdvips.sty @@ -1,6 +1,6 @@ %% %% This is file `hypdvips.sty', -%% Copyright 2008-2009 Raimund Niedrist +%% Copyright 2008-2010 Raimund Niedrist %% %% With portions written by David Carlisle, Toby Cubitt, Geoffrey %% Keating, Heiko Oberdiek and Sebastian Rahtz, 1995-2009 @@ -21,7 +21,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{hypdvips} - [2009/03/25 v1.06 + [2010/06/22 v2.00 Hyperref extensions for use with dvips] \RequirePackage{hyperref} \newif\ifpp@dvips @@ -49,14 +49,6 @@ \RequirePackage{bookmark} \let\special\pp@backup@special } -\define@key{BKM}{italic,bold}[]{% - \bitsetSet{BKM@style}{0}% - \bitsetSet{BKM@style}{1}% - } -\define@key{BKM}{bold,italic}[]{% - \bitsetSet{BKM@style}{0}% - \bitsetSet{BKM@style}{1}% - } \RequirePackage[totpages]{zref} \RequirePackage{xcolor} \hypersetup{breaklinks=true} @@ -109,22 +101,45 @@ \def\pp@tabstring{Attachments~tab} \@ifpackageloaded{babel}{\addtocontents{loa}{\protect\select@language{english}}}{} \def\pp@br@abstractstring{Abstract} - \def\pp@br@pagestring{Page~} + \def\pp@br@pagestring{Page} \def\pp@br@documentstring{(document)} - \ifx\backrefxxx\hyper@section@backref - \@ifpackageloaded{cleveref} - {\def\pp@backrefformat{\setlength{\pp@offset}{\baselineskip}\\\tiny\textbf{Referenced\ in: }\sc\setlength{\baselineskip}{\pp@offset}}} - {\def\pp@backrefformat{\setlength{\pp@offset}{\baselineskip}\\\footnotesize\textbf{Referenced\ in: }\setlength{\baselineskip}{\pp@offset}}} - \fi - \ifx\backrefxxx\hyper@page@backref - \def\pp@backrefformat{\setlength{\pp@offset}{\baselineskip}\\\footnotesize\textbf{Referenced\ on\ page: }\setlength{\baselineskip}{\pp@offset}} + \ifHy@backref + \ifx\backrefxxx\hyper@section@backref + \@ifpackageloaded{cleveref} + { + \renewcommand*{\backrefalt}[4]{% + \setlength{\pp@offset}{\baselineskip}% + \\\footnotesize(Referenced in + \setlength{\baselineskip}{\pp@offset}% + ##2.) + } + } + { + \renewcommand*{\backrefalt}[4]{\\\footnotesize(Referenced\ in: ##2.)} + } + \fi + \ifx\backrefxxx\hyper@page@backref + \renewcommand*{\backrefalt}[4]{% + \ifcase##1% + \or% + \\\footnotesize(Referenced\ on\ page ##2.) + \else% + \\\footnotesize(Referenced\ on\ pages ##2.) + \fi% + } + \fi \fi \@ifpackageloaded{cleveref} { - \crefname{subfigure}{fig.}{figs.} - \Crefname{subfigure}{Figure}{Figures} - \crefname{footnote}{footnote}{footnotes} - \Crefname{footnote}{Footnote}{Footnotes} + \Crefname{Hfootnote}{Footnote}{Footnotes} + \Crefname{abstract}{Abstract}{Abstract} + \if@cref@capitalise + \crefname{Hfootnote}{Footnote}{Footnotes} + \crefname{abstract}{Abstract}{Abstracts} + \else + \crefname{Hfootnote}{footnote}{footnotes} + \crefname{abstract}{abstract}{abstracts} + \fi }{} \pp@languagesettrue } @@ -160,68 +175,40 @@ \@ifpackageloaded{babel}{\addtocontents{loa}{\protect\select@language{german}}}{} \def\pp@loastring{Dateianlagenverzeichnis} \def\pp@br@abstractstring{Zusammenfassung} - \def\pp@br@pagestring{Seite~} + \def\pp@br@pagestring{Seite} \def\pp@br@documentstring{(Dokument)} - \ifx\backrefxxx\hyper@section@backref - \@ifpackageloaded{cleveref} - {\def\pp@backrefformat{\setlength{\pp@offset}{\baselineskip}\\\tiny\textbf{Verwiesen\ in: }\sc\setlength{\baselineskip}{\pp@offset}}} - {\def\pp@backrefformat{\setlength{\pp@offset}{\baselineskip}\\\footnotesize\textbf{Verwiesen\ in: }\setlength{\baselineskip}{\pp@offset}}} - \fi - \ifx\backrefxxx\hyper@page@backref - \def\pp@backrefformat{\setlength{\pp@offset}{\baselineskip}\\\footnotesize\textbf{Verwiesen\ auf\ Seite: }\setlength{\baselineskip}{\pp@offset}} + \ifHy@backref + \ifx\backrefxxx\hyper@section@backref + \@ifpackageloaded{cleveref} + { + \renewcommand*{\backrefalt}[4]{% + \setlength{\pp@offset}{\baselineskip}% + \\\footnotesize(Zitiert in + \setlength{\baselineskip}{\pp@offset}% + ##2.) + } + } + { + \renewcommand*{\backrefalt}[4]{\\\footnotesize(Zitiert\ in: ##2.)} + } + \fi + \ifx\backrefxxx\hyper@page@backref + \renewcommand*{\backrefalt}[4]{% + \ifcase##1% + \or% + \\\footnotesize(Zitiert auf Seite ##2.) + \else% + \\\footnotesize(Zitiert auf den Seiten ##2.) + \fi% + } + \fi \fi \@ifpackageloaded{cleveref} { - \renewcommand{\crefrangeconjunction}{--} - \renewcommand{\crefpairconjunction}{ u.\@~} - \renewcommand{\crefmiddleconjunction}{, } - \renewcommand{\creflastconjunction}{ und~} - \crefdefaultlabelformat{##2##1##3} - \crefname{equation}{Gleichung}{Gleichungen} - \Crefname{equation}{Gleichung}{Gleichungen} - \creflabelformat{equation}{##2\textup{(##1)}##3} - \crefname{chapter}{Kapitel}{Kapiteln} - \Crefname{chapter}{Kapitel}{Kapitel} - \crefname{section}{Abschnitt}{Abschnitten} - \Crefname{section}{Abschnitt}{Abschnitte} - \crefname{subsection}{Abschnitt}{Abschnitten} - \Crefname{subsection}{Abschnitt}{Abschnitte} - \crefname{subsubsection}{Abschnitt}{Abschnitten} - \Crefname{subsubsection}{Abschnitt}{Abschnitte} - \crefname{subsubsubsection}{Abschnitt}{Abschnitten} - \Crefname{subsubsubsection}{Abschnitt}{Abschnitte} - \crefname{appendix}{Anhang}{Anhängen} - \Crefname{appendix}{Anhang}{Anhänge} - \crefname{figure}{Abbildung}{Abbildungen} - \Crefname{figure}{Abbildung}{Abbildungen} - \crefname{table}{Tabelle}{Tabellen} - \Crefname{table}{Tabelle}{Tabellen} - \crefname{theorem}{Theorem}{Theoremen} - \Crefname{theorem}{Theorem}{Theoreme} - \crefname{enumi}{Punkt}{Punkten} - \Crefname{enumi}{Punkt}{Punkte} - \crefname{enumii}{Punkt}{Punkten} - \Crefname{enumii}{Punkt}{Punkte} - \crefname{enumiii}{Punkt}{Punkten} - \Crefname{enumiii}{Punkt}{Punkte} - \crefname{enumiv}{Punkt}{Punkten} - \Crefname{enumiv}{Punkt}{Punkte} - \crefname{enumv}{Punkt}{Punkten} - \Crefname{enumv}{Punkt}{Punkte} - \crefname{lemma}{Lemma}{Lemmata} - \Crefname{lemma}{Lemma}{Lemmata} - \crefname{corollary}{Korollar}{Korollaren} - \Crefname{corollary}{Korollar}{Korollare} - \crefname{proposition}{Satz}{S\"{a}tzen} - \Crefname{proposition}{Satz}{S\"{a}tze} - \crefname{definition}{Definition}{Definitionen} - \Crefname{definition}{Definition}{Definitionen} - \crefname{result}{Resultat}{Resultaten} - \Crefname{result}{Resultat}{Resultate} - \crefname{subfigure}{Abbildung}{Abbildungen} - \Crefname{subfigure}{Abbildung}{Abbildungen} - \crefname{footnote}{Fu\ss note}{Fu\ss noten} - \Crefname{footnote}{Fu\ss note}{Fu\ss noten} + \Crefname{Hfootnote}{Fu\ss note}{Fu\ss noten} + \Crefname{abstract}{Zusammenfassung}{Zusammenfassungen} + \crefname{Hfootnote}{Fu\ss note}{Fu\ss noten} + \crefname{abstract}{Zusammenfassung}{Zusammenfassungen} }{} \pp@languagesettrue } @@ -298,7 +285,9 @@ \pp@booloption[false]{autoauthor} \pp@obsoleteoption{autocrop} \pp@booloption[false]{autotitle} -\pp@booloption[true]{detailedpagebr} +\pp@booloption[false]{detailedbr} +\pp@obsoleteoption{detailedpagebr} +\pp@booloption[true]{emptypagelabels} \pp@booloption[false]{evenboxes} \pp@booloption[true]{fish} \pp@booloption[false]{flip} @@ -327,7 +316,8 @@ { autoauthor=false, autotitle=false, - detailedpagebr=true, + detailedbr=false, + emptypagelabels=true, evenboxes=false, fish=true, flip=false, @@ -1844,6 +1834,7 @@ \let\pp@backup@endfigure\endfigure \renewcommand{\endfigure}{% + \global\let\@currentHref\Hy@saved@currentHref% \pp@subfigurefalse% \pp@backup@endfigure% } @@ -1886,7 +1877,7 @@ pdfmark=/DEST,% linktype=anchor,% View={/\@pdfview \@pdfviewparams},% - Dest={subfigure.\@currentHlabel}% + Dest={\@currentHlabel}% }% \fi% \fi% @@ -1911,37 +1902,84 @@ \box\z@ \fi} +\let\pp@backup@endtable\endtable +\renewcommand{\endtable}{% + \global\let\@currentHref\Hy@saved@currentHref% + \pp@backup@endtable% +} + +\let\pp@backup@endminipage\endminipage +\renewcommand{\endminipage}{% + \global\let\@currentHref\pp@backup@mpcurrentHref% + \pp@backup@endminipage% +} + +\@ifundefined{abstract}{}{ + \let\pp@backup@abstract\abstract + \renewcommand{\abstract}{% + \protected@edef\cref@currentlabel{[abstract][][]}% + \def\@currentHref{abstract}% + \hyper@anchorstart{abstract}% + \hyper@anchorend% + \pp@backup@abstract% + } +} + \renewcommand{\capstart}{% - \H@refstepcounter\@captype % first part of caption - \hyper@makecurrent\@captype - \global\let\hc@currentHref\@currentHref - \vspace*{-\hypcapspace}% - \begingroup - \let\leavevmode\relax - \pp@SDictPS{/pdf@hoff 0 /pdf@voff 0 pp.savecurrentpoint} - \ifHy@draft% - \else% - \pdfmark{% - pdfmark=/DEST,% - linktype=anchor,% - View={/\@pdfview \@pdfviewparams},% - Dest={\@currentHref}% - }% - \fi% - \endgroup - \vspace*{\hypcapspace}% - \hc@hyperref{\let\caption\hc@caption}% - \global\@capstarttrue - \global\advance\csname c@\@captype\endcsname\m@ne + \if@minipage% + \global\let\pp@backup@mpcurrentHref\@currentHref% + \fi% + \global\let\Hy@saved@currentHref\@currentHref% + \ifcapstart + \H@refstepcounter\@captype % first part of caption + \hyper@makecurrent{\@captype} + \global\let\hc@currentHref\@currentHref + \vspace*{-\hypcapspace}% + \begingroup + \let\leavevmode\relax + \pp@SDictPS{/pdf@hoff 0 /pdf@voff 0 pp.savecurrentpoint} + \ifHy@draft% + \else% + \pdfmark{% + pdfmark=/DEST,% + linktype=anchor,% + View={/\@pdfview \@pdfviewparams},% + Dest={\@currentHref}% + }% + \fi% + \endgroup + \vspace*{\hypcapspace}% + \hc@hyperref{\let\caption\hc@caption}% + \global\@capstarttrue + \global\advance\csname c@\@captype\endcsname\m@ne + \fi } -\let\pp@backup@pdf@rect\pdf@rect \def\pp@activerect{false} \def\pdf@rect#1{% \def\pp@activerect{true}% + \begingroup% + \chardef\x=1 % + \def\Hy@temp{#1}% + \ifx\Hy@temp\ltx@empty% + \chardef\x=0 % + \else% + \def\y{\anchor@spot}% + \ifx\Hy@temp\y% + \def\y{\relax}% + \ifx\anchor@spot\y% + \chardef\x=0 % + \fi% + \fi% + \fi% + \expandafter\endgroup% + \ifcase\x% + \literalps@out{H.S}% + \literalps@out{H.R}% + \else% \leavevmode% \ifHy@breaklinks% - \Hy@setouterhbox\pdf@box{#1}% + \Hy@setouterhbox\pdf@box{\Hy@AllowHyphens#1}% \else% \sbox\pdf@box{#1}% \fi% @@ -1952,7 +1990,6 @@ \addtolength{\pp@offset}{\the\dp\pp@textbox}% \pp@SDictPS{/pp.yoffset \strip@pt\pp@offset\space PDFToDvips def}% \else% -% \sbox\pp@textbox{#1}% \sbox\pp@textbox{\usebox{\pdf@box}}% \fi% \ifodd\value{page}% @@ -1997,6 +2034,7 @@ \else% \pdf@addtoksx{H.B}% \fi% + \fi% \def\pp@activerect{false}% } @@ -2086,21 +2124,24 @@ \leavevmode \ifhmode\edef\@x@sf{\the\spacefactor}\nobreak\fi \stepcounter{Hfootnote}% - \global\let\Hy@saved@currentHlabel\@currentHlabel \global\let\Hy@saved@currentHref\@currentHref \hyper@makecurrent{Hfootnote}% - \global\let\Hy@footnote@currentHlabel\@currentHlabel \global\let\Hy@footnote@currentHref\@currentHref - \global\let\@currentHlabel\Hy@saved@currentHlabel - \global\let\@currentHref\Hy@saved@currentHref \ifHy@draft% \@makefnmark% \else% \pp@hyperfootnote% \fi% + \global\let\@currentHref\Hy@saved@currentHref \ifhmode\spacefactor\@x@sf\fi \relax } + \let\pp@backup@@footnotetext\@footnotetext + \renewcommand{\@footnotetext}[1]{% + \let\pp@backup@cref@currentlabel\cref@currentlabel% + \pp@backup@@footnotetext{#1}% + \let\cref@currentlabel\pp@backup@cref@currentlabel% + } \let\pp@backup@H@@footnotetext\H@@footnotetext \renewcommand{\H@@footnotetext}[1]{% \pp@backup@H@@footnotetext{% @@ -2134,39 +2175,21 @@ {} {\def\Hy@numberline#1{#1\autodot~}} -\newcounter{pp@bm@level} +\bookmarkdefinestyle{pp@bmstyle@empty}{italic=false,bold=false,color={},rellevel=0,keeplevel=true} \let\pp@backup@@startsection\@startsection \def\@startsection#1#2#3#4#5#6{% - \setcounter{pp@bm@level}{#2}% - \bookmarksetup{bold=false,italic=false}% - \@ifundefined{pp@bm@\Roman{pp@bm@level}}{}{\bookmarksetup{\csname pp@bm@\Roman{pp@bm@level}\endcsname}}% + \xdef\BKM@currentlevel{#2}% + \bookmarksetup{style=pp@bmstyle@empty}% + \@ifundefined{BKM@style@#2}{}{\bookmarksetup{style=#2}} \pp@backup@@startsection{#1}{#2}{#3}{#4}{#5}{#6}% } -\newcounter{pp@starredsection} +\let\pp@backup@@ssect\@ssect \def\@ssect#1#2#3#4#5{% + \pp@backup@@ssect{#1}{#2}{#3}{#4}{#5}% \ifpp@fullbookmarks% - \stepcounter{pp@starredsection}% - \hyper@anchorstart{*.\arabic{pp@starredsection}}\hyper@anchorend% - \@ifundefined{pp@bm@starred}{}{\bookmarksetup{\pp@bm@starred}}% - \Hy@writebookmark{}{#5}{*.\arabic{pp@starredsection}}{\arabic{pp@bm@level}}{toc}% - \H@old@ssect{#1}{#2}{#3}{#4}{#5}% - \else% - \H@old@ssect{#1}{#2}{#3}{#4}{#5}% - \phantomsection - \fi% -} - -\def\pp@star{*} -\newcount\pp@bm@style -\newif\ifpp@goodbm -\newcommand{\pp@setbmstyle}[2]{% arguments: {level}{style} - \def\pp@string{#1}% - \ifx\pp@string\pp@star% - \xdef\pp@bm@starred{#2}% - \else% - \setcounter{pp@bm@level}{#1}% - \expandafter\xdef\csname pp@bm@\Roman{pp@bm@level}\endcsname{#2}% + \@ifundefined{BKM@style@*}{}{\bookmarksetup{style=*}} + \Hy@writebookmark{}{#5}{\@currentHref}{\BKM@currentlevel}{toc}% \fi% } @@ -2195,16 +2218,24 @@ \renewcommand{\Hy@backout}[1]{% \@bsphack% - \ifx\@empty\@currentlabel% + \ifpp@detailedbr% + \else% + \ifx\backrefxxx\pp@backref@page% + \def\pp@br@currentHref{page.\thepage}% + \else% + \def\pp@br@currentHref{\@currentHref}% + \fi% + \fi% + \ifx\@currentlabel\@empty% \protected@write\@auxout{}{% \string\@writefile{brf}{% - \string\backcite{#1}{{\thepage}{\pp@br@documentstring}{\@currentHref}}% + \string\backcite{#1}{{\thepage}{\pp@br@documentstring}{\pp@br@currentHref}}% }% }% \else% \protected@write\@auxout{}{% \string\@writefile{brf}{% - \string\backcite{#1}{{\thepage}{\@currentlabel}{\@currentHref}}% + \string\backcite{#1}{{\thepage}{\@currentlabel}{\pp@br@currentHref}}% }% }% \fi% @@ -2218,7 +2249,6 @@ \if@crefstarred% #1{\@tmplabel}{}{}% \else% - \edef\@tmplink{\cref@hyperref{#2}}% #1{\@tmplabel}{\pp@beforelink{#2}}{\pp@afterlink}% \fi% } @@ -2228,8 +2258,6 @@ \if@crefstarred% #1{\@labela}{\@labelb}{}{}{}{}% \else% - \edef\@linka{\cref@hyperref{#2}}% - \edef\@linkb{\cref@hyperref{#3}}% #1{\@labela}{\@labelb}% {\pp@beforelink{#2}}{\pp@afterlink}% {\pp@beforelink{#3}}{\pp@afterlink}% @@ -2237,54 +2265,46 @@ } \renewcommand{\Hy@backout}[1]{% \@bsphack% - \expandafter\@cref@getlabel\@currentlabel\@nil{\pp@labelcaption}% - \expandafter\@cref@gettype\@currentlabel\@nil{\pp@labeltype}% - \@ifundefined{Cref@\pp@labeltype @name}% - {% - \def\pp@labelname{\nfss@text{\reset@font\bfseries ??}}% - \ifx\backrefxxx\pp@backref@section% - \def\pp@string{abstract}% - \ifx\@currenvir\pp@string% + \ifpp@detailedbr% + \else% + \def\pp@br@currentHref{\@currentHref}% + \fi% + \edef\pp@labelcaption{\@currentlabel}% + \expandafter\@cref@gettype\cref@currentlabel\@nil{\pp@labeltype}% + \ifx\backrefxxx\pp@backref@section% + \@ifundefined{Cref@\pp@labeltype @name}% + {% + \PackageWarning{hypdvips}{\string\Cref\space reference format for label type `\pp@labeltype'\MessageBreak undefined in reference `\pp@labelcaption'.\MessageBreak Back-referencing to page `\thepage'.\MessageBreak}% + \ifpp@detailedbr% \else% - \PackageWarning{hypdvips}{\string\Cref\space reference format of label type `\pp@labeltype'\MessageBreak undefined for back-reference `\pp@labelcaption'.\MessageBreak}% + \def\pp@br@currentHref{page.\thepage}% \fi% + \def\pp@labelcaption{\thepage}% + \def\pp@labelname{\pp@br@pagestring}% + }% + {% + \def\pp@labelname{\csname Cref@\pp@labeltype @name\endcsname}% + }% + \ifx\pp@labelcaption\@empty% + \def\pp@string{\pp@labelname}% + \else% + \def\pp@string{\pp@labelname~\pp@labelcaption}% \fi% - }% - {\def\pp@labelname{\csname Cref@\pp@labeltype @name\endcsname}}% - \@ifundefined{cref@\pp@labeltype @label}% - {\def\pp@string{\pp@labelname~\cref@default@label{\pp@labelcaption}{}{}}}% - {\def\pp@string{\pp@labelname~\csname cref@\pp@labeltype @label\endcsname{\pp@labelcaption}{}{}}}% - \ifx\@empty\pp@labelcaption% - \def\pp@string{abstract}% - \ifx\@currenvir\pp@string% - \def\pp@string{\pp@br@abstractstring}% + \fi% + \ifx\backrefxxx\pp@backref@page% + \def\pp@string{\pp@br@pagestring~\thepage}% + \ifpp@detailedbr% \else% - \def\pp@string{\pp@br@pagestring\thepage}% - \ifx\backrefxxx\pp@backref@section% - \PackageWarning{hypdvips}{No current section number given.\MessageBreak Back-referencing to page `\thepage'.\MessageBreak}% - \ifpp@detailedpagebr% - \else% - \def\@currentHref{page.\thepage}% - \fi% - \fi% + \def\pp@br@currentHref{page.\thepage}% \fi% \fi% - \protected@write\@auxout{}{% - \string\@writefile{brf}{% - \string\backcite{#1}{{\thepage}{\pp@string}{\@currentHref}}% + \protected@write\@auxout{}{% + \string\@writefile{brf}{% + \string\backcite{#1}{{\thepage}{\pp@string}{\pp@br@currentHref}}% }% }% \@esphack% }% - \ifHy@hyperfootnotes - \renewcommand{\H@@footnotetext}[1]{% - \pp@backup@H@@footnotetext{% - \edef\@currentlabel{[footnote][\arabic{Hfootnote}][\relax]\@thefnmark}% - \pp@SDictPS{/pp.voffset \f@size\space 5 add def}% - #1% - }% - } - \fi }{} \newlength{\pp@backup@baselineskip} @@ -2776,11 +2796,15 @@ \edef\1{\string\1}% \edef\2{\string\2}% \edef\3{\string\3}% - \ifx\pp@specialpagestyle\@empty% - \edef\pp@string{\pp@currentpagestyle}% + \ifpp@emptypagelabels% + \ifx\pp@specialpagestyle\@empty% + \edef\pp@string{\pp@currentpagestyle}% + \else% + \edef\pp@string{\pp@specialpagestyle}% + \global\let\pp@specialpagestyle\@empty% + \fi% \else% - \edef\pp@string{\pp@specialpagestyle}% - \global\let\pp@specialpagestyle\@empty% + \let\pp@string\@empty% \fi% \ifx\pp@string\pp@ps@empty% \ifHy@unicode% @@ -2870,60 +2894,44 @@ } \renewcommand{\contentsline}[4]{% - \ifHy@hyperindex% - \else% - \let\Hy@linktoc\Hy@linktoc@none% - \fi% \ifx\\#4\\% \csname l@#1\endcsname{#2}{#3}% \else% \ifcase\Hy@linktoc% none \csname l@#1\endcsname{#2}{#3}% \or% section - \csname l@#1\endcsname{% - \hyper@@link{}{#4}{\pp@SDictPS{pp.disablepdfmarks}#2\pp@SDictPS{pp.enablepdfmarks}}% - }{#3}% + \csname l@#1\endcsname{\hyper@@link{}{#4}{#2}}{#3}% \or% page - \csname l@#1\endcsname{{#2}}{% - \hyper@@link{}{#4}{#3}% - }% + \csname l@#1\endcsname{{#2}}{\hyper@@link{}{#4}{#3}}% \else% all - \csname l@#1\endcsname{% - \hyper@@link{}{#4}{\pp@SDictPS{pp.disablepdfmarks}#2\pp@SDictPS{pp.enablepdfmarks}}% - }{% - \hyper@@link{}{#4}{#3}% - }% + \csname l@#1\endcsname{\hyper@@link{}{#4}{#2}}{\hyper@@link{}{#4}{#3}}% \fi% \fi% } \newcounter{pp@backrefID} \setcounter{pp@backrefID}{1} -\let\pp@backup@@cite\@cite -\def\@cite{% - \ifHy@draft% - \else% - \ifHy@backref% - \setlength{\pp@offset}{\the\baselineskip}% - \pp@SDictPS{/pdf@hoff -2 /pdf@voff \strip@pt\pp@offset\space pp.BPToPDF pp.savecurrentpoint}% - \pp@SDictPS{mark /Dest (backref.\arabic{pp@backrefID}) cvn /View [/\@pdfview \@pdfviewparams] /DEST pdfmark}% +\ifpp@detailedbr + \let\pp@backup@@cite\@cite + \def\@cite{% + \ifHy@draft% \else% + \ifHy@backref% + \setlength{\pp@offset}{\the\baselineskip}% + \pp@SDictPS{/pdf@hoff -2 /pdf@voff \strip@pt\pp@offset\space pp.BPToPDF pp.savecurrentpoint}% + \pp@SDictPS{mark /Dest (backref.\arabic{pp@backrefID}) cvn /View [/\@pdfview \@pdfviewparams] /DEST pdfmark}% + \else% + \fi% \fi% - \fi% - \edef\@currentHref{backref.\arabic{pp@backrefID}}% - \stepcounter{pp@backrefID}% - \pp@backup@@cite% -} + \edef\pp@br@currentHref{backref.\arabic{pp@backrefID}}% + \stepcounter{pp@backrefID}% + \pp@backup@@cite% + } -\newif\ifpp@newbackref -\pp@newbackreftrue +\fi \edef\@backrefcolor{\@citecolor} \edef\@backrefbordercolor{\@citebordercolor} \long\def\pp@backref@section#1#2#3{% - \ifpp@newbackref% - \pp@backrefformat% - \pp@newbackreffalse% - \fi% \edef\Hy@pstringDest{#3}% \ifHy@draft% #2% @@ -2937,15 +2945,11 @@ BorderStyle=\@pdfborderstyle,% Color=\@backrefbordercolor,% View={/\@pdfview \@pdfviewparams},% - Dest={#3}% + Dest={\Hy@pstringDest}% }% \fi% } -\long\def\pp@backref@pagedetailed#1#2#3{% - \ifpp@newbackref% - \pp@backrefformat% - \pp@newbackreffalse% - \fi% +\long\def\pp@backref@page#1#2#3{% \edef\Hy@pstringDest{#3}% \ifHy@draft% #1% @@ -2959,45 +2963,18 @@ BorderStyle=\@pdfborderstyle,% Color=\@backrefbordercolor,% View={/\@pdfview \@pdfviewparams},% - Dest={#3}% + Dest={\Hy@pstringDest}% }% \fi% } - \ifHy@backref - \renewcommand{\page@backref}[3]{% - \ifpp@newbackref% - \pp@backrefformat% - \pp@newbackreffalse% - \fi% - \edef\Hy@pstringDest{page.#1}% - \ifHy@draft% - #1% - \else% - \pdfmark[#1]{% - pdfmark=/ANN,% - linktype=backref,% - Subtype=/Link,% - AcroHighlight=\@pdfhighlight,% - Border=\@pdfborder,% - BorderStyle=\@pdfborderstyle,% - Color=\@backrefbordercolor,% - View={/\@pdfview \@pdfviewparams},% - Dest={page.#1}% - }% - \fi% - } -\fi - -\ifx\backrefxxx\hyper@page@backref - \ifpp@detailedpagebr - \let\backrefxxx\pp@backref@pagedetailed - \else - \let\backrefxxx\page@backref% + \renewcommand*{\backref}[1]{}% for backref < 1.33 necessary + \ifx\backrefxxx\hyper@page@backref + \let\backrefxxx\pp@backref@page% + \fi + \ifx\backrefxxx\hyper@section@backref + \let\backrefxxx\pp@backref@section% \fi -\fi -\ifx\backrefxxx\hyper@section@backref - \let\backrefxxx\pp@backref@section \fi \ifHy@draft @@ -3047,7 +3024,7 @@ \setcounter{pp@subcaptioncounter}{1}% \@for \sf@temp:=\@subfigcaptionlist \do {% \ifx \@empty\sf@temp\relax \else - \edef\@currentHref{sub\pp@backup@@currentHref.\arabic{pp@subcaptioncounter}}% + \edef\@currentHref{sub#1.\csname theH#1\endcsname.\arabic{pp@subcaptioncounter}}% \stepcounter{pp@subcaptioncounter}% \addcontentsline {\@nameuse{ext@sub#1}}% @@ -3454,7 +3431,7 @@ pdfmark=/DEST,% linktype=anchor,% View={/\@pdfview \@pdfviewparams},% - Dest={table.\@currentHlabel.note: "\pp@string"}% + Dest={\@currentHlabel.note: "\pp@string"}% }% }% \renewcommand{\tnote}[1]{% @@ -3474,7 +3451,7 @@ BorderStyle=\@pdfborderstyle,% Color=\@tablenotebordercolor,% View={/\@pdfview \@pdfviewparams},% - Dest={table.\@currentHlabel.note: "\pp@string"}% + Dest={\@currentHlabel.note: "\pp@string"}% }% \fi}}% } @@ -3517,7 +3494,7 @@ \providecommand{\attachfile}[2][]{\pp@attachfile[#1]{#2}}% arguments: [options]{filename} \providecommand{\backrefbordercolor}[1]{\gdef\@backrefbordercolor{#1}}% arguments: {R G B} \providecommand{\backrefcolor}[1]{\gdef\@backrefcolor{#1}}% arguments: {color} - \providecommand{\bmstyle}[2]{\pp@setbmstyle{#1}{#2}}% arguments: {level}{style} + \providecommand{\bmstyle}[2]{\bookmarkdefinestyle{#1}{#2}}% arguments: {level}{style} \providecommand{\embeddedbordercolor}[1]{\gdef\@embeddedbordercolor{#1}}% arguments: {R G B} \providecommand{\embeddedcolor}[1]{\gdef\@embeddedcolor{#1}}% arguments: {color} \providecommand{\embedfile}[2][]{\pp@embedfile[#1]{#2}}% arguments: [options]{filename} |