ocgx2 (27jun18)

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

2 files changed, 22 insertions, 30 deletions

diff --git a/Master/texmf-dist/doc/latex/ocgx2/ChangeLog b/Master/texmf-dist/doc/latex/ocgx2/ChangeLog
index c93ec6d7113..9472c78eb1d 100644
--- a/Master/texmf-dist/doc/latex/ocgx2/ChangeLog
+++ b/Master/texmf-dist/doc/latex/ocgx2/ChangeLog
@@ -1,3 +1,7 @@
+2018-06-27
+	* v0.36: ocgx2.sty
+	* fix: code of previous fix simplified
+
 2018-06-26
 	* v0.35: ocgx2.sty
 	* fix: wrong link size of clickable paths in scaled `tikzpicture'
diff --git a/Master/texmf-dist/tex/latex/ocgx2/ocgx2.sty b/Master/texmf-dist/tex/latex/ocgx2/ocgx2.sty
index 8722c180ffd..b3a287b3514 100644
--- a/Master/texmf-dist/tex/latex/ocgx2/ocgx2.sty
+++ b/Master/texmf-dist/tex/latex/ocgx2/ocgx2.sty
@@ -35,8 +35,8 @@
 \RequirePackage{xparse}
 \RequirePackage{l3keys2e}
 
-\def\g@ocgxii@date@tl{2018/06/26}
-\def\g@ocgxii@version@tl{0.35}
+\def\g@ocgxii@date@tl{2018/06/27}
+\def\g@ocgxii@version@tl{0.36}
 
 \ProvidesExplPackage{ocgx2}{\g@ocgxii@date@tl}{\g@ocgxii@version@tl}
 {ports `ocgx' functionality to dvips+ps2pdf, xelatex and dvipdfmx}
@@ -938,13 +938,10 @@
   switch ocg/.style={
     postaction={
       path picture={
-        \path let
-        \p1 = (path picture bounding box.south west),
-        \p2 = (path picture bounding box.north east)
-        in
-        coordinate (p1) at (\p1) coordinate (p2) at (\p2)
-        node[inner sep=0pt,anchor=south west,outer sep=0pt] at (p1)
-        {\switchocg*{#1}{\tikz \useasboundingbox (p1) rectangle (p2);}};
+        \path (path picture bounding box.south west) coordinate (p1)
+          (path picture bounding box.north east) coordinate (p2)
+          (p1) node[inner sep=0pt,anchor=south west,outer sep=0pt] {%
+            \switchocg*{#1}{\tikz \useasboundingbox (p1) rectangle (p2);}};
       }
     }
   },
@@ -985,39 +982,30 @@
   show ocg/.style={
     postaction={
       path picture={
-        \path let
-        \p1 = (path picture bounding box.south west),
-        \p2 = (path picture bounding box.north east)
-        in
-        coordinate (p1) at (\p1) coordinate (p2) at (\p2)
-        node[inner sep=0pt,anchor=south west,outer sep=0pt] at (p1)
-        {\showocg*{#1}{\tikz \useasboundingbox (p1) rectangle (p2);}};
+        \path (path picture bounding box.south west) coordinate (p1)
+          (path picture bounding box.north east) coordinate (p2)
+          (p1) node[inner sep=0pt,anchor=south west,outer sep=0pt] {%
+            \showocg*{#1}{\tikz \useasboundingbox (p1) rectangle (p2);}};
       }
     }
   },
   hide ocg/.style={
     postaction={
       path picture={
-        \path let
-        \p1 = (path picture bounding box.south west),
-        \p2 = (path picture bounding box.north east)
-        in
-        coordinate (p1) at (\p1) coordinate (p2) at (\p2)
-        node[inner sep=0pt,anchor=south west,outer sep=0pt] at (p1)
-        {\hideocg*{#1}{\tikz \useasboundingbox (p1) rectangle (p2);}};
+        \path (path picture bounding box.south west) coordinate (p1)
+          (path picture bounding box.north east) coordinate (p2)
+          (p1) node[inner sep=0pt,anchor=south west,outer sep=0pt] {%
+            \hideocg*{#1}{\tikz \useasboundingbox (p1) rectangle (p2);}};
       }
     }
   },
   actions ocg/.style n args={3}{
     postaction={
       path picture={
-        \path let
-        \p1 = (path picture bounding box.south west),
-        \p2 = (path picture bounding box.north east)
-        in
-        coordinate (p1) at (\p1) coordinate (p2) at (\p2)
-        node[inner sep=0pt,anchor=south west,outer sep=0pt] at (p1)
-        {\actionsocg*{#1}{#2}{#3}{\tikz \useasboundingbox (p1) rectangle (p2);}};
+        \path (path picture bounding box.south west) coordinate (p1)
+          (path picture bounding box.north east) coordinate (p2)
+          (p1) node[inner sep=0pt,anchor=south west,outer sep=0pt] {%
+            \actionsocg*{#1}{#2}{#3}{\tikz \useasboundingbox (p1) rectangle (p2);}};
       }
     }
   }