media9 (13feb13)

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

4 files changed, 20 insertions, 12 deletions

diff --git a/Master/texmf-dist/doc/latex/media9/ChangeLog b/Master/texmf-dist/doc/latex/media9/ChangeLog
index b83e40e354e..e2ba678420d 100644
--- a/Master/texmf-dist/doc/latex/media9/ChangeLog
+++ b/Master/texmf-dist/doc/latex/media9/ChangeLog
@@ -1,3 +1,7 @@
+2013-02-12
+	* v0.23
+	* fix: minor usability improvements
+
 2013-01-31
 	* v0.22
 	* new: user command \mediabutton for creating media control buttons
diff --git a/Master/texmf-dist/doc/latex/media9/media9.pdf b/Master/texmf-dist/doc/latex/media9/media9.pdf
index 18c3fd6c3c0..1f4c15fdaca 100644
--- a/Master/texmf-dist/doc/latex/media9/media9.pdf
+++ b/Master/texmf-dist/doc/latex/media9/media9.pdf
diff --git a/Master/texmf-dist/doc/latex/media9/media9.tex b/Master/texmf-dist/doc/latex/media9/media9.tex
index 3dd94675dfe..275b6c1954b 100644
--- a/Master/texmf-dist/doc/latex/media9/media9.tex
+++ b/Master/texmf-dist/doc/latex/media9/media9.tex
@@ -101,7 +101,7 @@ From a sequence \verb+frame-0.png+, \verb+frame-1.png+, ... of bitmap files, an
 \end{Verbatim}
 Both examples insert a key frame at every second.
 
-\emph{Note:} `media9' package replaces the now obsolete `movie15' package. `media9' is based on the RichMedia Annotation (Annotations are the interactive parts in a document, in PDF specification parlance.), an Adobe addition to the PDF specification~\cite{supplement}, while `movie15' uses the old multimedia framework (`Screen Annotation') of pre-9 Readers which depends on external plug-ins and which does not support recent media file formats.
+\emph{Note:} `media9' package replaces the now obsolete `movie15' package. `media9' is based on the RichMedia Annotation (Annotations are the interactive parts in a document, in PDF specification parlance.), an Adobe addition to the PDF specification~\cite{supplement}, while `movie15' uses the old multimedia framework (`Screen Annotation') of pre-9 Readers which depends on third-party plug-ins and which does not support recent media file formats.
 
 Package `media9' supports the usual PDF making workflows, i.\,e. pdf\LaTeX{}, Lua\LaTeX, \LaTeX{} $\rightarrow$ \verb+dvips+ $\rightarrow$ \verb+ps2pdf+/Distiller and \pXepLaTeX{} $\rightarrow$ \verb+(x)dvipdfmx+.
 
@@ -492,7 +492,7 @@ Selects a view from the list of predefined views associated with a 3D media incl
 \begin{verbatim}
 mediacommand=<label key>[:<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 enclosed in `\verb+[+' and `\verb+]+' and separated by spaces. 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}).
+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 enclosed in `\verb+[+' and `\verb+]+' and separated by spaces. 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>}
@@ -640,15 +640,15 @@ parameter & description\\\hline\hline
 ]{}{VPlayer.swf}
 
 \mediabutton[
-  mediacommand=some_dice:playPause,
+  mediacommand={some_dice:playPause},
   overface=\color{blue}{\fbox{\strut Play/Pause}},
-  downface=\color{red}{\fbox{\strut Play/Pause}},
+  downface=\color{red}{\fbox{\strut Play/Pause}}
 ]{\fbox{\strut Play/Pause}}
 \mediabutton[
-  mediacommand=some_dice:setSource [(random.mp4)],
+  mediacommand={some_dice:setSource [(random.mp4)]}
 ]{\fbox{\strut random.mp4}}
 \mediabutton[
-  mediacommand=some_dice:setSource [(cube.mp4)],
+  mediacommand={some_dice:setSource [(cube.mp4)]}
 ]{\fbox{\strut cube.mp4}}
 \end{Verbatim}
 \vspace{1ex}
@@ -668,13 +668,13 @@ parameter & description\\\hline\hline
 \mediabutton[
   mediacommand=some_dice:playPause,
   overface=\color{blue}{\fbox{\strut Play/Pause}},
-  downface=\color{red}{\fbox{\strut Play/Pause}},
+  downface=\color{red}{\fbox{\strut Play/Pause}}
 ]{\fbox{\strut Play/Pause}}
 \mediabutton[
-  mediacommand=some_dice:setSource [(random.mp4)],
+  mediacommand=some_dice:setSource [(random.mp4)]
 ]{\fbox{\strut random.mp4}}
 \mediabutton[
-  mediacommand=some_dice:setSource [(cube.mp4)],
+  mediacommand=some_dice:setSource [(cube.mp4)]
 ]{\fbox{\strut cube.mp4}}
 \hfill}
 \caption{Example of playing back two different embedded MP4 video files in the same video player instance. The player, `VPlayer.swf', is also embedded in the PDF. Exposed ActionScript functions `{\tt playPause}' and `{\tt setSource}' of `VPlayer.swf' (Table~\ref{AVPlayerMethods}) are used to set-up media control buttons. Different button faces have been defined for the Play/Pause button.}\label{videoa}
diff --git a/Master/texmf-dist/tex/latex/media9/media9.sty b/Master/texmf-dist/tex/latex/media9/media9.sty
index 93dfbedbe82..9053ac41e5b 100644
--- a/Master/texmf-dist/tex/latex/media9/media9.sty
+++ b/Master/texmf-dist/tex/latex/media9/media9.sty
@@ -41,8 +41,8 @@
 \RequirePackage{ifpdf}
 \RequirePackage{atbegshi}
 
-\def\g@mix@date@tl{2013/01/31}
-\def\g@mix@version@tl{0.22}
+\def\g@mix@date@tl{2013/02/12}
+\def\g@mix@version@tl{0.23}
 
 \def\g@mix@liiikerneldate{2012/07/16}
 \def\g@mix@liiipkgdate{2012/07/16}
@@ -2214,6 +2214,8 @@
       \str_if_eq_x:nnF{\tl_use:c{ann@\l_tmpa_tl}}{draft}{
         \tl_set:Nx\l_tmpb_tl{#1}
         \regex_replace_once:nnN{[^:]+\:?}{}\l_tmpb_tl
+        \tl_trim_spaces:N\l_tmpb_tl
+		\regex_replace_all:nnN{^\{|\}$}{}\l_tmpb_tl
         \tl_set:Nx\l_mix_cmd_tl{
           \exp_after:wN\mix_separate_cmd_from_actn:w\l_tmpb_tl[]\q_stop}
         \tl_trim_spaces:N\l_mix_cmd_tl
@@ -2275,7 +2277,9 @@
     \tl_set:Nx\l_tmpb_tl{\exp_after:wN\use:n\l_tmpb_tl}
     \tl_trim_spaces:N\l_tmpb_tl
     \tl_if_blank:VF\l_tmpb_tl{
-    \mix_pdfobj:nnn{}{dict}{/S/JavaScript/JS~(try{\l_tmpb_tl}catch(e){})}}
+    \mix_pdfobj:nnn{}{dict}{
+      /S/JavaScript/JS~(
+	    try{\l_tmpb_tl}catch(e){console.show();console.println(e)})}}
     \bool_if:nT{
       \tl_if_exist_p:c{ann@\l_tmpa_tl}&&
       !\str_if_eq_x_p:nn{\tl_use:c{ann@\l_tmpa_tl}}{draft}