Revert "Check \ifmeasuring@ pgf-tikz#759"

This reverts commit 135e361.
hmenke · Jan 7, 2020 · aa28fda · aa28fda
1 parent 61acf1c
commit aa28fda
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 24 deletions.
diff --git a/tex/generic/pgf/frontendlayer/tikz/libraries/tikzexternalshared.code.tex b/tex/generic/pgf/frontendlayer/tikz/libraries/tikzexternalshared.code.tex
@@ -749,13 +749,6 @@
     \fi
 }
 
-% amsmath signals the first pass of aligned environments with measuring@true.
-% This is just \measuring@false in case \ifmeasuring@ is not defined
-\def\pgf@marshal{\let\ifmeasuring@\iffalse}
-\ifdefined\ifmeasuring@\else
-    \expandafter\pgf@marshal
-\fi
-
 % Fills #1 with a filename for the current picture.
 %
 % The filename will be generated automatically by appending '-figure<number>' to the real jobname.
@@ -786,10 +779,8 @@
                     }{}%
                     \t@tikzexternal@tmpb=\expandafter{\tikzexternal@figurename}%
                     \xdef\pgf@tempa{\the\t@tikzexternal@tmpa\the\t@tikzexternal@tmpb\csname c@tikzext@no@\tikzexternal@figurename\endcsname}%
-                    \ifmeasuring@\else
-                        % advance the counter for 'figure name':
-                        \tikzexternal@getnextfilename@advancecount
-                    \fi
+                    % advance the counter for 'figure name':
+                    \tikzexternal@getnextfilename@advancecount
                 \fi
             \else
                 \t@tikzexternal@tmpb=\expandafter{\tikzexternal@nextfile}%
@@ -807,9 +798,7 @@
 
 \def\tikzexternal@getnextfilename@resetglobals{%
     % Reset global flags:
-    \ifmeasuring@\else
-        \global\let\tikzexternal@nextfile=\pgfutil@empty
-    \fi
+    \global\let\tikzexternal@nextfile=\pgfutil@empty
     \global\tikzexternalexportnexttrue
 }%
 

diff --git a/tex/latex/pgf/utilities/tikzexternal.sty b/tex/latex/pgf/utilities/tikzexternal.sty
@@ -69,10 +69,6 @@
 \def\tikz@opt@process#1#2{\tikzexternal@image}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-\def\pgf@marshal{\let\ifmeasuring@\iffalse}
-\ifdefined\ifmeasuring@\else
-    \expandafter\pgf@marshal
-\fi
 \def\tikzexternal@image{%
     \leavevmode
     \begingroup
@@ -84,18 +80,14 @@
         \t@tikzexternal@tmpb=\expandafter{\tikzexternal@figurename}%
         \count0=\csname c@tikzext@no@\tikzexternal@figurename\endcsname
         \xdef\tikzexternal@curfilename{\the\t@tikzexternal@tmpa\the\t@tikzexternal@tmpb\the\count0 }%
-        \ifmeasuring@\else
-            \advance\count0 by1\relax
-        \fi
+        \advance\count0 by1\relax
         \expandafter\xdef\csname c@tikzext@no@\tikzexternal@figurename\endcsname{\the\count0 }%
     \else
         \t@tikzexternal@tmpb=\expandafter{\tikzexternal@nextfile}%
         \xdef\tikzexternal@curfilename{\the\t@tikzexternal@tmpa\the\t@tikzexternal@tmpb}%
     \fi
     \endgroup
-    \ifmeasuring@\else
-        \global\let\tikzexternal@nextfile=\empty
-    \fi
+    \global\let\tikzexternal@nextfile=\empty
     \pgfincludeexternalgraphics\tikzexternal@curfilename
 }%
 \def\tikzset#1{}\def\pgfkeys#1{}\def\pgfqkeys#1#2{}