pst-circ update (16mar08)

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

3 files changed, 13 insertions, 12 deletions

diff --git a/Master/texmf-dist/doc/generic/pst-circ/Changes b/Master/texmf-dist/doc/generic/pst-circ/Changes
index ff340303f99..a4c42a4233d 100644
--- a/Master/texmf-dist/doc/generic/pst-circ/Changes
+++ b/Master/texmf-dist/doc/generic/pst-circ/Changes
@@ -1,3 +1,4 @@
+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
 1.42 2007-10-15 (hv) - added better FET support (Ted Pavlic)
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 990e456369b..add10bb62c7 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/tex/generic/pst-circ/pst-circ.tex b/Master/texmf-dist/tex/generic/pst-circ/pst-circ.tex
index 534cebc83f5..595811ece18 100644
--- a/Master/texmf-dist/tex/generic/pst-circ/pst-circ.tex
+++ b/Master/texmf-dist/tex/generic/pst-circ/pst-circ.tex
@@ -29,8 +29,8 @@
 \ifx\PSTnodeLoaded\endinput\else\input pst-node.tex\fi
 \ifx\PSTXKeyLoaded\endinput\else\input pst-xkey \fi
 %
-\def\fileversion{1.44}
-\def\filedate{2008/02/27}
+\def\fileversion{1.45}
+\def\filedate{2008/03/15}
 \message{`pst-circ' v\fileversion (CJ,hv,pd)}
 %
 \edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax
@@ -251,48 +251,48 @@
 %
 \def\Ucc{\@ifnextchar[{\pst@Ucc}{\pst@Ucc[]}}
 \def\pst@Ucc[#1](#2)(#3)#4{{%
-  \pst@draw@dipole{#1}{#2}{#3}{#4}\pst@draw@Ucc
+  \pst@draw@dipole{#1}{#2}{#3}{#4}\pst@draw@Ucc%
   }\ignorespaces}
 %
 \def\Icc{\@ifnextchar[{\pst@Icc}{\pst@Icc[]}}
 \def\pst@Icc[#1](#2)(#3)#4{{%
-  \pst@draw@dipole{#1}{#2}{#3}{#4}\pst@draw@Icc
+  \pst@draw@dipole{#1}{#2}{#3}{#4}\pst@draw@Icc%
   }\ignorespaces}
 %
 \def\switch{\@ifnextchar[{\pst@switch}{\pst@switch[]}}
 \def\pst@switch[#1](#2)(#3)#4{{%
-  \pst@draw@dipole{#1}{#2}{#3}{#4}\pst@draw@switch
+  \pst@draw@dipole{#1}{#2}{#3}{#4}\pst@draw@switch%
   }\ignorespaces}
 %
 \def\diode{\@ifnextchar[{\pst@diode}{\pst@diode[]}}
 \def\pst@diode[#1](#2)(#3)#4{{%
-  \pst@draw@dipole{#1}{#2}{#3}{#4}\pst@draw@diode
+  \pst@draw@dipole{#1}{#2}{#3}{#4}\pst@draw@diode%
   }\ignorespaces}
 %
 \def\Zener{\@ifnextchar[{\pst@Zener}{\pst@Zener[]}}
 \def\pst@Zener[#1](#2)(#3)#4{{%
-  \pst@draw@dipole{#1}{#2}{#3}{#4}\pst@draw@Zener
+  \pst@draw@dipole{#1}{#2}{#3}{#4}\pst@draw@Zener%
   }\ignorespaces}
 %
 \def\lamp{\@ifnextchar[{\pst@lamp}{\pst@lamp[]}}
 \def\pst@lamp[#1](#2)(#3)#4{{%
-  \pst@draw@dipole{#1}{#2}{#3}{#4}\pst@draw@lamp
+  \pst@draw@dipole{#1}{#2}{#3}{#4}\pst@draw@lamp%
   }\ignorespaces}
 %
 \def\circledipole{\@ifnextchar[{\pst@circledipole}{\pst@circledipole[]}}
 \def\pst@circledipole[#1](#2)(#3)#4{{%
-  \pst@draw@dipole{#1}{#2}{#3}{#4}\pst@draw@circledipole
+  \pst@draw@dipole{#1}{#2}{#3}{#4}\pst@draw@circledipole%
   }\ignorespaces}
 %
 \def\LED{\@ifnextchar[{\pst@LED}{\pst@LED[]}}
 \def\pst@LED[#1](#2)(#3)#4{{%
-  \pst@draw@dipole{#1}{#2}{#3}{#4}\pst@draw@LED
+  \pst@draw@dipole{#1}{#2}{#3}{#4}\pst@draw@LED%
   }\ignorespaces}
 %
 % pd start ====================================================
 \def\dashpot{\@ifnextchar[{\pst@dashpot}{\pst@dashpot[]}}
 \def\pst@dashpot[#1](#2)(#3)#4{{%
-  \pst@draw@dipole{#1}{#2}{#3}{#4}\pst@draw@dashpot
+  \pst@draw@dipole{#1}{#2}{#3}{#4}\pst@draw@dashpot%
   }\ignorespaces}
 % pd end ======================================================
 %
@@ -814,7 +814,7 @@
               \let\next\pst@multidipole@Icc
             \else
               \ifx\switch #1%
-                \let\next\pst@multidipole@switchoff
+                \let\next\pst@multidipole@switch %off
               \else
                 \ifx\diode #1%
                   \let\next\pst@multidipole@diode