summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-12-27 21:58:12 +0000
committerKarl Berry <karl@freefriends.org>2020-12-27 21:58:12 +0000
commiteb4ae35281c4395b6f084138134421949b9d9183 (patch)
treeb184276690b241fad79c7b4ad5762ce42c114a5b /Master
parent7d37ab17591b283dd2a7224be1005412d09519db (diff)
pgf (27dec20)
git-svn-id: svn://tug.org/texlive/trunk@57240 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/generic/pgf/ChangeLog16
-rw-r--r--Master/texmf-dist/doc/generic/pgf/RELEASE_NOTES.md37
-rw-r--r--Master/texmf-dist/doc/generic/pgf/pgfmanual.pdfbin10580776 -> 10580316 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/tikz.code.tex30
-rw-r--r--Master/texmf-dist/tex/generic/pgf/pgf.revision.tex8
5 files changed, 30 insertions, 61 deletions
diff --git a/Master/texmf-dist/doc/generic/pgf/ChangeLog b/Master/texmf-dist/doc/generic/pgf/ChangeLog
index 2e12f9a86ee..4e3c19950cb 100644
--- a/Master/texmf-dist/doc/generic/pgf/ChangeLog
+++ b/Master/texmf-dist/doc/generic/pgf/ChangeLog
@@ -1,3 +1,19 @@
+2020-12-27 Henri Menke
+
+ - Release 3.1.8b
+
+2020-12-27 Henri Menke
+
+ - Revert "tikz: handle \relax and frozen \relax on path #966"
+
+2020-12-27 Henri Menke
+
+ - Release 3.1.8a
+
+2020-12-25 Henri Menke
+
+ - fixup! Preserve coordinate relativity across ..
+
2020-12-25 Henri Menke
- Release 3.1.8
diff --git a/Master/texmf-dist/doc/generic/pgf/RELEASE_NOTES.md b/Master/texmf-dist/doc/generic/pgf/RELEASE_NOTES.md
index 22437f3da7e..6fc188431c5 100644
--- a/Master/texmf-dist/doc/generic/pgf/RELEASE_NOTES.md
+++ b/Master/texmf-dist/doc/generic/pgf/RELEASE_NOTES.md
@@ -1,34 +1,5 @@
-# BREAKING CHANGES
+Hotfix for handling of TeX conditionals on a path. We can't forward \relax and
+frozen \relax through the parser because there is existing code that relies on
+this.
-If a topath is bent by any of the in=, out=, bend=, etc. options, a Bezier
-curve is constructed in the background. To infer the positions of the control
-points the start and end coordinate are converted to absolute coordinates.
-However, this has the effect that subsequent points on the path think that the
-endpoint of the topath was absolute which can lead to counter-intuitive path
-construction, e.g.
-```latex
-\draw (2,0) to[out=0,in=180] +(1,0) -- ++(0,-1) -- +(1,0);
-```
-If old code relies on this behavior, this drawing will silently break! Please
-open an issue if you rely on this.
-
-# Bug fixes
-
-This release introduces a fix for path handling which concerns expansion of
-tokens on the path in particular with respect to conditional. Previously when
-the expansion of a conditonal resulted in a frozen \relax the parser would just
-give up. Now the parser will skip over the frozen \relax and continue to
-expand tokens. Whether this will result in a meaningful expansion is up to the
-user.
-
-This release also includes other bug fixes. On GitHub you can click the commit
-hashes and the issue numbers to get to the fix and the ticket, respectively.
-
-a4c275704 #952
-8a997bbc1 #954
-8f37bca84 #962
-3cbe5a192 #844
-49e5f0a08 #654
-17a95e4c5 #966
-ad06895a6 #966
-79e613ae1 #966
+The recommendation is to use expandable conditionals where possible.
diff --git a/Master/texmf-dist/doc/generic/pgf/pgfmanual.pdf b/Master/texmf-dist/doc/generic/pgf/pgfmanual.pdf
index 38c731f0fab..47b3273441b 100644
--- a/Master/texmf-dist/doc/generic/pgf/pgfmanual.pdf
+++ b/Master/texmf-dist/doc/generic/pgf/pgfmanual.pdf
Binary files differ
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 477418b7167..f848487e705 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
@@ -2120,15 +2120,10 @@
\else%
\tikz@invoke@collected@onpath%
\fi%
- \tikz@scan@@next@command
-}%
-\def\tikz@scan@@next@command{%
\afterassignment\tikz@handle\let\pgf@let@token=%
-}
-
+}%
\newcount\tikz@expandcount
\let\tikz@collected@onpath=\pgfutil@empty%
-\edef\tikz@frozen@relax@token{\ifnum0=0\fi}
% Central dispatcher for commands
\def\tikz@handle{%
@@ -2229,7 +2224,7 @@
\ifx\pgf@let@token:%
\let\pgfutil@next=\tikz@colon@char%
\else%
- \let\pgfutil@next=\tikz@handle@evenmore
+ \let\pgfutil@next=\tikz@expand%
\fi%
\fi%
\fi%
@@ -2245,26 +2240,10 @@
\fi%
\fi%
\fi%
+ \ifx\pgfutil@next\tikz@expand\else\tikz@expandcount=100\relax\fi%
\pgfutil@next%
}%
-% Continued...
-\def\tikz@handle@evenmore{%
- % if \pgf@let@token is \relax or frozen \relax, skip it and
- % scan from the next token
- \ifx\pgf@let@token\relax
- \let\pgfutil@next=\tikz@scan@@next@command
- \else
- \ifx\pgf@let@token\tikz@frozen@relax@token
- \let\pgfutil@next=\tikz@scan@@next@command
- \else
- \let\pgfutil@next=\tikz@expand
- \fi
- \fi
- \ifx\pgfutil@next\tikz@expand\else\tikz@expandcount=100\relax\fi
- \pgfutil@next
-}
-
\def\tikz@l@char{%
\pgfutil@ifnextchar e{\tikz@let@command}{%
\pgfutil@ifnextchar i{\tikz@lsystem}{%
@@ -3112,6 +3091,9 @@
}%
\def\tikz@@to@or@edge@math#1{%
\pgf@process{#1}%
+ \iftikz@updatecurrent\else
+ \tikz@updatenextfalse
+ \fi
\edef\tikztotarget{\the\pgf@x,\the\pgf@y}%
\tikz@to@or@edge@function%
}%
diff --git a/Master/texmf-dist/tex/generic/pgf/pgf.revision.tex b/Master/texmf-dist/tex/generic/pgf/pgf.revision.tex
index a03cfbb9452..796c7fbe8a6 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.8}
-\gdef\pgfversion{3.1.8}
-\gdef\pgfversiondatetime{2020-12-25 18:12:40 +0100}
-\gdef\pgfrevisiondatetime{2020-12-25 18:12:40 +0100}
+\gdef\pgfrevision{3.1.8b}
+\gdef\pgfversion{3.1.8b}
+\gdef\pgfversiondatetime{2020-12-27 19:52:45 +0100}
+\gdef\pgfrevisiondatetime{2020-12-27 19:52:45 +0100}
\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}