texlive[48779] Master/texmf-dist: ocgx2 (27sep18)

[commits+karl at tug.org]

Revision: 48779
          http://tug.org/svn/texlive?view=revision&revision=48779
Author:   karl
Date:     2018-09-29 00:21:31 +0200 (Sat, 29 Sep 2018)
Log Message:
-----------
ocgx2 (27sep18)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/latex/ocgx2/ChangeLog
    trunk/Master/texmf-dist/tex/latex/ocgx2/ocgx2.sty

Modified: trunk/Master/texmf-dist/doc/latex/ocgx2/ChangeLog
===================================================================
--- trunk/Master/texmf-dist/doc/latex/ocgx2/ChangeLog	2018-09-28 22:21:14 UTC (rev 48778)
+++ trunk/Master/texmf-dist/doc/latex/ocgx2/ChangeLog	2018-09-28 22:21:31 UTC (rev 48779)
@@ -1,3 +1,8 @@
+2018-09-27
+	* v0.38: ocgx2.sty
+	* fix: /ocglinkprotect{...} underfull box message and colour issue when
+	nested
+
 2018-09-25
 	* v0.37: ocgx2.sty
 	* new: /tikz/trigger ocg={...} for various mouse triggers

Modified: trunk/Master/texmf-dist/tex/latex/ocgx2/ocgx2.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ocgx2/ocgx2.sty	2018-09-28 22:21:14 UTC (rev 48778)
+++ trunk/Master/texmf-dist/tex/latex/ocgx2/ocgx2.sty	2018-09-28 22:21:31 UTC (rev 48779)
@@ -38,8 +38,8 @@
 \RequirePackage{xparse}
 \RequirePackage{l3keys2e}
 
-\def\g at ocgxii@date at tl{2018/09/25}
-\def\g at ocgxii@version at tl{0.37}
+\def\g at ocgxii@date at tl{2018/09/27}
+\def\g at ocgxii@version at tl{0.38}
 
 \ProvidesExplPackage{ocgx2}{\g at ocgxii@date at tl}{\g at ocgxii@version at tl}
 {ports `ocgx' functionality to dvips+ps2pdf, xelatex and dvipdfmx}
@@ -875,7 +875,10 @@
         \tl_set_eq:NN\l_ocgxii_lnkcol_tl\l_tmpa_tl
         \ocgxii_colourlink_nobreak_begin:
     }
+    \group_begin:
+    \cs_set_nopar:Npn\ocglinkprotect##1{##1} % in case of nesting
     \sys_if_output_pdf:TF{
+      \leavevmode
       \hbox_set:Nn\l_tmpb_box{#1}
       \hbox_to_wd:nn{\box_wd:N\l_tmpb_box}{
         \vrule~width~\c_zero_dim~height~\box_ht:N\l_tmpb_box~
@@ -882,8 +885,10 @@
           depth~\box_dp:N\l_tmpb_box
         \pbs_pdfxform:nnnnn{1}{0}{}{}{\l_tmpb_box}
         \pbs_pdfrefxform:n{\pbs_pdflastxform:}
+        \hss
       }
     }{#1}
+    \group_end:
     \seq_get_left:NNT\g_ocgxii_lnk_color_seq\l_tmpa_tl{
         \ocgxii_colourlink_nobreak_end:
       \group_end: