ocgx2 (7dec15)

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

4 files changed, 26 insertions, 22 deletions

diff --git a/Master/texmf-dist/doc/latex/ocgx2/ChangeLog b/Master/texmf-dist/doc/latex/ocgx2/ChangeLog
index d2a9fa7b453..8613f198a3e 100644
--- a/Master/texmf-dist/doc/latex/ocgx2/ChangeLog
+++ b/Master/texmf-dist/doc/latex/ocgx2/ChangeLog
@@ -1,3 +1,10 @@
+2015-12-07
+	* v0.14 : ocgx2.sty
+	* v0.5 : ocgbase.sty
+	* fix: `0' and `1' could not be used for setting initial
+	visibility; \actionsocg macro caused compilation error when used
+	without optional argument
+
 2015-12-03
 	* v0.13 : ocgx2.sty
 	* fix: bug occasionally creating wrong OCG listing in the layers
diff --git a/Master/texmf-dist/doc/latex/ocgx2/README b/Master/texmf-dist/doc/latex/ocgx2/README
index 1944aeb126f..f2f5ab21d34 100644
--- a/Master/texmf-dist/doc/latex/ocgx2/README
+++ b/Master/texmf-dist/doc/latex/ocgx2/README
@@ -1,7 +1,7 @@
 ==================================
  The `ocgx2' LaTeX Package
 
- Version 0.13 [2015/12/03]
+ Version 0.14 [2015/12/07]
 
  (C) 2015--\today Alexander Grahn
 ==================================
@@ -10,9 +10,9 @@
 1. Introduction
 ===============
 
-The intent of this package is to be a drop-in replacement for the already
-existing packages `ocgx' by Paul Gaborit and `ocg-p' by Werner Moshammer
-for the creation of PDF Layers.
+This package serves as a drop-in replacement for the already existing
+packages `ocgx' by Paul Gaborit and `ocg-p' by Werner Moshammer for the
+creation of PDF Layers.
 
 It re-implements the functionality of the `ocg', `ocgx' and `ocg-p'
 packages and adds support for all known engines and back-ends including:
diff --git a/Master/texmf-dist/tex/latex/ocgx2/ocgbase.sty b/Master/texmf-dist/tex/latex/ocgx2/ocgbase.sty
index 33794d6558d..61c5ead4026 100644
--- a/Master/texmf-dist/tex/latex/ocgx2/ocgbase.sty
+++ b/Master/texmf-dist/tex/latex/ocgx2/ocgbase.sty
@@ -101,10 +101,7 @@
 \RequirePackage{l3keys2e}
 \RequirePackage{atenddvi}
 
-\def\g@ocgbase@date@tl{2015/11/26}
-\def\g@ocgbase@version@tl{0.4}
-
-\ProvidesExplPackage{ocgbase}{\g@ocgbase@date@tl}{\g@ocgbase@version@tl}
+\ProvidesExplPackage{ocgbase}{2015/12/07}{0.5}
 {support package for ocgx2.sty}
 
 %unknown package option error message
@@ -162,7 +159,7 @@
       }
       %second sweep on Order array to generate the final Order entry
       \tl_new:N\l_ocgbase_ocgorder_tl
