ocgx2 (2nov15)

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

2 files changed, 29 insertions, 8 deletions

diff --git a/Master/texmf-dist/tex/latex/ocgx2/ocgbase.sty b/Master/texmf-dist/tex/latex/ocgx2/ocgbase.sty
index aa24adfc294..df92035991e 100644
--- a/Master/texmf-dist/tex/latex/ocgx2/ocgbase.sty
+++ b/Master/texmf-dist/tex/latex/ocgx2/ocgbase.sty
@@ -2,8 +2,9 @@
 %
 % ocgbase.sty
 %
-% low-level macros for OCG creation and for managment of global (document-wide)
-% OCG related lists;
+% low-level macros for OCG creation, /OC-marked content and
+% for managment of global (document-wide) OCG related lists;
+%
 % (automatic) OCG configuration in the PDF catalog
 %
 % Copyright 2015--\today, Alexander Grahn
@@ -63,6 +64,18 @@
 %     add OCG #2 (obj ref) to radio button group `#1' (string),
 %     #3: (0|1|false|true) list OCG as part of group `#1' in the Layers Tab)
 %
+%   --------
+%
+%   \ocgbase_oc_bdc:n
+%   \ocgbase@oc@bdc
+%     #1: OCG obj ref
+%     mark begin of optional content belonging to OCG #1 in the current
+%     content stream  
+%
+%   \ocgbase_oc_emc:
+%   \ocgbase@oc@emc
+%     mark end of optional content in the current content stream  
+%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 % This work may be distributed and/or modified under the
@@ -78,10 +91,11 @@
 % The Current Maintainer of this work is A. Grahn.
 
 \RequirePackage{expl3}
+\RequirePackage{l3keys2e}
 \RequirePackage{atenddvi}
 
-\def\g@ocgbase@date@tl{2015/10/28}
-\def\g@ocgbase@version@tl{0.1}
+\def\g@ocgbase@date@tl{2015/11/02}
+\def\g@ocgbase@version@tl{0.2}
 
 \ProvidesExplPackage{ocgbase}{\g@ocgbase@date@tl}{\g@ocgbase@version@tl}
 {support package for ocgx2.sty}
@@ -101,7 +115,8 @@
 %process package options
 \ProcessKeysOptions{ocgbase}
 
-\AtBeginDocument{
+%\AtBeginDocument{
+\AtBeginDvi{
   \@ifpackageloaded{pdfbase}{}{\RequirePackage{pdfbase}}
 }
 
@@ -255,9 +270,15 @@
 }
 \cs_generate_variant:Nn\ocgbase_add_ocg_to_radiobtn_grp:nnn{xxx}
 
+% OC-marked content
+\cs_new:Nn\ocgbase_oc_bdc:n{\pbs_pdfbdc:nn{/OC}{#1}}
+\cs_new:Nn\ocgbase_oc_emc:{\pbs_pdfemc:}
+
 %l2e versions
 \cs_gset_eq:NN\ocgbase@new@ocg\ocgbase_new_ocg:xxx
 \cs_gset_eq:NN\ocgbase@last@ocg\ocgbase_last_ocg:
 \cs_gset_eq:NN\ocgbase@add@to@order@list\ocgbase_add_to_order_list:n
 \cs_gset_eq:NN\ocgbase@add@to@off@list\ocgbase_add_to_off_list:n
 \cs_gset_eq:NN\ocgbase@add@ocg@to@radiobtn@grp\ocgbase_add_ocg_to_radiobtn_grp:xxx
+\cs_gset_eq:NN\ocgbase@oc@bdc\ocgbase_oc_bdc:n
+\cs_gset_eq:NN\ocgbase@oc@emc\ocgbase_oc_emc:
diff --git a/Master/texmf-dist/tex/latex/ocgx2/ocgx2.sty b/Master/texmf-dist/tex/latex/ocgx2/ocgx2.sty
index 62b9c905b72..6872f2e9322 100644
--- a/Master/texmf-dist/tex/latex/ocgx2/ocgx2.sty
+++ b/Master/texmf-dist/tex/latex/ocgx2/ocgx2.sty
@@ -35,7 +35,7 @@
 \RequirePackage{xparse}
 \RequirePackage{l3keys2e}
 
-\ProvidesExplPackage{ocgx2}{2015/10/28}{0.9}
+\ProvidesExplPackage{ocgx2}{2015/11/02}{0.10}
 {ports `ocgx' functionality to dvips+ps2pdf, xelatex and dvipdfmx}
 
 %package opts
@@ -158,11 +158,11 @@
     \tl_gset:cx{OCGpdfobj#3}{\tl_use:c{ocgxii@#3}}
     \seq_gput_left:Nx\g_ocgxii_ocgstack_seq{\tl_use:c{ocgxii@#3}}
   \group_end:
-  \pbs_pdfbdc:nn{/OC}{\tl_use:c{ocgxii@#3}}
+  \ocgbase_oc_bdc:n{\tl_use:c{ocgxii@#3}}
   \ignorespaces
 }{
   \unskip
-  \pbs_pdfemc:
+  \ocgbase_oc_emc:
   \seq_gpop_left:NN\g_ocgxii_ocgstack_seq\l_tempa_tl
   \bool_if:NT\g_ocgxii_nestedE_bool{\ocgbase_add_to_order_list:n{]}}
   \bool_gset_true:N\g_ocgxii_nestedE_bool