summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-11-16 22:13:46 +0000
committerKarl Berry <karl@freefriends.org>2017-11-16 22:13:46 +0000
commit9c1e4c79b1fa7b6be636fb948fb94710d2357b22 (patch)
treee6b778dd79265701d0fffd08d79723d5632f27b4 /Master
parentae6d11dd19a64996c9692f8e2f226fb5f55f2bad (diff)
pst-circ (16nov17)
git-svn-id: svn://tug.org/texlive/trunk@45829 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/generic/pst-circ/Changes1
-rw-r--r--Master/texmf-dist/doc/generic/pst-circ/README2
-rw-r--r--Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.bib121
-rw-r--r--Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.pdfbin856380 -> 853522 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.tex10
-rw-r--r--Master/texmf-dist/dvips/pst-circ/pst-circ.pro2
-rw-r--r--Master/texmf-dist/tex/generic/pst-circ/pst-circ.tex56
-rw-r--r--Master/texmf-dist/tex/latex/pst-circ/pst-circ.sty2
8 files changed, 72 insertions, 122 deletions
diff --git a/Master/texmf-dist/doc/generic/pst-circ/Changes b/Master/texmf-dist/doc/generic/pst-circ/Changes
index 4e26be44337..743c5577b1b 100644
--- a/Master/texmf-dist/doc/generic/pst-circ/Changes
+++ b/Master/texmf-dist/doc/generic/pst-circ/Changes
@@ -1,3 +1,4 @@
+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)
2.12a 2014-10-09 Updated documentation
diff --git a/Master/texmf-dist/doc/generic/pst-circ/README b/Master/texmf-dist/doc/generic/pst-circ/README
index 6f92315d8e4..be6dc4b3936 100644
--- a/Master/texmf-dist/doc/generic/pst-circ/README
+++ b/Master/texmf-dist/doc/generic/pst-circ/README
@@ -27,7 +27,7 @@ be sure that you
If you like to get the documentation file in another format run
latex pst-circ-doc.tex
-bibtex pst-circ.doc
+biber pst-circ.doc
latex pst-circ-doc.tex
dvips pst-circ-doc.dvi
diff --git a/Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.bib b/Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.bib
index 9656e70ef88..ead359beff7 100644
--- a/Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.bib
+++ b/Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.bib
@@ -1,100 +1,67 @@
+%% -*-bibtex-*-
+@STRING{tugboat = {TUGboat} }
@STRING{dtk = {{D}ie {\TeX}nische {K}om{\"o}die} }
+@Book{companion,
+ author = {Michel Goosens and Frank Mittelbach and Sebastian Rahtz and Dennis Roegel and Herbert Vo\ss},
+ title = {The {\LaTeX} {G}raphics {C}ompanion},
+ publisher = {{Addison-Wesley Publishing Company}},
+ edition = {second},
+ year = {2007},
+ address = {Boston, Mass.}
+}
+
+@Article{girou:01:,
+ author = {Denis Girou},
+ title = {Pr\'esentation de {PST}ricks},
+ journal = {Cahier {GUT}enberg},
+ year = 1994,
+ volume = {16},
+ month = apr,
+ pages = {21-70}
+}
+
+@Article{girou:02:,
+ author = {{Timothy Van} Zandt and Denis Girou},
+ title = {Inside {PST}ricks},
+ journal = TUGboat,
+ year = 1994,
+ volume = {15},
+ month = sep,
+ pages = {239-246}
+}
+
@Book{PostScript,
Author = {Kollock, Nikolai G.},
- Title = {PostScript richtig eingesetzt: vom Konzept zum
- praktischen Einsatz},
+ Title = {Post{S}cript richtig eingesetzt: vom {K}onzept zum
+ praktischen {E}insatz},
Publisher = {IWT},
Address = {Vaterstetten},
year = 1989,
}
-@Manual{miwi,
- Title = {References for \TeX{} and Friends},
- Author = {Michael Wiedmann and Peter Karp},
+@Manual{multido,
+ Title = {\texttt{multido.tex} - a loop macro, that supports fixed-point addition},
+ Author = {{Timothy Van} Zandt},
Organization = {},
- Address = {\url{http://www.miwie.org/tex-refs/}},
+ Address = {\url{CTAN:/macros/generic/multido.tex}},
Note = {},
- year = 2003,
-}
-
-
-@Article{dtk02.2:jackson.voss:plot-funktionen,
- author = {Laura E. Jackson and Herbert Vo{\ss}},
- title = {Die {P}lot-{F}unktionen von {\texttt{pst-plot}}},
- journal = dtk,
- year = 2002,
- volume = {2/02},
- altvolume = 2,
- altnumber = 14,
- month = jun,
- pages = {27--34},
- annote = bretter,
- keywords = {},
- abstract = { Im letzten Heft wurden die mathematischen Funktionen von
- \PS~im Zusammenhang mit dem {\LaTeX}-Paket
- \texttt{pst-plot} zum Zeichnen von Funktionen beschrieben
- und durch Beispiele erl{\"a}utert. In diesem Teil werden
- die bislang nur erw{\"a}hnten Plot-Funktionen f{\"u}r
- externe Daten behandelt. }
-}
-
-@Article{dtk02.1:voss:mathematischen,
- author = {Herbert Vo{\ss}},
- title = {Die mathematischen {F}unktionen von {P}ostscript},
- journal = dtk,
- year = 2002,
- volume = {1/02},
- altvolume = 1,
- altnumber = 14,
- month = mar,
- pages = {40-47},
- annote = bretter,
- keywords = {},
- abstract = { \PS, faktisch genauso alt wie {\TeX}, ist im
- Verh{\"a}ltnis dazu allgemein noch weniger bekannt, wenn es
- darum geht zu beurteilen, was es denn nun im eigentlichen
- Sinne ist. Au{\ss}erdem wird h{\"a}ufig vergessen, dass
- sich mit den \PS-Funktionen viele Dinge erledigen lassen,
- bei denen sonst auf externe Programme zur{\"u}ckgegriffen
- wird. Dies wird im Folgenden f{\"u}r die mathematischen
- Funktionen im Zusammenhang mit dem Paket \texttt{pst-plot}
- gezeigt. }
-}
-
-
-@Book{companion,
- author = {Michel Goosens and Frank Mittelbach and Serbastian Rahtz and Denis Roegel and Herbert Vo\ss},
- title = {The {\LaTeX} {G}raphics {C}ompanion},
- publisher = {{Addison-Wesley Publishing Company}},
- year = {2007},
- edition = {2nd},
- address = {Reading, Mass.}
+ year = 1997
}
@Book{PSTricks2,
- author = {Herbert Vo\ss},
+ author = {Herbert Vo\ss{}},
title = {\texttt{PSTricks} -- {G}rafik f\"ur \TeX{} und \LaTeX},
- edition = {6.},
- publisher = {DANTE/Lehmanns},
+ edition = {6},
+ publisher = {DANTE -- lehmanns media},
year = {2010},
address = {Heidelberg/Berlin}
}
-@Book{voss:math,
+@Book{PSTricks2-UIT,
author = {Herbert Vo\ss},
- title = {Typsetting mathematics with \LaTeX},
- publisher = {UIT},
- year = {2010},
- address = {Cambridge -- UK}
-}
-
-@Book{PSTricksE,
- author = {Herbert Vo\ss{}},
- title = {\texttt{PSTricks} -- {G}raphics and {P}ost{S}cript for \LaTeX},
- edition = {1st},
+ title = {PSTricks -- Graphics for \LaTeX},
publisher = {UIT},
year = {2011},
- address = {Cambridge -- UK}
+ address = {Cambridge/UK}
}
-
diff --git a/Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.pdf b/Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.pdf
index 57322c8a59b..f771080be9f 100644
--- a/Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.pdf
+++ b/Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.tex b/Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.tex
index 14745aecba5..fb1c2e3218d 100644
--- a/Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.tex
+++ b/Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.tex
@@ -1,10 +1,12 @@
-%% $Id: pst-circ-doc.tex 927 2014-06-18 11:01:59Z herbert $
+%% $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}
\usepackage{pst-circ}
\let\pstCircFV\fileversion
\usepackage{amsmath,siunitx}
+
+\addbibresource{\jobname.bib}
\DeclareSIUnit\dbm{dBm} %% Définition du dBm
\lstset{explpreset={pos=l,wide=false,rframe=},language=PSTricks,
morekeywords={multidipole,parallel},basicstyle=\footnotesize\ttfamily}
@@ -497,7 +499,7 @@ There are 5 types of transistors included : NPN, PNP, FET, NMOS and PMOS. It's t
\xLcs{transistor}\xLkeyword{TRot}
\begin{LTXexample}[width=5.5cm]
-\begin{pspicture}(3,4)
+\begin{pspicture}[showgrid](3,4)
\pnodes(3,2){A}(0,1){B}(0,3){C}
\transistor[TRot=180](A)(B)(C)
\end{pspicture}
@@ -4201,8 +4203,8 @@ Note: the default for booleans is always false.
\bgroup
\raggedright
\nocite{*}
-\bibliographystyle{plain}
-\bibliography{pst-circ-doc}
+%\bibliographystyle{plain}
+\printbibliography
\egroup
\printindex
diff --git a/Master/texmf-dist/dvips/pst-circ/pst-circ.pro b/Master/texmf-dist/dvips/pst-circ/pst-circ.pro
index 9eb1977939d..57e66aef5f7 100644
--- a/Master/texmf-dist/dvips/pst-circ/pst-circ.pro
+++ b/Master/texmf-dist/dvips/pst-circ/pst-circ.pro
@@ -1,5 +1,5 @@
%!
-% $Id: pst-circ.pro 3 2007-12-23 16:23:22Z herbert $
+% $Id: pst-circ.pro 646 2017-11-16 09:46:12Z herbert $
%
% PostScript prologue for pst-circ.tex.
% version 0.01 2007-03-23 (hv)
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)]