summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-02-06 23:21:46 +0000
committerKarl Berry <karl@freefriends.org>2014-02-06 23:21:46 +0000
commit60d128571258b0d294d7cc43bd4227b4f7b7f076 (patch)
tree8f41cb046a387c8db284f3023e2bb6739da1218b /Master
parentf4a0b10b29cbb9f66a51c23b44d36967a7248997 (diff)
media9 (6feb14)
git-svn-id: svn://tug.org/texlive/trunk@32885 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/media9/ChangeLog4
-rw-r--r--Master/texmf-dist/doc/latex/media9/media9.pdfbin3304459 -> 3304633 bytes
-rw-r--r--Master/texmf-dist/doc/latex/media9/media9.tex18
-rw-r--r--Master/texmf-dist/tex/latex/media9/media9.sty48
4 files changed, 37 insertions, 33 deletions
diff --git a/Master/texmf-dist/doc/latex/media9/ChangeLog b/Master/texmf-dist/doc/latex/media9/ChangeLog
index ef5823a6aa1..ba4fd9ac6b7 100644
--- a/Master/texmf-dist/doc/latex/media9/ChangeLog
+++ b/Master/texmf-dist/doc/latex/media9/ChangeLog
@@ -1,3 +1,7 @@
+2014-02-06
+ * v0.39
+ * fix: improved compatibility with `animate' package
+
2013-12-04
* v0.38
* fix: bugs in 3Dmenu
diff --git a/Master/texmf-dist/doc/latex/media9/media9.pdf b/Master/texmf-dist/doc/latex/media9/media9.pdf
index ed0e174c4dc..c4da341629a 100644
--- a/Master/texmf-dist/doc/latex/media9/media9.pdf
+++ b/Master/texmf-dist/doc/latex/media9/media9.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/media9/media9.tex b/Master/texmf-dist/doc/latex/media9/media9.tex
index baf7c8b9ec9..9149ea8ed2d 100644
--- a/Master/texmf-dist/doc/latex/media9/media9.tex
+++ b/Master/texmf-dist/doc/latex/media9/media9.tex
@@ -206,9 +206,9 @@ depth=<depth>
\end{verbatim}
Resize the media playback area, overriding the original dimensions of the {\tt<poster text>} argument. Option `\verb+depth+' specifies how far the playback area should extend below the base line of the running text. If only one of `\verb+width+' or `\verb+height+' is given, the other dimension is scaled to maintain the aspect ratio of \verb+<poster text>+. Any valid \TeX{} dimension is accepted as a parameter. In addition, the length commands \verb+\width+, \verb+\height+, \verb+\depth+ and \verb+\totalheight+ can be used to refer to the original dimensions of \verb+<poster text>+.
\begin{verbatim}
-label=<label key>
+label=<label text>
\end{verbatim}
-The media annotation is given a label, \verb+<label key>+, which should be unique. Labelled media annotations can be targeted by the media actions of a control button (see description of the \verb+\mediabutton+ command in Sect. ~\ref{mbtn}). Moreover, a reference to the RichMedia Annotation object (of type `\verb+AnnotRichMedia+') is assigned to the JavaScript variable \verb+annotRM['<label key>']+ in order to facilitate its access in JavaScript. Note that the JavaScript reference is known only after the first opening of the page containing the media.
+The media annotation is given a label, \verb+<label text>+, which should be unique. Labelled media annotations can be targeted by the media actions of a control button (see description of the \verb+\mediabutton+ command in Sect. ~\ref{mbtn}). Moreover, a reference to the RichMedia Annotation object (of type `\verb+AnnotRichMedia+') is assigned to the JavaScript variable \verb+annotRM['<label text>']+ in order to facilitate its access in JavaScript. Note that the JavaScript reference is known only after the first opening of the page containing the media.
\begin{verbatim}
scale=<factor>
\end{verbatim}
@@ -472,7 +472,7 @@ Things like animation, lighting, background of 3D objects etc. may also be scrip
\begin{verbatim}
\mediabutton[<options>]{<normal button text or graphic>}
\end{verbatim}
-This command inserts a clickable button for media control. Actions to be performed are specified through options `\verb+mediacommand+', `\verb+3Dgotoview+' and `\verb+jsaction+'. By using these options repeatedly and in any combination, several actions can be bound to one media button, and one media button can be used to control several media at the same time. Media actions are started in the given order but performed in parallel, because they do not wait for each other to finish. The target of an action is specified via the label key that was also given to a particular media by the `\verb+label+' option of `\verb+\includemedia+'. Individual button faces can be defined for the `mouse-over' and `mouse-button-down' events using the `\verb+overface+' and `\verb+downface+' options. Without options, the button produced does nothing. The options provided are as follows:
+This command inserts a clickable button for media control. Actions to be performed are specified through options `\verb+mediacommand+', `\verb+3Dgotoview+' and `\verb+jsaction+'. By using these options repeatedly and in any combination, several actions can be bound to one media button, and one media button can be used to control several media at the same time. Media actions are started in the given order but performed in parallel, because they do not wait for each other to finish. The target of an action is specified via the label that was also given to a particular media by the `\verb+label+' option of `\verb+\includemedia+'. Individual button faces can be defined for the `mouse-over' and `mouse-button-down' events using the `\verb+overface+' and `\verb+downface+' options. Without options, the button produced does nothing. The options provided are as follows:
\begin{verbatim}
overface=<mouse-over text or graphic>
\end{verbatim}
@@ -482,18 +482,18 @@ downface=<mouse-button-down text or graphic>
\end{verbatim}
If specified, the media button changes its appearance when the mouse button is pressed while the pointer is over it. When pressed, the button is always slightly offset to appear as if it were being pushed below the surface of the page. An \verb+\includegraphics+ command may need to be enclosed in braces.
\begin{verbatim}
-3Dgotoview=<label key>[:<view specification>]
+3Dgotoview=<label text>[:<view specification>]
\end{verbatim}
-Selects a view from the list of predefined views associated with a 3D media inclusion (see option `\verb+3Dviews+'). The target media is specified by \verb+<label key>+, as defined by the `\verb+label+' option of `\verb+\includemedia+'. \verb+<label key>+ alone without a view specification simply activates the 3D object if not yet activated. {\tt<view specification>} which is separated from the label key by a colon (\verb+:+) can be one of the following: an integer specifying the zero-based index into the list of views in the 3D views file; one of `\verb+D+', `\verb+F+', `\verb+L+', `\verb+N+', `\verb+P+' indicating the default, first, last, next or previous view in the list of views; a string delimited by `\verb+(+' and `\verb+)+' matching the name of a view as specified by the `\verb+VIEW=...+' entry in the views file. The option can be given several times to simultaneously change the view in more than one 3D inclusion. However, it cannot be used to create an animation effect within the same 3D inclusion, because \verb+3Dgotoview+ actions are executed in parallel.
+Selects a view from the list of predefined views associated with a 3D media inclusion (see option `\verb+3Dviews+'). The target media is specified by \verb+<label text>+, as defined by the `\verb+label+' option of `\verb+\includemedia+'. \verb+<label text>+ alone without a view specification simply activates the 3D object if not yet activated. {\tt<view specification>} which is separated from the label by a colon (\verb+:+) can be one of the following: an integer specifying the zero-based index into the list of views in the 3D views file; one of `\verb+D+', `\verb+F+', `\verb+L+', `\verb+N+', `\verb+P+' indicating the default, first, last, next or previous view in the list of views; a string delimited by `\verb+(+' and `\verb+)+' matching the name of a view as specified by the `\verb+VIEW=...+' entry in the views file. The option can be given several times to simultaneously change the view in more than one 3D inclusion. However, it cannot be used to create an animation effect within the same 3D inclusion, because \verb+3Dgotoview+ actions are executed in parallel.
%For this, one may implement a 3D JavaScript function that is associated with the media button using the `\verb+mediacommand+' option.
\begin{verbatim}
-mediacommand=<label key>[:<command> [<arg1> <arg2> ...]]
+mediacommand=<label text>[:<command> [<arg1> <arg2> ...]]
\end{verbatim}
-A media command \verb+<command>+, with arguments if required, is sent to a media inclusion identified by \verb+<label key>+, as defined by the `\verb+label+' option of `\verb+\includemedia+'. \verb+<label key>+ alone without a command specification simply activates the media, if not yet activated. The option can be multiply used within the same button to target different media inclusions at the same time or to execute several commands for the same media. Depending on the type of the target media (3D or Flash), \verb+<command>+ is either the name of a JavaScript function defined in a 3D JavaScript file associated with the 3D media (see option `\verb+add3Djscript+') or the name of an ActionScript function that was exposed by the embedded Flash file. ActionScript functions are exposed to the scripting context of the hosting document by using the \verb+ExternalInterface+ call within the Flash file. Arguments to be passed to \verb+<command>+ must be separated by spaces and the whole list be enclosed in `\verb+[+' and `\verb+]+'. Arguments can be of Boolean type (\verb+true+, \verb+false+), numbers (integer, reals) and strings. String arguments must be passed as \verb+(string arg)+, i.\,e. enclosed in parentheses, while numbers and Booleans are passed as they are. Of course, the number of arguments and their types must match the definition of the function to be called. Media players VPlayer.swf and APlayer.swf shipping with media9 expose a number of ActionScript functions that can be used with this option (see Tab. \ref{AVPlayerMethods}). \verb+<command> [<arg1> <arg2> ...]+ must be enclosed in braces if there are embedded equals signs or commas.
+A media command \verb+<command>+, with arguments if required, is sent to a media inclusion identified by \verb+<label text>+, as defined by the `\verb+label+' option of `\verb+\includemedia+'. \verb+<label text>+ alone without a command specification simply activates the media, if not yet activated. The option can be multiply used within the same button to target different media inclusions at the same time or to execute several commands for the same media. Depending on the type of the target media (3D or Flash), \verb+<command>+ is either the name of a JavaScript function defined in a 3D JavaScript file associated with the 3D media (see option `\verb+add3Djscript+') or the name of an ActionScript function that was exposed by the embedded Flash file. ActionScript functions are exposed to the scripting context of the hosting document by using the \verb+ExternalInterface+ call within the Flash file. Arguments to be passed to \verb+<command>+ must be separated by spaces and the whole list be enclosed in `\verb+[+' and `\verb+]+'. Arguments can be of Boolean type (\verb+true+, \verb+false+), numbers (integer, reals) and strings. String arguments must be passed as \verb+(string arg)+, i.\,e. enclosed in parentheses, while numbers and Booleans are passed as they are. Of course, the number of arguments and their types must match the definition of the function to be called. Media players VPlayer.swf and APlayer.swf shipping with media9 expose a number of ActionScript functions that can be used with this option (see Tab. \ref{AVPlayerMethods}). \verb+<command> [<arg1> <arg2> ...]+ must be enclosed in braces if there are embedded equals signs or commas.
\begin{verbatim}
-jsaction=[<label key>:]{<JavaScript code>}
+jsaction=[<label text>:]{<JavaScript code>}
\end{verbatim}
-The JavaScript code is executed in the context of the document's instance of the JavaScript engine (there is one instance of the JavaScript engine per open document in Adobe Reader). \verb+<JavaScript code>+ is required and must be enclosed in braces. Unlike media actions defined with options `\verb+mediacommand+' and `\verb+3Dgotoview+', the JavaScript action defined here is not targeted at a particular embedded media and can be used to run arbitrary code. Therefore, \verb+<label key>+ is optional. If provided, it must be separated from \verb+<JavaScript code>+ by a colon. However, it is recommended to provide a label key. It ensures that \verb+annotRM['<label key>']+ is a valid JavaScript reference to the \verb+AnnotRichMedia+ object. \verb+annotRM['<label key>']+ can be used to get access to the global context of the annotation's instance of the 3D JavaScript engine (there is one instance of the 3D JavaScript engine per activated RichMedia Annotation with 3D content). The 3D JavaScript context of a 3D model can be accessed as \verb+annotRM['<label key>'].context3D+. Refer to the Acrobat 3D JavaScript Reference~\cite{jscript3D} for details on built-in JavaScript objects that are available in the 3D context. The \verb+annotRM['<label key>'].callAS()+ method may be used as an alternative to the `\verb+mediacommand+` option in order run exposed ActionScript functions of an embedded Flash file. See~\cite{jscript} for details.
+The JavaScript code is executed in the context of the document's instance of the JavaScript engine (there is one instance of the JavaScript engine per open document in Adobe Reader). \verb+<JavaScript code>+ is required and must be enclosed in braces. Unlike media actions defined with options `\verb+mediacommand+' and `\verb+3Dgotoview+', the JavaScript action defined here is not targeted at a particular embedded media and can be used to run arbitrary code. Therefore, \verb+<label text>+ is optional. If provided, it must be separated from \verb+<JavaScript code>+ by a colon. However, it is recommended to provide a label text. It ensures that \verb+annotRM['<label text>']+ is a valid JavaScript reference to the \verb+AnnotRichMedia+ object. \verb+annotRM['<label text>']+ can be used to get access to the global context of the annotation's instance of the 3D JavaScript engine (there is one instance of the 3D JavaScript engine per activated RichMedia Annotation with 3D content). The 3D JavaScript context of a 3D model can be accessed as \verb+annotRM['<label text>'].context3D+. Refer to the Acrobat 3D JavaScript Reference~\cite{jscript3D} for details on built-in JavaScript objects that are available in the 3D context. The \verb+annotRM['<label text>'].callAS()+ method may be used as an alternative to the `\verb+mediacommand+` option in order run exposed ActionScript functions of an embedded Flash file. See~\cite{jscript} for details.
\begin{verbatim}
draft
final
diff --git a/Master/texmf-dist/tex/latex/media9/media9.sty b/Master/texmf-dist/tex/latex/media9/media9.sty
index 1bb6ab1b1b2..0f92922e10b 100644
--- a/Master/texmf-dist/tex/latex/media9/media9.sty
+++ b/Master/texmf-dist/tex/latex/media9/media9.sty
@@ -42,8 +42,8 @@
\RequirePackage{atbegshi}
\RequirePackage{tikz}
-\def\g@mix@date@tl{2013/12/04}
-\def\g@mix@version@tl{0.38}
+\def\g@mix@date@tl{2014/02/06}
+\def\g@mix@version@tl{0.39}
\def\g@mix@liiikerneldate{2013/07/28}
\def\g@mix@liiipkgdate{2013/07/28}
@@ -468,6 +468,22 @@
}
\group_end:
+%takes Field object refs
+\tl_if_exist:cF{@anim@fields}{\tl_gset:cn{@anim@fields}{}}
+%macro for adding AcroForm entry to PDF Catalog
+\cs_new:Nn\mix_insert_acroform:{
+ \tl_if_exist:cF{Acro@Form@added}{
+ \mix_pdfobj:nnn{}{array}{}
+ \tl_gset:Nx\g_mix_fieldsarray_tl{\g_mix_pdflastobj_tl}
+ \mix_pdfcatalog:n{
+ /AcroForm~<</Fields~\g_mix_fieldsarray_tl/NeedAppearances~true>>}
+ \AtEndDocument{%
+ \mix_pdfobj:nnn{\g_mix_fieldsarray_tl}{array}{\@anim@fields}
+ }
+ \tl_gset:cn{Acro@Form@added}{}
+ }
+}
+
%commands for creating PDF objects, annots etc.
\bool_if:NTF\g_mix_pdfoutput_bool{
%helper func to remove `0 R' part from pdf obj reference
@@ -531,13 +547,7 @@
\tl_set:Nn\l_mix_ndname_tl{\mix_unescapehex:n{#1}}
}
- %macro for adding AcroForm entry to PDF Catalog
- \cs_new:Nn\mix_insert_acroform:{
- \tl_if_exist:cF{Acro@Form@added}{
- \pdfcatalog{/AcroForm~<</Fields~[]/NeedAppearances~true>>}
- \tl_gset:cn{Acro@Form@added}{}
- }
- }
+ \cs_new:Nn\mix_pdfcatalog:n{\pdfcatalog{#1}}
}{
\int_new:N\g_mix_obj_int % object ID
\bool_if:NTF\g_mix_dvipdfmx_bool{ %dvipdfmx/XeTeX
@@ -619,13 +629,7 @@
\tl_set:Nn\l_mix_ndname_tl{<#1>}
}
- \cs_new:Nn\mix_insert_acroform:{
- \tl_if_exist:cF{Acro@Form@added}{
- \special{pdf:put~@catalog~<<
- /AcroForm~<</Fields~[]/NeedAppearances~true>>>>}
- \tl_gset:cn{Acro@Form@added}{}
- }
- }
+ \cs_new:Nn\mix_pdfcatalog:n{\special{pdf:put~@catalog~<<#1>>}}
}{
% dvips
\bool_new:N\g_mix_powerdot_bool %to cope with some powerdot oddity
@@ -896,14 +900,8 @@
\tl_set:Nn\l_mix_ndname_tl{mix@unicode}
}
- \cs_new:Nn\mix_insert_acroform:{
- \tl_if_exist:cF{Acro@Form@added}{
- \special{ps:
- mark~{Catalog}~<</AcroForm~<</Fields~[]/NeedAppearances~true>>>>~
- /PUT~pdfmark
- }
- \tl_gset:cn{Acro@Form@added}{}
- }
+ \cs_new:Nn\mix_pdfcatalog:n{
+ \special{ps:~mark~{Catalog}~<<#1>>~/PUT~pdfmark}
}
}
}
@@ -1412,6 +1410,7 @@
/T~(fd@\g_mix_label_tl)
/AA~<</PO~\g_mix_pdflastobj_tl~/PV~\g_mix_pdflastobj_tl>>
}
+ \tl_gput_right:Nx\@anim@fields{\g_mix_pdflastann_tl\space}
\mix_insert_acroform:
}
\hbox_overlap_right:n{
@@ -2525,6 +2524,7 @@
\tl_if_empty:NF\g_mix_btnactions_tl{/Next~[\g_mix_btnactions_tl]}
>>
}
+ \tl_gput_right:Nx\@anim@fields{\g_mix_pdflastann_tl\space}
\mix_insert_acroform:
\hbox_to_wd:nn{\width}{
\vrule~width~\c_zero_dim~height~\height~depth~\depth\hss