texlive[61092] Master/texmf-dist: bodeplot (20nov21)

commits+karl at tug.org commits+karl at tug.org
Sat Nov 20 00:11:57 CET 2021


Revision: 61092
          http://tug.org/svn/texlive?view=revision&revision=61092
Author:   karl
Date:     2021-11-20 00:11:56 +0100 (Sat, 20 Nov 2021)
Log Message:
-----------
bodeplot (20nov21)

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-19 00:42:42 UTC (rev 61091)
+++ trunk/Master/texmf-dist/source/latex/bodeplot/bodeplot.dtx	2021-11-19 23:11:56 UTC (rev 61092)
@@ -16,14 +16,14 @@
 % \fi
 %
 % \iffalse
-%<package> \NeedsTeXFormat{LaTeX2e}[2006/05/20]
-%<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}
+%<package>\NeedsTeXFormat{LaTeX2e}[2006/05/20]
+%<package>\ProvidesPackage{bodeplot}
+%<package>\RequirePackage{tikz}
+%<package>\RequirePackage{pdftexcmds}
+%<package>\RequirePackage{ifplatform}
+%<package>\RequirePackage{pgfplots}
+%<package>  \pgfplotsset{compat=1.18}
+%<package>  \usepgfplotslibrary{groupplots}
 %
 %<*driver>
 \documentclass{ltxdoc}
@@ -45,6 +45,7 @@
 %
 % \changes{v1.0}{2021/10/25}{Initial release}
 % \changes{v1.0.4}{2021/11/05}{Fixed unintended optional argument macro expansion}
+% \changes{v1.0.6}{2021/11/18}{Fixed issue \#3}
 %
 % \GetFileInfo{bodeplot.sty}
 %
@@ -51,8 +52,8 @@
 % \DoNotIndex{\newcommand,\xdef,\gdef,\def,\edef,\addplot,\approx,\arabic,\opt,\typ,\obj,\else,\if at pgfarg,\fi,\begin,\end,\feature,\footnotesize,\draw,\detokenize,\DeclareOption,\foreach,\ifdim,\ifodd,\Im,\Re,\let,\newif,\nextgroupplot,\noexpand,\expandafter,\unexpanded,\PackageError,\PackageWarning,\relax,\RequirePackage,\tikzset,\pgfmathsetmacro,\pgfmathtruncatemacro,\ProcessOptions}
 %
 % \title{The \textsf{bodeplot} package\thanks{This document
-% corresponds to \textsf{bodeplot}~v1.0.5,
-% dated November 15, 2021.}}
+% corresponds to \textsf{bodeplot}~v1.0.6,
+% dated November 18, 2021.}}
 % \author{Rushikesh Kamalapurkar \\ \texttt{rlkamalapurkar at gmail.com}}
 %
 % \maketitle
@@ -457,10 +458,10 @@
 % \end{macro}
 % \begin{macro}{\n at mod}
 % \begin{macro}{\n at pow}
-% \begin{macro}{idGnuplot}
-% \begin{macro}{gnuplot def}
+% \begin{macro}{gnuplot at id}
+% \begin{macro}{gnuplot at prefix}
 % \changes{v1.0.3}{2021/11/03}{Added jobname to gnuplot prefix}
-% \begin{macro}{gnuplot degrees}
+% \begin{macro}{gnuplot at degrees}
 % 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
@@ -480,11 +481,11 @@
 %    \end{macrocode}
 % Then, we create a counter so that a new data table is generated and for each new plot. If the plot macros have not changed, the tables, once generated, can be reused by |gnuplot|, which reduces compilation time.
 %    \begin{macrocode}
