movie15 update (4jan07)

git-svn-id: svn://tug.org/texlive/trunk@3143 c570f23f-e606-0410-a88d-b1316a301751

7 files changed, 123 insertions, 111 deletions

diff --git a/Master/texmf-dist/doc/latex/movie15/README b/Master/texmf-dist/doc/latex/movie15/README
index 3f56a4b1f4b..02c67f2ca7b 100644
--- a/Master/texmf-dist/doc/latex/movie15/README
+++ b/Master/texmf-dist/doc/latex/movie15/README
@@ -27,6 +27,9 @@ Description:
     options. Please refer to the documentation `movie15.pdf' in the `doc/'
     directory for details.
 
+    Keywords: embed, movie, LaTeX, pdfLaTeX, PDF, 3D, JavaScript, include,
+              sound, video, multimedia, animation
+
 
 Usage:
 
diff --git a/Master/texmf-dist/doc/latex/movie15/animation.js b/Master/texmf-dist/doc/latex/movie15/animation.js
index 99829252365..fe239ee69ad 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
-//
-//   888888888888888888888888888888888888888888888888888888888888
-// * 88 Set includemovie-option `repeat=0', to take effect !!! 88
-//   888888888888888888888888888888888888888888888888888888888888
-//
-// * 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;
-  }
-};
-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 46dbb64d66e..5417ae47a44 100644
--- a/Master/texmf-dist/doc/latex/movie15/movie15.pdf
+++ b/Master/texmf-dist/doc/latex/movie15/movie15.pdf
diff --git a/Master/texmf-dist/doc/latex/movie15/movie15.tex b/Master/texmf-dist/doc/latex/movie15/movie15.tex
index e452dfed451..f63b1d9bd2e 100644
--- a/Master/texmf-dist/doc/latex/movie15/movie15.tex
+++ b/Master/texmf-dist/doc/latex/movie15/movie15.tex
@@ -51,7 +51,7 @@
 
 \begin{abstract}\noindent
 A \LaTeX{} package for inclusion of movies, sounds and 3D objects into PDF documents with PDF-1.5/1.6 compatibility.\\[0.2\baselineskip]
-\emph{Keywords}: embed, movie, LaTeX, pdfLaTeX, PDF, 3D, JavaScript, include, sound, video, multimedia, animation
+\emph{Keywords}: embed, movie, LaTeX, pdfLaTeX, PDF, 3D, JavaScript, \mbox{include}, sound, video, multimedia, animation
 \end{abstract}
 
 \tableofcontents
@@ -314,7 +314,7 @@ Sets the default lighting scheme. The following values are honoured: `\verb+None
 \begin{verbatim}
 3Djscript=<JavaScript file>
 \end{verbatim}
-Things like animation, lighting, background etc. may also be script driven. Option `\verb+3Djscript+' associates \verb+<JavaScript file>+ with the 3D object. The script will be executed upon activation of the object. Refer to the Acrobat 3D JavaScript Reference~\cite{jscript3D} for details. Directory `\verb+doc/javascript+' contains JavaScript example files for animation and rotation control. The files work off-the-shelf with any 3D file and may be concatenated to combine their effects. If animation is to be managed by JavaScript, option `\verb+repeat+' must be set to zero, i.\,e. `\verb+repeat=0+'.
+Things like animation, lighting, background etc. may also be script driven. Option `\verb+3Djscript+' associates \verb+<JavaScript file>+ with the 3D object. The script will be executed upon activation of the object. Refer to the Acrobat 3D JavaScript Reference~\cite{jscript3D} for details. Directory `\verb+doc/javascript+' contains JavaScript example files for animation and rotation control. The files work off-the-shelf with any 3D file and may be concatenated to combine their effects.
 \begin{verbatim}
 3Dresource=<resource file 1>[, 3Dresource=<resource file 2> [, ...]]
 \end{verbatim}
