diff options
author | Karl Berry <karl@freefriends.org> | 2019-05-08 21:09:31 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2019-05-08 21:09:31 +0000 |
commit | 3de6683607c3042def19b77ca8a338814d0a1575 (patch) | |
tree | 106d17a816c9eb899d2943cbadb33aa9b627f4ca /Master/texmf-dist/doc/generic/pgf/text-en | |
parent | 3e178d666f929257b38c4d6857bccf4076145c29 (diff) |
pgf revert again to r49607, after mistaken update
git-svn-id: svn://tug.org/texlive/trunk@51047 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/doc/generic/pgf/text-en')
11 files changed, 19 insertions, 27 deletions
diff --git a/Master/texmf-dist/doc/generic/pgf/text-en/pgfmanual-en-base-decorations.tex b/Master/texmf-dist/doc/generic/pgf/text-en/pgfmanual-en-base-decorations.tex index a4067c9861a..b51d5373162 100644 --- a/Master/texmf-dist/doc/generic/pgf/text-en/pgfmanual-en-base-decorations.tex +++ b/Master/texmf-dist/doc/generic/pgf/text-en/pgfmanual-en-base-decorations.tex @@ -968,7 +968,7 @@ only use one meta-decoration per path. \begin{environment}{{pgfmetadecoration}\marg{name}} This environment decorates the input path described in \meta{environment - contents}, with the meta-decoration \meta{name}. + contents}, with the meta-decoration \meta{name}. \end{environment} \begin{plainenvironment}{{pgfmetadecoration}\marg{name}} diff --git a/Master/texmf-dist/doc/generic/pgf/text-en/pgfmanual-en-base-points.tex b/Master/texmf-dist/doc/generic/pgf/text-en/pgfmanual-en-base-points.tex index 56f49d7e5dc..eace57ffde3 100644 --- a/Master/texmf-dist/doc/generic/pgf/text-en/pgfmanual-en-base-points.tex +++ b/Master/texmf-dist/doc/generic/pgf/text-en/pgfmanual-en-base-points.tex @@ -66,7 +66,7 @@ The following commands are the most basic for specifying a coordinate. \draw[help lines] (0,0) grid (3,2); \foreach \angle in {0,10,...,90} - {\pgfpathcircle{\pgfpointpolar{\angle}{1cm and 2cm}}{2pt}} + {\pgfpathcircle{\pgfpointpolar{\angle}{1cm/2cm}}{2pt}} \pgfusepath{fill} \end{tikzpicture} \end{codeexample} @@ -662,8 +662,8 @@ be used to perform the above code: Note that this macro is used often internally. For this reason, it is not a good idea to keep anything important in the variables |\pgf@x| and |\pgf@y| since they will be overwritten and changed frequently. Instead, intermediate -values can be stored in the \TeX-dimensions |\pgf@xa|, |\pgf@xb|, |\pgf@xc| and -their |y|-counterparts |\pgf@ya|, |\pgf@yb|, |\pgf@yc|. For example, here is the +values can ge stored in the \TeX-dimensions |\pgf@xa|, |\pgf@xb|, |\pgf@xc| and +their |y|-counterparts |\pgf@ya|, |\pgf@yb|, |pgf@yc|. For example, here is the code of the command |\pgfpointadd|: % \begin{codeexample}[code only] diff --git a/Master/texmf-dist/doc/generic/pgf/text-en/pgfmanual-en-base-transparency.tex b/Master/texmf-dist/doc/generic/pgf/text-en/pgfmanual-en-base-transparency.tex index 22156f98d3e..fda8f6a8872 100644 --- a/Master/texmf-dist/doc/generic/pgf/text-en/pgfmanual-en-base-transparency.tex +++ b/Master/texmf-dist/doc/generic/pgf/text-en/pgfmanual-en-base-transparency.tex @@ -349,7 +349,6 @@ Transparency groups are declared using the following commands. is ``large enough'' and then insert this picture into the main picture while ignoring the size. The following example shows how this is done: -% TODO: Nesting tikzpictures is NOT supported {\tikzexternaldisable \begin{codeexample}[] \begin{tikzpicture} diff --git a/Master/texmf-dist/doc/generic/pgf/text-en/pgfmanual-en-library-circuits.tex b/Master/texmf-dist/doc/generic/pgf/text-en/pgfmanual-en-library-circuits.tex index 31d4345cb69..66bbd1e3233 100644 --- a/Master/texmf-dist/doc/generic/pgf/text-en/pgfmanual-en-library-circuits.tex +++ b/Master/texmf-dist/doc/generic/pgf/text-en/pgfmanual-en-library-circuits.tex @@ -1241,7 +1241,7 @@ Let us begin with the base library that defines the handling of inputs. \foreach \x/\y/\z in {false/blue/1pt, true/red/2pt} \foreach \a in {north, south, east, west, north east, south east, north west, south west} - \draw[logic gate anchors use bounding box=\x, color=\y] + \draw[logic gate anchors use bounding box=\x, color=\y] (A.\a) circle(\z); \end{tikzpicture} \end{codeexample} diff --git a/Master/texmf-dist/doc/generic/pgf/text-en/pgfmanual-en-library-decorations.tex b/Master/texmf-dist/doc/generic/pgf/text-en/pgfmanual-en-library-decorations.tex index 718d8b7870c..58d2b6f3af8 100644 --- a/Master/texmf-dist/doc/generic/pgf/text-en/pgfmanual-en-library-decorations.tex +++ b/Master/texmf-dist/doc/generic/pgf/text-en/pgfmanual-en-library-decorations.tex @@ -1819,7 +1819,7 @@ shapes. This library is included mostly for historical reasons, using the \end{key} \begin{key}{/pgf/decoration/text effects/word count=\meta{macro}} - Store the number of words in the decoration text in \meta{macro}. + Store the number of words in the decoration text in \meta{macro}. Numbering starts at |1|. When the character is the word separator, \meta{macro} takes the number of the previous word. If the decoration text starts with a word separator \meta{macro} will be |0|. diff --git a/Master/texmf-dist/doc/generic/pgf/text-en/pgfmanual-en-main-body.tex b/Master/texmf-dist/doc/generic/pgf/text-en/pgfmanual-en-main-body.tex index 15a678e7270..78b72d5ab8c 100644 --- a/Master/texmf-dist/doc/generic/pgf/text-en/pgfmanual-en-main-body.tex +++ b/Master/texmf-dist/doc/generic/pgf/text-en/pgfmanual-en-main-body.tex @@ -50,7 +50,6 @@ \foreach \where in {-9cm,9cm} {\nodeshadowed [at={(\where,5cm)}] { - % TODO: Nesting tikzpictures is NOT supported \tikz \draw [green!20!black, rotate=90] [l-system={rule set={F -> FF-[-F+F]+[+F-F]}, axiom=F, order=4, step=2pt, randomize step percent=50, angle=30, randomize angle percent=5}] @@ -221,7 +220,7 @@ \title{\bfseries The \tikzname\ and {\Large PGF} Packages\\ \large Manual for version \pgfversion\\[1mm] -\large\href{https://github.com/pgf-tikz/pgf}{\texttt{https://github.com/pgf-tikz/pgf}}} +\large\href{https://sourceforge.net/projects/pgf}{\texttt{https://sourceforge.net/projects/pgf}}} \author{Till Tantau\footnote{Editor of this documentation. Parts of this documentation have been written by other authors as indicated in these parts or chapters and in Section~\ref{section-authors}.}\\ @@ -537,7 +536,6 @@ libraries are not loaded by default since many users will not need them. \include{pgfmanual-en-library-mindmaps} \include{pgfmanual-en-library-folding} \include{pgfmanual-en-library-patterns} -\include{pgfmanual-en-library-perspective} \include{pgfmanual-en-library-petri} \include{pgfmanual-en-library-plot-handlers} \include{pgfmanual-en-library-plot-marks} diff --git a/Master/texmf-dist/doc/generic/pgf/text-en/pgfmanual-en-main-preamble.tex b/Master/texmf-dist/doc/generic/pgf/text-en/pgfmanual-en-main-preamble.tex index d35c0e89abd..5515cc8b7ed 100644 --- a/Master/texmf-dist/doc/generic/pgf/text-en/pgfmanual-en-main-preamble.tex +++ b/Master/texmf-dist/doc/generic/pgf/text-en/pgfmanual-en-main-preamble.tex @@ -94,7 +94,6 @@ views, animations, rdf, - perspective, } \usepackage{ifluatex} diff --git a/Master/texmf-dist/doc/generic/pgf/text-en/pgfmanual-en-pgffor.tex b/Master/texmf-dist/doc/generic/pgf/text-en/pgfmanual-en-pgffor.tex index 8ae0628b367..a8ddbd9194a 100644 --- a/Master/texmf-dist/doc/generic/pgf/text-en/pgfmanual-en-pgffor.tex +++ b/Master/texmf-dist/doc/generic/pgf/text-en/pgfmanual-en-pgffor.tex @@ -359,19 +359,6 @@ This section describes the package |pgffor|, which is loaded automatically by \end{codeexample} % \end{key} - - \begin{key}{/pgf/foreach/parse=\marg{boolean} (default false)} - If this key is set to true the upper bound in the loop will be - fed into |\pgfmathparse|. This allows to use complex expressions as - the upper bound. However, the expression must be safe for evaluation - in |\pgfmathparse|. It is known that internal \TeX\ registers can - cause trouble. - % -\begin{codeexample}[] -\foreach \x [parse=true] in {1,...,1.0e+1 - 1}{ \x } -\end{codeexample} - % - \end{key} \end{command} \begin{command}{\breakforeach} diff --git a/Master/texmf-dist/doc/generic/pgf/text-en/pgfmanual-en-tikz-coordinates.tex b/Master/texmf-dist/doc/generic/pgf/text-en/pgfmanual-en-tikz-coordinates.tex index c3921486e6d..8ffafad7f54 100644 --- a/Master/texmf-dist/doc/generic/pgf/text-en/pgfmanual-en-tikz-coordinates.tex +++ b/Master/texmf-dist/doc/generic/pgf/text-en/pgfmanual-en-tikz-coordinates.tex @@ -1046,7 +1046,7 @@ which you need. whatever value it had at the beginning of the scope. More precisely, when \tikzname\ encounters |}| on a path, it checks whether at this particular moment the key is set to |true|. If so, the current position reverts to the - value it had when the matching |{| was read. + value is had when the matching |{| was read. % \begin{codeexample}[] \begin{tikzpicture} diff --git a/Master/texmf-dist/doc/generic/pgf/text-en/pgfmanual-en-tikz-decorations.tex b/Master/texmf-dist/doc/generic/pgf/text-en/pgfmanual-en-tikz-decorations.tex index 009660a911d..1600e6f5378 100644 --- a/Master/texmf-dist/doc/generic/pgf/text-en/pgfmanual-en-tikz-decorations.tex +++ b/Master/texmf-dist/doc/generic/pgf/text-en/pgfmanual-en-tikz-decorations.tex @@ -474,20 +474,25 @@ decorations, not with meta-decorations. which |0pt| by default. Thus, for the |pre| option to have any effect, you also need to set the |pre length| option. % - % TODO: Nesting tikzpictures is NOT supported \begin{codeexample}[] +\begin{tikzpicture} \tikz [decoration={zigzag,pre=lineto,pre length=1cm}] \draw [decorate] (0,0) -- (2,1) arc (90:0:1); +\end{tikzpicture} \end{codeexample} % \begin{codeexample}[] +\begin{tikzpicture} \tikz [decoration={zigzag,pre=moveto,pre length=1cm}] \draw [decorate] (0,0) -- (2,1) arc (90:0:1); +\end{tikzpicture} \end{codeexample} % \begin{codeexample}[] +\begin{tikzpicture} \tikz [decoration={zigzag,pre=crosses,pre length=1cm}] \draw [decorate] (0,0) -- (2,1) arc (90:0:1); +\end{tikzpicture} \end{codeexample} Note that the default |pre| option is |lineto|, not |curveto|. This means @@ -495,13 +500,17 @@ decorations, not with meta-decorations. reasons). Change the |pre| key to |curveto| if you have a curved path. % \begin{codeexample}[] +\begin{tikzpicture} \tikz [decoration={zigzag,pre length=3cm}] \draw [decorate] (0,0) -- (2,1) arc (90:0:1); +\end{tikzpicture} \end{codeexample} % \begin{codeexample}[] +\begin{tikzpicture} \tikz [decoration={zigzag,pre=curveto,pre length=3cm}] \draw [decorate] (0,0) -- (2,1) arc (90:0:1); +\end{tikzpicture} \end{codeexample} % \end{key} diff --git a/Master/texmf-dist/doc/generic/pgf/text-en/pgfmanual-en-tutorial-Euclid.tex b/Master/texmf-dist/doc/generic/pgf/text-en/pgfmanual-en-tutorial-Euclid.tex index ace6c5d8827..c35deca1f82 100644 --- a/Master/texmf-dist/doc/generic/pgf/text-en/pgfmanual-en-tutorial-Euclid.tex +++ b/Master/texmf-dist/doc/generic/pgf/text-en/pgfmanual-en-tutorial-Euclid.tex @@ -488,7 +488,7 @@ The second proposition in the Elements is the following: Produce the straight lines \A\E\ and \B\F\ in a straight line with \D\A\ and \D\B. Describe the circle \C\G\H\ with center \B\ and radius \B\C, and again, describe the circle \G\K\L\ with center - \D\ and radius \D\G. + \D\ and radius \D\G. Since the point \B\ is the center of the circle \C\G\H, therefore \B\C\ equals \B\G. Again, since the point \D\ is the center of the |