From 59c29abbbb331758b74ed6d9ee6f0550c01dfc1d Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 9 Sep 2010 21:54:23 +0000 Subject: hypdvips 2.01 (9sep10) git-svn-id: svn://tug.org/texlive/trunk@19631 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/hypdvips/hypdvips.sty | 86 ++++++++++++++--------- 1 file changed, 53 insertions(+), 33 deletions(-) (limited to 'Master/texmf-dist/tex/latex/hypdvips') diff --git a/Master/texmf-dist/tex/latex/hypdvips/hypdvips.sty b/Master/texmf-dist/tex/latex/hypdvips/hypdvips.sty index 1796a0cc941..8268b54b4d8 100644 --- a/Master/texmf-dist/tex/latex/hypdvips/hypdvips.sty +++ b/Master/texmf-dist/tex/latex/hypdvips/hypdvips.sty @@ -1,17 +1,18 @@ %% %% This is file `hypdvips.sty', %% Copyright 2008-2010 Raimund Niedrist -%% -%% With portions written by David Carlisle, Toby Cubitt, Geoffrey -%% Keating, Heiko Oberdiek and Sebastian Rahtz, 1995-2010 +%% +%% With portions written by Donald Arsenau, David Carlisle, Steven +%% Douglas Cochran, Toby Cubitt, Geoffrey Keating, Heiko Oberdiek, +%% Sebastian Rahtz, and the Latex3 Project 1986-2010 %% %% This work may be distributed and/or modified under the conditions %% of the LaTeX Project Public License, either version 1.3 of this %% license or (at your option) any later version. %% The latest version of this license is in -%% +%% %% http://www.latex-project.org/lppl.txt -%% +%% %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. %% @@ -21,7 +22,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{hypdvips} - [2010/07/06 v2.01 + [2010/09/08 v2.02 Hyperref extensions for use with dvips] \@ifpackageloaded{hyperref} { @@ -40,7 +41,6 @@ \ProcessOptions \endinput } -\RequirePackage{hypcap} \RequirePackage{xcolor} \RequirePackage{xkeyval} \RequirePackage[totpages]{zref} @@ -59,6 +59,34 @@ \RequirePackage{bookmark} \let\special\pp@backup@special } +\@ifpackageloaded{caption}{}{ + \RequirePackage{hypcap} + \renewcommand{\capstart}{% + \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 + } +} \ifHy@unicode \else \HyPsd@InitUnicode @@ -1867,6 +1895,7 @@ \pp@backup@end{#1}% \global\expandafter\let\expandafter\@currentHref\csname pp@saved@before#1@@currentHref\endcsname% \global\expandafter\let\expandafter\cref@currentlabel\csname pp@saved@before#1@cref@currentlabel\endcsname% + \ignorespaces } \newif\ifpp@subfigure @@ -1952,32 +1981,6 @@ } } -\renewcommand{\capstart}{% - \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 -} - \def\pp@activerect{false} \def\pdf@rect#1{% \def\pp@activerect{true}% @@ -2216,6 +2219,23 @@ \fi% } +\@ifundefined{chapter}{}{ + \let\pp@backup@chapter\chapter + \def\chapter{% + \bookmarksetup{style=pp@bmstyle@empty}% + \@ifundefined{BKM@style@0}{}{\bookmarksetup{style=0}} + \pp@backup@chapter% + } + \let\pp@backup@@schapter\@schapter + \def\@schapter#1{% + \pp@backup@@schapter{#1}% + \ifpp@fullbookmarks% + \@ifundefined{BKM@style@*}{}{\bookmarksetup{style=*}} + \Hy@writebookmark{}{#1}{\@currentHref}{0}{toc}% + \fi% + } +} + \newcommand{\pp@beforelink}[1]{% arguments: labelname \ifpp@evenboxes% \sbox\pp@textbox\pp@ABC% -- cgit v1.2.3