summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-06-11 19:54:04 +0000
committerKarl Berry <karl@freefriends.org>2021-06-11 19:54:04 +0000
commitb3bc3d37bd31f552e18fb0e635164e5e95441e13 (patch)
treec72e036995fdc62163e17fb2dd6424922b09db7f
parentcfb98cfa117d8595b40e733a00935497149da38c (diff)
ocgx2 (11jun21)
git-svn-id: svn://tug.org/texlive/trunk@59559 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/ocgx2/ChangeLog5
-rw-r--r--Master/texmf-dist/tex/latex/ocgx2/ocgbase.sty12
-rw-r--r--Master/texmf-dist/tex/latex/ocgx2/ocgx2.sty19
3 files changed, 24 insertions, 12 deletions
diff --git a/Master/texmf-dist/doc/latex/ocgx2/ChangeLog b/Master/texmf-dist/doc/latex/ocgx2/ChangeLog
index 244ce66c956..4b91f95c790 100644
--- a/Master/texmf-dist/doc/latex/ocgx2/ChangeLog
+++ b/Master/texmf-dist/doc/latex/ocgx2/ChangeLog
@@ -1,3 +1,8 @@
+2021-06-11
+ * v0.52: ocgx2.sty
+ * v0.20: ocgbase.sty
+ * fix: incomplete \ifx when pdfmanagement-testphase was not enabled
+
2021-06-03
* v0.51: ocgx2.sty
* v0.19: ocgbase.sty
diff --git a/Master/texmf-dist/tex/latex/ocgx2/ocgbase.sty b/Master/texmf-dist/tex/latex/ocgx2/ocgbase.sty
index 6e514c22367..0d1cc4a73dd 100644
--- a/Master/texmf-dist/tex/latex/ocgx2/ocgbase.sty
+++ b/Master/texmf-dist/tex/latex/ocgx2/ocgbase.sty
@@ -102,8 +102,8 @@
\RequirePackage{l3keys2e}
-\def\g@ocgbase@date@tl{2021/06/03}
-\def\g@ocgbase@version@tl{0.19}
+\def\g@ocgbase@date@tl{2021/06/11}
+\def\g@ocgbase@version@tl{0.20}
\ProvidesExplPackage{ocgbase}{\g@ocgbase@date@tl}{\g@ocgbase@version@tl}
{support package for ocgx2.sty}
@@ -372,8 +372,10 @@
\cs_gset_eq:NN\ocgbase@oc@emc\ocgbase_oc_emc:
\cs_gset_eq:NN\ocgbase@open@stack@pop\ocgbase_open_stack_pop:N
\cs_gset_eq:NN\ocgbase@open@stack@push\ocgbase_open_stack_push:n
-\endinput
\fi
+\begingroup
+\if@ocgbase@testphase\else\aftergroup\endinput\fi
+\endgroup
%%%%%%%%%%%%%%%%%%%%%% /pdfmanagement-testphase %%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -472,8 +474,8 @@
\RequirePackage{l3keys2e}
-\def\g@ocgbase@date@tl{2021/06/03}
-\def\g@ocgbase@version@tl{0.19}
+\def\g@ocgbase@date@tl{2021/06/11}
+\def\g@ocgbase@version@tl{0.20}
\ProvidesExplPackage{ocgbase}{\g@ocgbase@date@tl}{\g@ocgbase@version@tl}
{support package for ocgx2.sty}
diff --git a/Master/texmf-dist/tex/latex/ocgx2/ocgx2.sty b/Master/texmf-dist/tex/latex/ocgx2/ocgx2.sty
index f2375cfbf9a..101537322e3 100644
--- a/Master/texmf-dist/tex/latex/ocgx2/ocgx2.sty
+++ b/Master/texmf-dist/tex/latex/ocgx2/ocgx2.sty
@@ -47,8 +47,8 @@
\RequirePackage{l3keys2e}
-\def\g@ocgxii@date@tl{2021/06/03}
-\def\g@ocgxii@version@tl{0.51}
+\def\g@ocgxii@date@tl{2021/06/11}
+\def\g@ocgxii@version@tl{0.52}
\ProvidesExplPackage{ocgx2}{\g@ocgxii@date@tl}{\g@ocgxii@version@tl}
{ports `ocgx' functionality to dvips+ps2pdf, xelatex and dvipdfmx}
@@ -1293,7 +1293,7 @@
% TikZ related code follows (to be enabled with package option `tikz')
-\bool_if:NF\l_ocgxii_tikz_bool{\endinput}
+\bool_if:NT\l_ocgxii_tikz_bool{
\cs_set_eq:NN\ocgxii@trmspc\tl_trim_spaces:N
\ExplSyntaxOff
\RequirePackage{tikz}
@@ -1499,8 +1499,11 @@
}
}
}
-\endinput
+}
\fi
+\begingroup
+\if@ocgxii@testphase\else\aftergroup\endinput\fi
+\endgroup
%%%%%%%%%%%%%%%%%%%%%% /pdfmanagement-testphase %%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1544,8 +1547,8 @@
\RequirePackage{l3keys2e}
-\def\g@ocgxii@date@tl{2021/06/03}
-\def\g@ocgxii@version@tl{0.51}
+\def\g@ocgxii@date@tl{2021/06/11}
+\def\g@ocgxii@version@tl{0.52}
\ProvidesExplPackage{ocgx2}{\g@ocgxii@date@tl}{\g@ocgxii@version@tl}
{ports `ocgx' functionality to dvips+ps2pdf, xelatex and dvipdfmx}
@@ -2780,7 +2783,9 @@
% TikZ related code follows (to be enabled with package option `tikz')
-\bool_if:NF\l_ocgxii_tikz_bool{\endinput}
+\group_begin:
+\bool_if:NF\l_ocgxii_tikz_bool{\aftergroup\endinput}
+\group_end:
\cs_set_eq:NN\ocgxii@trmspc\tl_trim_spaces:N
\ExplSyntaxOff
\RequirePackage{tikz}