From b06455ca8236ce81cad6e5880960a0dfa90b01f3 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 27 Mar 2009 17:40:03 +0000 Subject: hypdvips 1.06 (25mar09) git-svn-id: svn://tug.org/texlive/trunk@12535 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/hypdvips/README | 9 +- Master/texmf-dist/doc/latex/hypdvips/hypdvips.pdf | Bin 1105344 -> 1106504 bytes Master/texmf-dist/tex/latex/hypdvips/hypdvips.sty | 120 +++++++++++++--------- 3 files changed, 78 insertions(+), 51 deletions(-) diff --git a/Master/texmf-dist/doc/latex/hypdvips/README b/Master/texmf-dist/doc/latex/hypdvips/README index 09744b1976e..882ab91cb4e 100644 --- a/Master/texmf-dist/doc/latex/hypdvips/README +++ b/Master/texmf-dist/doc/latex/hypdvips/README @@ -1,4 +1,4 @@ -LaTeX package hypdvips 2009/03/04 v1.05 +LaTeX package hypdvips 2009/03/25 v1.06 The hypdvips package fixes some problems when using hyperref with dvips. It also adds support for breaking links, hyperlinked tablenotes, file attachments, @@ -8,11 +8,16 @@ referencing system. History: +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' + is disabled + v1.05 - improved compatibility with packages tabularx & subcaption (thanks to Marco Daniel for the bug-report) v1.04 - fixes problem with back-reference when citing in footnotetext and - option smallfootnotes is enabled + option `smallfootnotes' is enabled v1.03 - new package options: `flip' & `mirror' - support for package threeparttable: tablenotes are now hyperlinked diff --git a/Master/texmf-dist/doc/latex/hypdvips/hypdvips.pdf b/Master/texmf-dist/doc/latex/hypdvips/hypdvips.pdf index b93b7642a54..8c4a43306a7 100644 Binary files a/Master/texmf-dist/doc/latex/hypdvips/hypdvips.pdf and b/Master/texmf-dist/doc/latex/hypdvips/hypdvips.pdf differ diff --git a/Master/texmf-dist/tex/latex/hypdvips/hypdvips.sty b/Master/texmf-dist/tex/latex/hypdvips/hypdvips.sty index 0b9a00f4c68..15f8deb7f87 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 2009 Raimund Niedrist +%% Copyright 2008-2009 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/04 v1.05 + [2009/03/25 v1.06 Hyperref extensions for use with dvips] \RequirePackage{hyperref} \newif\ifpp@dvips @@ -173,7 +173,7 @@ \@ifpackageloaded{cleveref} { \renewcommand{\crefrangeconjunction}{--} - \renewcommand{\crefpairconjunction}{ \&~} + \renewcommand{\crefpairconjunction}{ u.\@~} \renewcommand{\crefmiddleconjunction}{, } \renewcommand{\creflastconjunction}{ und~} \crefdefaultlabelformat{##2##1##3} @@ -311,6 +311,7 @@ \pp@booloption[false]{lotbr} \pp@booloption[false]{mac} \pp@booloption[false]{mirror} +\pp@booloption[true]{nlwarning} \pp@booloption[true]{openmessage} \pp@booloption[true]{quadpoints} \pp@booloption[false]{showdests} @@ -339,6 +340,7 @@ lotbr=false, mac=false, mirror=false, + nlwarning=true, openmessage=true, quadpoints=true, showdests=false, @@ -1950,7 +1952,8 @@ \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{#1}% + \sbox\pp@textbox{\usebox{\pdf@box}}% \fi% \ifodd\value{page}% \gdef\pp@sidemargin{\the\oddsidemargin}% @@ -1998,46 +2001,46 @@ } \def\pdfmark@[#1]#2{% - \Hy@pdfmarkerrorfalse% + \Hy@pdfmarkerrorfalse \edef\@processme{\noexpand\pdf@toks={\the\pdf@defaulttoks}}% - \@processme% - \let\pdf@type\relax% + \@processme + \let\pdf@type\relax \setkeys{PDF}{#2}% - \ifHy@pdfmarkerror% - \else% - \ifx\pdf@type\relax% - \Hy@WarningNoLine{no pdfmark type specified in #2!!}% - \ifx\\#1\\% - \else% - \ifx\pp@activerect\pp@true% - \PackageWarning{hypdvips}{Nested link discarded: dest = `\Hy@pstringDest'\MessageBreak}% - \else% - \pdf@rect{#1}% - \fi% - \fi% + \ifHy@pdfmarkerror + \else + \ifx\pp@activerect\pp@true% + \ifpp@nlwarning% + \PackageWarning{hypdvips}{Nested link discarded: dest = `\Hy@pstringDest'\MessageBreak}% + \fi% + #1% \else% - \ifx\\#1\\% - \literalps@out{[\the\pdf@toks\space\pdf@type\space pdfmark}% - \else% - \ifx\pp@activerect\pp@true% - \PackageWarning{hypdvips}{Nested link discarded: dest = `\Hy@pstringDest'\MessageBreak}% - #1% - \else% - \@ifundefined{@\pdf@linktype color}% - {% - \Hy@colorlink\@linkcolor% - }% - {% - \expandafter\Hy@colorlink% - \csname @\pdf@linktype color\endcsname% - }% + \ifx\pdf@type\relax + \Hy@WarningNoLine{no pdfmark type specified in #2!!}% + \ifx\\#1\\% + \else + \pdf@rect{#1}% + \fi + \else + \ifx\\#1\\% + \literalps@out{% + [\the\pdf@toks\space\pdf@type\space pdfmark% + }% + \else + \@ifundefined{@\pdf@linktype color}{% + \Hy@colorlink\@linkcolor + }{% + \expandafter\Hy@colorlink + \csname @\pdf@linktype color\endcsname + }% \pdf@rect{#1}% - \literalps@out{[\the\pdf@toks\space\pdf@type\space pdfmark}% - \Hy@endcolorlink% - \fi% - \fi% + \literalps@out{% + [\the\pdf@toks\space\pdf@type\space pdfmark% + }% + \Hy@endcolorlink + \fi + \fi \fi% - \fi% + \fi } \edef\@footnotecolor{\@linkcolor} @@ -2763,6 +2766,7 @@ }% } +\def\pp@ps@empty{empty} \newcounter{pp@PL@currentpage} \setcounter{pp@PL@currentpage}{1} \let\pp@backup@HyPL@EveryPage\HyPL@EveryPage @@ -2772,7 +2776,21 @@ \edef\1{\string\1}% \edef\2{\string\2}% \edef\3{\string\3}% - \expandafter\global\expandafter\let\expandafter\HyPL@thisLabel\csname pp@PL@\Roman{pp@PL@currentpage}\endcsname% + \ifx\pp@specialpagestyle\@empty% + \edef\pp@string{\pp@currentpagestyle}% + \else% + \edef\pp@string{\pp@specialpagestyle}% + \global\let\pp@specialpagestyle\@empty% + \fi% + \ifx\pp@string\pp@ps@empty% + \ifHy@unicode% + \gdef\HyPL@thisLabel{\000\000}% + \else% + \gdef\HyPL@thisLabel{\000}% + \fi% + \else% + \expandafter\global\expandafter\let\expandafter\HyPL@thisLabel\csname pp@PL@\Roman{pp@PL@currentpage}\endcsname% + \fi% \global\let\HyPL@LastType\relax% \pp@backup@HyPL@EveryPage% \ifx\pp@EoD\@empty% @@ -2782,7 +2800,7 @@ \stepcounter{pp@PL@currentpage}% }% } - + \let\pp@BoD\@empty \AtBeginDocument{\gdef\pp@BoD{true}} \newcommand{\pp@pagelabel}[2][]{% {pagenum}{pagelabel} @@ -2809,14 +2827,18 @@ \fi% } -\let\pp@backup@ps@empty\ps@empty -\def\ps@empty{% - \ifHy@unicode% - \pp@pagelabel{\000\000}% - \else% - \pp@pagelabel{\000}% - \fi% - \pp@backup@ps@empty% +\let\pp@currentpagestyle\@empty +\let\pp@backup@pagestyle\pagestyle +\renewcommand{\pagestyle}[1]{% + \def\pp@currentpagestyle{#1}% + \pp@backup@pagestyle{#1}% + } + +\let\pp@specialpagestyle\@empty +\let\pp@backup@thispagestyle\thispagestyle +\renewcommand{\thispagestyle}[1]{% + \def\pp@specialpagestyle{#1}% + \pp@backup@thispagestyle{#1}% } \AtEndDocument{% -- cgit v1.2.3