ocgx2 (4nov19)

git-svn-id: svn://tug.org/texlive/trunk@52639 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 37 insertions, 27 deletions

diff --git a/Master/texmf-dist/doc/latex/ocgx2/ChangeLog b/Master/texmf-dist/doc/latex/ocgx2/ChangeLog
index 947383cc655..98b07f750cb 100644
--- a/Master/texmf-dist/doc/latex/ocgx2/ChangeLog
+++ b/Master/texmf-dist/doc/latex/ocgx2/ChangeLog
@@ -1,3 +1,8 @@
+2019-11-04
+	* v0.47: ocgx2.sty
+	* v0.17: ocgx2.sty
+	* fix: 2020 deprecations (fixocgx.sty)
+
 2019-10-01
 	* v0.46: ocgx2.sty
 	* fix: 2020 deprecations (fixocgx.sty)
diff --git a/Master/texmf-dist/tex/latex/ocgx2/ocgbase.sty b/Master/texmf-dist/tex/latex/ocgx2/ocgbase.sty
index fd1abcfc3a4..8b43adea539 100644
--- a/Master/texmf-dist/tex/latex/ocgx2/ocgbase.sty
+++ b/Master/texmf-dist/tex/latex/ocgx2/ocgbase.sty
@@ -92,23 +92,39 @@
 %
 % The Current Maintainer of this work is A. Grahn.
 
-%process non-detectable dvipdfmx driver for passing to expl3
-\RequirePackage{xkeyval}
-\DeclareOptionX{dvipdfmx}{%
-  \PassOptionsToPackage{driver=dvipdfmx}{expl3}
-  \PassOptionsToPackage{dvipdfmx}{pdfbase}
-}
-\DeclareOptionX*{}\ProcessOptionsX*\relax %allow anything as an option
-
-\RequirePackage{pdfbase}
 \RequirePackage{expl3}
+\RequirePackage{l3keys2e}
 
-\def\g@ocgbase@date@tl{2019/07/04}
-\def\g@ocgbase@version@tl{0.16}
+\def\g@ocgbase@date@tl{2019/11/04}
+\def\g@ocgbase@version@tl{0.17}
 
 \ProvidesExplPackage{ocgbase}{\g@ocgbase@date@tl}{\g@ocgbase@version@tl}
 {support package for ocgx2.sty}
 
+%package options
+
+%unknown package option error message
+\msg_set:nnnn{ocgbase}{unknown~package~option}{Unknown~package~option~`#1'.}{
+  Package option~'#1'~is~unknown;\\
+  perhaps~it~is~spelled~incorrectly.
+}
+
+\keys_define:nn{ocgbase}{
+  xetex .code:n = {}, %dummy
+
+  dvipdfmx .choice:,
+  dvipdfmx / true .code:n = {\PassOptionsToPackage{dvipdfmx}{pdfbase}},
+  dvipdfmx / false .code:n = {},
+  dvipdfmx .default:n = {true},
+
+  unknown .code:n = {
+    \msg_error:nnx{ocgbase}{unknown~package~option}{\l_keys_key_tl}
+  }
+}
+\ProcessKeysOptions{ocgbase}
+
+\RequirePackage{pdfbase}
+
 \msg_set:nnnn{ocgbase}{support~outdated}{
   Support~package~`#1'~too~old.
 }{
diff --git a/Master/texmf-dist/tex/latex/ocgx2/ocgx2.sty b/Master/texmf-dist/tex/latex/ocgx2/ocgx2.sty
index 564c032e98c..84d7cc855fb 100644
--- a/Master/texmf-dist/tex/latex/ocgx2/ocgx2.sty
+++ b/Master/texmf-dist/tex/latex/ocgx2/ocgx2.sty
@@ -37,19 +37,11 @@
 %
 % The Current Maintainer of this work is A. Grahn.
 
-%process non-detectable dvipdfmx driver for passing to expl3
-\RequirePackage{xkeyval}
-\DeclareOptionX{dvipdfmx}{%
-  \PassOptionsToPackage{dvipdfmx}{ocgbase}
-  \PassOptionsToPackage{driver=dvipdfmx}{expl3}
-}
-\DeclareOptionX*{}\ProcessOptionsX*\relax %allow anything as an option
-
 \RequirePackage{xparse}
 \RequirePackage{l3keys2e}
 
-\def\g@ocgxii@date@tl{2019/10/01}
-\def\g@ocgxii@version@tl{0.46}
+\def\g@ocgxii@date@tl{2019/11/04}
+\def\g@ocgxii@version@tl{0.47}
 
 \ProvidesExplPackage{ocgx2}{\g@ocgxii@date@tl}{\g@ocgxii@version@tl}
 {ports `ocgx' functionality to dvips+ps2pdf, xelatex and dvipdfmx}
@@ -103,11 +95,10 @@
 \bool_new:N\l_ocgxii_showingui_bool
 
 \keys_define:nn{ocgx2}{
-  xetex .code:n = {
-    \PassOptionsToPackage{xetex}{pdfbase}
-  },
+  xetex .code:n = {}, %dummy
 
   dvipdfmx .code:n = {
+    \PassOptionsToPackage{dvipdfmx}{ocgbase}
     \PassOptionsToPackage{dvipdfmx}{pdfbase}
     \bool_gset_true:N\g_ocgxii_dvipdfmx_bool
   },
@@ -167,9 +158,7 @@
 
 %process package options
 \ProcessKeysOptions{ocgx2}
-\sys_if_engine_xetex:T{
-  \bool_gset_true:N\g_ocgxii_dvipdfmx_bool
-}
+\sys_if_engine_xetex:T{\bool_gset_true:N\g_ocgxii_dvipdfmx_bool}
 
 \RequirePackage{ocgbase} %also loads pdfbase.sty