texlive[48929] Master/texmf-dist: tikzmark (18oct18)
commits+karl at tug.org
commits+karl at tug.org
Thu Oct 18 22:26:16 CEST 2018
Revision: 48929
http://tug.org/svn/texlive?view=revision&revision=48929
Author: karl
Date: 2018-10-18 22:26:16 +0200 (Thu, 18 Oct 2018)
Log Message:
-----------
tikzmark (18oct18)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/tikzmark/tikzmark.pdf
trunk/Master/texmf-dist/source/latex/tikzmark/tikzmark.dtx
trunk/Master/texmf-dist/source/latex/tikzmark/tikzmark.ins
trunk/Master/texmf-dist/tex/latex/tikzmark/tikzlibrarytikzmark.code.tex
trunk/Master/texmf-dist/tex/latex/tikzmark/tikzmarklibrarylistings.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 2018-10-18 00:23:14 UTC (rev 48928)
+++ trunk/Master/texmf-dist/source/latex/tikzmark/tikzmark.dtx 2018-10-18 20:26:16 UTC (rev 48929)
@@ -36,7 +36,7 @@
\endpreamble
\postamble
-Copyright (C) 2011-2016 by Andrew Stacey <loopspace at mathforge.org>
+Copyright (C) 2011-2018 by Andrew Stacey <loopspace at mathforge.org>
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License (LPPL), either
@@ -87,6 +87,7 @@
\documentclass{ltxdoc}
\usepackage[T1]{fontenc}
\usepackage{lmodern}
+\usepackage{amsmath}
%\usepackage{morefloats}
\usepackage{listings}
\usepackage{tikz}
@@ -93,7 +94,7 @@
\usetikzlibrary{fit,arrows,tikzmark,shadows,decorations.pathreplacing,calc}
\usetikzmarklibrary{listings}
-\usepackage[numbered]{hypdoc}
+%\usepackage[numbered]{hypdoc}
\definecolor{lstbgcolor}{rgb}{0.9,0.9,0.9}
\usepackage{listings}
@@ -102,6 +103,8 @@
\usepackage{fancyvrb}
+\usepackage[hyperindex=false]{hyperref}
+
\newenvironment{example}
{\VerbatimEnvironment
\begin{VerbatimOut}[gobble=2]{example.out}}
@@ -119,6 +122,19 @@
\end{center}
}
+\newenvironment{justexample}
+ {\VerbatimEnvironment
+ \begin{VerbatimOut}[gobble=2]{example.out}}
+ {\end{VerbatimOut}
+ \begin{center}
+% \setlength{\parindent}{0pt}
+ \fbox{\begin{minipage}{.9\linewidth}
+ \lstset{breakatwhitespace=true,breaklines=true,language=TeX,basicstyle=\small}
+ \lstinputlisting[]{example.out}
+ \end{minipage}}
+\end{center}
+}
+
\newcommand\balloon[4]{%
\pgfmathtruncatemacro\firstline{%
#3-1
@@ -176,8 +192,8 @@
},
}
-\EnableCrossrefs
-\CodelineIndex
+\DisableCrossrefs
+% \CodelineIndex
\RecordChanges
\begin{document}
\DocInput{\jobname.dtx}
@@ -185,7 +201,7 @@
%</driver>
% \fi
%
-% \CheckSum{521}
+% \CheckSum{919}
%
% \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
@@ -208,6 +224,9 @@
% \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}
+% \changes{1.4}{2017/10/29}{Bug fixes: spurious characters in aux file, tikzmark prefix/suffix ignored in iftikzmark test}
+% \changes{1.5}{2018/09/09}{Reintroduced the original command (now as tikzmarknode) with a mathchoice hack for different math modes}
+% \changes{1.6}{2019/10/18}{Added the ability to save node information between runs and between TeX documents}
%
% \DoNotIndex{\newcommand,\newenvironment}
%
@@ -214,7 +233,7 @@
% \providecommand*{\url}{\texttt}
% \title{The \textsf{tikzmark} package}
% \author{Andrew Stacey \\ \url{loopspace at mathforge.org}}
-% \date{v1.3~from 2017/06/01}
+% \date{v1.6~from 2018/10/18}
%
%
% \maketitle
@@ -322,7 +341,7 @@
%
% \begin{figure}
% \centering
-% \includegraphics{tikzmark_example}
+% \includegraphics{tikzmarkExample}
% \caption{First use of tikzmark}
% \label{fig:tikzmarkex}
% \end{figure}
@@ -342,6 +361,15 @@
% This version added two important features: a TikZ coordinate system for referencing saved marks directly and the ability to refer to marks earlier in the document than they are defined (the mechanism for remembering points uses the \Verb+aux+ file anyway so this was more about exposing the information earlier than anything complicated).
% Then in October 2012 there was a \href{http://tex.stackexchange.com/q/79121/86}{question} where it would have been useful to remember which page the mark was on and a \href{http://tex.stackexchange.com/q/79762/86}{question} where for some reason using the \Verb+\tikz+ macro didn't work so the \Verb+\pgfmark+ macro was introduced.
%
+% By this point, the \Verb+\tikzmark+ command had morphed considerably from its original definition.
+% Experience has shown that on the TeX-SX site it has continued to be used in its original form as well as its current form.
+% I've therefore taken the decision to reintroduce a form of the original command, now called \Verb+\tikzmarknode+.
+% It goes beyond the original version in that it uses some \Verb+\mathchoice+ trickery (inspired by \href{https://tex.stackexchange.com/a/122419/86}{this answer} from Heiko Oberdiek) to hopefully correctly choose the correct math style.
+%
+% The original reason for not using nodes inside \Verb+\tikzmark+ was to be able to use the information from a \Verb+\tikzmark+ before the point where it was defined (via information saved into the \Verb+aux+ file).
+% Thanks to a \href{https://tex.stackexchange.com/a/415862/86}{question on TeX-SX} about saving node information, I've developed code that solves that issue with nodes.
+% As it fits in the general concept of this package, I've added that code to the \Verb+\tikzmark+ package.
+%
% \section{Usage}
%
% This package defines the following commands and usable stuff.
@@ -371,6 +399,8 @@
%
% This is a more basic form of the \Verb+\tikzmark+ which doesn't use any of the \Verb+\tikz+ overhead.
% One advantage of this command is that it doesn't create an \Verb+hbox+.
+% It does, however, insert a \Verb+whatsit+ into the stream so it will, for example, stop two vertical spaces either side of it being merged.
+% This can't be avoided.
%
% If the \Verb+beamer+ class is loaded then this command is made overlay-aware.
%
@@ -379,6 +409,20 @@
% This is a simple conditional to test if a particular mark is available.
% It executes \Verb+true code+ if it is and \Verb+false code+ if not.
%
+% \item \Verb+\tikzmarknode+\oarg{options}\marg{name}\marg{contents}
+%
+% This is a reincarnation of the original \Verb+\tikzmark+ command which places its contents inside a \Verb+\tikz+ node. It also defines a \Verb+tikzmark+ with the same name. Using a sneaky trick with \Verb+\mathchoice+, it works inside a math environment. The spacing either side might not be quite right as although it detects the math style it doesn't got beyond that. The \Verb+options+ are passed to the node.
+%
+% Two styles are attempted, one on the surrounding picture and one on the node, which are:
+%
+% \begin{itemize}
+% \item \Verb+every tikzmarknode picture+
+% \item \Verb+every tikzmarknode+
+% \end{itemize}
+%
+% To refer to the \emph{node}, use usual TikZ coordinates.
+% To refer to the underlying \emph{tikzmark}, use the special tikzmark coordinates (see below).
+%
% \item \Verb+(pic cs:<name>)+ or \Verb+(pic cs:<name>,<coordinate>)+
%
% This is the method for referring to a position remembered by \Verb+\tikzmark+ (or \Verb+\pgfmark+) as a coordinate in a \Verb+tikzpicture+ environment (or \Verb+\tikz+ command).
@@ -387,7 +431,7 @@
% \item \Verb+/tikz/save picture id=<name>+
%
% This is the TikZ key that is used by \Verb+\tikzmark+ to actually save the connection between the name and the picture coordinate.
-% It can be used on an arbitrary picture to save its origin.
+% It can be used on an arbitrary picture to save its origin as a tikzmark.
%
% \item \Verb+/tikz/if picture id=#1#2#3+
%
@@ -433,6 +477,58 @@
% The simplest way to turn a pseudo-node into a more normal node is to use the \Verb+fit+ library.
% Using the above example, \Verb+\node[fit=(a),draw,inner sep=0pt] {};+ would draw a rectangle around the word \Verb+sub+ of exactly the same size as would appear had a normal node been created.
%
+% \item \emph{Node saving}
+%
+% The node saving system takes the information stored about a node and saves it for later use.
+% That later use can be in the same document, in which case it should be saved just to the memory of the current TeX process, or it can be used earlier in the same document or another document altogether (in particular, if the nodes are defined in a \Verb+tikzpicture+ that has been externalised, this can be used to import the node information into the main file) in which cases the node data is saved to a file.
+%
+% When working with files, nodes are saved and restored in bulk.
+% When working in memory, nodes are saved and restored in named lists.
+% Nodes are not actually saved until the end of the tikzpicture in which they are defined, meaning that if saving to memory then all the nodes in a tikzpicture will belong to the same list.
+%
+% The keys for working with saving and restoring nodes are as follows.
+%
+% \begin{itemize}
+% \item \Verb+save node+
+%
+% This is the key to put on a node that is to be saved.
+%
+% \item \Verb+set node group=<name>+
+%
+% Nodes are grouped together into a list that can be saved either to a file or for use later on in the document.
+% This sets the name for the current group.
+%
+% \item \Verb+restore nodes from list=<name>+
+%
+% This restores the node information from the named list to the current \Verb+tikzpicture+.
+% This is required both for when the node information comes from a file or from earlier in the same document.
+%
+% \item \Verb+save nodes to file+
+%
+% This is a \Verb+true/false+ key which determines whether to save the node information to a file.
+%
+% \item \Verb+set saved nodes file name=<name>+
+%
+% This sets the file name for the saved nodes (the extension will be \Verb+.nodes+.
+% The default is to use the current \TeX\ filename.
+% This is set globally, and once the file is opened then changing the name will have no effect.
+% (The file is not opened until it is actually needed to avoid creating empty files unnecessarily.)
+%
+% \item \Verb+restore nodes from file=<name>+
+%
+% This loads the node information from the file into the current document.
+%
+% The \Verb+<name>+ can have the syntax \Verb+[options]{name}+, where \Verb+options+ can be used to influence how the nodes are restored.
+% The key \Verb+transform saved nodes+ (see below) can be given here.
+% Another useful key is the \Verb+name prefix+ key which is applied to all restored nodes.
+%
+% \item \Verb+transform saved nodes+
+%
+% A particular use-case for restoring saved nodes is to safely include one \Verb+tikzpicture+ inside another by creating an image out of the inner picture and including it back in as a picture inside a node.
+% In that situation, restoring the nodes from the inner picture can make it possible to refer to coordinates from the inner picture to the outer one.
+% If there is a transformation in place on the containing node, this key applies that transformation to all the nodes in the inner picture.
+%
+% \end{itemize}
% \end{enumerate}
%
% \section{Examples and Extras}
@@ -489,9 +585,97 @@
% \end{tikzpicture}
% \end{example}
%
+% The \Verb+\tikmarknode+ puts a node around some text, which can be referred to later, and adds a \Verb+\tikzmark+ at its origin.
+%
+% \begin{example}
+% Putting a node around \tikzmarknode{txt}{some text} means we can connect text together, including in maths:
+% \[
+% \tikzmarknode{a}{\sum_{k=1}^n} k^{\tikzmarknode{b}{2}}
+% \]
+%
+% \begin{tikzpicture}[remember picture,overlay]
+% \draw[->] (txt) -- (a);
+% \draw[->] (a.south) to[out=-90,in=-45] (b.south east);
+% \end{tikzpicture}
+% \end{example}
+%
+% The syntax for saving node data is illustrated by the following example.
+%
+% File \Verb+firstpicture.tex+:
+%
+% \begin{justexample}
+% \documentclass[tikz,border=10pt]{standalone}
+% \usetikzlibrary{tikzmark,shapes.geometric}
+% \begin{document}
+% \begin{tikzpicture}[save nodes to file]
+% \node[draw,rotate=-30,save node](1) at (-2,0) {1};
+% \draw[->] (0,0) -- (1);
+% \node[draw,ellipse,save node] (c) at (current bounding box.center) {};
+% \end{tikzpicture}
+% \end{document}
+% \end{justexample}
+%
+% File \Verb+secondpicture.tex+:
+%
+% \begin{justexample}
+% \documentclass[tikz,border=10pt]{standalone}
+% \usetikzlibrary{tikzmark,shapes.geometric}
+% \begin{document}
+% \begin{tikzpicture}[save nodes to file]
+% \node[draw,rotate=-70,save node] (2) at (2,0) {2};
+% \draw[->] (0,0) -- (2);
+% \node[draw,ellipse,save node] (c) at (current bounding box.center) {};
+% \end{tikzpicture}
+% \end{document}
+% \end{justexample}
+%
+% Main file:
+%
+% \begin{justexample}
+% \documentclass{article}
+% \usepackage{tikz}
+% \usetikzlibrary{tikzmark}
+%
+% \begin{document}
+% \begin{tikzpicture}
+%
+% \node[draw,
+% rotate=30,
+% restore nodes from file={[transform saved nodes,name prefix=pic-1-]{firstpicture}}
+% ] (a-1) at (-2,-3) {\includegraphics{firstpicture.pdf}};
+%
+% \node[draw,
+% rotate=70,
+% restore nodes from file={[transform saved nodes,name prefix=pic-2-]{secondpicture}}
+% ] (a-2) at (+2,+2) {\includegraphics{secondpicture.pdf}};
+%
+% \draw[red] (pic-1-1.north west) -- (pic-1-1.north east) -- (pic-1-1.south east) -- (pic-1-1.south west) -- cycle;
+% \draw[red] (pic-2-2.north west) -- (pic-2-2.north east) -- (pic-2-2.south east) -- (pic-2-2.south west) -- cycle;
+%
+% \node[red] at (pic-1-1) {1};
+% \node[red] at (pic-2-2) {2};
+%
+% \draw (a-1) circle[radius=5pt];
+% \draw (a-2) circle[radius=5pt];
+%
+% \draw (pic-1-1) -- (pic-2-2);
+% \end{tikzpicture}
+% \end{document}
+% \end{justexample}
+%
+% This produces:
+%
+% \begin{center}
+% \fbox{\includegraphics{tikzrefextnodes}}
+% \end{center}
+%
% \subsection{Code Listings}
%
-% If the \Verb+listings+ package has been loaded then issuing \Verb+\usetikzmarklibrary{listings}+ will load in some code to add marks to \Verb+lstlisting+ environments.
+% If the \Verb+listings+ package has been loaded then issuing
+%
+% \Verb+\usetikzmarklibrary{listings}+
+%
+% \noindent will load in some code to add marks to \Verb+lstlisting+ environments.
% This code places a mark at three places on a line of code in a \Verb+listings+ environment.
% The marks are placed at the start of the line, the first non-whitespace character, and the end of the line (if the line is blank the latter two are not placed).
% (This has not been extensively tested, it works by adding code to various ``hooks'' that are made available by the \Verb+listings+ package; it is quite possible that the hooks chosen are both wrong and insufficient to cover all desired cases.)
@@ -559,8 +743,8 @@
% \section{Acknowledgements}
%
% The \Verb+\tikzmark+ macro has been used and abused by many users of \href{http://tex.stackexchange.com}{TeX-SX}.
-% Of particular note (but in no particular order) are \href{}{Peter Grill}, \href{}{Gonzalo Medina}, \href{}{Claudio Fiandrino}, and \href{}{percusse}.
-% I would also like to mention David Carlisle whose knowledge of TikZ continues to astound us all.
+% Of particular note (but in no particular order) are \href{https://tex.stackexchange.com/users/4301/peter-grill}{Peter Grill}, \href{https://tex.stackexchange.com/users/3954/gonzalo-medina}{Gonzalo Medina}, \href{https://tex.stackexchange.com/users/13304/claudio-fiandrino}{Claudio Fiandrino}, \href{https://tex.stackexchange.com/users/3235/percusse}{percusse}, and \href{https://tex.stackexchange.com/users/121799/marmot}{marmot}.
+% I would also like to mention \href{https://tex.stackexchange.com/users/1090/david-carlisle}{David Carlisle} whose knowledge of TikZ continues to astound us all.
%
%
% \StopEventually{}
@@ -572,7 +756,13 @@
% \fi
% \subsection{Main Code}
%
+%
+% The \Verb+save nodes+ code uses \LaTeX3.
% \begin{macrocode}
+\RequirePackage{expl3, l3keys2e, xparse}
+% \end{macrocode}
+%
+% \begin{macrocode}
\tikzset{%
remember picture with id/.style={%
remember picture,
@@ -588,7 +778,10 @@
\ifpgfrememberpicturepositiononpage%
\edef\pgf at temp{%
\noexpand\write\noexpand\pgfutil at auxout{%
- \string\savepicturepage{\pgfpictureid}{\noexpand\arabic{page}}}}%
+ \string\savepicturepage%
+ {\pgfpictureid}{\noexpand\arabic{page}}%
+ }%
+ }%
\pgf at temp
\fi%
},
@@ -598,7 +791,8 @@
% \begin{macrocode}
save picture id/.code={%
\protected at write\pgfutil at auxout{}{%
- \string\savepointas{\tikzmark at pp@name{#1}}{\pgfpictureid}{0pt}{0pt}}%
+ \string\savepointas%
+ {\tikzmark at pp@name{#1}}{\pgfpictureid}{0pt}{0pt}}%
},
% \end{macrocode}
% Provides a way to test if a picture has already been saved (in particular, can avoid errors on first runs)
@@ -640,7 +834,11 @@
%
% \begin{macro}{\tikzmark at pp@name}
% \begin{macrocode}
-\def\tikzmark at pp@name#1{\csname pgfk@/tikz/tikzmark prefix\endcsname#1\csname pgfk@/tikz/tikzmark suffix\endcsname}%
+\def\tikzmark at pp@name#1{%
+ \csname pgfk@/tikz/tikzmark prefix\endcsname%
+ #1%
+ \csname pgfk@/tikz/tikzmark suffix\endcsname%
+}%
% \end{macrocode}
% \end{macro}
%
@@ -649,7 +847,8 @@
% \begin{macrocode}
\def\savepointas#1#2#3#4{%
\expandafter\gdef\csname save at pt@#1\endcsname{#2}%
- \expandafter\gdef\csname save at pt@#1 at offset\endcsname{\pgfqpoint{#3}{#4}}%
+ \expandafter\gdef\csname save at pt@#1 at offset\endcsname%
+ {\pgfqpoint{#3}{#4}}%
}
\def\savepicturepage#1#2{%
\expandafter\gdef\csname save at pg@#1\endcsname{#2}%
@@ -680,26 +879,32 @@
\@ifundefined{save at pt@\tmk at label}{%
\tikz at scan@one at point\pgfutil at firstofone\tmk at def
}{%
- \pgfsys at getposition{\csname save at pt@\tmk at label\endcsname}\save at orig@pic%
- \pgfsys at getposition{\pgfpictureid}\save at this@pic%
- \pgf at process{\pgfpointorigin\save at this@pic}%
- \pgf at xa=\pgf at x
- \pgf at ya=\pgf at y
- \pgf at process{\pgfpointorigin\save at orig@pic}%
- \advance\pgf at x by -\pgf at xa
- \advance\pgf at y by -\pgf at ya
- \pgf at xa=\pgf at x
- \pgf at ya=\pgf at y
- \pgf at process{\pgfpointorigin\csname save at pt@\tmk at label @offset\endcsname}%
+ \pgfsys at getposition{\csname save at pt@\tmk at label\endcsname}%
+ \save at orig@pic%
+ \pgfsys at getposition{\pgfpictureid}\save at this@pic%
+ \pgf at process{\pgfpointorigin\save at this@pic}%
+ \pgf at xa=\pgf at x
+ \pgf at ya=\pgf at y
+ \pgf at process{\pgfpointorigin\save at orig@pic}%
+ \advance\pgf at x by -\pgf at xa
+ \advance\pgf at y by -\pgf at ya
+ \pgf at xa=\pgf at x
+ \pgf at ya=\pgf at y
+ \pgf at process%
+ {\pgfpointorigin\csname save at pt@\tmk at label @offset\endcsname}%
\advance\pgf at xa by \pgf at x
\advance\pgf at ya by \pgf at y
\@ifundefined{save at pg@\csname save at pt@\tmk at label\endcsname}{}{%
\@ifundefined{save at pg@\pgfpictureid}{}{%
\pgfkeysvalueof{/tikz/next page vector}%
- \advance \pgf at xa by \csname save at pg@\csname save at pt@\tmk at label\endcsname\endcsname\pgf at x\relax
-\advance \pgf at ya by \csname save at pg@\csname save at pt@\tmk at label\endcsname\endcsname\pgf at y\relax
- \advance \pgf at xa by -\csname save at pg@\pgfpictureid\endcsname\pgf at x\relax
-\advance \pgf at ya by -\csname save at pg@\pgfpictureid\endcsname\pgf at y\relax
+ \advance \pgf at xa by %
+ \csname save at pg@\csname save at pt@\tmk at label\endcsname\endcsname\pgf at x\relax
+ \advance \pgf at ya by %
+ \csname save at pg@\csname save at pt@\tmk at label\endcsname\endcsname\pgf at y\relax
+ \advance \pgf at xa by %
+ -\csname save at pg@\pgfpictureid\endcsname\pgf at x\relax
+ \advance \pgf at ya by %
+ -\csname save at pg@\pgfpictureid\endcsname\pgf at y\relax
}%
}%
\pgf at x=\pgf at xa
@@ -726,7 +931,7 @@
\tikzset{remember picture}%
\tikz at scan@one at point\pgfutil at firstofone#2\relax
\protected at write\pgfutil at auxout{}{%
- \string\savepointas{\tikzmark at pp@name{#1}}{\pgfpictureid}{\the\pgf at x pt}{\the\pgf at y pt}}%
+ \string\savepointas{\tikzmark at pp@name{#1}}{\pgfpictureid}{\the\pgf at x}{\the\pgf at y}}%
}
% \end{macrocode}
% And finally, the ultimate invoker:
@@ -765,8 +970,12 @@
% \begin{macro}{\tikzmark<>}
% \begin{macrocode}
\@ifclassloaded{beamer}{
- \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}}}
+ \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}
@@ -792,7 +1001,7 @@
% \begin{macro}{\iftikzmark}
% \begin{macrocode}
\newcommand\iftikzmark[3]{%
- \@ifundefined{save at pt@#1}{%
+ \@ifundefined{save at pt@\tikzmark at pp@name{#1}}{%
#3%
}{%
#2%
@@ -802,6 +1011,7 @@
% \end{macro}
%
% \begin{macro}{\subnode}
+% Note: much of this code was inevitably adapted from the node defining code in the TikZ/PGF sources.
% \begin{macrocode}
\newcommand\subnode[3][]{%
\begingroup
@@ -841,9 +1051,12 @@
\ifx\pgf at node@name\pgfutil at empty%
\else%
\expandafter\xdef\csname pgf at sh@ns@\pgf at node@name\endcsname{\tikz at shape}%
- \edef\pgf at sh@@temp{\noexpand\gdef\expandafter\noexpand\csname pgf at sh@np@\pgf at node@name\endcsname}%
- \expandafter\pgf at sh@@temp\expandafter{\pgf at sh@savedpoints}%
- \edef\pgf at sh@@temp{\noexpand\gdef\expandafter\noexpand\csname pgf at sh@ma@\pgf at node@name\endcsname}% MW
+ \edef\pgf at sh@@temp{%
+ \noexpand\gdef\expandafter\noexpand\csname pgf at sh@np@\pgf at node@name\endcsname}%
+ \expandafter\pgf at sh@@temp\expandafter{%
+ \pgf at sh@savedpoints}%
+ \edef\pgf at sh@@temp{%
+ \noexpand\gdef\expandafter\noexpand\csname pgf at sh@ma@\pgf at node@name\endcsname}% MW
\expandafter\pgf at sh@@temp\expandafter{\pgf at sh@savedmacros}% MW
\pgfgettransform\pgf at temp
\expandafter\xdef\csname pgf at sh@nt@\pgf at node@name\endcsname{\pgf at temp}%
@@ -858,9 +1071,75 @@
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\tikzmarknode}
+% The \Verb+\tikzmark+ macro has changed considerably since its first inception, but there does still seem to be a use for the original version which put stuff inside a node. This command reintroduces that command.
+%
+% It does its best to work inside a math environment by a sneaky trick involving \Verb+\mathchoice+: the \Verb+remember picture+ key means that only the picture id of the typeset box is saved to the aux file. So comparing the possible picture ids of the four options with the one read from the aux file, we can figure out which box was actually used.
+% \begin{macrocode}
+\def\tikzmarknode@#1#2#3{%
+ \tikz[%
+ remember picture,
+ baseline=(#2.base),
+ save picture id={#2},
+ every tikzmarknode picture/.try
+ ] {
+ \node[
+ anchor=base,
+ inner sep=0pt,
+ name={#2},
+ node contents={#3},
+ every tikzmarknode/.try,
+ #1
+ ]}%
+}
+
+\newcommand\tikzmarknode[3][]{%
+ \ifmmode
+ \mathchoice{%
+ \tikzmarknode@{#1}{#2-d}{\(\displaystyle #3\)}%
+ }{%
+ \tikzmarknode@{#1}{#2-t}{\(\textstyle #3\)}%
+ }{%
+ \tikzmarknode@{#1}{#2-s}{\(\scriptstyle #3\)}%
+ }{%
+ \tikzmarknode@{#1}{#2-ss}{\(\scriptscriptstyle #3\)}%
+ }%
+ \let\pgf at nodecallback\pgfutil at gobble
+ \def\tzmk at prfx{pgf at sys@pdf at mark@pos at pgfid}%
+ \edef\tzmk at pic{\tzmk at prfx\the\pgf at picture@serial at count}
+ \expandafter\ifx\csname\tzmk at pic\endcsname\relax
+ \edef\tzmk at pic{\tzmk at prfx\the\numexpr\the\pgf at picture@serial at count-1\relax}%
+ \expandafter\ifx\csname\tzmk at pic\endcsname\relax
+\edef\tzmk at pic{\tzmk at prfx\the\numexpr\the\pgf at picture@serial at count-2\relax}%
+ \expandafter\ifx\csname\tzmk at pic\endcsname\relax
+\edef\tzmk at pic{\tzmk at prfx\the\numexpr\the\pgf at picture@serial at count-3\relax}%
+ \expandafter\ifx\csname\tzmk at pic\endcsname\relax
+ \pgfnodealias{#2}{#2-t}% %% Fallback
+ \else
+ \pgfnodealias{#2}{#2-d}%
+ \fi
+ \else
+ \pgfnodealias{#2}{#2-t}%
+ \fi
+ \else
+ \pgfnodealias{#2}{#2-s}%
+ \fi
+ \else
+ \pgfnodealias{#2}{#2-ss}%
+ \fi
+ \else
+ \tikzmarknode@{#1}{#2}{#3}%
+ \fi
+}
+% \end{macrocode}
+% \end{macro}
+%
+%
% \begin{macro}{\usetikzmarklibrary}
% \begin{macrocode}
-\def\usetikzmarklibrary{\pgfutil at ifnextchar[{\use at tikzmarklibrary}{\use@@tikzmarklibrary}}%}
+\def\usetikzmarklibrary{%
+ \pgfutil at ifnextchar[{\use at tikzmarklibrary}{\use@@tikzmarklibrary}%
+ }%}
\def\use at tikzmarklibrary[#1]{\use@@tikzmarklibrary{#1}}
\def\use@@tikzmarklibrary#1{%
\edef\pgf at list{#1}%
@@ -869,7 +1148,8 @@
\ifx\pgf at temp\pgfutil at empty
\else
\expandafter\ifx\csname tikzmark at library@\pgf at temp @loaded\endcsname\relax%
- \expandafter\global\expandafter\let\csname tikzmark at library@\pgf at temp @loaded\endcsname=\pgfutil at empty%
+ \expandafter\global\expandafter\let%
+ \csname tikzmark at library@\pgf at temp @loaded\endcsname=\pgfutil at empty%
\expandafter\edef\csname tikzmark at library@#1 at atcode\endcsname{\the\catcode`\@}
\expandafter\edef\csname tikzmark at library@#1 at barcode\endcsname{\the\catcode`\|}
\catcode`\@=11
@@ -887,6 +1167,502 @@
% \end{macrocode}
% \end{macro}
%
+% The \Verb+save node+ code is written in \LaTeX3.
+%
+% \begin{macrocode}
+\ExplSyntaxOn
+% \end{macrocode}
+%
+% We save our information in a ``property list'', which is L3's
+% version of an associative array or dictionary. They keys will give
+% the ability to store several groups of nodes and restore them at
+% will.
+% \begin{macrocode}
+\prop_new:N \g__sn_prop
+% \end{macrocode}
+% We'll need a couple of spare token lists
+% \begin{macrocode}
+\tl_new:N \l__sn_tmpa_tl
+\tl_new:N \l__sn_tmpb_tl
+% \end{macrocode}
+%
+% Another useful token list
+% \begin{macrocode}
+\tl_new:N \l__open_bracket_tl
+\tl_set:Nn \l__open_bracket_tl {[} %]
+% \end{macrocode}
+%
+% This token list is used for our current node group name
+% \begin{macrocode}
+\tl_new:N \l__sn_group_tl
+% \end{macrocode}
+%
+% We store up the nodes in a list and save them at the end of a given tikzpicture.
+% \begin{macrocode}
+\clist_new:N \l__sn_nodes_clist
+% \end{macrocode}
+%
+% This boolean is for whether we save to a file or not.
+% \begin{macrocode}
+\bool_new:N \l__sn_file_bool
+% \end{macrocode}
+%
+% Dimensions and token lists for shifting
+% \begin{macrocode}
+\dim_new:N \l__sn_x_dim
+\dim_new:N \l__sn_y_dim
+\dim_new:N \l__sn_xa_dim
+\dim_new:N \l__sn_ya_dim
+\tl_new:N \l__sn_centre_tl
+
+\tl_new:N \l__sn_transformation_tl
+\tl_set:Nn \l__sn_transformation_tl {{1}{0}{0}{1}{0pt}{0pt}}
+% \end{macrocode}
+%
+% Set up a stream for saving the nodes data to a file
+% \begin{macrocode}
+\iow_new:N \g__sn_stream
+\bool_new:N \g__sn_stream_bool
+\tl_new:N \g__sn_filename_tl
+\tl_set:Nx \g__sn_filename_tl {\c_sys_jobname_str}
+
+\cs_new_nopar:Npn \sn_open_stream:
+{
+ \bool_if:NF \g__sn_stream_bool
+ {
+ \iow_open:Nn \g__sn_stream {\tl_use:N \g__sn_filename_tl .nodes}
+ \bool_gset_true:N \g__sn_stream_bool
+ }
+}
+
+\AtEndDocument
+{
+ \ExplSyntaxOn
+ \bool_if:NT \g__sn_stream_bool
+ {
+ \iow_close:N \g__sn_stream
+ }
+ \ExplSyntaxOff
+}
+% \end{macrocode}
+%
+% LaTeX3 wrappers around some PGF functions (to avoid @-catcode issues)
+% \begin{macrocode}
+\makeatletter
+\cs_set_eq:NN \tikz_set_node_name:n \tikz at pp@name
+\cs_set_eq:NN \tikz_fig_must_be_named: \tikz at fig@mustbenamed
+
+\cs_new_nopar:Npn \tikz_scan_point:n #1
+{
+ \tikz at scan@one at point\pgfutil at firstofone#1\relax
+}
+
+\cs_new_nopar:Npn \tikz_scan_point:NNn #1#2#3
+{
+ \tikz at scan@one at point\pgfutil at firstofone#3\relax
+ \dim_set_eq:NN #1 \pgf at x
+ \dim_set_eq:NN #2 \pgf at y
+}
+
+\makeatother
+\cs_generate_variant:Nn \tikz_scan_point:n {V}
+\cs_generate_variant:Nn \tikz_scan_point:NNn {NNV}
+% \end{macrocode}
+%
+% \begingroup
+% \catcode`_=12
+% \begin{macro}{\save_nodes:Nn}
+% This is the command that actually does the work. It constructs a
+% token list which contains the code that will restore the node data
+% when invoked. The two arguments are the token list to store this in
+% and a comma separated list of the node names to be saved.
+% \begin{macrocode}
+\cs_new_nopar:Npn \save_nodes:Nn #1#2
+{
+% \end{macrocode}
+% Clear our token lists
+% \begin{macrocode}
+ \tl_clear:N \l__sn_tmpa_tl
+% \end{macrocode}
+% Set the centre of the picture
+% \begin{macrocode}
+ \tikz_scan_point:NNn \l__sn_x_dim \l__sn_y_dim {(current~ bounding~ box.center)}
+ \dim_set:Nn \l__sn_x_dim {-\l__sn_x_dim}
+ \dim_set:Nn \l__sn_y_dim {-\l__sn_y_dim}
+ \tl_set:Nx \l__sn_centre_tl {
+ {1}{0}{0}{1}{\dim_use:N \l__sn_x_dim}{\dim_use:N \l__sn_y_dim}
+ }
+% \end{macrocode}
+% Iterate over the list of node names
+% \begin{macrocode}
+ \clist_map_inline:nn {#2}
+ {
+% \end{macrocode}
+% Test to see if the node has been defined
+% \begin{macrocode}
+ \tl_if_exist:cT {pgf at sh@ns@##1}
+ {
+% \end{macrocode}
+% The node information is stored in a series of macros of the form
+% \Verb+\pgf at sh@XX at nodename+ where XX is one of the following.
+% \begin{macrocode}
+ \clist_map_inline:nn {ns,np,ma,pi}
+ {
+% \end{macrocode}
+% Our token list will look like:
+%
+% \Verb+\tl_set:cn {pgf at sh@XX at nodename}+ {<current contents of that macro>}
+%
+% This will restore \Verb+\pgf at sh@XX at nodename+ to its current value
+% when this list is invoked.
+%
+% This part puts the \Verb+\tl_set:cn {pgf at sh@XX at nodename}+ in place
+% \begin{macrocode}
+ \tl_put_right:Nn \l__sn_tmpa_tl
+ {
+ \tl_gset:cn {pgf at sh@####1@ \tikz_set_node_name:n{##1} }
+ }
+% \end{macrocode}
+% Now we put the current contents in place. We're doing this in
+% an expansive context to get at the contents. The \Verb+\exp_not:v+
+% part takes the current value of \Verb+\pgf at sh@XX at nodename+ and puts
+% it in place, preventing further expansion.
+% \begin{macrocode}
+ \tl_if_exist:cTF {pgf at sh@####1@##1}
+ {
+ \tl_put_right:Nx \l__sn_tmpa_tl {
+ {\exp_not:v {pgf at sh@####1@ \tikz_set_node_name:n {##1}}}
+ }
+ }
+ {
+ \tl_put_right:Nx \l__sn_tmpa_tl {{}}
+ }
+ }
+ \tl_put_right:Nn \l__sn_tmpa_tl
+ {
+ \tl_gset:cn {pgf at sh@nt@ \tikz_set_node_name:n{##1} }
+ }
+ \compose_transformations:NVv \l__sn_tmpb_tl \l__sn_centre_tl {pgf at sh@nt@##1}
+ \tl_put_right:Nx \l__sn_tmpa_tl {{\exp_not:V \l__sn_tmpb_tl}}
+ \tl_put_right:Nn \l__sn_tmpa_tl {
+ \transform_node:Nn \l__sn_transformation_tl {
+ \tikz_set_node_name:n{##1}
+ }
+ }
+ }
+ }
+% \end{macrocode}
+% Once we've assembled our token list, we store it in the given
+% token list
+% \begin{macrocode}
+ \tl_set_eq:NN #1 \l__sn_tmpa_tl
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\save_nodes_to_list:nn}
+% Save the nodes to a list, given a key
+% \begin{macrocode}
+\cs_new_nopar:Npn \save_nodes_to_list:nn #1#2
+{
+ \save_nodes:Nn \l__sn_tmpa_tl {#2}
+ \prop_gput:NnV \g__sn_prop {#1} \l__sn_tmpa_tl
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\save_nodes_to_file:n}
+% Save the nodes to a file
+% \begin{macrocode}
+\cs_new_nopar:Npn \save_nodes_to_file:n #1
+{
+ \save_nodes:Nn \l__sn_tmpa_tl {#1}
+% \end{macrocode}
+% Save the token list to the aux file so that on reading the aux
+% file, we restore the node definitions
+% \begin{macrocode}
+ \sn_open_stream:
+ \iow_now:Nx \g__sn_stream
+ {
+ \iow_newline:
+ \exp_not:V \l__sn_tmpa_tl
+ \iow_newline:
+ }
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macrocode}
+\cs_generate_variant:Nn \save_nodes_to_list:nn {VV}
+\cs_generate_variant:Nn \save_nodes_to_file:n {V}
+% \end{macrocode}
+%
+% \begin{macro}{\restore_nodes_from_list:n}
+% \begin{macrocode}
+\cs_new_nopar:Npn \restore_nodes_from_list:n #1
+{
+% \end{macrocode}
+% Restoring nodes is simple: look in the property list for the key
+% and if it exists, invoke the macro stored there.
+% \begin{macrocode}
+ \prop_get:NnNT \g__sn_prop {#1} \l__sn_tmpa_tl
+ {
+ \tl_use:N \l__sn_tmpa_tl
+ }
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\restore_nodes_from_file:n}
+% \begin{macrocode}
+\cs_new_nopar:Npn \restore_nodes_from_file:n #1
+{
+ \file_if_exist:nT {#1.nodes}
+ {
+ \ExplSyntaxOn
+ \file_input:n {#1.nodes}
+ \ExplSyntaxOff
+ }
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\compose_transformations:Nnn}
+% Compose PGF transformations \Verb+#2 * #3+, storing the result in \Verb+#1+
+
+% I think the PGF Manual might be incorrect. It implies that the
+% matrix is stored row-major, but experimentation implies column-major.
+%
+% That is, \Verb+{a}{b}{c}{d}{s}{t}+ is:
+%
+% \[
+% \begin{bmatrix} a & c \\ b & d \end{bmatrix}
+% \]
+%
+% \begin{macrocode}
+\cs_new_nopar:Npn \compose_transformations:Nnn #1#2#3
+{
+ \tl_gset:Nx #1
+ {
+ {\fp_eval:n {
+ \tl_item:nn {#2} {1}
+ * \tl_item:nn {#3} {1}
+ +
+ \tl_item:nn {#2} {3}
+ * \tl_item:nn {#3} {2}
+ }
+ }
+ {\fp_eval:n {
+ \tl_item:nn {#2} {2}
+ * \tl_item:nn {#3} {1}
+ +
+ \tl_item:nn {#2} {4}
+ * \tl_item:nn {#3} {2}
+ }
+ }
+ {\fp_eval:n {
+ \tl_item:nn {#2} {1}
+ * \tl_item:nn {#3} {3}
+ +
+ \tl_item:nn {#2} {3}
+ * \tl_item:nn {#3} {4}
+ }
+ }
+ {\fp_eval:n {
+ \tl_item:nn {#2} {2}
+ * \tl_item:nn {#3} {3}
+ +
+ \tl_item:nn {#2} {4}
+ * \tl_item:nn {#3} {4}
+ }
+ }
+ {\fp_to_dim:n {
+ \tl_item:nn {#2} {1}
+ * \tl_item:nn {#3} {5}
+ +
+ \tl_item:nn {#2} {3}
+ * \tl_item:nn {#3} {6}
+ +
+ \tl_item:nn {#2} {5}
+ }
+ }
+ {\fp_to_dim:n {
+ \tl_item:nn {#2} {2}
+ * \tl_item:nn {#3} {5}
+ +
+ \tl_item:nn {#2} {4}
+ * \tl_item:nn {#3} {6}
+ +
+ \tl_item:nn {#2} {6}
+ }
+ }
+ }
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macrocode}
+\cs_generate_variant:Nn \compose_transformations:Nnn {cVv,NVv,NVn,NvV,NnV}
+% \end{macrocode}
+%
+% \begin{macro}{\transform_node:Nn}
+% \begin{macrocode}
+\cs_new_nopar:Npn \transform_node:Nn #1#2
+{
+ \compose_transformations:cVv {pgf at sh@nt@#2} #1 {pgf at sh@nt@#2}
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\set_transform_from_node:n}
+% \begin{macrocode}
+\cs_new_nopar:Npn \set_transform_from_node:n #1
+{
+ \tl_set_eq:Nc \l__sn_transformation_tl {pgf at sh@nt@#1}
+ \tikz_scan_point:NNn \l__sn_x_dim \l__sn_y_dim {(#1.center)}
+
+ \dim_set:Nn \l__sn_x_dim {\l__sn_x_dim - \tl_item:cn {pgf at sh@nt@#1}{5}}
+ \dim_set:Nn \l__sn_y_dim {\l__sn_y_dim - \tl_item:cn {pgf at sh@nt@#1}{6}}
+
+ \compose_transformations:NnV \l__sn_transformation_tl {
+ {1}{0}{0}{1}{\dim_use:N \l__sn_x_dim}{\dim_use:N \l__sn_y_dim}
+ } \l__sn_transformation_tl
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macrocode}
+\cs_generate_variant:Nn \set_transform_from_node:n {v}
+% \end{macrocode}
+%
+% Set the TikZ keys for access to the above commands.
+% \begin{macrocode}
+\tikzset{
+ set~ saved~ nodes~ file~ name/.code={
+ \tl_gset:Nx \g__sn_filename_tl {#1}
+ },
+ transform~ saved~ nodes/.code={
+ \set_transform_from_node:v {tikz at last@fig at name}
+ },
+ set~ node~ group/.code={
+ \tl_set:Nn \l__sn_group_tl {#1}
+ \pgfkeysalso{
+ execute~ at~ end~ scope={
+ \maybe_save_nodes:
+ }
+ }
+ },
+% \end{macrocode}
+% Are we saving to a file?
+% \begin{macrocode}
+ save~ nodes~ to~ file/.code={
+ \tl_if_eq:nnTF {#1}{false}
+ {
+ \bool_set_false:N \l__sn_file_bool
+ }
+ {
+ \bool_set_true:N \l__sn_file_bool
+ }
+ \pgfkeysalso{
+ execute~ at~ end~ scope={
+ \maybe_save_nodes:
+ }
+ }
+ },
+% \end{macrocode}
+% Append current node to the list of nodes to be saved
+% \begin{macrocode}
+ save~ node/.code={
+ \tikz_fig_must_be_named:
+ \pgfkeysalso{append~ after~ command={
+ \pgfextra{
+ \clist_gput_right:Nv \l__sn_nodes_clist {tikz at last@fig at name}
+ }
+ }
+ }
+ },
+% \end{macrocode}
+% Restore nodes from file
+% \begin{macrocode}
+ restore~ nodes~ from~ file/.code={
+ \tikz_fig_must_be_named:
+ \pgfkeysalso{append~ after~ command={
+ \pgfextra{
+ \scope
+ \split_argument:NNn \tikzset \restore_nodes_from_file:n {#1}
+ \endscope
+ }
+ }
+ }
+ },
+% \end{macrocode}
+% Restore nodes from list
+% \begin{macrocode}
+ restore~ nodes~ from~ list/.code={
+ \tikz_fig_must_be_named:
+ \pgfkeysalso{append~ after~ command={
+ \pgfextra{
+ \scope
+ \split_argument:NNn \tikzset \restore_nodes_from_list:n {#1}
+ \endscope
+ }
+ }
+ }
+ }
+}
+\cs_generate_variant:Nn \clist_gput_right:Nn {Nv}
+% \end{macrocode}
+%
+% \begin{macro}{\split_argument:NNn}
+% \begin{macrocode}
+\cs_new_nopar:Npn \split_argument:NNn #1#2#3
+{
+ \tl_set:Nx \l__sn_tmpa_tl {\tl_head:n {#3}}
+ \tl_if_eq:NNTF \l__sn_tmpa_tl \l__open_bracket_tl
+ {
+ \split_argument_aux:NNp #1#2#3
+ }
+ {
+ #2 {#3}
+ }
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\split_argument_aux:NNp}
+% \begin{macrocode}
+\cs_new_nopar:Npn \split_argument_aux:NNp #1#2[#3]#4
+{
+ #1 {#3}
+ #2 {#4}
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\maybe_save_nodes:}
+% \begin{macrocode}
+\cs_new_nopar:Npn \maybe_save_nodes:
+{
+ \clist_if_empty:NF \l__sn_nodes_clist
+ {
+ \bool_if:NTF \l__sn_file_bool
+ {
+ \save_nodes_to_file:V \l__sn_nodes_clist
+ }
+ {
+ \tl_if_empty:NF \l__sn_group_tl
+ {
+ \save_nodes_to_list:VV \l__sn_group_tl \l__sn_nodes_clist
+ }
+ }
+ \clist_gclear:N \l__sn_nodes_clist
+ }
+}
+% \end{macrocode}
+% \end{macro}
+% \endgroup
+% \begin{macrocode}
+\ExplSyntaxOff
+% \end{macrocode}
% \iffalse
%</tikzlibrary>
% \fi
Modified: trunk/Master/texmf-dist/source/latex/tikzmark/tikzmark.ins
===================================================================
--- trunk/Master/texmf-dist/source/latex/tikzmark/tikzmark.ins 2018-10-18 00:23:14 UTC (rev 48928)
+++ trunk/Master/texmf-dist/source/latex/tikzmark/tikzmark.ins 2018-10-18 20:26:16 UTC (rev 48929)
@@ -26,7 +26,7 @@
\endpreamble
\postamble
-Copyright (C) 2011-2016 by Andrew Stacey <loopspace at mathforge.org>
+Copyright (C) 2011-2018 by Andrew Stacey <loopspace at mathforge.org>
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License (LPPL), either
@@ -54,7 +54,7 @@
}
\endbatchfile
%%
-%% Copyright (C) 2011-2016 by Andrew Stacey <loopspace at mathforge.org>
+%% Copyright (C) 2011-2018 by Andrew Stacey <loopspace at mathforge.org>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
Modified: trunk/Master/texmf-dist/tex/latex/tikzmark/tikzlibrarytikzmark.code.tex
===================================================================
--- trunk/Master/texmf-dist/tex/latex/tikzmark/tikzlibrarytikzmark.code.tex 2018-10-18 00:23:14 UTC (rev 48928)
+++ trunk/Master/texmf-dist/tex/latex/tikzmark/tikzlibrarytikzmark.code.tex 2018-10-18 20:26:16 UTC (rev 48929)
@@ -12,6 +12,7 @@
%% See http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
+\RequirePackage{expl3, l3keys2e, xparse}
\tikzset{%
remember picture with id/.style={%
remember picture,
@@ -23,7 +24,10 @@
\ifpgfrememberpicturepositiononpage%
\edef\pgf at temp{%
\noexpand\write\noexpand\pgfutil at auxout{%
- \string\savepicturepage{\pgfpictureid}{\noexpand\arabic{page}}}}%
+ \string\savepicturepage%
+ {\pgfpictureid}{\noexpand\arabic{page}}%
+ }%
+ }%
\pgf at temp
\fi%
},
@@ -30,7 +34,8 @@
},
save picture id/.code={%
\protected at write\pgfutil at auxout{}{%
- \string\savepointas{\tikzmark at pp@name{#1}}{\pgfpictureid}{0pt}{0pt}}%
+ \string\savepointas%
+ {\tikzmark at pp@name{#1}}{\pgfpictureid}{0pt}{0pt}}%
},
if picture id/.code args={#1#2#3}{%
\@ifundefined{save at pt@\tikzmark at pp@name{#1}}{%
@@ -59,10 +64,15 @@
tikzmark prefix/.initial=,%
tikzmark suffix/.initial=,%
}
-\def\tikzmark at pp@name#1{\csname pgfk@/tikz/tikzmark prefix\endcsname#1\csname pgfk@/tikz/tikzmark suffix\endcsname}%
+\def\tikzmark at pp@name#1{%
+ \csname pgfk@/tikz/tikzmark prefix\endcsname%
+ #1%
+ \csname pgfk@/tikz/tikzmark suffix\endcsname%
+}%
\def\savepointas#1#2#3#4{%
\expandafter\gdef\csname save at pt@#1\endcsname{#2}%
- \expandafter\gdef\csname save at pt@#1 at offset\endcsname{\pgfqpoint{#3}{#4}}%
+ \expandafter\gdef\csname save at pt@#1 at offset\endcsname%
+ {\pgfqpoint{#3}{#4}}%
}
\def\savepicturepage#1#2{%
\expandafter\gdef\csname save at pg@#1\endcsname{#2}%
@@ -81,26 +91,32 @@
\@ifundefined{save at pt@\tmk at label}{%
\tikz at scan@one at point\pgfutil at firstofone\tmk at def
}{%
- \pgfsys at getposition{\csname save at pt@\tmk at label\endcsname}\save at orig@pic%
- \pgfsys at getposition{\pgfpictureid}\save at this@pic%
- \pgf at process{\pgfpointorigin\save at this@pic}%
- \pgf at xa=\pgf at x
- \pgf at ya=\pgf at y
- \pgf at process{\pgfpointorigin\save at orig@pic}%
- \advance\pgf at x by -\pgf at xa
- \advance\pgf at y by -\pgf at ya
- \pgf at xa=\pgf at x
- \pgf at ya=\pgf at y
- \pgf at process{\pgfpointorigin\csname save at pt@\tmk at label @offset\endcsname}%
+ \pgfsys at getposition{\csname save at pt@\tmk at label\endcsname}%
+ \save at orig@pic%
+ \pgfsys at getposition{\pgfpictureid}\save at this@pic%
+ \pgf at process{\pgfpointorigin\save at this@pic}%
+ \pgf at xa=\pgf at x
+ \pgf at ya=\pgf at y
+ \pgf at process{\pgfpointorigin\save at orig@pic}%
+ \advance\pgf at x by -\pgf at xa
+ \advance\pgf at y by -\pgf at ya
+ \pgf at xa=\pgf at x
+ \pgf at ya=\pgf at y
+ \pgf at process%
+ {\pgfpointorigin\csname save at pt@\tmk at label @offset\endcsname}%
\advance\pgf at xa by \pgf at x
\advance\pgf at ya by \pgf at y
\@ifundefined{save at pg@\csname save at pt@\tmk at label\endcsname}{}{%
\@ifundefined{save at pg@\pgfpictureid}{}{%
\pgfkeysvalueof{/tikz/next page vector}%
- \advance \pgf at xa by \csname save at pg@\csname save at pt@\tmk at label\endcsname\endcsname\pgf at x\relax
-\advance \pgf at ya by \csname save at pg@\csname save at pt@\tmk at label\endcsname\endcsname\pgf at y\relax
- \advance \pgf at xa by -\csname save at pg@\pgfpictureid\endcsname\pgf at x\relax
-\advance \pgf at ya by -\csname save at pg@\pgfpictureid\endcsname\pgf at y\relax
+ \advance \pgf at xa by %
+ \csname save at pg@\csname save at pt@\tmk at label\endcsname\endcsname\pgf at x\relax
+ \advance \pgf at ya by %
+ \csname save at pg@\csname save at pt@\tmk at label\endcsname\endcsname\pgf at y\relax
+ \advance \pgf at xa by %
+ -\csname save at pg@\pgfpictureid\endcsname\pgf at x\relax
+ \advance \pgf at ya by %
+ -\csname save at pg@\pgfpictureid\endcsname\pgf at y\relax
}%
}%
\pgf at x=\pgf at xa
@@ -116,7 +132,7 @@
\tikzset{remember picture}%
\tikz at scan@one at point\pgfutil at firstofone#2\relax
\protected at write\pgfutil at auxout{}{%
- \string\savepointas{\tikzmark at pp@name{#1}}{\pgfpictureid}{\the\pgf at x pt}{\the\pgf at y pt}}%
+ \string\savepointas{\tikzmark at pp@name{#1}}{\pgfpictureid}{\the\pgf at x}{\the\pgf at y}}%
}
\def\tikzmark{%
\ifx\pgfpictureid\@undefined
@@ -140,8 +156,12 @@
\egroup
}
\@ifclassloaded{beamer}{
- \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}}}
+ \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}}}
@@ -152,7 +172,7 @@
}
}{}
\newcommand\iftikzmark[3]{%
- \@ifundefined{save at pt@#1}{%
+ \@ifundefined{save at pt@\tikzmark at pp@name{#1}}{%
#3%
}{%
#2%
@@ -196,9 +216,12 @@
\ifx\pgf at node@name\pgfutil at empty%
\else%
\expandafter\xdef\csname pgf at sh@ns@\pgf at node@name\endcsname{\tikz at shape}%
- \edef\pgf at sh@@temp{\noexpand\gdef\expandafter\noexpand\csname pgf at sh@np@\pgf at node@name\endcsname}%
- \expandafter\pgf at sh@@temp\expandafter{\pgf at sh@savedpoints}%
- \edef\pgf at sh@@temp{\noexpand\gdef\expandafter\noexpand\csname pgf at sh@ma@\pgf at node@name\endcsname}% MW
+ \edef\pgf at sh@@temp{%
+ \noexpand\gdef\expandafter\noexpand\csname pgf at sh@np@\pgf at node@name\endcsname}%
+ \expandafter\pgf at sh@@temp\expandafter{%
+ \pgf at sh@savedpoints}%
+ \edef\pgf at sh@@temp{%
+ \noexpand\gdef\expandafter\noexpand\csname pgf at sh@ma@\pgf at node@name\endcsname}% MW
\expandafter\pgf at sh@@temp\expandafter{\pgf at sh@savedmacros}% MW
\pgfgettransform\pgf at temp
\expandafter\xdef\csname pgf at sh@nt@\pgf at node@name\endcsname{\pgf at temp}%
@@ -210,7 +233,64 @@
\box\pgfnodeparttextbox
\endgroup
}
-\def\usetikzmarklibrary{\pgfutil at ifnextchar[{\use at tikzmarklibrary}{\use@@tikzmarklibrary}}%}
+\def\tikzmarknode@#1#2#3{%
+ \tikz[%
+ remember picture,
+ baseline=(#2.base),
+ save picture id={#2},
+ every tikzmarknode picture/.try
+ ] {
+ \node[
+ anchor=base,
+ inner sep=0pt,
+ name={#2},
+ node contents={#3},
+ every tikzmarknode/.try,
+ #1
+ ]}%
+}
+
+\newcommand\tikzmarknode[3][]{%
+ \ifmmode
+ \mathchoice{%
+ \tikzmarknode@{#1}{#2-d}{\(\displaystyle #3\)}%
+ }{%
+ \tikzmarknode@{#1}{#2-t}{\(\textstyle #3\)}%
+ }{%
+ \tikzmarknode@{#1}{#2-s}{\(\scriptstyle #3\)}%
+ }{%
+ \tikzmarknode@{#1}{#2-ss}{\(\scriptscriptstyle #3\)}%
+ }%
+ \let\pgf at nodecallback\pgfutil at gobble
+ \def\tzmk at prfx{pgf at sys@pdf at mark@pos at pgfid}%
+ \edef\tzmk at pic{\tzmk at prfx\the\pgf at picture@serial at count}
+ \expandafter\ifx\csname\tzmk at pic\endcsname\relax
+ \edef\tzmk at pic{\tzmk at prfx\the\numexpr\the\pgf at picture@serial at count-1\relax}%
+ \expandafter\ifx\csname\tzmk at pic\endcsname\relax
+\edef\tzmk at pic{\tzmk at prfx\the\numexpr\the\pgf at picture@serial at count-2\relax}%
+ \expandafter\ifx\csname\tzmk at pic\endcsname\relax
+\edef\tzmk at pic{\tzmk at prfx\the\numexpr\the\pgf at picture@serial at count-3\relax}%
+ \expandafter\ifx\csname\tzmk at pic\endcsname\relax
+ \pgfnodealias{#2}{#2-t}% %% Fallback
+ \else
+ \pgfnodealias{#2}{#2-d}%
+ \fi
+ \else
+ \pgfnodealias{#2}{#2-t}%
+ \fi
+ \else
+ \pgfnodealias{#2}{#2-s}%
+ \fi
+ \else
+ \pgfnodealias{#2}{#2-ss}%
+ \fi
+ \else
+ \tikzmarknode@{#1}{#2}{#3}%
+ \fi
+}
+\def\usetikzmarklibrary{%
+ \pgfutil at ifnextchar[{\use at tikzmarklibrary}{\use@@tikzmarklibrary}%
+ }%}
\def\use at tikzmarklibrary[#1]{\use@@tikzmarklibrary{#1}}
\def\use@@tikzmarklibrary#1{%
\edef\pgf at list{#1}%
@@ -219,7 +299,8 @@
\ifx\pgf at temp\pgfutil at empty
\else
\expandafter\ifx\csname tikzmark at library@\pgf at temp @loaded\endcsname\relax%
- \expandafter\global\expandafter\let\csname tikzmark at library@\pgf at temp @loaded\endcsname=\pgfutil at empty%
+ \expandafter\global\expandafter\let%
+ \csname tikzmark at library@\pgf at temp @loaded\endcsname=\pgfutil at empty%
\expandafter\edef\csname tikzmark at library@#1 at atcode\endcsname{\the\catcode`\@}
\expandafter\edef\csname tikzmark at library@#1 at barcode\endcsname{\the\catcode`\|}
\catcode`\@=11
@@ -234,8 +315,318 @@
}%
}
+\ExplSyntaxOn
+\prop_new:N \g__sn_prop
+\tl_new:N \l__sn_tmpa_tl
+\tl_new:N \l__sn_tmpb_tl
+\tl_new:N \l__open_bracket_tl
+\tl_set:Nn \l__open_bracket_tl {[} %]
+\tl_new:N \l__sn_group_tl
+\clist_new:N \l__sn_nodes_clist
+\bool_new:N \l__sn_file_bool
+\dim_new:N \l__sn_x_dim
+\dim_new:N \l__sn_y_dim
+\dim_new:N \l__sn_xa_dim
+\dim_new:N \l__sn_ya_dim
+\tl_new:N \l__sn_centre_tl
+
+\tl_new:N \l__sn_transformation_tl
+\tl_set:Nn \l__sn_transformation_tl {{1}{0}{0}{1}{0pt}{0pt}}
+\iow_new:N \g__sn_stream
+\bool_new:N \g__sn_stream_bool
+\tl_new:N \g__sn_filename_tl
+\tl_set:Nx \g__sn_filename_tl {\c_sys_jobname_str}
+
+\cs_new_nopar:Npn \sn_open_stream:
+{
+ \bool_if:NF \g__sn_stream_bool
+ {
+ \iow_open:Nn \g__sn_stream {\tl_use:N \g__sn_filename_tl .nodes}
+ \bool_gset_true:N \g__sn_stream_bool
+ }
+}
+
+\AtEndDocument
+{
+ \ExplSyntaxOn
+ \bool_if:NT \g__sn_stream_bool
+ {
+ \iow_close:N \g__sn_stream
+ }
+ \ExplSyntaxOff
+}
+\makeatletter
+\cs_set_eq:NN \tikz_set_node_name:n \tikz at pp@name
+\cs_set_eq:NN \tikz_fig_must_be_named: \tikz at fig@mustbenamed
+
+\cs_new_nopar:Npn \tikz_scan_point:n #1
+{
+ \tikz at scan@one at point\pgfutil at firstofone#1\relax
+}
+
+\cs_new_nopar:Npn \tikz_scan_point:NNn #1#2#3
+{
+ \tikz at scan@one at point\pgfutil at firstofone#3\relax
+ \dim_set_eq:NN #1 \pgf at x
+ \dim_set_eq:NN #2 \pgf at y
+}
+
+\makeatother
+\cs_generate_variant:Nn \tikz_scan_point:n {V}
+\cs_generate_variant:Nn \tikz_scan_point:NNn {NNV}
+\cs_new_nopar:Npn \save_nodes:Nn #1#2
+{
+ \tl_clear:N \l__sn_tmpa_tl
+ \tikz_scan_point:NNn \l__sn_x_dim \l__sn_y_dim {(current~ bounding~ box.center)}
+ \dim_set:Nn \l__sn_x_dim {-\l__sn_x_dim}
+ \dim_set:Nn \l__sn_y_dim {-\l__sn_y_dim}
+ \tl_set:Nx \l__sn_centre_tl {
+ {1}{0}{0}{1}{\dim_use:N \l__sn_x_dim}{\dim_use:N \l__sn_y_dim}
+ }
+ \clist_map_inline:nn {#2}
+ {
+ \tl_if_exist:cT {pgf at sh@ns@##1}
+ {
+ \clist_map_inline:nn {ns,np,ma,pi}
+ {
+ \tl_put_right:Nn \l__sn_tmpa_tl
+ {
+ \tl_gset:cn {pgf at sh@####1@ \tikz_set_node_name:n{##1} }
+ }
+ \tl_if_exist:cTF {pgf at sh@####1@##1}
+ {
+ \tl_put_right:Nx \l__sn_tmpa_tl {
+ {\exp_not:v {pgf at sh@####1@ \tikz_set_node_name:n {##1}}}
+ }
+ }
+ {
+ \tl_put_right:Nx \l__sn_tmpa_tl {{}}
+ }
+ }
+ \tl_put_right:Nn \l__sn_tmpa_tl
+ {
+ \tl_gset:cn {pgf at sh@nt@ \tikz_set_node_name:n{##1} }
+ }
+ \compose_transformations:NVv \l__sn_tmpb_tl \l__sn_centre_tl {pgf at sh@nt@##1}
+ \tl_put_right:Nx \l__sn_tmpa_tl {{\exp_not:V \l__sn_tmpb_tl}}
+ \tl_put_right:Nn \l__sn_tmpa_tl {
+ \transform_node:Nn \l__sn_transformation_tl {
+ \tikz_set_node_name:n{##1}
+ }
+ }
+ }
+ }
+ \tl_set_eq:NN #1 \l__sn_tmpa_tl
+}
+\cs_new_nopar:Npn \save_nodes_to_list:nn #1#2
+{
+ \save_nodes:Nn \l__sn_tmpa_tl {#2}
+ \prop_gput:NnV \g__sn_prop {#1} \l__sn_tmpa_tl
+}
+\cs_new_nopar:Npn \save_nodes_to_file:n #1
+{
+ \save_nodes:Nn \l__sn_tmpa_tl {#1}
+ \sn_open_stream:
+ \iow_now:Nx \g__sn_stream
+ {
+ \iow_newline:
+ \exp_not:V \l__sn_tmpa_tl
+ \iow_newline:
+ }
+}
+\cs_generate_variant:Nn \save_nodes_to_list:nn {VV}
+\cs_generate_variant:Nn \save_nodes_to_file:n {V}
+\cs_new_nopar:Npn \restore_nodes_from_list:n #1
+{
+ \prop_get:NnNT \g__sn_prop {#1} \l__sn_tmpa_tl
+ {
+ \tl_use:N \l__sn_tmpa_tl
+ }
+}
+\cs_new_nopar:Npn \restore_nodes_from_file:n #1
+{
+ \file_if_exist:nT {#1.nodes}
+ {
+ \ExplSyntaxOn
+ \file_input:n {#1.nodes}
+ \ExplSyntaxOff
+ }
+}
+
+\cs_new_nopar:Npn \compose_transformations:Nnn #1#2#3
+{
+ \tl_gset:Nx #1
+ {
+ {\fp_eval:n {
+ \tl_item:nn {#2} {1}
+ * \tl_item:nn {#3} {1}
+ +
+ \tl_item:nn {#2} {3}
+ * \tl_item:nn {#3} {2}
+ }
+ }
+ {\fp_eval:n {
+ \tl_item:nn {#2} {2}
+ * \tl_item:nn {#3} {1}
+ +
+ \tl_item:nn {#2} {4}
+ * \tl_item:nn {#3} {2}
+ }
+ }
+ {\fp_eval:n {
+ \tl_item:nn {#2} {1}
+ * \tl_item:nn {#3} {3}
+ +
+ \tl_item:nn {#2} {3}
+ * \tl_item:nn {#3} {4}
+ }
+ }
+ {\fp_eval:n {
+ \tl_item:nn {#2} {2}
+ * \tl_item:nn {#3} {3}
+ +
+ \tl_item:nn {#2} {4}
+ * \tl_item:nn {#3} {4}
+ }
+ }
+ {\fp_to_dim:n {
+ \tl_item:nn {#2} {1}
+ * \tl_item:nn {#3} {5}
+ +
+ \tl_item:nn {#2} {3}
+ * \tl_item:nn {#3} {6}
+ +
+ \tl_item:nn {#2} {5}
+ }
+ }
+ {\fp_to_dim:n {
+ \tl_item:nn {#2} {2}
+ * \tl_item:nn {#3} {5}
+ +
+ \tl_item:nn {#2} {4}
+ * \tl_item:nn {#3} {6}
+ +
+ \tl_item:nn {#2} {6}
+ }
+ }
+ }
+}
+\cs_generate_variant:Nn \compose_transformations:Nnn {cVv,NVv,NVn,NvV,NnV}
+\cs_new_nopar:Npn \transform_node:Nn #1#2
+{
+ \compose_transformations:cVv {pgf at sh@nt@#2} #1 {pgf at sh@nt@#2}
+}
+\cs_new_nopar:Npn \set_transform_from_node:n #1
+{
+ \tl_set_eq:Nc \l__sn_transformation_tl {pgf at sh@nt@#1}
+ \tikz_scan_point:NNn \l__sn_x_dim \l__sn_y_dim {(#1.center)}
+
+ \dim_set:Nn \l__sn_x_dim {\l__sn_x_dim - \tl_item:cn {pgf at sh@nt@#1}{5}}
+ \dim_set:Nn \l__sn_y_dim {\l__sn_y_dim - \tl_item:cn {pgf at sh@nt@#1}{6}}
+
+ \compose_transformations:NnV \l__sn_transformation_tl {
+ {1}{0}{0}{1}{\dim_use:N \l__sn_x_dim}{\dim_use:N \l__sn_y_dim}
+ } \l__sn_transformation_tl
+}
+\cs_generate_variant:Nn \set_transform_from_node:n {v}
+\tikzset{
+ set~ saved~ nodes~ file~ name/.code={
+ \tl_gset:Nx \g__sn_filename_tl {#1}
+ },
+ transform~ saved~ nodes/.code={
+ \set_transform_from_node:v {tikz at last@fig at name}
+ },
+ set~ node~ group/.code={
+ \tl_set:Nn \l__sn_group_tl {#1}
+ \pgfkeysalso{
+ execute~ at~ end~ scope={
+ \maybe_save_nodes:
+ }
+ }
+ },
+ save~ nodes~ to~ file/.code={
+ \tl_if_eq:nnTF {#1}{false}
+ {
+ \bool_set_false:N \l__sn_file_bool
+ }
+ {
+ \bool_set_true:N \l__sn_file_bool
+ }
+ \pgfkeysalso{
+ execute~ at~ end~ scope={
+ \maybe_save_nodes:
+ }
+ }
+ },
+ save~ node/.code={
+ \tikz_fig_must_be_named:
+ \pgfkeysalso{append~ after~ command={
+ \pgfextra{
+ \clist_gput_right:Nv \l__sn_nodes_clist {tikz at last@fig at name}
+ }
+ }
+ }
+ },
+ restore~ nodes~ from~ file/.code={
+ \tikz_fig_must_be_named:
+ \pgfkeysalso{append~ after~ command={
+ \pgfextra{
+ \scope
+ \split_argument:NNn \tikzset \restore_nodes_from_file:n {#1}
+ \endscope
+ }
+ }
+ }
+ },
+ restore~ nodes~ from~ list/.code={
+ \tikz_fig_must_be_named:
+ \pgfkeysalso{append~ after~ command={
+ \pgfextra{
+ \scope
+ \split_argument:NNn \tikzset \restore_nodes_from_list:n {#1}
+ \endscope
+ }
+ }
+ }
+ }
+}
+\cs_generate_variant:Nn \clist_gput_right:Nn {Nv}
+\cs_new_nopar:Npn \split_argument:NNn #1#2#3
+{
+ \tl_set:Nx \l__sn_tmpa_tl {\tl_head:n {#3}}
+ \tl_if_eq:NNTF \l__sn_tmpa_tl \l__open_bracket_tl
+ {
+ \split_argument_aux:NNp #1#2#3
+ }
+ {
+ #2 {#3}
+ }
+}
+\cs_new_nopar:Npn \split_argument_aux:NNp #1#2[#3]#4
+{
+ #1 {#3}
+ #2 {#4}
+}
+\cs_new_nopar:Npn \maybe_save_nodes:
+{
+ \clist_if_empty:NF \l__sn_nodes_clist
+ {
+ \bool_if:NTF \l__sn_file_bool
+ {
+ \save_nodes_to_file:V \l__sn_nodes_clist
+ }
+ {
+ \tl_if_empty:NF \l__sn_group_tl
+ {
+ \save_nodes_to_list:VV \l__sn_group_tl \l__sn_nodes_clist
+ }
+ }
+ \clist_gclear:N \l__sn_nodes_clist
+ }
+}
+\ExplSyntaxOff
%%
-%% Copyright (C) 2011-2016 by Andrew Stacey <loopspace at mathforge.org>
+%% Copyright (C) 2011-2018 by Andrew Stacey <loopspace at mathforge.org>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
Modified: trunk/Master/texmf-dist/tex/latex/tikzmark/tikzmarklibrarylistings.code.tex
===================================================================
--- trunk/Master/texmf-dist/tex/latex/tikzmark/tikzmarklibrarylistings.code.tex 2018-10-18 00:23:14 UTC (rev 48928)
+++ trunk/Master/texmf-dist/tex/latex/tikzmark/tikzmarklibrarylistings.code.tex 2018-10-18 20:26:16 UTC (rev 48929)
@@ -47,7 +47,7 @@
\PackageError{tikzmark listings}{The listings package has not been loaded.}{}
}
%%
-%% Copyright (C) 2011-2016 by Andrew Stacey <loopspace at mathforge.org>
+%% Copyright (C) 2011-2018 by Andrew Stacey <loopspace at mathforge.org>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
More information about the tex-live-commits
mailing list