pst-circ (16nov17)

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

2 files changed, 19 insertions, 39 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 4beb50119a3..db268caba9e 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 928 2014-06-19 13:56:25Z herbert $
+%% $Id: pst-circ.tex 646 2017-11-16 09:46:12Z 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.14}
-\def\filedate{2016/08/21}
+\def\fileversion{2.15}
+\def\filedate{2017/11/16}
 \message{`pst-circ' v\fileversion (hv)}
 %
 \edef\PstAtCode{\the\catcode`\@}
@@ -1174,50 +1174,44 @@
       XB basesep \Pst@TRot\space cos mul add
       YB basesep \Pst@TRot\space sin mul add){TBaseNode}% base node
   \fi%
-%  \psdot(#1)%
   \rput[c]{\Pst@TRot}(!
       \pst@tempA /YB exch \pst@number\psyunit div def
       /XB exch \pst@number\psxunit div def
       /basesep \Pst@basesep\space \pst@number\psxunit div def
       XB basesep \Pst@TRot\space cos mul add
-      YB basesep \Pst@TRot\space sin mul add){%(#1){%
-
-  %%%%%%%%%%
-    \ifnum180=\Pst@TRot\relax%
+      YB basesep \Pst@TRot\space sin mul add){%
+    \ifnum180=\Pst@TRot
     	\ifPst@transistorcircle\pscircle(0.3,0){0.7}\fi
-	
-    	\ifx\psk@Ttype\pst@Ttype@NPN\relax%
-	
-	      	\ifPst@transistorinvert\pnode(0.5,-0.5){#2}\else\pnode(0.5,-0.5){#3}\fi%
-        	\ifPst@transistorinvert\pnode(0.5,0.5){#3}\else\pnode(0.5,0.5){#2}\fi%
-	
-		    \psline[arrows=-](0.5,0.5)(TBaseNode)(0.5,-0.5)%
-		    
-		    \psline[arrows=-,linewidth=4\pslinewidth](TBaseNode|0,0.4)(TBaseNode|0,-0.4)%
-    	\else% 
+    	\ifx\psk@Ttype\pst@Ttype@NPN 
+%  \psdot[dotscale=3]
+          \ifPst@transistorinvert
+            \pnode(0.5,-0.5){#2}
+            \pnode(0.5,0.5){#3}
+            \psline[arrowinset=0,arrowsize=8\pslinewidth,arrows=<-](0.5,0.5)(TBaseNode)(0.5,-0.5)%
+          \else
+            \pnode(0.5,-0.5){#3}
+            \pnode(0.5,0.5){#2}
+            \psline[arrowinset=0,arrowsize=8\pslinewidth,arrows=->](0.5,0.5)(TBaseNode)(0.5,-0.5)%
+          \fi
+          \psline[linewidth=4\pslinewidth,arrows=-](TBaseNode|0,0.4)(TBaseNode|0,-0.4)%
+    	\else
       		\ifx\psk@Ttype\pst@Ttype@PNP\relax%
 		        \ifPst@transistorinvert\pnode(0.5,-0.5){#2}\else\pnode(0.5,-0.5){#3}\fi%
             	\ifPst@transistorinvert\pnode(0.5,0.5){#3}\else\pnode(0.5,0.5){#2}\fi%
-	
 			    \psline[arrows=-](0.5,0.5)(TBaseNode)(0.5,-0.5)%
-
           	\else%  FET 
 				\ifx\psk@Ttype\pst@Ttype@FET\relax%
-				
 					\ifPst@transistorinvert\pnode(0.75,-0.5){#2}\else\pnode(0.75,-0.5){#3}\fi%
         			\ifPst@transistorinvert\pnode(0.75,0.5){#3}\else\pnode(0.75,0.5){#2}\fi%
 				    % Main drawings
 				    \psline[arrows=-](0.75,0.5)(0.2,0.5)
                     \psline[linestyle=dashed,dash=8pt 3pt,arrows=-](0.2,0.6)(0.2,-0.6)
                     \psline[arrows=-](0.2,-0.5)(0.75,-0.5)%
-                    
                     \ifPst@FETmemory% atosch
                     	\psline[arrows=-,linewidth=\psk@I@width](-0.15,0.5)(-0.15,-0.5)%
                   	\fi%
                   	\psline[arrows=-,linewidth=\psk@I@width](TBaseNode|0,0.5)(TBaseNode|0,-0.5)%
-                    
                     \ifx\psk@FETchanneltype\pst@FETchanneltype@P\relax% Ted 2007-10-15
-                    
                 		\psline[arrowinset=0,arrowsize=8\pslinewidth]{->}(0.2,0)(0.75,0)%
 						\ifPst@transistorinvert
         					\qdisk(#3){1.5pt}\psline[origin={#3}]{-}(0,-0.5)%
@@ -1232,8 +1226,6 @@
 							\qdisk(#2){1.5pt}\psline[origin={#2}]{-}(0,-0.5)%
 						\fi
              		\fi%
-
-      				
 				\else % NMOS or PMOS
 					\ifPst@transistorinvert\pnode(0.75,-0.4){#2}\else\pnode(0.75,-0.4){#3}\fi%
         			\ifPst@transistorinvert\pnode(0.75,0.4){#3}\else\pnode(0.75,0.4){#2}\fi%
@@ -1241,8 +1233,6 @@
     				\psline[arrows=-](0.75,0.4)(0.15,0.4)
                     \psline[linewidth=3\psk@I@width,arrows=-](0.15,0.6)(0.15,-0.6)
                     \psline[arrows=-](0.75,-0.4)(0.15,-0.4)%
-                    
-      				
 					 \ifx\psk@Ttype\pst@Ttype@NMOS\relax%
 					 	\ifPst@transistorinvert
         					\psline[arrowinset=0,arrowsize=8\pslinewidth]{->}(0.15,0.4)(0.75,0.4)%
@@ -1250,7 +1240,6 @@
 							\psline[arrowinset=0,arrowsize=8\pslinewidth]{->}(0.15,-0.4)(0.75,-0.4)%
 						\fi
 						\psline[arrows=-,linewidth=1.5\psk@I@width](TBaseNode|0,0.4)(TBaseNode|0,-0.4)%
-
 					\else
 						\ifPst@transistorinvert
         					\psline[arrowinset=0,arrowsize=8\pslinewidth]{<-}(0.15,0.4)(0.75,0.4)%
@@ -1267,19 +1256,14 @@
 		\ifx\psk@Ttype\pst@Ttype@FET\relax%
 			\ifPst@transistorinvert\pnode(0.65,0.5){#2}\else\pnode(0.65,0.5){#3}\fi%
         	\ifPst@transistorinvert\pnode(0.65,-0.5){#3}\else\pnode(0.65,-0.5){#2}\fi%
-		
 			% FET Main drawings
-			
 		    \psline[arrows=-](0.65,0.5)(0.15,0.5) % upper line
             \psline[linestyle=dashed,dash=8pt 3pt,arrows=-](0.15,0.6)(0.15,-0.6) % gate
             \psline[arrows=-](0.15,-0.5)(0.65,-0.5)% lower line
-            
             \ifPst@FETmemory% atosch
             	\psline[arrows=-,linewidth=\psk@I@width](-0.15,0.5)(-0.15,-0.5)%
           	\fi%
           	\psline[arrows=-,linewidth=\psk@I@width](TBaseNode|0,0.5)(TBaseNode|0,-0.5)%
-            
-            
             \ifx\psk@FETchanneltype\pst@FETchanneltype@P\relax% Ted 2007-10-15
         		\psline[arrowinset=0,arrowsize=8\pslinewidth]{->}(0.15,0)(0.65,0)%
 				\qdisk(#3){1.5pt}\psline[origin={#3}]{-}(0,-0.5)%
@@ -1287,8 +1271,6 @@
       			\psline[arrowinset=0,arrowsize=8\pslinewidth]{<-}(0.15,0)(0.65,0)%
 				\qdisk(#2){1.5pt}\psline[origin={#2}]{-}(0,0.5)%
      		\fi%
-            
-
 		\else
 			\ifx\psk@Ttype\pst@Ttype@NMOS\relax%
 				% NMOS Main drawings
@@ -1311,9 +1293,7 @@
     				\psline[arrows=-](0.65,0.4)(0.15,0.4) % upper line
                     \psline[linewidth=3\psk@I@width,arrows=-](0.15,0.6)(0.15,-0.6) % gate
                     \psline[arrows=-](0.65,-0.4)(0.15,-0.4)% lower line
-                
                 	\psline[arrows=-,linewidth=1.5\psk@I@width](TBaseNode|0,0.4)(TBaseNode|0,-0.4)%
-                    
             		\ifPst@transistorinvert\pnode(0.65,0.4){#2}\else\pnode(0.65,0.4){#3}\fi%
             		\ifPst@transistorinvert\pnode(0.65,-0.4){#3}\else\pnode(0.65,-0.4){#2}\fi%
     				\ifPst@transistorinvert
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 5034be3d68c..93fb9e9b586 100644
--- a/Master/texmf-dist/tex/latex/pst-circ/pst-circ.sty
+++ b/Master/texmf-dist/tex/latex/pst-circ/pst-circ.sty
@@ -1,4 +1,4 @@
-%% $Id: pst-circ.sty 3 2007-12-23 16:23:22Z herbert $
+%% $Id: pst-circ.sty 646 2017-11-16 09:46:12Z herbert $
 \RequirePackage{pstricks}
 \ProvidesPackage{pst-circ}[2007/12/23 package wrapper for 
   pst-circ.tex (hv)]