pst-circ 1.46 (15jul08)

git-svn-id: svn://tug.org/texlive/trunk@9619 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 110 insertions, 87 deletions

diff --git a/Master/texmf-dist/doc/generic/pst-circ/Changes b/Master/texmf-dist/doc/generic/pst-circ/Changes
index a4c42a4233d..595c596257c 100644
--- a/Master/texmf-dist/doc/generic/pst-circ/Changes
+++ b/Master/texmf-dist/doc/generic/pst-circ/Changes
@@ -1,3 +1,5 @@
+1.46 2008-07-15 (hv) - optional dot for the (new)ground symbol (rw) 
+		     - added dipolstyle crystal for the capacitor 
 1.45 2008-03-16 (hv) - fix bug with a switch as multidipole 
 1.44 2008-02-28 (hv) - added the microwave part (Francois Boone)
 1.43 2007-12-18 (hv) - fixed bug with \@empty
diff --git a/Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.pdf b/Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.pdf
index add10bb62c7..61f2a879c2a 100644
--- a/Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.pdf
+++ b/Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.pdf
diff --git a/Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.tex b/Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.tex
index d1877f73eb7..93ce8cd7c59 100644
--- a/Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.tex
+++ b/Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.tex
@@ -1,17 +1,23 @@
-%% $Id: pst-circ-doc.tex 3 2007-12-23 16:23:22Z herbert $
+%% $Id: pst-circ-doc.tex 18 2008-03-22 20:20:39Z herbert $
 \listfiles
 \documentclass{article}
 \usepackage[a4paper]{geometry}
 \usepackage[T1]{fontenc}
-\usepackage{mathpazo}
+\usepackage{arev}%  use this if you do not have the palatino math font
+%\usepackage{mathpazo}
 \usepackage{fancyhdr}
-\usepackage{url}
+\usepackage{url,array,longtable}
 %
 \usepackage[dvipsnames]{pstricks}
 \usepackage{pst-circ}
 \let\verPstCirc\fileversion
 \usepackage{multicol}
 \usepackage{showexpl,lscape}
+\lstset{language=PSTricks,
+    morekeywords={psGammaDist,psChiIIDist,psTDist,psFDist,psBetaDist,psPlotImpl}}
+\lstdefinestyle{syntax}{backgroundcolor=\color{blue!20},numbers=none,xleftmargin=0pt,xrightmargin=0pt,
+    frame=single}
+%
 %
 \makeatletter
 \def\@UrlFont{\small\ttfamily}
@@ -34,10 +40,11 @@
 
 \begin{document}
 
-\title{\texttt{pst-circ}\\ A PSTricks package for drawing electric circuits\\\normalsize ver. \verPstCirc}
+\title{\texttt{pst-circ}\\[10pt] 
+    {\Large A PSTricks package for drawing electric circuits}\\\normalsize ver. \verPstCirc}
 \author{Christophe Jorssen\thanks{\url{<CJ@PSTricks.de>}} \and  
 Herbert Vo\ss\thanks{\url{<voss@PSTricks.de>}} \and Fran\c{c}ois Boone%
-\thanks{(microwave symbols) \url{francois.boone@usherbrooke.ca}}}
+\thanks{\url{francois.boone@usherbrooke.ca} (microwave symbols)}}
 \date{\today}
 \maketitle
 
@@ -48,11 +55,14 @@ circuits are provided as graphical units which can readily be
 interconnectedd to produce circuit diagrams of a reasonable level of complexity.
 \end{abstract}
 
+\clearpage
+
 \setlength{\columnseprule}{0.6pt}
 \begin{multicols}{2}
 {\parskip 0pt \tableofcontents}
 \end{multicols}
 
+\clearpage
 \section{Introduction}
 
 The package \CircPackage{} is a collection of graphical elements based
@@ -72,65 +82,64 @@ out the underlying vector graphics.
 There are specific paramaters defined to change easily the behaviour of the pst-circ
 objects you are drawing.
 
