media9 (25mar14)

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

4 files changed, 37 insertions, 34 deletions

diff --git a/Master/texmf-dist/doc/latex/media9/ChangeLog b/Master/texmf-dist/doc/latex/media9/ChangeLog
index 504d34d19de..2f5d38e54c3 100644
--- a/Master/texmf-dist/doc/latex/media9/ChangeLog
+++ b/Master/texmf-dist/doc/latex/media9/ChangeLog
@@ -1,3 +1,8 @@
+2014-03-25
+	* v0.43
+	* fix: bugs related to AcroForm and OCProperties catalog entries;
+	documenation
+
 2014-03-21
 	* v0.42
 	* change: refined look for the play button overlay
diff --git a/Master/texmf-dist/doc/latex/media9/media9.pdf b/Master/texmf-dist/doc/latex/media9/media9.pdf
index 844d2b982b6..5f0feefaabb 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 71f032913d2..3e25ee845c6 100644
--- a/Master/texmf-dist/doc/latex/media9/media9.tex
+++ b/Master/texmf-dist/doc/latex/media9/media9.tex
@@ -126,11 +126,11 @@ MiK\TeX{} and \TeX{}Live users should run the package manager for installation a
 
 Otherwise, a manual installation into the \emph{local} TeX-Directory-Structure (TDS) root directory is done along the following steps:
 \begin{enumerate}
