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/doc/latex/movie15/animation.js | 200 ++++++++++----------- Master/texmf-dist/doc/latex/movie15/movie15.pdf | Bin 471115 -> 471132 bytes Master/texmf-dist/doc/latex/movie15/movie15.tex | 19 +- .../doc/latex/movie15/overlay-example.pdf | Bin 32488 -> 32513 bytes .../doc/latex/movie15/overlay-example.tex | 2 +- Master/texmf-dist/tex/latex/movie15/movie15.sty | 100 ++++++----- Master/texmf-dist/tpm/movie15.tpm | 6 +- Master/texmf/tpm/collection-formatsextra.tpm | 1 - 8 files changed, 172 insertions(+), 156 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/movie15/animation.js b/Master/texmf-dist/doc/latex/movie15/animation.js index fe239ee69ad..f0789891f44 100644 --- a/Master/texmf-dist/doc/latex/movie15/animation.js +++ b/Master/texmf-dist/doc/latex/movie15/animation.js @@ -1,100 +1,100 @@ -///////////////////////////////////////////////////////////////// -// -// animation.js -// -// JavaScript for use with `3Djscript' option of \includemovie -// -// * Activates keyframe animation embedded in the u3d file. -// * Arrow keys `Down', `Up' can be used for speeding up and -// slowing down a running animation, key `Home' for reverting -// to the default speed. -// -// * Adjustable parameters: -var rate = 1; // 1 --> use original speed as default -var palindrome = true; // true --> play forth and back -// -///////////////////////////////////////////////////////////////// - -//get the first animation in the scene -var myAnim = scene.animations.getByIndex(0); -myAnim.wallTime = 0; -myAnim.speed = 1; -myAnim.myLength = myAnim.endTime - myAnim.startTime; -scene.activateAnimation(myAnim); - -//method to set animation speed -myAnim.setSpeed = function (speed) { - speed = Math.abs(speed); - this.wallTime /= speed/this.speed; //correct the walltime - this.speed = speed; -}; - -//method to change animation speed by a factor -myAnim.changeSpeed = function (mult) { - this.wallTime /= mult; //correct the walltime - this.speed *= mult; -}; - -//set default speed -myAnim.setSpeed(rate); - -//menu items -runtime.addCustomMenuItem("faster", "Faster (Key Up)", "default", 0); -runtime.addCustomMenuItem("slower", "Slower (Key Down)", "default", 0); -runtime.addCustomMenuItem("default", "Default Speed (Key Home)", "default", 0); - -//menu handler to control speed -menuEventHandler = new MenuEventHandler(); -menuEventHandler.onEvent = function(e) { - if (e.menuItemName == "faster") { - myAnim.changeSpeed(1.25); - } - else if (e.menuItemName == "slower") { - myAnim.changeSpeed(1/1.25); - } - else if (e.menuItemName == "default") { - myAnim.setSpeed(rate); - } -}; -runtime.addEventHandler(menuEventHandler); - -//key handler to control speed -keyEventHandler = new KeyEventHandler(); -keyEventHandler.onKeyDown = true; -keyEventHandler.onEvent = function(e) { - switch(e.characterCode) { - case 30: //key up - myAnim.changeSpeed(1.05); - break; - - case 31: //key down - myAnim.changeSpeed(1/1.05); - break; - - case 4: //key home - myAnim.setSpeed(rate); - break; - - case 1: //key end - myAnim.setSpeed(rate); - break; - } -}; -runtime.addEventHandler(keyEventHandler); - -//run the animation using a TimeEventHandler -myTimer = new TimeEventHandler(); -myTimer.onTimeChange = true; -myTimer.onEvent = function(e) { - myAnim.wallTime += e.deltaTime; - if (palindrome == true) { - myAnim.currentTime = - myAnim.startTime - + myAnim.myLength/2 - * (1 - Math.cos(Math.PI * myAnim.speed/myAnim.myLength * myAnim.wallTime)); - } else { - myAnim.currentTime = myAnim.startTime - + (myAnim.speed * myAnim.wallTime % myAnim.myLength); - } -}; -runtime.addEventHandler(myTimer); +///////////////////////////////////////////////////////////////// +// +// animation.js +// +// JavaScript for use with `3Djscript' option of \includemovie +// +// * Activates keyframe animation embedded in the u3d file. +// * Arrow keys `Down', `Up' can be used for speeding up and +// slowing down a running animation, key `Home' for reverting +// to the default speed. +// +// * Adjustable parameters: +var rate = 1; // 1 --> use original speed as default +var palindrome = true; // true --> play forth and back +// +///////////////////////////////////////////////////////////////// + +//get the first animation in the scene +var myAnim = scene.animations.getByIndex(0); +myAnim.wallTime = 0; +myAnim.speed = 1; +myAnim.myLength = myAnim.endTime - myAnim.startTime; +scene.activateAnimation(myAnim); + +//method to set animation speed +myAnim.setSpeed = function (speed) { + speed = Math.abs(speed); + this.wallTime /= speed/this.speed; //correct the walltime + this.speed = speed; +}; + +//method to change animation speed by a factor +myAnim.changeSpeed = function (mult) { + this.wallTime /= mult; //correct the walltime + this.speed *= mult; +}; + +//set default speed +myAnim.setSpeed(rate); + +//menu items +runtime.addCustomMenuItem("faster", "Faster (Key Up)", "default", 0); +runtime.addCustomMenuItem("slower", "Slower (Key Down)", "default", 0); +runtime.addCustomMenuItem("default", "Default Speed (Key Home)", "default", 0); + +//menu handler to control speed +menuEventHandler = new MenuEventHandler(); +menuEventHandler.onEvent = function(e) { + if (e.menuItemName == "faster") { + myAnim.changeSpeed(1.25); + } + else if (e.menuItemName == "slower") { + myAnim.changeSpeed(1/1.25); + } + else if (e.menuItemName == "default") { + myAnim.setSpeed(rate); + } +}; +runtime.addEventHandler(menuEventHandler); + +//key handler to control speed +keyEventHandler = new KeyEventHandler(); +keyEventHandler.onKeyDown = true; +keyEventHandler.onEvent = function(e) { + switch(e.characterCode) { + case 30: //key up + myAnim.changeSpeed(1.05); + break; + + case 31: //key down + myAnim.changeSpeed(1/1.05); + break; + + case 4: //key home + myAnim.setSpeed(rate); + break; + + case 1: //key end + myAnim.setSpeed(rate); + break; + } +}; +runtime.addEventHandler(keyEventHandler); + +//run the animation using a TimeEventHandler +myTimer = new TimeEventHandler(); +myTimer.onTimeChange = true; +myTimer.onEvent = function(e) { + myAnim.wallTime += e.deltaTime; + if (palindrome == true) { + myAnim.currentTime = + myAnim.startTime + + myAnim.myLength/2 + * (1 - Math.cos(Math.PI * myAnim.speed/myAnim.myLength * myAnim.wallTime)); + } else { + myAnim.currentTime = myAnim.startTime + + (myAnim.speed * myAnim.wallTime % myAnim.myLength); + } +}; +runtime.addEventHandler(myTimer); diff --git a/Master/texmf-dist/doc/latex/movie15/movie15.pdf b/Master/texmf-dist/doc/latex/movie15/movie15.pdf index 5417ae47a44..4581a0a5648 100644 Binary files a/Master/texmf-dist/doc/latex/movie15/movie15.pdf and b/Master/texmf-dist/doc/latex/movie15/movie15.pdf differ diff --git a/Master/texmf-dist/doc/latex/movie15/movie15.tex b/Master/texmf-dist/doc/latex/movie15/movie15.tex index f63b1d9bd2e..821f068d341 100644 --- a/Master/texmf-dist/doc/latex/movie15/movie15.tex +++ b/Master/texmf-dist/doc/latex/movie15/movie15.tex @@ -491,9 +491,15 @@ The duration of the media segment to be played. The trailing `\verb+s+' is manda \end{minipage}% \begin{minipage}{0.5\linewidth} \begin{center} - \includemovie[poster, label=alien, text=(AlienSong.mpg), url, - playerid=AAPL_QuickTime, - repeat]{\linewidth}{.75\linewidth}{http://www.linux-video.net/Samples/Mpeg1/AlienSong.mpg}\\ + \includemovie[ + poster, + label=alien, + text=(AlienSong.mpg), + repeat, + playerid=AAPL_QuickTime, + url + ]{\linewidth}{.75\linewidth}{http://www.linux-video.net/Samples/Mpeg1/AlienSong.mpg}\\ +% ]{\linewidth}{.75\linewidth}{AlienSong.mpg}\\ \movieref[rate=0.5]{alien}{Slow}\hfill \movieref{alien}{Normal}\hfill \movieref[rate=2]{alien}{Fast}\hfill @@ -533,7 +539,7 @@ The duration of the media segment to be played. The trailing `\verb+s+' is manda \begin{center} \includemovie[ poster, - toolbar, + toolbar, %same as `controls' label=dice, text=(dice.u3d), 3Droo=27, @@ -657,11 +663,7 @@ wmv & video/x-ms-wmv & Windows Media Video\\\hline \end{table} \begin{thebibliography}{9} - %http://www.adobe.com/devnet/pdf/pdf_reference.html - %http://www.adobe.com/devnet/acrobat/pdfs/js_3d_api_reference.pdf - %http://www.adobe.com/devnet/acrobat/pdfs/js_api_reference.pdf \bibitem{pdfspec} Adobe Systems Inc.: \emph{PDF Reference, fifth edition: Adobe Portable Document Format version 1.6}, 2004, Implementation note 144, Appendix H.3, available at \href{http://www.adobe.com/devnet/pdf/pdf_reference.html}{\tt http://www.adobe.com/devnet/pdf/pdf\_reference.html} - %\href{http://partners.adobe.com/public/developer/en/acrobat/sdk/pdf/pdf_creation_apis_and_specs/PDFReference.pdf}{\tt pdf/pdf\_creation\_apis\_and\_specs/PDFReference.pdf}. \bibitem{3diforg} \href{http://www.3dif.org/}{\tt http://www.3dif.org/} \bibitem{dexp} \href{http://www.righthemisphere.com/products/dexp/}{\tt http://www.righthemisphere.com/products/dexp/} \bibitem{jscript3D} Adobe Systems Inc.: \emph{JavaScript for Acrobat\textsuperscript{\scriptsize\textregistered} 3D Annotations API Ref\-er\-ence}, 2006, available at \href{http://www.adobe.com/devnet/acrobat/javascript3d.html}{\tt http://www.adobe.com/devnet/acrobat/} \href{http://www.adobe.com/devnet/acrobat/javascript3d.html}{\tt javascript3d.html} @@ -669,4 +671,3 @@ wmv & video/x-ms-wmv & Windows Media Video\\\hline \end{thebibliography} \end{document} - diff --git a/Master/texmf-dist/doc/latex/movie15/overlay-example.pdf b/Master/texmf-dist/doc/latex/movie15/overlay-example.pdf index 3a019696d34..20a0d5c4a7e 100644 Binary files a/Master/texmf-dist/doc/latex/movie15/overlay-example.pdf and b/Master/texmf-dist/doc/latex/movie15/overlay-example.pdf differ diff --git a/Master/texmf-dist/doc/latex/movie15/overlay-example.tex b/Master/texmf-dist/doc/latex/movie15/overlay-example.tex index 92348d42247..6040b5ea9ec 100644 --- a/Master/texmf-dist/doc/latex/movie15/overlay-example.tex +++ b/Master/texmf-dist/doc/latex/movie15/overlay-example.tex @@ -31,7 +31,7 @@ \includemovie[ poster, autopause, autoresume, - text={\parbox{0.4\linewidth}{\tiny + text={\parbox{0.35\linewidth}{\tiny http://www.linux-video.net/\\Samples/Mpeg1/AlienSong.mpg% }}, playerid=AAPL_QuickTime, 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% >>% diff --git a/Master/texmf-dist/tpm/movie15.tpm b/Master/texmf-dist/tpm/movie15.tpm index f8d7f82e752..44887101343 100644 --- a/Master/texmf-dist/tpm/movie15.tpm +++ b/Master/texmf-dist/tpm/movie15.tpm @@ -3,7 +3,7 @@ movie15 Package - 2007/01/04 16:39:00 + 2007/01/12 11:43:00 2005/07/01 rahtz Multimedia inclusion package. @@ -18,11 +18,11 @@ played back synchronously. 919919 - + texmf-dist/tex/latex/movie15/movie15.sty texmf-dist/tpm/movie15.tpm - + texmf-dist/doc/latex/movie15/3dsystem.fig texmf-dist/doc/latex/movie15/3dsystem.pdf texmf-dist/doc/latex/movie15/3dsystem.tex diff --git a/Master/texmf/tpm/collection-formatsextra.tpm b/Master/texmf/tpm/collection-formatsextra.tpm index e6d11a3d0c4..ac7f066afb3 100644 --- a/Master/texmf/tpm/collection-formatsextra.tpm +++ b/Master/texmf/tpm/collection-formatsextra.tpm @@ -22,7 +22,6 @@ macro packages designed to be dumped into .fmt file - -- cgit v1.2.3