-  \newcounter{idGnuplot}%
-  \setcounter{idGnuplot}{0}%
+  \newcounter{gnuplot at id}%
+  \setcounter{gnuplot at id}{0}%
   \tikzset{%
-    gnuplot def/.style={%
-      id=\arabic{idGnuplot},
+    gnuplot at prefix/.style={%
+      id=\arabic{gnuplot at id},
       prefix=gnuplot/\jobname
     }%
   }
@@ -492,8 +493,8 @@
 % Then, we add |set angles degrees| to all |gnuplot| macros to avoid having to convert from degrees to radians everywhere.
 %    \begin{macrocode}
   \pgfplotsset{%
-    gnuplot degrees/.code={%
-      \ifnum\value{idGnuplot}=1
+    gnuplot at degrees/.code={%
+      \ifnum\value{gnuplot at id}=1
         \xdef\pgfplots at gnuplot@format{\pgfplots at gnuplot@format set angles degrees;}%
       \fi
     }%
@@ -511,11 +512,11 @@
 % \end{macro}
 % \end{macro}
 % \end{macro}
-% \begin{macro}{bodeStyle}
+% \begin{macro}{bode at style}
 % Default axis properties for all plot macros are collected in this |pgf| style.
 %    \begin{macrocode}
 \pgfplotsset{%
-  bodeStyle/.style = {%
+  bode at style/.style = {%
     label style={font=\footnotesize},
     tick label style={font=\footnotesize},
     grid=both,
@@ -794,7 +795,7 @@
 %    \begin{macrocode}
   \edef\temp at cmd{\noexpand\begin{tikzpicture}[\unexpanded\expandafter{\opt at tikz}]%
     \noexpand\begin{groupplot}[%
-      bodeStyle,
+      bode at style,
       xmin={#3},
       xmax={#4},
       domain=#3:#4,
@@ -811,29 +812,29 @@
       \if at pgfarg
         \expandafter\nextgroupplot\expandafter[ytick distance=20,
           ylabel={Gain (dB)},xmajorticks=false,\optmag at axes]
-        \edef\temp at cmd{\noexpand\addplot[thick,\optmag at plot]}%
+        \edef\temp at cmd{\noexpand\addplot[variable=t,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[thick,\optph at plot]}%
+        \edef\temp at cmd{\noexpand\addplot[variable=t,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.
+% In |gnuplot| mode, we increment the |gnuplot at id| counter before every plot to make sure that new and reusable |.gnuplot| and |.table| files are generated for every plot.
 %    \begin{macrocode}
-      \stepcounter{idGnuplot}
+      \stepcounter{gnuplot at id}
       \expandafter\nextgroupplot\expandafter[ytick distance=20,
         ylabel={Gain (dB)},xmajorticks=false,\optmag at axes]
-      \edef\temp at cmd{\noexpand\addplot[thick,\optmag at plot]}%
-      \temp at cmd gnuplot[gnuplot degrees,gnuplot def] {\func at mag};
+      \edef\temp at cmd{\noexpand\addplot[variable=t,thick,\optmag at plot]}%
+      \temp at cmd gnuplot[gnuplot at degrees,gnuplot at prefix] {\func at mag};
       \optmag at commands;
-      \stepcounter{idGnuplot}
+      \stepcounter{gnuplot at id}
       \expandafter\nextgroupplot\expandafter[ytick distance=45,
         ylabel={Phase ($^{\circ}$)},xlabel={Frequency (rad/s)},\optph at axes]
-      \edef\temp at cmd{\noexpand\addplot[thick,\optph at plot]}%
-      \temp at cmd gnuplot[gnuplot degrees,gnuplot def] {\func at ph};
+      \edef\temp at cmd{\noexpand\addplot[variable=t,thick,\optph at plot]}%
+      \temp at cmd gnuplot[gnuplot at degrees,gnuplot at prefix] {\func at ph};
       \optph at commands;
     \fi
     \end{groupplot}
@@ -851,7 +852,7 @@
   \build at TF@plot{\func at mag}{\func at ph}{#2}%
   \edef\temp at cmd{\noexpand\begin{tikzpicture}[\unexpanded\expandafter{\opt at tikz}]%
     \noexpand\begin{groupplot}[%
-      bodeStyle,
+      bode at style,
       xmin={#3},
       xmax={#4},
       domain=#3:#4,
@@ -865,26 +866,26 @@
       \if at pgfarg
         \expandafter\nextgroupplot\expandafter[ytick distance=20,
           ylabel={Gain (dB)},xmajorticks=false,\optmag at axes]
-        \edef\temp at cmd{\noexpand\addplot[thick,\optmag at plot]}%
+        \edef\temp at cmd{\noexpand\addplot[variable=t,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[thick,\optph at plot]}%
+        \edef\temp at cmd{\noexpand\addplot[variable=t,thick,\optph at plot]}%
         \temp at cmd {\func at ph};
         \optph at commands;
       \else
-        \stepcounter{idGnuplot}%
+        \stepcounter{gnuplot at id}%
         \expandafter\nextgroupplot\expandafter[ytick distance=20,
           ylabel={Gain (dB)},xmajorticks=false,\optmag at axes]
-        \edef\temp at cmd{\noexpand\addplot[thick,\optmag at plot]}%
-        \temp at cmd gnuplot[gnuplot degrees,gnuplot def] {\func at mag};
+        \edef\temp at cmd{\noexpand\addplot[variable=t,thick,\optmag at plot]}%
+        \temp at cmd gnuplot[gnuplot at degrees,gnuplot at prefix] {\func at mag};
         \optmag at commands;
-        \stepcounter{idGnuplot}%
+        \stepcounter{gnuplot at id}%
         \expandafter\nextgroupplot\expandafter[ytick distance=45,
           ylabel={Phase ($^{\circ}$)},xlabel={Frequency (rad/s)},\optph at axes]
-        \edef\temp at cmd{\noexpand\addplot[thick,\optph at plot]}%
-        \temp at cmd gnuplot[gnuplot degrees,gnuplot def] {\func at ph};
+        \edef\temp at cmd{\noexpand\addplot[variable=t,thick,\optph at plot]}%
+        \temp at cmd gnuplot[gnuplot at degrees,gnuplot at prefix] {\func at ph};
         \optph at commands;
       \fi
     \end{groupplot}
@@ -905,12 +906,12 @@
       \build at ZPK@plot{\plot at macro}{\temp at macro}{\approx}{#3}%
     \fi
     \if at pgfarg
-      \edef\temp at cmd{\noexpand\addplot[thick,\opt]}%
+      \edef\temp at cmd{\noexpand\addplot[variable=t,thick,\opt]}%
       \temp at cmd {\plot at macro};
     \else
-      \stepcounter{idGnuplot}%
-      \edef\temp at cmd{\noexpand\addplot[thick,\opt]}
-      \temp at cmd gnuplot[gnuplot degrees,gnuplot def] {\plot at macro};
+      \stepcounter{gnuplot at id}%
+      \edef\temp at cmd{\noexpand\addplot[variable=t,thick,\opt]}
+      \temp at cmd gnuplot[gnuplot at degrees,gnuplot at prefix] {\plot at macro};
     \fi
   }%
 }
@@ -928,10 +929,10 @@
     \build at TF@plot{\plot at macro}{\temp at macro}{#3}%
   \fi
   \if at pgfarg
-    \addplot[#1]{\plot at macro};
+    \addplot[variable=t,#1]{\plot at macro};
   \else
-    \stepcounter{idGnuplot}%
-    \addplot[#1] gnuplot[gnuplot degrees, gnuplot def] {\plot at macro};
+    \stepcounter{gnuplot at id}%
+    \addplot[variable=t,#1] gnuplot[gnuplot at degrees, gnuplot at prefix] {\plot at macro};
   \fi
 }
 %    \end{macrocode}
@@ -941,22 +942,22 @@
 %    \begin{macrocode}
 \newcommand{\addBodeComponentPlot}[2][thick]{%
   \if at pgfarg
-    \addplot[#1]{#2};
+    \addplot[variable=t,#1]{#2};
   \else
-    \stepcounter{idGnuplot}%
-    \addplot[#1] gnuplot[gnuplot degrees,gnuplot def] {#2};
+    \stepcounter{gnuplot at id}%
+    \addplot[variable=t,#1] gnuplot[gnuplot at degrees,gnuplot at prefix] {#2};
   \fi
 }
 %    \end{macrocode}
 %\end{macro}
 % \begin{environment}{BodePlot}
-% An environment to host macros that pass parametric functions to |\addplot| macros. Uses the defaults specified in |bodeStyle| to create a shortcut that includes the |tikzpicture| and |semilogaxis| environments. \changes{v1.0.3}{2021/11/03}{Added tikz option to environments}
+% An environment to host macros that pass parametric functions to |\addplot| macros. Uses the defaults specified in |bode at style| to create a shortcut that includes the |tikzpicture| and |semilogaxis| environments. \changes{v1.0.3}{2021/11/03}{Added tikz option to environments}
 %    \begin{macrocode}
 \newenvironment{BodePlot}[3][]{%
   \parse at env@opt{#1}%
   \edef\temp at cmd{\noexpand\begin{tikzpicture}[\unexpanded\expandafter{\opt at tikz}]
     \noexpand\begin{semilogxaxis}[%
-      bodeStyle,
+      bode at style,
       xmin={#2},
       xmax={#3},
       domain=#2:#3,
@@ -1124,7 +1125,7 @@
 %    \end{macrocode}
 %\end{macro}
 % \begin{macro}{\parse at opt}
-% Parses options supplied to the main Bode macros. A |for| loop over tuples of the form |\obj/\typ/\opt| with a long list of nested if-else statements does the job. If the input |\obj| is |plot|, |axes|, |group|, |approx|, or |tikz| the corresponding |\opt| are passed, unexpanded, to the |\addplot| macro, the |\nextgroupplot| macro, the |groupplot| environment, the |\build at ZPK@plot| macro, and the |tikzpicture| environment, respectively. If |\obj| is |commands|, the corresponding |\opt| are stored, unexpanded, in the macros |\optph at commands| and |\optmag at commands|, to be executed in appropriate |axis| environments. \changes{v1.0.3}{2021/11/03}{Added Tikz option}
+% Parses options supplied to the main Bode macros. A |for| loop over tuples of the form |\obj/\typ/\opt| with a long list of nested if-else statements does the job. If the input |\obj| is |plot|, |axes|, |group|, |approx|, or |tikz| the corresponding |\opt| are passed, unexpanded, to the |\addplot| macro, the |\nextgroupplot| macro, the |groupplot| environment, the |\build at ZPK@plot| macro, and the |tikzpicture| environment, respectively. If |\obj| is |commands|, the corresponding |\opt| are stored, unexpanded, in the macros |\optph at commands| and |\optmag at commands|, to be executed in appropriate |axis| environments. \changes{v1.0.3}{2021/11/03}{Added Tikz option} \changes{v1.0.5}{2021/11/15}{Fixed a bug}
 %    \begin{macrocode}
 \newcommand{\parse at opt}[1]{%
   \gdef\optmag at axes{}%
@@ -1224,7 +1225,7 @@
   \build at ZPK@plot{\func at mag}{\func at ph}{}{#2}%
   \edef\temp at cmd{\noexpand\begin{tikzpicture}[\unexpanded\expandafter{\opt at tikz}]%
     \noexpand\begin{axis}[%
-      bodeStyle,
+      bode at style,
       domain=#3:#4,
       height=5cm,
       xlabel={$\Re$},
@@ -1235,14 +1236,14 @@
   }%
   \temp at cmd
       \addplot [only marks,mark=+,thick,red] (-1 , 0);
-      \edef\temp at cmd{\noexpand\addplot[thick,\unexpanded\expandafter{\opt at plot}]}%
+      \edef\temp at cmd{\noexpand\addplot[variable=t,thick,\unexpanded\expandafter{\opt at plot}]}%
       \if at pgfarg
         \temp at cmd ( {\n at pow{10}{((\func at mag)/20)}*cos(\func at ph)},
           {\n at pow{10}{((\func at mag)/20)}*sin(\func at ph)} );
         \opt at commands;
       \else
-        \stepcounter{idGnuplot}%
-        \temp at cmd gnuplot[parametric,gnuplot degrees,gnuplot def] {%
+        \stepcounter{gnuplot at id}%
+        \temp at cmd gnuplot[parametric,gnuplot at degrees,gnuplot at prefix] {%
           \n at pow{10}{((\func at mag)/20)}*cos(\func at ph),
           \n at pow{10}{((\func at mag)/20)}*sin(\func at ph)};
         \opt at commands;
@@ -1262,7 +1263,7 @@
   \build at TF@plot{\func at mag}{\func at ph}{#2}%
   \edef\temp at cmd{\noexpand\begin{tikzpicture}[\unexpanded\expandafter{\opt at tikz}]%
     \noexpand\begin{axis}[%
-      bodeStyle,
+      bode at style,
       domain=#3:#4,
       height=5cm,
       xlabel={$\Re$},
@@ -1273,14 +1274,14 @@
   }%
   \temp at cmd
       \addplot [only marks,mark=+,thick,red] (-1 , 0);
-      \edef\temp at cmd{\noexpand\addplot[thick,\unexpanded\expandafter{\opt at plot}]}%
+      \edef\temp at cmd{\noexpand\addplot[variable=t,thick,\unexpanded\expandafter{\opt at plot}]}%
       \if at pgfarg
         \temp at cmd ( {\n at pow{10}{((\func at mag)/20)}*cos(\func at ph)},
           {\n at pow{10}{((\func at mag)/20)}*sin(\func at ph)} );
         \opt at commands;
       \else
-        \stepcounter{idGnuplot}%
-        \temp at cmd gnuplot[parametric,gnuplot degrees,gnuplot def]{%
+        \stepcounter{gnuplot at id}%
+        \temp at cmd gnuplot[parametric,gnuplot at degrees,gnuplot at prefix]{%
           \n at pow{10}{((\func at mag)/20)}*cos(\func at ph),
           \n at pow{10}{((\func at mag)/20)}*sin(\func at ph)};
         \opt at commands;
@@ -1298,11 +1299,11 @@
   \gdef\func at ph{}%
   \build at ZPK@plot{\func at mag}{\func at ph}{}{#2}%
   \if at pgfarg
-    \addplot [#1] ( {\n at pow{10}{((\func at mag)/20)}*cos(\func at ph)},
+    \addplot[variable=t,#1] ( {\n at pow{10}{((\func at mag)/20)}*cos(\func at ph)},
       {\n at pow{10}{((\func at mag)/20)}*sin(\func at ph)} );
   \else
-    \stepcounter{idGnuplot}%
-    \addplot [#1] gnuplot[parametric,gnuplot degrees,gnuplot def]{%
+    \stepcounter{gnuplot at id}%
+    \addplot[variable=t,#1] gnuplot[parametric,gnuplot at degrees,gnuplot at prefix]{%
       \n at pow{10}{((\func at mag)/20)}*cos(\func at ph),
       \n at pow{10}{((\func at mag)/20)}*sin(\func at ph)};
   \fi
@@ -1317,11 +1318,11 @@
   \gdef\func at ph{}%
   \build at TF@plot{\func at mag}{\func at ph}{#2}%
   \if at pgfarg
-    \addplot [#1] ( {\n at pow{10}{((\func at mag)/20)}*cos(\func at ph)},
+    \addplot[variable=t,#1] ( {\n at pow{10}{((\func at mag)/20)}*cos(\func at ph)},
       {\n at pow{10}{((\func at mag)/20)}*sin(\func at ph)} );
   \else
-    \stepcounter{idGnuplot}%
-    \addplot [#1] gnuplot[parametric,gnuplot degrees,gnuplot def]{%
+    \stepcounter{gnuplot at id}%
+    \addplot[variable=t,#1] gnuplot[parametric,gnuplot at degrees,gnuplot at prefix]{%
       \n at pow{10}{((\func at mag)/20)}*cos(\func at ph),
       \n at pow{10}{((\func at mag)/20)}*sin(\func at ph)};
   \fi
@@ -1329,13 +1330,13 @@
 %    \end{macrocode}
 %\end{macro}
 %\begin{macro}{NyquistPlot}
-% An environment to host |\addNyquist...| macros that pass parametric functions to |\addplot|. Uses the defaults specified in |bodeStyle| to create a shortcut that includes the |tikzpicture| and |axis| environments. \changes{v1.0.3}{2021/11/03}{Added tikz option to environments}
+% An environment to host |\addNyquist...| macros that pass parametric functions to |\addplot|. Uses the defaults specified in |bode at style| to create a shortcut that includes the |tikzpicture| and |axis| environments. \changes{v1.0.3}{2021/11/03}{Added tikz option to environments}
 %    \begin{macrocode}
 \newenvironment{NyquistPlot}[3][]{%
   \parse at env@opt{#1}%
   \edef\temp at cmd{\noexpand\begin{tikzpicture}[\unexpanded\expandafter{\opt at tikz}]%
     \noexpand\begin{axis}[%
-      bodeStyle,
+      bode at style,
       height=5cm,
       domain=#2:#3,
       xlabel={$\Re$},
@@ -1401,7 +1402,7 @@
   \build at ZPK@plot{\func at mag}{\func at ph}{}{#2}%
   \edef\temp at cmd{\noexpand\begin{tikzpicture}[\unexpanded\expandafter{\opt at tikz}]%
     \noexpand\begin{axis}[%
-      bodeStyle,
+      bode at style,
       domain=#3:#4,
       height=5cm,
       xlabel={Phase (degrees)},
@@ -1411,13 +1412,13 @@
     ]%
   }%
   \temp at cmd
-      \edef\temp at cmd{\noexpand\addplot[thick,\opt at plot]}%
+      \edef\temp at cmd{\noexpand\addplot[variable=t,thick,\opt at plot]}%
       \if at pgfarg
         \temp at cmd ( {\func at ph} , {\func at mag} );
         \opt at commands;
       \else
-        \stepcounter{idGnuplot}%
-        \temp at cmd gnuplot[parametric, gnuplot degrees, gnuplot def]
+        \stepcounter{gnuplot at id}%
+        \temp at cmd gnuplot[parametric, gnuplot at degrees, gnuplot at prefix]
           { \func at ph , \func at mag };
         \opt at commands;
       \fi
@@ -1431,7 +1432,7 @@
   \build at TF@plot{\func at mag}{\func at ph}{#2}%
   \edef\temp at cmd{\noexpand\begin{tikzpicture}[\unexpanded\expandafter{\opt at tikz}]%
     \noexpand\begin{axis}[%
-      bodeStyle,
+      bode at style,
       domain=#3:#4,
       height=5cm,
       xlabel={Phase (degrees)},
@@ -1441,13 +1442,13 @@
     ]%
   }%
   \temp at cmd
-      \edef\temp at cmd{\noexpand\addplot[thick,\opt at plot]}%
+      \edef\temp at cmd{\noexpand\addplot[variable=t,thick,\opt at plot]}%
       \if at pgfarg
         \temp at cmd ( {\func at ph} , {\func at mag} );
         \opt at commands;
       \else
-        \stepcounter{idGnuplot}%
-        \temp at cmd gnuplot[parametric, gnuplot degrees, gnuplot def]
+        \stepcounter{gnuplot at id}%
+        \temp at cmd gnuplot[parametric, gnuplot at degrees, gnuplot at prefix]
           { \func at ph , \func at mag };
         \opt at commands;
       \fi
@@ -1458,7 +1459,7 @@
   \parse at env@opt{#1}%
   \edef\temp at cmd{\noexpand\begin{tikzpicture}[\unexpanded\expandafter{\opt at tikz}]%
     \noexpand\begin{axis}[%
-      bodeStyle,
+      bode at style,
       domain=#2:#3,
       height=5cm,
       xlabel={Phase (degrees)},
@@ -1476,10 +1477,10 @@
   \gdef\func at ph{}%
   \build at ZPK@plot{\func at mag}{\func at ph}{}{#2}%
   \if at pgfarg
-    \addplot [#1] ( {\func at ph} , {\func at mag} );
+    \addplot[variable=t,#1] ( {\func at ph} , {\func at mag} );
   \else
-    \stepcounter{idGnuplot}%
-    \addplot [#1] gnuplot[parametric,gnuplot degrees,gnuplot def]
+    \stepcounter{gnuplot at id}%
+    \addplot[variable=t,#1] gnuplot[parametric,gnuplot at degrees,gnuplot at prefix]
       {\func at ph , \func at mag};
   \fi
 }
@@ -1488,10 +1489,10 @@
   \gdef\func at ph{}%
   \build at TF@plot{\func at mag}{\func at ph}{#2}%
   \if at pgfarg
-    \addplot [#1] ( {\func at ph} , {\func at mag} );
+    \addplot[variable=t,#1] ( {\func at ph} , {\func at mag} );
   \else
-    \stepcounter{idGnuplot}%
-    \addplot [#1] gnuplot[gnuplot degrees,gnuplot def]
+    \stepcounter{gnuplot at id}%
+    \addplot[variable=t,#1] gnuplot[gnuplot at degrees,gnuplot at prefix]
       {\func at ph , \func at mag};
   \fi
 }

Modified: trunk/Master/texmf-dist/tex/latex/bodeplot/bodeplot.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/bodeplot/bodeplot.sty	2021-11-19 00:42:42 UTC (rev 61091)
+++ trunk/Master/texmf-dist/tex/latex/bodeplot/bodeplot.sty	2021-11-19 23:11:56 UTC (rev 61092)
@@ -14,14 +14,14 @@
 %% http://www.latex-project.org/lppl.txt
 %% and version 1.3c or later is part of all distributions of
 %% LaTeX version 2006/05/20 or later.
- \NeedsTeXFormat{LaTeX2e}[2006/05/20]
- \ProvidesPackage{bodeplot}
- \RequirePackage{tikz}
- \RequirePackage{pgfplots}
- \RequirePackage{pdftexcmds}
- \RequirePackage{ifplatform}
- \pgfplotsset{compat=1.18,variable=t}
- \usepgfplotslibrary{groupplots}
+\NeedsTeXFormat{LaTeX2e}[2006/05/20]
+\ProvidesPackage{bodeplot}
+\RequirePackage{tikz}
+\RequirePackage{pdftexcmds}
+\RequirePackage{ifplatform}
+\RequirePackage{pgfplots}
+  \pgfplotsset{compat=1.18}
+  \usepgfplotslibrary{groupplots}
 
 \RequirePackage{ifluatex}%
 \ifluatex
@@ -38,17 +38,17 @@
 \else
   \newcommand{\n at pow}[2]{(#1)**(#2)}%
   \newcommand{\n at mod}[2]{(#1)-(floor((#1)/(#2))*(#2))}%
-  \newcounter{idGnuplot}%
-  \setcounter{idGnuplot}{0}%
+  \newcounter{gnuplot at id}%
+  \setcounter{gnuplot at id}{0}%
   \tikzset{%
-    gnuplot def/.style={%
-      id=\arabic{idGnuplot},
+    gnuplot at prefix/.style={%
+      id=\arabic{gnuplot at id},
       prefix=gnuplot/\jobname
     }%
   }
   \pgfplotsset{%
-    gnuplot degrees/.code={%
-      \ifnum\value{idGnuplot}=1
+    gnuplot at degrees/.code={%
+      \ifnum\value{gnuplot at id}=1
         \xdef\pgfplots at gnuplot@format{\pgfplots at gnuplot@format set angles degrees;}%
       \fi
     }%
@@ -58,7 +58,7 @@
   \fi
 \fi
 \pgfplotsset{%
-  bodeStyle/.style = {%
+  bode at style/.style = {%
     label style={font=\footnotesize},
     tick label style={font=\footnotesize},
     grid=both,
@@ -174,7 +174,7 @@
   \build at ZPK@plot{\func at mag}{\func at ph}{\opt at approx}{#2}%
   \edef\temp at cmd{\noexpand\begin{tikzpicture}[\unexpanded\expandafter{\opt at tikz}]%
     \noexpand\begin{groupplot}[%
-      bodeStyle,
+      bode at style,
       xmin={#3},
       xmax={#4},
       domain=#3:#4,
@@ -188,26 +188,26 @@
       \if at pgfarg
         \expandafter\nextgroupplot\expandafter[ytick distance=20,
           ylabel={Gain (dB)},xmajorticks=false,\optmag at axes]
-        \edef\temp at cmd{\noexpand\addplot[thick,\optmag at plot]}%
+        \edef\temp at cmd{\noexpand\addplot[variable=t,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[thick,\optph at plot]}%
+        \edef\temp at cmd{\noexpand\addplot[variable=t,thick,\optph at plot]}%
         \temp at cmd {\func at ph};
         \optph at commands;
       \else
-      \stepcounter{idGnuplot}
+      \stepcounter{gnuplot at id}
       \expandafter\nextgroupplot\expandafter[ytick distance=20,
         ylabel={Gain (dB)},xmajorticks=false,\optmag at axes]
-      \edef\temp at cmd{\noexpand\addplot[thick,\optmag at plot]}%
-      \temp at cmd gnuplot[gnuplot degrees,gnuplot def] {\func at mag};
+      \edef\temp at cmd{\noexpand\addplot[variable=t,thick,\optmag at plot]}%
+      \temp at cmd gnuplot[gnuplot at degrees,gnuplot at prefix] {\func at mag};
       \optmag at commands;
-      \stepcounter{idGnuplot}
+      \stepcounter{gnuplot at id}
       \expandafter\nextgroupplot\expandafter[ytick distance=45,
         ylabel={Phase ($^{\circ}$)},xlabel={Frequency (rad/s)},\optph at axes]
-      \edef\temp at cmd{\noexpand\addplot[thick,\optph at plot]}%
-      \temp at cmd gnuplot[gnuplot degrees,gnuplot def] {\func at ph};
+      \edef\temp at cmd{\noexpand\addplot[variable=t,thick,\optph at plot]}%
+      \temp at cmd gnuplot[gnuplot at degrees,gnuplot at prefix] {\func at ph};
       \optph at commands;
     \fi
     \end{groupplot}
@@ -220,7 +220,7 @@
   \build at TF@plot{\func at mag}{\func at ph}{#2}%
   \edef\temp at cmd{\noexpand\begin{tikzpicture}[\unexpanded\expandafter{\opt at tikz}]%
     \noexpand\begin{groupplot}[%
-      bodeStyle,
+      bode at style,
       xmin={#3},
       xmax={#4},
       domain=#3:#4,
@@ -234,26 +234,26 @@
       \if at pgfarg
         \expandafter\nextgroupplot\expandafter[ytick distance=20,
           ylabel={Gain (dB)},xmajorticks=false,\optmag at axes]
-        \edef\temp at cmd{\noexpand\addplot[thick,\optmag at plot]}%
+        \edef\temp at cmd{\noexpand\addplot[variable=t,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[thick,\optph at plot]}%
+        \edef\temp at cmd{\noexpand\addplot[variable=t,thick,\optph at plot]}%
         \temp at cmd {\func at ph};
         \optph at commands;
       \else
-        \stepcounter{idGnuplot}%
+        \stepcounter{gnuplot at id}%
         \expandafter\nextgroupplot\expandafter[ytick distance=20,
           ylabel={Gain (dB)},xmajorticks=false,\optmag at axes]
-        \edef\temp at cmd{\noexpand\addplot[thick,\optmag at plot]}%
-        \temp at cmd gnuplot[gnuplot degrees,gnuplot def] {\func at mag};
+        \edef\temp at cmd{\noexpand\addplot[variable=t,thick,\optmag at plot]}%
+        \temp at cmd gnuplot[gnuplot at degrees,gnuplot at prefix] {\func at mag};
         \optmag at commands;
-        \stepcounter{idGnuplot}%
+        \stepcounter{gnuplot at id}%
         \expandafter\nextgroupplot\expandafter[ytick distance=45,
           ylabel={Phase ($^{\circ}$)},xlabel={Frequency (rad/s)},\optph at axes]
-        \edef\temp at cmd{\noexpand\addplot[thick,\optph at plot]}%
-        \temp at cmd gnuplot[gnuplot degrees,gnuplot def] {\func at ph};
+        \edef\temp at cmd{\noexpand\addplot[variable=t,thick,\optph at plot]}%
+        \temp at cmd gnuplot[gnuplot at degrees,gnuplot at prefix] {\func at ph};
         \optph at commands;
       \fi
     \end{groupplot}
@@ -269,12 +269,12 @@
       \build at ZPK@plot{\plot at macro}{\temp at macro}{\approx}{#3}%
     \fi
     \if at pgfarg
-      \edef\temp at cmd{\noexpand\addplot[thick,\opt]}%
+      \edef\temp at cmd{\noexpand\addplot[variable=t,thick,\opt]}%
       \temp at cmd {\plot at macro};
     \else
-      \stepcounter{idGnuplot}%
-      \edef\temp at cmd{\noexpand\addplot[thick,\opt]}
-      \temp at cmd gnuplot[gnuplot degrees,gnuplot def] {\plot at macro};
+      \stepcounter{gnuplot at id}%
+      \edef\temp at cmd{\noexpand\addplot[variable=t,thick,\opt]}
+      \temp at cmd gnuplot[gnuplot at degrees,gnuplot at prefix] {\plot at macro};
     \fi
   }%
 }
@@ -287,18 +287,18 @@
     \build at TF@plot{\plot at macro}{\temp at macro}{#3}%
   \fi
   \if at pgfarg
-    \addplot[#1]{\plot at macro};
+    \addplot[variable=t,#1]{\plot at macro};
   \else
-    \stepcounter{idGnuplot}%
-    \addplot[#1] gnuplot[gnuplot degrees, gnuplot def] {\plot at macro};
+    \stepcounter{gnuplot at id}%
+    \addplot[variable=t,#1] gnuplot[gnuplot at degrees, gnuplot at prefix] {\plot at macro};
   \fi
 }
 \newcommand{\addBodeComponentPlot}[2][thick]{%
   \if at pgfarg
-    \addplot[#1]{#2};
+    \addplot[variable=t,#1]{#2};
   \else
-    \stepcounter{idGnuplot}%
-    \addplot[#1] gnuplot[gnuplot degrees,gnuplot def] {#2};
+    \stepcounter{gnuplot at id}%
+    \addplot[variable=t,#1] gnuplot[gnuplot at degrees,gnuplot at prefix] {#2};
   \fi
 }
 \newenvironment{BodePlot}[3][]{%
@@ -305,7 +305,7 @@
   \parse at env@opt{#1}%
   \edef\temp at cmd{\noexpand\begin{tikzpicture}[\unexpanded\expandafter{\opt at tikz}]
     \noexpand\begin{semilogxaxis}[%
-      bodeStyle,
+      bode at style,
       xmin={#2},
       xmax={#3},
       domain=#2:#3,
@@ -540,7 +540,7 @@
   \build at ZPK@plot{\func at mag}{\func at ph}{}{#2}%
   \edef\temp at cmd{\noexpand\begin{tikzpicture}[\unexpanded\expandafter{\opt at tikz}]%
     \noexpand\begin{axis}[%
-      bodeStyle,
+      bode at style,
       domain=#3:#4,
       height=5cm,
       xlabel={$\Re$},
@@ -551,14 +551,14 @@
   }%
   \temp at cmd
       \addplot [only marks,mark=+,thick,red] (-1 , 0);
-      \edef\temp at cmd{\noexpand\addplot[thick,\unexpanded\expandafter{\opt at plot}]}%
+      \edef\temp at cmd{\noexpand\addplot[variable=t,thick,\unexpanded\expandafter{\opt at plot}]}%
       \if at pgfarg
         \temp at cmd ( {\n at pow{10}{((\func at mag)/20)}*cos(\func at ph)},
           {\n at pow{10}{((\func at mag)/20)}*sin(\func at ph)} );
         \opt at commands;
       \else
-        \stepcounter{idGnuplot}%
-        \temp at cmd gnuplot[parametric,gnuplot degrees,gnuplot def] {%
+        \stepcounter{gnuplot at id}%
+        \temp at cmd gnuplot[parametric,gnuplot at degrees,gnuplot at prefix] {%
           \n at pow{10}{((\func at mag)/20)}*cos(\func at ph),
           \n at pow{10}{((\func at mag)/20)}*sin(\func at ph)};
         \opt at commands;
@@ -573,7 +573,7 @@
   \build at TF@plot{\func at mag}{\func at ph}{#2}%
   \edef\temp at cmd{\noexpand\begin{tikzpicture}[\unexpanded\expandafter{\opt at tikz}]%
     \noexpand\begin{axis}[%
-      bodeStyle,
+      bode at style,
       domain=#3:#4,
       height=5cm,
       xlabel={$\Re$},
@@ -584,14 +584,14 @@
   }%
   \temp at cmd
       \addplot [only marks,mark=+,thick,red] (-1 , 0);
-      \edef\temp at cmd{\noexpand\addplot[thick,\unexpanded\expandafter{\opt at plot}]}%
+      \edef\temp at cmd{\noexpand\addplot[variable=t,thick,\unexpanded\expandafter{\opt at plot}]}%
       \if at pgfarg
         \temp at cmd ( {\n at pow{10}{((\func at mag)/20)}*cos(\func at ph)},
           {\n at pow{10}{((\func at mag)/20)}*sin(\func at ph)} );
         \opt at commands;
       \else
-        \stepcounter{idGnuplot}%
-        \temp at cmd gnuplot[parametric,gnuplot degrees,gnuplot def]{%
+        \stepcounter{gnuplot at id}%
+        \temp at cmd gnuplot[parametric,gnuplot at degrees,gnuplot at prefix]{%
           \n at pow{10}{((\func at mag)/20)}*cos(\func at ph),
           \n at pow{10}{((\func at mag)/20)}*sin(\func at ph)};
         \opt at commands;
@@ -604,11 +604,11 @@
   \gdef\func at ph{}%
   \build at ZPK@plot{\func at mag}{\func at ph}{}{#2}%
   \if at pgfarg
-    \addplot [#1] ( {\n at pow{10}{((\func at mag)/20)}*cos(\func at ph)},
+    \addplot[variable=t,#1] ( {\n at pow{10}{((\func at mag)/20)}*cos(\func at ph)},
       {\n at pow{10}{((\func at mag)/20)}*sin(\func at ph)} );
   \else
-    \stepcounter{idGnuplot}%
-    \addplot [#1] gnuplot[parametric,gnuplot degrees,gnuplot def]{%
+    \stepcounter{gnuplot at id}%
+    \addplot[variable=t,#1] gnuplot[parametric,gnuplot at degrees,gnuplot at prefix]{%
       \n at pow{10}{((\func at mag)/20)}*cos(\func at ph),
       \n at pow{10}{((\func at mag)/20)}*sin(\func at ph)};
   \fi
@@ -618,11 +618,11 @@
   \gdef\func at ph{}%
   \build at TF@plot{\func at mag}{\func at ph}{#2}%
   \if at pgfarg
-    \addplot [#1] ( {\n at pow{10}{((\func at mag)/20)}*cos(\func at ph)},
+    \addplot[variable=t,#1] ( {\n at pow{10}{((\func at mag)/20)}*cos(\func at ph)},
       {\n at pow{10}{((\func at mag)/20)}*sin(\func at ph)} );
   \else
-    \stepcounter{idGnuplot}%
-    \addplot [#1] gnuplot[parametric,gnuplot degrees,gnuplot def]{%
+    \stepcounter{gnuplot at id}%
+    \addplot[variable=t,#1] gnuplot[parametric,gnuplot at degrees,gnuplot at prefix]{%
       \n at pow{10}{((\func at mag)/20)}*cos(\func at ph),
       \n at pow{10}{((\func at mag)/20)}*sin(\func at ph)};
   \fi
@@ -631,7 +631,7 @@
   \parse at env@opt{#1}%
   \edef\temp at cmd{\noexpand\begin{tikzpicture}[\unexpanded\expandafter{\opt at tikz}]%
     \noexpand\begin{axis}[%
-      bodeStyle,
+      bode at style,
       height=5cm,
       domain=#2:#3,
       xlabel={$\Re$},
@@ -678,7 +678,7 @@
   \build at ZPK@plot{\func at mag}{\func at ph}{}{#2}%
   \edef\temp at cmd{\noexpand\begin{tikzpicture}[\unexpanded\expandafter{\opt at tikz}]%
     \noexpand\begin{axis}[%
-      bodeStyle,
+      bode at style,
       domain=#3:#4,
       height=5cm,
       xlabel={Phase (degrees)},
@@ -688,13 +688,13 @@
     ]%
   }%
   \temp at cmd
-      \edef\temp at cmd{\noexpand\addplot[thick,\opt at plot]}%
+      \edef\temp at cmd{\noexpand\addplot[variable=t,thick,\opt at plot]}%
       \if at pgfarg
         \temp at cmd ( {\func at ph} , {\func at mag} );
         \opt at commands;
       \else
-        \stepcounter{idGnuplot}%
-        \temp at cmd gnuplot[parametric, gnuplot degrees, gnuplot def]
+        \stepcounter{gnuplot at id}%
+        \temp at cmd gnuplot[parametric, gnuplot at degrees, gnuplot at prefix]
           { \func at ph , \func at mag };
         \opt at commands;
       \fi
@@ -708,7 +708,7 @@
   \build at TF@plot{\func at mag}{\func at ph}{#2}%
   \edef\temp at cmd{\noexpand\begin{tikzpicture}[\unexpanded\expandafter{\opt at tikz}]%
     \noexpand\begin{axis}[%
-      bodeStyle,
+      bode at style,
       domain=#3:#4,
       height=5cm,
       xlabel={Phase (degrees)},
@@ -718,13 +718,13 @@
     ]%
   }%
   \temp at cmd
-      \edef\temp at cmd{\noexpand\addplot[thick,\opt at plot]}%
+      \edef\temp at cmd{\noexpand\addplot[variable=t,thick,\opt at plot]}%
       \if at pgfarg
         \temp at cmd ( {\func at ph} , {\func at mag} );
         \opt at commands;
       \else
-        \stepcounter{idGnuplot}%
-        \temp at cmd gnuplot[parametric, gnuplot degrees, gnuplot def]
+        \stepcounter{gnuplot at id}%
+        \temp at cmd gnuplot[parametric, gnuplot at degrees, gnuplot at prefix]
           { \func at ph , \func at mag };
         \opt at commands;
       \fi
@@ -735,7 +735,7 @@
   \parse at env@opt{#1}%
   \edef\temp at cmd{\noexpand\begin{tikzpicture}[\unexpanded\expandafter{\opt at tikz}]%
     \noexpand\begin{axis}[%
-      bodeStyle,
+      bode at style,
       domain=#2:#3,
       height=5cm,
       xlabel={Phase (degrees)},
@@ -753,10 +753,10 @@
   \gdef\func at ph{}%
   \build at ZPK@plot{\func at mag}{\func at ph}{}{#2}%
   \if at pgfarg
-    \addplot [#1] ( {\func at ph} , {\func at mag} );
+    \addplot[variable=t,#1] ( {\func at ph} , {\func at mag} );
   \else
-    \stepcounter{idGnuplot}%
-    \addplot [#1] gnuplot[parametric,gnuplot degrees,gnuplot def]
+    \stepcounter{gnuplot at id}%
+    \addplot[variable=t,#1] gnuplot[parametric,gnuplot at degrees,gnuplot at prefix]
       {\func at ph , \func at mag};
   \fi
 }
@@ -765,10 +765,10 @@
   \gdef\func at ph{}%
   \build at TF@plot{\func at mag}{\func at ph}{#2}%
   \if at pgfarg
-    \addplot [#1] ( {\func at ph} , {\func at mag} );
+    \addplot[variable=t,#1] ( {\func at ph} , {\func at mag} );
   \else
-    \stepcounter{idGnuplot}%
-    \addplot [#1] gnuplot[gnuplot degrees,gnuplot def]
+    \stepcounter{gnuplot at id}%
+    \addplot[variable=t,#1] gnuplot[gnuplot at degrees,gnuplot at prefix]
       {\func at ph , \func at mag};
   \fi
 }



More information about the tex-live-commits mailing list.