From 0bce358db40e51664ec58f62a15557154ee1e12a Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 2 Nov 2015 22:03:12 +0000 Subject: media9 (2nov15) git-svn-id: svn://tug.org/texlive/trunk@38765 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/media9/ChangeLog | 5 +++ Master/texmf-dist/doc/latex/media9/media9.pdf | Bin 3606048 -> 3605528 bytes Master/texmf-dist/tex/latex/media9/media9.sty | 10 ++--- Master/texmf-dist/tex/latex/media9/pdfbase.sty | 50 +++++++++++++++++++------ 4 files changed, 47 insertions(+), 18 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/media9/ChangeLog b/Master/texmf-dist/doc/latex/media9/ChangeLog index 29cd11a17f9..d9ed7987070 100644 --- a/Master/texmf-dist/doc/latex/media9/ChangeLog +++ b/Master/texmf-dist/doc/latex/media9/ChangeLog @@ -1,3 +1,8 @@ +2015-11-02 + * v0.60 (media9.sty) + * v0.2 (pdfbase.sty) + * fix: improved compatibility with ocgbase.sty + 2015-10-28 * v0.59 (media9.sty) * v0.1 (pdfbase.sty) diff --git a/Master/texmf-dist/doc/latex/media9/media9.pdf b/Master/texmf-dist/doc/latex/media9/media9.pdf index e347dff1ff1..5d03589c3d5 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 c690316b564..9bf6926a2b8 100644 --- a/Master/texmf-dist/tex/latex/media9/media9.sty +++ b/Master/texmf-dist/tex/latex/media9/media9.sty @@ -41,8 +41,8 @@ \RequirePackage{atbegshi} \RequirePackage{atenddvi} -\def\g@mix@date@tl{2015/10/28} -\def\g@mix@version@tl{0.59} +\def\g@mix@date@tl{2015/11/02} +\def\g@mix@version@tl{0.60} \def\g@mix@liiikerneldate{2015/09/27} \def\g@mix@liiipkgdate{2015/09/27} @@ -326,8 +326,6 @@ \cs_new_eq:NN\mix_pdfxform:n \pbs_pdfxform:n \cs_new_eq:NN\mix_pdfximage:n \pbs_pdfximage:n \cs_new_eq:NN\mix_pdfcatalog:n \pbs_pdfcatalog:n -\cs_new_eq:NN\mix_pdfbdc:nn \pbs_pdfbdc:nn -\cs_new_eq:NN\mix_pdfemc: \pbs_pdfemc: \cs_set_eq:NN\mix_pdflastobj: \pbs_pdflastobj: \cs_set_eq:NN\mix_pdflastann: \pbs_pdflastann: @@ -1215,9 +1213,9 @@ \hbox_to_wd:nn{\g_mix_wd_tl}{ \vbox_to_ht:nn{\g_mix_tt_tl}{ \vss - \mix_pdfbdc:nn{/OC}{\g_mix_btnocg_tl} + \ocgbase_oc_bdc:n{\g_mix_btnocg_tl} \box_use:N\l_mix_pbtn_box - \mix_pdfemc: + \ocgbase_oc_emc: } } } diff --git a/Master/texmf-dist/tex/latex/media9/pdfbase.sty b/Master/texmf-dist/tex/latex/media9/pdfbase.sty index b736a571417..9d4715256b5 100644 --- a/Master/texmf-dist/tex/latex/media9/pdfbase.sty +++ b/Master/texmf-dist/tex/latex/media9/pdfbase.sty @@ -99,11 +99,12 @@ % The Current Maintainer of this work is A. Grahn. \RequirePackage{expl3} +\RequirePackage{l3regex} \RequirePackage{l3keys2e} -\RequirePackage{atbegshi} +\RequirePackage{atenddvi} -\def\g@pbs@date@tl{2015/10/28} -\def\g@pbs@version@tl{0.1} +\def\g@pbs@date@tl{2015/11/02} +\def\g@pbs@version@tl{0.2} \ProvidesExplPackage{pdfbase}{\g@pbs@date@tl}{\g@pbs@version@tl} {driver independent access to low-level PDF features} @@ -132,6 +133,7 @@ \bool_new:N\g_pbs_pkgbigfiles_bool \bool_new:N\g_pbs_dvipdfmx_bool +\bool_new:N\g_pbs_twocolumn_bool \keys_define:nn{pdfbase}{ xetex .bool_gset:N = \g_pbs_dvipdfmx_bool, @@ -144,7 +146,9 @@ unknown .code:n = { \msg_error:nnx{pdfbase}{unknown~package~option}{\l_keys_key_tl} - } + }, + + twocolumn .bool_gset:N = \g_pbs_twocolumn_bool } \ProcessKeysOptions{pdfbase} \sys_if_engine_xetex:T{\bool_gset_true:N\g_pbs_dvipdfmx_bool} @@ -207,25 +211,47 @@ \cs_new:Nn\pbs_pdfcatalog:n{\pdfcatalog{#1}} \int_new:N\g_pbs_oc_int % object ID + \cs_new:Nn\pbs_pdfbdc:nn{ \pdfliteral~direct~{#1/rm@oc\int_use:N\g_pbs_oc_int\space BDC} - \tl_if_empty:NTF\@anim@ocmap{ - \tl_gset:cx{@anim@ocmap}{/rm@oc\int_use:N\g_pbs_oc_int\space#2} + \tl_if_empty:NTF\g_pbs_ocmap_tl{ + \tl_gset:Nx\g_pbs_ocmap_tl{/rm@oc\int_use:N\g_pbs_oc_int\space#2} }{ - \tl_gput_right:cx{@anim@ocmap}{~/rm@oc\int_use:N\g_pbs_oc_int\space#2} + \tl_gput_right:Nx\g_pbs_ocmap_tl{~/rm@oc\int_use:N\g_pbs_oc_int\space#2} } + \tl_set:Nx\l_pbs_pdfpageresources_tl{\the\pdfpageresources} + \regex_replace_all:NnN\l_pbs_regex{}\l_pbs_pdfpageresources_tl \group_begin: \tl_set:Nx\l_pbs_temp_tl{\group_end: - \global\pdfpageresources{\the\pdfpageresources - /Properties<<\@anim@ocmap>> + \global\pdfpageresources{ + \l_pbs_pdfpageresources_tl + /Properties<<\g_pbs_ocmap_tl>> } }\l_pbs_temp_tl \int_gincr:N\g_pbs_oc_int } - \tl_if_exist:cF{@anim@ocmap}{ - \tl_gset:cn{@anim@ocmap}{} - \AtBeginShipout{\tl_gset:cn{@anim@ocmap}{}} + \tl_new:N\g_pbs_ocmap_tl + \regex_const:Nn\l_pbs_regex{\/Properties<<(?:\s*\/rm@oc[^R]+R\s*)+>>} + + %modify output routine to purge \pdfpageresources from OCG properties + \int_new:N\g_pbs_columns_int + \tl_gset:Nx\g_pbs_output_tl{\the\output} + \global\output{ + \g_pbs_output_tl + \int_gincr:N\g_pbs_columns_int + \bool_if:nT{ + !\g_pbs_twocolumn_bool || \int_if_even_p:n{\int_use:N\g_pbs_columns_int} + }{ + \tl_gclear:N\g_pbs_ocmap_tl + \tl_set:Nx\l_pbs_pdfpageresources_tl{\the\pdfpageresources} + \regex_replace_all:NnN\l_pbs_regex{}\l_pbs_pdfpageresources_tl + \group_begin: + \tl_set:Nx\l_pbs_temp_tl{\group_end: + \global\pdfpageresources{\l_pbs_pdfpageresources_tl} + }\l_pbs_temp_tl + } } + \cs_new:Nn\pbs_pdfemc:{\pdfliteral~direct~{EMC}} }{ %pgf + transparency related settings -- cgit v1.2.3