media9 0.20 (21jan13)

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

6 files changed, 73 insertions, 25 deletions

diff --git a/Master/texmf-dist/doc/latex/media9/ChangeLog b/Master/texmf-dist/doc/latex/media9/ChangeLog
index 929fcc8e96f..94917fdbc46 100644
--- a/Master/texmf-dist/doc/latex/media9/ChangeLog
+++ b/Master/texmf-dist/doc/latex/media9/ChangeLog
@@ -1,4 +1,8 @@
 2013-01-07
+	* v0.20
+	* new: `hideBar' option (FlashVar) for APlayer.swf
+
+2013-01-07
 	* v0.19
 	* fix: default window size calculation for floating media window
 
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 14847f88406..f8f916e063c 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 20121123                                              -->
+<!-- version 20130111                                              -->
 <!--                                                               -->
 <!--                                                               -->
 <!-- The free Adobe Flex 4 SDK is required to compile              -->
@@ -54,6 +54,7 @@
       [Bindable] private var loop:Boolean=false;
       [Bindable] private var vol:Number=0.75;
       [Bindable] private var pan:Number=0;
+      [Bindable] private var hideBar:Boolean=false;
 
       private var snd:Sound;
       private var sndCh:SoundChannel;
@@ -75,6 +76,7 @@
         if(flashVars.loop){loop=(flashVars.loop=='true')}
         if(flashVars.volume){vol=Number(flashVars.volume)}
         if(flashVars.balance){pan=Number(flashVars.balance)}
+        if(flashVars.hideBar){hideBar=(flashVars.hideBar=='true')}
       }
 
       import mx.controls.Alert;
@@ -333,6 +335,6 @@
 
   <mx:ProgressBar width="100%" mode="manual"
     horizontalCenter="0" verticalCenter="0" labelPlacement="center"
-    label="" id="playProgress"
+	label="" id="playProgress" visible="{!hideBar}"
   />
 </s:Application>
diff --git a/Master/texmf-dist/doc/latex/media9/media9.pdf b/Master/texmf-dist/doc/latex/media9/media9.pdf
index 1eec2238809..d4939ac07ab 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 a1d796a8726..ec55465fe7d 100644
--- a/Master/texmf-dist/doc/latex/media9/media9.tex
+++ b/Master/texmf-dist/doc/latex/media9/media9.tex
@@ -81,7 +81,7 @@
 
 \begin{abstract}\noindent
 A \LaTeX{} package for embedding interactive Adobe Flash (SWF) and 3D files (Adobe U3D \& PRC) as well as video and sound files or streams (FLV, MP4/H.246, MP3) into PDF documents with Adobe Reader-9/X compatibility.\\[0.2\baselineskip]
-\emph{Keywords}: \keywords
+\begin{sloppypar}\foreignlanguage{nohyphenation}{\noindent\emph{Keywords}: \keywords}\end{sloppypar}
 \end{abstract}
 
 \tableofcontents
@@ -540,6 +540,7 @@ parameter & description\\\hline\hline
 {\tt loop=true|false} & if {\tt=true}, media is played in a loop\\
 {\tt stepping=true|false} &(VPlayer.swf only) if {\tt=true}, the video advances by roughly one frame per mouse click\\
 {\tt scaleMode=letterbox|none| \phantom{.}\hfill{}stretch|zoom} & default: {\tt stretch}; determines how to scale the video in order to fit into player\\
+{\tt hideBar=true|false} &(APlayer.swf only) if {\tt=true}, the progress bar indicating the play position is not shown\\
 {\tt volume=<value between 0.0 \phantom{.}\hfill{}and 1.0>} & sets volume of the sound\\
 {\tt balance=<value between \phantom{xxxx} \phantom{.}\hfill{}-1.0 and 1.0>} & (APlayer.swf only) sets balance of sound speakers\\\hline
 \end{tabular}
@@ -904,7 +905,7 @@ Contents of `dice.vws':
   \begin{itemize}
     \item[a)] Open a text file, e.\,g. `myviews.vws', to be populated with additional views of the 3D object.
     \item[b)] Manipulate the 3D object using the mouse (camera position) and via 3D context menu items `\emph{\sffamily Part Options}' and `\emph{\sffamily Viewing Options}' (visibility, rendering attributes, background etc.); the camera target can be moved into the centre of a single part via `\emph{\sffamily Part Options}'$\rightarrow$`\emph{\sffamily Zoom to Part}'.
