Merge remote-tracking branch 'upstream/master'

pgf-tikz · Apr 2, 2024 · 20d9027 · 20d9027
2 parents 31aebc7 + 3007c42
commit 20d9027
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 8 deletions.
diff --git a/build.lua b/build.lua
@@ -80,9 +80,3 @@ function tag_hook(tagname, tagdate)
   return 0
 end
 
-target_list = target_list or { }
-target_list.revisionfile =
-  {
-    desc = "Create revision data file",
-    func = revisionfile
-  }
diff --git a/doc/generic/pgf/CHANGELOG.md b/doc/generic/pgf/CHANGELOG.md
@@ -34,6 +34,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Matthias Hetzenberger
 - Qrrbrbirlbel
 - quark67
+- Rocky Zhang (@rockyzhz)
 - Yukai Chou (@muzimuzhi)
 - Alexander Grahn
 

diff --git a/doc/generic/pgf/pgfmanual-en-introduction.tex b/doc/generic/pgf/pgfmanual-en-introduction.tex
@@ -19,7 +19,7 @@ \section{Introduction}
 will teach you almost all you should know about \tikzname\ without your having
 to read the rest.
 
-I wish to start with the questions ``What is \tikzname?'' Basically, it just
+I wish to start with the question ``What is \tikzname?'' Basically, it just
 defines a number of \TeX\ commands that draw graphics. For example, the code
 |\tikz \draw (0pt,0pt) -- (20pt,6pt);| yields the line \tikz \draw (0pt,0pt) --
 (20pt,6pt); and the code |\tikz \fill[orange] (1ex,1ex) circle (1ex);| yields

diff --git a/doc/generic/pgf/pgfmanual-en-pgffor.tex b/doc/generic/pgf/pgfmanual-en-pgffor.tex
@@ -100,7 +100,7 @@ \section{Repeating Things: The Foreach Statement}
     ``missing values''. More precisely, the following happens:
 
     Normally, when a list item |...| is encountered, there should already have
-    been \emph{two} list items before it, which where numbers. Examples of
+    been \emph{two} list items before it, which were numbers. Examples of
     \emph{numbers} are |1|, |-10|, or |-0.24|. Let us call these numbers $x$
     and $y$ and let $d := y-x$ be their difference. Next, there should also be
     one number following the three dots, let us call this number~$z$.

diff --git a/doc/generic/pgf/pgfmanual-en-tikz-coordinates.tex b/doc/generic/pgf/pgfmanual-en-tikz-coordinates.tex
@@ -663,6 +663,7 @@ \subsubsection{Defining New Coordinate Systems}
 \define@key{cylindricalkeys}{angle}{\def\myangle{#1}}
 \define@key{cylindricalkeys}{radius}{\def\myradius{#1}}
 \define@key{cylindricalkeys}{z}{\def\myz{#1}}
+\makeatother
 \tikzdeclarecoordinatesystem{cylindrical}%
 {%
   \setkeys{cylindricalkeys}{#1}%