4 files changed, 16 insertions, 23 deletions
diff --git a/Master/texmf-dist/doc/latex/media9/ChangeLog b/Master/texmf-dist/doc/latex/media9/ChangeLog
index 3d190ba787d..e82b6ab0172 100644
--- a/Master/texmf-dist/doc/latex/media9/ChangeLog
+++ b/Master/texmf-dist/doc/latex/media9/ChangeLog
@@ -1,3 +1,8 @@
+2019-11-04
+	* v1.04 : media9.sty
+	* v0.35 : pdfbase.sty
+	* fix : output driver set-up
+
 2019-09-30
 	* v1.03 : media9.sty
 	* v0.34 : pdfbase.sty
diff --git a/Master/texmf-dist/doc/latex/media9/media9.pdf b/Master/texmf-dist/doc/latex/media9/media9.pdf
index bac0d6c043e..691819ce4b7 100644
--- a/Master/texmf-dist/doc/latex/media9/media9.pdf
+++ b/Master/texmf-dist/doc/latex/media9/media9.pdf
diff --git a/Master/texmf-dist/tex/latex/media9/media9.sty b/Master/texmf-dist/tex/latex/media9/media9.sty
index 396b84a60bc..7d349864847 100644
--- a/Master/texmf-dist/tex/latex/media9/media9.sty
+++ b/Master/texmf-dist/tex/latex/media9/media9.sty
@@ -32,21 +32,13 @@
 %
 % The Current Maintainer of this work is A. Grahn.
 
-%process non-detectable dvipdfmx driver for passing to expl3
-\RequirePackage{xkeyval}
-\DeclareOptionX{dvipdfmx}{%
-  \PassOptionsToPackage{dvipdfmx}{pdfbase}
-  \PassOptionsToPackage{driver=dvipdfmx}{expl3}
-}
-\DeclareOptionX*{}\ProcessOptionsX*\relax %allow anything as an option
-
 \RequirePackage{expl3}
 \RequirePackage{l3keys2e}
 \RequirePackage{xparse}
 \RequirePackage{atbegshi}
 
-\def\g@mix@date@tl{2019/09/30}
-\def\g@mix@version@tl{1.03}
+\def\g@mix@date@tl{2019/11/04}
+\def\g@mix@version@tl{1.04}
 
 \ProvidesExplPackage{media9}{\g@mix@date@tl}{\g@mix@version@tl}
 {acrobat-9/X compatible media}
@@ -117,7 +109,13 @@
 \keys_define:nn{media9}{
   xetex .code:n = {}, %dummy
 
-  dvipdfmx .code:n = {\bool_gset_true:N\g_mix_dvipdfmx_bool},
+  dvipdfmx .choice:,
+  dvipdfmx / true .code:n = {
+    \bool_gset_true:N\g_mix_dvipdfmx_bool
+    \PassOptionsToPackage{dvipdfmx}{pdfbase}
+  },
+  dvipdfmx / false .code:n = {\bool_gset_false:N\g_mix_dvipdfmx_bool},
+  dvipdfmx .default:n = {true},
 
   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 788dbe90a26..6e84cf4f913 100644
--- a/Master/texmf-dist/tex/latex/media9/pdfbase.sty
+++ b/Master/texmf-dist/tex/latex/media9/pdfbase.sty
@@ -156,21 +156,11 @@
 %
 % The Current Maintainer of this work is A. Grahn.
 
-%process non-detectable driver options for passing to expl3
-\RequirePackage{xkeyval}
-\DeclareOptionX{dvipdfmx}{%
-  \PassOptionsToPackage{driver=dvipdfmx}{expl3}
-}
-\DeclareOptionX{dvisvgm}{%
-  \PassOptionsToPackage{driver=dvisvgm}{expl3}
-}
-\DeclareOptionX*{}\ProcessOptionsX*\relax %allow anything as an option
-
 \RequirePackage{expl3}
 \RequirePackage{l3keys2e}
 
-\def\g@pbs@date@tl{2019/09/30}
-\def\g@pbs@version@tl{0.34}
+\def\g@pbs@date@tl{2019/11/04}
+\def\g@pbs@version@tl{0.35}
 
 \ProvidesExplPackage{pdfbase}{\g@pbs@date@tl}{\g@pbs@version@tl}
 {driver independent access to low-level PDF features}