summaryrefslogtreecommitdiff
path: root/graphics/pgf/base/doc/text-en
diff options
context:
space:
mode:
Diffstat (limited to 'graphics/pgf/base/doc/text-en')
-rw-r--r--graphics/pgf/base/doc/text-en/pgfmanual-en-base-nodes.tex3
-rw-r--r--graphics/pgf/base/doc/text-en/pgfmanual-en-guidelines.tex2
-rw-r--r--graphics/pgf/base/doc/text-en/pgfmanual-en-library-edges.tex3
-rw-r--r--graphics/pgf/base/doc/text-en/pgfmanual-en-library-fpu.tex3
-rw-r--r--graphics/pgf/base/doc/text-en/pgfmanual-en-library-math.tex22
-rw-r--r--graphics/pgf/base/doc/text-en/pgfmanual-en-math-parsing.tex13
-rw-r--r--graphics/pgf/base/doc/text-en/pgfmanual-en-pgfkeys.tex3
-rw-r--r--graphics/pgf/base/doc/text-en/pgfmanual-en-tikz-graphs.tex2
-rw-r--r--graphics/pgf/base/doc/text-en/pgfmanual-en-tikz-shapes.tex4
-rw-r--r--graphics/pgf/base/doc/text-en/pgfmanual-en-tutorial.tex2
10 files changed, 37 insertions, 20 deletions
diff --git a/graphics/pgf/base/doc/text-en/pgfmanual-en-base-nodes.tex b/graphics/pgf/base/doc/text-en/pgfmanual-en-base-nodes.tex
index 29034d17cb..19499ec551 100644
--- a/graphics/pgf/base/doc/text-en/pgfmanual-en-base-nodes.tex
+++ b/graphics/pgf/base/doc/text-en/pgfmanual-en-base-nodes.tex
@@ -601,6 +601,9 @@ commands:
\end{pgfpicture}
\end{codeexample}
%
+ \emph{Remark:} If the given \meta{point} is almost identical to the center
+ of \meta{node}, the node center is returned and a warning message will be
+ printed.
\end{command}
diff --git a/graphics/pgf/base/doc/text-en/pgfmanual-en-guidelines.tex b/graphics/pgf/base/doc/text-en/pgfmanual-en-guidelines.tex
index e59a2b19ec..fa29cce302 100644
--- a/graphics/pgf/base/doc/text-en/pgfmanual-en-guidelines.tex
+++ b/graphics/pgf/base/doc/text-en/pgfmanual-en-guidelines.tex
@@ -320,7 +320,7 @@ is ``the graphic looks nicer than the table'', try to answer the following
questions based on the information in the table or in the graphic:
%
\begin{enumerate}
- \item How many participants where there?
+ \item How many participants were there?
\item How many participants returned the feedback form?
\item What percentage of the participants returned the feedback form?
\item How many participants checked ``very good''?
diff --git a/graphics/pgf/base/doc/text-en/pgfmanual-en-library-edges.tex b/graphics/pgf/base/doc/text-en/pgfmanual-en-library-edges.tex
index 7207fb1612..51332af0cc 100644
--- a/graphics/pgf/base/doc/text-en/pgfmanual-en-library-edges.tex
+++ b/graphics/pgf/base/doc/text-en/pgfmanual-en-library-edges.tex
@@ -253,7 +253,8 @@ this curve looks can be influenced via a number of options.
%
\begin{key}{/tikz/in control=\meta{coordinate}}
This option causes the \meta{coordinate} to be used as the target
- control point.
+ control point. You can use a coordinate like |+(1,0)| to specify
+ a point relative to the \emph{end} coordinate.
\end{key}
%
\begin{key}{/tikz/controls=\meta{coordinate}| and |\meta{coordinate}}
diff --git a/graphics/pgf/base/doc/text-en/pgfmanual-en-library-fpu.tex b/graphics/pgf/base/doc/text-en/pgfmanual-en-library-fpu.tex
index 04989eef44..6c0f62f5f5 100644
--- a/graphics/pgf/base/doc/text-en/pgfmanual-en-library-fpu.tex
+++ b/graphics/pgf/base/doc/text-en/pgfmanual-en-library-fpu.tex
@@ -179,7 +179,8 @@ by \pgfname.
\endgroup
\end{codeexample}
%
- \emph{This key is experimental and can change or disappear at any time!}
+ This key is introduced in \pgfname v3.1.6 and marked stable since \pgfname
+ v3.1.8.
\end{key}
diff --git a/graphics/pgf/base/doc/text-en/pgfmanual-en-library-math.tex b/graphics/pgf/base/doc/text-en/pgfmanual-en-library-math.tex
index 7f0b429f1b..8fabb4998e 100644
--- a/graphics/pgf/base/doc/text-en/pgfmanual-en-library-math.tex
+++ b/graphics/pgf/base/doc/text-en/pgfmanual-en-library-math.tex
@@ -68,7 +68,7 @@ following command:
};
};
int \f, \i;
- for \i in {0,1,...,20}{
+ for \i in {0,1,...,20} {
\f = fibonacci(\i);
print {\f, };
};
@@ -86,8 +86,8 @@ In addition to this command the following key is provided:
\tikz[x=0.25cm,y=0.25cm,
evaluate={
int \i, \j;
- for \i in {0,...,10}{
- for \j in {0,...,10}{
+ for \i in {0,...,10} {
+ for \j in {0,...,10} {
\a{\i,\j} = (\i+\j)*5;
};
};
@@ -295,7 +295,7 @@ following keyword.
\subsection{Repeating Things}
-\begin{math-keyword}{{for} \meta{variable} \texttt{in \{}\meta{list}\texttt{\}\{}\meta{expressions}\texttt{\};}}
+\begin{math-keyword}{{for} \meta{variable} \texttt{in \{}\meta{list} \texttt{\}\{}\meta{expressions}\texttt{\};}}
This is a ``trimmed down'' version of the |\foreach| command available as
part of \pgfname\ and \tikzname, but cannot currently be used outside of
the |\tikzmath| command. It is important to note the following:
@@ -310,7 +310,7 @@ following keyword.
\tikzmath{
int \x, \v;
\v=1;
- for \x in {1,...,{random(3,10)}}{
+ for \x in {1,...,{random(3,10)}} {
\v=\v*2;
};
print {$x=\x, v=\v$};
@@ -333,8 +333,8 @@ following keyword.
\tikzmath{
int \x, \y;
\y = 0;
- for \x1 in {1,...,5}{
- for \x2 in {10,20,...,50}{
+ for \x1 in {1,...,5} {
+ for \x2 in {10,20,...,50} {
\y = \y+\x1*\x2;
};
};
@@ -365,7 +365,7 @@ of an expression. In this case the following keyword can be used:
\begin{tikzpicture}
\tikzmath{
int \x;
- for \k in {0,10,...,350}{
+ for \k in {0,10,...,350} {
if \k>260 then { let \c = orange; } else {
if \k>170 then { let \c = blue; } else {
if \k>80 then { let \c = red; } else {
@@ -409,7 +409,7 @@ You can add functions by using the following keywords:
function product(\x,\y) {
return \x*\y;
};
- int \i, \i, \k;
+ int \i, \j, \k;
\i = random(1,10);
\j = random(20, 40);
\k = product(\i, \j);
@@ -441,7 +441,7 @@ options. Firstly, the following keyword can be used:
\tikzmath{
int \x, \y, \z;
\x = random(2, 5);
- for \y in {0,...,6}{
+ for \y in {0,...,6} {
\z = \x^\y;
print {$\x^\y=\z$, };
};
@@ -462,7 +462,7 @@ executed inside a |tikzpicture|.
\draw [help lines] grid (3,2);
\tikzmath{
coordinate \c;
- for \x in {0,10,...,360}{
+ for \x in {0,10,...,360} {
\c = (1.5cm, 1cm) + (\x:1cm and 0.5cm);
{ \fill (\c) circle [radius=1pt]; };
};
diff --git a/graphics/pgf/base/doc/text-en/pgfmanual-en-math-parsing.tex b/graphics/pgf/base/doc/text-en/pgfmanual-en-math-parsing.tex
index d694ef7355..c0d32d4d9c 100644
--- a/graphics/pgf/base/doc/text-en/pgfmanual-en-math-parsing.tex
+++ b/graphics/pgf/base/doc/text-en/pgfmanual-en-math-parsing.tex
@@ -484,7 +484,7 @@ The following functions are recognized:
\begin{tikzpicture}
\foreach \f [count=\i from 0] in
{abs,acos,add,and,array,asin,atan,atan2,bin,ceil,cos,
- cosec,cosh,cot,deg,depth,div,divide,e,equal,factorial, false,
+ cosec,cosh,cot,deg,depth,dim,div,divide,e,equal,factorial, false,
floor,frac,gcd,greater,height,hex,Hex,int,ifthenelse,iseven,isodd,isprime,
less,ln,log10,log2,max,min,mod,Mod,multiply,
neg,not,notequal,notgreater,notless,
@@ -1332,6 +1332,17 @@ some notable exceptions.
%
\end{math-function}
+\begin{math-function}{dim(\mvar{x})}
+\mathcommand
+ This returns the dimension of the array \mvar{x}. The array must begin and
+ end with braces (e.g., |{1,2,3,4}|).
+ %
+\begin{codeexample}[]
+\pgfmathparse{dim({1,2,3,4})} \pgfmathresult
+\end{codeexample}
+ %
+\end{math-function}
+
The following hyperbolic functions were adapted from code suggested by Martin
Heller:
diff --git a/graphics/pgf/base/doc/text-en/pgfmanual-en-pgfkeys.tex b/graphics/pgf/base/doc/text-en/pgfmanual-en-pgfkeys.tex
index 641bae58f2..95994059da 100644
--- a/graphics/pgf/base/doc/text-en/pgfmanual-en-pgfkeys.tex
+++ b/graphics/pgf/base/doc/text-en/pgfmanual-en-pgfkeys.tex
@@ -1025,9 +1025,6 @@ A number of handlers exist for defining the code of keys.
\pgfkeys{/page size={30cm}{20cm}}
\end{codeexample}
%
- The second argument is optional: if it is not provided, it will be the
- empty string.
-
Because of the special way the \meta{value} is parsed, if you set
\meta{value} to, for instance, |first| (without any braces), then |#1| will
be set to |f| and |#2| will be set to |irst|.
diff --git a/graphics/pgf/base/doc/text-en/pgfmanual-en-tikz-graphs.tex b/graphics/pgf/base/doc/text-en/pgfmanual-en-tikz-graphs.tex
index bfe669c724..0135679c6e 100644
--- a/graphics/pgf/base/doc/text-en/pgfmanual-en-tikz-graphs.tex
+++ b/graphics/pgf/base/doc/text-en/pgfmanual-en-tikz-graphs.tex
@@ -270,7 +270,7 @@ preamble) results in the following somewhat more pleasing rendering:
\subsubsection{Concept: Edge Labels and Styles}
When connectors like |->| or |--| are used to connect nodes or whole chain
-groups, one or more edges will typically be created. These edges can be styles
+groups, one or more edges will typically be created. These edges can be styled
easily by providing options in square brackets directly after these connectors:
%
\begin{codeexample}[preamble={\usetikzlibrary{graphs}}]
diff --git a/graphics/pgf/base/doc/text-en/pgfmanual-en-tikz-shapes.tex b/graphics/pgf/base/doc/text-en/pgfmanual-en-tikz-shapes.tex
index eb23cd90d8..aa9b1a8962 100644
--- a/graphics/pgf/base/doc/text-en/pgfmanual-en-tikz-shapes.tex
+++ b/graphics/pgf/base/doc/text-en/pgfmanual-en-tikz-shapes.tex
@@ -2627,6 +2627,10 @@ Section~\ref{section-node-coordinates}. Suppose you have said
Likewise, |(1,1)--(x)| will also have the line end on the border in the
direction coming from |(1,1)|.
+ If the specified coordinate is almost identical to the node center, for
+ example |(x)--(0,0)|, no line will be drawn and a warning message will
+ be printed.
+
In addition to |--|, the curve-to path operation |..| and the path
operations \verb!-|! and \verb!|-! will also handle nodes without
anchors correctly. Here is an example, see also
diff --git a/graphics/pgf/base/doc/text-en/pgfmanual-en-tutorial.tex b/graphics/pgf/base/doc/text-en/pgfmanual-en-tutorial.tex
index 7f334ddc7f..ae2c47cdc9 100644
--- a/graphics/pgf/base/doc/text-en/pgfmanual-en-tutorial.tex
+++ b/graphics/pgf/base/doc/text-en/pgfmanual-en-tutorial.tex
@@ -793,7 +793,7 @@ from where the sine ends:
\end{codeexample}
Note that there is no |--| between |(30:1cm)| and |++(0,-0.5)|. In detail, this
-path is interpreted as follows: ``First, the |(30:1cm)| tells me to move by pen
+path is interpreted as follows: ``First, the |(30:1cm)| tells me to move my pen
to $(\cos 30^\circ,1/2)$. Next, there comes another coordinate specification,
so I move my pen there without drawing anything. This new point is half a unit
down from the last position, thus it is at $(\cos 30^\circ,0)$. Finally, I move