diff options
author | Karl Berry <karl@freefriends.org> | 2014-03-06 22:10:21 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2014-03-06 22:10:21 +0000 |
commit | dce368d510dc3ccdacfd71146a8fbd05bb74f82d (patch) | |
tree | bfb2544e02ad1f3fe1a3c67af92fcb685b2fb7cd /Master/texmf-dist | |
parent | 08f1d1c4e2857a3aa0ed1fffaf12ebc78006919b (diff) |
media9 (6mar14)
git-svn-id: svn://tug.org/texlive/trunk@33108 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r-- | Master/texmf-dist/doc/latex/media9/ChangeLog | 6 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/media9/README | 2 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/media9/files/players/VPlayer.mxml | 6 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/media9/media9.pdf | bin | 3306411 -> 3305538 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/media9/media9.tex | 7 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/media9/media9.sty | 33 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/media9/players/VPlayer.swf | bin | 502357 -> 502482 bytes |
7 files changed, 36 insertions, 18 deletions
diff --git a/Master/texmf-dist/doc/latex/media9/ChangeLog b/Master/texmf-dist/doc/latex/media9/ChangeLog index 6752af51885..c57a2e713dc 100644 --- a/Master/texmf-dist/doc/latex/media9/ChangeLog +++ b/Master/texmf-dist/doc/latex/media9/ChangeLog @@ -1,3 +1,9 @@ +2014-03-06 + * v0.41 + * new: poster text, if provided, also shown in draft mode (instead of draft + box) + * new: updated VPlayer with `autoRewind' setting via FlashVars + 2014-02-17 * v0.40 * new: play button visible in AR only diff --git a/Master/texmf-dist/doc/latex/media9/README b/Master/texmf-dist/doc/latex/media9/README index a699541f9a1..b77022632ee 100644 --- a/Master/texmf-dist/doc/latex/media9/README +++ b/Master/texmf-dist/doc/latex/media9/README @@ -50,7 +50,7 @@ Otherwise, a manual install into the local TeX-Directory-Structure (TDS) root directory can be done along the following steps: 1.) Download the TDS compliant package file -http://tug.ctan.org/tex-archive/install/macros/latex/contrib/media9.tds.zip. +http://mirror.ctan.org/install/macros/latex/contrib/media9.tds.zip. 2.) Find the local TDS root directory by running diff --git a/Master/texmf-dist/doc/latex/media9/files/players/VPlayer.mxml b/Master/texmf-dist/doc/latex/media9/files/players/VPlayer.mxml index 2c71e372b52..a5f05bbb425 100644 --- a/Master/texmf-dist/doc/latex/media9/files/players/VPlayer.mxml +++ b/Master/texmf-dist/doc/latex/media9/files/players/VPlayer.mxml @@ -4,7 +4,7 @@ <!-- a FlashPlayer-10 compatible component for playing --> <!-- FLV and MP4/H.264 video files and streams. --> <!-- --> -<!-- version 20140211 --> +<!-- version 20140306 --> <!-- --> <!-- --> <!-- The free Apache Flex 4 SDK is required to compile --> @@ -48,6 +48,7 @@ [Bindable] private var scaleMode:String='stretch'; [Bindable] private var source:String; [Bindable] private var autoPlay:Boolean=false; + [Bindable] private var autoRewind:Boolean=false; [Bindable] private var loop:Boolean=false; [Bindable] private var vol:Number=0.75; [Bindable] private var stepping:Boolean=false; @@ -61,6 +62,7 @@ private function initialise(flashVars:Object):void { source=flashVars.source; if(flashVars.autoPlay=='true'){autoPlay=true} + if(flashVars.autoRewind=='true'){autoRewind=true} if(flashVars.loop=='true'){loop=true} if(flashVars.volume){vol=Number(flashVars.volume)} if(flashVars.scaleMode){scaleMode=flashVars.scaleMode} @@ -260,7 +262,7 @@ id="vidDisp" width="100%" height="100%" scaleMode="{scaleMode}" source="{source}" volume="{vol}" - autoPlay="{autoPlay}" autoRewind="false" loop="{loop}" + autoPlay="{autoPlay}" autoRewind="{autoRewind}" loop="{loop}" mouseDown="if(stepping){vidDisp.play();}else{vidDisp.pause();}this.setFocus();" mouseUp="if(vidComplete) vidDisp.seek(0);if(!stepping){vidDisp.play();}" mediaPlayerStateChange="onStateChange(event);" diff --git a/Master/texmf-dist/doc/latex/media9/media9.pdf b/Master/texmf-dist/doc/latex/media9/media9.pdf Binary files differindex 8b64de02420..a51a62414d4 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 155b0af9d44..0b07a0441d7 100644 --- a/Master/texmf-dist/doc/latex/media9/media9.tex +++ b/Master/texmf-dist/doc/latex/media9/media9.tex @@ -1,7 +1,7 @@ % Copyright 2012--\today Alexander Grahn % % This material is subject to the LaTeX Project Public License. See -% http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html +% http://mirror.ctan.org/help/Catalogue/licenses.lppl.html % for the details of that license. % %\pdfcompresslevel=0 @@ -481,7 +481,7 @@ If specified, the media button changes its appearance when the mouse pointer is \begin{verbatim} downface=<mouse-button-down text or graphic> \end{verbatim} -If specified, the media button changes its appearance when the mouse button is pressed while the pointer is over it. When pressed, the button is always slightly offset to appear as if it were being pushed below the surface of the page. An \verb+\includegraphics+ command may need to be enclosed in braces. +If specified, the media button changes its appearance when the mouse button is pressed while the pointer is over it. An \verb+\includegraphics+ command may need to be enclosed in braces. \begin{verbatim} tooltip=<tip text> \end{verbatim} @@ -586,6 +586,7 @@ keys & action\\\hline\hline parameter & description\\\hline\hline {\tt source=<file path or URL>} & (required) path to embedded media file (see option `{\tt addresource}'), or URL (http, rtmp) to online media file\\ {\tt autoPlay=true|false} & if {\tt=true}, automatically starts playback after activation (see option `{\tt activation})'\\ +{\tt autoRewind=true|false} &(VPlayer.swf only) if {\tt=true}, automatically rewind to the first frame after playback has finished; default is `{\tt false}'\\ {\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\\ @@ -1088,7 +1089,7 @@ when using \verb+latex+ in \verb+dvips+ mode. While writing the DVI file, media There are two options to handle such situations: -The first one is to increase \TeX's main memory. You may follow the steps in the \href{http://www.ctan.org/tex-archive/macros/latex/contrib/animate/animate.pdf\#dest:mem}{Bugs} section of the `animate' package documentation. In \TeX{}Live-2012, the maximum value that can be set is \verb+main_memory = 12435455+. +The first one is to increase \TeX's main memory. You may follow the steps in the \href{http://mirror.ctan.org/macros/latex/contrib/animate/animate.pdf\#dest:mem}{Bugs} section of the `animate' package documentation. In \TeX{}Live-2012, the maximum value that can be set is \verb+main_memory = 12435455+. If increasing \TeX's main memory does not help, use the package option `\verb+bigfiles+' with media9. It defers file embedding from the DVI producing to the PS producing step. diff --git a/Master/texmf-dist/tex/latex/media9/media9.sty b/Master/texmf-dist/tex/latex/media9/media9.sty index 6acf9ac4bce..5b099609fd2 100644 --- a/Master/texmf-dist/tex/latex/media9/media9.sty +++ b/Master/texmf-dist/tex/latex/media9/media9.sty @@ -42,8 +42,8 @@ \RequirePackage{atbegshi} \RequirePackage{tikz} -\def\g@mix@date@tl{2014/02/17} -\def\g@mix@version@tl{0.40} +\def\g@mix@date@tl{2014/03/06} +\def\g@mix@version@tl{0.41} \def\g@mix@liiikerneldate{2013/07/28} \def\g@mix@liiipkgdate{2013/07/28} @@ -468,7 +468,6 @@ } \group_end: - %macros for adding AcroForm and OCProperties dicts to PDF Catalog \tl_if_exist:cF{@anim@fields}{\tl_gset:cn{@anim@fields}{}}%takes Field object refs \cs_new:Nn\mix_insert_acroform:{ %AcroForm dict @@ -476,7 +475,7 @@ \mix_pdfobj:nnn{}{array}{} \tl_gset:Nx\g_mix_fieldsarray_tl{\g_mix_pdflastobj_tl} \mix_pdfcatalog:n{ - /AcroForm~<</Fields~\g_mix_fieldsarray_tl/NeedAppearances~true>>} + /AcroForm~<</Fields~\g_mix_fieldsarray_tl/NeedAppearances~false>>} \AtEndDocument{ \mix_pdfobj:nnn{\g_mix_fieldsarray_tl}{array}{\@anim@fields} } @@ -507,13 +506,11 @@ \tl_gset:cn{oc@props@added}{} } } -\cs_new:Nn\mix_insert_btnocg:{%OCG for play button +\cs_new:Nn\mix_insert_btnocg:{%OCG for play button overlay \tl_if_exist:NF\g_mix_btnocg_tl{ - \mix_pdfobj:nnn{}{dict}{/Type/OCG/Name~(MediaPlayButton) - /Usage<< - /Print<</PrintState/OFF>> - /Export<</ExportState/OFF>> - >> + \mix_pdfobj:nnn{}{dict}{ + /Type/OCG/Name~(MediaPlayButton) + /Usage<</Print<</PrintState/OFF>>/Export<</ExportState/OFF>>>> } \tl_gput_right:Nx\@anim@ocgs{\space\g_mix_pdflastobj_tl} \tl_gput_right:Nx\@anim@offocgs{\space\g_mix_pdflastobj_tl} @@ -1255,7 +1252,13 @@ \tl_if_empty:NF\g_mix_usrlabel_tl{ \mix_keytoaux_now:nn{ann@\g_mix_usrlabel_tl}{draft} } - \mix_draftbox:n{\tl_to_str:n{#3}} + \tl_if_blank:oTF{#2}{ + \mix_draftbox:n{\tl_to_str:n{#3}} + }{ + \box_move_down:nn{\l_mix_dp_tl-\box_dp:N\l_mix_poster_box}{ + \box_use:N\l_mix_poster_box + } + } }{ %embed main asset \mix_uribegin: @@ -1469,6 +1472,7 @@ } } }catch(e){} + this.dirty=false; ) } \mix_pdfannot:nnnn{0pt}{0pt}{0pt}{ @@ -2589,7 +2593,12 @@ /T~(mbtn@\int_use:N\g_mix_mbtncnt_int) \tl_if_empty:NF\g_mix_tooltip_tl{/TU~(\g_mix_tooltip_tl)} /FT/Btn/Ff~65536 - /H/P + \tl_if_empty:NTF\g_mix_downbtn_tl{/H/I}{/H/P} + /AP~<< + /N~\g_mix_normalbtn_tl + \tl_if_empty:NF\g_mix_overbtn_tl{/R~\g_mix_overbtn_tl} + \tl_if_empty:NF\g_mix_downbtn_tl{/D~\g_mix_downbtn_tl} + >> /MK~<< /TP~1~/IF~<</S/A/FB~true/A~[0.0~0.0]>> /I~\g_mix_normalbtn_tl diff --git a/Master/texmf-dist/tex/latex/media9/players/VPlayer.swf b/Master/texmf-dist/tex/latex/media9/players/VPlayer.swf Binary files differindex 2801daea750..fc97ef42730 100644 --- a/Master/texmf-dist/tex/latex/media9/players/VPlayer.swf +++ b/Master/texmf-dist/tex/latex/media9/players/VPlayer.swf |