summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2007-11-16 10:45:52 +0000
committerNorbert Preining <preining@logic.at>2007-11-16 10:45:52 +0000
commitf5fd3fed4e77eb3ba97c4405d64beb24abbfed5d (patch)
tree79ee94393d9f9b044e2a4567a8a6352a480c9cab /Master/texmf-dist/tex/latex
parent9cb91a45f0263cb69174b80b0a26258ef06a360a (diff)
update movies 2007/10/29 from ctan
git-svn-id: svn://tug.org/texlive/trunk@5443 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r--Master/texmf-dist/tex/latex/movie15/movie15.sty177
1 files changed, 92 insertions, 85 deletions
diff --git a/Master/texmf-dist/tex/latex/movie15/movie15.sty b/Master/texmf-dist/tex/latex/movie15/movie15.sty
index e189257adf1..a8c1b9b0bf5 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/09/21]
+\ProvidesPackage{movie15}[2007/10/29]
\RequirePackage{keyval}
\RequirePackage{ifthen}
\RequirePackage{ifpdf}
@@ -226,6 +226,7 @@
\setboolean{@MXV@linkstop}{false}%
\setboolean{@MXV@linkclose}{false}%
\setboolean{@MXV@linkreset}{false}%
+ \setboolean{@MXV@requirereopen}{false}%
\ifthenelse{\boolean{@MXV@draft}}{%
\setboolean{@MXV@@draft}{true}%
}{%
@@ -246,6 +247,7 @@
\gdef\@MXV@palindrome{}%
\gdef\@MXV@rate{}%
\gdef\@MXV@startat{}%
+ \gdef\@MXV@@startat{}%
\gdef\@MXV@endat{}%
\gdef\@MXV@poevent{}%
\gdef\@MXV@pcevent{}%
@@ -359,6 +361,15 @@
\ifthenelse{\equal{#2}{swf}\OR\equal{#2}{SWF}}{%
\gdef\@MXV@mime{application/x-shockwave-flash}%
}{%
+ \ifthenelse{\equal{#2}{prc}\OR\equal{#2}{PRC}}{%
+ \ifthenelse{\boolean{@MXV@iiiDfeat}}{%
+ \setboolean{@MXV@iiid}{true}%
+ \gdef\@MXV@mime{model/prc}% (unofficial)
+ \gdef\@MXV@iiidsubtype{PRC}%
+ }{%
+ \@MXV@neediiiD%
+ }%
+ }{%
\ifthenelse{\equal{#2}{u3d}\OR\equal{#2}{U3D}}{%
\ifthenelse{\boolean{@MXV@iiiDfeat}}{%
\setboolean{@MXV@iiid}{true}%
@@ -368,10 +379,14 @@
\@MXV@neediiiD%
}%
}{%
- \ifthenelse{\equal{#2}{ra}\OR\equal{#2}{RA}\OR%
- \equal{#2}{ram}\OR\equal{#2}{RAM}\OR%
- \equal{#2}{rm}\OR\equal{#2}{RM}}{%
- \gdef\@MXV@mime{audio/x-pn-realaudio}%
+ \ifthenelse{\equal{#2}{ra}\OR\equal{#2}{RA}}{
+ \gdef\@MXV@mime{audio/vnd.rn-realaudio}%
+ }{%
+ \ifthenelse{%
+ \equal{#2}{rv}\OR\equal{#2}{RV}\OR
+ \equal{#2}{rm}\OR\equal{#2}{RM}%
+ }{%
+ \gdef\@MXV@mime{application/vnd.rn-realmedia}%
}{%
\PackageError{movie15}{%
I couldn't determine MIME type of file:\MessageBreak`#1':\MessageBreak
@@ -381,11 +396,11 @@
non-standard file name extension, the MIME type must\MessageBreak
explicitly be specified. Try option `mimetype=<mime type>'!
}%
- }}}}}}}}}}}}}}}}%
+ }}}}}}}}}}}}}}}}}}%
}
%sets @MXV@issound boolean
-\def\@MXV@@issound#1/#2.{% argument: \@MXV@mime.
+\def\@MXV@@issound#1/#2:{% argument: \@MXV@mime.
\def\@MXV@firstarg{#1}%
\def\@MXV@audio{audio}%
\ifx\@MXV@firstarg\@MXV@audio%
@@ -1846,7 +1861,7 @@
\else%
\xdef\@MXV@filename{\filename@base.\filename@ext}%
\fi%
- \expandafter\@MXV@@issound\@MXV@mime.%
+ \expandafter\@MXV@@issound\@MXV@mime:%
%
%if 3D object is not embedded inline we must use some external player :(
\ifthenelse{%
@@ -2234,7 +2249,7 @@
%script for normal activation by mouse click
\xdef\@MXV@activationjsentry{%
/JS (
- app.focusRect=true;%
+ app.focusRect=true;%
if(focusonplayer==undefined){%
var focusonplayer=0; %shared by all annots
}
@@ -2539,6 +2554,8 @@
\edef\@MXV@linkjscriptiiid{%
\@MXV@linkjscriptiiid
try{
+% console.show();
+% console.clear();
%constructor for doubly linked list
function List(){%
this.first_node=null;%
@@ -2921,6 +2938,7 @@
}%
}{\edef\@MXV@jscriptiiidaction{}}%
}{% #### 2D ####
+ \setkeys{MXV@user}{#1}%
%retrieve original settings
\ifthenelse{\equal{\@MXV@getlabelvalue{@MXV@\@MXV@label.mouse}}{true}}{%
\setboolean{@MXV@mouse}{true}%
@@ -2934,7 +2952,9 @@
\edef\@MXV@startat{\@MXV@getlabelvalue{@MXV@\@MXV@label.startAt}}%
\edef\@MXV@endat{\@MXV@getlabelvalue{@MXV@\@MXV@label.endAt}}%
\edef\@MXV@volume{\@MXV@getlabelvalue{@MXV@\@MXV@label.volume}}%
- \setkeys{MXV@user}{#1}%override with new settings
+ \if@MXV@linkreset\else%
+ \setkeys{MXV@user}{#1}%override with new settings
+ \fi%
%
\edef\@MXV@operation{}%
%
@@ -2959,23 +2979,47 @@
\@MXV@settings{\@MXV@ctrls}{\@MXV@palindrome}{\@MXV@repeat}%
{\@MXV@rate}{\@MXV@startat}{\@MXV@endat}{\@MXV@volume}%
\@MXV@events{\@MXV@currplayer}%
- {\if@MXV@mouse true\else false\fi}{true}%
- try{%
- if(player\@MXV@currplayer.isOpen){%
- player\@MXV@currplayer.close(%
- app.media.closeReason.general);
- player\@MXV@currplayer=null;
- }%
- }%
- catch(e){}%
- %
+ {\if@MXV@mouse true\else false\fi}%
+ {true}%
+ \if@MXV@requirereopen\else
try{%
- var player\@MXV@currplayer=app.media.openPlayer({%
- settings: settings,%
- events: events%
- });
+ \ifx\@MXV@@startat\@empty
+ player\@MXV@currplayer.seek(%
+ player\@MXV@currplayer.settings.startAt%
+ );
+ \else
+ player\@MXV@currplayer.seek(\@MXV@@startat);
+ \fi
+ player\@MXV@currplayer.play();
+ \ifx\@MXV@@startat\@empty
+ player\@MXV@currplayer.seek(%
+ player\@MXV@currplayer.settings.startAt%
+ );
+ \else
+ player\@MXV@currplayer.seek(\@MXV@@startat);
+ \fi
}%
- catch (e){}%
+ catch(e)\@charlb%
+ \fi%
+ try{%
+ if(player\@MXV@currplayer.isOpen){%
+ player\@MXV@currplayer.close(%
+ app.media.closeReason.general);
+ player\@MXV@currplayer=null;
+ }%
+ }%
+ catch(e){}%
+ %
+ try{%
+ var player\@MXV@currplayer=app.media.openPlayer({%
+ settings: settings,%
+ events: events%
+ });%
+ }%
+ catch (e){}%
+ \if@MXV@requirereopen\else
+ \@charrb%
+ \fi%
)%
}%
\fi%
@@ -3017,7 +3061,8 @@
\@MXV@settings{\@MXV@ctrls}{\@MXV@palindrome}{\@MXV@repeat}%
{\@MXV@rate}{\@MXV@startat}{\@MXV@endat}{\@MXV@volume}%
\@MXV@events{\@MXV@currplayer}%
- {\if@MXV@mouse true\else false\fi}{true}%
+ {\if@MXV@mouse true\else false\fi}%
+ {true}%
try{%
var player\@MXV@currplayer=app.media.openPlayer({%
settings: settings,%
@@ -3092,7 +3137,8 @@
\@MXV@settings{\@MXV@ctrls}{\@MXV@palindrome}{\@MXV@repeat}%
{\@MXV@rate}{\@MXV@startat}{\@MXV@endat}{\@MXV@volume}%
\@MXV@events{\@MXV@currplayer}%
- {\if@MXV@mouse true\else false\fi}{true}%
+ {\if@MXV@mouse true\else false\fi}%
+ {true}%
try{%
var player\@MXV@currplayer=app.media.openPlayer({%
settings: settings,%
@@ -3117,54 +3163,6 @@
)%
}%
\fi%
- \if@MXV@linkreset% reset to orig. settings
- %retrieve original settings
- \ifthenelse{\equal{\@MXV@getlabelvalue{@MXV@\@MXV@label.mouse}}{true}}{%
- \setboolean{@MXV@mouse}{true}%
- }{%
- \setboolean{@MXV@mouse}{false}%
- }%
- \ifthenelse{\equal{\@MXV@getlabelvalue{@MXV@\@MXV@label.autoplay}}{true}}{%
- \setboolean{@MXV@autoplay}{true}%
- }{%
- \setboolean{@MXV@autoplay}{false}%
- }%
- %
- \edef\@MXV@operation{%
- /OP 0%
- /JS (%
- if(focusonplayer==undefined){%
- var focusonplayer=0; %shared by all annots
- }%
- \@MXV@settings{\@MXV@getlabelvalue{@MXV@\@MXV@label.showUI}}%
- {\@MXV@getlabelvalue{@MXV@\@MXV@label.palindrome}}%
- {\@MXV@getlabelvalue{@MXV@\@MXV@label.repeat}}%
- {\@MXV@getlabelvalue{@MXV@\@MXV@label.rate}}%
- {\@MXV@getlabelvalue{@MXV@\@MXV@label.startAt}}%
- {\@MXV@getlabelvalue{@MXV@\@MXV@label.endAt}}%
- {\@MXV@getlabelvalue{@MXV@\@MXV@label.volume}}%
- \@MXV@events{\@MXV@currplayer}%
- {\if@MXV@mouse true\else false\fi}%
- {\if@MXV@autoplay true\else false\fi}%
- try{%
- if(player\@MXV@currplayer.isOpen){%
- player\@MXV@currplayer.close(%
- app.media.closeReason.general);
- player\@MXV@currplayer=null;
- }%
- }%
- catch(e){}%
- %
- try{%
- var player\@MXV@currplayer=app.media.openPlayer({%
- settings: settings,%
- events: events%
- });
- }%
- catch (e){}%
- )%
- }%
- \fi%
}%
\fi%
\fi%
@@ -3261,6 +3259,10 @@
}%
}
+%set to true for certain \movieref options, which require the media player to
+%be re-opened
+\newboolean{@MXV@requirereopen}
+
%standard keys to be processed first
%key definitions for options to \includemovie
\define@key{MXV@user}{draft}[true]{%
@@ -3277,6 +3279,7 @@
\gdef\@MXV@label{#1}%
}
\define@key{MXV@user}{controls}[true]{%
+ \setboolean{@MXV@requirereopen}{true}%
\xdef\@MXV@ctrls{, showUI: #1}%
\xdef\@MXV@@ctrls{/C #1}%
\ifthenelse{\boolean{@MXV@iiiDfeat}}{%
@@ -3293,6 +3296,7 @@
\define@key{MXV@user}{volume}{%
\def\@MXV@@volume{/V #1}%
\def\@MXV@volume{#1}%
+ \setboolean{@MXV@requirereopen}{true}%
}
\define@key{MXV@user}{mimetype}{%
\ifthenelse{\equal{#1}{model/u3d}}{%
@@ -3352,23 +3356,27 @@
}
\define@key{MXV@user}{mouse}[true]{%
\setboolean{@MXV@mouse}{#1}%
+ \setboolean{@MXV@requirereopen}{true}%
\ifthenelse{\equal{false}{#1}\AND\boolean{@MXV@iiiDfeat}}{%
\def\@MXV@iiidia{/3DI #1}%
}{}%
}
\define@key{MXV@user}{palindrome}[true]{%
\xdef\@MXV@palindrome{, palindrome: #1}%
+ \setboolean{@MXV@requirereopen}{true}%
\ifthenelse{\boolean{@MXV@iiiDfeat}}{%
\gdef\@MXV@iiidpalindrome{/Subtype/Oscillating}%
}{}%
}
\define@key{MXV@user}{rate}{%
+ \setboolean{@MXV@requirereopen}{true}%
\xdef\@MXV@rate{, rate: #1}%
\ifthenelse{\boolean{@MXV@iiiDfeat}}{%
\gdef\@MXV@iiidrate{/TM #1}%
}{}%
}
\define@key{MXV@user}{repeat}[Infinity]{%
+ \setboolean{@MXV@requirereopen}{true}%
\ifthenelse{%
\equal{#1}{Infinity}\OR%
\equal{#1}{0}%
@@ -3389,8 +3397,10 @@
}
\define@key{MXV@user}{startat}{%
\xdef\@MXV@startat{, startAt: {#1}}%
+ \xdef\@MXV@@startat{{#1}}%
}
\define@key{MXV@user}{endat}{%
+ \setboolean{@MXV@requirereopen}{true}%
\xdef\@MXV@endat{, endAt: {#1}}%
}
\define@key{MXV@user}{poster}[true]{%
@@ -3526,7 +3536,6 @@
\setboolean{@MXV@linkresume}{false}%
\setboolean{@MXV@linkstop}{false}%
\setboolean{@MXV@linkclose}{false}%
- \setboolean{@MXV@linkreset}{false}%
\fi%
}
\define@key{MXV@user}{pause}[true]{%
@@ -3535,7 +3544,6 @@
\setboolean{@MXV@linkresume}{false}%
\setboolean{@MXV@linkstop}{false}%
\setboolean{@MXV@linkclose}{false}%
- \setboolean{@MXV@linkreset}{false}%
\setboolean{@MXV@linkplay}{false}%
\fi%
}
@@ -3545,7 +3553,6 @@
\setboolean{@MXV@linkpause}{false}%
\setboolean{@MXV@linkstop}{false}%
\setboolean{@MXV@linkclose}{false}%
- \setboolean{@MXV@linkreset}{false}%
\setboolean{@MXV@linkplay}{false}%
\fi%
}
@@ -3555,7 +3562,6 @@
\setboolean{@MXV@linkpause}{false}%
\setboolean{@MXV@linkresume}{false}%
\setboolean{@MXV@linkclose}{false}%
- \setboolean{@MXV@linkreset}{false}%
\setboolean{@MXV@linkplay}{false}%
\fi%
}
@@ -3565,18 +3571,19 @@
\setboolean{@MXV@linkpause}{false}%
\setboolean{@MXV@linkresume}{false}%
\setboolean{@MXV@linkstop}{false}%
- \setboolean{@MXV@linkreset}{false}%
\setboolean{@MXV@linkplay}{false}%
\fi%
}
\define@key{MXV@user}{reset}[true]{%
\setboolean{@MXV@linkreset}{#1}%
\if@MXV@linkreset%
- \setboolean{@MXV@linkpause}{false}%
- \setboolean{@MXV@linkresume}{false}%
- \setboolean{@MXV@linkstop}{false}%
- \setboolean{@MXV@linkclose}{false}%
- \setboolean{@MXV@linkplay}{false}%
+ \setboolean{@MXV@requirereopen}{true}%
+ \fi%
+}
+\define@key{MXV@user}{default}[true]{% synonyme for `reset'
+ \setboolean{@MXV@linkreset}{#1}%
+ \if@MXV@linkreset%
+ \setboolean{@MXV@requirereopen}{true}%
\fi%
}
\define@key{MXV@user}{3Dviewindex}{%