movie15 update (21sep07)

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

6 files changed, 44 insertions, 48 deletions

diff --git a/Master/texmf-dist/doc/latex/movie15/README b/Master/texmf-dist/doc/latex/movie15/README
index 807c12d716c..5ed35fbae65 100644
--- a/Master/texmf-dist/doc/latex/movie15/README
+++ b/Master/texmf-dist/doc/latex/movie15/README
@@ -333,11 +333,10 @@ Requirements:
 
  package `fp', if option `3D' is selected
 
- pdfTeX, version >= 1.30 needed for DVI and PDF output
+ pdfTeX, version >= 1.20 needed for PDF output
 
  Adobe Reader, version >=6 for playing movies/sound,
  Adobe Reader, version >=7 for 3D objects
- (Only Windows and Mac versions support embedded multimedia playback)
 
  Embedded media file data can also be extracted and saved to disk from within
  Readers which support file attachments. This makes PDF documents a little more
diff --git a/Master/texmf-dist/doc/latex/movie15/movie15.pdf b/Master/texmf-dist/doc/latex/movie15/movie15.pdf
index c7765f7ca76..1f4006c2f7a 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 52560fd5e7a..8aff891e70b 100644
--- a/Master/texmf-dist/doc/latex/movie15/movie15.tex
+++ b/Master/texmf-dist/doc/latex/movie15/movie15.tex
@@ -73,13 +73,13 @@ Also read the comments in the example's source file, `\verb+overlay-example.tex+
 The file `movie15.sty' should be stored in a place where \LaTeX{} can find it.
 
 \section{Requirements}
-pdf\TeX{}, version $\ge1.30$, is needed for DVI \emph{and} PDF output.
+pdf\TeX{}, version $\ge1.20$, is needed for direct PDF output.
 
 If the package option `\verb+3D+' is set, `movie15' loads Michael Mehlich's `fp' package for fixed point arithmetic. Since it does not belong to the core packages of most \TeX{} distributions it must be installed prior to selecting the `\verb+3D+' option.
 
-Adobe Reader, version 6, is required for playing movies and sounds, version 7 for rendering embedded 3D content. Unfortunately, only Windows and Mac versions of Adobe Reader provide the necessary plug-ins.
+Adobe Reader, version 6, is required for playing movies and sounds, version 7 for rendering embedded 3D content.
 
-\newpage
+%\newpage
 \section{Using the package}
 Invoke the package by putting the line
 \begin{verbatim}
diff --git a/Master/texmf-dist/doc/latex/movie15/overlay-example.pdf b/Master/texmf-dist/doc/latex/movie15/overlay-example.pdf
index 71f77b2ed21..bddd5565fab 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/doc/latex/movie15/overlay-example.tex b/Master/texmf-dist/doc/latex/movie15/overlay-example.tex
index 6040b5ea9ec..d2c791e256e 100644
--- a/Master/texmf-dist/doc/latex/movie15/overlay-example.tex
+++ b/Master/texmf-dist/doc/latex/movie15/overlay-example.tex
@@ -6,7 +6,7 @@
 %
 \documentclass{beamer}
 \setbeamertemplate{navigation symbols}{}
-\usepackage[3D]{movie15}
+\usepackage{movie15}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % Some hints on using movie15 with /presentation/ packages
diff --git a/Master/texmf-dist/tex/latex/movie15/movie15.sty b/Master/texmf-dist/tex/latex/movie15/movie15.sty
index ed756eec65d..e189257adf1 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/05/07]
+\ProvidesPackage{movie15}[2007/09/21]
 \RequirePackage{keyval}
 \RequirePackage{ifthen}
 \RequirePackage{ifpdf}
@@ -45,14 +45,19 @@
 
 \ProcessOptions*\relax
 
-%testing for correct TeX version, pdfmdfivesum file  is needed for both,
-%pdf _and_ dvi output
+%testing for correct TeX version,
+\ifpdf
+ \ifnum\pdftexversion<120
+   \PackageError{movie15}{%
+     pdfeTeX, version >= 1.20, required
+   }{%
+     Install a more recent version!
+   }%
+ \fi
+\fi
+
 \ifx\@undefined\pdfmdfivesum
-  \PackageError{movie15}{%
-    pdfeTeX, version >= 1.30, required
-  }{%
-    Install a more recent version!
-  }%
+  \def\pdfmdfivesum file #1{#1}
 \fi
 
 \ifpdf %allows pdftex to directly import Metapost generated Postscript
@@ -1052,7 +1057,7 @@
                   /H /N%
                   /Border [0 0 0]%
                 \fi%
-                /A <</URI (#5) /S/URI>>%
+                /Action <</URI (#5) /S/URI>>%
                 /Contents (3D Object (\@MXV@mime))%
               }%
             }%
@@ -1073,7 +1078,7 @@
                     /H /N%
                     /Border [0 0 0]%
                   \fi%
-                  /A <<%
+                  /Action <<%
                     /F (#5)%
                     /S /Launch%
                   >>%
@@ -1496,7 +1501,7 @@
                 /H /N%
                 /Border [0 0 0]%
               \fi%
-              /A <</URI (#4) /S/URI>>%
+              /Action <</URI (#4) /S/URI>>%
               /Contents (Media File (\@MXV@mime))%
             }%
           }%
@@ -1517,7 +1522,7 @@
                   /H /N%
                   /Border [0 0 0]%
                 \fi%
-                /A <<%
+                /Action <<%
                   /F (#4)%
                   /S /Launch%
                 >>%
@@ -2229,6 +2234,7 @@
         %script for normal activation by mouse click
         \xdef\@MXV@activationjsentry{%
           /JS (
+		    app.focusRect=true;%
             if(focusonplayer==undefined){%
               var focusonplayer=0; %shared by all annots
             }
@@ -3221,41 +3227,32 @@
           Raw={%
             \@MXV@pdfborder%
             /_objdef {linkannot\the\@MXV@links}%
-          }%
-        }%
-        %
-        %entire action entry moved outside
-        \pdfmark{%
-          pdfmark=/PUT,%
-          Raw={%
-            {linkannot\the\@MXV@links} <<%
-              /A <<%
-                /S/GoTo%
-                /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%
+            /Action <<%
+              /S/GoTo%
+              /D/@MXV@\@MXV@@label%
+              \if@MXV@@draft\else%
+                \if@MXV@externalviewer\else%
+                  \if@MXV@iiid%
+                    \ifx\@MXV@iiidview\@empty\else%
                       /Next <<%
-                        /S /Rendition%
-                        /R {mediarendition\@MXV@getlabelvalue{@MXV@\@MXV@@label.annotid}}%
-                        /AN {screenannot\@MXV@getlabelvalue{@MXV@\@MXV@@label.annot}}%
-                        \@MXV@operation%
+                        /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 /Rendition%
+                      /R {mediarendition\@MXV@getlabelvalue{@MXV@\@MXV@@label.annotid}}%
+                      /AN {screenannot\@MXV@getlabelvalue{@MXV@\@MXV@@label.annot}}%
+                      \@MXV@operation%
+                    >>%
                   \fi%
                 \fi%
-              >>%
+              \fi%
             >>%
           }%
         }%