-    \item[c)] Add a cross section plane, adjust its position using the keyboard; keyboard keys are given \hyperlink{3dmenu}{here}.
+    \item[c)] Add a cross section plane (select `\emph{\sffamily Cross Section}' from the 3D context menu), adjust its position using the keyboard; keyboard keys are given \hyperlink{3dmenu}{here}.
     \item[d)] Adjust scaling and position of individual parts using the keyboard; keyboard keys are given \hyperlink{3dmenu}{here}.
     \item[e)] Re-adjust the camera distance using either `\emph{\sffamily Generate Default View}' or `\emph{\sffamily Part Options}'$\rightarrow$`\emph{\sffamily Fit Visible}'.
     \item[f)] When you are done, select `\emph{\sffamily Get Current View}' to get the {\tt VIEW} section, readily formatted for insertion into the views file. Repeat steps (a)--(f) to get any number of views you want to define. The views file can be edited manually to give meaningful names to the views (change the value of the {\tt VIEW} key), or to further tweak camera settings, opacity, part options etc.
diff --git a/Master/texmf-dist/tex/latex/media9/media9.sty b/Master/texmf-dist/tex/latex/media9/media9.sty
index d2d18f54d2f..e76a04b9477 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{2013/01/07}
-\def\g@mix@version@tl{0.19}
+\def\g@mix@date@tl{2013/01/21}
+\def\g@mix@version@tl{0.20}
 
 \def\g@mix@liiikerneldate{2012/07/16}
 \def\g@mix@liiipkgdate{2012/07/16}
@@ -278,6 +278,23 @@
   }
 }
 
