ocgx2 (26jan21)

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

2 files changed, 11 insertions, 9 deletions

diff --git a/Master/texmf-dist/tex/latex/ocgx2/ocgbase.sty b/Master/texmf-dist/tex/latex/ocgx2/ocgbase.sty
index 8b43adea539..7c97c37ab04 100644
--- a/Master/texmf-dist/tex/latex/ocgx2/ocgbase.sty
+++ b/Master/texmf-dist/tex/latex/ocgx2/ocgbase.sty
@@ -92,11 +92,10 @@
 %
 % The Current Maintainer of this work is A. Grahn.
 
-\RequirePackage{expl3}
 \RequirePackage{l3keys2e}
 
-\def\g@ocgbase@date@tl{2019/11/04}
-\def\g@ocgbase@version@tl{0.17}
+\def\g@ocgbase@date@tl{2021/01/25}
+\def\g@ocgbase@version@tl{0.18}
 
 \ProvidesExplPackage{ocgbase}{\g@ocgbase@date@tl}{\g@ocgbase@version@tl}
 {support package for ocgx2.sty}
@@ -139,7 +138,7 @@
 \tl_new:N\g_ocgbase_ocgs_tl %takes ocg object refs
 \seq_new:N\g_ocgbase_offocgs_seq
 
-\pbs_at_end_dvi:n{
+\AddToHook{shipout/lastpage}{
   \tl_if_empty:NF\g_ocgbase_ocgs_tl{
     %global OCG array
     \pbs_pdfobj:nnn{}{array}{\g_ocgbase_ocgs_tl}
diff --git a/Master/texmf-dist/tex/latex/ocgx2/ocgx2.sty b/Master/texmf-dist/tex/latex/ocgx2/ocgx2.sty
index a0dce3b5007..470057f619f 100644
--- a/Master/texmf-dist/tex/latex/ocgx2/ocgx2.sty
+++ b/Master/texmf-dist/tex/latex/ocgx2/ocgx2.sty
@@ -37,11 +37,10 @@
 %
 % The Current Maintainer of this work is A. Grahn.
 
-\RequirePackage{xparse}
 \RequirePackage{l3keys2e}
 
-\def\g@ocgxii@date@tl{2020/06/11}
-\def\g@ocgxii@version@tl{0.49}
+\def\g@ocgxii@date@tl{2021/01/25}
+\def\g@ocgxii@version@tl{0.50}
 
 \ProvidesExplPackage{ocgx2}{\g@ocgxii@date@tl}{\g@ocgxii@version@tl}
 {ports `ocgx' functionality to dvips+ps2pdf, xelatex and dvipdfmx}
@@ -1255,16 +1254,20 @@
         /Export<</ExportState/OFF>>
       }{on}
       \tl_gset:cx{ocgxii_ocg_OCView}{\ocgbase_last_ocg:}
+      \ocgbase_add_ocg_to_radiobtn_grp:nn{OCPrintViewGrp}{\ocgbase_last_ocg:}
       %in case somebody wants to reopen with \begin{ocg}...
       \tl_gset:cx{ocgxii_ocg_OCView.opts}{
-        showingui=never,printocg=never,exportocg=never}
+        showingui=never,printocg=never,exportocg=never,
+        radiobtngrp=OCPrintViewGrp}
       \ocgbase_new_ocg:nnn{OCPrint}{
         /Print<</PrintState/ON>>
         /Export<</ExportState/ON>>
       }{off}
       \tl_gset:cx{ocgxii_ocg_OCPrint}{\ocgbase_last_ocg:}
+      \ocgbase_add_ocg_to_radiobtn_grp:nn{OCPrintViewGrp}{\ocgbase_last_ocg:}
       \tl_gset:cx{ocgxii_ocg_OCPrint.opts}{
-        showingui=never,printocg=always,exportocg=always}
+        showingui=never,printocg=always,exportocg=always,
+        radiobtngrp=OCPrintViewGrp}
       \ocgxii_enable_ocglinks:
       \iow_now:Nx\@mainaux{
         \token_to_str:N\ocgxii@newkey{ocgx2.ocg.OCView}{