texlive[49791] Master/texmf-dist: pst-circ (22jan19)
commits+karl at tug.org
commits+karl at tug.org
Tue Jan 22 23:19:16 CET 2019
Revision: 49791
http://tug.org/svn/texlive?view=revision&revision=49791
Author: karl
Date: 2019-01-22 23:19:16 +0100 (Tue, 22 Jan 2019)
Log Message:
-----------
pst-circ (22jan19)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/generic/pst-circ/Changes
trunk/Master/texmf-dist/doc/generic/pst-circ/README
trunk/Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.pdf
trunk/Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.tex
trunk/Master/texmf-dist/tex/generic/pst-circ/pst-circ.tex
trunk/Master/texmf-dist/tex/latex/pst-circ/pst-circ.sty
Modified: trunk/Master/texmf-dist/doc/generic/pst-circ/Changes
===================================================================
--- trunk/Master/texmf-dist/doc/generic/pst-circ/Changes 2019-01-22 22:18:58 UTC (rev 49790)
+++ trunk/Master/texmf-dist/doc/generic/pst-circ/Changes 2019-01-22 22:19:16 UTC (rev 49791)
@@ -1,3 +1,4 @@
+2.16 2019-01-22 fix for arrows in coil-elektor
2.15 2017-11-16 fix bug with TRot=180 for \transistor
2.14 2016-08-21 fix bug with \splitter
2.13 2015-04-15 added some new components (Piere Vivegnis)
Modified: trunk/Master/texmf-dist/doc/generic/pst-circ/README
===================================================================
--- trunk/Master/texmf-dist/doc/generic/pst-circ/README 2019-01-22 22:18:58 UTC (rev 49790)
+++ trunk/Master/texmf-dist/doc/generic/pst-circ/README 2019-01-22 22:19:16 UTC (rev 49791)
@@ -40,3 +40,4 @@
For another PDF output read the Introduction from
the documentation.
+hvoss at tug.org
\ No newline at end of file
Modified: trunk/Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.tex
===================================================================
--- trunk/Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.tex 2019-01-22 22:18:58 UTC (rev 49790)
+++ trunk/Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.tex 2019-01-22 22:19:16 UTC (rev 49791)
@@ -1,7 +1,6 @@
-%% $Id: pst-circ-doc.tex 646 2017-11-16 09:46:12Z herbert $
-\documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings,
- headexclude,footexclude,oneside,enabledeprecatedfontcommands]{pst-doc}
-\usepackage[utf8]{inputenc}
+%% $Id: pst-circ-doc.tex 918 2019-01-22 16:41:03Z herbert $
+\documentclass[fontsize=11pt,english,BCOR=10mm,DIV=12,bibliography=totoc,parskip=false,
+ headings=small, headinclude=false,footinclude=false,oneside,abstract=on]{pst-doc}
\usepackage{pst-circ}
\let\pstCircFV\fileversion
\usepackage{amsmath,siunitx}
Modified: trunk/Master/texmf-dist/tex/generic/pst-circ/pst-circ.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/pst-circ/pst-circ.tex 2019-01-22 22:18:58 UTC (rev 49790)
+++ trunk/Master/texmf-dist/tex/generic/pst-circ/pst-circ.tex 2019-01-22 22:19:16 UTC (rev 49791)
@@ -1,4 +1,4 @@
-%% $Id: pst-circ.tex 646 2017-11-16 09:46:12Z herbert $
+%% $Id: pst-circ.tex 918 2019-01-22 16:41:03Z 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.15}
-\def\filedate{2017/11/16}
+\def\fileversion{2.16}
+\def\filedate{2019/01/22}
\message{`pst-circ' v\fileversion (hv)}
%
\edef\PstAtCode{\the\catcode`\@}
@@ -155,6 +155,7 @@
\ifx\psk at Ttype\pst at Ttype@FET \Pst at transistorcirclefalse\fi}
\newdimen\Pst at basesep
\define at key[psset]{pst-circ}{basesep}[0]{\pst at getlength{#1}\Pst at basesep}
+%\define at key[psset]{pst-circ}{TRot}[0]{\def\Pst at TRot{#1}}
\define at key[psset]{pst-circ}{TRot}[0]{\pst at checknum{#1}\Pst at TRot}
\define at key[psset]{pst-circ}{circedge}[\pcangle]{%
\let\pscirc at edge#1%
@@ -1154,7 +1155,7 @@
\newif\ifPst at temp
\def\transistor{\def\pst at par{}\pst at object{transistor}}
\def\transistor at i(#1){%
-% \addbefore at par{circedge=\pcangle}
+ \addbefore at par{dimen=inner}
\pst at killglue
\begingroup
\use at par
@@ -1165,7 +1166,7 @@
\def\transistor at ii(#1)#2#3{% with one node, the base
\pst at killglue%
\ifPst at temp\pnode(#1){TBaseNode}%
- \else%
+ \else
\pst at getcoor{#1}\pst at tempA%
\pnode(!
\pst at tempA /YB exch \pst at number\psyunit div def
@@ -1173,7 +1174,7 @@
/basesep \Pst at basesep\space \pst at number\psxunit div def
XB basesep \Pst at TRot\space cos mul add
YB basesep \Pst at TRot\space sin mul add){TBaseNode}% base node
- \fi%
+ \fi
\rput[c]{\Pst at TRot}(!
\pst at tempA /YB exch \pst at number\psyunit div def
/XB exch \pst at number\psxunit div def
@@ -1180,26 +1181,29 @@
/basesep \Pst at basesep\space \pst at number\psxunit div def
XB basesep \Pst at TRot\space cos mul add
YB basesep \Pst at TRot\space sin mul add){%
- \ifnum180=\Pst at TRot
- \ifPst at transistorcircle\pscircle(0.3,0){0.7}\fi
- \ifx\psk at Ttype\pst at Ttype@NPN
-% \psdot[dotscale=3]
+ \ifdim180pt=\Pst at TRot pt\relax
+ \ifPst at transistorcircle\pscircle(0.3,0){0.7}\fi
+ \ifx\psk at Ttype\pst at Ttype@NPN\relax
\ifPst at 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)%
+ \pnode(0.5,-0.5){#2}%
+ \pnode(0.5,0.5){#3}%
\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)%
+ \pnode(0.5,-0.5){#3}%
+ \pnode(0.5,0.5){#2}%
\fi
\psline[linewidth=4\pslinewidth,arrows=-](TBaseNode|0,0.4)(TBaseNode|0,-0.4)%
- \else
- \ifx\psk at Ttype\pst at Ttype@PNP\relax%
- \ifPst at transistorinvert\pnode(0.5,-0.5){#2}\else\pnode(0.5,-0.5){#3}\fi%
- \ifPst at 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
+ \psline[arrowinset=0,arrowsize=8\pslinewidth,arrows=->](#2)(TBaseNode)(#3)%
+ \else
+ \ifx\psk at Ttype\pst at Ttype@PNP\relax
+ \ifPst at transistorinvert
+ \pnode(0.5,-0.5){#2}\pnode(0.5,0.5){#3}%
+ \else
+ \pnode(0.5,-0.5){#3}\pnode(0.5,0.5){#2}%
+ \fi
+ \psline[linewidth=4\pslinewidth,arrows=-](TBaseNode|0,0.4)(TBaseNode|0,-0.4)%
+ \psline[arrowinset=0,arrowsize=8\pslinewidth,arrows=->,dimen=middle](0.5,-0.5)(TBaseNode)%
+ \psline(0.5,0.5)(TBaseNode)
+ \else% FET
\ifx\psk at Ttype\pst at Ttype@FET\relax%
\ifPst at transistorinvert\pnode(0.75,-0.5){#2}\else\pnode(0.75,-0.5){#3}\fi%
\ifPst at transistorinvert\pnode(0.75,0.5){#3}\else\pnode(0.75,0.5){#2}\fi%
@@ -1277,9 +1281,7 @@
\psline[arrows=-](0.65,0.4)(0.15,0.4) % upper line
\psline[linewidth=3\psk at 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 at I@width](TBaseNode|0,0.4)(TBaseNode|0,-0.4)%
-
\ifPst at transistorinvert\pnode(0.65,0.4){#2}\else\pnode(0.65,0.4){#3}\fi%
\ifPst at transistorinvert\pnode(0.65,-0.4){#3}\else\pnode(0.65,-0.4){#2}\fi%
\ifPst at transistorinvert
@@ -1294,30 +1296,35 @@
\psline[linewidth=3\psk at 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 at I@width](TBaseNode|0,0.4)(TBaseNode|0,-0.4)%
- \ifPst at transistorinvert\pnode(0.65,0.4){#2}\else\pnode(0.65,0.4){#3}\fi%
- \ifPst at transistorinvert\pnode(0.65,-0.4){#3}\else\pnode(0.65,-0.4){#2}\fi%
- \ifPst at transistorinvert
- \psline[arrowinset=0,arrowsize=8\pslinewidth]{<-}(0.15,0.4)(0.65,0.4)%
- \else
- \psline[arrowinset=0,arrowsize=8\pslinewidth]{<-}(0.15,-0.4)(0.65,-0.4)%
- \fi
- \else % PNP or NPN
- \ifPst at transistorinvert\pnode(0.5,0.5){#2}\pnode(0.5,-0.5){#3}%
- \else \pnode(0.5,0.5){#3}\pnode(0.5,-0.5){#2}%
- \fi
- \ifx\psk at Ttype\pst at Ttype@NPN\relax% % NPN
- \psline[arrowinset=0,arrowsize=8\pslinewidth]{->}(TBaseNode)(#2)%
- \psline[arrows=-,linewidth=4\pslinewidth](TBaseNode|0,0.4)(TBaseNode|0,-0.4)%
- \psline[arrows=-](0.5,0.5)(TBaseNode)(0.5,-0.5)%
- \else% % PNP
- \psline[arrowinset=0,arrowsize=8\pslinewidth]{->}(#3)(TBaseNode)%
- \psline[arrows=-,linewidth=4\pslinewidth](TBaseNode|0,0.4)(TBaseNode|0,-0.4)%
- \psline[arrows=-](0.5,0.5)(TBaseNode)(0.5,-0.5)%
- \fi
- \fi%
- \fi%
- \fi%
- \fi%
+ \ifPst at transistorinvert
+ \pnode(0.65,0.4){#2}\pnode(0.65,-0.4){#3}
+ \else
+ \pnode(0.65,0.4){#3}\pnode(0.65,-0.4){#2}
+ \fi%
+ \ifPst at transistorinvert
+ \psline[arrowinset=0,arrowsize=8\pslinewidth]{<-}(0.15,0.4)(0.65,0.4)%
+ \else
+ \psline[arrowinset=0,arrowsize=8\pslinewidth]{<-}(0.15,-0.4)(0.65,-0.4)%
+ \fi
+ \else % PNP or NPN
+ \ifPst at transistorinvert
+ \pnode(0.5,0.5){#2}\pnode(0.5,-0.5){#3}%
+ \else
+ \pnode(0.5,0.5){#3}\pnode(0.5,-0.5){#2}%
+ \fi
+ \ifx\psk at Ttype\pst at Ttype@NPN\relax% % NPN
+ \psline[arrowinset=0,arrowsize=8\pslinewidth]{->}(TBaseNode)(#2)%
+ \psline[arrows=-,linewidth=4\pslinewidth](TBaseNode|0,0.4)(TBaseNode|0,-0.4)%
+ \psline[arrows=-](0.5,0.5)(TBaseNode)(0.5,-0.5)%
+ \else% % PNP
+ \psline[arrowinset=0,arrowsize=8\pslinewidth]{->}(#3)(TBaseNode)%
+ \psline[arrows=-,linewidth=4\pslinewidth](TBaseNode|0,0.4)(TBaseNode|0,-0.4)%
+ \psline[arrows=-](0.5,0.5)(TBaseNode)(0.5,-0.5)%
+ \fi
+ \fi
+ \fi
+ \fi
+ \fi
}%
\ifPst at temp\else\endgroup\fi%
\ignorespaces%
@@ -1343,64 +1350,64 @@
\global\Pst at temptrue%
\transistor at ii(@@base){@@emitter}{@@collector}%
%
- \if\psk at labeltransistoribase\@empty\else\psset{transistoribase=true}\fi%
- \if\psk at labeltransistoriemitter\@empty\else\psset{transistoriemitter=true}\fi%
- \if\psk at labeltransistoricollector\@empty\else\psset{transistoricollector=true}\fi%
- \ifPst at intensity\psset{transistoribase=true,transistoriemitter=true,transistoricollector=true}\fi%
+ \if\psk at labeltransistoribase\@empty\else\psset{transistoribase=true}\fi
+ \if\psk at labeltransistoriemitter\@empty\else\psset{transistoriemitter=true}\fi
+ \if\psk at labeltransistoricollector\@empty\else\psset{transistoricollector=true}\fi
+ \ifPst at intensity\psset{transistoribase=true,transistoriemitter=true,transistoricollector=true}\fi
%
- \bgroup\psset{style=baseOpt}\pscirc at edge(#1)(TBaseNode)\egroup%
+ \bgroup\psset{style=baseOpt}\pscirc at edge(#1)(TBaseNode)\egroup
\ifPst at transistoribase% base current?
\ncput[npos=0.5,nrot=\Pst at TRot]{%
\psline[linecolor=\psk at I@color,linewidth=\psk at I@width,%
arrowsize=6\pslinewidth,arrowinset=0]{->}(-.1,0)(.1,0)}%
\naput[npos=0.5]{\csname\psk at I@labelcolor\endcsname\psk at labeltransistoribase}%
- \fi%
- \bgroup%
+ \fi
+ \bgroup
\psset{style=collectorOpt}%
\ifPst at transistorinvert
\pscirc at edge(#3)(@@emitter)
\else
\pscirc at edge(#3)(@@collector)
- \fi%
- \egroup%
+ \fi
+ \egroup
\ncput[npos=2]{\pnode{\ifPst at transistorinvert @@emitter\else @@collector\fi}}%
\ifPst at transistoriemitter% emitter current?
\ifPst at transistorinvert% emitter/collector changed?
\ncput[npos=\pscirc at edge@sector,nrot=:U]{%
\psline[linecolor=\psk at I@color,linewidth=\psk at I@width,%
- arrowsize=6\pslinewidth,arrowinset=0]{->}(-0.1,0)(0.1,0)}
- \nbput[npos=\pscirc at edge@sector]{\csname\psk at I@labelcolor\endcsname\psk at labeltransistoriemitter}
- \fi\fi%
+ arrowsize=6\pslinewidth,arrowinset=0]{->}(-0.1,0)(0.1,0)}%
+ \nbput[npos=\pscirc at edge@sector]{\csname\psk at I@labelcolor\endcsname\psk at labeltransistoriemitter}%
+ \fi\fi
\ifPst at transistoricollector% collector current?
\ifPst at transistorinvert\else% emitter/collector changed?
\ncput[npos=\pscirc at edge@sector,nrot=:U]{%
- \psline[linecolor=\psk at I@color,linewidth=\psk at I@width,%
+ \psline[linecolor=\psk at I@color,linewidth=\psk at I@width,
arrowsize=6\pslinewidth,arrowinset=0]{->}(-.1,0)(.1,0)}
- \nbput[npos=\pscirc at edge@sector]{\csname\psk at I@labelcolor\endcsname\psk at labeltransistoricollector}
- \fi\fi%
+ \nbput[npos=\pscirc at edge@sector]{\csname\psk at I@labelcolor\endcsname\psk at labeltransistoricollector}%
+ \fi\fi
\bgroup
- \psset{style=emitterOpt}
+ \psset{style=emitterOpt}%
\ifPst at transistorinvert\pscirc at edge(#2)(@@collector)\else\pscirc at edge(#2)(@@emitter)\fi
\egroup
- \ncput[npos=2]{\pnode{\ifPst at transistorinvert @@collector\else @@emitter\fi}}
+ \ncput[npos=2]{\pnode{\ifPst at transistorinvert @@collector\else @@emitter\fi}}%
\ifPst at transistoriemitter
\ifPst at transistorinvert\else
\ncput[npos=\pscirc at edge@sector,nrot=:U]{%
\psline[linecolor=\psk at I@color,linewidth=\psk at I@width,
arrowsize=6\pslinewidth,arrowinset=0]{<-}(-.1,0)(.1,0)}
- \naput[npos=\pscirc at edge@sector]{\csname\psk at I@labelcolor\endcsname\psk at labeltransistoriemitter}
- \fi\fi%
+ \naput[npos=\pscirc at edge@sector]{\csname\psk at I@labelcolor\endcsname\psk at labeltransistoriemitter}%
+ \fi\fi
\ifPst at transistoricollector% collector current?
\ifPst at transistorinvert% emitter/collector changed?
\ncput[npos=\pscirc at edge@sector,nrot=:U]{%
\psline[linecolor=\psk at I@color,linewidth=\psk at I@width,
arrowsize=6\pslinewidth,arrowinset=0]{<-}(-.1,0)(.1,0)}
- \naput[npos=\pscirc at edge@sector]{\csname\psk at I@labelcolor\endcsname\psk at labeltransistoricollector}
+ \naput[npos=\pscirc at edge@sector]{\csname\psk at I@labelcolor\endcsname\psk at labeltransistoricollector}%
\fi\fi
\psline[linestyle=none](#1)(#2)% for the end arrows
\psline[linestyle=none](#1)(#3)% for the end arrows
\endgroup
- \ignorespaces%
+ \ignorespaces
}
%
\def\Tswitch{\pst at object{Tswitch}}
@@ -1999,19 +2006,19 @@
%
\def\pst at draw@coil{%
\ifx\psk at Dstyle\pst at Dstyle@curved
- \pscurve[arrows=-](-0.7,0)(-0.6,0.3)(-0.35,0)(-0.4,-0.2)
- (-0.5,0)(-0.4,0.3)(-0.15,0)(-0.2,-0.2)(-0.3,0)
- (-0.2,0.3)(0.05,0)(0,-0.2)(-0.1,0)
- (0,0.3)(0.25,0)(0.2,-0.2)(0.1,0)
- (0.2,0.3)(0.45,0)(0.4,-0.2)(0.3,0)
- (0.4,0.3)(0.65,0)(0.6,-0.2)(0.5,0)
+ \pscurve[arrows=-](-0.7,0)(-0.6,0.3)(-0.35,0)(-0.4,-0.2)%
+ (-0.5,0)(-0.4,0.3)(-0.15,0)(-0.2,-0.2)(-0.3,0)%
+ (-0.2,0.3)(0.05,0)(0,-0.2)(-0.1,0)%
+ (0,0.3)(0.25,0)(0.2,-0.2)(0.1,0)%
+ (0.2,0.3)(0.45,0)(0.4,-0.2)(0.3,0)%
+ (0.4,0.3)(0.65,0)(0.6,-0.2)(0.5,0)%
\pnode(-0.7,0){dipole at 1}
\pnode(0.5,0){dipole at 2}
\else
\ifx\psk at Dstyle\pst at Dstyle@elektor
\psarcn[arrows=c-](-0.3885794,0){0.1295265}{-180}{0}
- \psarcn(-0.1295265,0){0.1295265}{-180}{0}
- \psarcn(0.1295265,0){0.1295265}{-180}{0}
+ \psarcn[arrows=-](-0.1295265,0){0.1295265}{-180}{0}
+ \psarcn[arrows=-](0.1295265,0){0.1295265}{-180}{0}
\psarcn[arrows=-c](0.3885794,0){0.1295265}{-180}{0}
\pnode(-0.5181058,0){dipole at 1}
\pnode(0.5181058,0){dipole at 2}
Modified: trunk/Master/texmf-dist/tex/latex/pst-circ/pst-circ.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/pst-circ/pst-circ.sty 2019-01-22 22:18:58 UTC (rev 49790)
+++ trunk/Master/texmf-dist/tex/latex/pst-circ/pst-circ.sty 2019-01-22 22:19:16 UTC (rev 49791)
@@ -1,6 +1,6 @@
-%% $Id: pst-circ.sty 646 2017-11-16 09:46:12Z herbert $
+%% $Id: pst-circ.sty 918 2019-01-22 16:41:03Z herbert $
\RequirePackage{pstricks}
-\ProvidesPackage{pst-circ}[2007/12/23 package wrapper for
+\ProvidesPackage{pst-circ}[2019/01/22 package wrapper for
pst-circ.tex (hv)]
\input{pst-circ.tex}
\IfFileExists{pst-circ.pro}{%
@@ -9,4 +9,6 @@
\@addtofilelist{pst-circ.pro}}{}%
\ProvidesFile{pst-circ.tex}
[\filedate\space v\fileversion\space `PST-circ' (CJ,hv)]
+\let\bf\bfseries
+\let\it\itshape
\endinput
More information about the tex-live-commits
mailing list