media9 (20oct14)

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

3 files changed, 32 insertions, 34 deletions

diff --git a/Master/texmf-dist/doc/latex/media9/ChangeLog b/Master/texmf-dist/doc/latex/media9/ChangeLog
index 991c501f777..2d663c87098 100644
--- a/Master/texmf-dist/doc/latex/media9/ChangeLog
+++ b/Master/texmf-dist/doc/latex/media9/ChangeLog
@@ -1,4 +1,8 @@
 2014-09-23
+	* v0.48
+	* fix: minor code change related to AcroForm and OCProperties catalog entries
+
+2014-09-23
 	* v0.47
 	* new: `width', `height', `totalheight', `keepaspectratio', `scale' added as
 	 package options; option `3Drender' accepts optional opacity values with
diff --git a/Master/texmf-dist/doc/latex/media9/media9.pdf b/Master/texmf-dist/doc/latex/media9/media9.pdf
index b00c029bb29..f34fc2ba4bd 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/tex/latex/media9/media9.sty b/Master/texmf-dist/tex/latex/media9/media9.sty
index d7f49e2ab8e..40997b8a939 100644
--- a/Master/texmf-dist/tex/latex/media9/media9.sty
+++ b/Master/texmf-dist/tex/latex/media9/media9.sty
@@ -43,8 +43,8 @@
 \RequirePackage{atenddvi}
 \RequirePackage{tikz}
 
-\def\g@mix@date@tl{2014/09/23}
-\def\g@mix@version@tl{0.47}
+\def\g@mix@date@tl{2014/10/20}
+\def\g@mix@version@tl{0.48}
 
 \def\g@mix@liiikerneldate{2014/07/20}
 \def\g@mix@liiipkgdate{2014/07/20}
@@ -535,46 +535,42 @@
 
 %macros for adding AcroForm and OCProperties dicts to PDF Catalog
 \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}{
-    \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_if_exist:cF{Acro@Form@added}{ %AcroForm dict
+  \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}{}
   }
+  \tl_gset:cn{Acro@Form@added}{}
 }
 
 \tl_if_exist:cF{@anim@ocgs}{\tl_gset:cn{@anim@ocgs}{}} %takes ocg object refs
 \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}{
-    \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~<<
-              /AS~[
-                <</Event/View  /Category[/View]  /OCGs~\g_mix_ocgarray_tl>>
-                <</Event/Print /Category[/Print] /OCGs~\g_mix_ocgarray_tl>>
-                <</Event/Export/Category[/Export]/OCGs~\g_mix_ocgarray_tl>>
-              ]
-              /BaseState/ON~/OFF~\g_mix_offocgarray_tl
-            >>
+\tl_if_exist:cF{oc@props@added}{
+  \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~<<
+            /AS~[
+              <</Event/View  /Category[/View]  /OCGs~\g_mix_ocgarray_tl>>
+              <</Event/Print /Category[/Print] /OCGs~\g_mix_ocgarray_tl>>
+              <</Event/Export/Category[/Export]/OCGs~\g_mix_ocgarray_tl>>
+            ]
+            /BaseState/ON~/OFF~\g_mix_offocgarray_tl
           >>
-        }
+        >>
       }
     }
-    \tl_gset:cn{oc@props@added}{}
   }
+  \tl_gset:cn{oc@props@added}{}
 }
 \cs_new:Nn\mix_insert_btnocg:{%OCG for play button overlay
   \mix_pdfobj:nnn{}{dict}{
@@ -2904,5 +2900,3 @@
 }
 \tl_set_eq:NN\l_mix_mediabutton_tl\mediabutton
 \tl_set:Nn\mediabutton{\mix_uribegin:\l_mix_mediabutton_tl}
-
-\mix_insert_ocprops:\mix_insert_acroform: