diff options
author | Karl Berry <karl@freefriends.org> | 2009-12-12 01:04:00 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2009-12-12 01:04:00 +0000 |
commit | 765461ffc288b6d5d2b0c1d96c539a20b2cc93f2 (patch) | |
tree | d9c5efbe098c5e5ca68eab2479367d136ab9c186 /Master | |
parent | d69c8e6f02c8ccddda5d0e298d8ef6dd9e3810c0 (diff) |
new pstricks package pst-am (8dec09)
git-svn-id: svn://tug.org/texlive/trunk@16371 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r-- | Master/texmf-dist/doc/generic/pst-am/Changes | 6 | ||||
-rw-r--r-- | Master/texmf-dist/doc/generic/pst-am/README | 10 | ||||
-rw-r--r-- | Master/texmf-dist/doc/generic/pst-am/pst-am-doc.bib | 181 | ||||
-rw-r--r-- | Master/texmf-dist/doc/generic/pst-am/pst-am-doc.pdf | bin | 0 -> 884173 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/generic/pst-am/pst-am-doc.tex | 525 | ||||
-rw-r--r-- | Master/texmf-dist/source/generic/pst-am/Makefile | 70 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/pst-am/pst-am.sty | 260 | ||||
-rwxr-xr-x | Master/tlpkg/bin/tlpkg-ctan-check | 2 | ||||
-rwxr-xr-x | Master/tlpkg/libexec/ctan2tds | 1 | ||||
-rw-r--r-- | Master/tlpkg/tlpsrc/collection-pstricks.tlpsrc | 1 | ||||
-rw-r--r-- | Master/tlpkg/tlpsrc/pst-am.tlpsrc | 0 |
11 files changed, 1055 insertions, 1 deletions
diff --git a/Master/texmf-dist/doc/generic/pst-am/Changes b/Master/texmf-dist/doc/generic/pst-am/Changes new file mode 100644 index 00000000000..6675cd48a62 --- /dev/null +++ b/Master/texmf-dist/doc/generic/pst-am/Changes @@ -0,0 +1,6 @@ +pst-am.sty -------- +v. 1.01 2009-12-08 initial CTAN version + + +pst-am-doc.tex -------- +2009-12-08 first documentation diff --git a/Master/texmf-dist/doc/generic/pst-am/README b/Master/texmf-dist/doc/generic/pst-am/README new file mode 100644 index 00000000000..2bfea5b1bbb --- /dev/null +++ b/Master/texmf-dist/doc/generic/pst-am/README @@ -0,0 +1,10 @@ +pst-am: modulation and demodulation + +pst-am.sty - The LaTeX file +pst-am-doc.pdf - The documentation +pst-am-doc.tex - The documentation, source +pst-am-doc.bib - The documentation, bibfile + + +-- +Herbert Voss 2012-12-08 diff --git a/Master/texmf-dist/doc/generic/pst-am/pst-am-doc.bib b/Master/texmf-dist/doc/generic/pst-am/pst-am-doc.bib new file mode 100644 index 00000000000..cb8f1f164c5 --- /dev/null +++ b/Master/texmf-dist/doc/generic/pst-am/pst-am-doc.bib @@ -0,0 +1,181 @@ +%% -*-bibtex-*- +@STRING{tugboat = {TUGboat} } +@STRING{beiprogramm = {{\TeX}-Beiprogramm} } +@STRING{bretter = {Bretter, die die Welt bedeuten} } +@STRING{dtk = {{D}ie {\TeX}nische {K}om{\"o}die} } +@STRING{editorial = {Editorial} } +@STRING{fremdebuehne = {Von fremden B{\"u}hnen} } +@STRING{fundus = {Aus dem Fundus} } +@STRING{hinterbuehne = {Hinter der B{\"u}hne} } +@STRING{leserbrief = {Leserbrief(e)} } +@STRING{magazin = {Magazin} } +@STRING{rezension = {Rezensionen} } +@STRING{schonimmer = {Was Sie schon immer {\"u}ber {\TeX} wissen wollten \dots} } +@STRING{theaterkasse = {Von der Theaterkasse} } +@STRING{theatertage = {{\TeX}-Theatertage} } + +@Book{PSTricks2, + author = {Herbert Vo\ss}, + title = {{\PST} {G}rafik f\"ur \TeX{} und \LaTeX}, + edition = {fifth}, + publisher = {DANTE -- Lob.media}, + year = {2008}, + address = {Heidelberg/Hamburg} +} + +@Book{companion04, + author = {Frank Mittelbach and Michel Goosens et al}, + title = {The {\LaTeX} {C}ompanion}, + edition = {second}, + publisher = {Addison-Wesley Publishing Company}, + year = {2004}, + address = {Boston} +} + +@Book{begleiter05, + author = {Frank Mittelbach and Michel Goosens et al}, + title = {Der {\LaTeX} {B}egleiter}, + edition = {zweite}, + publisher = {Pearson Education}, + year = {2005}, + address = {M\"unchen} +} + +@Book{unbound, + author = {Alan Hoenig}, + title = {\TeX{} {U}nbound: \LaTeX{} \& \TeX{} {S}trategies, {F}onts, {G}raphics, and {M}ore}, + publisher = {Oxford University Press}, + year = {1998}, + address = {London} +} +@Article{ dtk02.2:jackson.voss:plot-funktionen, + author = {Laura E. Jackson and Herbert Vo{\ss}}, + title = {Die Plot-Funktionen von {\texttt{pst-plot}}}, + journal = dtk, + year = 2002, + volume = {2/02}, + altvolume = 2, + altnumber = 14, + month = jun, + pages = {27--34}, + annote = bretter, + keywords = {}, + abstract = { Im letzten Heft wurden die mathematischen Funktionen von + \PS~im Zusammenhang mit dem {\LaTeX}-Paket + \texttt{pst-plot} zum Zeichnen von Funktionen beschrieben + und durch Beispiele erl{\"a}utert. In diesem Teil werden + die bislang nur erw{\"a}hnten Plot-Funktionen f{\"u}r + externe Daten behandelt. } +} + +@Article{ dtk02.1:voss:mathematischen, + author = {Herbert Vo{\ss}}, + title = {Die mathematischen {F}unktionen von {P}ost{S}cript}, + journal = dtk, + year = 2002, + volume = {1/02}, + altvolume = 1, + altnumber = 14, + month = mar, + pages = {}, + annote = bretter, + keywords = {}, + abstract = { \PS, faktisch genauso alt wie {\TeX}, ist im + Verh{\"a}ltnis dazu allgemein noch weniger bekannt, wenn es + darum geht zu beurteilen, was es denn nun im eigentlichen + Sinne ist. Au{\ss}erdem wird h{\"a}ufig vergessen, dass + sich mit den \PS-Funktionen viele Dinge erledigen lassen, + bei denen sonst auf externe Programme zur{\"u}ckgegriffen + wird. Dies wird im Folgenden f{\"u}r die mathematischen + Funktionen im Zusammenhang mit dem Paket \texttt{pst-plot} + gezeigt. } +} + +@Book{tlgc2, + author = {Michel Goosens and Frank Mittelbach and Sebastian Rahtz and Denis Roegel and Herbert Vo{\ss}}, + title = {The {\LaTeX} {G}raphics {C}ompanion}, + publisher = {{Addison-Wesley Publishing Company}}, + edition = second, + year = {2007}, + address = {Reading, Mass.} +} + +@Book{voss:chaos, + author = {Herbert Vo{\ss}}, + title = {Chaos und {F}raktale selbst programmieren: von {M}andelbrotmengen {\"u}ber {F}arbmanipulationen zur perfekten Darstellung}, + publisher = {{Franzis Verlag}}, + year = {1994}, + address = {Poing} +} + +@Article{girou:01:, + author = {Denis Girou}, + title = {Pr\'esentation de {PST}ricks}, + journal = {Cahier {GUT}enberg}, + year = 1994, + volume = {16}, + month = apr, + pages = {21-70} +} + +@Article{girou:02:, + author = {{Timothy Van} Zandt and Denis Girou}, + title = {Inside {PST}ricks}, + journal = TUGboat, + year = 1994, + volume = {15}, + month = sep, + pages = {239-246} +} + +@Book{PostScript, + Author = {Kollock, Nikolai G.}, + Title = {PostScript richtig eingesetzt: vom {K}onzept zum + praktischen {E}insatz}, + Publisher = {IWT}, + Address = {Vaterstetten}, + year = 1989, +} + +@Manual{pstricks, + Title = {PSTricks - {\PS} macros for generic {\TeX}}, + Author = {{Timothy Van} Zandt}, + Organization = {}, + Address = {\url{http://www.tug.org/application/PSTricks}}, + Note = {}, + year = 1993 +} + +@Manual{pst-plot, + Title = {\texttt{pst-plot}: Plotting two dimensional functions and data}, + Author = {{Timothy Van} Zandt}, + Organization = {}, + Address = {\url{CTAN:graphics/pstricks/generic/pst-plot.tex}}, + Note = {}, + year = 1999 +} + +@Manual{multido, + Title = {\texttt{multido.tex} - a loop macro, that supports fixed-point addition}, + Author = {{Timothy Van} Zandt}, + Organization = {}, + Address = {\url{CTAN:/graphics/pstricks/generic/multido.tex}}, + Note = {}, + year = 1997 +} + +@MISC{xkeyval, + author = {Hendri Adriaens}, + title = {xkeyval package}, + howpublished = {\url{CTAN:/macros/latex/contrib/xkeyval}}, + year = 2004 +} + +@book{voss06, + Title = {Mathematiksatz in \LaTeX{}}, + Author = {Herbert Vo\ss}, + Publisher = {Lehmanns Media/DANTE}, + Edition= {first}, + Address= {Berlin/Heidelberg}, + Year= {2009}, +} diff --git a/Master/texmf-dist/doc/generic/pst-am/pst-am-doc.pdf b/Master/texmf-dist/doc/generic/pst-am/pst-am-doc.pdf Binary files differnew file mode 100644 index 00000000000..e34bbf1c14a --- /dev/null +++ b/Master/texmf-dist/doc/generic/pst-am/pst-am-doc.pdf diff --git a/Master/texmf-dist/doc/generic/pst-am/pst-am-doc.tex b/Master/texmf-dist/doc/generic/pst-am/pst-am-doc.tex new file mode 100644 index 00000000000..5e512f7652d --- /dev/null +++ b/Master/texmf-dist/doc/generic/pst-am/pst-am-doc.tex @@ -0,0 +1,525 @@ +%% $Id: pst-am-doc.tex 166 2009-12-08 14:48:53Z herbert $ +\documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings + headexclude,footexclude,oneside]{pst-doc} +\usepackage[latin9]{inputenc} +\usepackage{pst-am} +\let\pstAmFV\fileversion +% +\begin{filecontents*}{pst-am-doc.eps} +%!PS +%%BoundingBox: 18 532 572 668 +%%CreationDate: Mon Apr 30 09:25:21 2007 +%%EndComments +% (c) P. Kleiweg 1997 +% adaptation plagiat de ManuelLuque 05/06/2006 +% avec le concours du groupe Syracuse +%/Font /Utopia-Regular def +/Font /Times-Roman def +/warp { % x y 1 index => x y x +1 index % position horizontale du point courant X +periode N mul mul +cos 2 add +mul % hauteur finale Y +} bind def +/warpmove{ +2 index { +newpath +} if +warp moveto +pop false +} bind def + +/warpline { +warp +lineto +} bind def + +/warpcurve { +6 2 roll warp +6 2 roll warp +6 2 roll warp +curveto +} bind def + +/warpit { +true +{ warpmove } { warpline } { warpcurve } { closepath } pathforall +pop +} bind def + +297 600 translate + +% taille de des caractères +Font findfont 40 scalefont setfont + +/warptxt (MODULATION D'AMPLITUDE) def % texte à déformer +/warpwidth warptxt stringwidth pop def % largeur horizontale du texte +/warphalf warpwidth 2 div def % demi-largeur horizontale + +/periode {360 warpwidth div} bind def % une sinusoïde +/N 3 def % ondulation sur 3 périodes + +%% modif 1 +%% sinusoïde du haut +%% 2 sinusoïdes clippées +warphalf neg 20 moveto +warphalf neg 1 warphalf { 20 lineto } for % les 2 sinusoïdes +warphalf -1 warphalf neg { 22 lineto } for +closepath + +%% modif 2 +%% sinusoïde du bas +%% 2 sinusoïdes clippées +warphalf neg -15 moveto +warphalf neg 1 warphalf { -15 lineto } for % les 2 sinusoïdes +warphalf -1 warphalf neg { -17 lineto } for +closepath + +%% modif 3 +warphalf neg -10 moveto +warptxt true charpath + +%% c'est parti ! +warpit +gsave +0 0 1 setrgbcolor +fill +grestore +0 0 0.5 setrgbcolor +stroke +\end{filecontents*} + +\def\bgImage{\includegraphics[scale=0.66]{pst-am-doc.eps}} + +\let\SaveFV\fileversion +\def\masse{% + \psframe[fillstyle=vlines,linestyle=none,hatchwidth=0.5\pslinewidth](-0.5,-0.7)(0.5,-0.5) + \psline[linewidth=1.5\pslinewidth](-0.5,-0.5)(0.5,-0.5) + \psline(0,0)(0,-0.5)} +\def\noeud(#1){\qdisk(#1){1.5pt}} +% +\def\selfA{\psframe[linestyle=none,fillstyle=solid](-1,-.2)(1,0.4) + \multido{\nS=-0.75+0.50}{4}{% + \psset{dimen=middle} + \rput(\nS,0){\pscurve[linewidth=1.5\pslinewidth](-0.25,0)(0,0.4)(0.25,0)}}} +\def\selfB{\psframe[linestyle=none,fillstyle=solid](-0.75,-.1)(0.75,0.4) + \multido{\nS=-0.50+0.50}{3}{% + \psset{dimen=middle} + \rput(\nS,0){\pscurve[linewidth=1.5\pslinewidth](-0.25,0)(0,0.4)(0.25,0)}}} +\def\GBF{\pscircle[fillstyle=solid,linewidth=1.5\pslinewidth]{0.5}} +\def\resistor{\psframe[fillstyle=solid,linewidth=1.5\pslinewidth](-0.5,-0.2)(0.5,0.2)} +\def\condensateur{% + \psframe[linestyle=none,fillstyle=solid](-0.15,-0.5)(0.15,0.5) + \psline[linewidth=1.5\pslinewidth](-0.15,-0.5)(-0.15,0.5) + \psline[linewidth=1.5\pslinewidth](0.15,-0.5)(0.15,0.5)} +\def\masse{% + \psframe[fillstyle=vlines,linestyle=none,hatchwidth=0.5\pslinewidth](-0.5,-0.7)(0.5,-0.5) + \psline[linewidth=1.5\pslinewidth](-0.5,-0.5)(0.5,-0.5) + \psline(0,0)(0,-0.5)} +\def\diode{% + \psline(0,0.25)(0.5,0)(0,-0.25)(0,0.25) + \psline(0.5,0.25)(0.5,-0.25) + \psline(-0.5,0)(1,0)} +\def\circput(#1)(#2)#3{% +\pcline(#2)(#1)% +\lput*{:U}{#3}} +\def\noeud(#1){\qdisk(#1){1.5pt}} + +\lstset{explpreset={pos=t,width=-99pt,overhang=0pt,hsep=\columnsep,vsep=\bigskipamount,rframe={}}} +\psset{Centering=true} +\begin{document} + +\title{\texttt{pst-am}} +\subtitle{A PSTricks package for drawing Modulations and Demodulations; v.\pstAmFV} +\author{Manuel Luque \\Herbert Vo\ss} +%\docauthor{Herbert Vo\ss} +\date{\today} +\maketitle + +\tableofcontents + +\clearpage + +\psset{title={Luc\'ee Auguste Fresnel}} +\begin{abstract} +\noindent +\LPack{pst-am} allows the simulation of modulated and demodulated +amplitude of the radio waves. You can choose several possible parameters +and plot the following curves: +\begin{compactitem} +\item modulated signals; +\item wave carrier; +\item signal modulation; +\item signal recovering; +\item signal demodulation. +\end{compactitem} + +The main command is called \Lcs{psAM}\OptArgs\ and has different options, including allowing +view table of the used values, are detailed thereafter. +The macro was written directly in PostScript\footnote{Original idea by +Peter Kleiweg and inspired by discussions on \url{http://melusine.eu.org/cgi-bin/mailman/listinfo/syracuse}}. + +\begin{LTXexample}[pos=t] +\psAM[SignalModulant,timeDiv=2e-4,SignalRedresse,SignalDemodule, + voltDivY2=0.5,R=4700] +\end{LTXexample} +\end{abstract} + + +\clearpage +\section{Introduction} +\subsection{Example of a modulation} +\begin{center} +\begin{pspicture}(-5,-1)(5,7) +\psline(-5,0)(5,0)\psline(-5,5)(-1,5)\psline(-2,4)(-1,4) +\pnode(-5,5){E2}\noeud(E2) +\pnode(-2,4){E1}\noeud(E1) +\psline[arrowinset=0,arrowscale=2](1,4.5)(3,4.5) +\psframe[linewidth=1.5\pslinewidth](-1,3.5)(1,5.5) +\rput(0,4.5){\Huge\sffamily X} +\uput[270](0,5.5){\sffamily AD633} +\pnode(-5,0){M1}\pnode(-2,0){M2} +\pnode(0,0){O}\noeud(O)\noeud(M1)\noeud(M2) +\rput(O){\masse} +\uput[0](-1,5){1} +\uput[0](-1,4){3} +\uput[180](1,4.5){7} +\psset{linewidth=0.5\pslinewidth} +\psline{->}(-5,0.1)(-5,4.9) +\uput[0](-5,2.5){$u_p$} +\psline{->}(-2,0.1)(-2,3.9) +\uput[0](-2,2){$u_m$} +\psline{->}(2,0.1)(2,4.4) +\uput[0](2,2.25){$u_s$} +\uput[0](3,4.5){\psscalebox{0.2}{\psAM[SignalModule,enveloppe,frequencePorteuse=1e4, + voltDivY2=0.5,timeDiv=5e-4,linewidth=2\pslinewidth]}} +\uput[l](-2,4){\psscalebox{0.2}{\psAM[SignalModulant,timeDiv=5e-4,linewidth=5\pslinewidth]}} +\uput[l](-5,5){\psscalebox{0.2}{\psAM[SignalPorteuse,timeDiv=2e-4, + frequencePorteuse=1e4,linewidth=5\pslinewidth]}} +%\psgrid +\end{pspicture} +\end{center} +\begin{compactitem} + \item l'onde \textbf{porteuse}, onde sinusoïdale de haute fréquence(H.F.) et + d'amplitude constante. + + Elle est produite par l'oscillateur de l'émetteur : + \[ + u_p(t)=U_p\cos2\pi F_p t + \] + \item \textbf{le signal modulant}(signal B.F. à transmettre), considéré comme une onde sinusoïdale + de la forme : + \[ + u_m(t)=U_m\cos2\pi F_m t + U_0 + \] +\begin{compactitem} + \item Le premier terme $u_m(t)=U_m\cos2\pi F_m t$ représente le signal à + transmettre. + \item $U_0$ est la tension de décalage ou \textit{offset}. +\end{compactitem} + +\end{compactitem} +Un circuit électronique, appelé \textbf{multiplieur}, donne en sortie une +tension : +\[ + u_s(t)=k\times u_p(t)\times u_m(t) +\] +La tension obtenue à la sortie est de la forme : +\[ +u_s=k.U_p\cos2\pi F_p t.(U_m\cos2\pi F_m t+U_0) +\] +Cette expression est mise sous la forme : +\[ +u_s(t)=A(1+m\cos2\pi F_m t)\cos2\pi F_p t +\] +avec : +\begin{itemize} + \item $A=kU_0.U_p$ ; + \item $m=\displaystyle\frac{U_m}{U_0}$ : \textbf{taux de modulation} +\end{itemize} + +\subsection{Schéma de principe du montage de la démodulation} +\begin{center} +\begin{pspicture}(-1,-1)(16,6) +\pnode(-1,4){A1} +\pnode(-0.5,4){A2} +\pnode(0,4){A3} +\pnode(-1,2){B1} +\pnode(-0.5,2){B2} +\pnode(0,2){B3} +\pnode(-0.5,0){M1} +\pnode(2,4){C1} +\pnode(2,3){C2} +\pnode(1.4,2){C3} +\pnode(4,2){C4} +\pnode(4,3.4){C5} +\pnode(1.4,0){C6} +\pnode(3.4,3.4){S1} +\pnode(6,3.4){D1} +\pnode(7,3.4){D2} +\pnode(6,0){D3} +\pnode(7,0){D4} +\pnode(9,3.4){D5} +\pnode(11,3.4){E1} +\pnode(11,4.4){E2} +\pnode(13.6,4.4){E3} +\pnode(11,2.4){E10} +\pnode(11.6,2.4){E9} +\pnode(11,0){E11} +\pnode(13.6,3){E4} +\pnode(13.6,2.6){E7} +\pnode(13.6,0){E12} +\pnode(14.4,3){E5} +\pnode(11.6,3.4){E8} +\pnode(14.4,2.6){E6} +\pnode(14.4,3){E5} +\pnode(13,3){S2} +\psframe[linewidth=2\pslinewidth](2,2.8)(3.4,4.2) +\psframe[linewidth=2\pslinewidth](11.6,2.2)(13,3.6) +\psline(5,3)(5,3.8)(5.6,3.4)(5,3) +\psline(5.6,3)(5.6,3.8) +\psline(14.4,2.4)(14.4,3.2)(14.6,3.2)(15,3.4)(15,2.2)(14.6,2.4)(14.4,2.4) +\psline(14.6,2.4)(14.6,3.2) +\psline(-2,0)(14,0) +\circput(A1)(B1){\selfA} +\circput(A3)(B3){\condensateur} +\psline(A1)(C1) +\noeud(A1) +\noeud(B1) +\noeud(B3) +\noeud(A3) +\noeud(A2) +\noeud(M1) +\noeud(C5) +\noeud(D1) +\noeud(D3) +\noeud(D2) +\noeud(D4) +\noeud(D5) +\noeud(E1) +\noeud(E10) +\noeud(C6) +\psline(A2)(-0.5,6.4) +\psline(-0.8,6.2)(-0.5,6)(-0.2,6.4) +\noeud(E11) +\noeud(E4) +\noeud(E7) +\noeud(E12) +\psline(B1)(B3) +\psline(B2)(M1) +\psline(C3)(1.4,3)(C2) +\psline(C3)(C4)(C5) +\psline(S1)(E8) +\psline(S2)(E5) +\psline(E6)(E5) +\psline(E6)(E7)(E12) +\psline(E9)(E10)(E11) +\psline(E1)(E2)(E3)(E4)(E5) +\circput(C3)(C6){\resistor} +\circput(C3)(C4){\resistor} +\circput(D1)(D3){\resistor} +\circput(E2)(E3){\resistor} +\circput(D5)(E1){\resistor} +\circput(D2)(D4){\condensateur} +\circput(D2)(D5){\condensateur} +\psline{->}(-0.4,2.4)(0.4,3.6) +\psline[linestyle=dashed](1,-0.5)(1,6) +\psline[linestyle=dashed](4.5,-0.5)(4.5,6) +\psline[linestyle=dashed](9,-0.5)(9,6) +\psline[linestyle=dashed](14,-0.5)(14,6) +%\uput[180](-1.3,3){L} +%\uput[0](0.4,3){C} +\uput[90](5.3,3.6){D} +\uput[180](5.8,1.65){R} +\uput[0](7.4,1.65){C} +\uput[90](8,3.8){C$'$} +\rput(-0.5,-0.5){$\underbrace{\rule{3cm}{0cm}}$} +\uput[90](-0.5,-1.2){réception-filtrage} +\rput(2.75,-0.5){$\underbrace{\rule{3.5cm}{0cm}}$} +\uput[90](2.75,-1.2){préamplification} +\rput(6.75,-0.5){$\underbrace{\rule{4.5cm}{0cm}}$} +\uput[90](6.75,-1.2){démodulation} +\rput(11.5,-0.5){$\underbrace{\rule{5cm}{0cm}}$} +\uput[90](11.5,-1.2){amplification} +\pspolygon(2.2,3.6)(2.2,3.8)(2.4,3.7)\uput[0](2.4,3.7){$\infty$} +\pspolygon(11.8,3)(11.8,3.2)(12,3.1)\uput[0](12,3.1){$\infty$} +\rput(6.9,5.2){\psscalebox{0.2}{\psAM[SignalModulant,SignalRedresse, + SignalDemodule,timeDiv=2e-4,frequencePorteuse=2e4,voltDivY2=0.5,traceU]}} +\rput(9,5.2){\psscalebox{0.2}{\psAM[SignalModulant,SignalFinal, + voltDivY2=0.5,frequencePorteuse=4e4,R=4.7e3]}} +%\psgrid +\end{pspicture} +\end{center} + + +\section{Optional arguments} + +\begin{center} +\begin{tabularx}{\linewidth}{@{} lc>{\ttfamily}c X@{}}\toprule + \emph{Name} & \emph{type} & \emph{default} & \emph{description}\\\toprule + \Lkeyword{Up} &number &3.5 & carrier amplitude in V \\ + \Lkeyword{Um} &number &1 & smodulated ignal amplitude in V\\ + \Lkeyword{Fp} &number &2e4 & frequency of carrier wave in Hz\\ + \Lkeyword{Fm} &number &1e3 & frequency of modulated signal in Hz\\ + \Lkeyword{U0} &number &2 & offset in V\\ + \Lkeyword{R} &number &3.3e3 & resistor in $\Omega$\\ + \Lkeyword{C} &number &3.9e-8 & capacitor in F\\ + \Lkeyword{timeDiv} &number &2e-4 & time base in s/div\\ + \Lkeyword{voltDivY1} &number &1 & coefficient for the amplification 1 in V/div\\ + \Lkeyword{voltDivY2} &number &1 & coefficient for the amplification 2 en V/div\\\midrule + \Lkeyword{SignalModulant} &boolean &false & trace of signal modulant (curve 1)\\ + \Lkeyword{SignalModule} &boolean &false & trace of signal module (curve 2)\\ + \Lkeyword{SignalPorteuse} &boolean &false & trace of signal module (curve 2)\\ + \Lkeyword{SignalRedresse} &boolean &false & trace of signal redressé (curve 2)\\ + \Lkeyword{SignalDemodule} &boolean &false & trace of signal demodulte (curve 2)\\ + \Lkeyword{XY} &boolean &false & positionne l'écran en mode XY\\ + \Lkeyword{traceU} &boolean &false & trace la ligne de décalage $U_0$\\ + \Lkeyword{UMandUm} &boolean &false & pour permettre le calcul de $m$\\\midrule + \Lkeyword{values} &boolean &false & values as a tabular under the image\\ + \Lkeyword{BW} &boolean &false & output curves in black on white\\ + \Lkeyword{Centering} &boolean &false & image and optional values are centered\\\bottomrule + \Lkeyword{title} &text &\{\} & a title for the lower line\\\bottomrule +\end{tabularx} +\end{center} + +\newpage +\section{Possibility of drawing the curves in black on white} +Avec l'option \Lkeyword{BW}. Lorsqu'on souhaite afficher une courbe, +il suffit de rajouter son nom dans la liste des options. + +\begin{LTXexample}[pos=t] +\psAM[SignalModulant,SignalPorteuse,Up=2.8,frequencePorteuse=1e4,values,BW] +\end{LTXexample} +\newpage + + +\section{Le dessin de l'enveloppe} +Avec l'option \Lkeyword{enveloppe}. +\begin{LTXexample}[pos=t] +\psAM[SignalModule,enveloppe,frequencePorteuse=1e4,voltDivY2=0.5,timeDiv=5e-4] +\end{LTXexample} +L'option \Lkeyword{UMandUm} permettra de déterminer facilement le taux de modulation. + +\begin{LTXexample} +\psAM[SignalModule,enveloppe,UMandUm] +\end{LTXexample} + +\newpage + +\section{Le signal redressé} +Avec l'option \Lkeyword{SignalRedresse}. +\begin{LTXexample}[pos=t] +\psAM[SignalModulant,timeDiv=1e-4,SignalRedresse,voltDivY2=0.5,values] +\end{LTXexample} +\newpage + +\section{Le signal démodulé} +Avec l'option \Lkeyword{SignalDemodule} et, en exemple, deux possibilités en fonction du choix de la base de temps. +\begin{LTXexample}[pos=t] +\psAM[SignalModulant,timeDiv=0.5e-4,SignalRedresse,SignalDemodule,values] +\end{LTXexample} +% +%\psline[linecolor=blue,linestyle=dashed](U01)(U02) +%\uput[l](U01){$U_0$} +\begin{LTXexample}[pos=t] +\psAM[SignalModulant,SignalRedresse,SignalDemodule,timeDiv=2e-4, + frequencePorteuse=2e4,voltDivY2=0.5,values,traceU] +\end{LTXexample} + +\newpage +\section{L'influence de R et C sur la qualité de la démodulation} +Avec les paramètres \Lkeyword{R} et \Lkeyword{C}. +\begin{LTXexample}[pos=t] +\psAM[SignalModulant,SignalRedresse,SignalDemodule,timeDiv=2e-4, + frequencePorteuse=2e4,voltDivY2=0.5,R=1e4,values] +\psline[linecolor=blue,linestyle=dashed](U01)(U02) +\uput[l](U01){$U_0$} +\end{LTXexample} + +\begin{LTXexample}[pos=t] +\psAM[SignalModulant,SignalRedresse,SignalDemodule,timeDiv=2e-4, + frequencePorteuse=2e4,voltDivY2=0.5,R=470,values] +\end{LTXexample} + +\newpage +\section{Suppression de la composante continue} +Avec l'option \Lkeyword{SignalFinal}. +\begin{LTXexample}[pos=t] +\psAM[SignalModulant,SignalFinal,timeDiv=2e-4,voltDivY2=0.5,frequencePorteuse=4e4,R=4.7e3,values] +\end{LTXexample} + +\clearpage +\section{Le phénomène de surmodulation} +\begin{LTXexample}[pos=t] +\psAM[SignalModulant,SignalModule,timeDiv=2e-4,U0=0.5,frequencePorteuse=4e4, + Up=4,Um=2,voltDivY2=0.5,values] +\end{LTXexample} + +\begin{LTXexample}[pos=t] +\psAM[SignalModulant,SignalRedresse,SignalDemodule,timeDiv=1e-4,U0=0.5, + frequencePorteuse=4e4,voltDivY2=0.2,voltDivY1=0.5] +\end{LTXexample} + +\clearpage +\section{XY mode} +\begin{LTXexample}[pos=t] +\psAM[XY,U0=0.5,frequencePorteuse=4e4,Up=4,Um=2,voltDivY2=0.5] +\end{LTXexample} + +\begin{LTXexample}[pos=t] +\psAM[XY,frequencePorteuse=4e4,voltDivY2=0.5,voltDivY1=1] +\end{LTXexample} + +\clearpage +\section{Deux autres exemples} +\begin{LTXexample}[pos=t] +\psAM[SignalModulant,SignalRedresse,SignalDemodule,voltDivY2=1,voltDivY1=5, + timeDiv=2e-4,U0=2,R=4700,frequencePorteuse=1e4,Up=2,Um=10,values,traceU,values] +\end{LTXexample} + +\begin{LTXexample}[pos=t] +\psAM[SignalModulant,SignalRedresse,SignalDemodule,timeDiv=1e-4,U0=1.5, + frequencePorteuse=4e4,Up=3,voltDivY2=0.2,traceU,values] +\end{LTXexample} + +\newpage +\section{Les styles} +À chaque courbe est associée un style, ce qui permet de les différencier. +Le style du tracé d'une courbe pourra donc être modifié, simplement, en redéfinissant +le \Lcs{newpstyle} associé à la courbe avant son tracé. + +De même, il sera possible de modifier l'allure de l'écran en redéfinissant les styles associés : +\begin{LTXexample}[pos=t] +\newpsstyle{signalModulant}{plotpoints=1000,linecolor=green,linewidth=2\pslinewidth} +\newpsstyle{signalPorteuse}{plotpoints=2000,linecolor=blue} +\newpsstyle{signalRedresse}{plotpoints=2000,linecolor=Bleu} +\newpsstyle{signalDemodule}{plotpoints=4000,linecolor=red} +\newpsstyle{signalModule}{plotpoints=4000,linecolor=blue} +\newpsstyle{XY}{plotpoints=4000,linecolor=blue} +\newpsstyle{cadre}{framearc=0.05,linecolor=black} +\newpsstyle{screen}{fillstyle=solid,fillcolor=yellow!70!white!30} +\end{LTXexample} + + +\clearpage +\section{List of all optional arguments for \texttt{pst-am}} + +\xkvview{family=pst-am,columns={key,type,default}} + + + + + +\nocite{*} +\bgroup +\RaggedRight +\bibliographystyle{plain} +\bibliography{pst-am-doc} +\egroup + +\printindex + + + + +\end{document} diff --git a/Master/texmf-dist/source/generic/pst-am/Makefile b/Master/texmf-dist/source/generic/pst-am/Makefile new file mode 100644 index 00000000000..724775ce125 --- /dev/null +++ b/Master/texmf-dist/source/generic/pst-am/Makefile @@ -0,0 +1,70 @@ + +# `Makefile' for `pst-am.pdf', hv, 2009/12/08 + +.SUFFIXES : .tex .ltx .dvi .ps .pdf .eps + +PACKAGE = pst-am + +MAIN = $(PACKAGE)-doc + +LATEX = latex + +ARCHNAME = $(MAIN)-$(shell date +%y%m%d) + +ARCHFILES = $(PACKAGE).sty $(PACKAGE).tex $(PACKAGE).pro $(MAIN).tex README Changes Makefile + +TDS = ~/PSTricks/PSTricks-TDS + +all : doc clean +doc: $(MAIN).pdf + +$(MAIN).pdf : $(MAIN).ps + GS_OPTIONS=-dAutoRotatePages=/None ps2pdf $< + +$(MAIN).ps : $(MAIN).dvi + dvips $< + +$(MAIN).dvi : $(MAIN).tex + $(LATEX) $< + $(LATEX) $< + if ! test -f $(basename $<).glo ; then touch $(basename $<).glo; fi + if ! test -f $(basename $<).idx ; then touch $(basename $<).idx; fi + makeindex -s gglo.ist -t $(basename $<).glg -o $(basename $<).gls \ + $(basename $<).glo + makeindex -t $(basename $<).ilg -o $(basename $<).ind \ + $(basename $<).idx + bibtex $(basename $<) + $(LATEX) $< + $(LATEX) $< + +clean : + $(RM) $(addprefix $(MAIN), .log .aux .glg .glo .gls .ilg .idx .ind .tmp .toc .out .blg .bbl) + $(RM) $(addprefix $(MAIN), .dvi .ps .eps) + +veryclean : clean + $(RM) $(addprefix $(MAIN), .pdf .bbl .blg) + +arch : + zip $(ARCHNAME).zip $(ARCHFILES) + +tds: + cp -u Changes $(TDS)/doc/latex/$(PACKAGE)/ + cp -u README $(TDS)/doc/latex/$(PACKAGE)/ + cp -u $(MAIN).pdf $(TDS)/doc/latex/$(PACKAGE)/ +# + cp -u Changes $(TDS)/tex/latex/$(PACKAGE)/ + cp -u $(PACKAGE).sty $(TDS)/tex/latex/$(PACKAGE)/ +# +# cp -u Changes $(TDS)/tex/generic/$(PACKAGE)/ +# cp -u $(PACKAGE).tex $(TDS)/tex/generic/$(PACKAGE)/ +# +# cp -u Changes $(TDS)/dvips/$(PACKAGE)/ +# cp -u $(PACKAGE).pro $(TDS)/dvips/$(PACKAGE)/ +# + cp -u Changes $(TDS)/source/$(PACKAGE)/ + cp -u $(MAIN).tex $(TDS)/source/$(PACKAGE)/ + cp -u $(MAIN).bib $(TDS)/source/$(PACKAGE)/ + cp -u Makefile $(TDS)/source/$(PACKAGE)/ + + +# EOF diff --git a/Master/texmf-dist/tex/latex/pst-am/pst-am.sty b/Master/texmf-dist/tex/latex/pst-am/pst-am.sty new file mode 100644 index 00000000000..543aede6836 --- /dev/null +++ b/Master/texmf-dist/tex/latex/pst-am/pst-am.sty @@ -0,0 +1,260 @@ +%% $Id: pst-am.sty 166 2009-12-08 14:48:53Z herbert $ +%% +%% This is file `pst-am.sty', +%% +%% 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. +%% +%% Manuel Luque <Mluque5130 _at_ aol.com> (France) +%% Herbert Voss <hvoss _at_ tug.org (Germany) +%% +%% 2009/12/08 +%% +%% DESCRIPTION: +%% `pst-am' is a package intended for the representation +%% of the amplitude modulation of the radio waves +% +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{pst-am} + [2009/12/00 v1.01 Modulation of radio waves (ml,hv)] +\RequirePackage{pstricks} +\RequirePackage{pst-plot} +\RequirePackage{pst-node} +\RequirePackage{pst-xkey} +\RequirePackage{numprint} +\RequirePackage{multido} + +\pst@addfams{pst-am} +\SpecialCoor +\definecolor{Bleu}{cmyk}{1,1,0,0.3} +\newpsstyle{cadre}{framearc=0.05,linecolor=black} +\newpsstyle{screen}{fillstyle=solid,fillcolor=yellow!70!white!30} +\newpsstyle{signalModulant}{plotpoints=1000,linecolor=green,linewidth=2\pslinewidth} +\newpsstyle{signalPorteuse}{plotpoints=2000,linecolor=blue} +\newpsstyle{signalRedresse}{plotpoints=2000,linecolor=Bleu} +\newpsstyle{signalDemodule}{plotpoints=4000,linecolor=red} +\newpsstyle{signalModule}{plotpoints=4000,linecolor=blue} +\newpsstyle{XY}{plotpoints=4000,linecolor=blue} +% +\define@key[psset]{pst-am}{title}{\def\psk@title{#1}} +\define@key[psset]{pst-am}{frequencePorteuse}[2e4]{\def\psk@frequencePorteuse{#1}} +\define@key[psset]{pst-am}{frequenceAudio}[1e3]{\def\psk@frequenceAudio{#1}} +\psset[pst-am]{title={},%{Luc\'e Auguste Fresnel}, + frequencePorteuse=2e4,frequenceAudio=1e3} % les fréquences +% +\define@key[psset]{pst-am}{R}[3300]{\def\psk@resistor{#1}} +\define@key[psset]{pst-am}{C}[3.9e-8]{\def\psk@capacitor{#1}} +\psset[pst-am]{R=3300,C=3.9e-8} +% +\define@key[psset]{pst-am}{U0}[2]{\def\psk@offset{#1}} +\psset[pst-am]{U0=2} +% +\define@key[psset]{pst-am}{Up}[3.5]{\def\psk@Up{#1}} +\define@key[psset]{pst-am}{Um}[1]{\def\psk@Um{#1}} +\psset[pst-am]{Up=3.5,Um=1} +% +\define@key[psset]{pst-am}{k}[0.1]{\def\psk@k{#1}} +\psset[pst-am]{k=0.1} % coefficient multiplicateur +% +\define@key[psset]{pst-am}{timeDiv}[2e-4]{\def\psk@timeDiv{#1}} +\define@key[psset]{pst-am}{voltDivY1}[1]{\def\psk@voltDivA{#1}} % coeff d'amplitude vertical curve Y1 +\define@key[psset]{pst-am}{voltDivY2}[1]{\def\psk@voltDivB{#1}} % coeff d'amplitude vertical curve Y2 +\psset[pst-am]{timeDiv=2e-4,voltDivY1=1,voltDivY2=1} +% +\define@boolkey[psset]{pst-am}[Pst@]{Centering}[true]{} +\define@boolkey[psset]{pst-am}[Pst@]{SignalModule}[true]{} +\define@boolkey[psset]{pst-am}[Pst@]{SignalPorteuse}[true]{} +\define@boolkey[psset]{pst-am}[Pst@]{SignalRedresse}[true]{} +\define@boolkey[psset]{pst-am}[Pst@]{SignalDemodule}[true]{} +\define@boolkey[psset]{pst-am}[Pst@]{SignalModulant}[true]{} +\define@boolkey[psset]{pst-am}[Pst@]{SignalModule}[true]{} +\define@boolkey[psset]{pst-am}[Pst@]{SignalFinal}[true]{} +\define@boolkey[psset]{pst-am}[Pst@]{enveloppe}[true]{} +\define@boolkey[psset]{pst-am}[Pst@]{XY}[true]{} +\define@boolkey[psset]{pst-am}[Pst@]{traceU}[true]{} +\define@boolkey[psset]{pst-am}[Pst@]{UMandUm}[true]{} +\define@boolkey[psset]{pst-am}[Pst@]{values}[true]{} +\define@boolkey[psset]{pst-am}[Pst@]{BW}[true]{} +\psset[pst-am]{Centering=false} +% +\def\psAM{\pst@object{psAM}} +\def\psAM@i{{% + \pst@killglue + \use@par + \pnode(!% + 1 setlinejoin + /PI 3.14159 def + /Tp {1 \psk@frequencePorteuse\space div} bind def % période du signal modulés + /Ap \psk@Up\space def % amplitude porteuse + /Fm \psk@frequenceAudio\space def % frequence signa modulant + /Tm {1 Fm div} bind def % periode du signal modulant + /Am \psk@Um\space def % amplitude signal modulant + /U0 \psk@offset\space def % decalage + /k \psk@k\space def + /R \psk@resistor\space def + /C \psk@capacitor\space def + /m {Am U0 div} bind def + /Umin {k Ap mul U0 mul 1 m sub mul} bind def + /Umax {k Ap mul U0 mul 1 m add mul} bind def + /composanteContinue {Umax Umin add 2 div} bind def + /Tau {R C mul} bind def + /TimeDiv \psk@timeDiv\space def % base de temps + /VoltDivY1 \psk@voltDivA\space def % amplitude verticale curve Y1 + /VoltDivY2 \psk@voltDivB\space def % amplitude verticale curve Y2 + /DecalageTemps 0 def + 0 0){MEM}% +\ifPst@BW + \newpsstyle{signalModulant}{plotpoints=1000,linewidth=2\pslinewidth} + \newpsstyle{signalPorteuse}{plotpoints=2000} + \newpsstyle{signalRedresse}{plotpoints=2000} + \newpsstyle{signalDemodule}{plotpoints=4000} + \newpsstyle{signalModule}{plotpoints=4000} + \newpsstyle{XY}{plotpoints=4000} +\fi +\ifPst@Centering\centering\fi +\pspicture(0,-5)(10,5) +\psframe[style=cadre](-0.1,-4.5)(10.1,4.5) +\psframe[style=screen](0,-4)(10,4) +\rput(5,4.25){\textsf{\large Modulation-Demodulation}} +\rput(5,-4.25){\psk@title} +\rput*(2.5,-3.5){\textsf{\large timeDiv:\numprint{\psk@timeDiv} s/div}} +\uput*[0](6,-3.7){\textsf{\large curve 2:\psk@voltDivB V/div}} +\uput*[0](6,-3.3){\textsf{\large curve 1:\psk@voltDivA V/div}} +\psclip{\psframe[linestyle=none](0,-4)(10,4)} +\ifPst@XY +\parametricplot[style=XY]{0}{10}{% duree + /temps t TimeDiv mul def % t est en s + /SignalModulant temps Fm mul 360 mul cos Am mul U0 add def + /FonctionPorteuse Ap 360 Tp div temps mul cos mul def + /SignalModule FonctionPorteuse SignalModulant mul k mul def + SignalModulant VoltDivY1 div 5 add SignalModule VoltDivY2 div} +\else + \ifPst@SignalModule + \parametricplot[style=signalModule]{0}{10}{% duree + /temps t TimeDiv mul def % t est en s + /SignalModulant temps Fm mul 360 mul cos Am mul U0 add def + /FonctionPorteuse Ap 360 Tp div temps mul cos mul def + /SignalModule FonctionPorteuse SignalModulant mul k mul def + t SignalModule VoltDivY2 div } + \ifPst@enveloppe + \parametricplot[style=signalModulant]{0}{10}{% + /temps t TimeDiv mul def % t est en s + /SignalModulant temps Fm mul 360 mul cos Am mul U0 add def + /enveloppeSup Ap SignalModulant mul k mul def + t enveloppeSup VoltDivY2 div } + \parametricplot[style=signalModulant]{0}{10}{% + /temps t TimeDiv mul def % t est en s + /SignalModulant temps Fm mul 360 mul cos Am mul U0 add def + /enveloppeInf Ap SignalModulant mul k mul neg def + t enveloppeInf VoltDivY2 div } + \fi + \fi + \ifPst@SignalRedresse + \parametricplot[style=signalRedresse]{0}{10}{% duree + /temps t TimeDiv mul def % t est en s + /SignalModulant temps Fm mul 360 mul cos Am mul U0 add def + /FonctionPorteuse Ap 360 Tp div temps mul cos mul def + /SignalModule FonctionPorteuse SignalModulant mul k mul def + SignalModule 0 le {/SignalRedresse 0 def} {/SignalRedresse SignalModule def} ifelse + t SignalRedresse VoltDivY2 div } + \fi + \ifPst@SignalDemodule + \parametricplot[style=signalDemodule]{0}{10}{% + /temps t TimeDiv mul def % t est en s + /SignalModulant temps Fm mul 360 mul cos Am mul U0 add def + /FonctionPorteuse Ap 360 Tp div temps mul cos mul def + /SignalModule FonctionPorteuse SignalModulant mul k mul def + SignalModule 0 le {/SignalRedresse 0 def} {/SignalRedresse SignalModule def} ifelse + /Uc U0 Ap mul + 1 + m DecalageTemps 360 mul Tm div cos mul + add + mul 2.718 temps DecalageTemps sub Tau div neg exp mul k mul def + Uc SignalRedresse ge {/SignalDemodule Uc def} % si condition realisee + {/SignalDemodule SignalRedresse def + /DecalageTemps temps Tp div floor Tp mul def} + ifelse + t SignalDemodule VoltDivY2 div } + \fi + \ifPst@SignalModulant% + \parametricplot[style=signalModulant]{0}{10}{% + % 1 div=0.2 ms + /temps t TimeDiv mul def % t est en s + /SignalModulant temps Fm mul 360 mul cos Am mul U0 add def + t SignalModulant VoltDivY1 div } + \fi + \ifPst@SignalPorteuse + \parametricplot[style=signalPorteuse]{0}{10}{% durée + /temps t TimeDiv mul def % t est en s + /SignalModulant temps Fm mul 360 mul cos Am mul U0 add def + /FonctionPorteuse Ap 360 Tp div temps mul cos mul def + t FonctionPorteuse VoltDivY1 div } + \fi +\fi +\ifPst@SignalFinal + \parametricplot[style=signalDemodule]{0}{10}{% + /temps t TimeDiv mul def % t est en s + /SignalModulant temps Fm mul 360 mul cos Am mul U0 add def + /FonctionPorteuse Ap 360 Tp div temps mul cos mul def + /SignalModule FonctionPorteuse SignalModulant mul k mul def + SignalModule 0 le {/SignalRedresse 0 def} {/SignalRedresse SignalModule def} ifelse + /Uc U0 Ap mul + 1 + m DecalageTemps 360 mul Tm div cos mul + add + mul 2.718 temps DecalageTemps sub Tau div neg exp mul k mul def + Uc SignalRedresse ge {/SignalDemodule Uc def} % si condition réalisée + {/SignalDemodule SignalRedresse def + /DecalageTemps temps Tp div floor Tp mul def} + ifelse + t SignalDemodule composanteContinue sub VoltDivY2 div } +\fi + +\pnode(! 0 Umax VoltDivY2 div){UM1} +\pnode(! 10 Umax VoltDivY2 div){UM2} +\pnode(! 0 Umin VoltDivY2 div){Um1} +\pnode(! 10 Umin VoltDivY2 div){Um2} +\pnode(! 0 U0 VoltDivY1 div){U01} +\pnode(! 10 U0 VoltDivY1 div){U02} +\endpsclip +\psgrid[gridlabels=0,subgriddiv=0,gridwidth=0.5\pslinewidth,subgridwidth=0.2\pslinewidth,gridcolor=black,subgridcolor=black](0,-4)(10,4) +\psline[linestyle=dotted,linecolor=black](0,2.5)(10,2.5) +\psline[linestyle=dotted,linecolor=black](0,-2.5)(10,-2.5) +\multido{\nxDiv=0.0+0.2}{50}{% +\psline[linecolor=black,linewidth=0.5\pslinewidth](\nxDiv,-.1)(\nxDiv,0.1)} +% ajout 29 janvier 2003 +\multido{\nxDiv=0.0+0.2}{50}{% +\psline[linecolor=black,linewidth=0.5\pslinewidth](\nxDiv,-2.05)(\nxDiv,-1.95)} +\multido{\nxDiv=0.0+0.2}{50}{% +\psline[linecolor=black,linewidth=0.5\pslinewidth](\nxDiv,2.05)(\nxDiv,1.95)} +% +\multido{\nyDiv=-4.0+0.2}{40}{% +\psline[linecolor=black,linewidth=0.5\pslinewidth](4.9,\nyDiv)(5.1,\nyDiv)} +\ifPst@traceU0 + \psline[linecolor=green,linestyle=dashed](U01)(U02) + \uput[l](U01){$U_0$} +\fi +\ifPst@UMandUm% +\psline[linecolor=blue,linestyle=dashed](UM1)(UM2) +\psline[linecolor=blue,linestyle=dashed](Um1)(Um2) + \uput[l](Um1){$U_m$} + \uput[l](UM1){$U_M$} +\fi +\endpspicture% + +\ifPst@values +\tabular{@{} r l @{}}\hline + Amplitude porteuse & \numprint{\psk@Up}\ V \\ + Amplitude audio & \numprint{\psk@Um}\ V \\ + Frequence porteuse & \numprint{\psk@frequencePorteuse}\ Hz \\ + Frequence audio & \numprint{\psk@frequenceAudio}\ Hz\\ + Decalage($U_0$) & \numprint{\psk@offset}\ V\\ \hline + R & \numprint{\psk@resistor}\ $\Omega$ \\ + C & \numprint{\psk@capacitor}\ F \\ \hline +\endtabular +\fi +\ifPst@Centering\par\fi +}} +% +\endinput diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check index c9e5c5782bd..1fc7f11306d 100755 --- a/Master/tlpkg/bin/tlpkg-ctan-check +++ b/Master/tlpkg/bin/tlpkg-ctan-check @@ -206,7 +206,7 @@ my @WorkingTLP = qw( prettyref preview printlen proba probsoln procIAGssymp program properties protex protocol psbao pseudocode psfrag psfrag-italian psgo pslatex psnfss pspicture - pst-2dplot pst-3d pst-3dplot pst-abspos pst-asr pst-bar + pst-2dplot pst-3d pst-3dplot pst-abspos pst-am pst-asr pst-bar pst-barcode pst-bezier pst-blur pst-bspline pst-calendar pst-circ pst-cox pst-dbicons pst-diffraction pst-eps pst-eucl pst-fill diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index daa0e011785..cd30cbfc83f 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -465,6 +465,7 @@ $Master = "$mydir/../.."; 'pst-3d', "&MAKEpst", 'pst-3dplot', "&MAKEpst", 'pst-abspos', "&MAKEpst", + 'pst-am', "&MAKEpst", 'pst-asr', "&MAKEpst", 'pst-bar', "&MAKEpst", 'pst-barcode', "&MAKEpst", diff --git a/Master/tlpkg/tlpsrc/collection-pstricks.tlpsrc b/Master/tlpkg/tlpsrc/collection-pstricks.tlpsrc index db860984159..863210f06f2 100644 --- a/Master/tlpkg/tlpsrc/collection-pstricks.tlpsrc +++ b/Master/tlpkg/tlpsrc/collection-pstricks.tlpsrc @@ -9,6 +9,7 @@ depend pst-2dplot depend pst-3d depend pst-3dplot depend pst-abspos +depend pst-am depend pst-asr depend pst-bar depend pst-barcode diff --git a/Master/tlpkg/tlpsrc/pst-am.tlpsrc b/Master/tlpkg/tlpsrc/pst-am.tlpsrc new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/Master/tlpkg/tlpsrc/pst-am.tlpsrc |