texlive[60932] Master/texmf-dist: bodeplot (3nov21)
commits+karl at tug.org
commits+karl at tug.org
Wed Nov 3 21:48:03 CET 2021
Revision: 60932
http://tug.org/svn/texlive?view=revision&revision=60932
Author: karl
Date: 2021-11-03 21:48:02 +0100 (Wed, 03 Nov 2021)
Log Message:
-----------
bodeplot (3nov21)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/bodeplot/bodeplot.pdf
trunk/Master/texmf-dist/source/latex/bodeplot/bodeplot.dtx
trunk/Master/texmf-dist/tex/latex/bodeplot/bodeplot.sty
Modified: trunk/Master/texmf-dist/doc/latex/bodeplot/bodeplot.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/bodeplot/bodeplot.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/bodeplot/bodeplot.dtx 2021-11-03 00:48:37 UTC (rev 60931)
+++ trunk/Master/texmf-dist/source/latex/bodeplot/bodeplot.dtx 2021-11-03 20:48:02 UTC (rev 60932)
@@ -20,6 +20,8 @@
%<package> \ProvidesPackage{bodeplot}
%<package> \RequirePackage{tikz}
%<package> \RequirePackage{pgfplots}
+%<package> \RequirePackage{pdftexcmds}
+%<package> \RequirePackage{ifplatform}
%<package> \pgfplotsset{compat=1.18,variable=t}
%<package> \usepgfplotslibrary{groupplots}
%
@@ -38,7 +40,7 @@
%</driver>
% \fi
%
-% \CheckSum{0}
+% \CheckSum{1162}
%
% \changes{v1.0}{2021/10/25}{Initial release}
%
@@ -52,7 +54,7 @@
% \author{Rushikesh Kamalapurkar \\ \texttt{rlkamalapurkar at gmail.com}}
%
% \maketitle
-%
+% \tableofcontents
% \section{Introduction}
%
% Generate Bode, Nyquist, and Nichols plots for transfer functions in the canonical (TF) form \begin{equation}G(s) = e^{-Ts}\frac{b_ms^m+\cdots+b_1s+b_0}{a_ns^n+\cdots+a_1s+a_0}\label{eq:TF}\end{equation} and the zero-pole-gain (ZPK) form \begin{equation}G(s) = Ke^{-Ts}\frac{(s-z_1)(s-z_2)\cdots(s-z_m)}{(s-p_1)(s-p_2)\cdots(s-p_n)}.\label{eq:ZPK}\end{equation} In the equations above, $b_m,\cdots,b_0$ and $a_n,\cdots,a_0$ are real coefficients, $T\geq 0$ is the loop delay, $z_1,\cdots,z_m$ and $p_1,\cdots,p_n$ are complex zeros and poles of the transfer function, respectively, and $K\in \Re$ is the loop gain. For transfer functions in the ZPK format in (\ref{eq:ZPK}) with zero delay, this package also supports linear and asymptotic approximation of Bode plots.
@@ -72,6 +74,7 @@
% \begin{itemize}
% \item |plot/typ/{opt}|: modify plot properties by adding options |{opt}| to the |\addplot| macro for the magnitude plot if |typ| is |mag| and the phase plot if |typ| is |ph|.
% \item |axes/typ/{opt}|: modify axis properties by adding options |{opt}| to the |\nextgroupplot| macro for the magnitude plot if |typ| is |mag| and the phase plot if |typ| is |ph|.
+% \item |commands/typ/{opt}|: add any valid TikZ commands (including the the parametric function generator macros in this package, such as |\addBodeZPKPlots|, |\addBodeTFPlot|, and |\addBodeComponentPlot|) to the magnitude axes plot if |typ| is |mag| and the phase plot if |typ| is |ph|. The commands passed to |opt| need to be valid TikZ commands, separated by semicolons as usual. For example, a TikZ command is used in the description of the |\BodeTF| macro below to mark the gain crossover frequency on the Bode Magnitude plot.
% \end{itemize}
% \item Tuples of the form |obj/{opt}|:
% \begin{itemize}
@@ -86,7 +89,7 @@
% The options |{opt}| can be any |key=value| options that are supported by the |pgfplots| macros they are added to. \textit{Linear or asymptotic approximation of transfer functions that include a transport delay is not supported.}
% For example, given a transfer function \begin{equation}G(s) = 10\frac{s(s+0.1+0.5\mathrm{i})(s+0.1-0.5\mathrm{i})}{(s+0.5+10\mathrm{i})(s+0.5-10\mathrm{i})},\label{eq:ZPKExample}\end{equation} its Bode plot over the frequency range $[0.01,100]$ can be generated using\\
-% |\BodeZPK|\\
+% |\BodeZPK [blue,thick]|\\
% | {z/{0,{-0.1,-0.5},{-0.1,0.5}},p/{{-0.5,-10},{-0.5,10}},k/10}|\\
% | {0.01}{100}|\\
% which generates the plot in Figure \ref{simpleBode}. If a delay is not specified, it is assumed to be zero. If a gain is not specified, it is assumed to be 1. By default, each of the axes, excluding ticks and labels, are 5cm wide and 2.5cm high. The width and the height, along with other properties of the plots, the axes, and the group can be customized using native |pgf| keys as shown in the example below.
@@ -93,10 +96,11 @@
%
% \begin{figure}
% \begin{center}
-% \BodeZPK{z/{0,{-0.1,-0.5},{-0.1,0.5}},p/{{-0.5,-10},{-0.5,10}},k/10}{0.01}{100}
+% \BodeZPK[blue,thick]{z/{0,{-0.1,-0.5},{-0.1,0.5}},p/{{-0.5,-10},{-0.5,10}},k/10}{0.01}{100}
% \cprotect\caption{\label{simpleBode}Output of the default |\BodeZPK| macro.}
% \end{center}
% \end{figure}
+% As demonstrated in this example, if a single comma-separated list of options is passed, it applies to both the magnitude and the phase plots. Without any optional arguments, we gets a thick black Bode plot.
%
% A linear approximation of the Bode plot with customization of the plots, the axes, and the group can be generated using\\
% |\BodeZPK[plot/mag/{red,thick},plot/ph/{blue,thick},|\\
@@ -123,15 +127,16 @@
% \noindent Plots the Bode plot of a transfer function given in TF format. The three mandatory arguments include: (1) a list of tuples comprised of the coefficients in the numerator and the denominator of the transfer function and the transport delay, (2) the lower end of the frequency range for the $x-$ axis, and (3) the higher end of the frequency range for the $x-$axis. The coefficients are entered as a comma-separated list, in order from the highest degree of $s$ to the lowest, with zeros for missing degrees. The optional arguments are the same as |\BodeZPK|, except that linear/asymptotic approximation is not supported, so |approx/...| is ignored.
%
% For example, given the same transfer function as (\ref{eq:ZPKExample}) in TF form and with a small transport delay, \begin{equation}G(s) = e^{-0.01s}\frac{s(10s^2+2s+2.6)}{(s^2+s+100.25)},\label{eq:TFExample}\end{equation} its Bode plot over the frequency range $[0.01,100]$ can be generated using\\
-% |\BodeTF[blue,thick]|\\
+% |\BodeTF[commands/mag/{\node at (axis cs: 2.1,0) |\\
+% | [circle,fill,inner sep=0.05cm,label=below:{$\omega_{gc}$}]{};}]|\\
% | {num/{10,2,2.6,0},den/{1,0.2,100},d/0.01}|\\
% | {0.01}{100}|\\
-% which generates the plot in Figure \ref{simpleBodeTF}. Note the $0$ added to the numerator coefficients to account for the fact that the numerator does not have a constant term in it. As demonstrated in this example, if a single comma-separated list of options is passed, it applies to both the magnitude and the phase plots.
+% which generates the plot in Figure \ref{simpleBodeTF}. Note the $0$ added to the numerator coefficients to account for the fact that the numerator does not have a constant term in it. Note the semicolon after the TikZ command passed to the |\commands| option.
%
% \begin{figure}
% \begin{center}
-% \BodeTF[blue,thick]{num/{10,2,2.6,0},den/{1,1,100.25},d/0.01}{0.01}{100}
-% \cprotect\caption{\label{simpleBodeTF}Output of the |\BodeTF| macro.}
+% \BodeTF[commands/mag/{\node at (axis cs: 2.1,0) [circle,fill,inner sep=0.05cm,label=below:{$\omega_{gc}$}] {};}]{num/{10,2,2.6,0},den/{1,1,100.25},d/0.01}{0.01}{100}
+% \cprotect\caption{\label{simpleBodeTF}Output of the |\BodeTF| macro with an optional TikZ command used to mark the gain crossover frequency.}
% \end{center}
% \end{figure}
%
@@ -139,7 +144,7 @@
% |\begin{BodePlot}|\oarg{axis-options}\marg{min-frequency}\marg{max-frequency}\\
% \hspace*{2em}|\addBode...|\\
% \hspace*{1.5em}|\end{BodePlot}|\\
-% The |BodePlot| environment works in conjunction with the parametric function generator macros |\addBodeZPKPlots|, |\addBodeTFPlot|, and |\addBodeComponentPlots|. If supplied, |axis-options| are passed directly to the |semilogaxis| environment and the frequency limits are translated to the x-axis limits and the domain of the |semilogaxis| environment. Example usage in the description of |\addBodeZPKPlots|, |\addBodeTFPlot|, and |\addBodeComponentPlots|.
+% The |BodePlot| environment works in conjunction with the parametric function generator macros |\addBodeZPKPlots|, |\addBodeTFPlot|, and |\addBodeComponentPlot|. If supplied, |axis-options| are passed directly to the |semilogaxis| environment and the frequency limits are translated to the x-axis limits and the domain of the |semilogaxis| environment. Example usage in the description of |\addBodeZPKPlots|, |\addBodeTFPlot|, and |\addBodeComponentPlot|.
%
% \DescribeMacro{\addBodeZPKPlots}
% |\addBodeZPKPlots| \oarg{approx1/\marg{opt1},approx2/\marg{opt2},...}\\
@@ -146,7 +151,7 @@
% \hspace*{2em}\marg{plot-type}\\
% \hspace*{2em}\marg{z/\marg{zeros},p/\marg{poles},k/\marg{gain},d/\marg{delay}}
%
-% \noindent Generates the appropriate parametric functions and supplies them to multiple |\addplot| macros, one for each |approx/{opt}| pair in the optional argument. If no optional argument is supplied, then a single |\addplot| command corresponding to the true Bode plot is generated. This macro can be used inside any |semilogaxis| environment as long as a domain for the x-axis is supplied through either the |approx/{opt}| interface or directly in the optional argument of the |semilogaxis| environment. Use with the |BodePlot| environment supplied with this package is recommended. The second mandatory argument, |plot-type| is either magnitude or |phase|. If it is not equal to |phase|, it is assumed to be |magnitude|. The last mandatory argument is the same as |\BodeZPK|.
+% \noindent Generates the appropriate parametric functions and supplies them to multiple |\addplot| macros, one for each |approx/{opt}| pair in the optional argument. If no optional argument is supplied, then a single |\addplot| command corresponding to a thick true Bode plot is generated. If an optional argument is supplied, it needs to be one of |true/{opt}|, |linear/{opt}|, or |asymptotic/{opt}|. This macro can be used inside any |semilogaxis| environment as long as a domain for the x-axis is supplied through either the |approx/{opt}| interface or directly in the optional argument of the |semilogaxis| environment. Use with the |BodePlot| environment supplied with this package is recommended. The second mandatory argument, |plot-type| is either |magnitude| or |phase|. If it is not equal to |phase|, it is assumed to be |magnitude|. The last mandatory argument is the same as |\BodeZPK|.
%
% For example, given the transfer function in (\ref{eq:ZPKExample}), its linear, asymptotic, and true Bode plots can be superimposed using
%\begin{verbatim}
@@ -410,7 +415,6 @@
% \begin{macrocode}
\RequirePackage{ifluatex}%
\ifluatex
- \RequirePackage{pdftexcmds}%
\let\pdfstrcmp\pdf at strcmp
\fi
% \end{macrocode}
@@ -420,7 +424,6 @@
% \begin{macro}{idGnuplot}
% \begin{macro}{gnuplot def}
% \begin{macro}{gnuplot degrees}
-% \begin{macro}{bodeStyle}
% This code is needed to support both |pgfplots| and |gnuplot| simultaneously. New macros are defined for the |pow| and |mod| functions to address differences between the two math engines. We start by processing the |pgf| class option.
% \begin{macrocode}
\newif\if at pgfarg\@pgfargfalse
@@ -458,9 +461,21 @@
\fi
}%
}
+% \end{macrocode}
+% If the operating system is not Windows, we create the |gnuplot| folder if it does not already exist. \changes{v1.0.2}{2021/11/01}{Fixed issue \#1}
+% \begin{macrocode}
+ \ifwindows\else
+ \immediate\write18{mkdir -p gnuplot}%
+ \fi
\fi
% \end{macrocode}
-% Default axis properties for all plot macros are collected in the following |pgf| style.
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \begin{macro}{bodeStyle}
+% Default axis properties for all plot macros are collected in this |pgf| style.
% \begin{macrocode}
\pgfplotsset{%
bodeStyle/.style = {%
@@ -478,11 +493,6 @@
}
% \end{macrocode}
% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
% \subsection{Parametric function generators for poles, zeros, gains, and delays.}
% \begin{macro}{\MagK}
% \begin{macro}{\MagKAsymp}
@@ -732,9 +742,9 @@
% \subsection{Commands for Bode plots}
% \subsubsection{User macros}
% \begin{macro}{\BodeZPK}
-% This macro takes lists of complex poles and zeros of the form |{re,im}|, and values of gain and delay as inputs and constructs parametric functions for the Bode magnitude and phase plots. This is done by adding together the parametric functions generated by the macros for individual zeros, poles, gain, and delay, described above. The parametric functions are then plotted in a |tikzpicture| environment using the |\addplot| macro. Unless the package is loaded with the option |pgf|, the parametric functions are evaluated using |gnuplot|.
+% This macro takes lists of complex poles and zeros of the form |{re,im}|, and values of gain and delay as inputs and constructs parametric functions for the Bode magnitude and phase plots. This is done by adding together the parametric functions generated by the macros for individual zeros, poles, gain, and delay, described above. The parametric functions are then plotted in a |tikzpicture| environment using the |\addplot| macro. Unless the package is loaded with the option |pgf|, the parametric functions are evaluated using |gnuplot|. \changes{v1.0.1}{2021/10/29}{Pass arbitrary TikZ commands as options.}
% \begin{macrocode}
-\newcommand{\BodeZPK}[4][]{%
+\newcommand{\BodeZPK}[4][approx/true]{%
% \end{macrocode}
% Most of the work is done by the |\parse at opt| and the |\build at ZPK@plot| macros, described in the 'Internal macros' section. The former is used to parse the optional arguments and the latter to extract poles, zeros, gain, and delay from the first mandatory argument and to generate macros |\func at mag| and |\func at ph| that hold the magnitude and phase parametric functions.
% \begin{macrocode}
@@ -761,12 +771,14 @@
\if at pgfarg
\expandafter\nextgroupplot\expandafter[ytick distance=20,
ylabel={Gain (dB)},xmajorticks=false,\optmag at axes]
- \edef\temp at cmd{\noexpand\addplot[red,thick,\optmag at plot]}%
+ \edef\temp at cmd{\noexpand\addplot[thick,\optmag at plot]}%
\temp at cmd {\func at mag};
+ \optmag at commands;
\expandafter\nextgroupplot\expandafter[ytick distance=45,
ylabel={Phase ($^{\circ}$)},xlabel={Frequency (rad/s)},\optph at axes]
- \edef\temp at cmd{\noexpand\addplot[red,thick,\optph at plot]}%
+ \edef\temp at cmd{\noexpand\addplot[thick,\optph at plot]}%
\temp at cmd {\func at ph};
+ \optph at commands;
\else
% \end{macrocode}
% In |gnuplot| mode, we increment the |idGnuplot| counter before every plot to make sure that new and reusable |.gnuplot| and |.table| files are generated for every plot.
@@ -774,15 +786,18 @@
\stepcounter{idGnuplot}
\expandafter\nextgroupplot\expandafter[ytick distance=20,
ylabel={Gain (dB)},xmajorticks=false,\optmag at axes]
- \edef\temp at cmd{\noexpand\addplot[red,thick,\optmag at plot]}%
+ \edef\temp at cmd{\noexpand\addplot[thick,\optmag at plot]}%
\temp at cmd gnuplot[gnuplot degrees,gnuplot def] {\func at mag};
+ \optmag at commands;
\stepcounter{idGnuplot}
\expandafter\nextgroupplot\expandafter[ytick distance=45,
ylabel={Phase ($^{\circ}$)},xlabel={Frequency (rad/s)},\optph at axes]
- \edef\temp at cmd{\noexpand\addplot[red,thick,\optph at plot]}%
+ \edef\temp at cmd{\noexpand\addplot[thick,\optph at plot]}%
\temp at cmd gnuplot[gnuplot degrees,gnuplot def] {\func at ph};
+ \optph at commands;
\fi
- \end{groupplot}\end{tikzpicture}}
+ \end{groupplot}\end{tikzpicture}
+}
% \end{macrocode}
% \end{macro}
% \begin{macro}{\BodeTF}
@@ -806,31 +821,36 @@
\if at pgfarg
\expandafter\nextgroupplot\expandafter[ytick distance=20,
ylabel={Gain (dB)},xmajorticks=false,\optmag at axes]
- \edef\temp at cmd{\noexpand\addplot[red,thick,\optmag at plot]}%
+ \edef\temp at cmd{\noexpand\addplot[thick,\optmag at plot]}%
\temp at cmd {\func at mag};
+ \optmag at commands;%
\expandafter\nextgroupplot\expandafter[ytick distance=45,
ylabel={Phase ($^{\circ}$)},xlabel={Frequency (rad/s)},\optph at axes]
- \edef\temp at cmd{\noexpand\addplot[red,thick,\optph at plot]}%
+ \edef\temp at cmd{\noexpand\addplot[thick,\optph at plot]}%
\temp at cmd {\func at ph};
+ \optph at commands;%
\else
\stepcounter{idGnuplot}%
\expandafter\nextgroupplot\expandafter[ytick distance=20,
ylabel={Gain (dB)},xmajorticks=false,\optmag at axes]
- \edef\temp at cmd{\noexpand\addplot[red,thick,\optmag at plot]}%
+ \edef\temp at cmd{\noexpand\addplot[thick,\optmag at plot]}%
\temp at cmd gnuplot[gnuplot degrees,gnuplot def] {\func at mag};
+ \optmag at commands;%
\stepcounter{idGnuplot}%
\expandafter\nextgroupplot\expandafter[ytick distance=45,
ylabel={Phase ($^{\circ}$)},xlabel={Frequency (rad/s)},\optph at axes]
- \edef\temp at cmd{\noexpand\addplot[red,thick,\optph at plot]}%
+ \edef\temp at cmd{\noexpand\addplot[thick,\optph at plot]}%
\temp at cmd gnuplot[gnuplot degrees,gnuplot def] {\func at ph};
+ \optph at commands;%
\fi
- \end{groupplot}\end{tikzpicture}}
+ \end{groupplot}\end{tikzpicture}
+}
% \end{macrocode}
% \end{macro}
% \begin{macro}{\addBodeZPKPlots}
-% This macro is designed to issues multiple |\addplot| macros for the same set of poles, zeros, gain, and delay. All of the work is done by the |\build at ZPK@plot| macro.
+% This macro is designed to issues multiple |\addplot| macros for the same set of poles, zeros, gain, and delay. All of the work is done by the |\build at ZPK@plot| macro. \changes{v1.0.1}{2021/10/29}{Improved optional argument handling.}
% \begin{macrocode}
-\newcommand{\addBodeZPKPlots}[3][{}]{%
+\newcommand{\addBodeZPKPlots}[3][true/{}]{%
\foreach \approx/\opt in {#1} {%
\gdef\plot at macro{}%
\gdef\temp at macro{}%
@@ -840,11 +860,11 @@
\build at ZPK@plot{\plot at macro}{\temp at macro}{\approx}{#3}%
\fi
\if at pgfarg
- \edef\temp at cmd{\noexpand\addplot[red,thick,\opt]}%
+ \edef\temp at cmd{\noexpand\addplot[thick,\opt]}%
\temp at cmd {\plot at macro};
\else
\stepcounter{idGnuplot}%
- \edef\temp at cmd{\noexpand\addplot[red,thick,\opt]}
+ \edef\temp at cmd{\noexpand\addplot[thick,\opt]}
\temp at cmd gnuplot[gnuplot degrees,gnuplot def] {\plot at macro};
\fi
}%
@@ -854,7 +874,7 @@
% \begin{macro}{\addBodeTFPlot}
% This macro is designed to issues a single |\addplot| macros for the set of coefficients and delay. All of the work is done by the |\build at TF@plot| macro.
% \begin{macrocode}
-\newcommand{\addBodeTFPlot}[3][red,thick]{%
+\newcommand{\addBodeTFPlot}[3][thick]{%
\gdef\plot at macro{}%
\gdef\temp at macro{}%
\ifnum\pdfstrcmp{#2}{phase}=0
@@ -874,7 +894,7 @@
% \begin{macro}{\addBodeComponentPlot}
% This macro is designed to issue a single |\addplot| macro capable of plotting linear combinations of the basic components described in Section \ref{sec:BasicComponents}. The only work to do here is to handle the |pgf| package option.
% \begin{macrocode}
-\newcommand{\addBodeComponentPlot}[2][red,thick]{%
+\newcommand{\addBodeComponentPlot}[2][thick]{%
\if at pgfarg
\addplot[#1]{#2};
\else
@@ -1064,6 +1084,8 @@
\gdef\optmag at plot{}%
\gdef\opt at group{}%
\gdef\opt at approx{}%
+ \xdef\optph at commands{}%
+ \xdef\optmag at commands{}%
\foreach \obj/\typ/\opt in {#1} {%
\ifnum\pdfstrcmp{\obj}{plot}=0
\ifnum\pdfstrcmp{\typ}{mag}=0
@@ -1093,10 +1115,18 @@
\xdef\opt at group{\opt at group,\opt}%
\else
\ifnum\pdfstrcmp{\obj}{approx}=0
- \xdef\opt at approx{\typ}%
+ \xdef\opt at approx{\opt}%
\else
- \xdef\optmag at plot{\optmag at plot,\obj}%
- \xdef\optph at plot{\optph at plot,\obj}%
+ \ifnum\pdfstrcmp{\obj}{commands}=0
+ \ifnum\pdfstrcmp{\typ}{phase}=0
+ \xdef\optph at commands{\unexpanded\expandafter{\opt}}%
+ \else
+ \xdef\optmag at commands{\unexpanded\expandafter{\opt}}%
+ \fi
+ \else
+ \xdef\optmag at plot{\optmag at plot,\obj}%
+ \xdef\optph at plot{\optph at plot,\obj}%
+ \fi
\fi
\fi
\fi
@@ -1273,7 +1303,7 @@
samples=500,
\opt at axes]}
\temp at cmd
- \edef\temp at cmd{\noexpand\addplot[red,thick,\opt at plot]}%
+ \edef\temp at cmd{\noexpand\addplot[thick,\opt at plot]}%
\if at pgfarg
\temp at cmd ( {\func at ph} , {\func at mag} );
\else
@@ -1298,7 +1328,7 @@
samples=500,
\opt at axes]}
\temp at cmd
- \edef\temp at cmd{\noexpand\addplot[red,thick,\opt at plot]}%
+ \edef\temp at cmd{\noexpand\addplot[thick,\opt at plot]}%
\if at pgfarg
\temp at cmd ( {\func at ph} , {\func at mag} );
\else
Modified: trunk/Master/texmf-dist/tex/latex/bodeplot/bodeplot.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/bodeplot/bodeplot.sty 2021-11-03 00:48:37 UTC (rev 60931)
+++ trunk/Master/texmf-dist/tex/latex/bodeplot/bodeplot.sty 2021-11-03 20:48:02 UTC (rev 60932)
@@ -18,12 +18,13 @@
\ProvidesPackage{bodeplot}
\RequirePackage{tikz}
\RequirePackage{pgfplots}
+ \RequirePackage{pdftexcmds}
+ \RequirePackage{ifplatform}
\pgfplotsset{compat=1.18,variable=t}
\usepgfplotslibrary{groupplots}
\RequirePackage{ifluatex}%
\ifluatex
- \RequirePackage{pdftexcmds}%
\let\pdfstrcmp\pdf at strcmp
\fi
\newif\if at pgfarg\@pgfargfalse
@@ -52,6 +53,9 @@
\fi
}%
}
+ \ifwindows\else
+ \immediate\write18{mkdir -p gnuplot}%
+ \fi
\fi
\pgfplotsset{%
bodeStyle/.style = {%
@@ -163,7 +167,7 @@
(axis cs:{sqrt(abs(#3))},{20*log10(abs(#3)) +
20*log10(abs(#2/sqrt(abs(#3))))});
}
-\newcommand{\BodeZPK}[4][]{%
+\newcommand{\BodeZPK}[4][approx/true]{%
\parse at opt{#1}%
\gdef\func at mag{}%
\gdef\func at ph{}%
@@ -181,25 +185,30 @@
\if at pgfarg
\expandafter\nextgroupplot\expandafter[ytick distance=20,
ylabel={Gain (dB)},xmajorticks=false,\optmag at axes]
- \edef\temp at cmd{\noexpand\addplot[red,thick,\optmag at plot]}%
+ \edef\temp at cmd{\noexpand\addplot[thick,\optmag at plot]}%
\temp at cmd {\func at mag};
+ \optmag at commands;
\expandafter\nextgroupplot\expandafter[ytick distance=45,
ylabel={Phase ($^{\circ}$)},xlabel={Frequency (rad/s)},\optph at axes]
- \edef\temp at cmd{\noexpand\addplot[red,thick,\optph at plot]}%
+ \edef\temp at cmd{\noexpand\addplot[thick,\optph at plot]}%
\temp at cmd {\func at ph};
+ \optph at commands;
\else
\stepcounter{idGnuplot}
\expandafter\nextgroupplot\expandafter[ytick distance=20,
ylabel={Gain (dB)},xmajorticks=false,\optmag at axes]
- \edef\temp at cmd{\noexpand\addplot[red,thick,\optmag at plot]}%
+ \edef\temp at cmd{\noexpand\addplot[thick,\optmag at plot]}%
\temp at cmd gnuplot[gnuplot degrees,gnuplot def] {\func at mag};
+ \optmag at commands;
\stepcounter{idGnuplot}
\expandafter\nextgroupplot\expandafter[ytick distance=45,
ylabel={Phase ($^{\circ}$)},xlabel={Frequency (rad/s)},\optph at axes]
- \edef\temp at cmd{\noexpand\addplot[red,thick,\optph at plot]}%
+ \edef\temp at cmd{\noexpand\addplot[thick,\optph at plot]}%
\temp at cmd gnuplot[gnuplot degrees,gnuplot def] {\func at ph};
+ \optph at commands;
\fi
- \end{groupplot}\end{tikzpicture}}
+ \end{groupplot}\end{tikzpicture}
+}
\newcommand{\BodeTF}[4][]{%
\parse at opt{#1}%
\gdef\func at mag{}%
@@ -218,26 +227,31 @@
\if at pgfarg
\expandafter\nextgroupplot\expandafter[ytick distance=20,
ylabel={Gain (dB)},xmajorticks=false,\optmag at axes]
- \edef\temp at cmd{\noexpand\addplot[red,thick,\optmag at plot]}%
+ \edef\temp at cmd{\noexpand\addplot[thick,\optmag at plot]}%
\temp at cmd {\func at mag};
+ \optmag at commands;%
\expandafter\nextgroupplot\expandafter[ytick distance=45,
ylabel={Phase ($^{\circ}$)},xlabel={Frequency (rad/s)},\optph at axes]
- \edef\temp at cmd{\noexpand\addplot[red,thick,\optph at plot]}%
+ \edef\temp at cmd{\noexpand\addplot[thick,\optph at plot]}%
\temp at cmd {\func at ph};
+ \optph at commands;%
\else
\stepcounter{idGnuplot}%
\expandafter\nextgroupplot\expandafter[ytick distance=20,
ylabel={Gain (dB)},xmajorticks=false,\optmag at axes]
- \edef\temp at cmd{\noexpand\addplot[red,thick,\optmag at plot]}%
+ \edef\temp at cmd{\noexpand\addplot[thick,\optmag at plot]}%
\temp at cmd gnuplot[gnuplot degrees,gnuplot def] {\func at mag};
+ \optmag at commands;%
\stepcounter{idGnuplot}%
\expandafter\nextgroupplot\expandafter[ytick distance=45,
ylabel={Phase ($^{\circ}$)},xlabel={Frequency (rad/s)},\optph at axes]
- \edef\temp at cmd{\noexpand\addplot[red,thick,\optph at plot]}%
+ \edef\temp at cmd{\noexpand\addplot[thick,\optph at plot]}%
\temp at cmd gnuplot[gnuplot degrees,gnuplot def] {\func at ph};
+ \optph at commands;%
\fi
- \end{groupplot}\end{tikzpicture}}
-\newcommand{\addBodeZPKPlots}[3][{}]{%
+ \end{groupplot}\end{tikzpicture}
+}
+\newcommand{\addBodeZPKPlots}[3][true/{}]{%
\foreach \approx/\opt in {#1} {%
\gdef\plot at macro{}%
\gdef\temp at macro{}%
@@ -247,16 +261,16 @@
\build at ZPK@plot{\plot at macro}{\temp at macro}{\approx}{#3}%
\fi
\if at pgfarg
- \edef\temp at cmd{\noexpand\addplot[red,thick,\opt]}%
+ \edef\temp at cmd{\noexpand\addplot[thick,\opt]}%
\temp at cmd {\plot at macro};
\else
\stepcounter{idGnuplot}%
- \edef\temp at cmd{\noexpand\addplot[red,thick,\opt]}
+ \edef\temp at cmd{\noexpand\addplot[thick,\opt]}
\temp at cmd gnuplot[gnuplot degrees,gnuplot def] {\plot at macro};
\fi
}%
}
-\newcommand{\addBodeTFPlot}[3][red,thick]{%
+\newcommand{\addBodeTFPlot}[3][thick]{%
\gdef\plot at macro{}%
\gdef\temp at macro{}%
\ifnum\pdfstrcmp{#2}{phase}=0
@@ -271,7 +285,7 @@
\addplot[#1] gnuplot[gnuplot degrees, gnuplot def] {\plot at macro};
\fi
}
-\newcommand{\addBodeComponentPlot}[2][red,thick]{%
+\newcommand{\addBodeComponentPlot}[2][thick]{%
\if at pgfarg
\addplot[#1]{#2};
\else
@@ -435,6 +449,8 @@
\gdef\optmag at plot{}%
\gdef\opt at group{}%
\gdef\opt at approx{}%
+ \xdef\optph at commands{}%
+ \xdef\optmag at commands{}%
\foreach \obj/\typ/\opt in {#1} {%
\ifnum\pdfstrcmp{\obj}{plot}=0
\ifnum\pdfstrcmp{\typ}{mag}=0
@@ -464,10 +480,18 @@
\xdef\opt at group{\opt at group,\opt}%
\else
\ifnum\pdfstrcmp{\obj}{approx}=0
- \xdef\opt at approx{\typ}%
+ \xdef\opt at approx{\opt}%
\else
- \xdef\optmag at plot{\optmag at plot,\obj}%
- \xdef\optph at plot{\optph at plot,\obj}%
+ \ifnum\pdfstrcmp{\obj}{commands}=0
+ \ifnum\pdfstrcmp{\typ}{phase}=0
+ \xdef\optph at commands{\unexpanded\expandafter{\opt}}%
+ \else
+ \xdef\optmag at commands{\unexpanded\expandafter{\opt}}%
+ \fi
+ \else
+ \xdef\optmag at plot{\optmag at plot,\obj}%
+ \xdef\optph at plot{\optph at plot,\obj}%
+ \fi
\fi
\fi
\fi
@@ -601,7 +625,7 @@
samples=500,
\opt at axes]}
\temp at cmd
- \edef\temp at cmd{\noexpand\addplot[red,thick,\opt at plot]}%
+ \edef\temp at cmd{\noexpand\addplot[thick,\opt at plot]}%
\if at pgfarg
\temp at cmd ( {\func at ph} , {\func at mag} );
\else
@@ -626,7 +650,7 @@
samples=500,
\opt at axes]}
\temp at cmd
- \edef\temp at cmd{\noexpand\addplot[red,thick,\opt at plot]}%
+ \edef\temp at cmd{\noexpand\addplot[thick,\opt at plot]}%
\if at pgfarg
\temp at cmd ( {\func at ph} , {\func at mag} );
\else
More information about the tex-live-commits
mailing list.