From ddd4f9656ab00a3c581a91dbba1c56efb378ec7e Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 8 Jan 2020 21:53:47 +0000 Subject: pgf (8jan20) git-svn-id: svn://tug.org/texlive/trunk@53349 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/generic/pgf/ChangeLog | 12 ++++++++++++ Master/texmf-dist/doc/generic/pgf/pgfmanual.pdf | Bin 10531852 -> 10531853 bytes .../tikz/libraries/tikzexternalshared.code.tex | 17 +++-------------- Master/texmf-dist/tex/generic/pgf/pgf.revision.tex | 8 ++++---- .../tex/latex/pgf/utilities/tikzexternal.sty | 12 ++---------- 5 files changed, 21 insertions(+), 28 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/generic/pgf/ChangeLog b/Master/texmf-dist/doc/generic/pgf/ChangeLog index 36bdaba4433..55d9caa6ff7 100644 --- a/Master/texmf-dist/doc/generic/pgf/ChangeLog +++ b/Master/texmf-dist/doc/generic/pgf/ChangeLog @@ -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 diff --git a/Master/texmf-dist/doc/generic/pgf/pgfmanual.pdf b/Master/texmf-dist/doc/generic/pgf/pgfmanual.pdf index 51d3c800959..ed818d8d3c1 100644 Binary files a/Master/texmf-dist/doc/generic/pgf/pgfmanual.pdf and b/Master/texmf-dist/doc/generic/pgf/pgfmanual.pdf differ diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzexternalshared.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzexternalshared.code.tex index 08fd794319b..55b387f13c6 100644 --- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzexternalshared.code.tex +++ b/Master/texmf-dist/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' 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/Master/texmf-dist/tex/generic/pgf/pgf.revision.tex b/Master/texmf-dist/tex/generic/pgf/pgf.revision.tex index a22a494129d..86dd7442d22 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.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@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} diff --git a/Master/texmf-dist/tex/latex/pgf/utilities/tikzexternal.sty b/Master/texmf-dist/tex/latex/pgf/utilities/tikzexternal.sty index 75cb9aedb56..4f9d31572f6 100644 --- a/Master/texmf-dist/tex/latex/pgf/utilities/tikzexternal.sty +++ b/Master/texmf-dist/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{} -- cgit v1.2.3