+%creating global definitions
+\cs_new:Npn\mix@newkey#1#2{\tl_gset:cx{#1}{#2}}
+
+%macro for writing global defs to \jobname.aux
+\msg_set:nnn{media9}{rerun}{Rerun~to~get~media~labels~right!}
+\cs_gset:Nn\mix_keytoaux:nn{
+  \iow_now:Nx\@auxout{\token_to_str:N\mix@newkey{#1}{#2}}
+  \bool_if:nF{
+    \cs_if_exist_p:c{#1} && \str_if_eq_x_p:nn{\tl_use:c{#1}}{#2}
+  }{
+    \cs_if_exist:NF\g_mix_rerunwarned_tl{
+      \tl_new:N\g_mix_rerunwarned_tl
+      \AtEndDocument{\msg_warning:nn{media9}{rerun}}
+    }
+  }
+}
+
 %reset various variables for every new media inclusion
 \cs_new:Nn\mix_reset:{
   \tl_gset:Nx\g_mix_label_tl{rm@\int_use:N\g_mix_rmcnt_int}
@@ -397,6 +414,10 @@
     \tl_gset:Nx\g_mix_pdflastann_tl{\int_use:c{pdflastannot}~0~R}
   }
 
+  \cs_new:Nn\mix_pdflink:nn{% #1:dict, #2:text
+    \immediate\pdfstartlink~user~{#1}#2\pdfendlink
+  }
+
   \cs_new:Nn\mix_pdfxform:n{%#1:savebox number
     \immediate\pdfxform~resources~{\the\pdfpageresources}~#1
     \tl_gset:Nx\g_mix_pdflastxform_tl{\int_use:c{pdflastxform}~0~R}
@@ -466,6 +487,10 @@
       \int_gincr:N\g_mix_obj_int
     }
 
+    \cs_new:Nn\mix_pdflink:nn{% #1:dict, #2:text
+      \special{pdf:bann~<<#1>>}#2\special{pdf:eann}
+    }
+
     \cs_new:Nn\mix_pdfxform:n{%#1:savebox number
       \special{pdf:bxobj~@mix@obj\int_use:N\g_mix_obj_int\space
         width\space\dim_eval:n{\box_wd:N #1}\space
@@ -504,20 +529,21 @@
     \bool_new:N\g_mix_powerdot_bool %to cope with some powerdot oddity
     \@ifclassloaded{powerdot}{\bool_gset_true:N\g_mix_powerdot_bool}{}
 
-    %define `?pdfmark' operator as in file hdvips.def from package `hyperref'
-    \AtBeginDvi{
-      \cs_if_exist:NF\pdfmark{
-        \special{!~
-          systemdict~/pdfmark~known
-          {
-            userdict~/?pdfmark~systemdict~/exec~get~put
-          }{
-            userdict~/?pdfmark~systemdict~/pop~get~put~
-            userdict~/pdfmark~systemdict~/cleartomark~get~put
-          }
-          ifelse~
+    \@ifpackageloaded{hyperref}{}{
+      %define `?pdfmark' operator as in file hdvips.def from package `hyperref'
+      \special{!~
+        systemdict~/pdfmark~known
+        {
+          userdict~/?pdfmark~systemdict~/exec~get~put
+        }{
+          userdict~/?pdfmark~systemdict~/pop~get~put~
+          userdict~/pdfmark~systemdict~/cleartomark~get~put
         }
+        ifelse~
       }
+    }
+
+    \AtBeginDvi{
       \bool_if:NT\g_mix_pkgbigfiles_bool{
         \special{!~1~dict~begin~(./\jobname.m9)~run~end}
         %open auxiliary file \jobname.m9 for writing hex encoded streams
@@ -641,6 +667,20 @@
       \int_gincr:N\g_mix_obj_int
     }
 
+    \cs_new:Nn\mix_pdflink:nn{% #1:dict, #2:text
+      \cs_if_exist:NTF\pdfmark{
+        \pdfmark[#2]{pdfmark=/ANN,Raw={#1}}
+      }{
+        \hbox_set:Nn\l_tmpb_box{#2}
+        \mix_pdfannot:nnnn{
+          \box_wd:N\l_tmpb_box}{
+          \box_ht:N\l_tmpb_box}{
+          \box_dp:N\l_tmpb_box
+        }{#1}
+        \box_use_clear:N\l_tmpb_box
+      }
+    }
+
     \cs_new:Nn\mix_pdfxform:n{%#1:savebox number
       %mark bbox of box#1
       \hbox_set:Nn\l_tmpa_box{
@@ -1114,6 +1154,9 @@
         >>
       }
     }
+    \tl_if_empty:NF\g_mix_usrlabel_tl{
+      \mix_keytoaux:nn{main@\g_mix_usrlabel_tl}{\g_mix_pdflastobj_tl}
+    }
     \mix_pdfobj:nnn{}{dict}{
       /Subtype/\g_mix_mainassetsub_tl
       /Instances~[\g_mix_pdflastobj_tl]
@@ -1195,6 +1238,7 @@
       /RichMediaContent~\l_mix_content_tl
     }
     \tl_if_empty:NF\g_mix_usrlabel_tl{
+      \mix_keytoaux:nn{ann@\g_mix_usrlabel_tl}{\g_mix_pdflastann_tl}
       \mix_pdfobj:nnn{}{dict}{
         /S/JavaScript/JS~(
           if(typeof(annotRM)=='undefined'){annotRM=new~Array();}
@@ -1381,9 +1425,9 @@
 \cs_new:Npn\mix_parse_windowedarg:w#1x#2\q_stop{
   \str_if_eq:nnTF{#1}{default}{
     \tl_gset:Nx\tl_mix_fltwd{
-	  \fp_to_int:n{1.522*\__dim_strip_bp:n{\l_mix_wd_tl}}}
+      \fp_to_int:n{1.522*\__dim_strip_bp:n{\l_mix_wd_tl}}}
     \tl_gset:Nx\tl_mix_fltht{
-	  \fp_to_int:n{1.522*\__dim_strip_bp:n{\l_mix_tt_tl}}}
+      \fp_to_int: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}
@@ -1402,11 +1446,8 @@
 \msg_set:nnn{media9}{same~label}{
   Line~\msg_line_number: :~Label~`#1'~multiply~defined.
 }
-\msg_set:nnn{media9}{multiple~labels}{\\
-  @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\\
-  @@~There~were~multiply-defined~labels!~@@\\
-  @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-}
+
+\msg_set:nnn{media9}{multiple~labels}{ There~were~multiply-defined~labels!}
 
 \bool_new:N\g_mix_usrdraft_bool
 \bool_new:N\g_mix_opt_iiidview_bool
diff --git a/Master/texmf-dist/tex/latex/media9/players/APlayer.swf b/Master/texmf-dist/tex/latex/media9/players/APlayer.swf
index 73046acd2cc..56d7093bf6c 100644
--- a/Master/texmf-dist/tex/latex/media9/players/APlayer.swf
+++ b/Master/texmf-dist/tex/latex/media9/players/APlayer.swf