pst-circ (19apr14)

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

1 files changed, 50 insertions, 30 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 d5f9905cd4d..14d5c2a7fae 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 906 2014-04-15 19:37:50Z herbert $
+%% $Id: pst-circ.tex 909 2014-04-19 08:32:02Z 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.07}
-\def\filedate{2014/04/15}
+\def\fileversion{2.08}
+\def\filedate{2014/04/19}
 \message{`pst-circ' v\fileversion (hv)}
 %
 \edef\PstAtCode{\the\catcode`\@}
@@ -1043,6 +1043,17 @@
   \ignorespaces%
 }
 %
+\def\pst@draw@battery{%
+  \psline[arrows=-,linewidth=1.5\pslinewidth](-0.10,-0.5)(-0.10,0.5)
+  \psline[arrows=-,linewidth=3\pslinewidth](0.10,-0.25)(0.10,0.25)
+  \pnode(-0.1,0){dipole@1}
+  \pnode(0.1,0){dipole@2}
+  \ifPst@variable%
+    \psline{->}(-0.75,-0.5)(0.75,0.5)%
+  \fi
+  }
+%
+%
 \newif\ifPst@temp
 \def\transistor{\def\pst@par{}\pst@object{transistor}}
 \def\transistor@i(#1){%
@@ -1782,30 +1793,30 @@
     \psframe[linewidth=1.5\pslinewidth](-1,-0.75)(1,0.75)
     \pspolygon(-0.4,-0.2)(-0.4,0.2)(-0.05,0)
   \else
-    \pspolygon[arrows=-](-1,-0.75)(-1,0.75)(1,0)(-1,-0.75)
+% USUAL AOP
+    \pspolygon[arrows=-,linewidth=1.5\pslinewidth](-1,-1)(-1,1)(1,0)(-1,-1)
+   	 %\pspolygon[arrows=-](-1,-0.75)(-1,0.75)(1,0)(-1,-0.75)
+    
+% Supply pins Position
     \ifPst@OApower
-      \psline{-o}(0,0.375)(0,0.75)\uput[90](0,0.75){$+$}
-      \psline{-o}(0,-0.375)(0,-0.75)\uput[-90](0,-0.75){$-$}
+      \psline{-}(0,0.5)(0,0.75)%\uput[90](0,1){$+$}
+     	 %\psline{-o}(0,0.375)(0,0.75)\uput[90](0,0.75){$+$}
+      \psline{-}(0,-0.5)(0,-0.75)%\uput[-90](0,-1){$-$}
+     	 %\psline{-o}(0,-0.375)(0,-0.75)\uput[-90](0,-0.75){$-$}
     \fi
   \fi
-  \pnode(-1,0.25){\ifPst@OAinvert Minus@\else Plus@\fi}
-  \pnode(-1,-0.25){\ifPst@OAinvert Plus@\else Minus@\fi}
+% Input Pins Position
+  \pnode(-1,0.5){\ifPst@OAinvert Minus@\else Plus@\fi}
+  \pnode(-1,-0.5){\ifPst@OAinvert Plus@\else Minus@\fi}
   \pnode(1,0){S@}
-  \uput{0.1}[0](-1,0.25){\ifPst@OAinvert$-$\else$+$\fi}
-  \uput{0.1}[0](-1,-0.25){\ifPst@OAinvert$+$\else$-$\fi}
+% + and - Position
+  \uput{0.1}[0](-1,0.5){\ifPst@OAinvert$-$\else$+$\fi}
+ 	 %\uput{0.1}[0](-1,0.25){\ifPst@OAinvert$-$\else$+$\fi}
+  \uput{0.1}[0](-1,-0.5){\ifPst@OAinvert$+$\else$-$\fi}
+ 	 %\uput{0.1}[0](-1,-0.25){\ifPst@OAinvert$+$\else$-$\fi}
   \ifPst@OAperfect\rput(0.25,0){$\infty$}\fi%
 }
 %
