From 1f2683ba3ec9c1855d5518e773c72d2241637449 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Thu, 30 Jan 2020 03:00:45 +0000 Subject: CTAN sync 202001300300 --- macros/latex/contrib/curve2e/README.txt | 2 +- macros/latex/contrib/curve2e/curve2e-manual.pdf | Bin 565933 -> 566234 bytes macros/latex/contrib/curve2e/curve2e-manual.tex | 27 ++++++++++++------------ macros/latex/contrib/curve2e/curve2e.dtx | 4 ++-- macros/latex/contrib/curve2e/curve2e.pdf | Bin 613238 -> 607171 bytes 5 files changed, 17 insertions(+), 16 deletions(-) (limited to 'macros/latex/contrib/curve2e') diff --git a/macros/latex/contrib/curve2e/README.txt b/macros/latex/contrib/curve2e/README.txt index faddfe1ed4..ea1f941352 100644 --- a/macros/latex/contrib/curve2e/README.txt +++ b/macros/latex/contrib/curve2e/README.txt @@ -10,7 +10,7 @@ %% License information appended %% File README.txt for package curve2e - [2020-01-18 v.2.2.0 Extension package for pict2e] + [2020-01-29 v.2.2.1 Extension package for pict2e] The package bundle curve2e is composed of the following files curve2e.dtx diff --git a/macros/latex/contrib/curve2e/curve2e-manual.pdf b/macros/latex/contrib/curve2e/curve2e-manual.pdf index 32691f5d9b..27ace5e0ca 100644 Binary files a/macros/latex/contrib/curve2e/curve2e-manual.pdf and b/macros/latex/contrib/curve2e/curve2e-manual.pdf differ diff --git a/macros/latex/contrib/curve2e/curve2e-manual.tex b/macros/latex/contrib/curve2e/curve2e-manual.tex index 7e0a5dc1b4..442bb42650 100644 --- a/macros/latex/contrib/curve2e/curve2e-manual.tex +++ b/macros/latex/contrib/curve2e/curve2e-manual.tex @@ -1337,14 +1337,14 @@ Remember to delete all these subfolders if you decide to install a complete upda and \cs{fpdowhile}\meta{test}\meta{operations to be repeated} \end{flushleft} - The name of |\fptest| requires two further arguments that contain + The macro |\fptest| requires two further arguments that contain what to do if the \meta{test} is true, and what to do if the \meta{test} is false. The \meta{test} is a logical expressions that connects math relation - expressions, even floating pint ones, by means of \emph{logical + expressions, even floating point ones, by means of \emph{logical operators}; such operators are \verb+||+, \verb|&&|, and \verb|!|, respectively for OR, AND, NOT; for example \verb|!<| means “not lower - than” which is equivalent to “equal or grater than”. The logical + than”, which is equivalent to “equal or grater than”. The logical expression is parsed left to right and normal parentheses may be used to alter this sequence. The logical operators work also between logical variables, therefore the \meta{test} may contain @@ -1415,11 +1415,11 @@ y = f_2(t) The syntax is the following: \begin{flushleft}\obeylines -\cs{Lissajous}\marg{t}\Oarg{\meta{$A_1$},\meta{$N_1$},\meta{$\phi_1$},\meta{$A_2$},\meta{$N_2$},\meta{$\phi_2$}}\meta{$P_{\mathrm{out}}$} +\cs{Lissajous}\marg{in}\Oarg{\meta{$A_1$},\meta{$N_1$},\meta{$\phi_1$},\meta{$A_2$},\meta{$N_2$},\meta{$\phi_2$}}\meta{$P_{\mathrm{out}}$} \end{flushleft} where \meta{$P_{\mathrm{out}}$} is a macro that gets defined with the cartesian coordinates of the computed output - point. + point.Arguments \meta{in} (the $t$ parameter) and \meta{out} (the computed coordinates) need not be enclosed within braces if they are given as macros; actually the code shown in figure~\ref{fig:lissajous} shows such procedure that renders the input code simpler to read. After this definition the diagram is plotted in figure~\ref{fig:lissajous}. @@ -1432,14 +1432,15 @@ y = f_2(t) \VECTOR(-50,0)(50,0)\Pbox(50,0)[tr]{x}[0] \VECTOR(0,-50)(0,50)\Pbox(0,50)[tr]{y}[0] \Pbox(0,0)[tr]{O}[2] -\countdef\I=2560 \I=0 % -\Lissajous\I[40,2,90,40,3,0]\Pout -{\moveto(\Pout)\relax +{\countdef\I=2560 \I=0 \fpdowhile{\I !> 360}{% -\Lissajous\I\Pout -\lineto(\Pout)\advance\I by1\relax}% -\strokepath} + \fptest{\I=0}% + {\Lissajous\I[40,2,90,40,3,0]\Pout + \moveto(\Pout)}% + {\Lissajous\I\Pout + \lineto(\Pout)}% + \advance\I by1}\strokepath}% \end{picture} \end{Esempio} \caption{A Lissajous diagram}\label{fig:lissajous} @@ -1448,10 +1449,10 @@ y = f_2(t) For the independent variable $t$, the parameter of the Lissajous parametric equations, it is better to work with degrees instead of radians, and with integer numbers, so that the whole range - from $0^\circ$ to $369^\circ$ is certainly spanned. Notice the + from $0^\circ$ to $360^\circ$ is certainly spanned. Notice the braces that include the code for the Lissajous diagram; they may be useful to render that group suitable to be |\put| somewhere - else than with its center in the origin of the canvas axes, + else than with its center at the origin of the canvas axes, and/or to be used as the second argument of a \cs{rotatebox}\marg{angle} command so as to rotate the whole diagram. diff --git a/macros/latex/contrib/curve2e/curve2e.dtx b/macros/latex/contrib/curve2e/curve2e.dtx index 266ca29f25..d387706676 100644 --- a/macros/latex/contrib/curve2e/curve2e.dtx +++ b/macros/latex/contrib/curve2e/curve2e.dtx @@ -46,7 +46,7 @@ README.txt and curve2e-v161.sty. %<+package>\ProvidesPackage{curve2e}% %<+readme>File README.txt for package curve2e %<*package|readme> - [2020-01-18 v.2.2.0 Extension package for pict2e] + [2020-01-29 v.2.2.1 Extension package for pict2e] % %<*driver> \documentclass{ltxdoc}\errorcontextlines=9 @@ -1198,7 +1198,7 @@ README.txt and curve2e-v161.sty. \def\VVECTOR(#1)(#2){{\SubVect#1from#2to\@tempb \ScaleVect\@tempb by0.5to\@tempb \AddVect\@tempb and#1to\@tempb -\VECTOR(\@tempb)(#2)\VECTOR(\@tempb)(#1)\ignorespaces}} +\VECTOR(\@tempb)(#2)\VECTOR(\@tempb)(#1)}\ignorespaces} % \end{macrocode} % % The \texttt{pict2e} documentation says that if the vector length is diff --git a/macros/latex/contrib/curve2e/curve2e.pdf b/macros/latex/contrib/curve2e/curve2e.pdf index d204e13d9a..536c56b9d5 100644 Binary files a/macros/latex/contrib/curve2e/curve2e.pdf and b/macros/latex/contrib/curve2e/curve2e.pdf differ -- cgit v1.2.3