movie15 update

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

1 files changed, 79 insertions, 25 deletions

diff --git a/Master/texmf-dist/tex/latex/movie15/movie15.sty b/Master/texmf-dist/tex/latex/movie15/movie15.sty
index cae17c79f0f..ac357f33026 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/05/22]
+\ProvidesPackage{movie15}[2006/07/13]
 \RequirePackage{keyval}
 \RequirePackage{ifthen}
 \RequirePackage{ifpdf}
@@ -125,6 +125,7 @@
 \newboolean{@MXV@autoplay}
 \newboolean{@MXV@autostop}
 \newboolean{@MXV@autoresume}
+\newboolean{@MXV@autoclose}
 \newboolean{@MXV@autopause}
 \newboolean{@MXV@mouse}%mouse interaction
 \newboolean{@MXV@inline}%inline movie data
@@ -147,6 +148,7 @@
   \setboolean{@MXV@autostop}{true}%
   \setboolean{@MXV@autoresume}{false}%
   \setboolean{@MXV@autopause}{false}%
+  \setboolean{@MXV@autoclose}{false}%
   \setboolean{@MXV@mouse}{false}%
   \setboolean{@MXV@inline}{true}%
   \setboolean{@MXV@attachment}{true}%
@@ -422,7 +424,8 @@
     %make the first view in the VA array the default view, if no default one has
     %explicitly been provided, but if the VA array itself is empty too (no
     %additional views provided) use our fallback view (c2c=0 -1 0) as default
-    \ifthenelse{\NOT\boolean{@MXV@defaultviewprovided}\AND\boolean{@MXV@viewsprovided}}{%
+    \ifthenelse{\NOT\boolean{@MXV@defaultviewprovided}%
+      \AND\boolean{@MXV@viewsprovided}}{%
       \xdef\@MXV@defaultview{/3DV /F}%
     }{%
       \xdef\@MXV@defaultview{/3DV \@MXV@defaultview}%
@@ -863,6 +866,7 @@
               e.target.settings.startAt.time
               || e.target.settings.startAt.frame
               || e.target.settings.startAt.marker
+              || e.target.id == 'vnd.adobe.swname:AAPL_QuickTime'
             ){
               e.target.seek(e.target.settings.startAt);
             }else{
@@ -1499,12 +1503,16 @@
         \fi%
       }%
       \if@MXV@autostop%
-        \def\@MXV@deactivation{/D/PI/DIS/U}%
+        \def\@MXV@deactivation{/D/PI/DIS/I}%
       \else%
         \if@MXV@autopause%
           \def\@MXV@deactivation{/D/PI/DIS/I}%
-        \else%@MXV@continue
-          \def\@MXV@deactivation{/D/PI/DIS/L}%
+        \else%
+          \if@MXV@autoclose%
+            \def\@MXV@deactivation{/D/PI/DIS/U}%
+          \else%@MXV@continue
+            \def\@MXV@deactivation{/D/PI/DIS/L}%
+          \fi%
         \fi%
       \fi%
       \if@MXV@externalviewer\else%
@@ -1518,7 +1526,8 @@
         }{%
           \global\@MXV@iiidoncurpage=1%
         }%
-        \xdef\@MXV@oldpage{\@MXV@getlabelvalue{@MXV@player\the\@MXV@includes.page}}%
+        \xdef\@MXV@oldpage{\@MXV@getlabelvalue{%
+          @MXV@player\the\@MXV@includes.page}}%
       \fi%
       \ifx\@MXV@label\@empty\else%
         \@MXV@labeltoaux{@MXV@\@MXV@label.3D}{true}%
@@ -1559,8 +1568,12 @@
       \else%
         \if@MXV@autopause%
           \xdef\@MXV@pagecloseopentry{/OP 2}%
-        \else% @MXV@continue
-          \xdef\@MXV@pagecloseopentry{/OP 3}%
+        \else%
+          \if@MXV@autoclose%
+            \xdef\@MXV@pagecloseopentry{/OP 1}%
+          \else% @MXV@continue
+            \xdef\@MXV@pagecloseopentry{/OP 3}%
+          \fi%
         \fi%
       \fi%
       %
