media9 (16apr12)

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

5 files changed, 21 insertions, 16 deletions

diff --git a/Master/texmf-dist/doc/latex/media9/ChangeLog b/Master/texmf-dist/doc/latex/media9/ChangeLog
index 8c594ee0bbd..4bd86f71d3e 100644
--- a/Master/texmf-dist/doc/latex/media9/ChangeLog
+++ b/Master/texmf-dist/doc/latex/media9/ChangeLog
@@ -1,7 +1,11 @@
+2012-04-16
+	* v0.5
+	* fix: option 3Dortho did not work, documentation update
+
 2012-04-12
 	* v0.4
 	* new: dependency on babel package removed; code contributed by
-	Enrico Grigorio
+	Enrico Gregorio
 	* fix: annotation box size calculation produced non-intuitive results
 
 2012-04-03
diff --git a/Master/texmf-dist/doc/latex/media9/media9.pdf b/Master/texmf-dist/doc/latex/media9/media9.pdf
index 78786415cae..6e7f4e2475c 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 9a0f217f8bf..704709e3940 100644
--- a/Master/texmf-dist/doc/latex/media9/media9.tex
+++ b/Master/texmf-dist/doc/latex/media9/media9.tex
@@ -70,14 +70,14 @@
 \maketitle
 
 \begin{abstract}\noindent
-A \LaTeX{} package for embedding interactive Adobe Flash (SWF) and 3D files (Adobe U3D \& PRC) as well as video and sound files or streams (FLV, MP4/H.246, MP3, AAC) into PDF documents with Adobe Reader-9/X compatibility.\\[0.2\baselineskip]
+A \LaTeX{} package for embedding interactive Adobe Flash (SWF) and 3D files (Adobe U3D \& PRC) as well as video and sound files or streams (FLV, MP4/H.246, MP3) into PDF documents with Adobe Reader-9/X compatibility.\\[0.2\baselineskip]
 \emph{Keywords}: \keywords
 \end{abstract}
 
 \tableofcontents
 
 \section{Introduction}
-This package provides an interface to embed interactive Flash (SWF) and 3D objects (Adobe U3D \& PRC) as well as video and sound files or streams in the popular MP4, FLV, MP3 and AAC formats into PDF documents. Playback of multimedia files uses the built-in Flash Player of Adobe Reader and does, therefore, not depend on external plug-ins. Flash Player supports the efficient H.264 codec for video compression.
+This package provides an interface to embed interactive Flash (SWF) and 3D objects (Adobe U3D \& PRC) as well as video and sound files or streams in the popular MP4, FLV and MP3 formats into PDF documents. Playback of multimedia files uses the built-in Flash Player of Adobe Reader and does, therefore, not depend on external plug-ins. Flash Player supports the efficient H.264 codec for video compression.
 
 Among the supported media types, video and sound files require an additional Flash (SWF) application for playback, which must be either embedded into the PDF or loaded at runtime from the internet. There are numerous such players, both open-source and commercial, available on the internet. One of them is the highly configurable open-source `StrobeMediaPlayback.swf'~\cite{strobe}, maintained by Adobe and hosted on \href{http://sourceforge.net/projects/smp.adobe/files/}{SourceForge.net}. Package `media9' comes with an enhanced version of `StrobeMediaPlayback.swf'. In addition, two simple players for video and audio, `VPlayer.swf' and `APlayer.swf' are included, which can be used instead. They provide sufficient functionality for playing embedded files and streamed media.
 
@@ -464,7 +464,7 @@ Playback of an embedded video is shown in Fig.~\ref{video}a. Besides embedded fi
 
 \begin{table}[p]
 \centering
