texlive[44475] Master/texmf-dist: tikzmark (1jun17)
commits+karl at tug.org
commits+karl at tug.org
Tue Jun 6 01:13:12 CEST 2017
Revision: 44475
http://tug.org/svn/texlive?view=revision&revision=44475
Author: karl
Date: 2017-06-06 01:13:12 +0200 (Tue, 06 Jun 2017)
Log Message:
-----------
tikzmark (1jun17)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/tikzmark/tikzmark.pdf
trunk/Master/texmf-dist/source/latex/tikzmark/tikzmark.dtx
trunk/Master/texmf-dist/tex/latex/tikzmark/tikzlibrarytikzmark.code.tex
Modified: trunk/Master/texmf-dist/doc/latex/tikzmark/tikzmark.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/tikzmark/tikzmark.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/tikzmark/tikzmark.dtx 2017-06-05 23:12:59 UTC (rev 44474)
+++ trunk/Master/texmf-dist/source/latex/tikzmark/tikzmark.dtx 2017-06-05 23:13:12 UTC (rev 44475)
@@ -146,7 +146,7 @@
}%
\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 @@
%</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,6 +207,7 @@
% \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}
%
@@ -213,7 +214,7 @@
% \providecommand*{\url}{\texttt}
% \title{The \textsf{tikzmark} package}
% \author{Andrew Stacey \\ \url{loopspace at mathforge.org}}
-% \date{v1.2~from 2016/04/07}
+% \date{v1.3~from 2017/06/01}
%
%
% \maketitle
@@ -587,7 +588,7 @@
\ifpgfrememberpicturepositiononpage%
\edef\pgf at temp{%
\noexpand\write\noexpand\pgfutil at auxout{%
- \string\savepicturepage{\pgfpictureid}{\noexpand\thepage}}}%
+ \string\savepicturepage{\pgfpictureid}{\noexpand\arabic{page}}}}%
\pgf at temp
\fi%
},
@@ -711,30 +712,12 @@
% \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.
+% 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}
-\begingroup
-\catcode`\;=\active
-\gdef\tikzmark at active#1#2{%
-\tikz[remember picture with id=#2] #1;}
-\endgroup
-% \end{macrocode}
-% Now, the version for ordinary semi-colon.
-% \begin{macrocode}
-\def\tikzmark at 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
-% \begin{macrocode}
\newcommand\tikzmark at outside[2][]{%
- \ifnum\catcode`\;=\active
- \let\tikzmark at next=\tikzmark at active
- \else
- \let\tikzmark at next=\tikzmark at nonactive
- \fi
- \tikzmark at 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 @@
\pgfsys at markposition{\pgfpictureid}%
\edef\pgf at temp{%
\noexpand\write\noexpand\pgfutil at auxout{%
- \string\savepicturepage{\pgfpictureid}{\noexpand\thepage}}}%
+ \string\savepicturepage{\pgfpictureid}{\noexpand\arabic{page}}}}%
\pgf at temp
\protected at write\pgfutil at auxout{}{%
\string\savepointas{\tikzmark at pp@name{#1}}{\pgfpictureid}{0pt}{0pt}}%
@@ -782,7 +765,8 @@
% \begin{macro}{\tikzmark<>}
% \begin{macrocode}
\@ifclassloaded{beamer}{
- \renewcommand<>{\tikzmark}[2][]{\only#3{\beameroriginal{\tikzmark}[{#1}]{#2}}}
+ \renewcommand<>{\tikzmark at outside}[2][]{\only#3{\beameroriginal{\tikzmark at outside}[{#1}]{#2}}}
+ \renewcommand<>{\tikzmark at inside}[2]{\only#3{\beameroriginal{\tikzmark at inside}{#1}{#2}}}
}{}
% \end{macrocode}
% \end{macro}
Modified: trunk/Master/texmf-dist/tex/latex/tikzmark/tikzlibrarytikzmark.code.tex
===================================================================
--- trunk/Master/texmf-dist/tex/latex/tikzmark/tikzlibrarytikzmark.code.tex 2017-06-05 23:12:59 UTC (rev 44474)
+++ trunk/Master/texmf-dist/tex/latex/tikzmark/tikzlibrarytikzmark.code.tex 2017-06-05 23:13:12 UTC (rev 44475)
@@ -23,7 +23,7 @@
\ifpgfrememberpicturepositiononpage%
\edef\pgf at temp{%
\noexpand\write\noexpand\pgfutil at auxout{%
- \string\savepicturepage{\pgfpictureid}{\noexpand\thepage}}}%
+ \string\savepicturepage{\pgfpictureid}{\noexpand\arabic{page}}}}%
\pgf at temp
\fi%
},
@@ -109,20 +109,8 @@
\pgf at pos@transform{\pgf at x}{\pgf at y}%
}%
}
-\begingroup
-\catcode`\;=\active
-\gdef\tikzmark at active#1#2{%
-\tikz[remember picture with id=#2] #1;}
-\endgroup
-\def\tikzmark at nonactive#1#2{%
-\tikz[remember picture with id=#2] #1;}
\newcommand\tikzmark at outside[2][]{%
- \ifnum\catcode`\;=\active
- \let\tikzmark at next=\tikzmark at active
- \else
- \let\tikzmark at next=\tikzmark at nonactive
- \fi
- \tikzmark at next{#1}{#2}%
+\tikz[remember picture with id=#2]{#1}%
}
\def\tikzmark at inside#1#2{%
\tikzset{remember picture}%
@@ -145,7 +133,7 @@
\pgfsys at markposition{\pgfpictureid}%
\edef\pgf at temp{%
\noexpand\write\noexpand\pgfutil at auxout{%
- \string\savepicturepage{\pgfpictureid}{\noexpand\thepage}}}%
+ \string\savepicturepage{\pgfpictureid}{\noexpand\arabic{page}}}}%
\pgf at temp
\protected at write\pgfutil at auxout{}{%
\string\savepointas{\tikzmark at pp@name{#1}}{\pgfpictureid}{0pt}{0pt}}%
@@ -152,7 +140,8 @@
\egroup
}
\@ifclassloaded{beamer}{
- \renewcommand<>{\tikzmark}[2][]{\only#3{\beameroriginal{\tikzmark}[{#1}]{#2}}}
+ \renewcommand<>{\tikzmark at outside}[2][]{\only#3{\beameroriginal{\tikzmark at outside}[{#1}]{#2}}}
+ \renewcommand<>{\tikzmark at inside}[2]{\only#3{\beameroriginal{\tikzmark at inside}{#1}{#2}}}
}{}
\@ifclassloaded{beamer}{
\renewcommand<>{\pgfmark}[1]{\only#2{\beameroriginal{\pgfmark}{#1}}}
More information about the tex-live-commits
mailing list