pst-circ (16jun13)

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

5 files changed, 64 insertions, 25 deletions

diff --git a/Master/texmf-dist/doc/generic/pst-circ/Changes b/Master/texmf-dist/doc/generic/pst-circ/Changes
index 9fa98a677c2..62a60c9e245 100644
--- a/Master/texmf-dist/doc/generic/pst-circ/Changes
+++ b/Master/texmf-dist/doc/generic/pst-circ/Changes
@@ -1,3 +1,4 @@
+2.04 2013-06-13 - added new optional argument matlabel and labelstyle
 2.03 2013-05-15 - added new symbol newSwitch and new option ison (cs)
 2.02 2011-05-11 - fix bug with \psdot in transistor module
 2.01 2011-03-03 - typos
diff --git a/Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.bib b/Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.bib
index 8ac6e1be793..7386b87ef55 100644
--- a/Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.bib
+++ b/Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.bib
@@ -19,15 +19,6 @@
 }
 
 
-@Manual{pdftricks,
-  Title          = {PSTricks Support for pdf},
-  Author         = {Herbert Voss},
-  Organization   = {},
-  Address        = {\url{http://PSTricks.de/pdf/pdfoutput.phtml}},
-  Note           = {},
-  year           = 2002,
-}
-
 @Manual{miwi,
   Title          = {References for \TeX{} and Friends},
   Author         = {Michael Wiedmann and Peter Karp},
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 a3fb5f3091a..5cba0147a79 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 1ba9c0ebd15..d7be2f92dc2 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,4 +1,4 @@
-%% $Id: pst-circ-doc.tex 780 2013-05-15 06:35:30Z herbert $
+%% $Id: pst-circ-doc.tex 793 2013-06-15 06:04:20Z herbert $
 \documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings
     headexclude,footexclude,oneside]{pst-doc}
 \usepackage[utf8]{inputenc}
@@ -491,7 +491,41 @@ well chosen, so don't try to use tripole macros in strange situations!
 \end{pspicture}
 \end{LTXexample}
 
-\bigskip
+
+\begin{LTXexample}[pos=b]
+\psset{mathlabel,labelstyle=\tt}
+\def\pcTran(#1)(#2){\psline(#1)(#2|#1)(#2)}% only 2 segements
+\psset{circedge=\pcTran,connectingdot=false}
+
+\begin{pspicture}(10,10)
+\pnode(1,1){G1}\pnode(6,1){G2}\pnode(7.5,1){G3}
+\newground[arrows=o](G1)\newground(G2)\newground(G3)
+\pnode(1,3){D1u}\pnode(7,3){T1B}\pnode(0,3){IB}\pnode(4,4){T2B}
+\newdiode(G1)(D1u){D1}\qdisk(D1u){2pt}
+\transistor[TRot=270,arrows=-o](T2B)(IB)(T1B)
+\pnode(8,7){O1}%junction to out
+\transistor(T1B)(G3)(O1)
+\pnode(1,6){D2u}\pnode(1,4){G4}
+\newground(G4) 
+\newdiode(G4)(D2u){D2}\qdisk(D2u){2pt}
+\pnode(2.5,7){T4B}\pnode(0,6){IA}\pnode(5.5,5){T3B}\pnode(6,7){R3d}
+\transistor[TRot=270,arrows=-o](T4B)(IA)(T3B)\uput[90](IA){$\mathtt{A}$}
+\transistor(T3B)(G2)(R3d)\uput[90](IB){$\mathtt{B}$}
+\pnode(2.5,10){VCC1}\pnode(4,10){VCC2}\pnode(6,10){VCC3}
+\resistor[arrows=o-](VCC1)(T4B){4{,}7k\Omega}
+\resistor[arrows=o-](VCC2)(T2B){4{,}7k\Omega}
+\resistor[arrows=o-](VCC3)(R3d){100\Omega}
+\wire[arrows=*-o](R3d)(O1)
+\uput[90](O1){$\mathtt{OUT}$} \qdisk(7.5,7){2pt}
+\end{pspicture}
+\end{LTXexample}
+
+
+
+
+
+
+\clearpage
 \subsubsection{Quadrupole macros}
 
 \xLcs{quadripole}
diff --git a/Master/texmf-dist/tex/generic/pst-circ/pst-circ.tex b/Master/texmf-dist/tex/generic/pst-circ/pst-circ.tex
index 18e4bdaad34..d531e094259 100644
--- a/Master/texmf-dist/tex/generic/pst-circ/pst-circ.tex
+++ b/Master/texmf-dist/tex/generic/pst-circ/pst-circ.tex
@@ -1,4 +1,4 @@
-%% $Id: pst-circ.tex 780 2013-05-15 06:35:30Z herbert $
+%% $Id: pst-circ.tex 792 2013-06-15 05:52:12Z herbert $
 %% This is file `pst-circ.tex'
 %%
 %% IMPORTANT NOTICE:
@@ -26,8 +26,8 @@
 \ifx\PSTXKeyLoaded\endinput   \else\input pst-xkey \fi
 \ifx\PSTMultidoLoaded\endinput\else\input multido.tex\fi
 %
-\def\fileversion{2.03}
-\def\filedate{2013/05/15}
+\def\fileversion{2.04}
+\def\filedate{2013/06/13}
 \message{`pst-circ' v\fileversion (hv)}
 %
 \edef\PstAtCode{\the\catcode`\@}
@@ -85,6 +85,8 @@
 \def\pst@tripole@style@french{french}
 %
 \define@boolkey[psset]{pst-circ}[Pst@]{intensity}[true]{}
+\define@boolkey[psset]{pst-circ}[Pst@]{mathlabel}[true]{}
+\define@key[psset]{pst-circ}{labelstyle}[]{\def\pst@labelstyle{#1}}
 \define@key[psset]{pst-circ}{intensitylabel}[]{\def\psk@I@label{#1}}
 \define@key[psset]{pst-circ}{intensitylabelcolor}[black]{\def\psk@I@labelcolor{#1}}
 \define@key[psset]{pst-circ}{intensitylabeloffset}[0.5]{\def\psk@I@label@offset{#1}}
@@ -822,7 +824,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 \psset[pst-circ]{%
-  labelInside=0,circedge=\pcangle,
+  labelstyle=,mathlabel=false,labelInside=0,circedge=\pcangle,
   intensity=false,intensitylabel={},
   intensitylabeloffset=0.5,
   intensitycolor=black,intensitylabelcolor=black,intensitywidth=\pslinewidth,
@@ -1052,7 +1054,8 @@
   \pst@killglue
   \begingroup
   \use@par%
-  \@ifnextchar({\transistor@iii(#1)}{\Pst@tempfalse\transistor@ii(#1)}}
+  \@ifnextchar(% do we have more coordinates?
+    {\transistor@iii(#1)}{\Pst@tempfalse\transistor@ii(#1)}}
 %
 \def\transistor@ii(#1)#2#3{% with one node, the base
   \pst@killglue%
@@ -1067,7 +1070,12 @@
       YB basesep \Pst@TRot\space sin mul add){TBaseNode}% base node
   \fi%
 %  \psdot(#1)%
-  \rput[c]{\Pst@TRot}(TBaseNode){%(#1){%
+  \rput[c]{\Pst@TRot}(!
+      \pst@tempA /YB exch \pst@number\psyunit div def
+      /XB exch \pst@number\psxunit div def
+      /basesep \Pst@basesep\space \pst@number\psxunit div def
+      XB basesep \Pst@TRot\space cos mul add
+      YB basesep \Pst@TRot\space sin mul add){%(#1){%
     \ifPst@transistorcircle\pscircle(0.3,0){0.7}\fi%
     \ifx\psk@Ttype\pst@Ttype@FET\relax%
       \ifPst@FETmemory% atosch
@@ -1090,8 +1098,9 @@
         \ifPst@transistorinvert\pnode(0.65,0.5){#2}\else\pnode(0.65,0.5){#3}\fi%
         \ifPst@transistorinvert\pnode(0.65,-0.5){#3}\else\pnode(0.65,-0.5){#2}\fi%
       \else%
-        \ifPst@transistorinvert\pnode(0.5,0.5){#2}\else\pnode(0.5,0.5){#3}\fi%
-        \ifPst@transistorinvert\pnode(0.5,-0.5){#3}\else\pnode(0.5,-0.5){#2}\fi%
+        \ifPst@transistorinvert\pnode(0.5,0.5){#2}\pnode(0.5,-0.5){#3}%
+        \else                  \pnode(0.5,0.5){#3}\pnode(0.5,-0.5){#2}%
+        \fi%
       \fi%
     \fi%
     \ifx\psk@Ttype\pst@Ttype@FET\relax%
@@ -1145,7 +1154,7 @@
     /YBase Y1 basesep \Pst@TRot\space sin mul add def
     XBase YBase ){@@base}% base node
 %
-  \Pst@temptrue%
+  \global\Pst@temptrue%
   \transistor@ii(@@base){@@emitter}{@@collector}%
 %
   \if\psk@labeltransistoribase\@empty\else\psset{transistoribase=true}\fi%
@@ -1162,7 +1171,11 @@
   \fi%
   \bgroup%
     \psset{style=collectorOpt}%
-    \ifPst@transistorinvert\pscirc@edge(#3)(@@emitter)\else\pscirc@edge(#3)(@@collector)\fi%
+    \ifPst@transistorinvert
+      \pscirc@edge(#3)(@@emitter)
+    \else
+      \pscirc@edge(#3)(@@collector)
+    \fi%
   \egroup%
   \ncput[npos=2]{\pnode{\ifPst@transistorinvert @@emitter\else @@collector\fi}}%
   \ifPst@transistoriemitter% emitter current?
@@ -1590,7 +1603,7 @@
      \pcline[arrows=-,linestyle=none,fillstyle=none,offset=\psk@parallel@arm](dipole@@1)(dipole@@2)
      \ncput[npos=0]{\pnode{dipole@@@1}}
      \ncput[npos=1]{\pnode{dipole@@@2}}
-     \ncput[nrot=:U]{#5}
+     \ncput[nrot=:U]{\ifPst@mathlabel$\pst@labelstyle#5$\else\pst@labelstyle#5\fi}
      \pcline[arrows=-](dipole@@1)(dipole@@@1)
      \pcline[arrows=-](dipole@@@1)(dipole@1)
      \pcline[arrows=-](dipole@2)(dipole@@@2)
@@ -1600,13 +1613,13 @@
        \pscircle*(dipole@@2){2\pslinewidth}
      \fi
      \pcline[arrows=-,linestyle=none,fillstyle=none,offset=\psk@label@offset](dipole@@@1)(dipole@@@2)
-     \ncput[nrot=\psk@label@angle]{#4}
+     \ncput[nrot=\psk@label@angle]{\ifPst@mathlabel$\pst@labelstyle#4$\else\pst@labelstyle#4\fi}
      \pst@intensity{dipole@@@1}{dipole@@@2}
      \pst@tension{dipole@@@1}{dipole@@@2}
    \else
-     \ncput[nrot=:U]{#5}
+     \ncput[nrot=:U]{\ifPst@mathlabel$\pst@labelstyle#5$\else\pst@labelstyle#5\fi}
      \pcline[arrowscale=1,arrows=-,linestyle=none,fillstyle=none,offset=\psk@label@offset](#2)(#3)
-     \ncput[nrot=\psk@label@angle]{#4}
+     \ncput[nrot=\psk@label@angle]{\ifPst@mathlabel$\pst@labelstyle#4$\else\pst@labelstyle#4\fi}
 %%%%%
      \ifPst@inputarrow
         \ifx\psk@Dinput\pst@Dinput@right