From acab24042d34dd439e1d074820d1da2fa1d591cd Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 4 Apr 2019 20:55:44 +0000 Subject: pgf (4apr19) git-svn-id: svn://tug.org/texlive/trunk@50758 c570f23f-e606-0410-a88d-b1316a301751 --- .../generic/pgf/frontendlayer/tikz/tikz.code.tex | 31 +++++++++++++++------- 1 file changed, 22 insertions(+), 9 deletions(-) (limited to 'Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/tikz.code.tex') 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..1ce575aab62 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 @@ -822,7 +822,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\pgfutil@scantokens\else\expandafter\pgfutil@firstofone\fi{#3\ignorespaces}} \pgfextra{\global\let\tikz@last@fig@name=\tikz@save@last@fig@name} \egroup}}}% \endgroup @@ -852,7 +852,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\pgfutil@scantokens\else\expandafter\pgfutil@firstofone\fi{#3\ignorespaces}} \pgfextra{\global\let\tikz@last@fig@name=\tikz@save@last@fig@name} \egroup}}}% @@ -1656,12 +1656,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,6 +2018,7 @@ % 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}}}% @@ -2769,7 +2779,7 @@ \iftikz@collect@pic% \expandafter\def\expandafter\tikz@collected@onpath\expandafter{\tikz@collected@onpath{#1}}% \else% - \expandafter\def\expandafter\tikz@collected@onpath\expandafter{\tikz@collected@onpath{\scantokens{#1}}}% + \expandafter\def\expandafter\tikz@collected@onpath\expandafter{\tikz@collected@onpath{\pgfutil@scantokens{#1}}}% \fi% \else% \expandafter\def\expandafter\tikz@collected@onpath\expandafter{\tikz@collected@onpath{#1}}% @@ -3823,6 +3833,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 +3881,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 + % but it caused . % \pgfutil@color{.}% \setbox\tikz@figbox=\box\pgfutil@voidb@x% \setbox\tikz@figbox@bg=\box\pgfutil@voidb@x% @@ -4326,7 +4338,7 @@ \iftikz@node@is@pic% \expandafter\def\expandafter\tikz@nodes@collect\expandafter{\tikz@nodes@collect{#1}}% \else% - \expandafter\def\expandafter\tikz@nodes@collect\expandafter{\tikz@nodes@collect{\scantokens{#1}}}% + \expandafter\def\expandafter\tikz@nodes@collect\expandafter{\tikz@nodes@collect{\pgfutil@scantokens{#1}}}% \fi% \else% \expandafter\def\expandafter\tikz@nodes@collect\expandafter{\tikz@nodes@collect{#1}}% @@ -4665,7 +4677,7 @@ \tikz@p@c@s}% \def\tikz@p@c@s@group#1{% \iftikz@handle@active@nodes% - \expandafter\def\expandafter\tikz@child@node@text\expandafter{\tikz@child@node@text{\scantokens{#1}}}% + \expandafter\def\expandafter\tikz@child@node@text\expandafter{\tikz@child@node@text{\pgfutil@scantokens{#1}}}% \else% \expandafter\def\expandafter\tikz@child@node@text\expandafter{\tikz@child@node@text{#1}} \fi% @@ -5161,8 +5173,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 +5338,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% }% -- cgit v1.2.3