-\let\HLTTc\textsf
-%\begin{multicols}{2}
-\begin{description}
-\item[\HLTTc{intensity} (boolean):] (\emph{default:~false})
-\item[\HLTTc{intensitylabel} (string):] (\emph{default:~})
-\item[\HLTTc{intensitylabeloffset} (dimension):] (\emph{default:~0.5})
-\item[\HLTTc{intensitycolor} (PSTricks color):] (\emph{default:~black})
-\item[\HLTTc{intensitylabelcolor} (PSTricks color):] (\emph{default:~black})
-\item[\HLTTc{intensitywidth} (dimension):] (\emph{default:~\texttt{\cs{pslinewidth}}})
-\item[\HLTTc{tension} (boolean):] (\emph{default:~false})
-\item[\HLTTc{tensionlabel} (string):] (\emph{default:~})
-\item[\HLTTc{tensionoffset} (dimension):] (\emph{default:~1})
-\item[\HLTTc{tensionlabeloffset} (dimension):] (\emph{default:~1.2})
-\item[\HLTTc{tensioncolor} (PSTricks color):] (\emph{default:~black})
-\item[\HLTTc{tensionlabelcolor} (PSTricks color):] (\emph{default:~black})
-\item[\HLTTc{tensionwidth} (dimension):] (\emph{default:~\texttt{\cs{pslinewidth}}})
-\item[\HLTTc{labeloffset} (dimension):] (\emph{default:~0.7})
-\item[\HLTTc{labelangle} (PSTricks label angle):] (\emph{default:~0})
-\item[\HLTTc{labelInside} (integer):] (\emph{default:~0})
-\item[\HLTTc{dipoleconvention}:] (\emph{default:~receptor})
-\item[\HLTTc{directconvetion} (boolean):] (\emph{default:~true})
-\item[\HLTTc{dipolestyle} (string):] (\emph{default:~normal})
-\item[\HLTTc{variable} (boolean):] (\emph{default:~false})
-\item[\HLTTc{parallel} (boolean):] (\emph{default:~false})
-\item[\HLTTc{parallelarm} (dimension):] (\emph{default:~1.5})
-\item[\HLTTc{parallelsep} (real):] (\emph{default:~0})
-\item[\HLTTc{parallelnode} (boolean):] (\emph{default:~false})
-\item[\HLTTc{intersect} (boolean):] (\emph{default:~false})
-\item[\HLTTc{intersectA} (node):]
-\item[\HLTTc{intersectB} (node):]
-\item[\HLTTc{OAinvert} (boolean):] (\emph{default:~true})
-\item[\HLTTc{OAperfect} (boolean):] (\emph{default:~true})
-\item[\HLTTc{OAiplus} (boolean):] (\emph{default:~false})
-\item[\HLTTc{OAiminus} (boolean):] (\emph{default:~false})
-\item[\HLTTc{OAiout} (boolean):] (\emph{default:~false})
-\item[\HLTTc{OAipluslabel} (string):] (\emph{default:~})
-\item[\HLTTc{OAiminuslabel} (string):] (\emph{default:~})
-\item[\HLTTc{OAioutlabel} (string):] (\emph{default:~})
-\item[\HLTTc{transistorcircle} (boolean):] (\emph{default:~true})
-\item[\HLTTc{transistorinvert} (boolean):] (\emph{default:~false})
-\item[\HLTTc{transistoribase} (boolean):] (\emph{default:~false})
-\item[\HLTTc{transistoricollector} (boolean):] (\emph{default:~false})
-\item[\HLTTc{transistoriemitter} (boolean):] (\emph{default:~false})
-\item[\HLTTc{transistoribaselabel} (string):] (\emph{default:~})
-\item[\HLTTc{transistoricollectorlabel} (string):] (\emph{default:~})
-\item[\HLTTc{transistoriemitterlabel} (string):] (\emph{default:~})
-\item[\HLTTc{TRot} (angle):] (\emph{default:~0})
-\item[\HLTTc{edge} (macro):] (\emph{default:~\texttt{\textbackslash ncangles}})
-\item[\HLTTc{transistortype} (string):] (\emph{default:~PNP})
-\item[\HLTTc{FETchanneltype} (string):] (\emph{default:~N})
-\item[\HLTTc{primarylabel} (string):] (\emph{default:~})
-\item[\HLTTc{secondarylabel} (string):] (\emph{default:~})
-\item[\HLTTc{transformeriprimary} (boolean):] (\emph{default:~false})
-\item[\HLTTc{transformerisecondary} (boolean):] (\emph{default:~false})
-\item[\HLTTc{transformeriprimarylabel} (string):] (\emph{default:~})
-\item[\HLTTc{transformerisecondarylabel} (string):] (\emph{default:~})
-\item[\HLTTc{tripolestyle} (string):] (\emph{default:~normal})
-\end{description}
-%\end{multicols}
+\begin{longtable}{@{}>{\ttfamily}l l l@{}}
+\textrm{\emph{name}} & \emph{type} & \emph{default}\\\hline
+\endhead
+intensity 	& boolean &  \emph{false} \\
+intensitylabel  & string &  \emph{ } \\
+intensitylabeloffset & dimension &  \emph{ 0.5} \\
+intensitycolor & PSTricks color &  \emph{ black} \\
+intensitylabelcolor & PSTricks color &  \emph{ black} \\
+intensitywidth & dimension &  \emph{ \texttt{\cs{pslinewidth}}} \\
+tension & boolean &  \emph{ false} \\
+tensionlabel & string &  \emph{ } \\
+tensionoffset & dimension &  \emph{ 1} \\
+tensionlabeloffset & dimension &  \emph{ 1.2} \\
+tensioncolor & PSTricks color &  \emph{ black} \\
+tensionlabelcolor & PSTricks color &  \emph{ black} \\
+tensionwidth & dimension &  \emph{ \texttt{\cs{pslinewidth}}} \\
+labeloffset & dimension &  \emph{ 0.7} \\
+labelangle & PSTricks label angle &  \emph{ 0} \\
+labelInside & integer &  \emph{ 0} \\
+dipoleconvention & & \emph{ receptor} \\
+directconvetion & boolean &  \emph{ true} \\
+dipolestyle & string &  \emph{ normal} \\
+variable & boolean &  \emph{ false} \\
+parallel & boolean &  \emph{ false} \\
+parallelarm & dimension &  \emph{ 1.5} \\
+parallelsep & real &  \emph{ 0} \\
+parallelnode & boolean &  \emph{ false} \\
+intersect & boolean &  \emph{ false} \\
+intersectA & node & \\
+intersectB & node & \\
+OAinvert & boolean &  \emph{ true} \\
+OAperfect & boolean &  \emph{ true} \\
+OAiplus & boolean &  \emph{ false} \\
+OAiminus & boolean &  \emph{ false} \\
+OAiout & boolean &  \emph{ false} \\
+OAipluslabel & string &  \emph{ } \\
+OAiminuslabel & string &  \emph{ } \\
+OAioutlabel & string &  \emph{ } \\
+transistorcircle & boolean &  \emph{ true} \\
+transistorinvert & boolean &  \emph{ false} \\
+transistoribase & boolean &  \emph{ false} \\
+transistoricollector & boolean &  \emph{ false} \\
+transistoriemitter & boolean &  \emph{ false} \\
+transistoribaselabel & string &  \emph{ } \\
+transistoricollectorlabel & string &  \emph{ } \\
+transistoriemitterlabel & string &  \emph{ } \\
+TRot & angle &  \emph{ 0} \\
+edge & macro &  \emph{ \texttt{\textbackslash ncangles}} \\
+transistortype & string &  \emph{ PNP} \\
+FETchanneltype & string &  \emph{ N} \\
+primarylabel & string &  \emph{ } \\
+secondarylabel & string &  \emph{ } \\
+transformeriprimary & boolean &  \emph{ false} \\
+transformerisecondary & boolean &  \emph{ false} \\
+transformeriprimarylabel & string &  \emph{ } \\
+transformerisecondarylabel & string &  \emph{ } \\
+tripolestyle & string &  \emph{ normal}
+\end{longtable}
 
 \subsection{Macros}
 