-  \item Download the TDS compliant package file `\href{http://tug.ctan.org/tex-archive/install/macros/latex/contrib/media9.tds.zip}{media9.tds.zip}' from CTAN.
+  \item Download the TDS compliant package file `\href{http://mirror.ctan.org/install/macros/latex/contrib/media9.tds.zip}{media9.tds.zip}' from CTAN.
   \item Find the local TDS root directory by running\\
   {\tt\phantom{xx}kpsewhich -var-value TEXMFLOCAL}\\
   on the command line. The local TDS root directory is intended for packages that are not maintained by the \TeX{}Live package manager.
-  \item Unzip `\href{http://tug.ctan.org/tex-archive/install/macros/latex/contrib/media9.tds.zip}{media9.tds.zip}' into the local TDS root directory previously found. Depending on the location of this directory, you may need to be logged in as Root/Administrator.
+  \item Unzip `\verb+media9.tds.zip+' into the local TDS root directory previously found. Depending on the location of this directory, you may need to be logged in as Root/Administrator.
   \item After installation, update the filename database by running `{\tt texhash}' on the command line. Again, Root/Administrator privileges may be required.
 \end{enumerate}
 For updating the package, repeat the steps given above.
@@ -515,7 +515,7 @@ A YouTube video clip, as shown in Fig.~\ref{alien}, may serve as a basic example
 \centering
 \begin{Verbatim}
 \includemedia[
-  width=0.6\linewidth,height=0.45\linewidth,
+  width=0.6\linewidth,height=0.3375\linewidth,
   activate=pageopen,
   flashvars={
     modestbranding=1 % no YT logo in control bar
@@ -523,11 +523,11 @@ A YouTube video clip, as shown in Fig.~\ref{alien}, may serve as a basic example
    &showinfo=0       % no title and other info before start
    &rel=0            % no related videos after end
   }
-]{}{http://www.youtube.com/v/Mdc3o7wOwNA?rel=0}
+]{}{http://www.youtube.com/v/w3f-WyDqOUw?rel=0}
 \end{Verbatim}
 \vspace{1ex}
 \includemedia[
-  width=0.6\linewidth,height=0.45\linewidth,
+  width=0.6\linewidth,height=0.3375\linewidth,
   activate=pageopen,
   flashvars={
     modestbranding=1 % no YT logo in control bar
@@ -535,7 +535,7 @@ A YouTube video clip, as shown in Fig.~\ref{alien}, may serve as a basic example
    &showinfo=0       % no title and other info before start
    &rel=0            % no related videos after end
   }
-]{}{http://www.youtube.com/v/Mdc3o7wOwNA?rel=0}
+]{}{http://www.youtube.com/v/w3f-WyDqOUw?rel=0}
 \caption{A YouTube video as an example of a Flash application loaded from a URL.}\label{alien}
 \end{figure}
 
@@ -768,7 +768,7 @@ parameter & description\\\hline\hline
   transparent
 ]{\color{blue}\fbox{Listen live to Radio France Culture}}{%
 %APlayer.swf%
-%http://www.ctan.org/tex-archive/macros/latex/contrib/media9/players/APlayer.swf%
+%http://mirror.ctan.org/macros/latex/contrib/media9/players/APlayer.swf%
 http://mirrors.ibiblio.org/pub/mirrors/CTAN/macros/latex/contrib/media9/players/APlayer.swf%
 }\hfill}
 \vskip 4ex
diff --git a/Master/texmf-dist/tex/latex/media9/media9.sty b/Master/texmf-dist/tex/latex/media9/media9.sty
index 40c18decd8e..959370fb20d 100644
--- a/Master/texmf-dist/tex/latex/media9/media9.sty
+++ b/Master/texmf-dist/tex/latex/media9/media9.sty
@@ -40,10 +40,11 @@
 \RequirePackage{xparse}
 \RequirePackage{ifpdf}
 \RequirePackage{atbegshi}
+\RequirePackage{atenddvi}
 \RequirePackage{tikz}
 
-\def\g@mix@date@tl{2014/03/21}
-\def\g@mix@version@tl{0.42}
+\def\g@mix@date@tl{2014/03/25}
+\def\g@mix@version@tl{0.43}
 
 \def\g@mix@liiikerneldate{2013/07/28}
 \def\g@mix@liiipkgdate{2013/07/28}
@@ -476,12 +477,12 @@
 \tl_if_exist:cF{@anim@fields}{\tl_gset:cn{@anim@fields}{}}%takes Field object refs
 \cs_new:Nn\mix_insert_acroform:{    %AcroForm dict
   \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~false>>}
-    \AtEndDocument{
-      \mix_pdfobj:nnn{\g_mix_fieldsarray_tl}{array}{\@anim@fields}
+    \AtEndDvi{
+      \tl_if_empty:NF\@anim@fields{
+        \mix_pdfobj:nnn{}{array}{\@anim@fields}
+        \mix_pdfcatalog:n{
+          /AcroForm~<</Fields~\g_mix_pdflastobj_tl/NeedAppearances~false>>}
+      }
     }
     \tl_gset:cn{Acro@Form@added}{}
   }
@@ -491,21 +492,21 @@
 \tl_if_exist:cF{@anim@offocgs}{\tl_gset:cn{@anim@offocgs}{}}
 \cs_new:Nn\mix_insert_ocprops:{%OCProperties dict
   \tl_if_exist:cF{oc@props@added}{
-    \mix_pdfobj:nnn{}{array}{}
-    \tl_gset:Nx\g_mix_ocgarray_tl{\g_mix_pdflastobj_tl}
-    \mix_pdfobj:nnn{}{array}{}
-    \tl_gset:Nx\g_mix_offocgarray_tl{\g_mix_pdflastobj_tl}
-    \mix_pdfcatalog:n{
-      /OCProperties~<<
-        /OCGs~\g_mix_ocgarray_tl
-        /D~<<
-          /BaseState/ON~/OFF~\g_mix_offocgarray_tl
-        >>
-      >>
-    }
-    \AtEndDocument{
-      \mix_pdfobj:nnn{\g_mix_ocgarray_tl}{array}{\@anim@ocgs}
-      \mix_pdfobj:nnn{\g_mix_offocgarray_tl}{array}{\@anim@offocgs}
+    \AtEndDvi{
+      \tl_if_empty:NF\@anim@ocgs{
+        \mix_pdfobj:nnn{}{array}{\@anim@ocgs}
+        \tl_gset:Nx\g_mix_ocgarray_tl{\g_mix_pdflastobj_tl}
+        \mix_pdfobj:nnn{}{array}{\@anim@offocgs}
+        \tl_gset:Nx\g_mix_offocgarray_tl{\g_mix_pdflastobj_tl}
+        \mix_pdfcatalog:n{
+          /OCProperties~<<
+            /OCGs~\g_mix_ocgarray_tl
+            /D~<<
+              /BaseState/ON~/OFF~\g_mix_offocgarray_tl
+            >>
+          >>
+        }
+      }
     }
     \tl_gset:cn{oc@props@added}{}
   }
@@ -1537,7 +1538,6 @@
       /AA~<</PO~\g_mix_pdflastobj_tl~/PV~\g_mix_pdflastobj_tl>>
     }
     \tl_gput_right:Nx\@anim@fields{\space\g_mix_pdflastann_tl\space}
-    \mix_insert_acroform:
     \hbox_overlap_right:n{
       \box_move_down:nn{\l_mix_dp_tl-\box_dp:N\l_mix_poster_box}{
         \box_use:N\l_mix_poster_box
@@ -1549,7 +1549,6 @@
       }
     }{%insert play button overlay
       \mix_insert_btnocg: %create OCG
-      \mix_insert_ocprops:
       \cs_gset_eq:Nc\mix_pbtn:NN{g@mix@pbtn@\g_mix_usrpbtn_tl @tl}
       \hbox_set:Nn\l_mix_pbtn_box{\mix_pbtn:NN\l_mix_wd_tl\l_mix_tt_tl}
       \box_move_down:nn{\l_mix_dp_tl}{
@@ -2664,7 +2663,6 @@
       >>
     }
     \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
     }
@@ -2672,4 +2670,4 @@
   }
   \group_end:
 }
-\bool_if:NF\g_mix_pdfoutput_bool{\mix_insert_ocprops:\mix_insert_acroform:}
+\mix_insert_ocprops:\mix_insert_acroform: