From e16008112b181663aeec26ec2c8a262536a91527 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 14 Jan 2007 17:42:19 +0000 Subject: movie15 update git-svn-id: svn://tug.org/texlive/trunk@3460 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/movie15/movie15.sty | 100 ++++++++++++++---------- 1 file changed, 58 insertions(+), 42 deletions(-) (limited to 'Master/texmf-dist/tex/latex/movie15') diff --git a/Master/texmf-dist/tex/latex/movie15/movie15.sty b/Master/texmf-dist/tex/latex/movie15/movie15.sty index 80b736cf2e0..cd69dd938d9 100644 --- a/Master/texmf-dist/tex/latex/movie15/movie15.sty +++ b/Master/texmf-dist/tex/latex/movie15/movie15.sty @@ -9,7 +9,7 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{movie15}[2007/01/04] +\ProvidesPackage{movie15}[2007/01/12] \RequirePackage{keyval} \RequirePackage{ifthen} \RequirePackage{ifpdf} @@ -40,7 +40,7 @@ } \DeclareOption*{% - \PackageWarning{movie15}{Unknown Option \CurrentOption} + \PackageWarning{movie15}{Unknown option \CurrentOption} } \ProcessOptions*\relax @@ -115,8 +115,8 @@ %double check that the value hasn't changed \NOT\equal{\@MXV@getlabelvalue{#1}}{\@MXV@getlabelvalue{@#1@}}% }{% - \ifthenelse{\isundefined{\@MXV@warning}}{%issue warning only once, at end - \gdef\@MXV@warning{}% of document + \ifthenelse{\isundefined{\@MXV@warning}}{% issue warning only once, at end + \gdef\@MXV@warning{}% of document \AtEndDocument{% \PackageWarningNoLine{movie15}{% @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\MessageBreak @@ -1351,7 +1351,7 @@ }% % \if@MXV@externalviewer\else% - %new annotation object of subtype `Screen' + %annotation object of subtype `Screen' \pdfannot width #1 height #2 depth #3 {% /Subtype /Screen% /Border [0 0 0]% no border (PDF-1.1) @@ -1509,7 +1509,7 @@ \if@MXV@externalviewer% \@MXV@box{#1}{#2}{#3}% \else% - %new annotation object of subtype `Screen' + %annotation object of subtype `Screen' \pdfmark[\@MXV@box{#1}{#2}{#3}]{% pdfmark=/ANN,% Subtype=/Screen,% @@ -1897,12 +1897,18 @@ }% }{}% }{}% + \if@MXV@@draft% + \@MXV@labeltoaux{@MXV@\@MXV@label.draft}{true}% + \else% + \@MXV@labeltoaux{@MXV@\@MXV@label.draft}{false}% + \fi% \@MXV@labeltoaux{@MXV@\@MXV@@label.annotid}{\the\@MXV@includes}% \if@MXV@presentation\else% \@MXV@newlabel{@MXV@\@MXV@@label.annotid}{\the\@MXV@includes}% \fi% \fi% % + \ifthenelse{\boolean{@MXV@@draft}}{}{% \ifthenelse{\boolean{@MXV@externalviewer}}{% \ifx\@MXV@label\@empty\else% \@MXV@labeltoaux{@MXV@\@MXV@label.externalviewer}{true}% @@ -2207,6 +2213,7 @@ }% }% }% + }% draft? % %insert link target, if media has been labelled \ifthenelse{\NOT\equal{\@MXV@@label}{}}{% @@ -2220,6 +2227,7 @@ }{}% % \ifthenelse{\boolean{@MXV@@draft}}{% + \makebox[0pt][l]{\usebox{\@MXV@textbox}}% \@MXV@draftbox{\@MXV@width}{\@MXV@height}{\@MXV@depth}{#4}% }{% %insert textbox, obscured by poster @@ -2278,8 +2286,7 @@ \global\advance\@MXV@links by 1%increment link counter % %label this link for later page number determination - \@MXV@labeltoaux{@MXV@link\the\@MXV@links.page}{% - \noexpand\the\@MXV@page}% + \@MXV@labeltoaux{@MXV@link\the\@MXV@links.page}{\noexpand\the\@MXV@page}% % \ifthenelse{\boolean{@MXV@presentation}}{% %in presentation mode the label must be extended by the physical page No. @@ -2304,6 +2311,10 @@ }% }{}% }{% + \ifthenelse{\equal{\@MXV@getlabelvalue{@MXV@\@MXV@label.draft}}{true}}{% + \setboolean{@MXV@@draft}{true}% if the screen annotation is in draft mode + }{}% + \if@MXV@@draft\else% \ifthenelse{\equal{\@MXV@getlabelvalue{@MXV@\@MXV@label.externalviewer}}{true}}{% \setboolean{@MXV@externalviewer}{true}% }{% @@ -3112,6 +3123,7 @@ \fi% }% \fi% + \fi% % \ifpdf% \ifthenelse{\isundefined{\@pdfborder}}{% @@ -3134,26 +3146,28 @@ /Subtype /Link% /A <<% /S/GoTo% - /D (@MXV@\@MXV@label)% - \if@MXV@externalviewer\else% - \if@MXV@iiid% - \ifx\@MXV@iiidview\@empty\else% + /D (@MXV@\@MXV@@label)% + \if@MXV@@draft\else% + \if@MXV@externalviewer\else% + \if@MXV@iiid% + \ifx\@MXV@iiidview\@empty\else% + /Next <<% + /S/GoTo3DView% + /TA \@MXV@getlabelvalue{@MXV@\@MXV@@label.annot}\space 0 R% + /V \@MXV@iiidview% + \fi% + \@MXV@jscriptiiidaction% + \ifx\@MXV@iiidview\@empty\else% + >>% + \fi% + \else% /Next <<% - /S/GoTo3DView% - /TA \@MXV@getlabelvalue{@MXV@\@MXV@@label.annot}\space 0 R% - /V \@MXV@iiidview% - \fi% - \@MXV@jscriptiiidaction% - \ifx\@MXV@iiidview\@empty\else% + /S/Rendition% + /R \@MXV@getlabelvalue{@MXV@\@MXV@@label.rendition}\space 0 R% + /AN \@MXV@getlabelvalue{@MXV@\@MXV@@label.annot}\space 0 R% + \@MXV@operation% >>% \fi% - \else% - /Next <<% - /S/Rendition% - /R \@MXV@getlabelvalue{@MXV@\@MXV@@label.rendition}\space 0 R% - /AN \@MXV@getlabelvalue{@MXV@\@MXV@@label.annot}\space 0 R% - \@MXV@operation% - >>% \fi% \fi% >>% @@ -3179,26 +3193,28 @@ {linkannot\the\@MXV@links} <<% /A <<% /S/GoTo% - /D (@MXV@\@MXV@label)% - \if@MXV@externalviewer\else% - \if@MXV@iiid% - \ifx\@MXV@iiidview\@empty\else% + /D/@MXV@\@MXV@@label% + \if@MXV@@draft\else% + \if@MXV@externalviewer\else% + \if@MXV@iiid% + \ifx\@MXV@iiidview\@empty\else% + /Next <<% + /S/GoTo3DView% + /TA {3Dannot\@MXV@getlabelvalue{@MXV@\@MXV@@label.annot}}% + /V \@MXV@iiidview% + \fi% + \@MXV@jscriptiiidaction% + \ifx\@MXV@iiidview\@empty\else% + >>% + \fi% + \else% /Next <<% - /S/GoTo3DView% - /TA {3Dannot\@MXV@getlabelvalue{@MXV@\@MXV@@label.annot}}% - /V \@MXV@iiidview% - \fi% - \@MXV@jscriptiiidaction% - \ifx\@MXV@iiidview\@empty\else% + /S /Rendition% + /R {mediarendition\@MXV@getlabelvalue{@MXV@\@MXV@@label.annotid}}% + /AN {screenannot\@MXV@getlabelvalue{@MXV@\@MXV@@label.annot}}% + \@MXV@operation% >>% \fi% - \else% - /Next <<% - /S /Rendition% - /R {mediarendition\@MXV@getlabelvalue{@MXV@\@MXV@@label.annotid}}% - /AN {screenannot\@MXV@getlabelvalue{@MXV@\@MXV@@label.annot}}% - \@MXV@operation% - >>% \fi% \fi% >>% -- cgit v1.2.3