From ef27df03797a3aad56362435ac554202909bb02e Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 2 Oct 2020 21:41:45 +0000 Subject: pgf (2oct20) git-svn-id: svn://tug.org/texlive/trunk@56512 c570f23f-e606-0410-a88d-b1316a301751 --- .../tikz/libraries/tikzlibraryintersections.code.tex | 2 +- .../tex/generic/pgf/frontendlayer/tikz/tikz.code.tex | 12 ------------ .../tex/generic/pgf/libraries/pgflibraryfpu.code.tex | 3 ++- .../generic/pgf/libraries/pgflibraryintersections.code.tex | 2 -- Master/texmf-dist/tex/generic/pgf/pgf.revision.tex | 8 ++++---- 5 files changed, 7 insertions(+), 20 deletions(-) (limited to 'Master/texmf-dist/tex/generic') diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryintersections.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryintersections.code.tex index ca0e7a1c5e4..cf94f923677 100644 --- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryintersections.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryintersections.code.tex @@ -104,7 +104,7 @@ \pgfmathloop% \ifnum\pgfmathcounter>\pgfintersectionsolutions\relax% \else% - \path\pgfextra{\pgftransformshift{\pgfpointintersectionsolution{\pgfmathcounter}}}% + \path[reset cm]\pgfextra{\pgftransformshift{\pgfpointintersectionsolution{\pgfmathcounter}}}% coordinate (\tikz@intersect@@name-\pgfmathcounter); \repeatpgfmathloop% \ifx\tikz@intersect@by\pgfutil@empty% diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/tikz.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/tikz.code.tex index a371ddfc7cf..70f8da088e0 100644 --- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/tikz.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/tikz.code.tex @@ -5276,19 +5276,7 @@ \tikz@marshal% }% -\def\tikz@ensure@dollar@catcode{% - \ifnum\catcode`\$=3 % - \else - \tikzerror{Sorry, some package has redefined the meaning of the - math-mode dollar sign. This is incompatible with tikz and its calc - library and might cause unrecoverable errors}% - % only show error once: - \global\let\tikz@ensure@dollar@catcode=\relax - \fi -}% - \def\tikz@@@scan@@absolute#1({% - \tikz@ensure@dollar@catcode \pgfutil@ifnextchar{$}%$ {\tikz@parse@calculator#1(} {\tikz@scan@no@calculator#1(}% diff --git a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryfpu.code.tex b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryfpu.code.tex index c3bb9582c51..01cbab40f9c 100644 --- a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryfpu.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryfpu.code.tex @@ -127,11 +127,12 @@ \edef\pgfmathfloat@expression{#1}% \expandafter\pgfmathfloatparse@@\pgfmathfloat@expression\pgfmathfloat@ \ifpgfmathfloat@scaleactive - \expandafter\pgfmathfloatmultiply@\expandafter{\pgfmathresult}{\pgfmathfloatscale} + \expandafter\pgfmathfloatmultiply@\expandafter{\pgfmathresult}{\pgfmathfloatscale}% \pgfmathfloattofixed{\pgfmathresult}% \else \pgfmathfloatparse@output \fi + \ignorespaces }% \def\pgfmathfloat@char@asterisk{*}% diff --git a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryintersections.code.tex b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryintersections.code.tex index c920dbae886..2457157690b 100644 --- a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryintersections.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryintersections.code.tex @@ -352,9 +352,7 @@ \pgf@iflinesintersect{#1}{#2}{#3}{#4}% {% \pgfextract@process\pgf@intersect@solution@candidate{% - \pgftransforminvert % pgf@x and pgf@y are already assigned by \pgf@iflinesintersect - \pgfpointtransformed{\pgfqpoint{\pgf@x}{\pgf@y}}% }% \pgf@ifsolution@duplicate{\pgf@intersect@solution@candidate}{% % ah - we a duplicate. Apparently, we have a hit on an diff --git a/Master/texmf-dist/tex/generic/pgf/pgf.revision.tex b/Master/texmf-dist/tex/generic/pgf/pgf.revision.tex index 551b21d9ff0..8b87951e3b1 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.6} -\gdef\pgfversion{3.1.6} -\gdef\pgfversiondatetime{2020-09-28 18:29:32 +0200} -\gdef\pgfrevisiondatetime{2020-09-28 18:29:32 +0200} +\gdef\pgfrevision{3.1.6a} +\gdef\pgfversion{3.1.6a} +\gdef\pgfversiondatetime{2020-10-01 21:02:59 +0200} +\gdef\pgfrevisiondatetime{2020-10-01 21:02:59 +0200} \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} -- cgit v1.2.3