tikzmark (1jun17)

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

3 files changed, 17 insertions, 44 deletions

diff --git a/Master/texmf-dist/doc/latex/tikzmark/tikzmark.pdf b/Master/texmf-dist/doc/latex/tikzmark/tikzmark.pdf
index c18b8974dd6..86725d6d6f0 100644
--- a/Master/texmf-dist/doc/latex/tikzmark/tikzmark.pdf
+++ b/Master/texmf-dist/doc/latex/tikzmark/tikzmark.pdf
diff --git a/Master/texmf-dist/source/latex/tikzmark/tikzmark.dtx b/Master/texmf-dist/source/latex/tikzmark/tikzmark.dtx
index 411887f043f..9be9bd24c98 100644
--- a/Master/texmf-dist/source/latex/tikzmark/tikzmark.dtx
+++ b/Master/texmf-dist/source/latex/tikzmark/tikzmark.dtx
@@ -146,7 +146,7 @@ and the derived files           tikzmark.ins,
     }%
     \ifx\blines\empty
     \else
-    \edef\temp{\noexpand\tikz[remember         picture,overlay]\noexpand\node[fit={\blines},balloon] (#1) {};}%
+    \edef\temp{\noexpand\tikz[remember         picture,overlay]{\noexpand\node[fit={\blines},balloon] (#1) {}}}%
     \temp
     \fi
   }
@@ -185,7 +185,7 @@ and the derived files           tikzmark.ins,
 %</driver>
 % \fi
 %
-% \CheckSum{539}
+% \CheckSum{521}
 %
 % \CharacterTable
 %  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -207,13 +207,14 @@ and the derived files           tikzmark.ins,
 % \changes{1.0}{2012/11/08}{Converted to DTX file}
 % \changes{1.1}{2013/04/22}{Fix bug relating to active semi-colon}
 % \changes{1.2}{2016/04/07}{Tikzmark works inside tikzpicture, added easy suffix and prefix for tikzmarks}
+% \changes{1.3}{2017/06/01}{Tikzmark no longer uses semi-colon (too many issues with catcodes) and fix for beamer-awareness}
 %
 % \DoNotIndex{\newcommand,\newenvironment}
 %
 % \providecommand*{\url}{\texttt}
 % \title{The \textsf{tikzmark} package}
 % \author{Andrew Stacey \\ \url{loopspace@mathforge.org}}
-% \date{v1.2~from 2016/04/07}
+% \date{v1.3~from 2017/06/01}
 %
 %
 % \maketitle
@@ -587,7 +588,7 @@ and the derived files           tikzmark.ins,
       \ifpgfrememberpicturepositiononpage%
       \edef\pgf@temp{%
         \noexpand\write\noexpand\pgfutil@auxout{%
-        \string\savepicturepage{\pgfpictureid}{\noexpand\thepage}}}%
+        \string\savepicturepage{\pgfpictureid}{\noexpand\arabic{page}}}}%
       \pgf@temp
       \fi%
     },
@@ -711,30 +712,12 @@ and the derived files           tikzmark.ins,
 % \end{macro}
 %
 % \begin{macro}{\tikzmark}
-% Fix for bug reported in \href{http://tex.stackexchange.com/q/110014/86}{ Tikzmark and french seem to conflict}.
-% 
-% First, the version for active semi-colon.
-%    \begin{macrocode}
-\begingroup
-\catcode`\;=\active
-\gdef\tikzmark@active#1#2{%
-\tikz[remember picture with id=#2] #1;}
-\endgroup
-%    \end{macrocode}
-% Now, the version for ordinary semi-colon.
-%    \begin{macrocode}
-\def\tikzmark@nonactive#1#2{%
-\tikz[remember picture with id=#2] #1;}
-%    \end{macrocode}
-% And the wrapper function for the above, which is when we're outside a tikzpicture environment
+% The active/non-active semi-colon is proving somewhat hazardous to \Verb+\tikzmark+ (see  \href{http://tex.stackexchange.com/q/110014/86}{ Tikzmark and french seem to conflict} and \href{http://tex.stackexchange.com/q/335485/86}{Clash between tikzmark, babel package (french) and babel tikzlibrary}) so \Verb+\tikzmark+ now uses the brace-delimited version of the \Verb+\tikz+ command.
+%
+% This version is for when we're outside a tikzpicture environment
 %    \begin{macrocode}
 \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}%
 }
 %    \end{macrocode}
 % This is for when we're inside a tikzpicture environment
@@ -768,7 +751,7 @@ and the derived files           tikzmark.ins,
       \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}}%
@@ -782,7 +765,8 @@ and the derived files           tikzmark.ins,
 % \begin{macro}{\tikzmark<>}
 %    \begin{macrocode}
 \@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}}}
 }{}
 %    \end{macrocode}
 % \end{macro}
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}}}