@@ -706,6 +715,14 @@ Wire intersect parameters work also with \cs{multidipole}.
 \begin{pspicture}(3,2)\psgrid
   \pnode(0,1){A}
   \pnode(3,1){B}
+  \capacitor[dipolestyle=crystal](A)(B){$Q$}
+\end{pspicture}
+\end{LTXexample}
+
+\begin{LTXexample}[width=3.5cm]
+\begin{pspicture}(3,2)\psgrid
+  \pnode(0,1){A}
+  \pnode(3,1){B}
   \coil[dipolestyle=rectangle](A)(B){$L$}
 \end{pspicture}
 \end{LTXexample}
@@ -1371,8 +1388,9 @@ Finally, something doesn't work with multidipole: this following example works:
     \resistor{$R$}.
 \end{pspicture}
 \end{LTXexample}
+
 However, this following one doesn't work:
-\begin{verbatim}
+\begin{lstlisting}
 \begin{LTXexample}[width=3.5cm,rframe={}]
 \begin{pspicture}(4,2)\psgrid
   \pnode(0.5,1){A}
@@ -1381,7 +1399,7 @@ However, this following one doesn't work:
     \resistor{$R$}.
 \end{pspicture}
 \end{LTXexample}
-\end{verbatim}
+\end{lstlisting}
 
 
 \subsection{New monopole components}
