From 9d2ebf24951017e4a930651f26e118128d9003a1 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Tue, 25 Dec 2007 09:54:48 +0000 Subject: pst-cric update 07-12-25 git-svn-id: svn://tug.org/texlive/trunk@5897 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/generic/pst-circ/pst-circ.tex | 58 +++++++++++----------- 1 file changed, 28 insertions(+), 30 deletions(-) (limited to 'Master/texmf-dist/tex/generic') 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 c1693b566de..490bdc5b9c1 100644 --- a/Master/texmf-dist/tex/generic/pst-circ/pst-circ.tex +++ b/Master/texmf-dist/tex/generic/pst-circ/pst-circ.tex @@ -7,8 +7,8 @@ %% %% Original idea: A.Premoli I.Maio, M.Luque, %% -%% Christophe Jorssen -%% Herbert Voss +%% Christophe Jorssen +%% Herbert Voss %% %% This program can be redistributed and/or modified under the terms %% of the LaTeX Project Public License Distributed from CTAN archives @@ -29,8 +29,8 @@ \ifx\PSTnodeLoaded\endinput\else\input pst-node.tex\fi \ifx\PSTXKeyLoaded\endinput\else\input pst-xkey \fi % -\def\fileversion{1.42} -\def\filedate{2007/10/15} +\def\fileversion{1.43} +\def\filedate{2007/12/19} \message{`pst-circ' v\fileversion (CJ,hv,pd)} % \edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax @@ -198,22 +198,22 @@ % \psset{% labelInside=0,% - intensity=false,intensitylabel=\@empty,intensitylabeloffset=0.5, + intensity=false,intensitylabel={},intensitylabeloffset=0.5, intensitycolor=black,intensitylabelcolor=black,intensitywidth=\pslinewidth, - tension=false,tensionlabel=\@empty,tensionoffset=1,tensionlabeloffset=1.2, + tension=false,tensionlabel={},tensionoffset=1,tensionlabeloffset=1.2, tensioncolor=black,tensionlabelcolor=black,tensionwidth=\pslinewidth, labeloffset=0.7,labelangle=0,dipoleconvention=receptor,directconvention=true,dipolestyle=normal parallel=false,parallelarm=1.5,parallelsep=0,parallelnode=false, intersect=false,OAperfect=true,OAinvert=true, - OAiplus=false,OAiminus=false,OAiout=false,OAipluslabel=\@empty, - OAiminuslabel=\@empty,OAioutlabel=\@empty,OApower=false,% + OAiplus=false,OAiminus=false,OAiout=false,OAipluslabel={}, + OAiminuslabel={},OAioutlabel={},OApower=false,% transistorcircle=true, transistorinvert=false, % hv 2003-07-23 transistoribase=false,transistoricollector=false,transistoriemitter=false,% - transistoribaselabel=\@empty,basesep=0pt,edge=\pcangle,% - transistoricollectorlabel=\@empty,transistoriemitterlabel=\@empty, + transistoribaselabel={},basesep=0pt,edge=\pcangle,% + transistoricollectorlabel={},transistoriemitterlabel={}, transistortype=NPN,TRot=0,% - primarylabel=\@empty,secondarylabel=\@empty,transformeriprimary=false,transformerisecondary=false, - transformeriprimarylabel=\@empty,transformerisecondarylabel=\@empty, + primarylabel={},secondarylabel={},transformeriprimary=false,transformerisecondary=false, + transformeriprimarylabel={},transformerisecondarylabel={}, tripolestyle=normal,variable=false,% logicShowDot=false, logicShowNode=false, logicChangeLR=false,% hv logicWireLength=0.5, logicWidth=1.5, logicHeight=2.5, % hv @@ -1138,24 +1138,22 @@ %%%%%%%%%%%%%%%%%%%%%%%% % \def\pst@draw@dipole#1#2#3#4#5{% suggestion by Alain Ristow - \psset{dimen=middle}% - \psset{#1}% - \if\psk@I@label\@empty\else\psset{intensity=true}\fi - \if\psk@tension@label\@empty\else\psset{tension=true}\fi - \ifx\psk@Dconvention\pst@Dconvention@generator - \Pst@Dconventiontrue - \else - \ifx\psk@Dconvention\pst@Dconvention@receptor - \Pst@Dconventionfalse - \fi - \fi - \pcline[arrows=-,linestyle=none,fillstyle=none](#2)(#3) - \ncput[nrot=:U]{\pnode{dipole@M}} - \ifPst@parallel - \pcline[arrows=-,linestyle=none,fillstyle=none](#2)(dipole@M) - \ncput[npos=\psk@parallel@sep]{\pnode{dipole@@1}} - \pcline[arrows=-,linestyle=none,fillstyle=none](#3)(dipole@M) - \ncput[npos=\psk@parallel@sep]{\pnode{dipole@@2}} + \psset{dimen=middle}% + \psset{#1}% + \if\psk@I@label\@empty\else\psset{intensity=true}\fi + \if\psk@tension@label\@empty\else\psset{tension=true}\fi + \ifx\psk@Dconvention\pst@Dconvention@generator + \Pst@Dconventiontrue + \else + \ifx\psk@Dconvention\pst@Dconvention@receptor\Pst@Dconventionfalse\fi + \fi + \pcline[arrows=-,linestyle=none,fillstyle=none](#2)(#3) + \ncput[nrot=:U]{\pnode{dipole@M}} + \ifPst@parallel + \pcline[arrows=-,linestyle=none,fillstyle=none](#2)(dipole@M) + \ncput[npos=\psk@parallel@sep]{\pnode{dipole@@1}} + \pcline[arrows=-,linestyle=none,fillstyle=none](#3)(dipole@M) + \ncput[npos=\psk@parallel@sep]{\pnode{dipole@@2}} \pcline[arrows=-,linestyle=none, fillstyle=none, offset=\psk@parallel@arm](dipole@@1)(dipole@@2) -- cgit v1.2.3