ocgx2 (11mar16)

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

4 files changed, 30 insertions, 34 deletions

diff --git a/Master/texmf-dist/doc/latex/ocgx2/ChangeLog b/Master/texmf-dist/doc/latex/ocgx2/ChangeLog
index 9bef73fbf83..f3f359a7aea 100644
--- a/Master/texmf-dist/doc/latex/ocgx2/ChangeLog
+++ b/Master/texmf-dist/doc/latex/ocgx2/ChangeLog
@@ -1,3 +1,8 @@
+2016-03-11
+	* v0.16 : ocgx2.sty
+	* v0.6 : ocgbase.sty
+	* fix: minor adjustments
+
 2016-01-29
 	* v0.15 : ocgx2.sty
 	* fix: adjusted `atendvi'-related warning message
diff --git a/Master/texmf-dist/doc/latex/ocgx2/README b/Master/texmf-dist/doc/latex/ocgx2/README
index 6b838cfad4d..cf2f2e54a61 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.15 [2016/01/29]
+ Version 0.16 [2016/03/11]
 
  (C) 2015--\today Alexander Grahn
 ==================================
diff --git a/Master/texmf-dist/tex/latex/ocgx2/ocgbase.sty b/Master/texmf-dist/tex/latex/ocgx2/ocgbase.sty
index 61c5ead4026..cf1cc3f94be 100644
--- a/Master/texmf-dist/tex/latex/ocgx2/ocgbase.sty
+++ b/Master/texmf-dist/tex/latex/ocgx2/ocgbase.sty
@@ -20,11 +20,7 @@
 %   latex-->dvipdfmx
 %   xelatex
 %
-%
-% Package options:
-%
-%   xetex,
-%   dvipdfmx
+%   for `dvipdfmx', set it as document class option
 %
 %
 % Commands defined:
@@ -98,31 +94,12 @@
 % The Current Maintainer of this work is A. Grahn.
 
 \RequirePackage{expl3}
-\RequirePackage{l3keys2e}
 \RequirePackage{atenddvi}
+\RequirePackage{pdfbase}
 
-\ProvidesExplPackage{ocgbase}{2015/12/07}{0.5}
+\ProvidesExplPackage{ocgbase}{2016/03/11}{0.6}
 {support package for ocgx2.sty}
 
-%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.
-}
-
-%package opts
-\keys_define:nn{ocgbase}{
-  xetex .code:n = {\PassOptionsToPackage{xetex}{pdfbase}},
-  dvipdfmx .code:n = {\PassOptionsToPackage{dvipdfmx}{pdfbase}}
-}
-
-%process package options
-\ProcessKeysOptions{ocgbase}
-
-\AtBeginDvi{
-  \@ifpackageloaded{pdfbase}{}{\RequirePackage{pdfbase}}
-}
-
 \tl_new:N\g_ocgbase_ocgs_tl %takes ocg object refs
 \seq_new:N\g_ocgbase_ocgorder_seq
 \seq_new:N\g_ocgbase_offocgs_seq
@@ -237,15 +214,15 @@
   \pbs_pdfobj:nnn{}{dict}{
     /Type/OCG/Name~(#1)~\tl_if_blank:oF{#2}{/Usage<<#2>>}
   }
-  \tl_gput_right:Nx\g_ocgbase_ocgs_tl{~\g_pbs_pdflastobj_tl}
+  \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}
   }{
-    \ocgbase_add_to_off_list:n{\g_pbs_pdflastobj_tl}
+    \ocgbase_add_to_off_list:n{\pbs_pdflastobj:}
   }
-  \tl_gset_eq:NN\g_ocgbase_last_ocg_tl\g_pbs_pdflastobj_tl
+  \tl_gset:Nx\g_ocgbase_last_ocg_tl{\pbs_pdflastobj:}
 }
 
 \cs_new_nopar:Nn\ocgbase_last_ocg:{\g_ocgbase_last_ocg_tl}
diff --git a/Master/texmf-dist/tex/latex/ocgx2/ocgx2.sty b/Master/texmf-dist/tex/latex/ocgx2/ocgx2.sty
index e235c2135d1..96c1d329d83 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}{2016/01/29}{0.15}
+\ProvidesExplPackage{ocgx2}{2016/03/11}{0.16}
 {ports `ocgx' functionality to dvips+ps2pdf, xelatex and dvipdfmx}
 
 %creating global definitions
@@ -55,11 +55,11 @@
 
 \keys_define:nn{ocgx2}{
   xetex .code:n = {
-    \PassOptionsToPackage{xetex}{ocgbase}
+    \PassOptionsToPackage{xetex}{pdfbase}
   },
 
   dvipdfmx .code:n = {
-    \PassOptionsToPackage{dvipdfmx}{ocgbase}
+    \PassOptionsToPackage{dvipdfmx}{pdfbase}
     \bool_gset_true:N\g_ocgxii_dvipdfmx_bool
   },
 
@@ -110,7 +110,17 @@
 \ProcessKeysOptions{ocgx2}
 \sys_if_engine_xetex:T{\bool_gset_true:N\g_ocgxii_dvipdfmx_bool}
 
-\RequirePackage{ocgbase}
+\RequirePackage{ocgbase} %also loads pdfbase.sty
+\msg_set:nnnn{ocgx2}{support~outdated}{
+  Support~package~`#1'~too~old.
+}{
+  Get~an~up~to~date~version~of~`#1'.\\
+  Aborting.
+}
+\@ifpackagelater{pdfbase}{2016/03/11}{}{
+  \msg_error:nnn{xsavebox}{support~outdated}{pdfbase.sty}
+  \tex_endinput:D
+}
 
 %re-implement ocg-p's `ocg' environment
 \DeclareDocumentEnvironment{ocg}{O{}mmm}{
@@ -392,6 +402,7 @@
         }
       >>
     }{\mbox{#3}} %Widget annots should not be broken across lines
+    \pbs_appendtofields:n{\pbs_pdflastann:}
     \int_gincr:N\g_ocgxii_widcount_int
   }
 }
@@ -427,6 +438,7 @@
         }
       >>
     }{\mbox{#3}} %Widget annots should not be broken across lines
+    \pbs_appendtofields:n{\pbs_pdflastann:}
     \int_gincr:N\g_ocgxii_widcount_int
   }
 }
@@ -462,6 +474,7 @@
         }
       >>
     }{\mbox{#3}} %Widget annots should not be broken across lines
+    \pbs_appendtofields:n{\pbs_pdflastann:}
     \int_gincr:N\g_ocgxii_widcount_int
   }
 }
@@ -570,6 +583,7 @@
         }
       >>
     }{\mbox{#5}} %Widget annots should not be broken across lines
+    \pbs_appendtofields:n{\pbs_pdflastann:}
     \int_gincr:N\g_ocgxii_widcount_int
   }
 }