texlive[53349] Master/texmf-dist: pgf (8jan20)

[commits+karl at tug.org]

Revision: 53349
          http://tug.org/svn/texlive?view=revision&revision=53349
Author:   karl
Date:     2020-01-08 22:53:47 +0100 (Wed, 08 Jan 2020)
Log Message:
-----------
pgf (8jan20)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/generic/pgf/ChangeLog
    trunk/Master/texmf-dist/doc/generic/pgf/pgfmanual.pdf
    trunk/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzexternalshared.code.tex
    trunk/Master/texmf-dist/tex/generic/pgf/pgf.revision.tex
    trunk/Master/texmf-dist/tex/latex/pgf/utilities/tikzexternal.sty

Modified: trunk/Master/texmf-dist/doc/generic/pgf/ChangeLog
===================================================================
--- trunk/Master/texmf-dist/doc/generic/pgf/ChangeLog	2020-01-08 21:39:45 UTC (rev 53348)
+++ trunk/Master/texmf-dist/doc/generic/pgf/ChangeLog	2020-01-08 21:53:47 UTC (rev 53349)
@@ -1,3 +1,15 @@
+2020-01-08 Henri Menke
+
+    - Release 3.1.5b
+
+2020-01-08 Henri Menke
+
+    - CI: Try to fix the usual oberdiek shenanigans
+
+2020-01-08 Henri Menke
+
+    - Revert "Check \ifmeasuring@ #759"
+
 2019-12-21 Henri Menke
 
     Release 3.1.5a

Modified: trunk/Master/texmf-dist/doc/generic/pgf/pgfmanual.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzexternalshared.code.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzexternalshared.code.tex	2020-01-08 21:39:45 UTC (rev 53348)
+++ trunk/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzexternalshared.code.tex	2020-01-08 21:53:47 UTC (rev 53349)
@@ -749,13 +749,6 @@
     \fi
 }
 
-% amsmath signals the first pass of aligned environments with measuring at true.
-% This is just \measuring at false in case \ifmeasuring@ is not defined
-\def\pgf at marshal{\let\ifmeasuring@\iffalse}
-\ifdefined\ifmeasuring@\else
-    \expandafter\pgf at 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 at tikzexternal@tmpb=\expandafter{\tikzexternal at figurename}%
                     \xdef\pgf at tempa{\the\t at tikzexternal@tmpa\the\t at tikzexternal@tmpb\csname c at tikzext@no@\tikzexternal at figurename\endcsname}%
-                    \ifmeasuring@\else
-                        % advance the counter for 'figure name':
-                        \tikzexternal at getnextfilename@advancecount
-                    \fi
+                    % advance the counter for 'figure name':
+                    \tikzexternal at getnextfilename@advancecount
                 \fi
             \else
                 \t at tikzexternal@tmpb=\expandafter{\tikzexternal at nextfile}%
@@ -807,9 +798,7 @@
 
 \def\tikzexternal at getnextfilename@resetglobals{%
     % Reset global flags:
-    \ifmeasuring@\else
-        \global\let\tikzexternal at nextfile=\pgfutil at empty
-    \fi
+    \global\let\tikzexternal at nextfile=\pgfutil at empty
     \global\tikzexternalexportnexttrue
 }%
 

Modified: trunk/Master/texmf-dist/tex/generic/pgf/pgf.revision.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/pgf/pgf.revision.tex	2020-01-08 21:39:45 UTC (rev 53348)
+++ trunk/Master/texmf-dist/tex/generic/pgf/pgf.revision.tex	2020-01-08 21:53:47 UTC (rev 53349)
@@ -5,10 +5,10 @@
 \catcode`\:=12
 \catcode`\+=12
 \catcode`\-=12
-\gdef\pgfrevision{3.1.5a}
-\gdef\pgfversion{3.1.5a}
-\gdef\pgfversiondatetime{2019-12-21 23:33:24 +1300}
-\gdef\pgfrevisiondatetime{2019-12-21 23:33:24 +1300}
+\gdef\pgfrevision{3.1.5b}
+\gdef\pgfversion{3.1.5b}
+\gdef\pgfversiondatetime{2020-01-08 10:30:17 +1300}
+\gdef\pgfrevisiondatetime{2020-01-08 10:30:17 +1300}
 \gdef\pgf at glob@TMPa#1-#2-#3 #4\relax{#1/#2/#3}
 \xdef\pgfversiondate{\expandafter\pgf at glob@TMPa\pgfversiondatetime\relax}
 \xdef\pgfrevisiondate{\expandafter\pgf at glob@TMPa\pgfrevisiondatetime\relax}

Modified: trunk/Master/texmf-dist/tex/latex/pgf/utilities/tikzexternal.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/pgf/utilities/tikzexternal.sty	2020-01-08 21:39:45 UTC (rev 53348)
+++ trunk/Master/texmf-dist/tex/latex/pgf/utilities/tikzexternal.sty	2020-01-08 21:53:47 UTC (rev 53349)
@@ -69,10 +69,6 @@
 \def\tikz at opt@process#1#2{\tikzexternal at image}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-\def\pgf at marshal{\let\ifmeasuring@\iffalse}
-\ifdefined\ifmeasuring@\else
-    \expandafter\pgf at marshal
-\fi
 \def\tikzexternal at image{%
     \leavevmode
     \begingroup
@@ -84,9 +80,7 @@
         \t at tikzexternal@tmpb=\expandafter{\tikzexternal at figurename}%
         \count0=\csname c at tikzext@no@\tikzexternal at figurename\endcsname
         \xdef\tikzexternal at curfilename{\the\t at tikzexternal@tmpa\the\t at tikzexternal@tmpb\the\count0 }%
-        \ifmeasuring@\else
-            \advance\count0 by1\relax
-        \fi
+        \advance\count0 by1\relax
         \expandafter\xdef\csname c at tikzext@no@\tikzexternal at figurename\endcsname{\the\count0 }%
     \else
         \t at tikzexternal@tmpb=\expandafter{\tikzexternal at nextfile}%
@@ -93,9 +87,7 @@
         \xdef\tikzexternal at curfilename{\the\t at tikzexternal@tmpa\the\t at tikzexternal@tmpb}%
     \fi
     \endgroup
-    \ifmeasuring@\else
-        \global\let\tikzexternal at nextfile=\empty
-    \fi
+    \global\let\tikzexternal at nextfile=\empty
     \pgfincludeexternalgraphics\tikzexternal at curfilename
 }%
 \def\tikzset#1{}\def\pgfkeys#1{}\def\pgfqkeys#1#2{}