media9 (11mar15)

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

3 files changed, 44 insertions, 39 deletions

diff --git a/Master/texmf-dist/doc/latex/media9/ChangeLog b/Master/texmf-dist/doc/latex/media9/ChangeLog
index bbd2456b43e..0a9f5754844 100644
--- a/Master/texmf-dist/doc/latex/media9/ChangeLog
+++ b/Master/texmf-dist/doc/latex/media9/ChangeLog
@@ -1,3 +1,7 @@
+2015-03-11
+	* v0.51
+	* Fix: compatibility with `fixocgx' package
+
 2015-02-24
 	* v0.50
 	* Fix: minor code changes; reorganized TDS packaging
diff --git a/Master/texmf-dist/doc/latex/media9/media9.pdf b/Master/texmf-dist/doc/latex/media9/media9.pdf
index d76a1062854..bdef33f20f6 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 549db4d51bd..5546fa06c3f 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{2015/02/24}
-\def\g@mix@version@tl{0.50}
+\def\g@mix@date@tl{2015/03/11}
+\def\g@mix@version@tl{0.51}
 
 \def\g@mix@liiikerneldate{2014/07/20}
 \def\g@mix@liiipkgdate{2014/07/20}
@@ -554,10 +554,18 @@
     \tl_if_empty:NF\@ocgbase@ocgs{
       \mix_pdfobj:nnn{}{array}{\@ocgbase@ocgs}
       \tl_gset:Nx\g_mix_ocgarray_tl{\g_mix_pdflastobj_tl}
-      \mix_pdfobj:nnn{}{array}{\@ocgbase@offocgs}
-      \tl_gset:Nx\g_mix_offocgarray_tl{\g_mix_pdflastobj_tl}
-      \mix_pdfobj:nnn{}{array}{\@ocgbase@ocgorder}
-      \tl_gset:Nx\g_mix_ocgorderarray_tl{\g_mix_pdflastobj_tl}
+      \tl_if_empty:NTF\@ocgbase@offocgs{
+        \tl_gset:Nn\g_mix_offocgentry_tl{}
+      }{
+        \mix_pdfobj:nnn{}{array}{\@ocgbase@offocgs}
+        \tl_gset:Nx\g_mix_offocgentry_tl{/OFF~\g_mix_pdflastobj_tl}
+      }
+      \tl_if_empty:NTF\@ocgbase@ocgorder{
+        \tl_gset:Nn\g_mix_ocgorderentry_tl{}
+      }{
+        \mix_pdfobj:nnn{}{array}{\@ocgbase@ocgorder}
+        \tl_gset:Nx\g_mix_ocgorderentry_tl{/Order~\g_mix_pdflastobj_tl}
+      }
       \mix_pdfcatalog:n{
         /OCProperties~<<
           /OCGs~\g_mix_ocgarray_tl
@@ -567,8 +575,8 @@
               <</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
-            /Order~\g_mix_ocgorderarray_tl~/ListMode/VisiblePages
+            /BaseState/ON~\g_mix_offocgentry_tl
+            \g_mix_ocgorderentry_tl~/ListMode/VisiblePages
           >>
         >>
       }
@@ -617,16 +625,12 @@
 
   \cs_new:Nn\mix_pdfannot:nnnn{
     % #1:width, #2:height, #3:depth, #4:content (key-value)
-    \immediate\pdfannot~width~#1~height~#2~depth~#3 {
-      #4\cs_if_exist_use:N\fxocg@insert@OC
-    }
+    \immediate\pdfannot~width~#1~height~#2~depth~#3 {#4}
     \tl_gset:Nx\g_mix_pdflastann_tl{\int_use:c{pdflastannot}~0~R}
   }
 
   \cs_new:Nn\mix_pdflink:nn{% #1:dict, #2:text
-    \immediate\pdfstartlink~user~{
-      #1\cs_if_exist_use:N\fxocg@insert@OC
-    }#2\pdfendlink
+    \immediate\pdfstartlink~user~{#1}#2\pdfendlink
   }
 
   \cs_new:Nn\mix_pdfxform:n{%#1:savebox number
@@ -697,7 +701,7 @@
       \tl_if_blank:oTF{#1}{
         \tl_set:Nx\l_mix_usenum_tl{@mix@obj\int_use:N\g_mix_obj_int}
         \int_gincr:N\g_mix_obj_int
-      }{  
+      }{
         \tl_set:Nx\l_mix_usenum_tl{#1}
       }
       \tl_if_blank:oF{#3}{
@@ -719,23 +723,21 @@
       \special{pdf:ann~@mix@obj\int_use:N\g_mix_obj_int\space
         width~#1\space
         height~#2\space
-        depth~#3~<<#4\cs_if_exist_use:N\fxocg@insert@OC>>
+        depth~#3~<<#4>>
       }
       \tl_gset:Nx\g_mix_pdflastann_tl{@mix@obj\int_use:N\g_mix_obj_int}
       \int_gincr:N\g_mix_obj_int
     }
 
     \cs_new:Nn\mix_pdflink:nn{% #1:dict, #2:text
-      \special{pdf:bann~<<
-        #1\cs_if_exist_use:N\fxocg@insert@OC
-      >>}#2\special{pdf:eann}
+      \special{pdf:bann~<<#1>>}#2\special{pdf:eann}
     }
 
     \cs_new:Nn\mix_pdfxform:n{%#1:savebox number
       \special{pdf:bxobj~@mix@obj\int_use:N\g_mix_obj_int\space
-        width\space\dim_eval:n{\box_wd:N #1}\space
-        height\space\dim_eval:n{\box_ht:N #1}\space
-        depth\space\dim_eval:n{\box_dp:N #1}
+        width\space \dim_use:N\box_wd:N#1\space
+        height\space\dim_use:N\box_ht:N#1\space
+        depth\space \dim_use:N\box_dp:N#1
       }
       \begin{picture}(0,0)\put(0,0){\box_use:N #1}\end{picture}
       \bool_if:NT\g_mix_pgfloaded_bool{ % transparency et al. for PGF
@@ -930,7 +932,7 @@
         mark~
           /_objdef~{mix@obj\int_use:N\g_mix_obj_int}
           /Rect~[mix@llx~mix@lly~mix@urx~mix@ury]
-          #4\cs_if_exist_use:N\fxocg@insert@OC
+          #4
         /ANN~pdfmark~
       }
       \tl_gset:Nx\g_mix_pdflastann_tl{{mix@obj\int_use:N\g_mix_obj_int}}
@@ -939,18 +941,14 @@
 
     \cs_new:Nn\mix_pdflink:nn{% #1:dict, #2:text
       \cs_if_exist:NTF\pdfmark{
-        \pdfmark[#2]{pdfmark=/ANN,Raw={
-          #1\cs_if_exist_use:N\fxocg@insert@OC
-        }}
+        \pdfmark[#2]{pdfmark=/ANN,Raw={#1}}
       }{
         \hbox_set:Nn\l_tmpb_box{#2}
         \mix_pdfannot:nnnn{
-          \box_wd:N\l_tmpb_box}{
-          \box_ht:N\l_tmpb_box}{
-          \box_dp:N\l_tmpb_box
-        }{
-          #1\cs_if_exist_use:N\fxocg@insert@OC
-        }
+          \dim_use:N\box_wd:N\l_tmpb_box}{
+          \dim_use:N\box_ht:N\l_tmpb_box}{
+          \dim_use:N\box_dp:N\l_tmpb_box
+        }{#1}
         \box_use_clear:N\l_tmpb_box
       }
     }
@@ -1154,7 +1152,7 @@
         \bool_if:NT\g_mix_usrattach_bool{
           \mix_pdfannot:nnnn{0pt}{0pt}{0pt}{
             /Contents~(media~resource)
-            /F~2
+            /F~2\cs_if_exist_use:N
             /Subtype/FileAttachment
             /FS~\g_mix_pdflastobj_tl
           }
@@ -1309,9 +1307,9 @@
   %apply scaling factor
   \box_scale:Nnn#1{\g_mix_scalearg_tl}{\g_mix_scalearg_tl}
   %dimensions after resizing
-  \tl_gset:Nx\g_mix_wd_tl{\dim_eval:n{\box_wd:N#1}}
-  \tl_gset:Nx\g_mix_ht_tl{\dim_eval:n{\box_ht:N#1}}
-  \tl_gset:Nx\g_mix_dp_tl{\dim_eval:n{\box_dp:N#1}}
+  \tl_gset:Nx\g_mix_wd_tl{\dim_use:N\box_wd:N#1}
+  \tl_gset:Nx\g_mix_ht_tl{\dim_use:N\box_ht:N#1}
+  \tl_gset:Nx\g_mix_dp_tl{\dim_use:N\box_dp:N#1}
   \tl_gset:Nx\g_mix_tt_tl{\dim_eval:n{\box_ht:N#1+\box_dp:N#1}}
   \dim_compare:nT{\g_mix_wd_tl=\c_zero_dim}{\msg_warning:nn{media9}{zero~width}}
   \dim_compare:nT{\g_mix_tt_tl=\c_zero_dim}{
@@ -1604,7 +1602,7 @@
     % #1:width, #2:height, #3:depth, #4:content (key-value)
     \mix_pdfannot:nnnn{\g_mix_wd_tl}{\g_mix_ht_tl}{\g_mix_dp_tl}{
       /Subtype/RichMedia
-      /F~4
+      /F~4\cs_if_exist_use:N\fxocg@insert@OC
       /BS~<</W~0/S/S>>
       /Contents~(media~embedded~by~media9~[\g_mix_version_tl~(\g_mix_date_tl)])
       /NM~(\g_mix_label_tl)
@@ -1650,7 +1648,7 @@
     }
     \mix_pdfannot:nnnn{0pt}{0pt}{0pt}{
       /Subtype/Widget
-      /FT/Btn/Ff~65537
+      /FT/Btn/Ff~65537/F~2
       /BS~<</W~0>>
       /T~(fd@\g_mix_label_tl)
       /AA~<</PO~\g_mix_pdflastobj_tl~/PV~\g_mix_pdflastobj_tl>>
@@ -2851,12 +2849,15 @@
   \bool_if:NTF\g_mix_btndraft_bool{\box_use:N\l_mix_poster_box}{
     \mix_pdfxform:n{\l_mix_poster_box}
     \tl_set:Nx\g_mix_normalbtn_tl{\g_mix_pdflastxform_tl}
+    \bool_if:nT{ %dummy Widget for fixocgx, AR seems to need it
+      \cs_if_exist_p:N\fxocg@insert@OC && !\tl_if_blank_p:V\fxocg@insert@OC
+    }{\mix_pdfannot:nnnn{\width}{\height}{\depth}{/Subtype/Widget/F~2}}
     %insert widget annotation
     \mix_pdfannot:nnnn{\width}{\height}{\depth}{
       /Subtype/Widget
       /T~(mbtn@\int_use:N\g_mix_mbtncnt_int)
       \tl_if_empty:NF\g_mix_tooltip_tl{/TU~(\g_mix_tooltip_tl)}
-      /FT/Btn/Ff~65536
+      /FT/Btn/Ff~65536\cs_if_exist_use:N\fxocg@insert@OC
       \tl_if_empty:NTF\g_mix_downbtn_tl{/H/I}{/H/P}
       /AP~<<
         /N~\g_mix_normalbtn_tl