-      \tl_set:Nn\l_ocgbase_order_item_count_tl{\c_zero}
+      \tl_set:Nn\l_ocgbase_order_item_count_tl{0}
       \seq_map_inline:Nn\g_ocgbase_ocgorder_seq{
         \tl_set:Nx\l_ocgbase_order_item_count_tl{
           \int_eval:n{\l_ocgbase_order_item_count_tl+\c_one}
@@ -242,7 +239,7 @@
   }
   \tl_gput_right:Nx\g_ocgbase_ocgs_tl{~\g_pbs_pdflastobj_tl}
   \bool_if:nT{
-    \str_if_eq_x_p:nn{#3}{\c_zero} ||
+    \str_if_eq_x_p:nn{#3}{0} ||
     \str_if_eq_x_p:nn{#3}{off} ||
     \str_if_eq_x_p:nn{#3}{false}
   }{
@@ -288,14 +285,14 @@
   }
   \seq_if_in:cxTF{g_ocgbase_#1_rbtn_order_seq}{#2}{
     \bool_if:nT{
-      \str_if_eq_x_p:nn{#3}{\c_zero} ||
+      \str_if_eq_x_p:nn{#3}{0} ||
       \str_if_eq_x_p:nn{#3}{false}
     }{
       \ocgbase_seq_gremove_all:cx{g_ocgbase_#1_rbtn_order_seq}{#2}
     }
   }{
     \bool_if:nF{
-      \str_if_eq_x_p:nn{#3}{\c_zero} ||
+      \str_if_eq_x_p:nn{#3}{0} ||
       \str_if_eq_x_p:nn{#3}{false}
     }{
       \seq_gput_right:cx{g_ocgbase_#1_rbtn_order_seq}{#2}
diff --git a/Master/texmf-dist/tex/latex/ocgx2/ocgx2.sty b/Master/texmf-dist/tex/latex/ocgx2/ocgx2.sty
index 8c55dbbf92d..44b0715e71a 100644
--- a/Master/texmf-dist/tex/latex/ocgx2/ocgx2.sty
+++ b/Master/texmf-dist/tex/latex/ocgx2/ocgx2.sty
@@ -37,7 +37,7 @@
 \RequirePackage{xparse}
 \RequirePackage{l3keys2e}
 
-\ProvidesExplPackage{ocgx2}{2015/12/03}{0.13}
+\ProvidesExplPackage{ocgx2}{2015/12/07}{0.14}
 {ports `ocgx' functionality to dvips+ps2pdf, xelatex and dvipdfmx}
 
 %creating global definitions
@@ -123,7 +123,7 @@
   \bool_if:NT\g_ocgxii_nestedB_bool{
     \seq_gput_left:Nx\g_ocgxii_nested_seq{
       \seq_item:Nn\g_ocgxii_ocgstack_seq{\c_one}
-    }  
+    }
     \ocgbase_add_to_order_list:n{[}
   }
   \bool_gset_true:N\g_ocgxii_nestedB_bool
@@ -140,9 +140,9 @@
         \bool_gset_false:N\g_ocgxii_nestedB_bool
       }
       \bool_if:nTF{ %initial visibility
-        \str_if_eq_p:nn{#4}{\c_one} ||
-        \str_if_eq_p:nn{#4}{on} ||
-        \str_if_eq_p:nn{#4}{true}
+        \str_if_eq_x_p:nn{#4}{1} ||
+        \str_if_eq_x_p:nn{#4}{on} ||
+        \str_if_eq_x_p:nn{#4}{true}
       }{
         \ocgbase_del_from_off_list:n{\tl_use:c{ocgxii@#3}}
       }{
@@ -233,7 +233,7 @@
 }
 \ocgxii@stack@on@page{0}{} %initialize
 
-%end of page action in output routine
+%end-of-page action in output routine
 \cs_new_nopar:Nn\ocgxii_at_end_page:{
   %check whether end-of-page ocg stack has settled
   \iow_shipout:Nx\@mainaux{
@@ -265,7 +265,7 @@
   }
 }
 
-%begin of page action in output routine
+%begin-of-page action in output routine
 \cs_new_nopar:Nn\ocgxii_at_begin_page:{
   % re-open pending ocgs
   \seq_set_eq:Nc\l_ocgxii_temp_seq{
@@ -480,9 +480,9 @@
       /A <</S/SetOCGState
         /State [
           \str_if_eq:VnF{\l_ocgxii_toswitch_u_tl}{}{
-            /Toggle~\l_ocgxii_toswitch_tl}~
-          \str_if_eq:VnF{\l_ocgxii_toshow_u_tl}{}{/ON~\l_ocgxii_toshow_tl}~
-          \str_if_eq:VnF{\l_ocgxii_tohide_u_tl}{}{/OFF~\l_ocgxii_tohide_tl}
+            /Toggle~\l_ocgxii_toswitch_u_tl}~
+          \str_if_eq:VnF{\l_ocgxii_toshow_u_tl}{}{/ON~\l_ocgxii_toshow_u_tl}~
+          \str_if_eq:VnF{\l_ocgxii_tohide_u_tl}{}{/OFF~\l_ocgxii_tohide_u_tl}
         ]
       >>
       /Border [0~0~0]