9 files changed, 43 insertions, 36 deletions
diff --git a/Master/texmf-dist/doc/latex/media9/ChangeLog b/Master/texmf-dist/doc/latex/media9/ChangeLog
index 14e79d29a0e..9a2760963db 100644
--- a/Master/texmf-dist/doc/latex/media9/ChangeLog
+++ b/Master/texmf-dist/doc/latex/media9/ChangeLog
@@ -1,3 +1,7 @@
+2015-06-23
+	* v0.54
+	* fix: flashing of videos when played in a loop
+
 2015-06-03
 	* v0.53
 	* New: `SlideShow.swf' with support added for dynamic resolution images
diff --git a/Master/texmf-dist/doc/latex/media9/media9.pdf b/Master/texmf-dist/doc/latex/media9/media9.pdf
index ce15737eb0c..39a872a6df6 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/source/latex/media9/files/config.xml b/Master/texmf-dist/source/latex/media9/files/config.xml
index 043a39b1c47..f79d28b9bb4 100644
--- a/Master/texmf-dist/source/latex/media9/files/config.xml
+++ b/Master/texmf-dist/source/latex/media9/files/config.xml
@@ -60,10 +60,14 @@ Remote image URL with dynamic size that is reloaded while resizing the display.<
   <Img>  <!-- remote image with multiple URLs of different resolution -->
     <caption>CTAN lion drawing by Duane Bibby. Thanks to www.ctan.org.
 Remote image with URLs at various resolutions ("responsive image").</caption>
-    <URL size="200x178"  >http://mirrors.ctan.org/macros/latex/contrib/media9/doc/files/ctan_lion_200.png</URL>
-    <URL size="400x355"  >http://mirrors.ctan.org/macros/latex/contrib/media9/doc/files/ctan_lion_400.png</URL>
-    <URL size="800x710"  >http://mirrors.ctan.org/macros/latex/contrib/media9/doc/files/ctan_lion_800.png</URL>
-    <URL size="1200x1065">http://mirrors.ctan.org/macros/latex/contrib/media9/doc/files/ctan_lion_1200.png</URL>
+    <URL size="200x178"  >
+      http://mirrors.ibiblio.org/CTAN/macros/latex/contrib/media9/doc/files/ctan_lion_200.png</URL>
+    <URL size="400x355"  >
+      http://mirrors.ibiblio.org/CTAN/macros/latex/contrib/media9/doc/files/ctan_lion_400.png</URL>
+    <URL size="800x710"  >
+      http://mirrors.ibiblio.org/CTAN/macros/latex/contrib/media9/doc/files/ctan_lion_800.png</URL>
+    <URL size="1200x1065">
+      http://mirrors.ibiblio.org/CTAN/macros/latex/contrib/media9/doc/files/ctan_lion_1200.png</URL>
   </Img>
   <Img rot90="3">  <!-- static image with URL relative to SlideShow.swf location -->
     <caption>Static embedded image file with initial rotation of 3x90°.
diff --git a/Master/texmf-dist/source/latex/media9/media9.tex b/Master/texmf-dist/source/latex/media9/media9.tex
index 997bf1e3347..b04fb4a7926 100644
--- a/Master/texmf-dist/source/latex/media9/media9.tex
+++ b/Master/texmf-dist/source/latex/media9/media9.tex
@@ -772,10 +772,11 @@ parameter & description\\\hline\hline
 \end{figure}
 
 \begin{figure}%[bp]
+\thispagestyle{empty}
 \centering
 %\lstinputlisting[basicstyle=\scriptsize\ttfamily,language=XML]{config.xml}  
 \vspace{-10\baselineskip}
-\inputminted[fontsize=\footnotesize]{xml}{files/config.xml}
+\hskip -5em\inputminted[fontsize=\footnotesize]{xml}{files/config.xml}
 \caption{Configuration file template (XML format) for `SlideShow.swf'}\label{SlideShowXML}
 \end{figure}
 
diff --git a/Master/texmf-dist/tex/latex/media9/media9.sty b/Master/texmf-dist/tex/latex/media9/media9.sty
index 5f4321b647d..c220d3a8a22 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/06/03}
-\def\g@mix@version@tl{0.53}
+\def\g@mix@date@tl{2015/06/23}
+\def\g@mix@version@tl{0.54}
 
 \def\g@mix@liiikerneldate{2014/07/20}
 \def\g@mix@liiipkgdate{2014/07/20}
@@ -202,14 +202,14 @@
   deactivate / onclick .code:n = {\tl_gset:Nn\g_mix_pkgdeact_tl{/XD}},
   deactivate .value_required:,
 
