1 files changed, 21 insertions, 22 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 884f709eae8..22aec4edd25 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.46}
-\def\filedate{2008/07/15}
+\def\fileversion{1.47}
+\def\filedate{2008/08/06}
 \message{`pst-circ' v\fileversion (CJ,hv,pd)}
 %
 \edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax
@@ -2504,12 +2504,12 @@
   \end@ClosedObj
   \ignorespaces%
 }
-\newcommand{\pst@draw@mixer}[3]{%
+\def\pst@draw@mixer#1#2#3{%
   \pscircle[#3,linewidth=1.5\pslinewidth](0,0){0.5}
   \psline[linewidth=1.5\pslinewidth](-0.3535,-0.3535)(0.3535,0.3535)
   \psline[linewidth=1.5\pslinewidth](-0.3535,0.3535)(0.3535,-0.3535)
-  \pnode(-0.5,0){Tport@left}
-  \pnode(0.5,0){Tport@right}
+  \pnode(-0.5,0){Tport@left}%
+  \pnode(0.5,0){Tport@right}%
   \ifx\psk@tripole@style\pst@tripole@style@top%
     \rput[t](0,-0.6){#2}
     \pnode(0,0.5){Tport@center}
@@ -2525,8 +2525,8 @@
         \ncangle[arrows=->,arrowinset=0,arm=0.5,angleB=-90]{#1}{Tport@center}
     \else
         \ncangle[arrows=-,arm=0.5,angleB=-90]{#1}{Tport@center}
-    \fi
-  \fi
+    \fi%
+  \fi%
 }
 %
 %%% Circulator
@@ -2561,9 +2561,9 @@
   \end@ClosedObj
   \ignorespaces%
 }
-\newcommand{\pst@draw@circulator}[3]{%
-  \pscircle[#3,linewidth=1.5\pslinewidth](0,0){0.5}
-  \pnode(0,0.6){Tport@label}
+\def\pst@draw@circulator#1#2#3{%
+  \pscircle[#3,linewidth=1.5\pslinewidth](0,0){0.5}%
+  \pnode(0,0.6){Tport@label}%
   \ifx\psk@Tconfig\pst@Tconfig@left%
     \psarc[linewidth=1.5\pslinewidth,arrowinset=0]{<-}{0.35}{15}{155}
     \pnode(-0.5,0){Tport@input}
@@ -2572,15 +2572,15 @@
     \psarc[linewidth=1.5\pslinewidth,arrowinset=0]{->}{0.35}{25}{165}
     \pnode(-0.5,0){Tport@output}
     \pnode(0.5,0){Tport@input}
-  \fi
+  \fi%
   \ifx\psk@tripole@style\pst@tripole@style@isolator%
-    \psline(0,-0.5)(0,-0.95)
+    \psline(0,-0.5)(0,-0.95)%
     \multips{0}(-0.225,-1)(0.1,0){5}%
         {\psline[arrows=-,linewidth=1.5\pslinewidth](0,0)(0.025,0.05)(0.075,-0.05)(0.1,0)}%
   \else
-    \pnode(0,-0.5){Tport@center}
+    \pnode(0,-0.5){Tport@center}%
     \ncline[arrows=-]{#1}{Tport@center}
-  \fi
+  \fi%
 }
 %
 %%% AGC
@@ -2608,7 +2608,7 @@
   \end@ClosedObj
   \ignorespaces%
 }
-\newcommand{\pst@draw@agc}[4]{%
+\def\pst@draw@agc#1#2#3#4{%
   \pnode(-0.433,0){Tport@left}
   \pnode(0.433,0){Tport@right}
   \pnode(0,-0.5){Tport@center}
@@ -2631,8 +2631,8 @@
     \else
         \ncangle[arrows=-,arm=0.5,angleB=180]{Tport@right}{#2}
     \fi
-    \ncangle[arrows=-,arm=0.5,angleB=180]{#1}{Tport@left}
-  \fi
+    \ncangle[arrows=-,arm=0.5,angleB=180]{#1}{Tport@left}%
+  \fi%
 }
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%% Quadripole
@@ -2681,7 +2681,7 @@
   \ignorespaces%
 }
 %
-\newcommand{\pst@draw@coupler}[1]{%
+\def\pst@draw@coupler#1{%
     \pnode(-0.75,0.4){inup@}
     \pnode(0.75,0.4){outup@}
     \psframe[#1,linewidth=1.5\pslinewidth](-0.5,-0.5)(0.5,0.5)
@@ -2738,10 +2738,9 @@
                     {\psline[arrows=-,linewidth=1.5\pslinewidth](0,0)(0.025,0.05)(0.075,-0.05)(0.1,0)}%
                 \psline[arrows=-,linewidth=1.5\pslinewidth](0.8,-0.275)(0.8,-0.2)
                 \psline(0.75,-0.4)(0.5,-0.4)
-            \fi
-        \fi
-    \fi
-%
+            \fi%
+        \fi%
+    \fi%
 }
 %
 \catcode`\@=\PstAtCode\relax