@@ -1593,6 +1606,8 @@
                   player\the\@MXV@includes.settings.startAt.time
                   || player\the\@MXV@includes.settings.startAt.frame
                   || player\the\@MXV@includes.settings.startAt.marker
+                  || player\the\@MXV@includes.id ==
+                     'vnd.adobe.swname:AAPL_QuickTime'
                 ){
                   player\the\@MXV@includes.seek(%
                     player\the\@MXV@includes.settings.startAt);
@@ -1604,15 +1619,28 @@
             )%
           }%
         \else%
-          \xdef\@MXV@pageclosejsentry{%@MXV@continue
-            /JS (
-              try{%
-                focusonplayer=-1; %page change
-                player\the\@MXV@includes.visible=false;
-              }
-              catch(e){}
-            )%
-          }%
+          \if@MXV@autoclose%
+            \xdef\@MXV@pageclosejsentry{%
+              /JS (
+                try{%
+                  player\the\@MXV@includes.close(app.media.closeReason.general);
+                  focusonplayer=-1; %page change
+                  player\the\@MXV@includes.visible=false;
+                }
+                catch(e){}
+              )%
+            }%
+          \else%
+            \xdef\@MXV@pageclosejsentry{%@MXV@continue
+              /JS (
+                try{%
+                  focusonplayer=-1; %page change
+                  player\the\@MXV@includes.visible=false;
+                }
+                catch(e){}
+              )%
+            }%
+          \fi%
         \fi%
       \fi%
       %
@@ -1632,6 +1660,8 @@
                     player\the\@MXV@includes.settings.startAt.time
                     || player\the\@MXV@includes.settings.startAt.frame
                     || player\the\@MXV@includes.settings.startAt.marker
+                    || player\the\@MXV@includes.id ==
+                       'vnd.adobe.swname:AAPL_QuickTime'
                   ){
                     player\the\@MXV@includes.seek(
                       player\the\@MXV@includes.settings.startAt);
@@ -1649,6 +1679,8 @@
                         player\the\@MXV@includes.settings.startAt.time
                         || player\the\@MXV@includes.settings.startAt.frame
                         || player\the\@MXV@includes.settings.startAt.marker
+                        || player\the\@MXV@includes.id ==
+                           'vnd.adobe.swname:AAPL_QuickTime'
                       ){
                         player\the\@MXV@includes.seek(%
                           player\the\@MXV@includes.settings.startAt);
@@ -1911,7 +1943,9 @@
                   )[\@MXV@getlabelvalue{@MXV@#2.3Doncurpage}-1];
                   annot3D["#2"].activated=true;
                 }catch(e){%
-                  app.alert("3D annotation could not be activated!");
+                  spc=String.fromCharCode(32);
+                  app.alert("3D" + spc + "annotation" + spc + "could" + spc +
+                  "not" + spc + "be" + spc + "activated!");
                 }%
               }%
             )%
@@ -2043,14 +2077,16 @@
                   %
                   %assemble result string
                   var res = '';
