From 502cfec16edc7477463f1840f162267068992770 Mon Sep 17 00:00:00 2001
From: Henri Menke <henri@henrimenke.de>
Date: Sun, 27 Dec 2020 19:50:31 +0100
Subject: [PATCH] Revert "tikz: handle \relax and frozen \relax on path #966"

This reverts commit 79e613ae139f4e16f1f991114fe1a001d0dd9dab.
---
 .../pgf/frontendlayer/tikz/tikz.code.tex      | 27 +++----------------
 1 file changed, 3 insertions(+), 24 deletions(-)

diff --git a/tex/generic/pgf/frontendlayer/tikz/tikz.code.tex b/tex/generic/pgf/frontendlayer/tikz/tikz.code.tex
index 9c4e8bf66..f848487e7 100644
--- a/tex/generic/pgf/frontendlayer/tikz/tikz.code.tex
+++ b/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}{%