From eb4ae35281c4395b6f084138134421949b9d9183 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 27 Dec 2020 21:58:12 +0000 Subject: pgf (27dec20) git-svn-id: svn://tug.org/texlive/trunk@57240 c570f23f-e606-0410-a88d-b1316a301751 --- .../generic/pgf/frontendlayer/tikz/tikz.code.tex | 30 +++++----------------- Master/texmf-dist/tex/generic/pgf/pgf.revision.tex | 8 +++--- 2 files changed, 10 insertions(+), 28 deletions(-) (limited to 'Master/texmf-dist/tex/generic') 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 477418b7167..f848487e705 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 @@ -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% }% diff --git a/Master/texmf-dist/tex/generic/pgf/pgf.revision.tex b/Master/texmf-dist/tex/generic/pgf/pgf.revision.tex index a03cfbb9452..796c7fbe8a6 100644 --- a/Master/texmf-dist/tex/generic/pgf/pgf.revision.tex +++ b/Master/texmf-dist/tex/generic/pgf/pgf.revision.tex @@ -5,10 +5,10 @@ \catcode`\:=12 \catcode`\+=12 \catcode`\-=12 -\gdef\pgfrevision{3.1.8} -\gdef\pgfversion{3.1.8} -\gdef\pgfversiondatetime{2020-12-25 18:12:40 +0100} -\gdef\pgfrevisiondatetime{2020-12-25 18:12:40 +0100} +\gdef\pgfrevision{3.1.8b} +\gdef\pgfversion{3.1.8b} +\gdef\pgfversiondatetime{2020-12-27 19:52:45 +0100} +\gdef\pgfrevisiondatetime{2020-12-27 19:52:45 +0100} \gdef\pgf@glob@TMPa#1-#2-#3 #4\relax{#1/#2/#3} \xdef\pgfversiondate{\expandafter\pgf@glob@TMPa\pgfversiondatetime\relax} \xdef\pgfrevisiondate{\expandafter\pgf@glob@TMPa\pgfrevisiondatetime\relax} -- cgit v1.2.3