texlive[68781] Master/texmf-dist: pst-osci (5nov23)
commits+karl at tug.org
commits+karl at tug.org
Thu Nov 9 23:19:57 CET 2023
Revision: 68781
https://tug.org/svn/texlive?view=revision&revision=68781
Author: karl
Date: 2023-11-09 23:19:57 +0100 (Thu, 09 Nov 2023)
Log Message:
-----------
pst-osci (5nov23)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/generic/pst-osci/Changes
trunk/Master/texmf-dist/doc/generic/pst-osci/README
trunk/Master/texmf-dist/doc/generic/pst-osci/pst-osci-doc.pdf
trunk/Master/texmf-dist/doc/generic/pst-osci/pst-osci-doc.tex
trunk/Master/texmf-dist/tex/generic/pst-osci/pst-osci.tex
trunk/Master/texmf-dist/tex/latex/pst-osci/pst-osci.sty
Removed Paths:
-------------
trunk/Master/texmf-dist/doc/generic/pst-osci/oscilloscope.pdf
trunk/Master/texmf-dist/doc/generic/pst-osci/oscilloscope.tex
Modified: trunk/Master/texmf-dist/doc/generic/pst-osci/Changes
===================================================================
--- trunk/Master/texmf-dist/doc/generic/pst-osci/Changes 2023-11-09 22:19:41 UTC (rev 68780)
+++ trunk/Master/texmf-dist/doc/generic/pst-osci/Changes 2023-11-09 22:19:57 UTC (rev 68781)
@@ -1,7 +1,5 @@
..... pst-osci.tex
+2.82b 2023-11-04 - added some more examples (hv)
+2.82a 2022-10-20 - added use of lualatex in the doc (hv)
2.82 2005-11-07 - using pst-xkey (hv)
- some modification to the code (hv)
-
-..... pst-func.sty
- 2005-11-07 new version
-
Modified: trunk/Master/texmf-dist/doc/generic/pst-osci/README
===================================================================
--- trunk/Master/texmf-dist/doc/generic/pst-osci/README 2023-11-09 22:19:41 UTC (rev 68780)
+++ trunk/Master/texmf-dist/doc/generic/pst-osci/README 2023-11-09 22:19:57 UTC (rev 68781)
@@ -1,21 +1,21 @@
- ------------------------------------------------------
- | pst-osci: PSTricks package for oscilloscopes |
- | |
- | Version 2.7 (November 17, 1999) |
- | Manuel Luque <Mluque5130 at aol.com> |
- | Christophe Jorssen <Christophe.Jorssen at wanadoo.fr> |
- ------------------------------------------------------
+%% Package `pst-osci.tex'
+%%
+%% Authors : Manuel LUQUE <Mluque5130 at aol.com>
+%% Christophe JORSSEN <Christophe.Jorssen at free.fr>
+%% Raoul HATTERER<Hatterer.Raoul at wanadoo.fr>
+%% Herbert Voss <hvoss at tug.org>
+%%
+%% 2023-11-04
+%%
+pst-osci is a PSTricks package to draw easily oscilloscope screen shots.
+Three channels can be used to represent the most common
+signals (damped or not), namely sinusoidal, rectangular, triangular,
+dog's tooth (left and right oriented). The third channel allows you to add, to
+subtract or to multiply the two other signals. Lissajous diagrams (XY-mode)
+can also be obtained.
- * Copy pst-osci.tex and pst-osci.sty in one of your TeX input directories
-
- * Run "latex" on pst-osci.doc to generate the documentation
-
- * Web page is http://www.tug.org/applications/PSTricks/Physics/Oscilloscopes
-
- * The files of this package are hereby put into the public domain:
- README pst-osci.doc pst-osci.sty pst-osci.tex
-
---
-Manuel Luque and Christophe Jorssen (updated November 22, 1999)
+%% This program can be redistributed and/or modified under the terms
+%% of the LaTeX Project Public License Distributed from CTAN archives
+%% in directory macros/latex/base/lppl.txt.
Deleted: trunk/Master/texmf-dist/doc/generic/pst-osci/oscilloscope.pdf
===================================================================
(Binary files differ)
Deleted: trunk/Master/texmf-dist/doc/generic/pst-osci/oscilloscope.tex
===================================================================
--- trunk/Master/texmf-dist/doc/generic/pst-osci/oscilloscope.tex 2023-11-09 22:19:41 UTC (rev 68780)
+++ trunk/Master/texmf-dist/doc/generic/pst-osci/oscilloscope.tex 2023-11-09 22:19:57 UTC (rev 68781)
@@ -1,361 +0,0 @@
-\documentclass [a4paper,12pt,dvips]{article}
-\usepackage[latin1]{inputenc}%accepte les accents
-\usepackage[francais]{babel}% r\xE8gles de c\xE9sure
-\usepackage{pstricks}
-\usepackage{pst-osci}
-\usepackage{pst-char,pst-text}%,pst-plot}
-%\usepackage[usenames] {pstcol}
-
-\title {pst-osci \& AllColor}
-\author {Raoul \textsc{Hatterer}}
-\begin {document}
-\maketitle
-\section {Pr\xE9sentation}
-J'ai trouv\xE9 ce package magnifique de puissance et de simplicit\xE9 mais les couleurs employ\xE9es ne passant pas \xE0 l'impression noir et blanc j'ai ajout\xE9 une option qui emploie des nuances de gris pour palier \xE0 ce probl\xE8me.
-\section {Utilisation}
-\subsection {En pr\xE9ambule}
-\verb+\usepackage{pst-osci}+
-
-Remarque: \verb+\usepackage{pstcol}+ n'est pas utilisable.
-\subsection {Commande}
-\verb+\Oscillo[options \xE9ventuelles]+
-
-\subsection{Compilation}
-Sous MacOSX j'utilise \emph{altpdflatex} ce qui doit correspondre \xE0 \emph{latex+dvips+ps2pdf}.
-\subsection {Nouvelle option}
-\verb+AllColor+ qui par defaut est \xE0 \verb+true+ mais qui lorsqu'on la met \xE0 \verb+false+ permet d'obtenir des oscillogrammes qui passent mieux \xE0 l'impression.
-
-\section {Exemples}
-Je reprends les exemples du document \emph{pst-osci.pdf} de Manuel \textsc{Luque} et Christophe \textsc{Jorssen}\footnote{Les auteurs du package \emph{pst-osci}} pour m'assurer qu'ils fonctionnent tels quels puis en rajoutant \verb+AllColor=false+. La taille est r\xE9duite \xE0 50 \% gr\xE2ce \xE0 \verb+\psscalebox {0.5}{ }+.
-
-\subsection{Oscillo \& Oscillo[AllColor=false]}
-\psscalebox{0.5}{\Oscillo \hspace{1cm}\Oscillo[AllColor=false]}
-
-\subsection{Oscillo[offset2= 5] \& Oscillo[offset2= 5, AllColor=false]}
-\psscalebox{0.5}{\Oscillo[offset2= 5] \hspace{1cm} \Oscillo[offset2= 5,AllColor=false]}
-
-Remarque: \xC0 partir de l\xE0, je ne pr\xE9cise plus que la figure de droite a \xE9t\xE9 obtenue en rajoutant l'option \verb+AllColor=false+.
-% Extrema invisible
-\subsection{ Extrema invisible: Oscillo[offset2=5, amplitude1=5]}
-\psscalebox{0.5}{\Oscillo[offset2=5, amplitude1=5] \hspace{1cm}
-\Oscillo[offset2=5, amplitude1=5,AllColor=false]}
-
-% Good sensivity choice
-\subsection{Good sensivity choice: Oscillo[offset2=5,amplitude1=5, sensivity1=2]}
-\psscalebox{0.5}{\Oscillo[offset2=5,amplitude1=5, sensivity1=2]\hspace{1cm}
-\Oscillo[offset2=5,amplitude1=5, sensivity1=2,AllColor=false]}
-
-% Different amplitude
-\subsection{Different amplitude: Oscillo[amplitude1=3, amplitude2=1.5]}
-\psscalebox{0.5}{\Oscillo[amplitude1=3, amplitude2=1.5]\hspace{1cm}
-\Oscillo[amplitude1=3, amplitude2=1.5,AllColor=false]}
-% Different period
-\subsubsection{Different period: Oscillo[amplitude1=3,amplitude2=1.5, period2=50]}
-\psscalebox{0.5}{\Oscillo[amplitude1=3,amplitude2=1.5, period2=50]\hspace{1cm}
-\Oscillo[amplitude1=3,amplitude2=1.5, period2=50,AllColor=false]}
-% Different phase
-\subsection {Different phase: Oscillo[amplitude1=3,amplitude2=1.5, phase1=60, phase2=-30]}
-\psscalebox{0.5}{\Oscillo[amplitude1=3,amplitude2=1.5, phase1=60, phase2=-30]\hspace{1cm}
-\Oscillo[amplitude1=3,amplitude2=1.5, phase1=60, phase2=-30,AllColor=false]}
-
-\subsection{Damping and amplification: Oscillo[amplitude1=3,amplitude2=1.5,
-damping2=0.005, damping1=-0.005]}
-\psscalebox{0.5}{\Oscillo[amplitude1=3,amplitude2=1.5,
-damping2=0.005, damping1=-0.005]\hspace{1cm}
-\Oscillo[amplitude1=3,amplitude2=1.5,
-damping2=0.005, damping1=-0.005,AllColor=false]}
-
-
-\subsection {Changing the plot style}
-\psscalebox{0.5}{\newpsstyle{BlueDots}{plotstyle=dots,
-linecolor=blue,linewidth=0.02,plotpoints=50}
-\Oscillo[amplitude1=3, plotstyle2=BlueDots,amplitude2=2]\hspace{1cm}
-\newpsstyle{GreenDash}{linestyle=dashed,
-linecolor=green,linewidth=0.035,plotpoints=50}
-\Oscillo[amplitude1=2,phase1=90,amplitude2=3.8,period1=25,
-period2=50,phase2=10, plotstyle1=GreenDash]}
-\\
-
-\psscalebox{0.5}{\newpsstyle{BlueDots}{plotstyle=dots,
-linecolor=blue,linewidth=0.02,plotpoints=50}
-\Oscillo[amplitude1=3, plotstyle2=BlueDots,amplitude2=2,AllColor=false]\hspace{1cm}
-\newpsstyle{GreenDash}{linestyle=dashed,
-linecolor=green,linewidth=0.035,plotpoints=50}
-\Oscillo[amplitude1=2,phase1=90,amplitude2=3.8,period1=25,
-period2=50,phase2=10, plotstyle1=GreenDash,AllColor=false]}
-
-
-\begin{verbatim}
-\newpsstyle{BlueDots}{plotstyle=dots,
-linecolor=blue,linewidth=0.02,plotpoints=50}
-\Oscillo[amplitude1=3, plotstyle2=BlueDots,amplitude2=2]\hspace{1cm}
-\newpsstyle{GreenDash}{linestyle=dashed,
-linecolor=green,linewidth=0.035,plotpoints=50}
-\Oscillo[amplitude1=2,phase1=90,amplitude2=3.8,period1=25,
-period2=50,phase2=10, plotstyle1=GreenDash]
-\end{verbatim}
-
-Remarque: Ce n'est plus possible si l'on met \verb+AllColor=false+. Mais rien ne vous emp\xEAche de faire des \verb+linecolor=black+ (cependant les \textsc{on} et \textsc{off} ne passeront pas mieux \xE0 l'impression qu'auparavant).
-
-\subsection{Channel C: operations}
-\psscalebox{0.5}{\Oscillo[amplitude2=1.5,period2=50,period1=10,
-combine= true, operation= add]
-\Oscillo[amplitude2=1.5,period2=50,period1=10,
-combine= true, operation= add,offset1=2,offset2=2]
-% SignalA and SignalB are invisible
-\Oscillo[amplitude2=1.5,period2=50,period1=10,
-combine= true, operation= add,offset1=6,offset2=6]}
-\\
-
-\psscalebox{0.5}{\Oscillo[amplitude2=1.5,period2=50,period1=10,
-combine= true, operation= add,AllColor=false]
-\Oscillo[amplitude2=1.5,period2=50,period1=10,
-combine= true, operation= add,offset1=2,offset2=2,AllColor=false]
-% SignalA and SignalB are invisible
-\Oscillo[amplitude2=1.5,period2=50,period1=10,
-combine= true, operation= add,offset1=6,offset2=6,AllColor=false]}
-
-\begin{verbatim}
-\Oscillo[amplitude2=1.5,period2=50,period1=10,
-combine= true, operation= add]
-\Oscillo[amplitude2=1.5,period2=50,period1=10,
-combine= true, operation= add,offset1=2,offset2=2]
-% SignalA and SignalB are invisible
-\Oscillo[amplitude2=1.5,period2=50,period1=10,
-combine= true, operation= add,offset1=6,offset2=6]
-\end{verbatim}
-
-\subsection{Subtraction: Oscillo[amplitude2=1.5,period2=50,period1=10,
-combine= true,operation= sub]}
-
-\psscalebox{0.5}{\Oscillo[amplitude2=1.5,period2=50,period1=10,
-combine= true,
-operation= sub]\hspace{1cm}
-\Oscillo[amplitude2=1.5,period2=50,period1=10,
-combine= true,
-operation= sub,AllColor=false]}
-
-\subsection {Multiplications}
-\psscalebox{0.5}{\Oscillo[amplitude2=1.5,period2=50,period1=10,
-combine= true, operation= mul]\hspace{1cm}
-\Oscillo[amplitude1=1,amplitude2=2,
-period2=50,period1=2, combine= true, operation= mul]}
-\\
-
-\psscalebox{0.5}{\Oscillo[amplitude2=1.5,period2=50,period1=10,
-combine= true, operation= mul,AllColor=false]\hspace{1cm}
-\Oscillo[amplitude1=1,amplitude2=2,
-period2=50,period1=2, combine= true, operation= mul,AllColor=false]}
-
-\begin{verbatim}
-\Oscillo[amplitude2=1.5,period2=50,period1=10,
-combine= true, operation= mul]
-\Oscillo[amplitude1=1,amplitude2=2,
-period2=50,period1=2, combine= true, operation= mul]
-\end{verbatim}
-
-\subsection{Channel C: XY-mode}
-\psscalebox{0.5}{\Oscillo[ Lissajous= true,amplitude2=2]
-\Oscillo[Lissajous=true,amplitude2=3,phase2=45]
-\Oscillo[Lissajous=true,amplitude2=2,phase2=90]}
-\\
-
-\psscalebox{0.5}{\Oscillo[ Lissajous=true,amplitude2=2,AllColor=false]
-\Oscillo[Lissajous=true,amplitude2=3,phase2=45,AllColor=false]
-\Oscillo[Lissajous=true,amplitude2=2,phase2=90,AllColor=false]}
-\begin{verbatim}
-\Oscillo[ Lissajous= true,amplitude2=2]
-\Oscillo[Lissajous=true,amplitude2=3,phase2=45]
-\Oscillo[Lissajous=true,amplitude2=2,phase2=90]
-\end{verbatim}
-
-\psscalebox{0.5}{\Oscillo[amplitude1=3.5,phase1=90,amplitude2=3.5,
-period1=20,period2=10,phase2=0,Lissajous=true]
-\Oscillo[amplitude1=3.5,phase1=90,amplitude2=3.5,
-period1=25,period2=5,phase2=60,Lissajous=true]
-\Oscillo[amplitude1=3.5,phase1=90,
-amplitude2=3.5,period1=50,period2=50,
-Lissajous=true,damping1=0.01,damping2=0.01]}
-\\
-
-\psscalebox{0.5}{\Oscillo[amplitude1=3.5,phase1=90,amplitude2=3.5,
-period1=20,period2=10,phase2=0,Lissajous=true,AllColor=false]
-\Oscillo[amplitude1=3.5,phase1=90,amplitude2=3.5,
-period1=25,period2=5,phase2=60,Lissajous=true,AllColor=false]
-\Oscillo[amplitude1=3.5,phase1=90,
-amplitude2=3.5,period1=50,period2=50,
-Lissajous=true,damping1=0.01,damping2=0.01,AllColor=false]}
-
-\begin{verbatim}
-\Oscillo[amplitude1=3.5,phase1=90,amplitude2=3.5,
-period1=20,period2=10,phase2=0,Lissajous=true]
-\Oscillo[amplitude1=3.5,phase1=90,amplitude2=3.5,
-period1=25,period2=5,phase2=60,Lissajous=true]
-\Oscillo[amplitude1=3.5,phase1=90,
-amplitude2=3.5,period1=50,period2=50,
-Lissajous=true,damping1=0.01,damping2=0.01]
-\end{verbatim}
-
-\subsection{Non sinusoidal signals}
-
-%\subsubsection*{Exponential signals}
-\psscalebox{0.5}{\Oscillo[amplitude1=3.5,phase1=90,
-period1= 2E30,offset2=5,damping1=0.02]\hspace{1cm}
-\Oscillo[amplitude1=3.5,phase1=90,
-period1= 2E30,offset2=3,amplitude2=-3,damping1=0.02,
-period2= 2E31,damping2=0.02,phase2=90]}
-
-\psscalebox{0.5}{\Oscillo[amplitude1=3.5,phase1=90,
-period1= 2E30,offset2=5,damping1=0.02,AllColor=false]\hspace{1cm}
-\Oscillo[amplitude1=3.5,phase1=90,
-period1= 2E30,offset2=3,amplitude2=-3,damping1=0.02,
-period2= 2E31,damping2=0.02,phase2=90,AllColor=false]}
-
-\begin{verbatim}
-\Oscillo[amplitude1=3.5,phase1=90,
-period1= 2E30,offset2=5,damping1=0.02]
-\Oscillo[amplitude1=3.5,phase1=90,
-period1= 2E30,offset2=3,amplitude2=-3,da
-period2= 2E31,damping2=0.02,phase2=90]
-\end{verbatim}
-
-\psscalebox{0.5}{\Oscillo[ Wave1= \TriangleA,amplitude2=2,period2=20,period1=25]\hspace{1cm}
-\Oscillo[ Wave1= \RectangleA,amplitude2=2,period2=20,period1=25]}
-\\
-
-\psscalebox{0.5}{\Oscillo[ Wave1= \TriangleA,amplitude2=2,period2=20,period1=25,AllColor=false]\hspace{1cm}
-\Oscillo[ Wave1= \RectangleA,amplitude2=2,period2=20,period1=25,AllColor=false]}
-
-\subsection{Combine examples}
-\psscalebox{0.5}{\Oscillo[Wave2=\TriangleB,combine=true,operation=mul,amplitude2=2,period2=50,period1=2,amplitude1=1]
-\Oscillo[combine=true,operation=add,amplitude2=1.5,Wave1=\RectangleA,amplitude1=1.5,period2=15]
-\Oscillo[combine=true,operation=add,amplitude2=1.5,Wave1=\RectangleA,amplitude1=1.5,period2=15,Wave2=\TriangleB]}
-\\
-
-\psscalebox{0.5}{\Oscillo[Wave2=\TriangleB,combine=true,operation=mul,amplitude2=2,period2=50,period1=2,amplitude1=1,AllColor=false]
-\Oscillo[combine=true,operation=add,amplitude2=1.5,Wave1=\RectangleA,amplitude1=1.5,period2=15,AllColor=false]
-\Oscillo[combine=true,operation=add,amplitude2=1.5,Wave1=\RectangleA,amplitude1=1.5,period2=15,Wave2=\TriangleB,AllColor=false]
-}
-\begin{verbatim}
-\Oscillo[Wave2=\TriangleB,combine=true,operation=mul,amplitude2=2,
-period2=50,period1=2,amplitude1=1]
-\Oscillo[combine=true,operation=add,amplitude2=1.5,
-Wave1=\RectangleA,amplitude1=1.5,period2=15]
-\Oscillo[combine=true,operation=add,amplitude2=1.5,
-Wave1=\RectangleA,amplitude1=1.5,period2=15,Wave2=\TriangleB]
-\end{verbatim}
-
-\subsection{Dog's tooth signal}
-\psscalebox{0.5}{\Oscillo[combine=true,operation=mul,amplitude2=1.5,
-Wave1= \RDogToothA,amplitude1=1.5,period2=15]\hspace{1cm}
-\Oscillo[amplitude1=3.5,phase1=90,amplitude2=3.5,
-period1=25,period2=6.25,phase2=0,Lissajous=true,Wave2=\RDogToothB]}
-\\
-
-\psscalebox{0.5}{\Oscillo[combine=true,operation=mul,amplitude2=1.5,
-Wave1= \RDogToothA,amplitude1=1.5,period2=15,AllColor=false]\hspace{1cm}
-\Oscillo[amplitude1=3.5,phase1=90,amplitude2=3.5,
-period1=25,period2=6.25,phase2=0,Lissajous=true,Wave2=\RDogToothB,AllColor=false]}
-
-\begin{verbatim}
-\Oscillo[combine=true,operation=mul,amplitude2=1.5,
-Wave1= \RDogToothA,amplitude1=1.5,period2=15]
-\Oscillo[amplitude1=3.5,phase1=90,amplitude2=3.5,
-period1=25,period2=6.25,phase2=0,Lissajous=true,Wave2=\RDogToothB]
-\end{verbatim}
-
-\subsection{Frequency modulation examples}
-\psscalebox{0.5}{\Oscillo[ periodmodulation1=200, freqmod1=5,period1=30,
-timediv=50,plotpoints=1000,amplitude2=2,period2=200]
-\Oscillo[amplitude1=1,amplitude2=1,
-period2=25,period1=2,combine=true,operation=mul]
-\Oscillo[amplitude1=1,amplitude2=1, CC2=2,
-period2=25,period1=2,combine=true,operation=mul,offset1=5]}
-\\
-
-\psscalebox{0.5}{\Oscillo[ periodmodulation1=200, freqmod1=5,period1=30,
-timediv=50,plotpoints=1000,amplitude2=2,period2=200,AllColor=false]
-\Oscillo[amplitude1=1,amplitude2=1,
-period2=25,period1=2,combine=true,operation=mul,AllColor=false]
-\Oscillo[amplitude1=1,amplitude2=1, CC2=2,
-period2=25,period1=2,combine=true,operation=mul,offset1=5,AllColor=false]}
-
-\begin{verbatim}
-\Oscillo[ periodmodulation1=200, freqmod1=5,period1=30,
-timediv=50,plotpoints=1000,amplitude2=2,period2=200]
-\Oscillo[amplitude1=1,amplitude2=1,
-period2=25,period1=2,combine=true,operation=mul]
-\Oscillo[amplitude1=1,amplitude2=1, CC2=2,
-period2=25,period1=2,combine=true,operation=mul,offset1=5]
-\end{verbatim}
-
-\psscalebox{0.5}{\Oscillo[amplitude1=1,amplitude2=1,CC2=1.5,Wave2=\TriangleB,
-period2=25,period1=2,combine=true,operation=mul,offset1=5]
-\Oscillo[amplitude1=1,amplitude2=1,CC2=2,Wave2=\RDogToothB,
-period2=25,period1=2,combine=true,operation=mul,offset1=5]
-\Oscillo[amplitude1=1,amplitude2=1,CC2=-2,Wave2=\LDogToothB,
-period2=20,period1=3,combine=true,operation=mul,offset1=5]}
-\\
-
-\psscalebox{0.5}{\Oscillo[amplitude1=1,amplitude2=1,CC2=1.5,Wave2=\TriangleB,
-period2=25,period1=2,combine=true,operation=mul,offset1=5,AllColor=false]
-\Oscillo[amplitude1=1,amplitude2=1,CC2=2,Wave2=\RDogToothB,
-period2=25,period1=2,combine=true,operation=mul,offset1=5,AllColor=false]
-\Oscillo[amplitude1=1,amplitude2=1,CC2=-2,Wave2=\LDogToothB,
-period2=20,period1=3,combine=true,operation=mul,offset1=5,AllColor=false]}
-
-\begin{verbatim}
-\Oscillo[amplitude1=1,amplitude2=1,CC2=1.5,Wave2=\TriangleB,
-period2=25,period1=2,combine=true,operation=mul,offset1=5]
-\Oscillo[amplitude1=1,amplitude2=1,CC2=2,Wave2=\RDogToothB,
-period2=25,period1=2,combine=true,operation=mul,offset1=5]
-\Oscillo[amplitude1=1,amplitude2=1,CC2=-2,Wave2=\LDogToothB,
-period2=20,period1=3,combine=true,operation=mul,offset1=5]
-\end{verbatim}
-
-\psscalebox{0.5}{\Oscillo[amplitude1=1,amplitude2=1,CC2=2,Wave2=\RDogToothB,
-period2=25,period1=2,combine=true,operation=mul,
-offset1=5,offset3=-1]\hspace{1cm}
-\Oscillo[amplitude1=1,amplitude2=1,CC2=-2,Wave2=\LDogToothB,
-period2=20,period1=3,combine=true,operation=mul,
-offset1=5,offset3=1]}
-\\
-
-\psscalebox{0.5}{\Oscillo[amplitude1=1,amplitude2=1,CC2=2,Wave2=\RDogToothB,
-period2=25,period1=2,combine=true,operation=mul,
-offset1=5,offset3=-1,AllColor=false]\hspace{1cm}
-\Oscillo[amplitude1=1,amplitude2=1,CC2=-2,Wave2=\LDogToothB,
-period2=20,period1=3,combine=true,operation=mul,
-offset1=5,offset3=1,AllColor=false]}
-
-\begin{verbatim}
-\Oscillo[amplitude1=1,amplitude2=1,CC2=2,Wave2=\RDogToothB,
-period2=25,period1=2,combine=true,operation=mul,
-offset1=5,offset3=-1]\hspace{1cm}
-\Oscillo[amplitude1=1,amplitude2=1,CC2=-2,Wave2=\LDogToothB,
-period2=20,period1=3,combine=true,operation=mul,
-offset1=5,offset3=1]
-\end{verbatim}
-
-\subsection{More examples}
-\psscalebox{0.5}{\Oscillo[amplitude1=3.5,phase1=90,amplitude2=3.5,period1=50,
-period2=50,phase2=0,Lissajous=true,damping1=0.01,
-Wave2=\RectangleB]
-\Oscillo[amplitude1=2,amplitude2=1.8,Wave1=\RectangleA,
-Fourier=500,period1=25,period2=12.5,combine=true,
-operation=add,Wave2=\RectangleB]
-\Oscillo[amplitude1=4,amplitude2=3,period1=50,
-period2=5,Lissajous=true,Wave1=\RectangleA]}
-\\
-
-\psscalebox{0.5}{\Oscillo[amplitude1=3.5,phase1=90,amplitude2=3.5,period1=50,
-period2=50,phase2=0,Lissajous=true,damping1=0.01,
-Wave2=\RectangleB,AllColor=false]
-\Oscillo[amplitude1=2,amplitude2=1.8,Wave1=\RectangleA,
-Fourier=500,period1=25,period2=12.5,combine=true,
-operation=add,Wave2=\RectangleB,AllColor=false]
-\Oscillo[amplitude1=4,amplitude2=3,period1=50,
-period2=5,Lissajous=true,Wave1=\RectangleA,AllColor=false]}
-
-
-\end {document}
Modified: trunk/Master/texmf-dist/doc/generic/pst-osci/pst-osci-doc.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/generic/pst-osci/pst-osci-doc.tex
===================================================================
--- trunk/Master/texmf-dist/doc/generic/pst-osci/pst-osci-doc.tex 2023-11-09 22:19:41 UTC (rev 68780)
+++ trunk/Master/texmf-dist/doc/generic/pst-osci/pst-osci-doc.tex 2023-11-09 22:19:57 UTC (rev 68781)
@@ -7,134 +7,60 @@
%% Last mod. by : Christophe JORSSEN <Christophe.Jorssen at wanadoo.fr>
%% Last mod. the : Wed 17 Nov 1999
%% Last mod. by : Herbert Voss
-%% Last mod. the : Wed 7 Nov 2005
+%% Last mod. the : 4 Nov 2023
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\documentclass{article}
+\PassOptionsToPackage{x11names,dvipsnames,svgnames}{xcolor}
+\documentclass[11pt,english,bibliography=totoc,parskip=false,headings=small,
+ headinclude=false,footinclude=false,twoside,english,usegeometry]{pst-doc}
-\usepackage{pstricks,pst-osci,multicol} % PSTricks package for Oscilloscope screen shots
-\usepackage[baw,pstricks]{fvrb-ex} % Example environments with `fancyvrb'
-\usepackage[a4paper,left=1.5cm,right=1.5cm,top=1.5cm,bottom=1.5cm]{geometry}
-\usepackage{fancyhdr}
+%\newgeometry{lmargin=2cm, rmargin=1.5cm}
+\usepackage{pst-osci,multicol} % PSTricks package for Oscilloscope screen shots
+\usepackage{enumitem,showexpl,fancyvrb} % Example environments with `fancyvrb'
+\setlist{nosep}
+\DeclareRobustCommand\cs[1]{\texttt{\char`\\#1}}
-% Modifications in `fvrb-ex' to use only 7 bits characters as escape ones
-% * will be for comment in place of \xA3, and /() for commands in place of \xA7\xB5\xB6
-% (this work here because these four characters are not used in the examples)
+\newcommand\OsciPackage{\texttt{pst-osci}}
+\let\phi\varphi
-\makeatletter
-\renewcommand{\Begin at Example}{%
-\parindent=0pt
-\multiply\topsep by 2
-\VerbatimEnvironment
-\begin{VerbatimOut}[codes={\catcode`\*=12\catcode`\/=12\catcode`\(=12%
- \catcode`\)=12}]{\jobname.tmp}}
+\def\bgImage{%
+\psscalebox{0.75}{\Oscillo[amplitude1=1.5,amplitude2=1.5,offset1=1.5,offset2=-1.5]}}
+%\lstset{explpreset={pos=l,width=-99pt,overhang=0pt,hsep=\columnsep,vsep=\bigskipamount,rframe={}},
+% escapechar=?}
-\renewcommand{\Below at Example}[1]{%
-\VerbatimInput[gobble=0,commentchar=*,commandchars=/(),numbersep=3pt]%
- {\jobname.tmp}
-\catcode`\*=9\relax%
-\NoHighlight at Attributes % To suppress possible highlighting
-\ifFvrbEx at Grid\vspace{5pt}\fi
-#1%
-\ifFvrbEx at Grid\vspace{5pt}\fi
-\par}
+\begin{document}
-\renewcommand{\SideBySide at Example}[1]{%
-\@tempdimb=\FV at XRightMargin
-\advance\@tempdimb -5mm
-\begin{minipage}[c]{\@tempdimb}
- \fvset{xrightmargin=0pt}
- \catcode`\*=9\relax%
- \NoHighlight at Attributes % To suppress possible highlighting
- #1
-\end{minipage}%
-\@tempdimb=\textwidth
-\advance\@tempdimb -\FV at XRightMargin
-\advance\@tempdimb 5mm
-\begin{minipage}[c]{\@tempdimb}
- \VerbatimInput[gobble=0,commentchar=*,commandchars=/(),numbersep=3pt,
- xleftmargin=5mm,xrightmargin=0pt]{\jobname.tmp}
-\end{minipage}}
+\title{pst-osci}
+\subtitle{A PSTricks package for oscilloscopes}
+\author{Manuel Luque\\Christophe Jorssen}
+\docauthor{Manuel Luque\\Christophe Jorssen\\Raoul Hatterer\\Herbert Voß}
+\date{\today}
+\settitle
-% The \NoHighlight at Attributes from `hbaw' and `hcolors' packages
-% must be modified too
-\def\NoHighlight at Attributes{%
-\catcode`\/=0\relax%
-\catcode`\(=1\relax%
-\catcode`\)=2\relax%
-\def\HLa##1{##1}%
-\def\HLb##1{##1}%
-\def\HLc##1{##1}%
-\def\HLd##1{##1}%
-\def\HLe##1{##1}%
-\def\HLf##1{##1}%
-\def\HLBFa##1{##1}%
-\def\HLBFb##1{##1}%
-\def\HLBFc##1{##1}%
-\def\HLBFd##1{##1}%
-\def\HLBFe##1{##1}%
-\def\HLBFf##1{##1}%
-\def\HLITa##1{##1}%
-\def\HLITb##1{##1}%
-\def\HLITc##1{##1}%
-\def\HLITd##1{##1}%
-\def\HLITe##1{##1}%
-\def\HLITf##1{##1}%
-\def\HLCBBa##1{##1}%
-\def\HLCBBb##1{##1}%
-\def\HLCBBc##1{##1}%
-\def\HLCBBd##1{##1}%
-\def\HLCBBe##1{##1}%
-\def\HLCBBf##1{##1}%
-\def\HLCBBz##1{##1}%
-\def\HLCBWa##1{##1}%
-\def\HLCBWb##1{##1}%
-\def\HLCBWc##1{##1}%
-\def\HLCBWd##1{##1}%
-\def\HLCBWe##1{##1}%
-\def\HLCBWf##1{##1}%
-\def\HLCBWz##1{##1}%
-}
-\makeatother
+\tableofcontents
-% Example environments with numbers, single frame, label on top and margin
-\fvset{numbers=none,frame=single,labelposition=topline}
-% For macro names
-\DeclareRobustCommand\cs[1]{\texttt{\char`\\#1}}
+%PSTricks is PostScript and cannot be run directly with pdf\TeX/pdf\LaTeX. Use insted the sequence
+%\texttt{latex}$\rightarrow$\texttt{dvips}$\rightarrow$\texttt{ps2pdf} or alternatively \texttt{lualatex}.
+%For the latter the package \texttt{luapstricks} is automatically be loaded and the PDF is created
+%without any additional program.
-\newcommand{\OsciPackage}{\textbf{`pst-osci'}}
-\let\phi\varphi
-\lhead{\OsciPackage}\rhead{A PSTricks package for oscilloscopes} \pagestyle{fancy}
-
-\begin{document}
-
-\title{\OsciPackage\thanks{Thanks to Denis \textsc{Girou} for his most valuable
-help and his encouragements.}\\ A PSTricks package for oscilloscopes}
-\author{\shortstack{\makeatletter Manuel \textsc{Luque} \texttt{<Mluque5130 at aol.com>}\\
-Christophe \textsc{Jorssen} \texttt{<Christophe.Jorssen at free.fr>}\makeatother}}
-\date{\shortstack{Version 2.82\\ \small Documentation revised November 07, 2005 by hv}}
-
-\maketitle
-
-\begin{center}
-\psframebox[framearc=0.3,framesep=5mm,linewidth=0.7mm]{%
-\parbox{15cm}{%
-{\Large\textbf{Abstract}}: \OsciPackage{} is a PSTricks package to draw easily
+\begin{abstract}
+\OsciPackage{} is a PSTricks package to draw easily
oscilloscope screen shots. Three channels can be used to represent the most common
signals (damped or not): namely sinusoidal ($y=A\exp (-\lambda t)\sin
(\frac{2\pi}{T}t+m\cdot\sin(\frac{2\pi}{T_m}t)+\phi) + c$), rectangular, triangular,
dog's tooth (left and right oriented). The third channel allows you to add, to
subtract or to multiply the two other signals. \textsc{Lissajous} diagrams (XY-mode)
-can also be obtained.}}
-\end{center}
+can also be obtained.
+\end{abstract}
-\setlength{\columnseprule}{0.6pt}
-\begin{multicols}{2}
-{\parskip 0pt \tableofcontents}
-\end{multicols}
+\vfill
+Thanks to Denis Girou for his most valuable
+help and his encouragements.
+\newpage
\section{Introduction}
@@ -153,93 +79,95 @@
\subsection{Parameters}
+\setlist[description]{font=\normalfont\ttfamily}%
+
+
There are thirty specific parameters defined to change the way the screen shots are
drawn.
-\par
Henceforth, the signals represented on channels A, B and C will be called `SignalA',
`SignalB' and `SignalC'.
\begin{description}
-\item[\HLTTc{period1} (real):] period $T_1$ (in ms) of SignalA (\emph{default:~20}).
+\item[\texttt{period1} (real):] period $T_1$ (in ms) of SignalA (\emph{default:~20}).
-\item[\HLTTc{period2} (real):] period $T_2$ (in ms) of SignalB (\emph{default:~20}).
+\item[\texttt{period2} (real):] period $T_2$ (in ms) of SignalB (\emph{default:~20}).
-\item[\HLTTc{amplitude1} (real):] amplitude $A_1$ (in V) of SignalA (\emph{default:~2}).
+\item[\texttt{amplitude1} (real):] amplitude $A_1$ (in V) of SignalA (\emph{default:~2}).
-\item[\HLTTc{amplitude2} (real):] amplitude $A_2$ (in V) of SignalB
+\item[\texttt{amplitude2} (real):] amplitude $A_2$ (in V) of SignalB
(\emph{default:~0 -- no signal}).
-\item[\HLTTc{periodmodulation1} (real):] period $T_{m1}$ (in ms) of SignalA
+\item[\texttt{periodmodulation1} (real):] period $T_{m1}$ (in ms) of SignalA
(\emph{default:~100}).
-\item[\HLTTc{periodmodulation2} (real):] period $T_{m2}$ (in ms) of SignalB
+\item[\texttt{periodmodulation2} (real):] period $T_{m2}$ (in ms) of SignalB
(\emph{default:~100}).
-\item[\HLTTc{freqmod1} (real):] modulation factor $m_1$ of SignalA (\emph{default:~0}).
+\item[\texttt{freqmod1} (real):] modulation factor $m_1$ of SignalA (\emph{default:~0}).
-\item[\HLTTc{freqmod2} (real):] modulation factor $m_2$ of SignalB (\emph{default:~0}).
+\item[\texttt{freqmod2} (real):] modulation factor $m_2$ of SignalB (\emph{default:~0}).
-\item[\HLTTc{phase1} (real):] phase $\phi_1$ (in deg) of SignalA (\emph{default:~0}).
+\item[\texttt{phase1} (real):] phase $\phi_1$ (in deg) of SignalA (\emph{default:~0}).
-\item[\HLTTc{phase2} (real):] phase $\phi_2$ (in deg) of SignalB (\emph{default:~0}).
+\item[\texttt{phase2} (real):] phase $\phi_2$ (in deg) of SignalB (\emph{default:~0}).
-\item[\HLTTc{CC1} (real):] continuous component $c_1$ (in V) of SignalA (\emph{default:~0}).
+\item[\texttt{CC1} (real):] continuous component $c_1$ (in V) of SignalA (\emph{default:~0}).
-\item[\HLTTc{CC2} (real):] continuous component $c_2$ (in V) of SignalB (\emph{default:~0}).
+\item[\texttt{CC2} (real):] continuous component $c_2$ (in V) of SignalB (\emph{default:~0}).
-\item[\HLTTc{damping1} (real):] damping $\lambda_1$ of SignalA
+\item[\texttt{damping1} (real):] damping $\lambda_1$ of SignalA
(\emph{default:~0 -- no damping}).
-\item[\HLTTc{damping2} (real):] damping $\lambda_2$ of SignalB
+\item[\texttt{damping2} (real):] damping $\lambda_2$ of SignalB
(\emph{default:~0 -- no damping}).
-\item[\HLTTc{wave1}:] type of the SignalA chosen between \cs{SinusA}, \cs{RectangleA},
+\item[\texttt{wave1}:] type of the SignalA chosen between \cs{SinusA}, \cs{RectangleA},
\cs{TriangleA}, \cs{LDogToothA}, \cs{RDogToothA} (\emph{default: \cs{SinusA}}).
-\item[\HLTTc{wave2}:] type of the SignalB chosen between \cs{SinusB}, \cs{RectangleB},
+\item[\texttt{wave2}:] type of the SignalB chosen between \cs{SinusB}, \cs{RectangleB},
\cs{TriangleB}, \cs{LDogToothB}, \cs{RDogToothB} (\emph{default: \cs{SinusB}}).
-\item[\HLTTc{timediv} (real):] scale (in ms) of the time axis (\emph{default:~5}).
+\item[\texttt{timediv} (real):] scale (in ms) of the time axis (\emph{default:~5}).
-\item[\HLTTc{Lissajous} (boolean):] switch to XY-mode (true) or not (false)
+\item[\texttt{Lissajous} (boolean):] switch to XY-mode (true) or not (false)
(\emph{default: false}).
-\item[\HLTTc{sensivity1} (real):] scale (in V) of the channel A vertical axis
+\item[\texttt{sensivity1} (real):] scale (in V) of the channel A vertical axis
(\emph{default:~1}).
-\item[\HLTTc{sensivity2} (real):] scale (in V) of the channel B vertical axis
+\item[\texttt{sensivity2} (real):] scale (in V) of the channel B vertical axis
(\emph{default:~1}).
-\item[\HLTTc{plotstyle1}:] determines what kind of plot you will get for
+\item[\texttt{plotstyle1}:] determines what kind of plot you will get for
channel A (\emph{default: GreenContA}). Note that you can customize the plotstyle
using the \cs{newpsstyle} macro (see below for examples).
-\item[\HLTTc{plotstyle2}:] determines what kind of plot you will get for
+\item[\texttt{plotstyle2}:] determines what kind of plot you will get for
channel B (\emph{default: BlueContB}). Same remark as above.
-\item[\HLTTc{plotstyle3}:] determines what kind of plot you will get for
+\item[\texttt{plotstyle3}:] determines what kind of plot you will get for
XY-mode (\emph{default: RedContLissajous}). Same remark as above.
-\item[\HLTTc{plotstyle4}:] determines what kind of plot you will get for
+\item[\texttt{plotstyle4}:] determines what kind of plot you will get for
add, sub or mul operation (third channel) (\emph{default: MagentaContAddSub}). Same
remark as above.
-\item[\HLTTc{combine} (boolean):] if true allows to draw combination of SignalA
+\item[\texttt{combine} (boolean):] if true allows to draw combination of SignalA
and SignalB on channel C (namely addition, subtraction or multiplication)
(\emph{default: false -- no signal}). See next item.
-\item[\HLTTc{operation}:] determines what kind of operation will be applied to
+\item[\texttt{operation}:] determines what kind of operation will be applied to
SignalA and SignalB to get SignalC. The valid parameters are add, sub and mul
(\emph{default: \cs{relax} -- no operation}).
-\item[\HLTTc{Fourier} (integer):] see below (Section \ref{Rectangular})
+\item[\texttt{Fourier} (integer):] see below (Section \ref{Rectangular})
(\emph{default:~100}).
-\item[\HLTTc{offset1} (real):] offset $c'_1$ (in V) of SignalA (\emph{default:~0}).
+\item[\texttt{offset1} (real):] offset $c'_1$ (in V) of SignalA (\emph{default:~0}).
-\item[\HLTTc{offset2} (real):] offset $c'_2$ (in V) of SignalB (\emph{default:~0}).
+\item[\texttt{offset2} (real):] offset $c'_2$ (in V) of SignalB (\emph{default:~0}).
-\item[\HLTTc{offset3} (real):] offset $c'_2$ (in V) of SignalC (\emph{default:~0}).
+\item[\texttt{offset3} (real):] offset $c'_2$ (in V) of SignalC (\emph{default:~0}).
\end{description}
@@ -246,13 +174,13 @@
\subsection{Rectangular, triangular and dog's tooth signals\label{Rectangular}}
-The parameter \HLTTc{Fourier} controls the precision of the Fourier transform used to
+The parameter \texttt{Fourier} controls the precision of the Fourier transform used to
draw rectangular, triangular and dog's tooth signals. The number of terms is fixed to
100 by default in order to minimize the computation time. But you can give
-\HLTTc{Fourier} any value you want.
+\texttt{Fourier} any value you want.
\par
-Note that those signals can also be damped using the \HLTTc{damping1} and
-\HLTTc{damping2} parameters. By default, there is no damping ($\lambda=1$).
+Note that those signals can also be damped using the \texttt{damping1} and
+\texttt{damping2} parameters. By default, there is no damping ($\lambda=1$).
\subsection{\OsciPackage{} and \LaTeX}
@@ -259,12 +187,12 @@
\OsciPackage{} defines colors that may interact with the \textbf{`color'} package.
You should then use the \textbf{`pst-col'} package and load \OsciPackage{} this way:
\begin{Verbatim}
- \usepackage{pstcol,pst-osci}
+\usepackage{pstricks,pst-osci}
\end{Verbatim}
\subsection{Reducing the size of the Oscilloscope}
-The oscilloscope is put inside a 10\,cm square \HLTTc{pspicture} environment. There
+The oscilloscope is put inside a 10\,cm square \texttt{pspicture} environment. There
are two ways to reduce the size of the box, depending on the fonts you use.
\subsubsection{Using PostScript fonts}
@@ -280,7 +208,7 @@
If you use non-PS fonts and if you want to reduce the size of the Oscilloscope, you
should type something like:
\begin{Verbatim}
- {\psset{unit=0.5}\footnotesize\Oscillo}
+{\psset{unit=0.5}\footnotesize\Oscillo}
\end{Verbatim}
\section{Examples}
@@ -287,10 +215,13 @@
\subsection{Basic examples}
-\begin{CenterExample}[label={The \cs{Oscillo} macro, default parameters}]
- \psscalebox{0.5}{\Oscillo}
-\end{CenterExample}
+\subsubsection{The \cs{Oscillo} macro, default parameters}
+\begin{LTXexample}[pos=r,width=0.5\linewidth]
+\psscalebox{0.5}{\Oscillo}
+\end{LTXexample}
+
+
\textbf{In order to minimize the size of the file, all the oscilloscopes are drawn
scaled $\frac{1}{2}$. This reduced scale is not represented.}
@@ -299,255 +230,640 @@
\def\pst at Oscillo[#1]{\psscalebox{0.5}{\Oldpst at Oscillo[#1]}}
\makeatother
-\par
-If you only want to see SignalA then set \HLTTc{offset2} in order to have
-$\HLTTc{offset2}\in ]-\infty,-4\times \HLTTc{sensivity2}[ \cup
-]4\times\HLTTc{sensivity2},+\infty[$:
-\begin{SideBySideExample}[label=SignalB invisible, xrightmargin=5.5cm]
- \Oscillo[offset2=/HLCBWz(5)]
-\end{SideBySideExample}
+If you only want to see SignalA then set \texttt{offset2} in order to have
+$\texttt{offset2}\in ]-\infty,-4\times \texttt{sensivity2}[
+\cup]4\times\texttt{sensivity2},+\infty[$:
+\lstset{explpreset={pos=b,width=\linewidth,rframe=}}
+
+\subsubsection{SignalB invisible}
+\begin{LTXexample}[pos=r,width=0.5\linewidth]
+\psscalebox{0.5}{\Oscillo[offset2=5]}
+\end{LTXexample}
+
+
+\subsubsection{The importance of sensivity}
Let's have a look at Channel A:
-\begin{CenterExample}[label=The importance of sensivity]
- % Extrema invisible
- \psscalebox{0.5}{\Oscillo[offset2=5,/HLCBWz(amplitude1)=5]}
- % Good sensivity choice
- \hfill
- \psscalebox{0.5}{\Oscillo[offset2=5,amplitude1=5,/HLCBWz(sensivity1)=2]}
-\end{CenterExample}
+\begin{LTXexample}[]
+% Extrema invisible
+\psscalebox{0.5}{\Oscillo[offset2=5,amplitude1=5]}
+\quad
+% Good sensivity choice
+\psscalebox{0.5}{\Oscillo[offset2=5,amplitude1=5,sensivity1=2]}
+\end{LTXexample}
Now, let's have two signals on Channel A and B. By default, the two signals have the
same period and the same phase:
-\begin{CenterExample}
- % Different amplitude
- \psscalebox{0.5}{\Oscillo[amplitude1=3,/HLCBWz(amplitude2)=1.5]}
- % Different period
- \xA3\hfill
- \psscalebox{0.5}{\Oscillo[amplitude1=3,amplitude2=1.5,/HLCBWz(period2)=50]}
- % Different phase
- \xA3\hfill
- \psscalebox{0.5}{\Oscillo[amplitude1=3,amplitude2=1.5,/HLCBWz(phase1)=60,/HLCBWz(phase2)=-30]}
-\end{CenterExample}
+\begin{LTXexample}
+% Different amplitude
+\psscalebox{0.5}{\Oscillo[amplitude1=3,amplitude2=1.5]}
+\quad
+% Different period
+\psscalebox{0.5}{\Oscillo[amplitude1=3,amplitude2=1.5,period2=50]}
+\quad
+% Different phase
+\psscalebox{0.5}{\Oscillo[amplitude1=3,amplitude2=1.5,phase1=60,phase2=-30]}
+\end{LTXexample}
-\begin{SideBySideExample}[label=Damping and amplification,xrightmargin=5.5cm]
- \psscalebox{0.5}{\Oscillo[amplitude1=3,amplitude2=1.5,
- /HLCBWz(damping2)=0.005,/HLCBWz(damping1)=-0.005]}
-\end{SideBySideExample}
+\subsubsection{Damping and amplification}
+\begin{LTXexample}[width=0.5\linewidth,pos=r]
+\psscalebox{0.5}{\Oscillo[amplitude1=3,amplitude2=1.5,
+ damping2=0.005,damping1=-0.005]}
+\end{LTXexample}
-\begin{SideBySideExample}[label=Changing the time scale,xrightmargin=5.5cm]
- \psscalebox{0.5}{\Oscillo[amplitude2=1.5,/HLCBWz(timediv)=10]}
-\end{SideBySideExample}
+\subsubsection{Changing the time scale}
+\begin{LTXexample}[width=0.5\linewidth,pos=r]
+\psscalebox{0.5}{\Oscillo[amplitude2=1.5,timediv=10]}
+\end{LTXexample}
-\begin{SideBySideExample}[label=Vertical translations,xrightmargin=5.5cm]
- \psscalebox{0.5}{\Oscillo[amplitude1=1.5,amplitude2=1.5,
- /HLCBWz(offset1)=1.5,/HLCBWz(offset2)=-1.5]}
-\end{SideBySideExample}
+\newpage
-\begin{CenterExample}[label=Changing the plot style]
- /HLCBWz(\newpsstyle){BlueDots}{plotstyle=dots,
- linecolor=blue,linewidth=0.02,plotpoints=50}
- \psscalebox{0.5}{\Oscillo[amplitude1=3,/HLCBWz(plotstyle2)=BlueDots,amplitude2=2]}
- /HLCBWz(\newpsstyle){GreenDash}{linestyle=dashed,
- linecolor=green,linewidth=0.035,plotpoints=50}
- \xA3\hfill
- \psscalebox{0.5}{\Oscillo[amplitude1=2,phase1=90,amplitude2=3.8,period1=25,
- period2=50,phase2=10,/HLCBWz(plotstyle1)=GreenDash]}
-\end{CenterExample}
+\subsubsection{Vertical translations}
+\begin{LTXexample}[width=0.5\linewidth,pos=r]
+\psscalebox{0.5}{\Oscillo[
+ amplitude1=1.5,amplitude2=1.5,
+ offset1=1.5,offset2=-1.5]}
+\end{LTXexample}
+
+\subsubsection{Changing the plot style}
+\begin{LTXexample}
+\newpsstyle{BlueDots}{plotstyle=dots,linecolor=blue,linewidth=0.02,plotpoints=50}
+\psscalebox{0.5}{\Oscillo[amplitude1=3,plotstyle2=BlueDots,amplitude2=2]}
+\newpsstyle{GreenDash}{linestyle=dashed,linecolor=green,linewidth=0.035,plotpoints=50}
+\quad
+\psscalebox{0.5}{\Oscillo[amplitude1=2,phase1=90,amplitude2=3.8,period1=25,
+ period2=50,phase2=10,plotstyle1=GreenDash]}
+\end{LTXexample}
+
\subsection{Channel C: operations}
-Note that \HLTTc{offset1} and \HLTTc{offset2} are \textbf{not} taken into account in
-the operations when the \HLTTc{combine} parameter is set to true.
+Note that \texttt{offset1} and \texttt{offset2} are \textbf{not} taken into account in
+the operations when the \texttt{combine} parameter is set to true.
-\begin{CenterExample}[label=Additions]
- \psscalebox{0.5}{\Oscillo[amplitude2=1.5,period2=50,period1=10,
- /HLCBWz(combine)=/HLCBWz(true),/HLCBWz(operation)=/HLCBWz(add)]}
- \xA3\hfill
- \psscalebox{0.5}{\Oscillo[amplitude2=1.5,period2=50,period1=10,
- /HLCBWz(combine)=/HLCBWz(true),/HLCBWz(operation)=/HLCBWz(add),offset1=2,offset2=2]}
- \xA3\hfill
- % SignalA and SignalB are invisible
- \psscalebox{0.5}{\Oscillo[amplitude2=1.5,period2=50,period1=10,
- /HLCBWz(combine)=/HLCBWz(true),/HLCBWz(operation)=/HLCBWz(add),offset1=6,offset2=6]}
-\end{CenterExample}
-\begin{SideBySideExample}[label=Subtraction,xrightmargin=5.5cm]
- \psscalebox{0.5}{\Oscillo[amplitude2=1.5,period2=50,period1=10,
- /HLCBWz(combine)=/HLCBWz(true),
- /HLCBWz(operation)=/HLCBWz(sub)]}
-\end{SideBySideExample}
+\newpage
+\subsubsection{Additions}
+\begin{LTXexample}
+\psscalebox{0.5}{\Oscillo[amplitude2=1.5,period2=50,period1=10,combine=true,operation=add]}
+\quad
+\psscalebox{0.5}{\Oscillo[amplitude2=1.5,period2=50,period1=10,
+ combine=true,operation=add,offset1=2,offset2=2]}
+\quad
+% SignalA and SignalB are invisible
+\psscalebox{0.5}{\Oscillo[amplitude2=1.5,period2=50,period1=10,
+ combine=true,operation=add,offset1=6,offset2=6]}
+\end{LTXexample}
-\begin{CenterExample}[label=Multiplications]
- \psscalebox{0.5}{\Oscillo[amplitude2=1.5,period2=50,period1=10,
- /HLCBWz(combine)=/HLCBWz(true),/HLCBWz(operation)=/HLCBWz(mul)]}
- \xA3\hfill
- \psscalebox{0.5}{\Oscillo[amplitude1=1,amplitude2=2,
- period2=50,period1=2,/HLCBWz(combine)=/HLCBWz(true),/HLCBWz(operation)=/HLCBWz(mul)]}
-\end{CenterExample}
+\subsubsection{Subtraction}
+\begin{LTXexample}[width=0.5\linewidth,pos=r]
+\psscalebox{0.5}{\Oscillo[
+ amplitude2=1.5,period2=50,period1=10,
+ combine=true,operation=sub]}
+\end{LTXexample}
+\subsubsection{Multiplications}
+\begin{LTXexample}
+\psscalebox{0.5}{\Oscillo[amplitude2=1.5,period2=50,period1=10,combine=true,operation=mul]}
+\quad
+\psscalebox{0.5}{\Oscillo[amplitude1=1,amplitude2=2,period2=50,period1=2,combine=true,operation=mul]}
+\end{LTXexample}
+
\subsection{Channel C: XY-mode}
-\begin{SideBySideExample}[label={Basic \textsc{Lissajous} curve},xrightmargin=5.5cm]
- \psscalebox{0.5}{\Oscillo[/HLCBWz(Lissajous)=/HLCBWz(true),amplitude2=2]}
-\end{SideBySideExample}
+\subsubsection{Basic \textsc{Lissajous} curve}
+\begin{LTXexample}[width=0.5\linewidth,pos=r]
+\psscalebox{0.5}{\Oscillo[Lissajous=true,amplitude2=2]}
+\end{LTXexample}
-\begin{CenterExample}
- \psscalebox{0.5}{\Oscillo[Lissajous=true,amplitude2=3,phase2=45]}
- \hfill
- \psscalebox{0.5}{\Oscillo[Lissajous=true,amplitude2=2,phase2=90]}
-\end{CenterExample}
+\begin{LTXexample}
+\psscalebox{0.5}{\Oscillo[Lissajous=true,amplitude2=3,phase2=45]}
+\quad
+\psscalebox{0.5}{\Oscillo[Lissajous=true,amplitude2=2,phase2=90]}
+\end{LTXexample}
-\begin{CenterExample}
- \psscalebox{0.5}{\Oscillo[amplitude1=3.5,phase1=90,amplitude2=3.5,
+\begin{LTXexample}
+\psscalebox{0.5}{\Oscillo[amplitude1=3.5,phase1=90,amplitude2=3.5,
period1=20,period2=10,phase2=0,Lissajous=true]}
- \hfill
- \psscalebox{0.5}{\Oscillo[amplitude1=3.5,phase1=90,amplitude2=3.5,
+\quad
+\psscalebox{0.5}{\Oscillo[amplitude1=3.5,phase1=90,amplitude2=3.5,
period1=25,period2=5,phase2=60,Lissajous=true]}
-\end{CenterExample}
+\end{LTXexample}
-\begin{SideBySideExample}[label={A damped \textsc{Lissajous} diagram},xrightmargin=5.5cm]
- \psscalebox{0.5}{\Oscillo[amplitude1=3.5,phase1=90,
+
+\newpage
+
+\subsubsection{{A damped \textsc{Lissajous} diagram}}
+\begin{LTXexample}[width=0.5\linewidth,pos=r]
+\psscalebox{0.5}{\Oscillo[amplitude1=3.5,phase1=90,
amplitude2=3.5,period1=50,period2=50,
Lissajous=true,damping1=0.01,damping2=0.01]}
-\end{SideBySideExample}
+\end{LTXexample}
-\subsection{Non sinusoidal signals}
-\begin{CenterExample}[label=Exponential signals]
- \psscalebox{0.5}{\Oscillo[amplitude1=3.5,phase1=90,
- period1=/HLCBWz(2E30),offset2=5,damping1=0.02]}
- \hfill
- \psscalebox{0.5}{\Oscillo[amplitude1=3.5,phase1=90,
- period1=/HLCBWz(2E30),offset2=3,amplitude2=-3,damping1=0.02,
- period2=/HLCBWz(2E31),damping2=0.02,phase2=90]}
-\end{CenterExample}
-\textbf{Note:} the maximum value for \HLTTc{period1} and \HLTTc{period2} is $\pm$2E31.
+\subsection{Non-sinusoidal signals}
+\subsubsection{Exponential signals}
+\begin{LTXexample}
+\psscalebox{0.5}{\Oscillo[amplitude1=3.5,phase1=90,period1=2E30,offset2=5,damping1=0.02]}
+\quad
+\psscalebox{0.5}{\Oscillo[amplitude1=3.5,phase1=90,period1=2E30,offset2=3,
+ amplitude2=-3,damping1=0.02,period2=2E31,damping2=0.02,phase2=90]}
+\end{LTXexample}
-\begin{CenterExample}[label={Non-sinusoidal signals}]
- \psscalebox{0.5}{\Oscillo[/HLCBWz(Wave1)=/HLCBWz(\TriangleA),amplitude2=2,period2=20,period1=25]}
- \hfill
- \psscalebox{0.5}{\Oscillo[/HLCBWz(Wave1)=/HLCBWz(\RectangleA),amplitude2=2,period2=20,period1=25]}
-\end{CenterExample}
+\textbf{Note:} the maximum value for \texttt{period1} and \texttt{period2} is $\pm2E31$.
-\begin{CenterExample}[label=Combine examples]
- \psscalebox{0.5}{\Oscillo[Wave2=\TriangleB,combine=true,operation=mul,amplitude2=2,
+\subsubsection{Non-sinusoidal signals}
+\begin{LTXexample}
+\psscalebox{0.5}{\Oscillo[Wave1=\TriangleA,amplitude2=2,period2=20,period1=25]}
+\quad
+\psscalebox{0.5}{\Oscillo[Wave1=\RectangleA,amplitude2=2,period2=20,period1=25]}
+\end{LTXexample}
+
+\subsubsection{Combine examples}
+\begin{LTXexample}
+\psscalebox{0.5}{\Oscillo[Wave2=\TriangleB,combine=true,operation=mul,amplitude2=2,
period2=50,period1=2,amplitude1=1]}
- \hfill
- \psscalebox{0.5}{\Oscillo[combine=true,operation=add,amplitude2=1.5,
+\quad
+\psscalebox{0.5}{\Oscillo[combine=true,operation=add,amplitude2=1.5,
Wave1=\RectangleA,amplitude1=1.5,period2=15]}
- \hfill
- \psscalebox{0.5}{\Oscillo[combine=true,operation=add,amplitude2=1.5,
+\quad
+\psscalebox{0.5}{\Oscillo[combine=true,operation=add,amplitude2=1.5,
Wave1=\RectangleA,amplitude1=1.5,period2=15,Wave2=\TriangleB]}
-\end{CenterExample}
+\end{LTXexample}
-\begin{CenterExample}[label={Dog's tooth signal}]
- \psscalebox{0.5}{\Oscillo[combine=true,operation=mul,amplitude2=1.5,
- /HLCBWz(Wave1)=/HLCBWz(\RDogToothA),amplitude1=1.5,period2=15]}
- \xA3\hfill
- \psscalebox{0.5}{\Oscillo[amplitude1=3.5,phase1=90,amplitude2=3.5,
+\subsubsection{Dog's tooth signal}
+\begin{LTXexample}
+\psscalebox{0.5}{\Oscillo[combine=true,operation=mul,amplitude2=1.5,
+ Wave1=\RDogToothA,amplitude1=1.5,period2=15]}
+\quad
+\psscalebox{0.5}{\Oscillo[amplitude1=3.5,phase1=90,amplitude2=3.5,
period1=25,period2=6.25,phase2=0,Lissajous=true,Wave2=\RDogToothB]}
-\end{CenterExample}
+\end{LTXexample}
\subsection{Frequency modulation examples}
-\begin{SideBySideExample}[xrightmargin=5.5cm]
- \psscalebox{0.5}{\Oscillo[/HLCBWz(periodmodulation1)=200,/HLCBWz(freqmod1)=5,
- period1=30,
+\begin{LTXexample}[pos=r,width=0.5\linewidth]
+\psscalebox{0.5}{\Oscillo[periodmodulation1=200,
+ freqmod1=5,period1=30,
timediv=50,plotpoints=1000,amplitude2=2,period2=200]}
-\end{SideBySideExample}
+\end{LTXexample}
-\begin{SideBySideExample}[xrightmargin=5.5cm]
- \psscalebox{0.5}{\Oscillo[amplitude1=1,amplitude2=1,
+\begin{LTXexample}[pos=r,width=0.5\linewidth]
+\psscalebox{0.5}{\Oscillo[amplitude1=1,amplitude2=1,
period2=25,period1=2,combine=true,operation=mul]}
-\end{SideBySideExample}
+\end{LTXexample}
-\begin{SideBySideExample}[xrightmargin=5.5cm]
- \psscalebox{0.5}{\Oscillo[amplitude1=1,amplitude2=1,/HLCBWz(CC2)=2,
- period2=25,period1=2,combine=true,operation=mul,offset1=5]}
-\end{SideBySideExample}
+\begin{LTXexample}[pos=r,width=0.5\linewidth]
+\psscalebox{0.5}{\Oscillo[
+ amplitude1=1,amplitude2=1,CC2=2,
+ period2=25,period1=2,combine=true,
+ operation=mul,offset1=5]}
+\end{LTXexample}
-\begin{SideBySideExample}[xrightmargin=5.5cm]
- \psscalebox{0.5}{\Oscillo[amplitude1=1,amplitude2=1,CC2=1.5,
+\begin{LTXexample}[pos=r,width=0.5\linewidth]
+\psscalebox{0.5}{\Oscillo[
+ amplitude1=1,amplitude2=1,CC2=1.5,
Wave2=\TriangleB,
- period2=25,period1=2,combine=true,operation=mul,offset1=5]}
-\end{SideBySideExample}
+ period2=25,period1=2,combine=true,
+ operation=mul,offset1=5]}
+\end{LTXexample}
-\begin{SideBySideExample}[xrightmargin=5.5cm]
- \psscalebox{0.5}{\Oscillo[amplitude1=1,amplitude2=1,CC2=2,
+\begin{LTXexample}[pos=r,width=0.5\linewidth]
+\psscalebox{0.5}{\Oscillo[
+ amplitude1=1,amplitude2=1,CC2=2,
Wave2=\RDogToothB,
period2=25,period1=2,combine=true,operation=mul,offset1=5]}
-\end{SideBySideExample}
+\end{LTXexample}
-\begin{SideBySideExample}[xrightmargin=5.5cm]
- \psscalebox{0.5}{\Oscillo[amplitude1=1,amplitude2=1,CC2=-2,
+
+\begin{LTXexample}[pos=r,width=0.5\linewidth]
+\psscalebox{0.5}{\Oscillo[
+ amplitude1=1,amplitude2=1,CC2=-2,
Wave2=\LDogToothB,
- period2=20,period1=3,combine=true,operation=mul,offset1=5]}
-\end{SideBySideExample}
+ period2=20,period1=3,combine=true,
+ operation=mul,offset1=5]}
+\end{LTXexample}
-\begin{SideBySideExample}[xrightmargin=5.5cm]
- \psscalebox{0.5}{\Oscillo[amplitude1=1,amplitude2=1,CC2=2,
+\begin{LTXexample}[pos=r,width=0.5\linewidth]
+\psscalebox{0.5}{\Oscillo[
+ amplitude1=1,amplitude2=1,CC2=2,
Wave2=\RDogToothB,
period2=25,period1=2,combine=true,operation=mul,
offset1=5,offset3=-1]}
-\end{SideBySideExample}
+\end{LTXexample}
-\begin{SideBySideExample}[xrightmargin=5.5cm]
- \psscalebox{0.5}{\Oscillo[amplitude1=1,amplitude2=1,CC2=-2,
+\begin{LTXexample}[pos=r,width=0.5\linewidth]
+\psscalebox{0.5}{\Oscillo[amplitude1=1,
+ amplitude2=1,CC2=-2,
Wave2=\LDogToothB,
period2=20,period1=3,combine=true,operation=mul,
offset1=5,offset3=1]}
-\end{SideBySideExample}
+\end{LTXexample}
-\subsection{More examples}
+\section{More examples}
-\begin{SideBySideExample}[xrightmargin=5.5cm]
- \psscalebox{0.5}{\Oscillo[amplitude1=3.5,phase1=90,amplitude2=3.5,
+\begin{LTXexample}[pos=r,width=0.5\linewidth]
+\psscalebox{0.5}{\Oscillo[amplitude1=3.5,phase1=90,amplitude2=3.5,
period1=50,
period2=50,phase2=0,Lissajous=true,damping1=0.01,
Wave2=\RectangleB]}
-\end{SideBySideExample}
+\end{LTXexample}
-\begin{SideBySideExample}[xrightmargin=5.5cm]
- \psscalebox{0.5}{\Oscillo[amplitude1=2,amplitude2=1.8,
+\begin{LTXexample}[pos=r,width=0.5\linewidth]
+\psscalebox{0.5}{\Oscillo[amplitude1=2,amplitude2=1.8,
Wave1=\RectangleA,
- Fourier=500,period1=25,period2=12.5,combine=true,
+ Fourier=500,period1=25,period2=12.5,
+ combine=true,
operation=add,Wave2=\RectangleB]}
-\end{SideBySideExample}
+\end{LTXexample}
-\begin{SideBySideExample}[xrightmargin=5.5cm]
- \psscalebox{0.5}{\Oscillo[amplitude1=4,amplitude2=3,
+\begin{LTXexample}[pos=r,width=0.5\linewidth]
+\psscalebox{0.5}{\Oscillo[amplitude1=4,amplitude2=3,
period1=50,
period2=5,Lissajous=true,Wave1=\RectangleA]}
-\end{SideBySideExample}
+\end{LTXexample}
-\begin{SideBySideExample}[xrightmargin=5.5cm]
- \psscalebox{0.5}{\Oscillo[amplitude1=3,phase1=90,
+\begin{LTXexample}[pos=r,width=0.5\linewidth]
+\psscalebox{0.5}{\Oscillo[amplitude1=3,phase1=90,
amplitude2=3,damping1=0.05,
period1=25,period2=12.5,phase2=0,
Lissajous=true,Wave2=\RDogToothB]}
-\end{SideBySideExample}
+\end{LTXexample}
-\begin{SideBySideExample}[xrightmargin=5.5cm]
- \psscalebox{0.5}{\Oscillo[amplitude1=4,amplitude2=3,period1=25,
+\begin{LTXexample}[pos=r,width=0.5\linewidth]
+\psscalebox{0.5}{\Oscillo[
+ amplitude1=4,amplitude2=3,period1=25,
period2=50,Lissajous=true,damping1=0.02,
Wave2=\TriangleB]}
-\end{SideBySideExample}
+\end{LTXexample}
-\begin{SideBySideExample}[xrightmargin=5.5cm]
- \psscalebox{0.5}{\Oscillo[Wave2=\LDogToothB,combine=true,
+\begin{LTXexample}[pos=r,width=0.5\linewidth]
+\psscalebox{0.5}{\Oscillo[Wave2=\LDogToothB,
+ combine=true,
operation=mul,
amplitude2=2,period2=50,period1=2,amplitude1=1]}
-\end{SideBySideExample}
+\end{LTXexample}
-\begin{SideBySideExample}[xrightmargin=5.5cm]
- \psscalebox{0.5}{\Oscillo[amplitude1=3.5,phase1=90,%
+
+\begin{LTXexample}[pos=r,width=0.5\linewidth]
+ \psscalebox{0.5}{\Oscillo[amplitude1=3.5,phase1=90,%
amplitude2=3.5,period1=50,
- period2=50,phase2=0,Lissajous=true,damping1=0.01,
+ period2=50,phase2=0,
+ Lissajous=true,damping1=0.01,
Wave2=\RectangleB,damping2=0.01]}
-\end{SideBySideExample}
+\end{LTXexample}
+\section{Examples by Raoul Hatterer}
+
+
+\subsection{Oscillo}
+\begin{LTXexample}
+\psscalebox{0.5}{\Oscillo \quad \Oscillo[AllColor=false]}
+\end{LTXexample}
+
+\begin{LTXexample}
+\psscalebox{0.5}{\Oscillo[offset2= 5] \quad \Oscillo[offset2= 5,AllColor=false]}
+\end{LTXexample}
+
+\begin{LTXexample}
+\psscalebox{0.5}{\Oscillo[offset2=5, amplitude1=5]
+\quad
+\Oscillo[offset2=5, amplitude1=5,AllColor=false]}
+\end{LTXexample}
+
+% Good sensivity choice
+\subsection{Good sensivity choice}
+\begin{LTXexample}
+\psscalebox{0.5}{\Oscillo[offset2=5,amplitude1=5, sensivity1=2]
+\quad
+\Oscillo[offset2=5,amplitude1=5, sensivity1=2,AllColor=false]}
+\end{LTXexample}
+
+% Different amplitude
+\subsection{Different amplitude}
+\begin{LTXexample}
+\psscalebox{0.5}{\Oscillo[amplitude1=3, amplitude2=1.5]
+\quad
+\Oscillo[amplitude1=3, amplitude2=1.5,AllColor=false]}
+\end{LTXexample}
+% Different period
+
+\newpage
+
+
+\subsubsection{Different period}
+\begin{LTXexample}
+\psscalebox{0.5}{\Oscillo[amplitude1=3,amplitude2=1.5, period2=50]
+\quad
+\Oscillo[amplitude1=3,amplitude2=1.5, period2=50,AllColor=false]}
+\end{LTXexample}
+
+% Different phase
+\subsection {Different phase}
+\begin{LTXexample}
+\psscalebox{0.5}{%
+\Oscillo[amplitude1=3,amplitude2=1.5, phase1=60, phase2=-30]
+\quad
+\Oscillo[amplitude1=3,amplitude2=1.5, phase1=60, phase2=-30,AllColor=false]}
+\end{LTXexample}
+
+\subsection{Damping and amplification}
+\begin{LTXexample}
+\psscalebox{0.5}{\Oscillo[amplitude1=3,amplitude2=1.5,damping2=0.005, damping1=-0.005]
+\quad
+\Oscillo[amplitude1=3,amplitude2=1.5,damping2=0.005, damping1=-0.005,AllColor=false]}
+\end{LTXexample}
+
+
+\subsection{Changing the plot style}
+\begin{LTXexample}
+\psscalebox{0.5}{%
+\newpsstyle{BlueDots}{plotstyle=dots,linecolor=blue,linewidth=0.02,plotpoints=50}
+\Oscillo[amplitude1=3, plotstyle2=BlueDots,amplitude2=2]
+\quad
+\newpsstyle{GreenDash}{linestyle=dashed,linecolor=green,linewidth=0.035,plotpoints=50}
+\Oscillo[amplitude1=2,phase1=90,amplitude2=3.8,period1=25,period2=50,phase2=10, plotstyle1=GreenDash]}
+\end{LTXexample}
+
+
+\begin{LTXexample}
+\psscalebox{0.5}{\newpsstyle{BlueDots}{%
+ plotstyle=dots,linecolor=blue,linewidth=0.02,plotpoints=50}
+\Oscillo[amplitude1=3, plotstyle2=BlueDots,amplitude2=2,AllColor=false]
+\quad
+\newpsstyle{GreenDash}{linestyle=dashed,
+linecolor=green,linewidth=0.035,plotpoints=50}
+\quad
+\Oscillo[amplitude1=2,phase1=90,amplitude2=3.8,period1=25,
+period2=50,phase2=10, plotstyle1=GreenDash,AllColor=false]}
+\end{LTXexample}
+
+
+Note: This is no longer possible if you set \verb+AllColor=false+.
+But nothing stops you from making \verb+linecolor=black+
+(however the \texttt{on} and \texttt{off} will not print any better than before
+
+
+\newpage
+
+\subsection{Channel C: operations}
+\begin{LTXexample}
+\psscalebox{0.5}{%
+\Oscillo[amplitude2=1.5,period2=50,period1=10,combine= true, operation= add]
+\quad
+\Oscillo[amplitude2=1.5,period2=50,period1=10,combine= true, operation= add,offset1=2,offset2=2]
+\quad
+% SignalA and SignalB are invisible
+\Oscillo[amplitude2=1.5,period2=50,period1=10,combine= true, operation= add,offset1=6,offset2=6]}
+\end{LTXexample}
+
+
+\begin{LTXexample}
+\psscalebox{0.5}{\Oscillo[amplitude2=1.5,period2=50,period1=10,
+combine= true, operation= add,AllColor=false]
+\quad
+\Oscillo[amplitude2=1.5,period2=50,period1=10,
+combine= true, operation= add,offset1=2,offset2=2,AllColor=false]
+\quad
+% SignalA and SignalB are invisible
+\Oscillo[amplitude2=1.5,period2=50,period1=10,
+combine= true, operation= add,offset1=6,offset2=6,AllColor=false]}
+\end{LTXexample}
+
+\newpage
+
+\subsection{Subtraction}
+
+\begin{LTXexample}
+\psscalebox{0.5}{\Oscillo[amplitude2=1.5,period2=50,period1=10,combine= true,operation= sub]
+\quad
+\Oscillo[amplitude2=1.5,period2=50,period1=10,combine= true,operation= sub,AllColor=false]}
+\end{LTXexample}
+
+\subsection{Multiplications}
+
+\begin{LTXexample}
+\psscalebox{0.5}{\Oscillo[amplitude2=1.5,period2=50,period1=10,combine= true, operation= mul]
+\quad
+\Oscillo[amplitude1=1,amplitude2=2,period2=50,period1=2, combine= true, operation= mul]}
+\end{LTXexample}
+
+
+\begin{LTXexample}
+\psscalebox{0.5}{\Oscillo[amplitude2=1.5,period2=50,period1=10,
+combine= true, operation= mul,AllColor=false]\quad
+\Oscillo[amplitude1=1,amplitude2=2,
+period2=50,period1=2, combine= true, operation= mul,AllColor=false]}
+\end{LTXexample}
+
+
+\newpage
+
+\subsection{Channel C: XY-mode}
+\begin{LTXexample}
+\psscalebox{0.5}{\Oscillo[ Lissajous= true,amplitude2=2]
+\quad
+\Oscillo[Lissajous=true,amplitude2=3,phase2=45]
+\quad
+\Oscillo[Lissajous=true,amplitude2=2,phase2=90]}
+\end{LTXexample}
+
+
+\begin{LTXexample}
+\psscalebox{0.5}{\Oscillo[ Lissajous=true,amplitude2=2,AllColor=false]
+\Oscillo[Lissajous=true,amplitude2=3,phase2=45,AllColor=false]
+\quad
+\Oscillo[Lissajous=true,amplitude2=2,phase2=90,AllColor=false]}
+\end{LTXexample}
+
+
+\begin{LTXexample}
+\psscalebox{0.5}{\Oscillo[amplitude1=3.5,phase1=90,amplitude2=3.5,
+ period1=20,period2=10,phase2=0,Lissajous=true]
+\quad
+\Oscillo[amplitude1=3.5,phase1=90,amplitude2=3.5,period1=25,period2=5,phase2=60,Lissajous=true]
+\quad
+\Oscillo[amplitude1=3.5,phase1=90, amplitude2=3.5,period1=50,period2=50,
+ Lissajous=true,damping1=0.01,damping2=0.01]}
+\end{LTXexample}
+
+
+\begin{LTXexample}
+\psscalebox{0.5}{\Oscillo[amplitude1=3.5,phase1=90,amplitude2=3.5,
+ period1=20,period2=10,phase2=0,Lissajous=true,AllColor=false]
+\Oscillo[amplitude1=3.5,phase1=90,amplitude2=3.5,
+ period1=25,period2=5,phase2=60,Lissajous=true,AllColor=false]
+\Oscillo[amplitude1=3.5,phase1=90,amplitude2=3.5,period1=50,period2=50,
+ Lissajous=true,damping1=0.01,damping2=0.01,AllColor=false]}
+\end{LTXexample}
+
+
+\subsection{Non sinusoidal signals}
+
+%\subsubsection*{Exponential signals}
+\begin{LTXexample}
+\psscalebox{0.5}{\Oscillo[amplitude1=3.5,phase1=90,period1= 2E30,offset2=5,damping1=0.02]
+\quad
+\Oscillo[amplitude1=3.5,phase1=90,period1= 2E30,offset2=3,amplitude2=-3,damping1=0.02,
+ period2= 2E31,damping2=0.02,phase2=90]}
+\end{LTXexample}
+
+\begin{LTXexample}
+\psscalebox{0.5}{%
+\Oscillo[amplitude1=3.5,phase1=90,period1= 2E30,offset2=5,damping1=0.02,AllColor=false]
+\quad
+\Oscillo[amplitude1=3.5,phase1=90,
+ period1= 2E30,offset2=3,amplitude2=-3,damping1=0.02,
+ period2= 2E31,damping2=0.02,phase2=90,AllColor=false]}
+\end{LTXexample}
+
+
+\begin{LTXexample}
+\psscalebox{0.5}{\Oscillo[ Wave1= \TriangleA,amplitude2=2,period2=20,period1=25]\quad
+ \Oscillo[ Wave1= \RectangleA,amplitude2=2,period2=20,period1=25]}
+
+\bigskip
+\psscalebox{0.5}{\Oscillo[ Wave1= \TriangleA,amplitude2=2,period2=20,period1=25,AllColor=false]\quad
+ \Oscillo[ Wave1= \RectangleA,amplitude2=2,period2=20,period1=25,AllColor=false]}
+\end{LTXexample}
+
+
+\newpage
+\subsection{Combine examples}
+\begin{LTXexample}
+\psscalebox{0.5}{%
+ \Oscillo[Wave2=\TriangleB,combine=true,operation=mul,amplitude2=2,period2=50,period1=2,amplitude1=1]
+ \quad
+ \Oscillo[combine=true,operation=add,amplitude2=1.5,Wave1=\RectangleA,amplitude1=1.5,period2=15]
+ \quad
+ \Oscillo[combine=true,operation=add,amplitude2=1.5,Wave1=\RectangleA,amplitude1=1.5,period2=15,Wave2=\TriangleB]}
+\end{LTXexample}
+
+
+\begin{LTXexample}
+\psscalebox{0.5}{%
+\Oscillo[Wave2=\TriangleB,combine=true,operation=mul,amplitude2=2,period2=50,period1=2,amplitude1=1,AllColor=false]
+\quad
+\Oscillo[combine=true,operation=add,amplitude2=1.5,Wave1=\RectangleA,amplitude1=1.5,period2=15,AllColor=false]
+\quad
+\Oscillo[combine=true,operation=add,amplitude2=1.5,Wave1=\RectangleA,amplitude1=1.5,period2=15,Wave2=\TriangleB,AllColor=false]}
+\end{LTXexample}
+
+
+
+\newpage
+
+\subsection{Dog's tooth signal}
+
+\begin{LTXexample}
+\psscalebox{0.5}{\Oscillo[combine=true,operation=mul,amplitude2=1.5,
+ Wave1= \RDogToothA,amplitude1=1.5,period2=15]\quad
+\Oscillo[amplitude1=3.5,phase1=90,amplitude2=3.5,
+ period1=25,period2=6.25,phase2=0,Lissajous=true,Wave2=\RDogToothB]}
+\end{LTXexample}
+
+
+\begin{LTXexample}
+\psscalebox{0.5}{\Oscillo[combine=true,operation=mul,amplitude2=1.5,
+ Wave1= \RDogToothA,amplitude1=1.5,period2=15,AllColor=false]\quad
+\Oscillo[amplitude1=3.5,phase1=90,amplitude2=3.5,
+ period1=25,period2=6.25,phase2=0,Lissajous=true,Wave2=\RDogToothB,AllColor=false]}
+\end{LTXexample}
+
+\subsection{Frequency modulation examples}
+\begin{LTXexample}
+\psscalebox{0.5}{\Oscillo[ periodmodulation1=200, freqmod1=5,period1=30,
+timediv=50,plotpoints=1000,amplitude2=2,period2=200]
+\Oscillo[amplitude1=1,amplitude2=1,
+period2=25,period1=2,combine=true,operation=mul]
+\Oscillo[amplitude1=1,amplitude2=1, CC2=2,
+period2=25,period1=2,combine=true,operation=mul,offset1=5]}
+\end{LTXexample}
+
+
+\begin{LTXexample}
+\psscalebox{0.5}{\Oscillo[ periodmodulation1=200, freqmod1=5,period1=30,
+timediv=50,plotpoints=1000,amplitude2=2,period2=200,AllColor=false]
+\quad
+\Oscillo[amplitude1=1,amplitude2=1,
+period2=25,period1=2,combine=true,operation=mul,AllColor=false]
+\quad
+\Oscillo[amplitude1=1,amplitude2=1, CC2=2,
+period2=25,period1=2,combine=true,operation=mul,offset1=5,AllColor=false]}
+\end{LTXexample}
+
+\begin{LTXexample}
+\psscalebox{0.5}{\Oscillo[amplitude1=1,amplitude2=1,CC2=1.5,Wave2=\TriangleB,
+period2=25,period1=2,combine=true,operation=mul,offset1=5]
+\Oscillo[amplitude1=1,amplitude2=1,CC2=2,Wave2=\RDogToothB,
+period2=25,period1=2,combine=true,operation=mul,offset1=5]
+\Oscillo[amplitude1=1,amplitude2=1,CC2=-2,Wave2=\LDogToothB,
+period2=20,period1=3,combine=true,operation=mul,offset1=5]}
+\end{LTXexample}
+
+\begin{LTXexample}
+\psscalebox{0.5}{\Oscillo[amplitude1=1,amplitude2=1,CC2=1.5,Wave2=\TriangleB,
+ period2=25,period1=2,combine=true,operation=mul,offset1=5,AllColor=false]
+\quad
+\Oscillo[amplitude1=1,amplitude2=1,CC2=2,Wave2=\RDogToothB,
+ period2=25,period1=2,combine=true,operation=mul,offset1=5,AllColor=false]
+\quad
+\Oscillo[amplitude1=1,amplitude2=1,CC2=-2,Wave2=\LDogToothB,
+ period2=20,period1=3,combine=true,operation=mul,offset1=5,AllColor=false]}
+\end{LTXexample}
+
+
+\begin{LTXexample}
+\psscalebox{0.5}{\Oscillo[amplitude1=1,amplitude2=1,CC2=2,Wave2=\RDogToothB,
+period2=25,period1=2,combine=true,operation=mul,
+offset1=5,offset3=-1]
+\quad
+\Oscillo[amplitude1=1,amplitude2=1,CC2=-2,Wave2=\LDogToothB,
+period2=20,period1=3,combine=true,operation=mul,
+offset1=5,offset3=1]}
+\end{LTXexample}
+
+
+\begin{LTXexample}
+\psscalebox{0.5}{\Oscillo[amplitude1=1,amplitude2=1,CC2=2,Wave2=\RDogToothB,
+period2=25,period1=2,combine=true,operation=mul,
+offset1=5,offset3=-1,AllColor=false]
+\quad
+\Oscillo[amplitude1=1,amplitude2=1,CC2=-2,Wave2=\LDogToothB,
+period2=20,period1=3,combine=true,operation=mul,
+offset1=5,offset3=1,AllColor=false]}
+\end{LTXexample}
+
+\begin{LTXexample}
+\psscalebox{0.5}{\Oscillo[amplitude1=3.5,phase1=90,amplitude2=3.5,period1=50,
+period2=50,phase2=0,Lissajous=true,damping1=0.01,
+Wave2=\RectangleB]
+\quad
+\Oscillo[amplitude1=2,amplitude2=1.8,Wave1=\RectangleA,
+Fourier=500,period1=25,period2=12.5,combine=true,
+operation=add,Wave2=\RectangleB]
+\quad
+\Oscillo[amplitude1=4,amplitude2=3,period1=50,
+period2=5,Lissajous=true,Wave1=\RectangleA]}
+\end{LTXexample}
+
+
+\begin{LTXexample}
+\psscalebox{0.5}{\Oscillo[amplitude1=3.5,phase1=90,amplitude2=3.5,period1=50,
+period2=50,phase2=0,Lissajous=true,damping1=0.01,
+Wave2=\RectangleB,AllColor=false]
+\quad
+\Oscillo[amplitude1=2,amplitude2=1.8,Wave1=\RectangleA,
+Fourier=500,period1=25,period2=12.5,combine=true,
+operation=add,Wave2=\RectangleB,AllColor=false]
+\quad
+\Oscillo[amplitude1=4,amplitude2=3,period1=50,
+period2=5,Lissajous=true,Wave1=\RectangleA,AllColor=false]}
+\end{LTXexample}
+
+
\end{document}
Modified: trunk/Master/texmf-dist/tex/generic/pst-osci/pst-osci.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/pst-osci/pst-osci.tex 2023-11-09 22:19:41 UTC (rev 68780)
+++ trunk/Master/texmf-dist/tex/generic/pst-osci/pst-osci.tex 2023-11-09 22:19:57 UTC (rev 68781)
@@ -15,7 +15,7 @@
%% DESCRIPTION:
%% `pst-osci' is a PSTricks package to plot oscilloscope diagrams
%%
-%% AllColor=false (true par d\xE9faut) Raoul HATTERER<Hatterer.Raoul at wanadoo.fr>
+%% AllColor=false (true by default) Raoul HATTERER<Hatterer.Raoul at wanadoo.fr>
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
\csname PSTOscilloLoaded\endcsname
@@ -26,12 +26,12 @@
\ifx\MultidoLoaded\endinput\else\input multido.tex\fi
\ifx\PSTXKeyLoaded\endinput\else\input pst-xkey \fi % hv
-\def\fileversion{2.82}% modifi\xE9
-\def\filedate{2005/10/17}
+\def\fileversion{2.82b}
+\def\filedate{2023/11/04}
\message{`PST-osci' v\fileversion, \filedate\space (ML/CJ)}
%%Last mod. by : Raoul HATTERER 2003/11/02
-%%Last mod. by : Herbert Voss 2005/11/07
+%%Last mod. by : Herbert Voss 2023/11/04
%
\edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax
\pst at addfams{pst-osci}
@@ -43,15 +43,16 @@
\newrgbcolor{LightGray}{0.8 0.8 0.8}
\newrgbcolor{VeryLightGray}{0.9 0.9 0.9}
\newcmykcolor{PaleOrange}{0 0.2 0.4 0}
-\newcmykcolor{LightBlue}{0.1 0 0 0}
+%\newrgbcolor{LightBlue}{0.68 0.85 0.90}
+\newrgbcolor{LightBlue}{0.975 0.975 1}
\newrgbcolor{ACredA}{1 0 0}
\newrgbcolor{ACgreenA}{0 1 0}
\newrgbcolor{ACmagentaA}{1 0 1}
\newrgbcolor{ACred}{0 0 0}
-\newrgbcolor{ACgreen}{.25 .25 .25}% green or Darkgray
+\newrgbcolor{ACgreen}{0 1 0}% green or Darkgray
+%\newrgbcolor{ACgreen}{.25 .25 .25}% green or Darkgray
\newrgbcolor{ACmagenta}{0 0 0}% magenta or black
-%
-%
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\define at key[psset]{pst-osci}{period1}{\edef\psk at Oscillo@PeriodA{#1}}
\define at key[psset]{pst-osci}{period2}{\edef\psk at Oscillo@PeriodB{#1}}
@@ -228,10 +229,8 @@
\pspicture(0,-5)(10,5)
\psframe*[linecolor=LightBlue](0,-4)(10,4)
\psgrid[gridlabels=0,subgriddiv=0](0,-4)(10,4)
- \multido{\nxDiv=0+0.2}{50}{%
- \psline(\nxDiv,-.1)(\nxDiv,0.1)}
- \multido{\nyDiv=-4.0+0.2}{40}{%
- \psline(4.9,\nyDiv)(5.1,\nyDiv)}
+ \multido{\nxDiv=0+0.2}{50}{\psline(\nxDiv,-.1)(\nxDiv,0.1)}
+ \multido{\nyDiv=-4.0+0.2}{40}{\psline(4.9,\nyDiv)(5.1,\nyDiv)}
\psframe[fillcolor=VeryLightGray,fillstyle=solid,dimen=middle](0,4)(10,5)
\rput(1.5,4.8){\ssf timeDiv :} \rput(1.5,4.3){\ssf\psk at Oscillo@TimeDiv{}ms/div}
\rput(4,4.8){\ssf Channel A :} \rput(4,4.3){\ssf\psk at ChannelA{} V/div}
Modified: trunk/Master/texmf-dist/tex/latex/pst-osci/pst-osci.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/pst-osci/pst-osci.sty 2023-11-09 22:19:41 UTC (rev 68780)
+++ trunk/Master/texmf-dist/tex/latex/pst-osci/pst-osci.sty 2023-11-09 22:19:57 UTC (rev 68781)
@@ -1,6 +1,7 @@
+\ProvidesPackage{pst-osci}[2023/11/03 package wrapper for `pst-osci.tex']
+%
\RequirePackage{pstricks}
-\ProvidesPackage{pst-osci}[2005/10/10 package wrapper for `pst-osci.tex']
-%
+%\RequirePackage{xcolor}
\input{pst-osci.tex}
\ProvidesFile{pst-osci.tex}
[\filedate\space v\fileversion\space `pst-osci' (ML,CJ)]
More information about the tex-live-commits
mailing list.