summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Master/texmf-dist/doc/latex/ocgx2/ChangeLog5
-rw-r--r--Master/texmf-dist/tex/latex/ocgx2/ocgbase.sty62
-rw-r--r--Master/texmf-dist/tex/latex/ocgx2/ocgx2.sty72
3 files changed, 93 insertions, 46 deletions
diff --git a/Master/texmf-dist/doc/latex/ocgx2/ChangeLog b/Master/texmf-dist/doc/latex/ocgx2/ChangeLog
index 2c6de07b3f3..6a05dbbcb92 100644
--- a/Master/texmf-dist/doc/latex/ocgx2/ChangeLog
+++ b/Master/texmf-dist/doc/latex/ocgx2/ChangeLog
@@ -1,3 +1,8 @@
+2022-08-04
+ * v0.55: ocgx2.sty
+ * v0.22: ocgbase.sty
+ * fix : pkg option processing acc. to new LaTeX format 22-06-01
+
2022-04-01
* v0.54: ocgx2.sty
* v0.21: ocgbase.sty
diff --git a/Master/texmf-dist/tex/latex/ocgx2/ocgbase.sty b/Master/texmf-dist/tex/latex/ocgx2/ocgbase.sty
index e8df5e87df6..bf4edf432b7 100644
--- a/Master/texmf-dist/tex/latex/ocgx2/ocgbase.sty
+++ b/Master/texmf-dist/tex/latex/ocgx2/ocgbase.sty
@@ -100,35 +100,42 @@
%
% The Current Maintainer of this work is A. Grahn.
-\RequirePackage{l3keys2e}
-
-\def\g@ocgbase@date@tl{2022/04/01}
-\def\g@ocgbase@version@tl{0.21}
+\def\g@ocgbase@date@tl{2022/08/04}
+\def\g@ocgbase@version@tl{0.22}
\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
+ pdftex.code:n = {},
+ pdftex.value_forbidden:n = true,
+
+ luatex.code:n = {},
+ luatex.value_forbidden:n = true,
+
+ xetex.code:n = {},
+ xetex.value_forbidden:n = true,
+
+ dvips.code:n = {},
+ dvips.value_forbidden:n = true,
- dvipdfmx .choice:,
- dvipdfmx / true .code:n = {\PassOptionsToPackage{dvipdfmx}{pdfbase}},
- dvipdfmx / false .code:n = {},
- dvipdfmx .default:n = {true},
+ dvipdfmx .code:n = {
+ \PassOptionsToPackage{dvipdfmx}{pdfbase}
+ },
+ dvipdfmx .value_forbidden:n = true,
unknown .code:n = {
\msg_error:nnx{ocgbase}{unknown~package~option}{\l_keys_key_tl}
}
}
-\ProcessKeysOptions{ocgbase}
+\ProcessKeyOptions[ocgbase]
\RequirePackage{pdfbase}
@@ -138,7 +145,7 @@
Get~an~up~to~date~version~of~`#1'.\\
Aborting.
}
-\@ifpackagelater{pdfbase}{2017/09/29}{}{
+\@ifpackagelater{pdfbase}{2022/08/04}{}{
\msg_error:nnn{ocgbase}{support~outdated}{pdfbase.sty}
\tex_endinput:D
}
@@ -472,35 +479,42 @@
%
% The Current Maintainer of this work is A. Grahn.
-\RequirePackage{l3keys2e}
-
-\def\g@ocgbase@date@tl{2022/04/01}
-\def\g@ocgbase@version@tl{0.21}
+\def\g@ocgbase@date@tl{2022/08/04}
+\def\g@ocgbase@version@tl{0.22}
\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
+ pdftex.code:n = {},
+ pdftex.value_forbidden:n = true,
+
+ luatex.code:n = {},
+ luatex.value_forbidden:n = true,
+
+ xetex.code:n = {},
+ xetex.value_forbidden:n = true,
+
+ dvips.code:n = {},
+ dvips.value_forbidden:n = true,
- dvipdfmx .choice:,
- dvipdfmx / true .code:n = {\PassOptionsToPackage{dvipdfmx}{pdfbase}},
- dvipdfmx / false .code:n = {},
- dvipdfmx .default:n = {true},
+ dvipdfmx .code:n = {
+ \PassOptionsToPackage{dvipdfmx}{pdfbase}
+ },
+ dvipdfmx .value_forbidden:n = true,
unknown .code:n = {
\msg_error:nnx{ocgbase}{unknown~package~option}{\l_keys_key_tl}
}
}
-\ProcessKeysOptions{ocgbase}
+\ProcessKeyOptions[ocgbase]
\RequirePackage{pdfbase}
@@ -510,7 +524,7 @@
Get~an~up~to~date~version~of~`#1'.\\
Aborting.
}
-\@ifpackagelater{pdfbase}{2017/09/29}{}{
+\@ifpackagelater{pdfbase}{2022/08/04}{}{
\msg_error:nnn{ocgbase}{support~outdated}{pdfbase.sty}
\tex_endinput:D
}
diff --git a/Master/texmf-dist/tex/latex/ocgx2/ocgx2.sty b/Master/texmf-dist/tex/latex/ocgx2/ocgx2.sty
index 46c42aca353..16319e52a39 100644
--- a/Master/texmf-dist/tex/latex/ocgx2/ocgx2.sty
+++ b/Master/texmf-dist/tex/latex/ocgx2/ocgx2.sty
@@ -43,10 +43,8 @@
%
% The Current Maintainer of this work is A. Grahn.
- \RequirePackage{l3keys2e}
-
- \def\g@ocgxii@date@tl{2022/04/01}
- \def\g@ocgxii@version@tl{0.54}
+ \def\g@ocgxii@date@tl{2022/08/04}
+ \def\g@ocgxii@version@tl{0.55}
\ProvidesExplPackage{ocgx2}{\g@ocgxii@date@tl}{\g@ocgxii@version@tl}
{ports `ocgx' functionality to dvips+ps2pdf, xelatex and dvipdfmx}
@@ -86,8 +84,8 @@
Using~`colorlinks'~instead.
}
- %package opts
- %unknown package option error message
+ % package options
+
\msg_set:nnnn{ocgx2}{unknown~package~option}{Unknown~package~option~`#1'.}{
Package option~'#1'~is~unknown;\\
perhaps~it~is~spelled~incorrectly.
@@ -100,13 +98,22 @@
\bool_new:N\l_ocgxii_showingui_bool
\keys_define:nn{ocgx2}{
- xetex .code:n = {}, %dummy
+ pdftex.code:n = {},
+ pdftex.value_forbidden:n = true,
+
+ luatex.code:n = {},
+ luatex.value_forbidden:n = true,
+
+ xetex.code:n = {},
+ xetex.value_forbidden:n = true,
+
+ dvips.code:n = {},
+ dvips.value_forbidden:n = true,
dvipdfmx .code:n = {
\PassOptionsToPackage{dvipdfmx}{ocgbase}
- \PassOptionsToPackage{dvipdfmx}{pdfbase}
- \bool_gset_true:N\g_ocgxii_dvipdfmx_bool
},
+ dvipdfmx .value_forbidden:n = true,
viewocg .choice:,
viewocg / always .code:n={
@@ -162,11 +169,18 @@
\keys_set:nn{ocgx2}{viewocg,printocg,exportocg,showingui,tikz=false}
%process package options
- \ProcessKeysOptions{ocgx2}
- \sys_if_engine_xetex:T{\bool_gset_true:N\g_ocgxii_dvipdfmx_bool}
+ \ProcessKeyOptions[ocgx2]
\RequirePackage{ocgbase} %also loads pdfbase.sty
+ \bool_gset_eq:NN\g_ocgxii_dvipdfmx_bool\g_pbs_dvipdfmx_bool
+
+ \bool_if:NT\g_pbs_dvisvgm_bool{
+ \msg_error:nnn{ocgx2}{generic~msg}{
+ Package~`ocgx2'~is~incompatible~with~the~`dvisvgm'~backend.
+ }
+ }
+
%re-implement ocg-p's `ocg' environment
\DeclareDocumentEnvironment{ocg}{O{}mmm}{
\ocgxii_begin_ocg:nnnn{#1}{#2}{#3}{#4}
@@ -1578,10 +1592,8 @@
%
% The Current Maintainer of this work is A. Grahn.
-\RequirePackage{l3keys2e}
-
-\def\g@ocgxii@date@tl{2022/04/01}
-\def\g@ocgxii@version@tl{0.54}
+\def\g@ocgxii@date@tl{2022/08/04}
+\def\g@ocgxii@version@tl{0.55}
\ProvidesExplPackage{ocgx2}{\g@ocgxii@date@tl}{\g@ocgxii@version@tl}
{ports `ocgx' functionality to dvips+ps2pdf, xelatex and dvipdfmx}
@@ -1621,8 +1633,8 @@
Using~`colorlinks'~instead.
}
-%package opts
-%unknown package option error message
+% package options
+
\msg_set:nnnn{ocgx2}{unknown~package~option}{Unknown~package~option~`#1'.}{
Package option~'#1'~is~unknown;\\
perhaps~it~is~spelled~incorrectly.
@@ -1635,13 +1647,22 @@
\bool_new:N\l_ocgxii_showingui_bool
\keys_define:nn{ocgx2}{
- xetex .code:n = {}, %dummy
+ pdftex.code:n = {},
+ pdftex.value_forbidden:n = true,
+
+ luatex.code:n = {},
+ luatex.value_forbidden:n = true,
+
+ xetex.code:n = {},
+ xetex.value_forbidden:n = true,
+
+ dvips.code:n = {},
+ dvips.value_forbidden:n = true,
dvipdfmx .code:n = {
\PassOptionsToPackage{dvipdfmx}{ocgbase}
- \PassOptionsToPackage{dvipdfmx}{pdfbase}
- \bool_gset_true:N\g_ocgxii_dvipdfmx_bool
},
+ dvipdfmx .value_forbidden:n = true,
viewocg .choice:,
viewocg / always .code:n={
@@ -1697,11 +1718,18 @@
\keys_set:nn{ocgx2}{viewocg,printocg,exportocg,showingui,tikz=false}
%process package options
-\ProcessKeysOptions{ocgx2}
-\sys_if_engine_xetex:T{\bool_gset_true:N\g_ocgxii_dvipdfmx_bool}
+\ProcessKeyOptions[ocgx2]
\RequirePackage{ocgbase} %also loads pdfbase.sty
+\bool_gset_eq:NN\g_ocgxii_dvipdfmx_bool\g_pbs_dvipdfmx_bool
+
+\bool_if:NT\g_pbs_dvisvgm_bool{
+ \msg_error:nnn{ocgx2}{generic~msg}{
+ Package~`ocgx2'~is~incompatible~with~the~`dvisvgm'~backend.
+ }
+}
+
%re-implement ocg-p's `ocg' environment
\DeclareDocumentEnvironment{ocg}{O{}mmm}{
\ocgxii_begin_ocg:nnnn{#1}{#2}{#3}{#4}
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-02 12:42:11 +0000