summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/tikz.code.tex
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/tikz.code.tex')
-rw-r--r--Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/tikz.code.tex28
1 files changed, 21 insertions, 7 deletions
diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/tikz.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/tikz.code.tex
index 2caf2c50695..090155e26d0 100644
--- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/tikz.code.tex
+++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/tikz.code.tex
@@ -483,6 +483,7 @@
\tikzoption{use as bounding box}[]{\tikz@addmode{\tikz@mode@boundarytrue}}%
\tikzoption{save path}{\tikz@addmode{\pgfsyssoftpath@getcurrentpath#1\global\let#1=#1}}%
+\tikzoption{use path}{\tikz@addmode{\pgfsyssoftpath@setcurrentpath#1}}%
\let\tikz@fillcolor=\pgfutil@empty
\let\tikz@strokecolor=\pgfutil@empty
@@ -822,7 +823,7 @@
tikz@label@angle = #2,
anchor=@auto,
#1,
- tikz@label@post = \tikz@label@distance] {\iftikz@handle@active@nodes\expandafter\scantokens\else\expandafter\pgfutil@firstofone\fi{#3\ignorespaces}}
+ tikz@label@post = \tikz@label@distance] {\iftikz@handle@active@nodes\expandafter\scantokens\else\expandafter\pgfutil@firstofone\fi{#3\noexpand}}
\pgfextra{\global\let\tikz@last@fig@name=\tikz@save@last@fig@name}
\egroup}}}%
\endgroup
@@ -852,7 +853,7 @@
tikz@label@angle = #2,
anchor=@auto,
#1,
- tikz@label@post = \tikz@label@distance] {\iftikz@handle@active@nodes\expandafter\scantokens\else\expandafter\pgfutil@firstofone\fi{#3\ignorespaces}}
+ tikz@label@post = \tikz@label@distance] {\iftikz@handle@active@nodes\expandafter\scantokens\else\expandafter\pgfutil@firstofone\fi{#3\noexpand}}
\pgfextra{\global\let\tikz@last@fig@name=\tikz@save@last@fig@name}
\egroup}}}%
@@ -1656,12 +1657,21 @@
%
% Main TikZ Environment
%
+\newif\iftikz@inside@picture
+\tikz@inside@picturefalse
+\def\tikz@check@inside@picture{%
+ \iftikz@inside@picture%
+ \pgfwarning{Nesting tikzpictures is NOT supported}%
+ \fi%
+ \tikz@inside@picturetrue%
+}
\def\tikzpicture{%
\begingroup%
\tikz@startup@env%
\tikz@collect@scope@anims\tikz@picture}%
\def\tikz@picture[#1]{%
+ %\tikz@check@inside@picture%
\pgfpicture%
\let\tikz@atbegin@picture=\pgfutil@empty%
\let\tikz@atend@picture=\pgfutil@empty%
@@ -2009,10 +2019,11 @@
% settings.
\def\tikz@command@path{%
+ \global\let\tikz@intersect@namedpaths=\pgfutil@empty% clear intersections
\let\tikz@signal@path=\tikz@signal@path% for detection at begin of matrix cell
\pgfutil@ifnextchar[{\tikz@check@earg}%]
{\pgfutil@ifnextchar<{\tikz@doopt}{\tikz@@command@path}}}%
-\def\tikz@signal@path{\tikz@signal@path}%
+\pgfutil@protected\def\tikz@signal@path{\tikz@signal@path}%
\def\tikz@check@earg[#1]{%
\pgfutil@ifnextchar<{\tikz@swap@args[#1]}{\tikz@@command@path[#1]}}
\def\tikz@swap@args[#1]<#2>{\tikz@command@path<#2>[#1]}%
@@ -3823,6 +3834,8 @@
{\tikzerror{Unknown shape ``\tikz@shape.'' Using ``rectangle'' instead}%
\def\tikz@shape{rectangle}}%
{}%
+ \expandafter\xdef\csname tikz@dcl@coord@\tikz@fig@name\endcsname{%
+ \csname tikz@scan@point@coordinate\endcsname}%
\tikzset{every \tikz@shape\space node/.try}%
\tikz@node@textfont%
\tikz@node@begin@hook%
@@ -3869,8 +3882,8 @@
\else%
\pgfutil@colorlet{.}{\tikz@textcolor}%
\fi%
- % FIXME : this here is the proposed solution for https://sourceforge.net/p/pgf/bugs/362/
- % bit it caused https://sourceforge.net/p/pgf/bugs/503/ .
+ % FIXME : this here is the proposed solution for <https://sourceforge.net/p/pgf/bugs/362/>
+ % but it caused <https://sourceforge.net/p/pgf/bugs/503/>.
% \pgfutil@color{.}%
\setbox\tikz@figbox=\box\pgfutil@voidb@x%
\setbox\tikz@figbox@bg=\box\pgfutil@voidb@x%
@@ -5161,8 +5174,8 @@
{\tikz@scan@no@calculator#1(}%
}%
\def\tikz@scan@no@calculator#1(#2){%
- \edef\tikz@temp{(#2)}%
- \expandafter\tikz@@scan@@no@calculator\expandafter#1\tikz@temp%
+ \edef\tikz@scan@point@coordinate{(#2)}%
+ \expandafter\tikz@@scan@@no@calculator\expandafter#1\tikz@scan@point@coordinate%
}%
\def\tikz@@scan@@no@calculator#1(#2){%
\pgfutil@in@{cs:}{#2}%
@@ -5326,6 +5339,7 @@
\def\tikz@shapeborder@name{\tikz@pp@name{#2}}%
\fi%
\fi%
+ \expandafter\let\expandafter\tikz@declared@coordinate\csname tikz@dcl@coord@\tikz@pp@name{#2}\endcsname
\edef\tikz@marshal{\noexpand#1{\noexpand\pgfqpoint{\the\pgf@x}{\the\pgf@y}}}%
\tikz@marshal%
}%