-  transparent .choice_code:n = {
-    \tl_gset:Nx\g_mix_pkgtransp_tl{\l_keys_choice_tl}},
-  transparent .generate_choices:n = {true,false},
+  transparent .choices:nn = {true,false}{
+    \tl_gset:Nx\g_mix_pkgtransp_tl{\l_keys_choice_tl}
+  },
   transparent .default:n = {true},
 
-  passcontext .choice_code:n = {\tl_gset:Nx\g_mix_pkgcontextclick_tl{
-    \l_keys_choice_tl}},
-  passcontext .generate_choices:n = {true,false},
+  passcontext .choices:nn = {true,false}{
+    \tl_gset:Nx\g_mix_pkgcontextclick_tl{\l_keys_choice_tl}
+  },
   passcontext .default:n = {true},
 
   windowed .code:n = {
@@ -281,15 +281,17 @@
   3Dplayspeed .tl_gset_x:N = \g_mix_pkgplayspd_tl,
   3Dplayspeed .value_required:,
 
-  3Dtoolbar .choice_code:n = {\tl_gset:Nx\g_mix_pkgtools_tl{\l_keys_choice_tl}},
-  3Dtoolbar .generate_choices:n = {true,false},
+  3Dtoolbar .choices:nn = {true,false}{
+    \tl_gset:Nx\g_mix_pkgtools_tl{\l_keys_choice_tl}
+  },
   3Dtoolbar .default:n = {true},
 
-  3Dnavpane .choice_code:n = {\tl_gset:Nx\g_mix_pkgnav_tl{\l_keys_choice_tl}},
-  3Dnavpane .generate_choices:n = {true,false},
+  3Dnavpane .choices:nn = {true,false}{
+    \tl_gset:Nx\g_mix_pkgnav_tl{\l_keys_choice_tl}
+  },
   3Dnavpane .default:n = {true},
 
-  3Dpartsattrs .choice_code:n = {
+  3Dpartsattrs .choices:nn = {keep,restore}{
     \tl_set:Nn\l_mix_keep_tl{keep}
     \tl_if_eq:NNTF\l_keys_choice_tl\l_mix_keep_tl{
       \tl_gset:Nn\g_mix_pkgnrdflt_tl{/NR~false}
@@ -297,7 +299,6 @@
       \tl_gset:Nn\g_mix_pkgnrdflt_tl{/NR~true}
     }
   },
-  3Dpartsattrs .generate_choices:n = {keep,restore},
   3Dpartsattrs .value_required:,
 
   3Dmenu .bool_gset:N = \g_mix_pkgiiidcalc_bool,
@@ -1981,13 +1982,14 @@
   playbutton / none .code:n = {\tl_gset:Nn\g_mix_usrpbtn_tl{none}},
   playbutton .default:n = {fancy},
 
-  transparent .choice_code:n = {\tl_gset:Nx\g_mix_transp_tl{\l_keys_choice_tl}},
-  transparent .generate_choices:n = {true,false},
+  transparent .choices:nn = {true,false}{
+    \tl_gset:Nx\g_mix_transp_tl{\l_keys_choice_tl}
+  },
   transparent .default:n = {true},
 
-  passcontext .choice_code:n = {\tl_gset:Nx\g_mix_contextclick_tl{
-    \l_keys_choice_tl}},
-  passcontext .generate_choices:n = {true,false},
+  passcontext .choices:nn = {true,false}{
+    \tl_gset:Nx\g_mix_contextclick_tl{\l_keys_choice_tl}
+  },
   passcontext .default:n = {true},
 
   windowed .code:n = {
@@ -2016,15 +2018,15 @@
   3Dplayspeed .tl_gset_x:N = \g_mix_playspd_tl,
   3Dplayspeed .value_required:,
 
-  3Dtoolbar .choice_code:n = {\tl_gset:Nx\g_mix_tools_tl{\l_keys_choice_tl}},
-  3Dtoolbar .generate_choices:n = {true,false},
+  3Dtoolbar .choices:nn = {true,false}{
+    \tl_gset:Nx\g_mix_tools_tl{\l_keys_choice_tl}},
   3Dtoolbar .default:n = {true},
 
-  3Dnavpane .choice_code:n = {\tl_gset:Nx\g_mix_nav_tl{\l_keys_choice_tl}},
-  3Dnavpane .generate_choices:n = {true,false},
+  3Dnavpane .choices:nn = {true,false}{
+    \tl_gset:Nx\g_mix_nav_tl{\l_keys_choice_tl}},
   3Dnavpane .default:n = {true},
 
-  3Dpartsattrs .choice_code:n = {
+  3Dpartsattrs .choices:nn = {keep,restore}{
     \tl_set:Nn\l_mix_keep_tl{keep}
     \tl_if_eq:NNTF\l_keys_choice_tl\l_mix_keep_tl{
       \tl_gset:Nn\g_mix_nrdflt_tl{/NR~false}
@@ -2032,7 +2034,6 @@
       \tl_gset:Nn\g_mix_nrdflt_tl{/NR~true}
     }
   },
-  3Dpartsattrs .generate_choices:n = {keep,restore},
   3Dpartsattrs .value_required:,
 
   3Dcoo .code:n = {\tl_gset:Nn\g_mix_opt_coo_tl{#1}
@@ -2381,7 +2382,7 @@
   },
   RENDERMODE .value_required:,
 
-  PARTSATTRS .choice_code:n = {
+  PARTSATTRS .choices:nn = {keep,restore}{
     \int_compare:nF{\l_mix_level_tl=\c_zero}{
       \msg_error:nnxxxx{media9}{key~not~allowed}
         {\g_mix_vfile_tl}{\int_use:N\l_mix_lineno_int}{PARTSATTRS}{VIEW}
@@ -2393,7 +2394,6 @@
       \tl_set:Nn\l_mix_nr_tl{/NR~true}
     }
   },
-  PARTSATTRS .generate_choices:n = {keep,restore},
   PARTSATTRS .value_required:,
 
   PART .code:n = {
@@ -2446,7 +2446,7 @@
   },
   OPACITY .value_required:,
 
-  VISIBLE .choice_code:n = {
+  VISIBLE .choices:nn = {true,false}{
     \bool_if:nF{
       \int_compare_p:n{\l_mix_level_tl=\c_one} ||
       \int_compare_p:n{\l_mix_level_tl=\c_two}
@@ -2462,10 +2462,9 @@
       \tl_set:Nx\l_mix_cspv_tl{/PV~\l_keys_choice_tl}
     }
   },
-  VISIBLE .generate_choices:n = {true,false},
   VISIBLE .default:n = {true},
 
-  INTERSECTIONVISIBLE .choice_code:n = {
+  INTERSECTIONVISIBLE .choices:nn = {true,false}{
     \int_compare:nF{\l_mix_level_tl=\c_two}{
       \msg_error:nnxxxx{media9}{key~not~allowed}
         {\g_mix_vfile_tl}{\int_use:N\l_mix_lineno_int}{INTERSECTIONVISIBLE}
@@ -2473,7 +2472,6 @@
     }
     \tl_set:Nx\l_mix_csiv_tl{/IV~\l_keys_choice_tl}
   },
-  INTERSECTIONVISIBLE .generate_choices:n = {true,false},
   INTERSECTIONVISIBLE .default:n = {true},
 
   PLANECOLOR .code:n = {
diff --git a/Master/texmf-dist/tex/latex/media9/players/APlayer.swf b/Master/texmf-dist/tex/latex/media9/players/APlayer.swf
index 472b96a91a3..970672bbe82 100644
--- a/Master/texmf-dist/tex/latex/media9/players/APlayer.swf
+++ b/Master/texmf-dist/tex/latex/media9/players/APlayer.swf
diff --git a/Master/texmf-dist/tex/latex/media9/players/SlideShow.swf b/Master/texmf-dist/tex/latex/media9/players/SlideShow.swf
index 7d54e924836..9f1670ccbc1 100644
--- a/Master/texmf-dist/tex/latex/media9/players/SlideShow.swf
+++ b/Master/texmf-dist/tex/latex/media9/players/SlideShow.swf
diff --git a/Master/texmf-dist/tex/latex/media9/players/StrobeMediaPlayback.swf b/Master/texmf-dist/tex/latex/media9/players/StrobeMediaPlayback.swf
index 185759fd39c..e9316e47936 100644
--- a/Master/texmf-dist/tex/latex/media9/players/StrobeMediaPlayback.swf
+++ b/Master/texmf-dist/tex/latex/media9/players/StrobeMediaPlayback.swf
diff --git a/Master/texmf-dist/tex/latex/media9/players/VPlayer.swf b/Master/texmf-dist/tex/latex/media9/players/VPlayer.swf
index 596359c6e4c..7a3cf6010e7 100644
--- a/Master/texmf-dist/tex/latex/media9/players/VPlayer.swf
+++ b/Master/texmf-dist/tex/latex/media9/players/VPlayer.swf