summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/ocgx2/ocgbase.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-05-24 21:20:13 +0000
committerKarl Berry <karl@freefriends.org>2019-05-24 21:20:13 +0000
commit08389ad18f40230695bf434e4a1a5de4f83b1862 (patch)
tree14df0a84ac7f7f8d94f84434f2de2e900d1e4398 /Master/texmf-dist/tex/latex/ocgx2/ocgbase.sty
parenteae1ca2f57626195fe6deb2dc89a6aa8936c1110 (diff)
ocgx2 (24may19)
git-svn-id: svn://tug.org/texlive/trunk@51213 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/ocgx2/ocgbase.sty')
-rw-r--r--Master/texmf-dist/tex/latex/ocgx2/ocgbase.sty30
1 files changed, 19 insertions, 11 deletions
diff --git a/Master/texmf-dist/tex/latex/ocgx2/ocgbase.sty b/Master/texmf-dist/tex/latex/ocgx2/ocgbase.sty
index b0113bf270a..d30786435dd 100644
--- a/Master/texmf-dist/tex/latex/ocgx2/ocgbase.sty
+++ b/Master/texmf-dist/tex/latex/ocgx2/ocgbase.sty
@@ -92,11 +92,19 @@
%
% The Current Maintainer of this work is A. Grahn.
-\RequirePackage{expl3}
+%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}
-\def\g@ocgbase@date@tl{2018/06/07}
-\def\g@ocgbase@version@tl{0.14}
+\def\g@ocgbase@date@tl{2019/05/24}
+\def\g@ocgbase@version@tl{0.15}
\ProvidesExplPackage{ocgbase}{\g@ocgbase@date@tl}{\g@ocgbase@version@tl}
{support package for ocgx2.sty}
@@ -141,7 +149,7 @@
%generate RBGroups entry (radio button groups)
\tl_new:N\l_ocgbase_rbtn_groups_tl
\seq_map_inline:Nn\g_ocgbase_rbtn_groups_seq{
- \int_compare:nT{\seq_count:c{g_ocgbase_rbtn_group_#1_seq}>\c_one}{
+ \int_compare:nT{\seq_count:c{g_ocgbase_rbtn_group_#1_seq}>\c_one_int}{
\tl_put_right:Nx\l_ocgbase_rbtn_groups_tl{
~[\seq_use:cn{g_ocgbase_rbtn_group_#1_seq}{~}]
}
@@ -174,14 +182,14 @@
%macro for inserting new OCG object
\cs_new_protected_nopar:Nn\ocgbase_new_ocg:nnn{
\pbs_pdfobj:nnn{}{dict}{
- /Type/OCG/Name~(#1)~\str_if_eq_x:nnF{#2}{}{/Usage<<#2>>}
+ /Type/OCG/Name~(#1)~\str_if_eq:eeF{#2}{}{/Usage<<#2>>}
}
\tl_gput_right:Nx\g_ocgbase_ocgs_tl{~\pbs_pdflastobj:}
\bool_if:nT{
- \str_if_eq_x_p:nn{#3}{0} ||
- \str_if_eq_x_p:nn{#3}{off} ||
- \str_if_eq_x_p:nn{#3}{false} ||
- \str_if_eq_x_p:nn{#3}{invisible}
+ \str_if_eq_p:ee{#3}{0} ||
+ \str_if_eq_p:ee{#3}{off} ||
+ \str_if_eq_p:ee{#3}{false} ||
+ \str_if_eq_p:ee{#3}{invisible}
}{
\ocgbase_add_to_off_list:n{\pbs_pdflastobj:}
}
@@ -236,7 +244,7 @@
\cs_new_protected:Nn\ocgbase_tree_node_end:{
\seq_get:NN\g_ocgbase_tree_nd_stack_seq\l_tempa_tl
\seq_get:NN\g_ocgbase_tree_ocg_stack_seq\l_tempb_tl
- \str_if_eq_x:nnT{
+ \str_if_eq:eeT{
\cs_if_exist_use:c{g_ocgbase_nd_\l_tempa_tl _ocg_tl}
}{
\l_tempb_tl
@@ -252,7 +260,7 @@
% the node id of the sibling found is returned in arg #1
\cs_new:Nn\ocgbase_traverse_siblings:NN{
% #1: current node (in/out), #2: OCG obj (in/out)
- \str_if_eq_x:nnF{#2}{\tl_use:c{g_ocgbase_nd_#1_ocg_tl}}{
+ \str_if_eq:eeF{#2}{\tl_use:c{g_ocgbase_nd_#1_ocg_tl}}{
\tl_if_exist:cTF{g_ocgbase_nd_#1_sbl_tl}{
\tl_set:Nv#1{g_ocgbase_nd_#1_sbl_tl}
\ocgbase_traverse_siblings:NN#1#2