2 files changed, 52 insertions, 3 deletions

diff --git a/Master/texmf-dist/tex/latex/media9/media9.sty b/Master/texmf-dist/tex/latex/media9/media9.sty
index c13b4692fa1..e28fe7df27e 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/26}
-\def\g@mix@version@tl{0.17}
+\def\g@mix@date@tl{2012/12/21}
+\def\g@mix@version@tl{0.18}
 
 \def\g@mix@liiikerneldate{2012/07/16}
 \def\g@mix@liiipkgdate{2012/07/16}
@@ -104,6 +104,8 @@
 \bool_new:N\g_mix_pkgbigfiles_bool
 \bool_new:N\g_mix_dvipdfmx_bool
 \bool_new:N\g_mix_pkgdraft_bool
+\bool_new:N\g_mix_opt_pkgwindowed_bool
+\tl_gset:Nx\g_mix_pkgwindowed_tl{defaultxdefault}
 \tl_gset:Nn\g_mix_pkgact_tl{/XA}
 \tl_gset:Nn\g_mix_pkgdeact_tl{/PC}
 \tl_gset:Nn\g_mix_pkgtransp_tl{false}
@@ -159,6 +161,16 @@
   passcontext .generate_choices:n = {true,false},
   passcontext .default:n = {true},
 
+  windowed .code:n = {
+    \str_if_eq_p:nnTF{#1}{false}{
+      \bool_gset_false:N\g_mix_opt_pkgwindowed_bool
+    }{
+      \bool_gset_true:N\g_mix_opt_pkgwindowed_bool
+      \tl_gset:Nx\g_mix_pkgwindowed_tl{#1}
+    }
+  },
+  windowed .default:n = {defaultxdefault},
+
   %3D specific options
   3Dplaytype .choice:,
   3Dplaytype / none .code:n = {\tl_gset:Nn\g_mix_pkgplaytpe_tl{None}},
@@ -288,6 +300,8 @@
   \tl_gset:Nn\g_mix_dparg_tl{\depth}
   \tl_gset_eq:NN\g_mix_transp_tl\g_mix_pkgtransp_tl
   \tl_gset_eq:NN\g_mix_contextclick_tl\g_mix_pkgcontextclick_tl
+  \bool_gset_eq:NN\g_mix_opt_windowed_bool\g_mix_opt_pkgwindowed_bool
+  \tl_gset_eq:NN\g_mix_windowed_tl\g_mix_pkgwindowed_tl
 
   %3D specific settings
   \bool_gset_false:N\g_mix_opt_iiidview_bool
@@ -1119,6 +1133,10 @@
     }{
       \tl_gset:Nx\g_mix_playcnt_tl{\int_eval:n{\g_mix_playcnt_tl*2}}
     }
+    %determine floating window size
+    \bool_if:NT\g_mix_opt_windowed_bool{
+      \exp_after:wN\mix_parse_windowedarg:w\g_mix_windowed_tl\q_stop
+    }
     \mix_pdfobj:nnn{}{dict}{
       /Activation~<<
         /Condition\g_mix_act_tl
@@ -1139,7 +1157,17 @@
         }{/View~\l_mix_dfltview_tl}
         /Presentation~<<
           /Transparent~\g_mix_transp_tl
-          /Style/Embedded
+          \bool_if:NTF\g_mix_opt_windowed_bool{
+            /Style/Windowed
+            /Window~<<
+              /Width~<</Default~\tl_mix_fltwd>>
+              /Height~<</Default~\tl_mix_fltht>>
+              /Position~<</HAlign/Near/VAlign/Near>>
+              >>
+            >>
+          }{
+            /Style/Embedded
+          }
           \bool_if:NTF\g_mix_iiid_bool{
             /Toolbar~\g_mix_tools_tl
             /NavigationPane~\g_mix_nav_tl
@@ -1350,6 +1378,16 @@
   }
 }
 
+\cs_new:Npn\mix_parse_windowedarg:w#1x#2\q_stop{
+  \str_if_eq:nnTF{#1}{default}{
+    \tl_gset:Nx\tl_mix_fltwd{\fp_eval:n{1.522*\__dim_strip_bp:n{\l_mix_wd_tl}}}
+    \tl_gset:Nx\tl_mix_fltht{\fp_eval:n{1.522*\__dim_strip_bp:n{\l_mix_tt_tl}}}
+  }{
+    \tl_gset:Nn\tl_mix_fltwd{#1}
+    \tl_gset:Nn\tl_mix_fltht{#2}
+  }
+}
+
 %document command options
 
 \msg_set:nnnn{media9}{unknown~option}{
@@ -1375,6 +1413,7 @@
 \bool_new:N\g_mix_opt_iiidortho_bool
 \bool_new:N\l_mix_ciiw_bool
 \bool_new:N\l_mix_iiidortho_bool
+\bool_new:N\g_mix_opt_windowed_bool
 
 \seq_new:N\g_mix_res_seq
 \seq_new:N\g_mix_script_seq
@@ -1459,6 +1498,16 @@
   passcontext .generate_choices:n = {true,false},
   passcontext .default:n = {true},
 
+  windowed .code:n = {
+    \str_if_eq:nnTF{#1}{false}{
+      \bool_gset_false:N\g_mix_opt_windowed_bool
+    }{
+      \bool_gset_true:N\g_mix_opt_windowed_bool
+      \tl_gset:Nx\g_mix_windowed_tl{#1}
+    }
+  },
+  windowed .default:n = {defaultxdefault},
+
   %3D specific options
   3Dplaytype .choice:,
   3Dplaytype / none .code:n = {\tl_gset:Nn\g_mix_playtpe_tl{None}},
diff --git a/Master/texmf-dist/tex/latex/media9/players/VPlayer.swf b/Master/texmf-dist/tex/latex/media9/players/VPlayer.swf
index cb0f3bf16ee..f6e8ea0eb21 100644
--- a/Master/texmf-dist/tex/latex/media9/players/VPlayer.swf
+++ b/Master/texmf-dist/tex/latex/media9/players/VPlayer.swf