+                  spc=String.fromCharCode(32);
                   if(aac != 30){%
-                    res += util.printf('3Daac=\%s, ', %
+                    res += util.printf('3Daac=\%s,' + spc, %
                       (Math.abs(aac) < 1.001e-6 && Math.abs(aac) > 0 ? %
-                        util.printf('\%.18f', aac): aac)%
+                        util.printf('\%.18f', aac): aac), 32%
                     );
                   }%
                   if(coo.length){%
-                    res += util.printf( '3Dcoo=\%s \%s \%s, ', %
+                    res += util.printf( '3Dcoo=\%s' + spc + '\%s' + spc + '\%s,'
+                        + spc, %
                         (Math.abs(coo.x) < 1.001e-6 && Math.abs(coo.x) > 0 ? %
                           util.printf('\%.18f', coo.x): coo.x), %
                         (Math.abs(coo.y) < 1.001e-6 && Math.abs(coo.y) > 0 ? %
@@ -2069,13 +2105,15 @@
                       });
                     }, %
                     description: {%
-                      name: "3D Camera Settings", %
+                      name: '3D' + spc + 'Camera' + spc + 'Settings', %
                       elements: [%
                         {%
                           type: "static_text", %
-                          name: 'Copy and paste the following to the option %
-                                 list of \string\\\string\\includemovie!', %
-                        }, %
+                          name: 'Copy' + spc + 'and' + spc + 'paste' + spc +
+                                'the' + spc + 'following' + spc + 'to' + spc +
+                                'the' + spc + 'option' + spc + 'list' + spc +
+                                'of' + spc + '\string\\\string\\includemovie!'%
+                        },
                         {%
                           type: "edit_text", %
                           item_id: "text", %
@@ -2168,6 +2206,8 @@
                     player\@MXV@getlabelvalue{@MXV@#2.playerid}.settings.startAt.time
                     || player\@MXV@getlabelvalue{@MXV@#2.playerid}.settings.startAt.frame
                     || player\@MXV@getlabelvalue{@MXV@#2.playerid}.settings.startAt.marker
+                    || player\@MXV@getlabelvalue{@MXV@#2.playerid}.id ==
+                       'vnd.adobe.swname:AAPL_QuickTime'
                   ){
                     player\@MXV@getlabelvalue{@MXV@#2.playerid}.seek(
                       player\@MXV@getlabelvalue{@MXV@#2.playerid}.settings.startAt);
@@ -2198,6 +2238,8 @@
                 player\@MXV@getlabelvalue{@MXV@#2.playerid}.settings.startAt.time
                 || player\@MXV@getlabelvalue{@MXV@#2.playerid}.settings.startAt.frame
                 || player\@MXV@getlabelvalue{@MXV@#2.playerid}.settings.startAt.marker
+                || player\@MXV@getlabelvalue{@MXV@#2.playerid}.id ==
+                   'vnd.adobe.swname:AAPL_QuickTime'
               ){
                 player\@MXV@getlabelvalue{@MXV@#2.playerid}.seek(%
                   player\@MXV@getlabelvalue{@MXV@#2.playerid}.settings.startAt);
@@ -2221,6 +2263,8 @@
                     player\@MXV@getlabelvalue{@MXV@#2.playerid}.settings.startAt.time
                     || player\@MXV@getlabelvalue{@MXV@#2.playerid}.settings.startAt.frame
                     || player\@MXV@getlabelvalue{@MXV@#2.playerid}.settings.startAt.marker
+                    || player\@MXV@getlabelvalue{@MXV@#2.playerid}.id ==
+                       'vnd.adobe.swname:AAPL_QuickTime'
                   ){
                     player\@MXV@getlabelvalue{@MXV@#2.playerid}.seek(
                       player\@MXV@getlabelvalue{@MXV@#2.playerid}.settings.startAt);
@@ -2439,17 +2483,27 @@
   \setboolean{@MXV@autoresume}{#1}%
   \if@MXV@autoresume%
     \setboolean{@MXV@autoplay}{false}%
+    \setboolean{@MXV@autoclose}{false}%
   \fi%
 }
 \define@key{movie15}{autopause}[true]{%
   \setboolean{@MXV@autopause}{#1}%
   \if@MXV@autopause%
     \setboolean{@MXV@autostop}{false}%
+    \setboolean{@MXV@autoclose}{false}%
+  \fi%
+}
+\define@key{movie15}{autoclose}[true]{%
+  \setboolean{@MXV@autoclose}{#1}%
+  \if@MXV@autoclose%
+    \setboolean{@MXV@autostop}{false}%
+    \setboolean{@MXV@autopause}{false}%
   \fi%
 }
 \define@key{movie15}{continue}[true]{%
   \setboolean{@MXV@autostop}{false}%
   \setboolean{@MXV@autopause}{false}%
+  \setboolean{@MXV@autoclose}{false}%
 }
 \define@key{movie15}{open}[true]{%
   %no longer supported; once open, media remains loaded