media9 (26nov12)

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

6 files changed, 56 insertions, 9 deletions

diff --git a/Master/texmf-dist/doc/latex/media9/ChangeLog b/Master/texmf-dist/doc/latex/media9/ChangeLog
index ef7a4eecd51..35162e3c6f9 100644
--- a/Master/texmf-dist/doc/latex/media9/ChangeLog
+++ b/Master/texmf-dist/doc/latex/media9/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-26
+	* v0.17
+	* updated APlayer.swf with transparent background; poster is now inserted
+	into the page content stream, not in the appearance dictionary
+
 2012-11-20
 	* v0.16
 	* fix: `transparent' option now working with Flash content, updated
diff --git a/Master/texmf-dist/doc/latex/media9/files/players/APlayer.mxml b/Master/texmf-dist/doc/latex/media9/files/players/APlayer.mxml
index 86c62753d3b..f35af9c1696 100644
--- a/Master/texmf-dist/doc/latex/media9/files/players/APlayer.mxml
+++ b/Master/texmf-dist/doc/latex/media9/files/players/APlayer.mxml
@@ -4,7 +4,7 @@
 <!-- a FlashPlayer-10 compatible component for playing             -->
 <!-- MP3 audio files and streams.                                  -->
 <!--                                                               -->
-<!-- version 20121002                                              -->
+<!-- version 20121123                                              -->
 <!--                                                               -->
 <!--                                                               -->
 <!-- The free Adobe Flex 4 SDK is required to compile              -->
@@ -44,6 +44,7 @@
   creationComplete="initCallBacks();"
   mouseDown="pause();setFocus();"
   mouseUp="play();"
+  backgroundAlpha="0"
 >
 
   <fx:Script>
@@ -65,6 +66,7 @@
       private var deltaSeek:Number;
       private var currentTime:Number;
       private var keyPressed:Boolean=false;
+      private var mouseIsOver:Boolean=false;
 
       import mx.core.FlexGlobals;
       private function initialise(flashVars:Object):void {
@@ -87,6 +89,18 @@
         if(autoPlay) play();
       }
 
+      import flash.events.MouseEvent;
+      private function mouseOvrHnd(e:MouseEvent):void {
+	    mouseIsOver=true;
+        fadeEffect.end();
+        playProgress.alpha=1.0;
+	  }
+
+      private function mouseOutHnd(e:MouseEvent):void {
+	    mouseIsOver=false;
+        fadeEffect.play();
+	  }
+
       import flash.events.KeyboardEvent;
       private function keyDnHnd(e:KeyboardEvent):void {
         switch(e.keyCode) {
@@ -103,6 +117,8 @@
             playResumePosition=(snd.length);
             break;
           case 37: //<--
+            fadeEffect.end();
+            playProgress.alpha=1.0;
             if(e.ctrlKey){
               pan=Math.max(-1,pan-0.025);
               balance(pan);
@@ -121,6 +137,8 @@
             deltaSeek*=1.1;
             break;
           case 39: //-->
+            fadeEffect.end();
+            playProgress.alpha=1.0;
             if(e.ctrlKey){
               pan=Math.min(1,pan+0.025);
               balance(pan);
@@ -162,6 +180,7 @@
           case 39: //-->
             deltaSeek=Math.max(100,snd.length/10000);
             keyPressed=false;
+            if (!mouseIsOver) fadeEffect.play();
             break;
         }
       }
@@ -190,6 +209,8 @@
         this.addEventListener(Event.ENTER_FRAME, onEnterFrame);
         this.addEventListener(KeyboardEvent.KEY_DOWN, keyDnHnd);
         this.addEventListener(KeyboardEvent.KEY_UP, keyUpHnd);
+        this.addEventListener(MouseEvent.MOUSE_OUT, mouseOutHnd);
+        this.addEventListener(MouseEvent.MOUSE_OVER, mouseOvrHnd);
       }
 
       private function setSource(src:String):void {
@@ -306,6 +327,10 @@
     ]]>
   </fx:Script>
 
+  <fx:Declarations>
+    <s:Fade id="fadeEffect" target="{playProgress}" alphaFrom="1.0" alphaTo="0" duration="2000"/>
+  </fx:Declarations>
+
   <mx:ProgressBar width="100%" mode="manual"
     horizontalCenter="0" verticalCenter="0" labelPlacement="center"
     label="" id="playProgress"
diff --git a/Master/texmf-dist/doc/latex/media9/media9.pdf b/Master/texmf-dist/doc/latex/media9/media9.pdf
index 514e7ab6e89..7784e3b0e23 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/doc/latex/media9/media9.tex b/Master/texmf-dist/doc/latex/media9/media9.tex
index 3ac394f8087..2c6971a7118 100644
--- a/Master/texmf-dist/doc/latex/media9/media9.tex
+++ b/Master/texmf-dist/doc/latex/media9/media9.tex
@@ -669,6 +669,7 @@ parameter & description\\\hline\hline
                          /all/franceculturehautdebit.mp3
      &autoPlay=true
     },
+    transparent,
     url  % refers to APlayer.swf, not to `source' flashvar!
   ]{\color{blue}\fbox{Listen live to Radio France Culture}}{%
     http://mirrors.ibiblio.org/pub/mirrors/CTAN/macros/latex/%
@@ -680,6 +681,7 @@ parameter & description\\\hline\hline
     source=http://mp3.live.tv-radio.com/franceculture/all/franceculturehautdebit.mp3
    &autoPlay=true
   },
+  transparent,
   url
 ]{\color{blue}\fbox{Listen live to Radio France Culture}}{%
 %APlayer.swf%
@@ -693,6 +695,7 @@ http://mirrors.ibiblio.org/pub/mirrors/CTAN/macros/latex/contrib/media9/players/
       source=http://www.openbsd.org/songs/song49.mp3
      &autoPlay=true
     },
+    transparent,
     url
   ]{\color{blue}\fbox{Listen to OpenBSD 4.9 release song.}}{%
     http://mirrors.ibiblio.org/pub/mirrors/CTAN/macros/latex/%
@@ -704,6 +707,7 @@ http://mirrors.ibiblio.org/pub/mirrors/CTAN/macros/latex/contrib/media9/players/
     source=http://www.openbsd.org/songs/song49.mp3
    &autoPlay=true
   },
+  transparent,
   url
 ]{\color{blue}\fbox{Listen to OpenBSD 4.9 release song.}}{%
 http://mirrors.ibiblio.org/pub/mirrors/CTAN/macros/latex/contrib/media9/players/APlayer.swf%
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
     }
diff --git a/Master/texmf-dist/tex/latex/media9/players/APlayer.swf b/Master/texmf-dist/tex/latex/media9/players/APlayer.swf
index 96dfcb71687..73046acd2cc 100644
--- a/Master/texmf-dist/tex/latex/media9/players/APlayer.swf
+++ b/Master/texmf-dist/tex/latex/media9/players/APlayer.swf