texlive[60464] Master/texmf-dist: pst-circ (10sep21)
commits+karl at tug.org
commits+karl at tug.org
Fri Sep 10 23:02:02 CEST 2021
Revision: 60464
http://tug.org/svn/texlive?view=revision&revision=60464
Author: karl
Date: 2021-09-10 23:02:02 +0200 (Fri, 10 Sep 2021)
Log Message:
-----------
pst-circ (10sep21)
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/dvips/pst-circ/pst-circ.pro
trunk/Master/texmf-dist/tex/generic/pst-circ/pst-circ.tex
trunk/Master/texmf-dist/tex/latex/pst-circ/pst-circ.sty
Removed Paths:
-------------
trunk/Master/texmf-dist/source/generic/pst-circ/
Modified: trunk/Master/texmf-dist/doc/generic/pst-circ/Changes
===================================================================
--- trunk/Master/texmf-dist/doc/generic/pst-circ/Changes 2021-09-10 16:25:56 UTC (rev 60463)
+++ trunk/Master/texmf-dist/doc/generic/pst-circ/Changes 2021-09-10 21:02:02 UTC (rev 60464)
@@ -1,3 +1,4 @@
+2.19 2021-09-09 fixes for use with lualatex
2.18 2021-04-28 Added new transistors: JFET (N and P channels),
D-MOSFET (N and P channels), and IGBT
2.17 2020-05-26 fix for colors in xcolor notation
@@ -89,4 +90,5 @@
-- pst-circ.pro ---
+0.02 2021-09-09 added tx at CircDict for use in pst-circ.tex
0.01 2007-03-23 (hv) first version
Modified: trunk/Master/texmf-dist/doc/generic/pst-circ/README
===================================================================
--- trunk/Master/texmf-dist/doc/generic/pst-circ/README 2021-09-10 16:25:56 UTC (rev 60463)
+++ trunk/Master/texmf-dist/doc/generic/pst-circ/README 2021-09-10 21:02:02 UTC (rev 60464)
@@ -1,12 +1,9 @@
-If you have TeX run by a distribution then you can ignore all the
-follwoing text, because verything is done by your package manager.
-
Save the files pst-circ.sty|tex in a directory, which is part of your
local TeX tree. pst-circ.pro should be saved in ../texmf/dvips/pstricks/
Then do not forget to run texhash to update this tree.
pst-circ needs pst-node and pstricks, which should be part of your
local TeX installation, otherwise get it from a CTAN server, f.ex.
-http://mirror.ctan.org
+https://mirror.ctan.org
Save the files
@@ -43,9 +40,4 @@
For another PDF output read the Introduction from
the documentation.
-
-%% This package may be distributed under the terms of the LaTeX Project
-%% Public License, as described in lppl.txt in the base LaTeX distribution.
-%% Either version 1.0 or, at your option, any later version.
-
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 2021-09-10 16:25:56 UTC (rev 60463)
+++ trunk/Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.tex 2021-09-10 21:02:02 UTC (rev 60464)
@@ -1,6 +1,8 @@
-%% $Id: pst-circ-doc.tex 1181 2020-05-26 13:19:14Z herbert $
-\documentclass[fontsize=11pt,english,BCOR=10mm,DIV=12,bibliography=totoc,parskip=false,
- headings=small, headinclude=false,footinclude=false,oneside,abstract=on]{pst-doc}
+%% $Id: pst-circ-doc.tex 210 2021-09-10 07:52:09Z herbert $
+\RequirePackage{pdfmanagement-testphase}
+\DeclareDocumentMetadata{}
+\documentclass[11pt,english,BCOR=10mm,DIV=12,bibliography=totoc,parskip=false,headings=small,
+ headinclude=false,footinclude=false,twoside,english]{pst-doc}
\usepackage{amsmath,siunitx}
\usepackage{pst-circ}
\let\pstCircFV\fileversion
@@ -75,7 +77,7 @@
Herbert Vo\ss}
%\docauthor{Herbert Vo\ss}
\date{\today}
-\maketitle
+\settitle
\tableofcontents
@@ -2162,7 +2164,8 @@
There are dipoleinput or tripoleinput or quadripoleinput and arrowinput parameters.
The value of theses parameters are left or right for the first one and true or false for second one.
-\xLcs{ifPst at inputarrow}\xLcs{pcline}
+%\xLcs{ifPst at inputarrow}
+\xLcs{pcline}
\begin{lstlisting}[style=code]
\ifPst at inputarrow
\ifx\psk at Dinput\pst at Dinput@right
@@ -4225,7 +4228,7 @@
This code can be placed in the core code or somewhere in the respective document in which case it must be surrounded by \lstinline[language=TeX]{\makeatletter...\makeatother}.
If your new dipole should also work with \Lcs{multidipole} then you have to make some changes in the \Lcs{multidipole} core code. In the definition
-of \Lcs{pst at multidipole}, look for the last \Lcs{ifx} test
+of \nxLcs{pst at multidipole}, look for the last \nxLcs{ifx} test
\begin{lstlisting}[language=TeX]
% ...
% Extract from \pst at multidipole
Modified: trunk/Master/texmf-dist/dvips/pst-circ/pst-circ.pro
===================================================================
--- trunk/Master/texmf-dist/dvips/pst-circ/pst-circ.pro 2021-09-10 16:25:56 UTC (rev 60463)
+++ trunk/Master/texmf-dist/dvips/pst-circ/pst-circ.pro 2021-09-10 21:02:02 UTC (rev 60464)
@@ -1,10 +1,11 @@
%!
-% $Id: pst-circ.pro 646 2017-11-16 09:46:12Z herbert $
+% $Id: pst-circ.pro 209 2021-09-10 06:24:23Z herbert $
%
% PostScript prologue for pst-circ.tex.
-% version 0.01 2007-03-23 (hv)
+% version 0.02 2021-09-09 (hv)
% For distribution, see pstricks.tex.
%
+/tx at CircDict 50 dict def % used in pst-circ.tex
/GetNode {
tx at NodeDict begin
tx at NodeDict 1 index known { load GetCenter } { pop 0 0 } ifelse
Modified: trunk/Master/texmf-dist/tex/generic/pst-circ/pst-circ.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/pst-circ/pst-circ.tex 2021-09-10 16:25:56 UTC (rev 60463)
+++ trunk/Master/texmf-dist/tex/generic/pst-circ/pst-circ.tex 2021-09-10 21:02:02 UTC (rev 60464)
@@ -1,4 +1,4 @@
-%% $Id: pst-circ.tex 1181 2020-05-26 13:19:14Z herbert $
+%% $Id: pst-circ.tex 210 2021-09-10 07:52:09Z 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.18}
-\def\filedate{2021/04/28}
+\def\fileversion{2.19}
+\def\filedate{2021/09/09}
\message{`pst-circ' v\fileversion (hv)}
%
\edef\PstAtCode{\the\catcode`\@}
@@ -1011,7 +1011,7 @@
\pst at getcoor{#1}\pst at tempa
\pst at getcoor{#2}\pst at tempb
\pst at getcoor{#3}\pst at tempc
- \pnode(!%
+ \pnode(! 10 dict begin
\pst at tempa /Y1 exch \pst at number\psyunit div def
/X1 exch \pst at number\psxunit div def
\pst at tempb /Y2 exch \pst at number\psyunit div def
@@ -1020,7 +1020,7 @@
/X3 exch \pst at number\psxunit div def
/XC X1 X2 lt {X3 X2} {X3 X1} ifelse add 2 div def
/YC Y1 Y2 add 2 div def
- XC YC){C@}
+ XC YC end ){C@}
\rput(C@){\pst at draw@OA}
\ncangle[arrows=-,arm=.5,angleA=0,angleB=180]{#1}{\ifPst at OAinvert Minus@\else Plus@\fi}
\ncput[npos=2]{\pnode{\ifPst at OAinvert Minus@@\else Plus@@\fi}}
@@ -1085,7 +1085,7 @@
\pst at getcoor{#1}\pst at tempa
\pst at getcoor{#2}\pst at tempb
\pst at getcoor{#3}\pst at tempc
- \pnode(!%
+ \pnode(! 10 dict begin
\pst at tempa /Y1 exch \pst at number\psyunit div def
/X1 exch \pst at number\psxunit div def
\pst at tempb /Y2 exch \pst at number\psyunit div def
@@ -1094,7 +1094,7 @@
/X3 exch \pst at number\psxunit div def
/XC X1 X2 lt {X3 X2} {X3 X1} ifelse add 2 div def
/YC Y1 Y2 add 2 div def
- XC YC){C@}
+ XC YC end){C@}
\rput(C@){\pst at draw@GM}
\ncangle[arrows=-,arm=.5,angleA=0,angleB=180]{#1}{\ifPst at GMinvert Minus@\else Plus@\fi}
\ncput[npos=2]{\pnode{\ifPst at GMinvert Minus@@\else Plus@@\fi}}
@@ -1177,18 +1177,18 @@
\else
\pst at getcoor{#1}\pst at tempA%
\pnode(!
- \pst at tempA /YB exch \pst at number\psyunit div def
- /XB exch \pst at number\psxunit div def
+ \pst at tempA /YB_t exch \pst at number\psyunit div def
+ /XB_t exch \pst at number\psxunit div def
/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
+ XB_t basesep \Pst at TRot\space cos mul add
+ YB_t basesep \Pst at TRot\space sin mul add){TBaseNode}% base node
\fi % Base
\rput[c]{\Pst at TRot}(!
- \pst at tempA /YB exch \pst at number\psyunit div def
- /XB exch \pst at number\psxunit div def
+ \pst at tempA /YB_t exch \pst at number\psyunit div def
+ /XB_t exch \pst at number\psxunit div def
/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){%
+ XB_t basesep \Pst at TRot\space cos mul add
+ YB_t basesep \Pst at TRot\space sin mul add){%
\ifdim180pt=\Pst at TRot pt\relax % rotate 180?
\ifPst at transistorcircle\pscircle(0.3,0){0.7}\fi % circle drawing
\ifx\psk at Ttype\pst at Ttype@NPN\relax % NPN
@@ -1419,9 +1419,9 @@
/X3 exch \pst at number\psxunit div def
/LR X1 X2 lt { false }{ true } ifelse def % change left-right
/basesep \Pst at basesep\space \pst at number\psxunit div def
- /XBase X1 basesep \Pst at TRot\space cos mul add def
- /YBase Y1 basesep \Pst at TRot\space sin mul add def
- XBase YBase ){@@base}% base node
+ /XB_tase X1 basesep \Pst at TRot\space cos mul add def
+ /YB_tase Y1 basesep \Pst at TRot\space sin mul add def
+ XB_tase YB_tase ){@@base}% base node
%
\global\Pst at temptrue%
\transistor at ii(@@base){@@emitter}{@@collector}%
@@ -1493,7 +1493,7 @@
\pst at getcoor{#1}\pst at tempa
\pst at getcoor{#2}\pst at tempb
\pst at getcoor{#3}\pst at tempc
- \pnode(!%
+ \pnode(! 10 dict begin
\pst at tempa /Y1 exch \pst at number\psyunit div def
/X1 exch \pst at number\psxunit div def
\pst at tempb /Y2 exch \pst at number\psyunit div def
@@ -1502,7 +1502,7 @@
/X3 exch \pst at number\psxunit div def
/XC X1 X2 add 2 div def
/YC Y2 def
- XC YC){C@}
+ XC YC end ){C@}
\rput(C@){\pst at draw@Tswitch}
\ncangle[arrows=-,arm=0.5,angleB=180]{#1}{Tswi at left}
\ncangle[arrows=-,arm=0.5,angleB=0]{#2}{Tswi at right}
@@ -1524,35 +1524,35 @@
\pst at getcoor{#1}\pst at tempa
\pst at getcoor{#2}\pst at tempb
\pst at getcoor{#3}\pst at tempc
- \pnode(!%
- \pst at tempa /Y1 exch \pst at number\psyunit div def
- /X1 exch \pst at number\psxunit div def
- \pst at tempb /Y2 exch \pst at number\psyunit div def
- /X2 exch \pst at number\psxunit div def
- \pst at tempc /Y3 exch \pst at number\psyunit div def
- /X3 exch \pst at number\psxunit div def
- /dx X2 X1 sub def
- /dy Y2 Y1 sub def
- dx 2 div X1 add
- dy 2 div Y1 add ){Center@}
+ \pnode(! tx at CircDict begin
+ \pst at tempa /Y1_p exch \pst at number\psyunit div def
+ /X1_p exch \pst at number\psxunit div def
+ \pst at tempb /Y2_p exch \pst at number\psyunit div def
+ /X2_p exch \pst at number\psxunit div def
+ \pst at tempc /Y3_p exch \pst at number\psyunit div def
+ /X3_p exch \pst at number\psxunit div def
+ /dx X2_p X1_p sub def
+ /dy Y2_p Y1_p sub def
+ dx 2 div X1_p add
+ dy 2 div Y1_p add end ){Center@}
\pst at getcoor{Center@}\pst at tempd
- \pnode(!%
- \pst at tempd /Y4 exch \pst at number\psyunit div def
- /X4 exch \pst at number\psxunit div def
+ \pnode(! tx at CircDict begin
+ \pst at tempd /Y4_p exch \pst at number\psyunit div def
+ /X4_p exch \pst at number\psxunit div def
dx abs 0.01 lt{
- X3 Y4
+ X3_p Y4_p
}{dy abs 0.01 lt {
- X4 Y3
+ X4_p Y3_p
}{/m dy dx div def
- /x Y4 Y3 sub m X3 mul add X4 m div add m 1 m div add div def
- x dup X3 sub m mul Y3 add
+ /x_p Y4_p Y3_p sub m X3_p mul add X4_p m div add m 1 m div add div def
+ x_p dup X3_p sub m mul Y3_p add
} ifelse
- }ifelse){@tempNodeB}
- \pnode(!%
+ }ifelse end ){@tempNodeB}
+ \pnode(! tx at CircDict begin
/Alpha dy dx atan def
/dx Alpha sin 0.25 mul def
/dy Alpha cos 0.25 mul def
- Y3 Y2 gt {X4 dx sub Y4 dy add}{X4 dx add Y4 dy sub}ifelse ){@tempNodeC}
+ Y3_p Y2_p gt { X4_p dx sub Y4_p dy add}{X4_p dx add Y4_p dy sub}ifelse end ){@tempNodeC}
\psline[arrows=->,arrowsize=0.2](#3)(@tempNodeB)(@tempNodeC)
\pcline[linestyle=none](#1)(#3)% for the endarrows
\end at ClosedObj%
@@ -1578,7 +1578,7 @@
\pst at getcoor{#2}\pst at tempB
\pst at getcoor{#3}\pst at tempC
\pst at getcoor{#4}\pst at tempD
- \pnode(!%
+ \pnode(! 10 dict begin
\pst at tempA /Y1 exch \pst at number\psyunit div def
/X1 exch \pst at number\psxunit div def
\pst at tempB /Y2 exch \pst at number\psyunit div def
@@ -1589,7 +1589,7 @@
/X4 exch \pst at number\psxunit div def
/XC X1 X2 lt {X2} {X1} ifelse X3 X4 lt {X3} {X4} ifelse add 2 div def
/YC Y1 Y3 lt {Y1} {Y3} ifelse Y2 Y4 lt {Y2} {Y4} ifelse add 2 div def
- XC YC){C@}
+ XC YC end){C@}
\rput(C@){\pst at draw@transformer}
\pnode(#1){@endA}\pnode(#2){@endB}\pnode(#3){@endC}\pnode(#4){@endD}%
\ncangle[arrows=-,arm=0.5,angleB=90]{@endA}{inup@}
@@ -1627,7 +1627,7 @@
\pst at getcoor{#2}\pst at tempb
\pst at getcoor{#3}\pst at tempc
\pst at getcoor{#4}\pst at tempd
- \pnode(!%
+ \pnode(! 10 dict begin
\pst at tempa /Y1 exch \pst at number\psyunit div def
/X1 exch \pst at number\psxunit div def
\pst at tempb /Y2 exch \pst at number\psyunit div def
@@ -1638,7 +1638,7 @@
/X4 exch \pst at number\psxunit div def
/XC X1 X2 lt {X2} {X1} ifelse X3 X4 lt {X3} {X4} ifelse add 2 div def
/YC Y1 Y3 lt {Y1} {Y3} ifelse Y2 Y4 lt {Y2} {Y4} ifelse add 2 div def
- XC YC){C@}
+ XC YC end){C@}
\rput(C@){\pst at draw@optoCoupler}
\ncangle[arrows=-,arm=0.5,angleB=90]{#1}{inup@}
\ncangle[arrows=-,arm=0.5,angleB=-90]{#2}{indown@}
@@ -1660,7 +1660,7 @@
\pst at getcoor{#2}\pst at tempb
\pst at getcoor{#3}\pst at tempc
\pst at getcoor{#4}\pst at tempd
- \pnode(!%
+ \pnode(! 10 dict begin
\pst at tempa /Y1 exch \pst at number\psyunit div def
/X1 exch \pst at number\psxunit div def
\pst at tempb /Y2 exch \pst at number\psyunit div def
@@ -1671,7 +1671,7 @@
/X4 exch \pst at number\psxunit div def
/XC X1 X2 lt {X2} {X1} ifelse X3 X4 lt {X3} {X4} ifelse add 2 div def
/YC Y1 Y3 lt {Y1} {Y3} ifelse Y2 Y4 lt {Y2} {Y4} ifelse add 2 div def
- XC YC){C@}
+ XC YC end){C@}
\rput(C@){#5}
\rput(C@){\psframe[linewidth=1.5\pslinewidth](-1.5,-1.2)(1.5,1.2)
\pnode(-1.5,1){inup@} \pnode(-1.5,-1){indown@}
@@ -2401,66 +2401,66 @@
\pst at getcoor{#2}\pst at tempa
\ifPst at logicChangeLR\def\logic at LR{true}\else\def\logic at LR{false}\fi
\pstVerb{
- /YA \pst at tempa exch pop \pst at number\psyunit div def
- /YB YA \psk at logic@height\space add def
+ /YA_log \pst at tempa exch pop \pst at number\psyunit div def
+ /YB_log YA_log \psk at logic@height\space add def
\logic at LR {%
- /XB \pst at tempa pop \pst at number\psxunit div def
- /XA XB \psk at logic@width\space add def
+ /XB_log \pst at tempa pop \pst at number\psxunit div def
+ /XA_log XB_log \psk at logic@width\space add def
}{%
- /XA \pst at tempa pop \pst at number\psxunit div def
- /XB XA \psk at logic@width\space add def
+ /XA_log \pst at tempa pop \pst at number\psxunit div def
+ /XB_log XA_log \psk at logic@width\space add def
} ifelse
- /dy YB YA sub def
+ /dy YB_log YA_log sub def
}
\ifx\psk at logic@type\pst at logic@type at RS%---------------- RS -----------------
- \pnode(! XA YA dy 4 div add){#3S}
- \pnode(! XA YA dy 4 div 3 mul add){#3R}
- \psline(#3R)(! XA 0.5 \logic at LR {add}{sub} ifelse YA dy 4 div 3 mul add)
- \psline(#3S)(! XA 0.5 \logic at LR {add}{sub} ifelse YA dy 4 div add)
+ \pnode(! XA_log YA_log dy 4 div add){#3S}
+ \pnode(! XA_log YA_log dy 4 div 3 mul add){#3R}
+ \psline(#3R)(! XA_log 0.5 \logic at LR {add}{sub} ifelse YA_log dy 4 div 3 mul add)
+ \psline(#3S)(! XA_log 0.5 \logic at LR {add}{sub} ifelse YA_log dy 4 div add)
\uput[\ifPst at logicChangeLR 180\else 0\fi](#3R){\psk at logic@nodestyle R}
\uput[\ifPst at logicChangeLR 180\else 0\fi](#3S){\psk at logic@nodestyle S}
- \pnode(! XB 0.2 \logic at LR {sub}{add} ifelse YA dy 4 div add){#3Qneg}
- \pscircle[linewidth=0.5pt](! XB 0.1 \logic at LR {sub}{add} ifelse YA dy 4 div add){0.1}
- \pnode(! XB YA dy 4 div 3 mul add){#3Q}
- \psline(#3Q)(! XB \psk at logic@wireLength\space \logic at LR {sub}{add} ifelse YA dy 4 div 3 mul add)
- \psline(#3Qneg)(! XB \psk at logic@wireLength\space \logic at LR {sub}{add} ifelse YA dy 4 div add)
+ \pnode(! XB_log 0.2 \logic at LR {sub}{add} ifelse YA_log dy 4 div add){#3Qneg}
+ \pscircle[linewidth=0.5pt](! XB_log 0.1 \logic at LR {sub}{add} ifelse YA_log dy 4 div add){0.1}
+ \pnode(! XB_log YA_log dy 4 div 3 mul add){#3Q}
+ \psline(#3Q)(! XB_log \psk at logic@wireLength\space \logic at LR {sub}{add} ifelse YA_log dy 4 div 3 mul add)
+ \psline(#3Qneg)(! XB_log \psk at logic@wireLength\space \logic at LR {sub}{add} ifelse YA_log dy 4 div add)
\uput[\ifPst at logicChangeLR 0\else 180\fi](#3Q){\psk at logic@nodestyle Q}
\uput{0.4}[\ifPst at logicChangeLR 0\else 180\fi](#3Qneg){\psk at logic@nodestyle $\mathrm{\overline{Q}}$}
\ifPst at logicShowDot
- \qdisk(! XA \psk at logic@wireLength\space \logic at LR {add}{sub} ifelse YA dy 4 div 3 mul add){3pt}
- \qdisk(! XA \psk at logic@wireLength\space \logic at LR {add}{sub} ifelse YA dy 4 div add){3pt}
- \qdisk(! XB \psk at logic@wireLength\space \logic at LR {sub}{add} ifelse YA dy 4 div 3 mul add){3pt}
- \qdisk(! XB \psk at logic@wireLength\space \logic at LR {sub}{add} ifelse YA dy 4 div add){3pt}
+ \qdisk(! XA_log \psk at logic@wireLength\space \logic at LR {add}{sub} ifelse YA_log dy 4 div 3 mul add){3pt}
+ \qdisk(! XA_log \psk at logic@wireLength\space \logic at LR {add}{sub} ifelse YA_log dy 4 div add){3pt}
+ \qdisk(! XB_log \psk at logic@wireLength\space \logic at LR {sub}{add} ifelse YA_log dy 4 div 3 mul add){3pt}
+ \qdisk(! XB_log \psk at logic@wireLength\space \logic at LR {sub}{add} ifelse YA_log dy 4 div add){3pt}
\fi
\rput[b](!%
- /dx XB XA sub 2 div def
- XA dx add YA 0.1 add){\if$\psk at logic@labelstyle$\else\psk at logic@labelstyle#3\fi}
+ /dx XB_log XA_log sub 2 div def
+ XA_log dx add YA_log 0.1 add){\if$\psk at logic@labelstyle$\else\psk at logic@labelstyle#3\fi}
\else
\ifx\psk at logic@type\pst at logic@type at D%---------------- D -----------------
- \pnode(! XA YA dy 2 div add){#3C}
- \pnode(! XA YA dy 4 div 3 mul add){#3D}
- \psline(#3D)(! XA 0.5 \logic at LR {add}{sub} ifelse YA dy 4 div 3 mul add)
- \psline(#3C)(! XA 0.5 \logic at LR {add}{sub} ifelse YA dy 2 div add)
- \psline[linewidth=0.5pt](! XA YA dy 2 div add 0.15 add)
- (! XA 0.4 \logic at LR {sub}{add} ifelse YA dy 2 div add)(! XA YA dy 2 div add 0.15 sub)
+ \pnode(! XA_log YA_log dy 2 div add){#3C}
+ \pnode(! XA_log YA_log dy 4 div 3 mul add){#3D}
+ \psline(#3D)(! XA_log 0.5 \logic at LR {add}{sub} ifelse YA_log dy 4 div 3 mul add)
+ \psline(#3C)(! XA_log 0.5 \logic at LR {add}{sub} ifelse YA_log dy 2 div add)
+ \psline[linewidth=0.5pt](! XA_log YA_log dy 2 div add 0.15 add)
+ (! XA_log 0.4 \logic at LR {sub}{add} ifelse YA_log dy 2 div add)(! XA_log YA_log dy 2 div add 0.15 sub)
\uput[\ifPst at logicChangeLR 180\else 0\fi](#3D){\psk at logic@nodestyle D}
\uput{0.5}[\ifPst at logicChangeLR 180\else 0\fi](#3C){\psk at logic@nodestyle C}
- \pnode(! XB 0.2 \logic at LR {sub}{add} ifelse YA dy 4 div add){#3Qneg}
- \pscircle[linewidth=0.5pt](! XB 0.1 \logic at LR {sub}{add} ifelse YA dy 4 div add){0.1}
- \pnode(! XB YA dy 4 div 3 mul add){#3Q}
- \psline(#3Q)(! XB 0.5 \logic at LR {sub}{add} ifelse YA dy 4 div 3 mul add)
- \psline(#3Qneg)(! XB 0.5 \logic at LR {sub}{add} ifelse YA dy 4 div add)
+ \pnode(! XB_log 0.2 \logic at LR {sub}{add} ifelse YA_log dy 4 div add){#3Qneg}
+ \pscircle[linewidth=0.5pt](! XB_log 0.1 \logic at LR {sub}{add} ifelse YA_log dy 4 div add){0.1}
+ \pnode(! XB_log YA_log dy 4 div 3 mul add){#3Q}
+ \psline(#3Q)(! XB_log 0.5 \logic at LR {sub}{add} ifelse YA_log dy 4 div 3 mul add)
+ \psline(#3Qneg)(! XB_log 0.5 \logic at LR {sub}{add} ifelse YA_log dy 4 div add)
\uput[\ifPst at logicChangeLR 0\else 180\fi](#3Q){\psk at logic@nodestyle Q}
\uput{0.4}[\ifPst at logicChangeLR 0\else 180\fi](#3Qneg){\psk at logic@nodestyle $\mathrm{\overline{Q}}$}
\ifPst at logicShowDot
- \qdisk(! XA 0.5 \logic at LR {add}{sub} ifelse YA dy 4 div 3 mul add){3pt}
- \qdisk(! XA 0.5 \logic at LR {add}{sub} ifelse YA dy 2 div add){3pt}
- \qdisk(! XB 0.5 \logic at LR {sub}{add} ifelse YA dy 4 div 3 mul add){3pt}
- \qdisk(! XB 0.5 \logic at LR {sub}{add} ifelse YA dy 4 div add){3pt}
+ \qdisk(! XA_log 0.5 \logic at LR {add}{sub} ifelse YA_log dy 4 div 3 mul add){3pt}
+ \qdisk(! XA_log 0.5 \logic at LR {add}{sub} ifelse YA_log dy 2 div add){3pt}
+ \qdisk(! XB_log 0.5 \logic at LR {sub}{add} ifelse YA_log dy 4 div 3 mul add){3pt}
+ \qdisk(! XB_log 0.5 \logic at LR {sub}{add} ifelse YA_log dy 4 div add){3pt}
\fi
\rput[b](!%
- /dx XB XA sub 2 div def
- XA dx add YA 0.1 add){\if$\psk at logic@labelstyle$\else\psk at logic@labelstyle#3\fi}
+ /dx XB_log XA_log sub 2 div def
+ XA_log dx add YA_log 0.1 add){\if$\psk at logic@labelstyle$\else\psk at logic@labelstyle#3\fi}
\else
\ifx\psk at logic@type\pst at logic@type at JK%---------------- JK -----------------
\multido{\n=1+1}{\psk at logic@JInput}{%
@@ -2467,7 +2467,7 @@
\pnode(!%
/Step dy 2 div \psk at logic@JInput\space div def
/yNew Step \n\space mul def
- XA YA yNew add Step 2 div sub){#3J\n}
+ XA_log YA_log yNew add Step 2 div sub){#3J\n}
\pst at getcoor{#3J\n}\pst at tempc
\uput[\ifPst at logicChangeLR 180\else 0\fi](#3J\n){\psk at logic@nodestyle J\n}
\pnode(!
@@ -2483,7 +2483,7 @@
\pnode(!%
/Step dy 2 div \psk at logic@KInput\space div def
/yNew Step \n\space mul def
- XA YB yNew sub Step 2 div add){#3K\n}
+ XA_log YB_log yNew sub Step 2 div add){#3K\n}
\pst at getcoor{#3K\n}\pst at tempc
\uput[\ifPst at logicChangeLR 180\else 0\fi](#3K\n){\psk at logic@nodestyle K\n}
\pnode(!
@@ -2495,26 +2495,26 @@
\qdisk(tempK\n){3pt}
\fi
}
- \psline[linewidth=0.5pt](! XA YA dy 2 div add 0.15 add)
- (! XA 0.4 \logic at LR {sub}{add} ifelse YA dy 2 div add)(! XA YA dy 2 div add 0.15 sub)
- \pnode(! XA YA dy 2 div add){#3C}
- \psline(#3C)(! XA 0.5 \logic at LR {add}{sub} ifelse YA dy 2 div add)
+ \psline[linewidth=0.5pt](! XA_log YA_log dy 2 div add 0.15 add)
+ (! XA_log 0.4 \logic at LR {sub}{add} ifelse YA_log dy 2 div add)(! XA_log YA_log dy 2 div add 0.15 sub)
+ \pnode(! XA_log YA_log dy 2 div add){#3C}
+ \psline(#3C)(! XA_log 0.5 \logic at LR {add}{sub} ifelse YA_log dy 2 div add)
\uput{0.5}[\ifPst at logicChangeLR 180\else 0\fi](#3C){\psk at logic@nodestyle C}
- \pnode(! XB 0.2 \logic at LR {sub}{add} ifelse YA dy 4 div add){#3Qneg}
- \pscircle[linewidth=0.5pt](! XB 0.1 \logic at LR {sub}{add} ifelse YA dy 4 div add){0.1}
- \pnode(! XB YA dy 4 div 3 mul add){#3Q}
- \psline(#3Q)(! XB 0.5 \logic at LR {sub}{add} ifelse YA dy 4 div 3 mul add)
- \psline(#3Qneg)(! XB 0.5 \logic at LR {sub}{add} ifelse YA dy 4 div add)
+ \pnode(! XB_log 0.2 \logic at LR {sub}{add} ifelse YA_log dy 4 div add){#3Qneg}
+ \pscircle[linewidth=0.5pt](! XB_log 0.1 \logic at LR {sub}{add} ifelse YA_log dy 4 div add){0.1}
+ \pnode(! XB_log YA_log dy 4 div 3 mul add){#3Q}
+ \psline(#3Q)(! XB_log 0.5 \logic at LR {sub}{add} ifelse YA_log dy 4 div 3 mul add)
+ \psline(#3Qneg)(! XB_log 0.5 \logic at LR {sub}{add} ifelse YA_log dy 4 div add)
\uput[\ifPst at logicChangeLR 0\else 180\fi](#3Q){\psk at logic@nodestyle Q}
\uput{0.4}[\ifPst at logicChangeLR 0\else 180\fi](#3Qneg){\psk at logic@nodestyle $\mathrm{\overline{Q}}$}
\ifPst at logicShowDot
- \qdisk(! XB 0.5 \logic at LR {sub}{add} ifelse YA dy 4 div 3 mul add){3pt}
- \qdisk(! XB 0.5 \logic at LR {sub}{add} ifelse YA dy 4 div add){3pt}
- \qdisk(! XA 0.5 \logic at LR {add}{sub} ifelse YA dy 2 div add){3pt}
+ \qdisk(! XB_log 0.5 \logic at LR {sub}{add} ifelse YA_log dy 4 div 3 mul add){3pt}
+ \qdisk(! XB_log 0.5 \logic at LR {sub}{add} ifelse YA_log dy 4 div add){3pt}
+ \qdisk(! XA_log 0.5 \logic at LR {add}{sub} ifelse YA_log dy 2 div add){3pt}
\fi
\rput[b](!%
- /dx XB XA sub 2 div def
- XA dx add YA 0.1 add){\if$\psk at logic@labelstyle$\else\psk at logic@labelstyle#3\fi}
+ /dx XB_log XA_log sub 2 div def
+ XA_log dx add YA_log 0.1 add){\if$\psk at logic@labelstyle$\else\psk at logic@labelstyle#3\fi}
\else%---------------- default AND/NAND/OR/NOR/NOT/EXOR/ENOR -----------------
\ifx\psk at logic@type\pst at logic@type at not \def\@nMax{1}\else \def\@nMax{\psk at logic@nInput}\fi
\multido{\n=1+1}{\@nMax}{%
@@ -2521,7 +2521,7 @@
\pnode(!%
/Step dy \psk at logic@nInput\space div def
/yNew Step \n\space mul def
- XA YA yNew add \@nMax\space 1 gt {Step 2 div sub} if){#3\n}
+ XA_log YA_log yNew add \@nMax\space 1 gt {Step 2 div sub} if){#3\n}
\pst at getcoor{#3\n}\pst at tempc
\pnode(!
/YC \pst at tempc exch pop \pst at number\psyunit div def
@@ -2537,10 +2537,10 @@
\ifx\psk at logic@type\pst at logic@type at nand\else
\ifx\psk at logic@type\pst at logic@type at nor\else
\ifx\psk at logic@type\pst at logic@type at exnor\else
- \pnode(! XB YA dy 2 div add){#3Q}
- \psline(#3Q)(! XB \psk at logic@wireLength\space \logic at LR {sub}{add} ifelse YA dy 2 div add)% output
+ \pnode(! XB_log YA_log dy 2 div add){#3Q}
+ \psline(#3Q)(! XB_log \psk at logic@wireLength\space \logic at LR {sub}{add} ifelse YA_log dy 2 div add)% output
\ifPst at logicShowDot
- \qdisk(! XB \psk at logic@wireLength\space \logic at LR {sub}{add} ifelse YA dy 2 div add){3pt}
+ \qdisk(! XB_log \psk at logic@wireLength\space \logic at LR {sub}{add} ifelse YA_log dy 2 div add){3pt}
\fi
\ifPst at logicShowNode
\uput[\ifPst at logicChangeLR 0\else 180\fi](#3Q){\psk at logic@nodestyle Q}
@@ -2552,11 +2552,11 @@
\ifx\psk at logic@type\pst at logic@type at and\else% NotX output
\ifx\psk at logic@type\pst at logic@type at or\else
\ifx\psk at logic@type\pst at logic@type at exor\else
- \pnode(! XB 0.2 \logic at LR {sub}{add} ifelse YA dy 2 div add){#3Q}
- \pscircle[linewidth=0.5pt](! XB 0.1 \logic at LR {sub}{add} ifelse YA dy 2 div add){0.1}
- \psline(#3Q)(! XB \psk at logic@wireLength\space \logic at LR {sub}{add} ifelse YA dy 2 div add)% output
+ \pnode(! XB_log 0.2 \logic at LR {sub}{add} ifelse YA_log dy 2 div add){#3Q}
+ \pscircle[linewidth=0.5pt](! XB_log 0.1 \logic at LR {sub}{add} ifelse YA_log dy 2 div add){0.1}
+ \psline(#3Q)(! XB_log \psk at logic@wireLength\space \logic at LR {sub}{add} ifelse YA_log dy 2 div add)% output
\ifPst at logicShowDot
- \qdisk(! XB \psk at logic@wireLength\space \logic at LR {sub}{add} ifelse YA dy 2 div add){3pt}
+ \qdisk(! XB_log \psk at logic@wireLength\space \logic at LR {sub}{add} ifelse YA_log dy 2 div add){3pt}
\fi
\ifPst at logicShowNode
\uput{0.4}[\ifPst at logicChangeLR 0\else 180\fi](#3Q){\psk at logic@nodestyle Q}
@@ -2590,11 +2590,11 @@
\fi
\fi
\rput(!%
- /dx XB XA sub \psk at logic@symbolpos\space mul def
- XA dx add YB 0.3 sub){\if$\psk at logic@symbolstyle$\else\psk at logic@symbolstyle\textbf{\logic at type}\fi}
+ /dx XB_log XA_log sub \psk at logic@symbolpos\space mul def
+ XA_log dx add YB_log 0.3 sub){\if$\psk at logic@symbolstyle$\else\psk at logic@symbolstyle\textbf{\logic at type}\fi}
\rput[b](!%
- /dx XB XA sub 2 div def
- XA dx add YA 0.1 add){\if$\psk at logic@labelstyle$\else\psk at logic@labelstyle#3\fi}
+ /dx XB_log XA_log sub 2 div def
+ XA_log dx add YA_log 0.1 add){\if$\psk at logic@labelstyle$\else\psk at logic@labelstyle#3\fi}
\fi
\fi
\fi% end of no special RS/JK/D
@@ -2772,18 +2772,18 @@
\psframe(-0.15,-0.3)(0.15,0.3)
\psline(0.2,-0.35)(0.2,0.35)
\else
- \pscurve[linewidth=1.5\pslinewidth]{c-c}(-0.3,0.000)(-0.225,0.088375)(-0.15,0.1250)(-0.075,0.088375)%
- (0,0.000)(0.075,-0.088375)(0.15,-0.125)(0.225,-0.088375)(0.3,0.000)
+ \pscurve[linewidth=1.5\pslinewidth]{cc}(-0.3,0.000)(-0.225,0.088375)(-0.15,0.1250)(-0.075,0.088375)%
+ (0,0.000)(0.075,-0.088375)(0.15,-0.125)(0.225,-0.088375)(0.3,0.000)
\fi
\ifx\psk at LOoutput\pst at LOoutput@left
\pst at getcoor{#3}\pst at tempa
- \pnode(!%
+ \pnode(! 5 dict begin
\pst at tempa /Y1 exch \pst at number\psyunit div def
/X1 exch \pst at number\psxunit div def
/XC X1 def
/YC Y1 -0.6 add def
- XC YC){C@}
- \rput[t]{#2}(C@){#4}
+ XC YC end){C at osciA}
+ \rput[t]{#2}(C at osciA){#4}
\ifPst at inputarrow
\psline[arrows=->,arrowinset=0](-0.5,0)(-1,0)
\else
@@ -2792,13 +2792,13 @@
\fi
\ifx\psk at LOoutput\pst at LOoutput@top
\pst at getcoor{#3}\pst at tempa
- \pnode(!%
+ \pnode(! 5 dict begin
\pst at tempa /Y1 exch \pst at number\psyunit div def
/X1 exch \pst at number\psxunit div def
/XC X1 def
/YC Y1 -0.6 add def
- XC YC){C@}
- \rput[t]{#2}(C@){#4}
+ XC YC end ){C at osciB}
+ \rput[t]{#2}(C at osciB){#4}
\ifPst at inputarrow
\psline[arrows=->,arrowinset=0](0,0.5)(0,1)
\else
@@ -2807,13 +2807,13 @@
\fi
\ifx\psk at LOoutput\pst at LOoutput@right
\pst at getcoor{#3}\pst at tempa
- \pnode(!%
+ \pnode(! 5 dict begin
\pst at tempa /Y1 exch \pst at number\psyunit div def
/X1 exch \pst at number\psxunit div def
/XC X1 def
/YC Y1 -0.6 add def
- XC YC){C@}
- \rput[t]{#2}(C@){#4}
+ XC YC end){C at osciC}
+ \rput[t]{#2}(C at osciC){#4}
\ifPst at inputarrow
\psline[arrows=->,arrowinset=0](0.5,0)(1,0)
\else
@@ -2822,13 +2822,13 @@
\fi
\ifx\psk at LOoutput\pst at LOoutput@bottom
\pst at getcoor{#3}\pst at tempa
- \pnode(!%
+ \pnode(! 5 dict begin
\pst at tempa /Y1 exch \pst at number\psyunit div def
/X1 exch \pst at number\psxunit div def
/XC X1 def
/YC Y1 0.6 add def
- XC YC){C@}
- \rput[b]{#2}(C@){#4}
+ XC YC end){C at osciD}
+ \rput[b]{#2}(C at osciD){#4}
\ifPst at inputarrow
\psline[arrows=->,arrowinset=0](0,-0.5)(0,-1)
\else
@@ -2835,8 +2835,8 @@
\psline(0,-0.5)(0,-1)
\fi
\fi
- }}%
- \ignorespaces%
+ }
+ }\ignorespaces
}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -5441,7 +5441,7 @@
\pst at draw@dipole{#1}{#2}{#3}{#4}\pst at draw@vac
\pst at getcoor{#2}\pst at tempa
\pst at getcoor{#3}\pst at tempb
- \rput(! %
+ \rput(! 5 dict begin
\pst at tempa \pst at number{\psyunit} div /YA ED
\pst at number{\psxunit} div /XA ED
\pst at tempb \pst at number{\psyunit} div /YB ED
@@ -5448,7 +5448,7 @@
\pst at number{\psxunit} div /XB ED
XA XB add 2 div
YA YB add 2 div
- ){\pscurve(-0.25,0)(-0.125,0.25)(0.125,-0.25)(0.25,0)}}\ignorespaces}
+ end ){\pscurve(-0.25,0)(-0.125,0.25)(0.125,-0.25)(0.25,0)}}\ignorespaces}
%
\def\pst at draw@vac{{%
\pnode(-0.5,0){dipole at 1}
Modified: trunk/Master/texmf-dist/tex/latex/pst-circ/pst-circ.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/pst-circ/pst-circ.sty 2021-09-10 16:25:56 UTC (rev 60463)
+++ trunk/Master/texmf-dist/tex/latex/pst-circ/pst-circ.sty 2021-09-10 21:02:02 UTC (rev 60464)
@@ -1,11 +1,11 @@
-%% $Id: pst-circ.sty 918 2019-01-22 16:41:03Z herbert $
+%% $Id: pst-circ.sty 210 2021-09-10 07:52:09Z herbert $
\RequirePackage{pstricks}
-\ProvidesPackage{pst-circ}[2019/01/22 package wrapper for
+\ProvidesPackage{pst-circ}[2021/09/09 package wrapper for
pst-circ.tex (hv)]
\input{pst-circ.tex}
\IfFileExists{pst-circ.pro}{%
\ProvidesFile{pst-circ.pro}
- [2007/03/23 v. 0.01, PostScript prologue file (hv)]
+ [2021/09/09 v. 0.02, PostScript prologue file (hv)]
\@addtofilelist{pst-circ.pro}}{}%
\ProvidesFile{pst-circ.tex}
[\filedate\space v\fileversion\space `PST-circ' (CJ,hv)]
More information about the tex-live-commits
mailing list.