@@ -592,9 +592,7 @@ The duration of the media segment to be played. The trailing `\verb+s+' is manda
 
   {\tt%
     \string\includemovie[\\
-	\phantom{xx}...,\\
-	\phantom{xx}repeat=0, \% required if animation is controlled by\\
-	\phantom{xx}3Djscript=my\_script.js\phantom{xxxxxxxxxxxxxxxx}\% JavaScript\\
+	\phantom{xx}..., 3Djscript=my\_script.js\\
 	]\string{\\
 	\phantom{xx}.5\string\linewidth\\
 	\string}\string{\\
diff --git a/Master/texmf-dist/doc/latex/movie15/overlay-example.pdf b/Master/texmf-dist/doc/latex/movie15/overlay-example.pdf
index f3d938d49f0..3a019696d34 100644
--- a/Master/texmf-dist/doc/latex/movie15/overlay-example.pdf
+++ b/Master/texmf-dist/doc/latex/movie15/overlay-example.pdf
diff --git a/Master/texmf-dist/tex/latex/movie15/movie15.sty b/Master/texmf-dist/tex/latex/movie15/movie15.sty
index 3a242932fbf..80b736cf2e0 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}[2006/12/19]
+\ProvidesPackage{movie15}[2007/01/04]
 \RequirePackage{keyval}
 \RequirePackage{ifthen}
 \RequirePackage{ifpdf}
@@ -77,6 +77,15 @@
 %  \setboolean{@MXV@presentation}{false}%
 %}
 
+\AtBeginDocument{%
+  \provideboolean{Hy@colorlinks}% set by hyperref
+  \ifHy@colorlinks% coloured (movieref-)link text instead of link border
+    \gdef\@MXV@pdfborder{/Border [0 0 0]}%
+  \else%
+    \gdef\@MXV@pdfborder{}%
+  \fi%
+}
+
 \RequirePackage{everyshi}%
 \newcount\@MXV@page% counter for absolute page number
 \EveryShipout{%
@@ -2240,7 +2249,8 @@
     \ifthenelse{\isundefined{\pdfmark}}{\@MXV@missing{hyperref}}{}%
   \fi%
   \leavevmode%
-  \savebox{\@MXV@textbox}{#3}% save text argument
+  % save text argument
+  \savebox{\@MXV@textbox}{\ifHy@colorlinks\color{\@linkcolor}\fi#3}%
   %
   %find out whether the contents should be hidden or not (for presentations)
   \setboolean{@MXV@hide}{false}%
@@ -3109,7 +3119,7 @@
         }{%
           \edef\@MXV@linkattr{%
             \if@MXV@beamer%
-              /Border [1 1 1]%
+              \@MXV@pdfborder%
             \else%
               /Border [\@pdfborder]%
             \fi%
@@ -3157,6 +3167,7 @@
           Color=\@linkbordercolor,%
           AcroHighlight=\@pdfhighlight,%
           Raw={%
+            \@MXV@pdfborder%
             /_objdef {linkannot\the\@MXV@links}%
           }%
         }%
diff --git a/Master/texmf-dist/tpm/movie15.tpm b/Master/texmf-dist/tpm/movie15.tpm
index 2aa9ab0c4b0..a3f22961160 100644
--- a/Master/texmf-dist/tpm/movie15.tpm
+++ b/Master/texmf-dist/tpm/movie15.tpm
@@ -3,7 +3,7 @@
   <rdf:Description about="http://texlive.dante.de/texlive/Package/movie15.zip">
     <TPM:Name>movie15</TPM:Name>
     <TPM:Type>Package</TPM:Type>
-    <TPM:Date>2006/12/19 13:53:00</TPM:Date>
+    <TPM:Date>2007/01/04 16:39:00</TPM:Date>
     <TPM:Version>2005/07/01</TPM:Version>
     <TPM:Creator>rahtz</TPM:Creator>
     <TPM:Title>Multimedia inclusion package.</TPM:Title>
@@ -18,11 +18,11 @@ played back synchronously.
     <TPM:Size>920826</TPM:Size>
     <TPM:License></TPM:License>
     <TPM:Build/>
-    <TPM:RunFiles size="131373">
+    <TPM:RunFiles size="131676">
 texmf-dist/tex/latex/movie15/movie15.sty
 texmf-dist/tpm/movie15.tpm
     </TPM:RunFiles>
-    <TPM:DocFiles size="789453">
+    <TPM:DocFiles size="788243">
 texmf-dist/doc/latex/movie15/3dsystem.fig
 texmf-dist/doc/latex/movie15/3dsystem.pdf
 texmf-dist/doc/latex/movie15/3dsystem.tex