tikzmark (1jun17)

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

1 files changed, 5 insertions, 16 deletions

diff --git a/Master/texmf-dist/tex/latex/tikzmark/tikzlibrarytikzmark.code.tex b/Master/texmf-dist/tex/latex/tikzmark/tikzlibrarytikzmark.code.tex
index 961c3bc731f..c7be8a5bc48 100644
--- a/Master/texmf-dist/tex/latex/tikzmark/tikzlibrarytikzmark.code.tex
+++ b/Master/texmf-dist/tex/latex/tikzmark/tikzlibrarytikzmark.code.tex
@@ -23,7 +23,7 @@
       \ifpgfrememberpicturepositiononpage%
       \edef\pgf@temp{%
         \noexpand\write\noexpand\pgfutil@auxout{%
-        \string\savepicturepage{\pgfpictureid}{\noexpand\thepage}}}%
+        \string\savepicturepage{\pgfpictureid}{\noexpand\arabic{page}}}}%
       \pgf@temp
       \fi%
     },
@@ -109,20 +109,8 @@
     \pgf@pos@transform{\pgf@x}{\pgf@y}%
     }%
   }
-\begingroup
-\catcode`\;=\active
-\gdef\tikzmark@active#1#2{%
-\tikz[remember picture with id=#2] #1;}
-\endgroup
-\def\tikzmark@nonactive#1#2{%
-\tikz[remember picture with id=#2] #1;}
 \newcommand\tikzmark@outside[2][]{%
-  \ifnum\catcode`\;=\active
-   \let\tikzmark@next=\tikzmark@active
-  \else
-   \let\tikzmark@next=\tikzmark@nonactive
-  \fi
-  \tikzmark@next{#1}{#2}%
+\tikz[remember picture with id=#2]{#1}%
 }
 \def\tikzmark@inside#1#2{%
   \tikzset{remember picture}%
@@ -145,14 +133,15 @@
       \pgfsys@markposition{\pgfpictureid}%
     \edef\pgf@temp{%
       \noexpand\write\noexpand\pgfutil@auxout{%
-        \string\savepicturepage{\pgfpictureid}{\noexpand\thepage}}}%
+        \string\savepicturepage{\pgfpictureid}{\noexpand\arabic{page}}}}%
     \pgf@temp
     \protected@write\pgfutil@auxout{}{%
       \string\savepointas{\tikzmark@pp@name{#1}}{\pgfpictureid}{0pt}{0pt}}%
     \egroup
   }
 \@ifclassloaded{beamer}{
-  \renewcommand<>{\tikzmark}[2][]{\only#3{\beameroriginal{\tikzmark}[{#1}]{#2}}}
+  \renewcommand<>{\tikzmark@outside}[2][]{\only#3{\beameroriginal{\tikzmark@outside}[{#1}]{#2}}}
+  \renewcommand<>{\tikzmark@inside}[2]{\only#3{\beameroriginal{\tikzmark@inside}{#1}{#2}}}
 }{}
 \@ifclassloaded{beamer}{
   \renewcommand<>{\pgfmark}[1]{\only#2{\beameroriginal{\pgfmark}{#1}}}