pst-cric update 07-12-25

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

5 files changed, 37 insertions, 34 deletions

diff --git a/Master/texmf-dist/doc/generic/pst-circ/Changes b/Master/texmf-dist/doc/generic/pst-circ/Changes
index a175c3a1a05..92309c71048 100644
--- a/Master/texmf-dist/doc/generic/pst-circ/Changes
+++ b/Master/texmf-dist/doc/generic/pst-circ/Changes
@@ -1,3 +1,4 @@
+1.43 2007-12-18 (hv) - fixed bug with \@empty
 1.42 2007-10-15 (hv) - added better FET support (Ted Pavlic)
                      - small changes to draw@dipole (Alan Ristow)
 1.41 2007-04-23 (hv) added dipolestyle varistor
@@ -28,5 +29,9 @@
 1.0  2003-07-10 (cj) first CTAN version
 
 
+-- pst-circ.sty ---
+2007-03-23 (hv) added message for pst-circ.pro
+
+
 -- pst-circ.pro ---
-0.01  2007-03-23 (hv) first version
\ No newline at end of file
+0.01  2007-03-23 (hv) first version
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 45e9b7e2c46..c34ec7b22fa 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 82304a8ba41..63a82398914 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
@@ -32,7 +32,7 @@
 \begin{document}
 
 \title{\texttt{pst-circ}\\ A PSTricks package for drawing electric circuits\\\normalsize ver. \verPstCirc}
-\author{Christophe Jorssen\thanks{\url{<christophe.jorssen@noos.fr>}} and 
+\author{Christophe Jorssen\thanks{\url{<CJ@PSTricks.de>}} and 
 Herbert Vo\ss\thanks{\url{<voss@PSTricks.de>}}}
 \date{\today}
 \maketitle
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 <Jorssen.lerraincy _at_ free.fr>
-%% Herbert Voss <voss _at_ pstricks.de>
+%% Christophe Jorssen <CJ@PSTricks.de>
+%% Herbert Voss <voss@Pstricks.de>
 %%
 %% 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)
diff --git a/Master/texmf-dist/tex/latex/pst-circ/pst-circ.sty b/Master/texmf-dist/tex/latex/pst-circ/pst-circ.sty
index 31dd14f6045..ec608bcb557 100644
--- a/Master/texmf-dist/tex/latex/pst-circ/pst-circ.sty
+++ b/Master/texmf-dist/tex/latex/pst-circ/pst-circ.sty
@@ -1,10 +1,10 @@
 \RequirePackage{pstricks}
-\ProvidesPackage{pst-circ}[2004/10/31 package wrapper for 
+\ProvidesPackage{pst-circ}[2007/12/23 package wrapper for 
   pst-circ.tex (hv)]
 \input{pst-circ.tex}
 \IfFileExists{pst-circ.pro}{%
   \ProvidesFile{pst-circ.pro}
-    [2007/09/04 v. 0.14,  PostScript prologue file (hv)]
+    [2007/03/23 v. 0.01,  PostScript prologue file (hv)]
     \@addtofilelist{pst-circ.pro}}{}%
 \ProvidesFile{pst-circ.tex}
   [\filedate\space v\fileversion\space `PST-circ' (CJ,hv)]