@@ -2088,43 +2106,45 @@ From Chang, K., RF and Microwave Wireless Systems, Wiley InterScience, page 319,
 \section{Flip Flops -- logical elements}
 
 The syntax for all logical base circuits is
-\begin{verbatim}
+\begin{lstlisting}[style=syntax]
 logic[<options>](<originX,originY>){Label}
-\end{verbatim}
+\end{lstlisting}
 
 \noindent where the options and the origin are optional. If they are missing,
 then the default options, described in the next section and the default
 origin $(0,0)$ is used. The origin specifies the lower left corner
 of the logical circuit.
 
-\begin{verbatim}
+\begin{lstlisting}[style=syntax]
 logic{Demo}
 logic[logicType=and]{Demo}
 logic(0,0){Demo}
 logic[logicType=and](0,0){Demo}
-\end{verbatim}
+\end{lstlisting}
 
 The above four ,,different`` calls of the \verb|logic| macro give the
 same output, because they are equivalent. 
 
 \subsection{The Options}
 
-\begin{description}
-\item[logicShowNode (boolean):] (\emph{default:~false})
-\item[logicShowDot (boolean):] (\emph{default:~false})
-\item[logicNodestyle (command):] (\emph{default:~\textbackslash footnotesize})
-\item[logicSymbolstyle (command):] (\emph{default:~\textbackslash large})
-\item[logicSymbolpos (value):] (\emph{default:~0.5})
-\item[logicLabelstyle (command):] (\emph{default:~\textbackslash small})
-\item[logicType (string):] (\emph{default:~and})
-\item[logicChangeLR (boolean):] (\emph{default:~false})
-\item[logicWidth (length):] (\emph{default:~1.5})
-\item[logicHeight (length):] (\emph{default:~2.5})
-\item[logicWireLength (length):] (\emph{default:~0.5})
-\item[logicNInput (number):] (\emph{default:~2})
-\item[logicJInput (number):] (\emph{default:~2})
-\item[logicKInput (number):] (\emph{default:~2})
-\end{description}
+\begin{longtable}{@{}>{\ttfamily}l l l@{}}
+\textrm{\emph{name}} & \emph{type} & \emph{default}\\\hline
+\endhead
+logicShowNode & boolean & \emph{ false} \\
+logicShowDot & boolean & \emph{ false} \\
+logicNodestyle & command & \emph{ \textbackslash footnotesize} \\
+logicSymbolstyle & command & \emph{ \textbackslash large} \\
+logicSymbolpos & value & \emph{ 0.5} \\
+logicLabelstyle & command & \emph{ \textbackslash small} \\
+logicType & string & \emph{ and} \\
+logicChangeLR & boolean & \emph{ false} \\
+logicWidth & length & \emph{ 1.5} \\
+logicHeight & length & \emph{ 2.5} \\
+logicWireLength & length & \emph{ 0.5} \\
+logicNInput & number & \emph{ 2} \\
+logicJInput & number & \emph{ 2} \\
+logicKInput & number &\emph{ 2}
+\end{longtable}
 
 \subsection{Basic Logical Circuits}
 At least the basic objects require a unique label name, otherwise it is
@@ -2652,7 +2672,8 @@ drawings: this wouldn't have been possible without him. As usual, Denis Girou ga
 precious hand with some dark tricks of \TeX{} and PSTricks. Jean-C\^ome Charpentier
 wrote the outline of \cs{multidipole} (a story about riri, fifi and loulou\dots).
 
-Thanks also to Douglas Waud, Patrick Drechsler (dashpot), Alan Ristow, and Ted Pavlic.
+Thanks also to Douglas Waud, Patrick Drechsler (dashpot), Alan Ristow, Ted Pavlic,
+and Richard Weissnar.
 
 
 \nocite{*}