summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/pgf/frontendlayer
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-10-02 21:41:45 +0000
committerKarl Berry <karl@freefriends.org>2020-10-02 21:41:45 +0000
commitef27df03797a3aad56362435ac554202909bb02e (patch)
tree37bb804a47e50a672567484801da0ce722b23c65 /Master/texmf-dist/tex/generic/pgf/frontendlayer
parent501c12bb9b700ae0b1dd2c8aa4a1609125f00b86 (diff)
pgf (2oct20)
git-svn-id: svn://tug.org/texlive/trunk@56512 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic/pgf/frontendlayer')
-rw-r--r--Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryintersections.code.tex2
-rw-r--r--Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/tikz.code.tex12
2 files changed, 1 insertions, 13 deletions
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(}%