From c35c9486f380273670e736423123ae152d08f269 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 24 Jul 2017 20:54:03 +0000 Subject: media9 (24jul17) git-svn-id: svn://tug.org/texlive/trunk@44882 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/media9/ChangeLog | 6 ++++++ Master/texmf-dist/doc/latex/media9/media9.pdf | Bin 4518050 -> 3836555 bytes Master/texmf-dist/tex/latex/media9/media9.sty | 15 ++++++++------- Master/texmf-dist/tex/latex/media9/pdfbase.sty | 13 +++++++++---- 4 files changed, 23 insertions(+), 11 deletions(-) diff --git a/Master/texmf-dist/doc/latex/media9/ChangeLog b/Master/texmf-dist/doc/latex/media9/ChangeLog index 9b56fd25da7..f04faa92f26 100644 --- a/Master/texmf-dist/doc/latex/media9/ChangeLog +++ b/Master/texmf-dist/doc/latex/media9/ChangeLog @@ -1,3 +1,9 @@ +2017-07-24 + * v0.81 : media9.sty + * v0.15 : pdfbase.sty + * fix : replace some \bool_if:n(TF) because of their new greedy behaviour + implemented in expl3 + 2017-06-12 * v0.80 : media9.sty * fix : obsolete l3regex warning diff --git a/Master/texmf-dist/doc/latex/media9/media9.pdf b/Master/texmf-dist/doc/latex/media9/media9.pdf index 44e9192f176..3a83d885d0c 100644 Binary files a/Master/texmf-dist/doc/latex/media9/media9.pdf and b/Master/texmf-dist/doc/latex/media9/media9.pdf differ diff --git a/Master/texmf-dist/tex/latex/media9/media9.sty b/Master/texmf-dist/tex/latex/media9/media9.sty index 103ad7c2d80..174c029a8b7 100644 --- a/Master/texmf-dist/tex/latex/media9/media9.sty +++ b/Master/texmf-dist/tex/latex/media9/media9.sty @@ -39,8 +39,8 @@ \RequirePackage{xparse} \RequirePackage{atbegshi} -\def\g@mix@date@tl{2017/06/12} -\def\g@mix@version@tl{0.80} +\def\g@mix@date@tl{2017/07/24} +\def\g@mix@version@tl{0.81} \def\g@mix@liiikerneldate{2017/05/29} \def\g@mix@liiipkgdate{2017/05/29} @@ -411,7 +411,6 @@ \cs_new_nopar:Nn\mix_keytoaux_now:nn{ \iow_now:Nx\@mainaux{\token_to_str:N\mix@newkey{#1}{#2}} \bool_if:nT{ -% !\cs_if_exist_p:c{#1} || !\str_if_eq_x_p:nn{\tl_use:c{#1}}{#2} !\cs_if_exist:cTF{#1}{ \str_if_eq_x_p:nn{\tl_use:c{#1}}{#2} }{ @@ -2322,8 +2321,9 @@ \mix_pdfobj:nnn{}{dict}{ /S/JavaScript/JS~( try{\l_tmpb_tl}catch(e){console.show();console.println(e)})}} - \bool_if:nT{ - \tl_if_exist_p:c{ann@\l_tmpa_tl}&& + \bool_lazy_and:nnT{ + \tl_if_exist_p:c{ann@\l_tmpa_tl} + }{ !\str_if_eq_x_p:nn{\tl_use:c{ann@\l_tmpa_tl}}{draft} }{ \mix_pdfobj:nnn{}{dict}{ @@ -2338,8 +2338,9 @@ \tl_if_blank:VF\l_tmpb_tl{/Next~\mix_pdflastobj:} } } - \bool_if:nT{ - \tl_if_exist_p:c{ann@\l_tmpa_tl}&& + \bool_lazy_and:nnT{ + \tl_if_exist_p:c{ann@\l_tmpa_tl} + }{ !\str_if_eq_x_p:nn{\tl_use:c{ann@\l_tmpa_tl}}{draft}|| !\tl_if_blank_p:V\l_tmpb_tl }{ diff --git a/Master/texmf-dist/tex/latex/media9/pdfbase.sty b/Master/texmf-dist/tex/latex/media9/pdfbase.sty index b838a7859a3..63a9ea3edd0 100644 --- a/Master/texmf-dist/tex/latex/media9/pdfbase.sty +++ b/Master/texmf-dist/tex/latex/media9/pdfbase.sty @@ -130,8 +130,8 @@ \RequirePackage{expl3} \RequirePackage{l3keys2e} -\def\g@pbs@date@tl{2017/03/23} -\def\g@pbs@version@tl{0.14} +\def\g@pbs@date@tl{2017/07/24} +\def\g@pbs@version@tl{0.15} \ProvidesExplPackage{pdfbase}{\g@pbs@date@tl}{\g@pbs@version@tl} {driver independent access to low-level PDF features} @@ -248,8 +248,10 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \sys_if_output_pdf:TF{ %in LuaTeX-0.95.0, pdfTeX primitives got new names - \bool_if:nT{ - \sys_if_engine_luatex_p: && !\int_compare_p:n{\luatexversion<95} + \bool_lazy_and:nnT{ + \sys_if_engine_luatex_p: + }{ + !\int_compare_p:n{\luatexversion<95} }{ \cs_set_protected:Npn\pdfnames{\pdfextension~names~} \cs_set_protected:Npn\pdfobj{\pdfextension~obj~} @@ -434,6 +436,9 @@ } \int_new:N\g_pbs_obj_int %object ID \bool_if:NTF\g_pbs_dvipdfmx_bool{ %dvipdfmx/XeTeX + %suppress any annotation growth through (x)dvipdfmx option/config var `g' + \AtBeginDocument{\special{dvipdfmx:config~g~0}} + \cs_new_nopar:Nn\pbs_pdfobj:nnn{ \tl_if_blank:oTF{#1}{ \tl_set:Nx\l_pbs_usenum_tl{@pbs@obj\int_use:N\g_pbs_obj_int} -- cgit v1.2.3