From e92268ff9f8d322970ba9adc951a9ebcee5a26a6 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 26 Jul 2012 00:14:41 +0000 Subject: media9 (25jul12) git-svn-id: svn://tug.org/texlive/trunk@27158 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/media9/media9.sty | 53 +++++++++++++++++++++------ 1 file changed, 42 insertions(+), 11 deletions(-) (limited to 'Master/texmf-dist/tex/latex/media9/media9.sty') diff --git a/Master/texmf-dist/tex/latex/media9/media9.sty b/Master/texmf-dist/tex/latex/media9/media9.sty index 0bfae338326..23ab9aede01 100644 --- a/Master/texmf-dist/tex/latex/media9/media9.sty +++ b/Master/texmf-dist/tex/latex/media9/media9.sty @@ -34,13 +34,46 @@ % % The Current Maintainer of this work is A. Grahn. +% TODO (expl3 changes until end of 2012) +%\prg_case_dim:nnn => \dim_case:nnn +%\prg_case_int:nnn => \int_case:nnn +%\prg_case_str:nnn => \str_case:nnn +%\prg_case_str:onn => \str_case:onn +%\prg_case_tl:Nnn => \tl_case:Nnn +% +%\prg_stepwise_function:nnnN => \int_step_function:nnnN +%\prg_stepwise_inline:nnnn => \int_step_inline:nnnn +%\prg_stepwise_variable:nnnNn => \int_step_variable:nnnNn +% +%\str_if_eq:xx(TF) => \str_if_eq_x:nn(TF) +% +%\prg_case_str:xxn => \str_case_x:nnn +% +%\tl_if_empty:x(TF) {#1} => \str_if_eq_x:nn(TF) { } {#1} +% +%\fp_(g)abs:(N|c) +%\fp_(g)neg:(N|c) +%\fp_(g)mul:(N|c)n +%\fp_(g)div:(N|c)n +%\fp_(g)sin:(N|c)n +%\fp_(g)cos:(N|c)n +%\fp_(g)tan:(N|c)n +%\fp_(g)exp:(N|c)n +%\fp_(g)ln:(N|c)n +%\fp_(g)pow:(N|c)n +%\fp_(g)round_figures:(N|c)n +%\fp_(g)round_places:(N|c)n +%\fp_if_zero:(N|c)(TF) +%\fp_if_undefined:(N|c)(TF) +%\c_undefined_fp + \RequirePackage{expl3} \RequirePackage{xparse} \RequirePackage{l3keys2e} \RequirePackage{ifpdf} -\def\g@mix@date@tl{2012/05/02} -\def\g@mix@version@tl{0.7} +\def\g@mix@date@tl{2012/07/24} +\def\g@mix@version@tl{0.8} \ProvidesExplPackage{media9}{\g@mix@date@tl}{\g@mix@version@tl} {acrobat-9 compatible media} @@ -61,15 +94,15 @@ } \tex_endinput:D } -\@ifpackagelater{expl3}{2011/09/08}{}{ +\@ifpackagelater{expl3}{2012/07/16}{}{ \msg_error:nnx{media9}{support~outdated}{l3kernel} \tex_endinput:D } -\@ifpackagelater{xparse}{2011/09/08}{}{ +\@ifpackagelater{xparse}{2012/07/16}{}{ \msg_error:nnx{media9}{support~outdated}{l3packages} \tex_endinput:D } -\@ifpackagelater{l3keys2e}{2011/09/08}{}{ +\@ifpackagelater{l3keys2e}{2012/07/16}{}{ \msg_error:nnx{media9}{support~outdated}{l3packages} \tex_endinput:D } @@ -521,11 +554,6 @@ \special{ps:~mark~\l_mix_usenum_tl~0~[#3]/PUTINTERVAL~pdfmark~} } {stream}{\special{ps:~mark~\l_mix_usenum_tl~(#3)/PUT~pdfmark~}} -% {fstream}{ -% \special{ps:~ -% mark~\l_mix_usenum_tl~{(#3)~(r)~file}?pdfmark~/PUT~pdfmark~ -% } -% } {fstream}{ \tl_set:Nn\l_mix_offset_tl{0} \tl_set:Nx\l_mix_fsize_tl{\mix_filesize:n{#3}} @@ -969,6 +997,7 @@ \tl_set:Nn\l_mix_level_tl{\c_minus_one} \int_zero:N\l_mix_viewcnt_int \int_zero:N\l_mix_lineno_int + \ior_new:N\l_mix_vfile_stream \ior_open:Nn\l_mix_vfile_stream{\g_mix_vfile_tl} \group_begin: @@ -1143,7 +1172,9 @@ % * to show at most 9 places after `.' % * trailing zeros removed \cs_new_protected:Nn\mix_format_num:N{ - \tl_set:Nx#1{\exp_after:wN\mix_format_num:w#1\q_stop} + \fp_compare:nNnF{#1}={\fp_to_int:n{#1}}{ + \tl_set:Nx#1{\exp_after:wN\mix_format_num:w#1\q_stop} + } } \cs_new:Npn\mix_format_num:w#1.#2\q_stop{ #1.\exp_after:wN\mix_trim_places:w#2000000000\q_stop -- cgit v1.2.3