summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-06-27 16:31:03 +0000
committerKarl Berry <karl@freefriends.org>2013-06-27 16:31:03 +0000
commiteeeb860e63fdf6d8e9c0c18825a887aec80eed7e (patch)
tree273652f22e95117dd0dd1726d396e11681448977 /Master/texmf-dist/tex/generic
parentd461a65ed824ec63c77f4ef241065619f3e8804b (diff)
pst-circ (16jun13)
git-svn-id: svn://tug.org/texlive/trunk@30977 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic')
-rw-r--r--Master/texmf-dist/tex/generic/pst-circ/pst-circ.tex41
1 files changed, 27 insertions, 14 deletions
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