From 68a34296797c3123dd3ba1af83d9540a46415551 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 1 Apr 2014 22:25:36 +0000 Subject: hypdvips (1apr14) git-svn-id: svn://tug.org/texlive/trunk@33348 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/hypdvips/hypdvips.sty | 52 ++++------------------- 1 file changed, 8 insertions(+), 44 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 ea9190259ea..f923e676594 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-2012 Raimund Niedrist +%% Copyright 2008-2014 Raimund Niedrist %% %% With portions written by Donald Arsenau, David Carlisle, Steven %% Douglas Cochran, Toby Cubitt, Geoffrey Keating, Heiko Oberdiek, @@ -22,7 +22,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{hypdvips} - [2012/12/30 v3.00 + [2014/03/31 v3.01 Hyperref extensions for use with dvips] \@ifpackageloaded{hyperref} { @@ -44,21 +44,7 @@ \RequirePackage{atveryend} \RequirePackage{xcolor} \RequirePackage{xkeyval} -\@ifpackageloaded{bookmark} - { - \PackageWarning{hypdvips}{Package `bookmark' should not be loaded before\MessageBreak hypdvips.\MessageBreak}% - } - { - \define@key[pp]{bookmarkfix}{header}{\def\pp@headerfile{#1}} - \let\pp@backup@special\special - \renewcommand{\special}[1]{% - \let\pp@headerfile\@undefined% - \setkeys*[pp]{bookmarkfix}{#1}% - \@ifundefined{pp@headerfile}{\pp@backup@special{#1}}{\pp@backup@special{header=./\pp@headerfile}}% - } - \RequirePackage{bookmark} - \let\special\pp@backup@special - } +\RequirePackage{bookmark} \@ifpackageloaded{caption}{}{ \RequirePackage[all]{hypcap} \@ifpackageloaded{wrapfig}{% @@ -1254,7 +1240,7 @@ currentdict /Rect known and SDict /pp.outerbox known and SDict /pp.baselineskip known and - {Rect 1 get Rect 3 get sub HyperBorder 2 mul sub 0 lt {pp.breaklink} if} + {Rect 3 get HyperBorder 2 mul add pp.outerbox pp.getheight add Rect 1 get sub pp.baselineskip div round cvi 0 gt {pp.breaklink} if} if end SDict /pp.outerbox undef @@ -2304,20 +2290,20 @@ \let\pp@backup@@startsection\@startsection \def\@startsection#1#2#3#4#5#6{% \bookmarksetup{style=pp@bmstyle@empty}% - \ifx#2\@M% + \ifx\@M#2% \xdef\BKM@currentlevel{1}% \else% - \xdef\BKM@currentlevel{#2}% + \xdef\BKM@currentlevel{\number#2}% \fi% \@ifundefined{BKM@style@\BKM@currentlevel}{}{\bookmarksetup{style=\BKM@currentlevel}}% \pp@backup@@startsection{#1}{#2}{#3}{#4}{#5}{#6}% } \let\pp@backup@@sect\@sect \def\@sect#1#2#3#4#5#6[#7]#8{% - \ifx#2\@M% + \ifx\@M#2% \@ifundefined{BKM@style@*}{}{\bookmarksetup{style=*}}% \fi% - \ifx#2\@m% + \ifx\@m#2% \@ifundefined{BKM@style@*}{}{\bookmarksetup{style=*}}% \fi% \pp@backup@@sect{#1}{#2}{#3}{#4}{#5}{#6}[#7]{#8}% @@ -2397,28 +2383,6 @@ \@ifpackageloaded{cleveref} { \creflabelformat{equation}{\textup{(}#2\textup{#1}#3\textup{)}} - \def\pp@link#1\relax#2\relax#3\relax#4{#1\hyper@@link{}{#4}{#2}#3} - \def\pp@rangelink#1\relax#2\relax#3\relax#4\relax#5\relax#6#7{#1\hyper@@link{}{#6}{#2}#3\hyper@@link{}{#7}{#4}#5} - \renewcommand{\@@setcref}[2]{% - \cref@getlabel{#2}{\@templabel}% - \if@crefstarred% - #1{\@templabel}{}{}% - \else% - \edef\@templink{\cref@hyperref{#2}}% - \expandafter\pp@link#1{\@templabel}{\relax}{\relax}\relax{\@templink}% - \fi% - } - \renewcommand{\@@setcrefrange}[3]{% - \cref@getlabel{#2}{\@labela}% - \cref@getlabel{#3}{\@labelb}% - \if@crefstarred% - #1{\@labela}{\@labelb}{}{}{}{}% - \else% - \edef\@linka{\cref@hyperref{#2}}% - \edef\@linkb{\cref@hyperref{#3}}% - \expandafter\pp@rangelink#1{\@labela}{\@labelb}{\relax}{\relax}{\relax}{\relax}\relax{\@linka}{\@linkb}% - \fi% - } \def\backrefsectionsname{}% \renewcommand{\Hy@backout}[1]{% \@bsphack% -- cgit v1.2.3