Handle \relax and frozen \relax in tikz path pgf-tikz#966

muzimuzhi · Dec 21, 2020 · e310da7 · e310da7
1 parent 88f5a0e
commit e310da7
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/tex/generic/pgf/frontendlayer/tikz/tikz.code.tex b/tex/generic/pgf/frontendlayer/tikz/tikz.code.tex
@@ -2120,10 +2120,14 @@
   \else%
     \tikz@invoke@collected@onpath%
   \fi%
-  \afterassignment\tikz@handle\let\pgf@let@token=%
+  \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{%
@@ -2224,7 +2228,15 @@
                               \ifx\pgf@let@token:%
                                 \let\pgfutil@next=\tikz@colon@char%
                               \else%
-                                \let\pgfutil@next=\tikz@expand%
+                                \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
                               \fi%
                             \fi%
                           \fi%