media9 (26nov12)

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

1 files changed, 21 insertions, 8 deletions

diff --git a/Master/texmf-dist/tex/latex/media9/media9.sty b/Master/texmf-dist/tex/latex/media9/media9.sty
index 333517e20ee..c13b4692fa1 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/11/20}
-\def\g@mix@version@tl{0.16}
+\def\g@mix@date@tl{2012/11/26}
+\def\g@mix@version@tl{0.17}
 
 \def\g@mix@liiikerneldate{2012/07/16}
 \def\g@mix@liiipkgdate{2012/07/16}
@@ -956,6 +956,13 @@
   \dim_set:Nn\l_tmpa_dim{\l_mix_dp_tl}
   \tl_set:Nx\l_mix_dp_tl{\dim_eval:n{\g_mix_scalearg_tl\l_tmpa_dim}}
   \tl_set:Nx\l_mix_tt_tl{\dim_eval:n{\l_mix_ht_tl+\l_mix_dp_tl}}
+  %apply new dimensions (to non-zero size box)
+  \bool_if:nF{
+    \dim_compare_p:n{\width=\c_zero_dim} ||
+    \dim_compare_p:n{\totalheight=\c_zero_dim}
+  }{
+    \box_resize:Nnn#1{\l_mix_wd_tl}{\l_mix_tt_tl}
+  }
 }
 
 \bool_new:N\g_mix_iiid_bool
@@ -968,6 +975,12 @@
   \group_begin:
   \leavevmode
   \mix_reset:
+  %empty stream as appearance dummy
+  \cs_if_exist:NF\g_mix_appearance_tl{
+    \hbox_set:Nn\l_mix_poster_box{\phantom{\rule{1pt}{1pt}}}
+    \mix_pdfxform:n{\l_mix_poster_box}
+    \tl_gset:Nx\g_mix_appearance_tl{\g_mix_pdflastxform_tl}
+  }
   \cs_if_exist:NT\Ginput@path{\cs_set_eq:NN\input@path\Ginput@path}
   \hbox_set:Nn\l_mix_poster_box{#2}
   \mix_uribegin: %treat URI characters correctly
@@ -979,14 +992,9 @@
   \tl_greplace_all:Nnn\g_mix_flashvars_tl{=~}{=}
   \tl_gtrim_spaces:N\g_mix_flashvars_tl
   \mix_scale:n{\l_mix_poster_box}
-  \dim_compare:nT{\width=\c_zero_dim}
-    {\box_set_wd:Nn\l_mix_poster_box{1pt}}
-  \dim_compare:nT{\totalheight=\c_zero_dim}
-    {\box_set_ht:Nn\l_mix_poster_box{1pt}}
   \bool_if:NTF\g_mix_usrdraft_bool{
     \mix_draftbox:n{\tl_to_str:n{#3}}
   }{
-    \mix_pdfxform:n{\l_mix_poster_box}
     %embed main asset
     \group_begin:
       \bool_set_eq:NN\l_mix_url_bool\g_mix_url_bool
@@ -1154,7 +1162,7 @@
       /BS~<</W~0/S/S>>
       /Contents~(media~embedded~by~media9~[\g_mix_version_tl~(\g_mix_date_tl)])
       /NM~(\g_mix_label_tl)
-      /AP~<</N~\g_mix_pdflastxform_tl>>
+      /AP~<</N~\g_mix_appearance_tl>>
       /RichMediaSettings~\l_mix_settings_tl
       /RichMediaContent~\l_mix_content_tl
     }
@@ -1174,6 +1182,11 @@
         /AA~<</PO~\g_mix_pdflastobj_tl~/PV~\g_mix_pdflastobj_tl>>
       }
     }
+    \hbox_to_wd:nn{\c_zero_dim}{
+      \box_move_down:nn{\l_mix_dp_tl-\box_dp:N\l_mix_poster_box}{
+        \box_use:N\l_mix_poster_box
+      }\hss
+    }
     \hbox_to_wd:nn{\l_mix_wd_tl}{
       \vrule~width~\c_zero_dim~height~\l_mix_ht_tl~depth~\l_mix_dp_tl\hss
     }