From 1d7a1c697696d66a97b64894f8553a61717928d9 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Tue, 7 Apr 2020 03:02:57 +0000 Subject: CTAN sync 202004070302 --- .../tkz/tkz-base/doc/latex/TKZdoc-base-point.tex | 57 ++++++++++++---------- 1 file changed, 32 insertions(+), 25 deletions(-) (limited to 'macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-point.tex') diff --git a/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-point.tex b/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-point.tex index 03a6721bd2..b0fa58e01f 100644 --- a/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-point.tex +++ b/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-point.tex @@ -6,7 +6,7 @@ The new macro is \tkzNameMacro{tkzDefPoint}, it allows to use \TIKZ-specific opt \subsection{Defining a point in Cartesian coordinates: \tkzcname{tkzDefPoint}} \hypertarget{tdp}{} -\begin{NewMacroBox}{tkzDefPoint}{\oarg{local options}\parg{x,y}\var{name} ou \parg{a:r}\var{name}}% +\begin{NewMacroBox}{tkzDefPoint}{\oarg{local options}\parg{x,y}\var{name} or \parg{a:r}\var{name}}% \begin{tabular}{lll}% arguments & default & definition \\ \midrule @@ -45,7 +45,7 @@ options & default & definition \\ \end{tkzexample} \subsection{Placing a label with the library \tkzname{quotes}} -I prefer not to mix operations and use \tkzcname{tkzLabelPoint} to place labels. See section The Syntax Quotes. +I prefer not to mix operations and use \tkzcname{tkzLabelPoint} to place labels. See the section "The Quotes Syntax" in the \TIKZ\ manual. \begin{tkzexample}[latex=7cm,small] \begin{tikzpicture}[trim left=-1cm] @@ -62,7 +62,7 @@ I prefer not to mix operations and use \tkzcname{tkzLabelPoint} to place labels. \subsubsection{Rotation with \tkzname{shift} and \tkzname{scope}} -Preferable to rotate is to use an environment \tkzNameEnv{scope}. +Preferable to rotate is to use a \tkzNameEnv{scope} environment. \begin{tkzexample}[latex=7cm,small] \begin{tikzpicture}[scale=.75,rotate=90] @@ -97,8 +97,8 @@ Here we must follow the syntax of \tkzNamePack{xfp}. It is always possible to go \end{tikzpicture} \end{tkzexample} -\subsubsection{Scope et \tkzcname{tkzDefPoint} } -First, we can use the \tkzNameEnv{scope} de \TIKZ\ +\subsubsection{Scope and \tkzcname{tkzDefPoint}} +First, we can use the \tkzNameEnv{scope} of \TIKZ. In the following example, we have a way to define an isosceles triangle. \begin{tkzexample}[latex=7cm,small] @@ -120,7 +120,7 @@ In the following example, we have a way to define an isosceles triangle. \subsection{Definition of points in Cartesian coordinates: \tkzcname{tkzDefPoints}} \hypertarget{tdps}{} \begin{NewMacroBox}{tkzDefPoints}{\oarg{local options}\var{$x_1/y_1/n_1,x_2/y_2/n_2$, ...}}% -$x_1$ et $y_1$ are the coordinates of a referenced point $n_1$ +$x_1$ and $y_1$ are the coordinates of a referenced point $n_1$ \begin{tabular}{lll}% \toprule @@ -173,7 +173,7 @@ This macro allows you to place one point relative to another. This is equivalent \end{tkzexample} \subsection{Point relative to another: \tkzcname{tkzDefShiftPointCoord}} -\begin{NewMacroBox}{tkzDefShiftPointCoord}{\oarg{a,b}\parg{x,y}\var{name} ou \parg{a:r}\var{name}}% +\begin{NewMacroBox}{tkzDefShiftPointCoord}{\oarg{a,b}\parg{x,y}\var{name} or \parg{a:r}\var{name}}% {This involves performing a $(a,b)$ vector translation at the defined point relative to the origin.} \medskip @@ -247,7 +247,7 @@ arguments & default & definition \\ \toprule options & default & definition \\ \midrule -\TOline{shape} {circle}{Possible \tkzname{cross} ou \tkzname{cross out}} +\TOline{shape} {circle}{Possible \tkzname{cross} or \tkzname{cross out}} \TOline{size} {2 pt} {disk size} \TOline{color} {black}{the default color can be changed} \bottomrule @@ -266,7 +266,7 @@ options & default & definition \\ \end{tkzexample} \subsubsection{Changing the style} -The default definition in the file \tkzname{tkz-base.cfg} +The default definition is in the file \tkzname{tkz-base.cfg} \begin{tkzltxexample}[small] \tikzset{point style/.style={draw = \tkz@euc@pointcolor, @@ -369,7 +369,7 @@ options & default & definition\\ \end{tabular} \medskip -Optionally, we can use any style of Tikz, especially placement with above, right, dots... +Optionally, we can use any style of \TIKZ, especially placement with above, right, dots... \end{NewMacroBox} \subsubsection{Example with \tkzcname{tkzLabelPoint}} @@ -407,7 +407,7 @@ It is possible to place several labels quickly when the point references are ide \begin{tabular}{lll} arguments & example & result \\ \midrule -\TAline{list of points}{\tkzcname{tkzLabelPoint(A,B,C)}}{Display of $A$, $B$ and $C$} +\TAline{list of points}{\tkzcname{tkzLabelPoints(A,B,C)}}{Display of $A$, $B$ and $C$} \bottomrule \end{tabular} @@ -429,17 +429,25 @@ This macro reduces the number of lines of code, but it is not obvious that all p % tkzAutoLabelPoints %<---------------------------------------------------------------------------> \subsection{Automatic position of labels \tkzcname{tkzAutoLabelPoints}} -The label of a point is placed in a direction defined by a center and a point \tkzname{center}. The distance to the point is determined by a percentage of the distance between the center and the point. This percentage is given by \tkzname{dist}. +The label of a point is placed in a direction defined by a \tkzname{center} and a point . The distance to the point is determined by a percentage of the distance between the center and the point. This percentage is given by \tkzname{dist}. \begin{NewMacroBox}{tkzLabelPoints}{\oarg{local options}\parg{$A_1,A_2,...$}}% \begin{tabular}{lll} arguments & example & result \\ \midrule \TAline{list of points}{\tkzcname{tkzLabelPoint(A,B,C)}}{Display of $A$, $B$ and $C$} \end{tabular} + +\medskip +\begin{tabular}{lll} +options & default & definition \\ +\midrule +\TOline{center}{no default}{you need to deisgn a center} +\TOline{dist}{0.15}{percentage change in the distance between the center and the points} +\end{tabular} \end{NewMacroBox} -\subsubsection{Example with \tkzcname{tkzAutoLabelPoints}} -Here the points are positioned relative to the center of gravity of $A,B,C \text{et} O$. +\subsubsection{Example 1 with \tkzcname{tkzAutoLabelPoints}} +Here the points are positioned relative to the center of gravity of $A,B,C \ \text{et}\ O$. \begin{tkzexample}[latex=5cm,small] \begin{tikzpicture}[scale=1.25] \tkzDefPoint(2,1){O} @@ -459,7 +467,7 @@ Here the points are positioned relative to the center of gravity of $A,B,C \text \end{tikzpicture} \end{tkzexample} -\subsubsection{Example with \tkzcname{tkzAutoLabelPoints}} +\subsubsection{Example 2 with \tkzcname{tkzAutoLabelPoints}} This time the reference is $O$ and the distance is by default $0.15$. \begin{tkzexample}[latex=5cm,small] \begin{tikzpicture}[scale=1.25] @@ -486,8 +494,8 @@ options & default & definition \\ \midrule \TOline{shape}{circle}{possible: circle, cross, cross out} \TOline{size}{current }{the size of the point is size * line width } -\TOline{color}{current}{example \tkzcname{tkzLabelPoint(A,B,C)}} -\TOline{fill}{current!50}{example \tkzcname{tkzLabelPoint(A,B,C)}} +\TOline{color}{current}{} +\TOline{fill}{current!50}{} \end{tabular} \end{NewMacroBox} @@ -505,7 +513,7 @@ This is a macro for choosing a \hypertarget{setupoint}{style} for points. \end{tikzpicture} \end{tkzexample} -\subsubsection{Example with \tkzcname{tkzSetUpPoint}} +\subsubsection{Second example with \tkzcname{tkzSetUpPoint}} \begin{tkzexample}[latex=7cm,small] \begin{tikzpicture} \tkzInit[ymin=-0.5,ymax=3,xmin=-0.5,xmax=7] @@ -558,8 +566,11 @@ argument & example & explanation \\ option & default & explication \\ \midrule \TOline{xlabel}{empty}{label abscissa} -\TOline{xstyle}{empty}{style for the abscissa label node} -\TOline{noxdraw}{false}{boolean so as not to draw an arrow to $(x'x)$} +\TOline{xstyle}{empty}{style for the abscissa label node example |text=red|} +\TOline{noxdraw}{false}{boolean for not draw an arrow to the X-axis $(x'x)$} +\TOline{ylabel}{empty}{idem} +\TOline{ystyle}{empty}{idem} +\TOline{noydraw}{false}{idem} \end{tabular} \end{NewMacroBox} @@ -585,8 +596,6 @@ Here are some of the main styles: \end{tkzltxexample} \subsubsection{Example with \tkzcname{tkzPointShowCoord}} -Without the options, you only get the arrows. - \begin{tkzexample}[latex=7cm,small] \begin{tikzpicture}[scale=1.5] @@ -603,8 +612,6 @@ Without the options, you only get the arrows. \end{tkzexample} \subsubsection{Example with \tkzcname{tkzPointShowCoord} and \tkzname{xstep}} -Without the options, you only get the arrows. - \begin{tkzexample}[latex=7cm,small] \begin{tikzpicture}[xscale=3,yscale=2] @@ -621,7 +628,7 @@ Without the options, you only get the arrows. \subsection{\tkzcname{tkzDefSetOfPoints}} % (fold) It was already possible to create a scatter plot with the macro \tkzcname{tkzDefPoints}, but this requires making a reference (a name) to each point, which is sometimes tedious. The macro \tkzcname{tkzSetOfPoints} allows to define points \tkzname{tkzPt1}, \tkzname{tkzPt2}, etc. -This is frequently referred to as \hypertarget{label_tkzDefSetOfPoints}{« scatter plot"}. The difference from the macro \tkzcname{tkzDefPoints} is that the reference to the points is given by a prefix (default tkzPt) and the point number. +This is frequently referred to as \hypertarget{label_tkzDefSetOfPoints}{ "scatter plot"}. The difference from the macro \tkzcname{tkzDefPoints} is that the reference to the points is given by a prefix (default \tkzname{tkzPt}) and the point number. The points are not drawn. \begin{NewMacroBox}{tkzDefSetOfPoints}{\oarg{local options}\var{$x_1/y_1,x_2/y_2,\ldots,x_n/y_n$}}% -- cgit v1.2.3