From 538bf9cb8c628873e9682c8573fe6af45a6304bc Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Tue, 3 Apr 2012 23:40:51 +0000
Subject: media9 (3apr12)

git-svn-id: svn://tug.org/texlive/trunk@25842 c570f23f-e606-0410-a88d-b1316a301751
---
 Master/texmf-dist/tex/latex/media9/media9.sty | 31 ++++++++++++++++-----------
 1 file changed, 19 insertions(+), 12 deletions(-)

(limited to 'Master/texmf-dist/tex/latex/media9/media9.sty')

diff --git a/Master/texmf-dist/tex/latex/media9/media9.sty b/Master/texmf-dist/tex/latex/media9/media9.sty
index c47d1df7f60..7e012d53228 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/03/16}
-\def\g@mix@version@tl{0.2}
+\def\g@mix@date@tl{2012/04/03}
+\def\g@mix@version@tl{0.3}
 \ProvidesExplPackage{media9}{\g@mix@date@tl}{\g@mix@version@tl}
 {acrobat-9 compatible media}
 
@@ -100,7 +100,7 @@
 \bool_new:N\g_mix_dvipdfmx_bool
 \bool_new:N\g_mix_pkgdraft_bool
 \tl_gset:Nn\g_mix_pkgact_tl{/XA}
-\tl_gset:Nn\g_mix_pkgdeact_tl{/XD}
+\tl_gset:Nn\g_mix_pkgdeact_tl{/PC}
 \tl_gset:Nn\g_mix_pkgtransp_tl{false}
 \tl_gset:Nn\g_mix_pkgcontextclick_tl{false}
 \tl_gset:Nn\g_mix_pkgplaycnt_tl{-1}
@@ -132,9 +132,9 @@
   activate / onclick .code:n = {\tl_gset:Nn\g_mix_pkgact_tl{/XA}},
 
   deactivate .choice:,
-  deactivate / pageinvisible .code:n = {\tl_gset:Nn\g_mix_pkgact_tl{/PI}},
-  deactivate / pageclose .code:n = {\tl_gset:Nn\g_mix_pkgact_tl{/PC}},
-  deactivate / onclick .code:n = {\tl_gset:Nn\g_mix_pkgact_tl{/XD}},
+  deactivate / pageinvisible .code:n = {\tl_gset:Nn\g_mix_pkgdeact_tl{/PI}},
+  deactivate / pageclose .code:n = {\tl_gset:Nn\g_mix_pkgdeact_tl{/PC}},
+  deactivate / onclick .code:n = {\tl_gset:Nn\g_mix_pkgdeact_tl{/XD}},
 
   transparent .choice_code:n = {
     \tl_gset:Nx\g_mix_pkgtransp_tl{\l_keys_choice_tl}},
@@ -1051,6 +1051,7 @@
 \def\mix@uribegin{%
   %make sure special characters in URIs (RFC 3986) are used unmodified
   \begingroup%
+  \defineshorthand{"}{\detokenize{"}}%
   \defineshorthand{:}{\detokenize{:}}%
   \defineshorthand{/}{\detokenize{/}}%
   \defineshorthand{?}{\detokenize{?}}%
@@ -1081,7 +1082,7 @@
 % macro to format a real number in tl variable
 % * to show at most 9 places after `.'
 % * trailing zeros removed
-\cs_new:Nn\mix_format_num:N{
+\cs_new_protected:Nn\mix_format_num:N{
   \tl_set:Nx#1{\exp_after:wN\mix_format_num:w#1\q_stop}
 }
 \cs_new:Npn\mix_format_num:w#1.#2\q_stop{
@@ -1407,13 +1408,19 @@
 
   url .bool_gset:N = \g_mix_url_bool,
 
-  addresource  .code:n = {\seq_gput_right:Nn\g_mix_res_seq{#1}},
+  addresource .code:n = {\seq_gput_right:Nn\g_mix_res_seq{#1}},
   addresource .value_required:,
 
   add3Djscript .code:n = {\seq_gput_right:Nn\g_mix_script_seq{#1}},
   add3Djscript .value_required:,
 
-  flashvars .tl_gset_x:N = \g_mix_flashvars_tl,
+  flashvars .code:n = {
+    \tl_gset:Nx\g_mix_flashvars_tl{\tl_trim_spaces:n{#1}}
+    \tl_greplace_all:Nnn\g_mix_flashvars_tl{~&}{&}
+    \tl_greplace_all:Nnn\g_mix_flashvars_tl{&~}{&}
+    \tl_greplace_all:Nnn\g_mix_flashvars_tl{~=}{=}
+    \tl_greplace_all:Nnn\g_mix_flashvars_tl{=~}{=}
+  },
   flashvars .value_required:,
 
   activate .choice:,
@@ -1422,9 +1429,9 @@
   activate / onclick .code:n = {\tl_gset:Nn\g_mix_act_tl{/XA}},
 
   deactivate .choice:,
-  deactivate / pageinvisible .code:n = {\tl_gset:Nn\g_mix_act_tl{/PI}},
-  deactivate / pageclose .code:n = {\tl_gset:Nn\g_mix_act_tl{/PC}},
-  deactivate / onclick .code:n = {\tl_gset:Nn\g_mix_act_tl{/XD}},
+  deactivate / pageinvisible .code:n = {\tl_gset:Nn\g_mix_deact_tl{/PI}},
+  deactivate / pageclose .code:n = {\tl_gset:Nn\g_mix_deact_tl{/PC}},
+  deactivate / onclick .code:n = {\tl_gset:Nn\g_mix_deact_tl{/XD}},
 
   draft .choice:,
   draft / true .code:n = {\bool_gset_true:N\g_mix_usrdraft_bool},
-- 
cgit v1.2.3

