diff options
author | Norbert Preining <norbert@preining.info> | 2020-12-28 03:03:19 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2020-12-28 03:03:19 +0000 |
commit | 07b20138841bb0e4c45e74a2a1d06cc91fe5a861 (patch) | |
tree | d55ace28f6d10d6a13406f1742f079c0ebf5f245 /graphics/pgf/base/tex/tikz.code.tex | |
parent | 40e40fcb2049d49871ddd4bdfff9a414b2cbb50e (diff) |
CTAN sync 202012280303
Diffstat (limited to 'graphics/pgf/base/tex/tikz.code.tex')
-rw-r--r-- | graphics/pgf/base/tex/tikz.code.tex | 30 |
1 files changed, 6 insertions, 24 deletions
diff --git a/graphics/pgf/base/tex/tikz.code.tex b/graphics/pgf/base/tex/tikz.code.tex index 477418b716..f848487e70 100644 --- a/graphics/pgf/base/tex/tikz.code.tex +++ b/graphics/pgf/base/tex/tikz.code.tex @@ -2120,15 +2120,10 @@ \else% \tikz@invoke@collected@onpath% \fi% - \tikz@scan@@next@command -}% -\def\tikz@scan@@next@command{% \afterassignment\tikz@handle\let\pgf@let@token=% -} - +}% \newcount\tikz@expandcount \let\tikz@collected@onpath=\pgfutil@empty% -\edef\tikz@frozen@relax@token{\ifnum0=0\fi} % Central dispatcher for commands \def\tikz@handle{% @@ -2229,7 +2224,7 @@ \ifx\pgf@let@token:% \let\pgfutil@next=\tikz@colon@char% \else% - \let\pgfutil@next=\tikz@handle@evenmore + \let\pgfutil@next=\tikz@expand% \fi% \fi% \fi% @@ -2245,26 +2240,10 @@ \fi% \fi% \fi% + \ifx\pgfutil@next\tikz@expand\else\tikz@expandcount=100\relax\fi% \pgfutil@next% }% -% Continued... -\def\tikz@handle@evenmore{% - % if \pgf@let@token is \relax or frozen \relax, skip it and - % scan from the next token - \ifx\pgf@let@token\relax - \let\pgfutil@next=\tikz@scan@@next@command - \else - \ifx\pgf@let@token\tikz@frozen@relax@token - \let\pgfutil@next=\tikz@scan@@next@command - \else - \let\pgfutil@next=\tikz@expand - \fi - \fi - \ifx\pgfutil@next\tikz@expand\else\tikz@expandcount=100\relax\fi - \pgfutil@next -} - \def\tikz@l@char{% \pgfutil@ifnextchar e{\tikz@let@command}{% \pgfutil@ifnextchar i{\tikz@lsystem}{% @@ -3112,6 +3091,9 @@ }% \def\tikz@@to@or@edge@math#1{% \pgf@process{#1}% + \iftikz@updatecurrent\else + \tikz@updatenextfalse + \fi \edef\tikztotarget{\the\pgf@x,\the\pgf@y}% \tikz@to@or@edge@function% }% |