summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/media9
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-05-15 20:37:51 +0000
committerKarl Berry <karl@freefriends.org>2019-05-15 20:37:51 +0000
commite6f1f0b04b754a629dbba27c6c05007db008f421 (patch)
treeaf0b9c4d2e4c07009ae93749b32f153c57369bd6 /Master/texmf-dist/tex/latex/media9
parentb1ddcad5d7aefd00e90cd808889f0ac4e20d3bfe (diff)
media9 (15may19)
git-svn-id: svn://tug.org/texlive/trunk@51135 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/media9')
-rw-r--r--Master/texmf-dist/tex/latex/media9/media9.sty48
-rw-r--r--Master/texmf-dist/tex/latex/media9/pdfbase.sty21
2 files changed, 28 insertions, 41 deletions
diff --git a/Master/texmf-dist/tex/latex/media9/media9.sty b/Master/texmf-dist/tex/latex/media9/media9.sty
index e2c4fcd66f4..bc9f81dea1c 100644
--- a/Master/texmf-dist/tex/latex/media9/media9.sty
+++ b/Master/texmf-dist/tex/latex/media9/media9.sty
@@ -32,13 +32,21 @@
%
% The Current Maintainer of this work is A. Grahn.
+%process non-detectable dvipdfmx driver for passing to expl3
+\RequirePackage{xkeyval}
+\DeclareOptionX{dvipdfmx}{%
+ \PassOptionsToPackage{dvipdfmx}{expl3}
+ \PassOptionsToPackage{dvipdfmx}{pdfbase}
+}
+\DeclareOptionX*{}\ProcessOptionsX*\relax %allow anything as an option
+
\RequirePackage{expl3}
\RequirePackage{l3keys2e}
\RequirePackage{xparse}
\RequirePackage{atbegshi}
-\def\g@mix@date@tl{2019/05/10}
-\def\g@mix@version@tl{0.98}
+\def\g@mix@date@tl{2019/05/15}
+\def\g@mix@version@tl{0.99}
\def\g@mix@liiikerneldate{2019/02/15}
\def\g@mix@liiipkgdate{2018/10/17}
@@ -49,33 +57,6 @@
\tl_gset_eq:NN\g_mix_date_tl\g@mix@date@tl
\tl_gset_eq:NN\g_mix_version_tl\g@mix@version@tl
-\cs_if_exist:NTF\msg_set:nnnn{
- \msg_set:nnnn{media9}{support~outdated}{
- Support~package~#1~too~old.
- }{
- Please~install~an~up~to~date~version~of~#1.\\
- Loading~media9~will~abort!
- }
-}{
- \PackageError{media9}{Support~package~expl3~too~old.}{
- Please~install~an~up~to~date~version~of~expl3.\\
- Loading~media9~will~abort!
- }
- \tex_endinput:D
-}
-\@ifpackagelater{expl3}{\g@mix@liiikerneldate}{}{
- \msg_error:nnn{media9}{support~outdated}{l3kernel}
- \tex_endinput:D
-}
-\@ifpackagelater{xparse}{\g@mix@liiipkgdate}{}{
- \msg_error:nnn{media9}{support~outdated}{l3packages}
- \tex_endinput:D
-}
-\@ifpackagelater{l3keys2e}{\g@mix@liiipkgdate}{}{
- \msg_error:nnn{media9}{support~outdated}{l3packages}
- \tex_endinput:D
-}
-
%package options
%unknown package option error message
@@ -137,14 +118,9 @@
}
\keys_define:nn{media9}{
- xetex .code:n = {
- \PassOptionsToPackage{xetex}{pdfbase}
- },
+ xetex .code:n = {}, %dummy
- dvipdfmx .code:n = {
- \PassOptionsToPackage{dvipdfmx}{pdfbase}
- \bool_gset_true:N\g_mix_dvipdfmx_bool
- },
+ dvipdfmx .code:n = {\bool_gset_true:N\g_mix_dvipdfmx_bool},
bigfiles .choice:,
bigfiles / true .code:n = {
diff --git a/Master/texmf-dist/tex/latex/media9/pdfbase.sty b/Master/texmf-dist/tex/latex/media9/pdfbase.sty
index 5e137ecfc31..d72aa09aa73 100644
--- a/Master/texmf-dist/tex/latex/media9/pdfbase.sty
+++ b/Master/texmf-dist/tex/latex/media9/pdfbase.sty
@@ -169,12 +169,23 @@
\RequirePackage{expl3}
\RequirePackage{l3keys2e}
-\def\g@pbs@date@tl{2019/05/10}
-\def\g@pbs@version@tl{0.29}
+\def\g@pbs@date@tl{2019/05/15}
+\def\g@pbs@version@tl{0.30}
\ProvidesExplPackage{pdfbase}{\g@pbs@date@tl}{\g@pbs@version@tl}
{driver independent access to low-level PDF features}
+\msg_set:nnnn{pdfbase}{support~outdated}{
+ Support~package~`#1'~too~old.
+}{
+ Get~an~up~to~date~version~of~`#1'.\\
+ Aborting.
+}
+\@ifpackagelater{expl3}{2019/05/09}{}{
+ \msg_error:nnn{pdfbase}{support~outdated}{expl3.sty}
+ \tex_endinput:D
+}
+
\int_new:N\g_pbs_page_int %abs. page counter
%creating global definitions
@@ -638,9 +649,9 @@
\begin{picture}(0,0)
\put(0,0){
\special{pdf:bxobj~@pbs@obj\int_use:N\g_pbs_obj_int\space
- width\space \dim_use:N\box_wd:N#5\space
- height\space\dim_use:N\box_ht:N#5\space
- depth\space \dim_use:N\box_dp:N#5
+ width~\dim_eval:n{\box_wd:N#5}~
+ height~\space\dim_eval:n{\box_ht:N#5}~
+ depth~\space \dim_eval:n{\box_dp:N#5}
}
\box_use:N#5
\tl_clear:N\l_tmpa_tl{}