diff options
author | Karl Berry <karl@freefriends.org> | 2015-07-28 21:22:14 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2015-07-28 21:22:14 +0000 |
commit | 0f2e8a3f6cc986296e73e726fe1f599cbb6b2e63 (patch) | |
tree | 897c0b0523fb35e7cc9906180a3eebf2b4ef7e54 /Master | |
parent | 2a6ba6d868071a3d636d8e91f87240934ad24251 (diff) |
media9 (28jul15)
git-svn-id: svn://tug.org/texlive/trunk@37983 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r-- | Master/texmf-dist/doc/latex/media9/ChangeLog | 4 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/media9/media9.pdf | bin | 3598734 -> 3599274 bytes | |||
-rw-r--r-- | Master/texmf-dist/source/latex/media9/media9.tex | 2 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/media9/players/APlayer.mxml | 4 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/media9/players/APlayer9.mxml | 4 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/media9/players/VPlayer.mxml | 25 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/media9/players/VPlayer9.mxml | 22 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/media9/media9.sty | 201 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/media9/players/APlayer.swf | bin | 353059 -> 353064 bytes | |||
-rw-r--r-- | Master/texmf-dist/tex/latex/media9/players/APlayer9.swf | bin | 206151 -> 206165 bytes | |||
-rw-r--r-- | Master/texmf-dist/tex/latex/media9/players/VPlayer.swf | bin | 480833 -> 480743 bytes | |||
-rw-r--r-- | Master/texmf-dist/tex/latex/media9/players/VPlayer9.swf | bin | 219365 -> 219242 bytes |
12 files changed, 94 insertions, 168 deletions
diff --git a/Master/texmf-dist/doc/latex/media9/ChangeLog b/Master/texmf-dist/doc/latex/media9/ChangeLog index 6a12b7a1e51..77c58cf9f15 100644 --- a/Master/texmf-dist/doc/latex/media9/ChangeLog +++ b/Master/texmf-dist/doc/latex/media9/ChangeLog @@ -1,3 +1,7 @@ +2015-07-28 + * v0.56 + * fix: expl3[2015/07/14]-related adjustments + 2015-07-20 * v0.55 * fix: expl3-related adjustments diff --git a/Master/texmf-dist/doc/latex/media9/media9.pdf b/Master/texmf-dist/doc/latex/media9/media9.pdf Binary files differindex d3bcc9f3c94..25fb6928ef4 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/media9.tex b/Master/texmf-dist/source/latex/media9/media9.tex index b04fb4a7926..c278a4c5ee7 100644 --- a/Master/texmf-dist/source/latex/media9/media9.tex +++ b/Master/texmf-dist/source/latex/media9/media9.tex @@ -633,7 +633,6 @@ parameter & description\\\hline\hline {\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 letterbox}; 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\\ @@ -658,7 +657,6 @@ function & argument &description\\\hline\hline {\tt play} & number (optional) & play media, optionally starting at \emph{number} seconds offset into the media file\\ {\tt pause} & number (optional) & pause media, optionally at the given offset of \emph{number} seconds into the media file\\ {\tt playPause} & & toggle between play and pause\\ -{\tt stepping} & & (VPlayer.swf only) toggle stepping mode (one frame per click)\\ {\tt setSource} & string & load another media file (path to file, embedded using option `{\tt addresource}', or URL)\\ {\tt seek} & number & move the play location to a time offset from the beginning of the media; argument measured in seconds\\ {\tt rewind} & & rewind media to the beginning (without pausing it)\\ diff --git a/Master/texmf-dist/source/latex/media9/players/APlayer.mxml b/Master/texmf-dist/source/latex/media9/players/APlayer.mxml index 263123a369d..29dcd64df0f 100644 --- a/Master/texmf-dist/source/latex/media9/players/APlayer.mxml +++ b/Master/texmf-dist/source/latex/media9/players/APlayer.mxml @@ -348,7 +348,9 @@ function(e:ContextMenuEvent):void{mute();}); this.contextMenu.customItems.push( - new ContextMenuItem("Seek, [\u2190]/[\u2192]", true, false, true)); + new ContextMenuItem("via keyboard:", true, false, true)); + this.contextMenu.customItems.push( + new ContextMenuItem("Seek, [\u2190]/[\u2192]", false, false, true)); this.contextMenu.customItems.push( new ContextMenuItem("Volume, [\u2191]/[\u2193]", false, false, true)); this.contextMenu.customItems.push( diff --git a/Master/texmf-dist/source/latex/media9/players/APlayer9.mxml b/Master/texmf-dist/source/latex/media9/players/APlayer9.mxml index cc1a1a0c629..aae99ffcb27 100644 --- a/Master/texmf-dist/source/latex/media9/players/APlayer9.mxml +++ b/Master/texmf-dist/source/latex/media9/players/APlayer9.mxml @@ -338,7 +338,9 @@ function(e:ContextMenuEvent):void{mute();}); this.contextMenu.customItems.push( - new ContextMenuItem("Seek, [\u2190]/[\u2192]", true, false, true)); + new ContextMenuItem("via keyboard:", true, false, true)); + this.contextMenu.customItems.push( + new ContextMenuItem("Seek, [\u2190]/[\u2192]", false, false, true)); this.contextMenu.customItems.push( new ContextMenuItem("Volume, [\u2191]/[\u2193]", false, false, true)); this.contextMenu.customItems.push( diff --git a/Master/texmf-dist/source/latex/media9/players/VPlayer.mxml b/Master/texmf-dist/source/latex/media9/players/VPlayer.mxml index ff3dc7962b0..c83ef4e3999 100644 --- a/Master/texmf-dist/source/latex/media9/players/VPlayer.mxml +++ b/Master/texmf-dist/source/latex/media9/players/VPlayer.mxml @@ -4,7 +4,7 @@ <!-- a FlashPlayer-10 compatible component for playing --> <!-- FLV and MP4/H.264 video files and streams. --> <!-- --> -<!-- version 20150601 --> +<!-- version 20150722 --> <!-- --> <!-- --> <!-- The free Apache Flex 4 SDK is required to compile --> @@ -51,7 +51,6 @@ [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; private var vidComplete:Boolean=false; private var deltaSeek:Number; private var curTime:Number; @@ -67,7 +66,6 @@ if(flashVars.loop=='true'){loop=true} if(flashVars.volume){vol=Number(flashVars.volume)} if(flashVars.scaleMode){scaleMode=flashVars.scaleMode} - if(flashVars.stepping){stepping=flashVars.stepping} } private function onProgress(event:ProgressEvent):void { @@ -152,10 +150,6 @@ } } - private function onEnterFrame(e:Event):void { - if(stepping&&vidDisp.playing){vidDisp.pause();} - } - private function onCurrentTimeChange(e:Event):void { if(vidDisp.playing&&pauseAtPos>=0&&vidDisp.currentTime<pauseAtPos) toBePaused=true; @@ -187,10 +181,6 @@ vidDisp.seek(p); } - private function step():void { - if(stepping){stepping=false;}else{stepping=true;} - } - private function rewind():void { vidDisp.seek(0); } @@ -251,7 +241,6 @@ private function initApp():void { this.addEventListener(KeyboardEvent.KEY_DOWN, onKeyDown); this.addEventListener(KeyboardEvent.KEY_UP, onKeyUp); - this.addEventListener(Event.ENTER_FRAME, onEnterFrame); ExternalInterface.addCallback("play", play); ExternalInterface.addCallback("pause", pause); ExternalInterface.addCallback("playPause", playPause); @@ -260,7 +249,6 @@ ExternalInterface.addCallback("volume", volume); ExternalInterface.addCallback("mute", mute); ExternalInterface.addCallback("setSource", setSource); - ExternalInterface.addCallback("stepping", step); ExternalInterface.addCallback("currentTime", currentTime); ExternalInterface.addCallback("duration", duration); ExternalInterface.addCallback("playing", playing); @@ -288,7 +276,9 @@ function(e:ContextMenuEvent):void{mute();}); this.contextMenu.customItems.push( - new ContextMenuItem("Seek, [\u2190]/[\u2192]", true, false, true)); + new ContextMenuItem("via keyboard:", true, false, true)); + this.contextMenu.customItems.push( + new ContextMenuItem("Seek, [\u2190]/[\u2192]", false, false, true)); this.contextMenu.customItems.push( new ContextMenuItem("Volume, [\u2191]/[\u2193]", false, false, true)); @@ -297,6 +287,9 @@ itemPlayPause.caption=(vidDisp.playing ? "Pause" : "Play")+", [Space]"; itemMute.caption=(vidDisp.muted ? "Unmute" : "Mute")+", [m]";} ); + + //autoPlay setting not reliable + if(autoPlay) {while(!vidDisp.playing) play();}; } ]]> </fx:Script> @@ -331,7 +324,7 @@ /> <s:Button alpha="0" width="100%" height="100%" - mouseDown="if(stepping){vidDisp.play();}else{vidDisp.pause();}" - mouseUp="if(vidComplete) vidDisp.seek(0);if(!stepping){vidDisp.play();}" + mouseDown="vidDisp.pause();" + mouseUp="if(vidComplete) vidDisp.seek(0);vidDisp.play();" /> </s:Application> diff --git a/Master/texmf-dist/source/latex/media9/players/VPlayer9.mxml b/Master/texmf-dist/source/latex/media9/players/VPlayer9.mxml index 5ecbaaf4d53..4379385d75b 100644 --- a/Master/texmf-dist/source/latex/media9/players/VPlayer9.mxml +++ b/Master/texmf-dist/source/latex/media9/players/VPlayer9.mxml @@ -4,7 +4,7 @@ <!-- a FlashPlayer-9 compatible component for playing --> <!-- FLV and MP4/H.264 video files and streams. --> <!-- --> -<!-- version 20150601 --> +<!-- version 20150722 --> <!-- --> <!-- Copyright (C) 2012-today Alexander Grahn --> <!-- --> @@ -37,7 +37,6 @@ [Bindable] private var autoPlay:Boolean=false; [Bindable] private var loop:Boolean=false; [Bindable] private var vol:Number=0.75; - [Bindable] private var stepping:Boolean=false; [Bindable] private var keepAspect:Boolean=true; private var vidComplete:Boolean=false; private var deltaSeek:Number; @@ -55,7 +54,6 @@ if(flashVars.autoPlay=='true') autoPlay=true; if(flashVars.loop=='true') loop=true; if(flashVars.volume) vol=Number(flashVars.volume); - if(flashVars.stepping) stepping=flashVars.stepping; if(flashVars.scaleMode && flashVars.scaleMode!='letterbox') keepAspect=false; } @@ -141,10 +139,6 @@ } } - private function onEnterFrame(e:Event):void { - if(stepping&&vidDisp.playing){vidDisp.pause();} - } - private function onPlayheadUpdate(e:Event):void { if(vidDisp.playing&&pauseAtPos>=0&&vidDisp.playheadTime<pauseAtPos) toBePaused=true; @@ -176,10 +170,6 @@ vidDisp.playheadTime=p; } - private function step():void { - if(stepping){stepping=false;}else{stepping=true;} - } - private function rewind():void { vidDisp.playheadTime=0; } @@ -242,7 +232,6 @@ private function initApp():void { this.addEventListener(KeyboardEvent.KEY_DOWN, onKeyDown); this.addEventListener(KeyboardEvent.KEY_UP, onKeyUp); - this.addEventListener(Event.ENTER_FRAME, onEnterFrame); ExternalInterface.addCallback("play", play); ExternalInterface.addCallback("pause", pause); ExternalInterface.addCallback("playPause", playPause); @@ -251,7 +240,6 @@ ExternalInterface.addCallback("volume", volume); ExternalInterface.addCallback("mute", mute); ExternalInterface.addCallback("setSource", setSource); - ExternalInterface.addCallback("stepping", step); ExternalInterface.addCallback("currentTime", currentTime); ExternalInterface.addCallback("duration", duration); ExternalInterface.addCallback("playing", playing); @@ -280,7 +268,9 @@ function(e:ContextMenuEvent):void{mute();}); this.contextMenu.customItems.push( - new ContextMenuItem("Seek, [\u2190]/[\u2192]", true, false, true)); + new ContextMenuItem("via keyboard:", true, false, true)); + this.contextMenu.customItems.push( + new ContextMenuItem("Seek, [\u2190]/[\u2192]", false, false, true)); this.contextMenu.customItems.push( new ContextMenuItem("Volume, [\u2191]/[\u2193]", false, false, true)); @@ -324,7 +314,7 @@ <mx:Button alpha="0" width="100%" height="100%" cornerRadius="0" paddingBottom="0" paddingLeft="0" paddingRight="0" paddingTop="0" - mouseDown="if(stepping){vidDisp.play();}else{vidDisp.pause();}" - mouseUp="if(vidComplete) vidDisp.playheadTime=0;if(!stepping){vidDisp.play();}" + mouseDown="vidDisp.pause();" + mouseUp="if(vidComplete) vidDisp.playheadTime=0;vidDisp.play();" /> </mx:Application> diff --git a/Master/texmf-dist/tex/latex/media9/media9.sty b/Master/texmf-dist/tex/latex/media9/media9.sty index 8bedbff3730..3587c473a15 100644 --- a/Master/texmf-dist/tex/latex/media9/media9.sty +++ b/Master/texmf-dist/tex/latex/media9/media9.sty @@ -43,11 +43,11 @@ \RequirePackage{atenddvi} \RequirePackage{tikz} -\def\g@mix@date@tl{2015/07/20} -\def\g@mix@version@tl{0.55} +\def\g@mix@date@tl{2015/07/28} +\def\g@mix@version@tl{0.56} -\def\g@mix@liiikerneldate{2015/06/15} -\def\g@mix@liiipkgdate{2015/06/15} +\def\g@mix@liiikerneldate{2015/07/14} +\def\g@mix@liiipkgdate{2015/07/14} \ProvidesExplPackage{media9}{\g@mix@date@tl}{\g@mix@version@tl} {acrobat-9/X compatible media} @@ -194,15 +194,13 @@ activate / pagevisible .code:n = {\tl_gset:Nn\g_mix_pkgact_tl{/PV}}, activate / pageopen .code:n = {\tl_gset:Nn\g_mix_pkgact_tl{/PO}}, activate / onclick .code:n = {\tl_gset:Nn\g_mix_pkgact_tl{/XA}}, -% activate .value_required:n = true, - activate .value_required:, + activate .value_required:n = {true}, deactivate .choice:, 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}}, -% deactivate .value_required:n = true, - deactivate .value_required:, + deactivate .value_required:n = {true}, transparent .choices:nn = {true,false}{ \tl_gset:Nx\g_mix_pkgtransp_tl{\l_keys_choice_tl} @@ -234,8 +232,7 @@ \tl_set:Nn\l_mix_pkgwd_tl{} } }, -% width .value_required:n = true, - width .value_required:, + width .value_required:n = {true}, height .code:n = { \tl_gset:Nn\g_mix_pkghtarg_tl{#1} @@ -244,8 +241,7 @@ \tl_set:Nn\l_mix_pkght_tl{} } }, -% height .value_required:n = true, - height .value_required:, + height .value_required:n = {true}, totalheight .code:n = { \tl_gset:Nn\g_mix_pkgttarg_tl{#1} @@ -254,8 +250,7 @@ \tl_set:Nn\l_mix_pkgtt_tl{} } }, -% height .value_required:n = true, - height .value_required:, + height .value_required:n = {true}, depth .code:n = { \msg_warning:nnnn{media9}{deprecated~option}{depth}{ @@ -269,8 +264,7 @@ keepaspectratio .default:n = {true}, scale .code:n = {\tl_gset:Nx\g_mix_pkgscalearg_tl{#1}}, -% scale .value_required:n = true, - scale .value_required:, + scale .value_required:n = {true}, %3D specific options 3Dplaytype .choice:, @@ -278,16 +272,13 @@ 3Dplaytype / linear .code:n = {\tl_gset:Nn\g_mix_pkgplaytpe_tl{Linear}}, 3Dplaytype / oscillating .code:n = { \tl_gset:Nn\g_mix_pkgplaytpe_tl{Oscillating}}, -% 3Dplaytype .value_required:n = true, - 3Dplaytype .value_required:, + 3Dplaytype .value_required:n = {true}, - 3Dplaycount .code:n = {\tl_gset:Nx\g_mix_pkgplaycnt_tl{\fp_eval:n{trunc(#1)}}} -% 3Dplaycount .value_required:n = true, - 3Dplaycount .value_required:, + 3Dplaycount .code:n = {\tl_gset:Nx\g_mix_pkgplaycnt_tl{\fp_eval:n{trunc(#1)}}}, + 3Dplaycount .value_required:n = {true}, 3Dplayspeed .tl_gset_x:N = \g_mix_pkgplayspd_tl, -% 3Dplayspeed .value_required:n = true, - 3Dplayspeed .value_required:, + 3Dplayspeed .value_required:n = {true}, 3Dtoolbar .choices:nn = {true,false}{ \tl_gset:Nx\g_mix_pkgtools_tl{\l_keys_choice_tl} @@ -307,8 +298,7 @@ \tl_gset:Nn\g_mix_pkgnrdflt_tl{/NR~true} } }, -% 3Dpartsattrs .value_required:n = true, - 3Dpartsattrs .value_required:, + 3Dpartsattrs .value_required:n = {true}, 3Dmenu .bool_gset:N = \g_mix_pkgiiidcalc_bool, @@ -316,20 +306,17 @@ \tl_gset:Nx\g_mix_pkgopt_bg_tl{ /BG<</Subtype/SC/CS/DeviceRGB/C[#1]/EA~true>>} }, -% 3Dbg .value_required:n = true, - 3Dbg .value_required:, + 3Dbg .value_required:n = {true}, 3Dlights .code:n = { \tl_gset:Nx\g_mix_pkgopt_ls_tl{/LS<</Subtype/#1>>} }, -% 3Dlights .value_required:n = true, - 3Dlights .value_required:, + 3Dlights .value_required:n = {true}, 3Drender .code:n = { \tl_gset:Nx\g_mix_pkgopt_rm_tl{/RM<</Subtype/#1>>} }, -% 3Drender .value_required:n = true, - 3Drender .value_required:, + 3Drender .value_required:n = {true}, unknown .code:n = { \msg_error:nnx{media9}{unknown~package~option}{\l_keys_key_tl} @@ -1904,8 +1891,7 @@ \tl_new:c{rm@#1} } }, -% label .value_required:n = true, - label .value_required:, + label .value_required:n = {true}, width .code:n = { \tl_gset:Nn\g_mix_wdarg_tl{#1} @@ -1914,8 +1900,7 @@ \tl_set:Nn\l_mix_usrwd_tl{} } }, -% width .value_required:n = true, - width .value_required:, + width .value_required:n = {true}, height .code:n = { \tl_gset:Nn\g_mix_htarg_tl{#1} @@ -1924,8 +1909,7 @@ \tl_set:Nn\l_mix_usrht_tl{} } }, -% height .value_required:n = true, - height .value_required:, + height .value_required:n = {true}, totalheight .code:n = { \tl_gset:Nn\g_mix_ttarg_tl{#1} @@ -1934,8 +1918,7 @@ \tl_set:Nn\l_mix_usrtt_tl{} } }, -% height .value_required:n = true, - height .value_required:, + height .value_required:n = {true}, depth .code:n = { \msg_warning:nnnn{media9}{deprecated~option}{depth}{ @@ -1949,8 +1932,7 @@ keepaspectratio .default:n = {true}, scale .code:n = {\tl_gset:Nx\g_mix_scalearg_tl{#1}}, -% scale .value_required:n = true, - scale .value_required:, + scale .value_required:n = {true}, url .code:n = { \msg_warning:nnnn{media9}{deprecated~option}{url}{ @@ -1959,30 +1941,25 @@ }, addresource .code:n = {\seq_gput_right:Nn\g_mix_res_seq{#1}}, -% addresource .value_required:n = true, - addresource .value_required:, + addresource .value_required:n = {true}, add3Djscript .code:n = {\seq_gput_right:Nn\g_mix_script_seq{#1}}, -% add3Djscript .value_required:n = true, - add3Djscript .value_required:, + add3Djscript .value_required:n = {true}, flashvars .tl_gset_x:N = \g_mix_flashvars_tl, -% flashvars .value_required:n = true, - flashvars .value_required:, + flashvars .value_required:n = {true}, activate .choice:, activate / pagevisible .code:n = {\tl_gset:Nn\g_mix_act_tl{/PV}}, activate / pageopen .code:n = {\tl_gset:Nn\g_mix_act_tl{/PO}}, activate / onclick .code:n = {\tl_gset:Nn\g_mix_act_tl{/XA}}, -% activate .value_required:n = true, - activate .value_required:, + activate .value_required:n = {true}, deactivate .choice:, 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}}, -% deactivate .value_required:n = true, - deactivate .value_required:, + deactivate .value_required:n = {true}, draft .choice:, draft / true .code:n = {\bool_gset_true:N\g_mix_usrdraft_bool}, @@ -2036,16 +2013,13 @@ 3Dplaytype / linear .code:n = {\tl_gset:Nn\g_mix_playtpe_tl{Linear}}, 3Dplaytype / oscillating .code:n = { \tl_gset:Nn\g_mix_playtpe_tl{Oscillating}}, -% 3Dplaytype .value_required:n = true, - 3Dplaytype .value_required:, + 3Dplaytype .value_required:n = {true}, - 3Dplaycount .code:n = {\tl_gset:Nx\g_mix_playcnt_tl{\fp_eval:n{trunc(#1)}}} -% 3Dplaycount .value_required:n = true, - 3Dplaycount .value_required:, + 3Dplaycount .code:n = {\tl_gset:Nx\g_mix_playcnt_tl{\fp_eval:n{trunc(#1)}}}, + 3Dplaycount .value_required:n = {true}, 3Dplayspeed .tl_gset_x:N = \g_mix_playspd_tl, -% 3Dplayspeed .value_required:n = true, - 3Dplayspeed .value_required:, + 3Dplayspeed .value_required:n = {true}, 3Dtoolbar .choices:nn = {true,false}{ \tl_gset:Nx\g_mix_tools_tl{\l_keys_choice_tl}}, @@ -2063,26 +2037,22 @@ \tl_gset:Nn\g_mix_nrdflt_tl{/NR~true} } }, -% 3Dpartsattrs .value_required:n = true, - 3Dpartsattrs .value_required:, + 3Dpartsattrs .value_required:n = {true}, 3Dcoo .code:n = {\tl_gset:Nn\g_mix_opt_coo_tl{#1} \bool_gset_true:N\g_mix_opt_iiidview_bool}, -% 3Dcoo .value_required:n = true, - 3Dcoo .value_required:, + 3Dcoo .value_required:n = {true}, 3Dc2c .code:n = {\tl_gset:Nn\g_mix_opt_ctoc_tl{#1} \bool_gset_true:N\g_mix_opt_iiidview_bool}, -% 3Dc2c .value_required:n = true, - 3Dc2c .value_required:, + 3Dc2c .value_required:n = {true}, 3Dc2w .code:n = { \tl_gset:Nx\g_mix_opt_ciiw_tl{#1} \bool_gset_true:N\g_mix_opt_iiidview_bool \bool_gset_true:N\g_mix_opt_ciiw_bool }, -% 3Dc2w .value_required:n = true, - 3Dc2w .value_required:, + 3Dc2w .value_required:n = {true}, 3Droo .code:n = { \fp_gset:Nn\g_mix_opt_roo_fp{abs(#1)} @@ -2091,13 +2061,11 @@ \bool_gset_true:N\g_mix_opt_iiidview_bool \bool_set_true:N\l_mix_roo_bool }, -% 3Droo .value_required:n = true, - 3Droo .value_required:, + 3Droo .value_required:n = {true}, 3Daac .code:n = {\fp_gset:Nn\g_mix_opt_aac_fp{#1} \bool_gset_true:N\g_mix_opt_iiidview_bool}, -% 3Daac .value_required:n = true, - 3Daac .value_required:, + 3Daac .value_required:n = {true}, 3Dortho .code:n = { \bool_gset_true:N\g_mix_opt_iiidview_bool @@ -2114,22 +2082,19 @@ 3Droll .code:n = {\fp_gset:Nn\g_mix_opt_roll_fp{#1} \bool_gset_true:N\g_mix_opt_iiidview_bool}, -% 3Droll .value_required:n = true, - 3Droll .value_required:, + 3Droll .value_required:n = {true}, 3Dmenu .bool_gset:N = \g_mix_iiidcalc_bool, 3Dbg .code:n = { \tl_gset:Nx\g_mix_opt_bg_tl{/BG<</Subtype/SC/CS/DeviceRGB/C[#1]/EA~true>>} }, -% 3Dbg .value_required:n = true, - 3Dbg .value_required:, + 3Dbg .value_required:n = {true}, 3Dlights .code:n = { \tl_gset:Nx\g_mix_opt_ls_tl{/LS<</Subtype/#1>>} }, -% 3Dlights .value_required:n = true, - 3Dlights .value_required:, + 3Dlights .value_required:n = {true}, 3Drender .code:n = { \regex_extract_once:nnNTF{ @@ -2144,14 +2109,12 @@ \tl_gset:Nx\g_mix_opt_rm_tl{/RM<</Subtype/#1>>} } }, -% 3Drender .value_required:n = true, - 3Drender .value_required:, + 3Drender .value_required:n = {true}, 3Dpsob .code:n = { \tl_gset:Nx\g_mix_opt_psob_tl{#1} }, -% 3Dpsob .value_required:n = true, - 3Dpsob .value_required:, + 3Dpsob .value_required:n = {true}, 3Dviews .code:n = { \file_if_exist:nTF{#1}{ @@ -2161,8 +2124,7 @@ \msg_error:nnx{media9}{file~not~found}{#1} } }, -% 3Dviews .value_required:n = true, - 3Dviews .value_required:, + 3Dviews .value_required:n = {true}, unknown .code:n = { \msg_error:nnx{media9}{unknown~option}{\l_keys_key_tl} @@ -2309,8 +2271,7 @@ } \tl_set:Nx\l_mix_coo_tl{#1} }, -% COO .value_required:n = true, - COO .value_required:, + COO .value_required:n = {true}, C2C .code:n = { \int_compare:nF{\l_mix_level_tl=\c_zero}{ @@ -2319,8 +2280,7 @@ } \tl_set:Nx\l_mix_ctoc_tl{#1} }, -% C2C .value_required:n = true, - C2C .value_required:, + C2C .value_required:n = {true}, C2W .code:n = { \int_compare:nF{\l_mix_level_tl=\c_zero}{ @@ -2330,8 +2290,7 @@ \tl_set:Nx\l_mix_ciiw_tl{#1} \bool_set_true:N\l_mix_ciiw_bool }, -% C2W .value_required:n = true, - C2W .value_required:, + C2W .value_required:n = {true}, ROO .code:n = { \int_compare:nF{\l_mix_level_tl=\c_zero}{ @@ -2343,8 +2302,7 @@ \fp_set:Nn\l_mix_roo_fp{1e-9}} \bool_set_true:N\l_mix_roo_bool }, -% ROO .value_required:n = true, - ROO .value_required:, + ROO .value_required:n = {true}, AAC .code:n = { \int_compare:nF{\l_mix_level_tl=\c_zero}{ @@ -2353,8 +2311,7 @@ } \fp_set:Nn\l_mix_aac_fp{#1} }, -% AAC .value_required:n = true, - AAC .value_required:, + AAC .value_required:n = {true}, ORTHO .code:n = { \int_compare:nF{\l_mix_level_tl=\c_zero}{ @@ -2381,8 +2338,7 @@ {PSOB}{a~VIEW} } }, -% PSOB .value_required:n = true, - PSOB .value_required:, + PSOB .value_required:n = {true}, ROLL .code:n = { \int_compare:nF{\l_mix_level_tl=\c_zero}{ @@ -2391,8 +2347,7 @@ } \fp_set:Nn\l_mix_roll_fp{#1} }, -% ROLL .value_required:n = true, - ROLL .value_required:, + ROLL .value_required:n = {true}, BGCOLOR .code:n = { \int_compare:nF{\l_mix_level_tl=\c_zero}{ @@ -2401,8 +2356,7 @@ } \tl_set:Nx\l_mix_bg_tl{/BG<</CS/DeviceRGB/C[#1]/EA~true>>} }, -% BGCOLOR .value_required:n = true, - BGCOLOR .value_required:, + BGCOLOR .value_required:n = {true}, LIGHTS .code:n = { \int_compare:nF{\l_mix_level_tl=\c_zero}{ @@ -2411,8 +2365,7 @@ } \tl_set:Nx\l_mix_ls_tl{/LS<</Subtype/#1>>} }, -% LIGHTS .value_required:n = true, - LIGHTS .value_required:, + LIGHTS .value_required:n = {true}, RENDERMODE .code:n = { \bool_if:nF{ @@ -2430,8 +2383,7 @@ \tl_set:Nx\l_mix_ndrm_tl{/RM<</Subtype/#1>>} %part (=node) render mode } }, -% RENDERMODE .value_required:n = true, - RENDERMODE .value_required:, + RENDERMODE .value_required:n = {true}, PARTSATTRS .choices:nn = {keep,restore}{ \int_compare:nF{\l_mix_level_tl=\c_zero}{ @@ -2445,8 +2397,7 @@ \tl_set:Nn\l_mix_nr_tl{/NR~true} } }, -% PARTSATTRS .value_required:n = true, - PARTSATTRS .value_required:, + PARTSATTRS .value_required:n = {true}, PART .code:n = { \int_compare:nF{\l_mix_level_tl=\c_zero}{ @@ -2496,8 +2447,7 @@ \tl_set:Nx\l_mix_csop_tl{/PO~#1} } }, -% OPACITY .value_required:n = true, - OPACITY .value_required:, + OPACITY .value_required:n = {true}, VISIBLE .choices:nn = {true,false}{ \bool_if:nF{ @@ -2534,8 +2484,7 @@ } \tl_set:Nx\l_mix_cspc_tl{/PC~[/DeviceRGB~#1]} }, -% PLANECOLOR .value_required:n = true, - PLANECOLOR .value_required:, + PLANECOLOR .value_required:n = {true}, INTERSECTIONCOLOR .code:n = { \int_compare:nF{\l_mix_level_tl=\c_two}{ @@ -2545,8 +2494,7 @@ } \tl_set:Nx\l_mix_csic_tl{/IC~[/DeviceRGB~#1]} }, -% INTERSECTIONCOLOR .value_required:n = true, - INTERSECTIONCOLOR .value_required:, + INTERSECTIONCOLOR .value_required:n = {true}, TRANSFORM .code:n = { \int_compare:nF{\l_mix_level_tl=\c_one}{ @@ -2560,8 +2508,7 @@ \tl_put_right:Nx\l_mix_ndtrans_tl{~\l_mix_tmpa_tl} } }, -% TRANSFORM .value_required:n = true, - TRANSFORM .value_required:, + TRANSFORM .value_required:n = {true}, CROSSSECT .code:n = { \int_compare:nF{\l_mix_level_tl=\c_zero}{ @@ -2582,8 +2529,7 @@ \tl_clear:N\l_mix_csic_tl %intersection colour \tl_clear:N\l_mix_csiv_tl %intersection visibility }, -% CROSSSECT .value_forbidden:n = true, - CROSSSECT .value_forbidden:, + CROSSSECT .value_forbidden:n = {true}, CENTER .code:n = { \int_compare:nF{\l_mix_level_tl=\c_two}{ @@ -2601,8 +2547,7 @@ \l_mix_z_tl } }, -% CENTER .value_required:n = true, - CENTER .value_required:, + CENTER .value_required:n = {true}, NORMAL .code:n = { \int_compare:nF{\l_mix_level_tl=\c_two}{ @@ -2622,8 +2567,7 @@ \tl_set:Nx\l_mix_rotz_tl{\fp_to_decimal:n{round((\l_mix_rotz_fp),9)}} \tl_set:Nx\l_mix_csorient_tl{null~\l_mix_roty_tl\space\l_mix_rotz_tl} }, -% NORMAL .value_required:n = true, - NORMAL .value_required:, + NORMAL .value_required:n = {true}, END .code:n = { \int_case:nnF{\l_mix_level_tl}{ @@ -2677,8 +2621,7 @@ {\g_mix_vfile_tl}{\int_use:N\l_mix_lineno_int} } }, -% END .value_forbidden:n = true, - END .value_forbidden:, + END .value_forbidden:n = {true}, } %options for \mediabutton command @@ -2710,24 +2653,21 @@ final .code:n = {}, tooltip .tl_gset_x:N = \g_mix_tooltip_tl, -% tooltip .value_required:n = true, - tooltip .value_required:, + tooltip .value_required:n = {true}, overface .code:n = { \hbox_set:Nn\l_mix_poster_box{#1} \mix_pdfxform:n{\l_mix_poster_box} \tl_gset:Nx\g_mix_overbtn_tl{\g_mix_pdflastxform_tl} }, -% overface .value_required:n = true, - overface .value_required:, + overface .value_required:n = {true}, downface .code:n = { \hbox_set:Nn\l_mix_poster_box{#1} \mix_pdfxform:n{\l_mix_poster_box} \tl_gset:Nx\g_mix_downbtn_tl{\g_mix_pdflastxform_tl} }, -% downface .value_required:n = true, - downface .value_required:, + downface .value_required:n = {true}, 3Dgotoview .code:n = { \tl_set:Nx\l_tmpa_tl{#1} %extract ref @@ -2778,8 +2718,7 @@ } } }, -% 3Dgotoview .value_required:n = true, - 3Dgotoview .value_required:, + 3Dgotoview .value_required:n = {true}, mediacommand .code:n = { \tl_set:Nx\l_tmpa_tl{#1} @@ -2830,8 +2769,7 @@ } } }, -% mediacommand .value_required:n = true, - mediacommand .value_required:, + mediacommand .value_required:n = {true}, jsaction .code:n = { \tl_set:Nx\l_tmpa_tl{#1} @@ -2880,8 +2818,7 @@ \tl_gput_right:Nx\g_mix_btnactions_tl{~\g_mix_pdflastobj_tl} } }, -% jsaction .value_required:n = true, - jsaction .value_required:, + jsaction .value_required:n = {true}, unknown .code:n = { \msg_error:nnx{media9}{unknown~option}{\l_keys_key_tl} diff --git a/Master/texmf-dist/tex/latex/media9/players/APlayer.swf b/Master/texmf-dist/tex/latex/media9/players/APlayer.swf Binary files differindex 970672bbe82..1d445003e6d 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/APlayer9.swf b/Master/texmf-dist/tex/latex/media9/players/APlayer9.swf Binary files differindex b4cdb5ea459..eb26630025c 100644 --- a/Master/texmf-dist/tex/latex/media9/players/APlayer9.swf +++ b/Master/texmf-dist/tex/latex/media9/players/APlayer9.swf 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 7a3cf6010e7..2a40d9f6821 100644 --- a/Master/texmf-dist/tex/latex/media9/players/VPlayer.swf +++ b/Master/texmf-dist/tex/latex/media9/players/VPlayer.swf diff --git a/Master/texmf-dist/tex/latex/media9/players/VPlayer9.swf b/Master/texmf-dist/tex/latex/media9/players/VPlayer9.swf Binary files differindex a09d8a37e22..b0ffbd85fb8 100644 --- a/Master/texmf-dist/tex/latex/media9/players/VPlayer9.swf +++ b/Master/texmf-dist/tex/latex/media9/players/VPlayer9.swf |