-\def\pst@draw@battery{%
-  \psline[arrows=-,linewidth=1.5\pslinewidth](-0.10,-0.5)(-0.10,0.5)
-  \psline[arrows=-,linewidth=3\pslinewidth](0.10,-0.25)(0.10,0.25)
-  \pnode(-0.1,0){dipole@1}
-  \pnode(0.1,0){dipole@2}
-  \ifPst@variable%
-    \psline{->}(-0.75,-0.5)(0.75,0.5)%
-  \fi
-  }
-%
 \def\pst@draw@coil{%
   \ifx\psk@Dstyle\pst@Dstyle@curved
     \pscurve[arrows=-](-0.7,0)(-0.6,0.3)(-0.35,0)(-0.4,-0.2)
@@ -2721,7 +2732,6 @@
 %
 \def\mixer{\pst@object{mixer}}
 \def\mixer@i(#1)(#2)(#3)#4#5{%
-  \addbefore@par{dimen=middle}%
   \pst@getcoor{#1}\pst@tempa
   \pst@getcoor{#2}\pst@tempb
   \pst@getcoor{#3}\pst@tempc
@@ -2735,7 +2745,14 @@
     /XC X1 X2 add 2 div def
     /YC Y2 def
     XC YC){C@}
-  \begingroup\use@par
+  \begingroup
+  \use@keep@par
+  \ifx\psk@tripole@style\pst@tripole@style@top
+    \addbefore@par{labeloffset=-0.9,dimen=middle}%
+  \else
+    \addbefore@par{labeloffset=0.9,dimen=middle}%
+  \fi
+  \use@par
   \rput(C@){\pst@draw@mixer{#3}{#4}{#5}}
   \endgroup
   \ifx\psk@Tinput\pst@Tinput@left%
@@ -2762,10 +2779,9 @@
   \let\psk@fillstyle\psfs@none
   \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}%
+  \pnodes(-0.5,0){Tport@left}(0.5,0){Tport@right}
+  \pcline[linestyle=none,offset=\psk@label@offset](Tport@left)(Tport@right)\ncput{#2}
   \ifx\psk@tripole@style\pst@tripole@style@top%
-    \rput[t](0,-0.6){#2}
     \pnode(0,0.5){Tport@center}
     \ifPst@inputarrow
         \ncangle[arrows=->,arrowinset=0,arm=0.5,angleB=90]{#1}{Tport@center}
@@ -2773,7 +2789,6 @@
         \ncangle[arrows=-,arm=0.5,angleB=90]{#1}{Tport@center}
     \fi
   \else
-    \rput[b](0,0.6){#2}
     \pnode(0,-0.5){Tport@center}
     \ifPst@inputarrow
         \ncangle[arrows=->,arrowinset=0,arm=0.5,angleB=-90]{#1}{Tport@center}
@@ -5223,7 +5238,6 @@
 %
 \def\splitter{\pst@object{splitter}}
 \def\splitter@i(#1)(#2)(#3)#4#5{%
-  \addbefore@par{dimen=middle}%
   \pst@getcoor{#1}\pst@tempa
   \pst@getcoor{#2}\pst@tempb
   \pst@getcoor{#3}\pst@tempc
@@ -5237,7 +5251,14 @@
     /XC X1 X2 add 2 div def
     /YC Y2 def
     XC YC){C@}
-  \begingroup\use@par
+  \begingroup
+  \use@keep@par
+  \ifx\psk@tripole@style\pst@tripole@style@top
+    \addbefore@par{labeloffset=-0.9,dimen=middle}%
+  \else
+    \addbefore@par{labeloffset=0.9,dimen=middle}%
+  \fi
+  \use@par
   \rput(C@){\pst@draw@splitter{#3}{#4}{#5}}
   \ifx\psk@Tinput\pst@Tinput@left%
     \ifPst@inputarrow
@@ -5277,12 +5298,11 @@
 		\fi
   \fi
   \pnodes(-0.5,0){Tport@left}(0.5,0){Tport@right}%
+  \pcline[offset=\psk@label@offset,linestyle=none](Tport@left)(Tport@right)\ncput{#2}%
   \ifx\psk@tripole@style\pst@tripole@style@top%
-    \pcline[offset=-\psk@label@offset,linestyle=none](Tport@left)(Tport@right)\ncput{#2}%
     \pnode(0,0.5){Tport@center}
     \ncangle[arrows=-,arm=0.5,angleB=90]{#1}{Tport@center}
   \else
-    \pcline[offset=\psk@label@offset,linestyle=none](Tport@left)(Tport@right)\ncput{#2}%
     \pnode(0,-0.5){Tport@center}
     \ncangle[arrows=-,arm=0.5,angleB=270]{#1}{Tport@center}
   \fi%