From 0da7899076450108cd78b6c32594806ad926873a Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 9 Jun 2016 22:52:34 +0000 Subject: media9 (8jun16) git-svn-id: svn://tug.org/texlive/trunk@41328 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/media9/media9.sty | 15 ++++++++---- Master/texmf-dist/tex/latex/media9/pdfbase.sty | 33 ++++++++++++++++++++++---- 2 files changed, 39 insertions(+), 9 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/latex/media9/media9.sty b/Master/texmf-dist/tex/latex/media9/media9.sty index d8c1b4b4d14..53a048902ff 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{2016/03/22} -\def\g@mix@version@tl{0.68} +\def\g@mix@date@tl{2016/06/08} +\def\g@mix@version@tl{0.69} \def\g@mix@liiikerneldate{2015/09/27} \def\g@mix@liiipkgdate{2015/09/27} @@ -379,10 +379,15 @@ }{ \sys_if_engine_luatex:TF{ \RequirePackage{pdftexcmds} - \cs_new:Nn\mix_filemdfivesum:n{\pdf@filemdfivesum{#1}} - \cs_new:Nn\mix_unescapehex:n{<#1>} + \cs_new_nopar:Nn\mix_filemdfivesum:n{\pdf@filemdfivesum{#1}} + %\cs_new:Nn\mix_unescapehex:n{<#1>} + \cs_new_nopar:Nn\mix_unescapehex:n{(\pdf@unescapehex{#1})} }{ - \cs_new:Nn\mix_filemdfivesum:n{#1} + \cs_if_exist:NTF\mdfivesum{ + \cs_new_nopar:Nn\mix_filemdfivesum:n{\mdfivesum file {#1}} + }{ + \cs_new_nopar:Nn\mix_filemdfivesum:n{#1} + } } } diff --git a/Master/texmf-dist/tex/latex/media9/pdfbase.sty b/Master/texmf-dist/tex/latex/media9/pdfbase.sty index 35ddc0685ca..c01bb2b2076 100644 --- a/Master/texmf-dist/tex/latex/media9/pdfbase.sty +++ b/Master/texmf-dist/tex/latex/media9/pdfbase.sty @@ -124,8 +124,8 @@ \RequirePackage{atbegshi} \RequirePackage{atenddvi} -\def\g@pbs@date@tl{2016/03/22} -\def\g@pbs@version@tl{0.8} +\def\g@pbs@date@tl{2016/06/08} +\def\g@pbs@version@tl{0.9} \ProvidesExplPackage{pdfbase}{\g@pbs@date@tl}{\g@pbs@version@tl} {driver independent access to low-level PDF features} @@ -178,6 +178,31 @@ %commands for creating PDF objects, annots etc. %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \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} + }{ + \cs_set_protected:Npn\pdfnames{\pdfextension~names~} + \cs_set_protected:Npn\pdfobj{\pdfextension~obj~} + \cs_set_protected:Npn\pdfrefobj{\pdfextension~refobj~} + \cs_set_protected:Npn\pdfannot{\pdfextension~annot~} + \cs_set_protected:Npn\pdfstartlink{\pdfextension~startlink~} + \cs_set_protected:Npn\pdfendlink{\pdfextension~endlink\relax} + \cs_set_protected:Npn\pdfliteral{\pdfextension~literal~} + \cs_set_protected:Npn\pdfcatalog{\pdfextension~catalog~} + \cs_set:Npn\pdflastlink{\numexpr\pdffeedback~lastlink\relax} + \cs_set:Npn\pdflastobj{\numexpr\pdffeedback~lastobj\relax} + \cs_set:Npn\pdflastannot{\numexpr\pdffeedback~lastannot\relax} + \cs_set:Npn\pdfpageref{\numexpr\pdffeedback~pageref\relax} + \cs_set:Npx\pdfpageresources{\pdfvariable~pageresources} + \cs_set_eq:NN\pdfximage\saveimageresource + \cs_set_eq:NN\pdfrefximage\useimageresource + \cs_set_eq:NN\pdflastximage\lastsavedimageresourceindex + \cs_set_eq:NN\pdflastximagepages\lastsavedimageresourcepages + \cs_set_eq:NN\pdfxform\saveboxresource + \cs_set_eq:NN\pdfrefxform\useboxresource + \cs_set_eq:NN\pdflastxform\lastsavedboxresourceindex + } %helper func to remove `0 R' part from pdf obj reference \cs_new_nopar:Nn\pbs_reftonum:n{\_pbs_reftonum:f{#1}} \cs_new_nopar:Nn\_pbs_reftonum:n{\exp_after:wN\_pbs_reftonum:w#1} @@ -283,7 +308,7 @@ \cs_new_nopar:Nn\pbs_pdfemc:{\pdfliteral~page~{EMC}} - %modify output routine to strip OCG properties from \pdfpageresources + %modify output routine to strip /Properties<<...>> from \pdfpageresources \AtBeginShipout{\tl_gclear:N\g_pbs_ocmap_tl} \tl_gset:Nx\g_pbs_output_tl{\the\output} \global\output{ @@ -673,7 +698,7 @@ \tl_new:N\g_pbs_dpiwarned_tl \AtEndDvi{\special{ps::[nobreak]\pbs_dpiwarning:}} } - }{%Form XObject to be inserted using \SP pdfmark: + }{%Form XObject to be inserted using /SP pdfmark: %The /SP pdfmark for placement of Form XObjects works reliably only %since gs-9.14. As gs-9.14 had some other TeX-related issues, we %require 9.15. -- cgit v1.2.3