ocgx2 (19sep19)

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

3 files changed, 41 insertions, 18 deletions

diff --git a/Master/texmf-dist/doc/latex/ocgx2/ChangeLog b/Master/texmf-dist/doc/latex/ocgx2/ChangeLog
index 3384906d485..5957ad4c5c3 100644
--- a/Master/texmf-dist/doc/latex/ocgx2/ChangeLog
+++ b/Master/texmf-dist/doc/latex/ocgx2/ChangeLog
@@ -1,3 +1,8 @@
+2019-09-19
+	* v0.45: ocgx2.sty
+	* new: using comma for separating OCG ids in \showocg, \hideocg etc.; <space>
+	still accepted for compatibility with ocgx/ocg-p 
+
 2019-09-17
 	* v0.44: ocgx2.sty
 	* fix: wrong visibility of reopened ocg (introduced in v0.41)
diff --git a/Master/texmf-dist/doc/latex/ocgx2/README.txt b/Master/texmf-dist/doc/latex/ocgx2/README.txt
index 903955efacd..4ad4a60aba7 100644
--- a/Master/texmf-dist/doc/latex/ocgx2/README.txt
+++ b/Master/texmf-dist/doc/latex/ocgx2/README.txt
@@ -151,9 +151,9 @@ directive `\AllOff{...}' is written as `\Not{ \Or{ ... } }'.
 
 The available commands are
 
-  \switchocg[<trigger>]{<OCG ids to toggle, space separated>}{<link text>}
-  \showocg[<trigger>]{<OCG ids to switch ON, space separated>}{<link text>}
-  \hideocg[<trigger>]{<OCG ids to switch OFF, space separated>}{<link text>}
+  \switchocg[<trigger>]{<OCG ids to toggle, comma-separated>}{<link text>}
+  \showocg[<trigger>]{<OCG ids to switch ON, comma-separated>}{<link text>}
+  \hideocg[<trigger>]{<OCG ids to switch OFF, comma-separated>}{<link text>}
   \actionsocg[<trigger>]{<ids to toggle>}{<ids to switch ON>}{<ids to switch OFF>}{<link text>}
 
 For details about their usage, read the `ocgx' package manual:
@@ -168,12 +168,17 @@ the commands listed above. Choose one of
 
 for  <trigger>. In order to listen to more than one mouse event, use
 `onmouseall'. Layer ids in the mandatory argument(s) must then be grouped with
-commas as follows:
+braces and commas as follows:
 
-  <mouse-enter group>, <mouse-exit group>, <mouse-down group>, <mouse-up group>
+  {<mouse-enter group>}, {<mouse-exit group>}, {<mouse-down group>}, {<mouse-up group>}
 
 Any of these groups may be left empty in order to configure only some
-mouse triggers. Inside the groups, OCG ids are separated by space.
+mouse triggers. Inside the groups, OCG ids are also separated by commas.
+Therefore, braces must be put around the groups. For example:
+
+  \switchocg[onmouseall]{
+    , , {ocg1, ocg2, ocg3, ocg4}, {ocg1, ocg2, ocg3, ocg4}
+  }{Toggle layers on mouse-down and -up}
 
 
 5. Package option `ocgcolorlinks'
diff --git a/Master/texmf-dist/tex/latex/ocgx2/ocgx2.sty b/Master/texmf-dist/tex/latex/ocgx2/ocgx2.sty
index 2e6cbdf6aac..235fe5f90e4 100644
--- a/Master/texmf-dist/tex/latex/ocgx2/ocgx2.sty
+++ b/Master/texmf-dist/tex/latex/ocgx2/ocgx2.sty
@@ -48,8 +48,8 @@
 \RequirePackage{xparse}
 \RequirePackage{l3keys2e}
 
-\def\g@ocgxii@date@tl{2019/09/17}
-\def\g@ocgxii@version@tl{0.44}
+\def\g@ocgxii@date@tl{2019/09/19}
+\def\g@ocgxii@version@tl{0.45}
 
 \ProvidesExplPackage{ocgx2}{\g@ocgxii@date@tl}{\g@ocgxii@version@tl}
 {ports `ocgx' functionality to dvips+ps2pdf, xelatex and dvipdfmx}
@@ -697,7 +697,22 @@
 
 \cs_new_protected_nopar:Nn\ocgxii_ocglist_build:Nn{
   \tl_set:Nx\l_ocglistarg_tl{#2}\tl_trim_spaces:N\l_ocglistarg_tl
-  \seq_set_split:NnV\l_ocgxii_ocglistarg_seq{~}\l_ocglistarg_tl
+  % first try splitting at commas (ocgx2 syntax)
+  \tl_set_eq:NN\l_tmpa_tl\l_ocglistarg_tl
+  \tl_remove_all:Nn\l_tmpa_tl{~}
+  \seq_set_split:NnV\l_ocgxii_ocglistarg_seq{,}\l_tmpa_tl
+  \seq_remove_all:Nn\l_ocgxii_ocglistarg_seq{}
+  \tl_set:Nx\l_tmpa_tl{\seq_count:N\l_ocgxii_ocglistarg_seq}
+  % now at spaces (legacy ocgx/ocg-p)
+  \tl_set_eq:NN\l_tmpb_tl\l_ocglistarg_tl
+  \tl_remove_all:Nn\l_tmpb_tl{,}
+  \seq_set_split:NnV\l_tmpb_seq{~}\l_tmpb_tl
+  \seq_remove_all:Nn\l_tmpb_seq{}
+  \tl_set:Nx\l_tmpb_tl{\seq_count:N\l_tmpb_seq}
+  %take the seq having more elements (guessing the separator most likely used)
+  \int_compare:nT{\l_tmpb_tl>\l_tmpa_tl}{
+    \seq_set_eq:NN\l_ocgxii_ocglistarg_seq\l_tmpb_seq
+  }
   \seq_map_variable:NNn\l_ocgxii_ocglistarg_seq\l_tempa_tl{
     \ocgxii_process_ocgref:NN#1\l_tempa_tl
   }
@@ -986,15 +1001,13 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \cs_new_protected:Nn\ocgxii_process_ocgref:NN{
-  \str_if_eq:eeF{#2}{}{
-    \tl_if_exist:cTF{ocgx2.ocg.#2}{
-      \tl_put_right:Nx#1{~\tl_use:c{ocgx2.ocg.#2}}
-    }{
-      \msg_warning:nnx{ocgx2}{undefined~OCG}{#2}
-      \tl_if_exist:NF\g_ocgxii_refundefwarned_tl{
-        \tl_new:N\g_ocgxii_refundefwarned_tl
-        \AtEndDocument{\msg_warning:nn{ocgx2}{undefined~OCGs}}
-      }
+  \tl_if_exist:cTF{ocgx2.ocg.#2}{
+    \tl_put_right:Nx#1{~\tl_use:c{ocgx2.ocg.#2}}
+  }{
+    \msg_warning:nnx{ocgx2}{undefined~OCG}{#2}
+    \tl_if_exist:NF\g_ocgxii_refundefwarned_tl{
+      \tl_new:N\g_ocgxii_refundefwarned_tl
+      \AtEndDocument{\msg_warning:nn{ocgx2}{undefined~OCGs}}
     }
   }
 }