-\caption{Parameters (ActionScript variables) for media players `VPlayer.swf' and `APlayer.swf' shipping with media9. Parameters are  passed as `{\tt\&}'-separated string using `{\tt flashvars}' option.}\label{playerparams}
+\caption{Parameters (ActionScript variables) for media players `VPlayer.swf' and `APlayer.swf' shipping with media9. Parameters are  passed as a `{\tt\&}'-separated string using `{\tt flashvars}' option.}\label{playerparams}
 \begin{tabular}[t]{p{0.4\linewidth}p{0.5\linewidth}}\hline
 parameter & description\\\hline\hline
 {\tt source=<file path or URL>} & (required) path to embedded media file (see option `{\tt addresource}'), or URL (http, rtmp) to online media file\\
@@ -477,7 +477,7 @@ parameter & description\\\hline\hline
 
 \begin{table}[p]
 \centering
-\caption{Parameters (ActionScript variables) for `StrobeMediaPlayback.swf' shipping with media9. Parameters are  passed as `{\tt\&}'-separated string using `{\tt flashvars}' option.}\label{smpparams}
+\caption{Parameters (ActionScript variables) for `StrobeMediaPlayback.swf' shipping with media9. Parameters are  passed as a `{\tt\&}'-separated string using `{\tt flashvars}' option.}\label{smpparams}
 \begin{tabular}[t]{p{0.4\linewidth}p{0.5\linewidth}}\hline
 parameter & description\\\hline\hline
 {\tt src=<file path or URL>} & (required) path to embedded media file (see option `{\tt addresource}'), or URL (http, rtmp) of online media file\\
@@ -487,12 +487,13 @@ parameter & description\\\hline\hline
 {\tt scaleMode=letterbox|none| \phantom{.}\hfill{}stretch|zoom} & default: {\tt letterbox}; determines how to scale the video in order to fit into player\\
 {\tt controlBarMode=docked|\phantom{xxxxxxxxxxxxxx} \phantom{.}\hfill{}floating|none} & default: {\tt docked}; determines position and visibility of control bar\\
 {\tt controlBarAutoHide=\phantom{xxxxxxx} \phantom{.}\hfill{}true|false} & default: {\tt true}; automatically hide or not control bar\\
-{\tt controlBarAutoHideTimeOut= \phantom{.}\hfill{}<number [s]>} & default: {\tt 3}; time span before auto-hide\\
+{\tt controlBarAutoHideTimeout= \phantom{.}\hfill{}<number [s]>} & default: {\tt 3}; time span before auto-hide\\
 {\tt volume=<value between 0.0 \phantom{.}\hfill{}and 1.0>} & sets volume of the sound\\
 {\tt audioPan=<value between \phantom{xxxx} \phantom{.}\hfill{}-1.0 and 1.0>} & default: {\tt 0}; sets balance of sound speakers\\
 {\tt muted=true|false} & default: {\tt false}; mute or not sound\\
-{\tt clipStartTime=<number [s]>} & default: {\tt NaN}; time to start from\\
-{\tt clipEndTime=<number [s]>} & default: {\tt NaN}; time to end at\\\hline
+%{\tt clipStartTime=<number [s]>} & default: {\tt NaN}; time to start from\\
+%{\tt clipEndTime=<number [s]>} & default: {\tt NaN}; time to end at\\
+\hline
 \end{tabular}
 \end{table}
 
@@ -545,7 +546,7 @@ parameter & description\\\hline\hline
 \end{figure}
 
 %\enlargethispage{2ex}
-Sound files and streams in the MP3 and AAC formats can be played with `APlayer.swf'. Fig.~\ref{radio} contains examples of an audio live stream and a downloaded MP3 sound file. Instead of being embedded, the player is loaded from a CTAN mirror during runtime because an internet connection is required anyway for streaming the audio.
+Sound files and streams in the MP3 format can be played with `APlayer.swf'. Fig.~\ref{radio} contains examples of an audio live stream and a remote MP3 sound file. Instead of being embedded, the player is loaded from a CTAN mirror during runtime because an internet connection is required anyway for streaming the audio. If a local sound file is to be embedded into the PDF this would have to be done in the same way as with the video file in one of the previous examples using the `\verb+addresource+' option.
 
 \begin{figure}[bp]
 %\flushright
@@ -577,7 +578,7 @@ http://mirrors.ibiblio.org/pub/mirrors/CTAN/macros/latex/contrib/media9/players/
 \begin{Verbatim}
   \includemedia[
     flashvars={
-      source=http://www.openbsd.org/songs/song50.mp3
+      source=http://www.openbsd.org/songs/song49.mp3
      &autoPlay=true
     },
     url
@@ -588,7 +589,7 @@ http://mirrors.ibiblio.org/pub/mirrors/CTAN/macros/latex/contrib/media9/players/
 \end{Verbatim}
 \makebox[\linewidth]{b)\hfill\includemedia[
   flashvars={
-    source=http://www.openbsd.org/songs/song50.mp3
+    source=http://www.openbsd.org/songs/song49.mp3
    &autoPlay=true
   },
   url
diff --git a/Master/texmf-dist/tex/latex/media9/media9.sty b/Master/texmf-dist/tex/latex/media9/media9.sty
index a25b732227a..5e152394316 100644
--- a/Master/texmf-dist/tex/latex/media9/media9.sty
+++ b/Master/texmf-dist/tex/latex/media9/media9.sty
@@ -39,8 +39,8 @@
 \RequirePackage{l3keys2e}
 \RequirePackage{ifpdf}
 
-\def\g@mix@date@tl{2012/04/12}
-\def\g@mix@version@tl{0.4}
+\def\g@mix@date@tl{2012/04/16}
+\def\g@mix@version@tl{0.5}
 \ProvidesExplPackage{media9}{\g@mix@date@tl}{\g@mix@version@tl}
 {acrobat-9 compatible media}
 
@@ -1086,7 +1086,7 @@
 
 %defines environment \mix_uribegin: ... \mix_uriend: to sanitize possibly
 %active chars in URLs (RFC 2396) and path specifications;
-%code contributed by E. Grigorio
+%code contributed by E. Gregorio
 \group_begin:
 \char_set_catcode_active:N\~
 \cs_new:Npn\mix_uribegin:{
@@ -1521,7 +1521,7 @@
   3Dortho .code:n = {
     \bool_gset_true:N\g_mix_opt_iiidview_bool
     \bool_gset_true:N\g_mix_opt_iiidortho_bool
-    \fp_compare:nNnF#1=\c_zero{
+    \fp_compare:nF{#1=0.0}{
       \fp_gset:Nn\g_mix_opt_oscale_fp{#1}
       \bool_if:NF\l_mix_roo_bool{
         \fp_set:Nn\l_mix_temp_fp{1}
@@ -1777,7 +1777,7 @@
         {\g_mix_vfile_tl}{\int_use:N\l_mix_lineno_int}{ORTHO}{a~VIEW}
     }
     \bool_set_true:N\l_mix_iiidortho_bool
-    \fp_compare:nNnF#1=\c_zero{
+    \fp_compare:nF{#1=0.0}{
       \fp_set:Nn\l_mix_oscale_fp{#1}
       \bool_if:NF\l_mix_roo_bool{
         \fp_set:Nn\l_mix_temp_fp{1}
diff --git a/Master/texmf-dist/tex/latex/media9/players/StrobeMediaPlayback.swf b/Master/texmf-dist/tex/latex/media9/players/StrobeMediaPlayback.swf
index 7297bef122b..0197d3b2237 100644
--- a/Master/texmf-dist/tex/latex/media9/players/StrobeMediaPlayback.swf
+++ b/Master/texmf-dist/tex/latex/media9/players/StrobeMediaPlayback.swf