From 10710410fa127b4c7ebef6d49956901b912b16ba Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 17 May 2013 22:25:16 +0000 Subject: pst-circ (17may13) git-svn-id: svn://tug.org/texlive/trunk@30527 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/generic/pst-circ/Changes | 2 + .../doc/generic/pst-circ/pst-circ-doc.pdf | Bin 733192 -> 766181 bytes .../doc/generic/pst-circ/pst-circ-doc.tex | 315 +++++++++++++++------ .../texmf-dist/tex/generic/pst-circ/pst-circ.tex | 104 +++++-- Master/tlpkg/bin/tlpkg-ctan-check | 3 +- Master/tlpkg/libexec/ctan2tds | 3 + Master/tlpkg/tlpsrc/collection-langgreek.tlpsrc | 1 + 7 files changed, 322 insertions(+), 106 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/generic/pst-circ/Changes b/Master/texmf-dist/doc/generic/pst-circ/Changes index bbd8e2e41e5..9fa98a677c2 100644 --- a/Master/texmf-dist/doc/generic/pst-circ/Changes +++ b/Master/texmf-dist/doc/generic/pst-circ/Changes @@ -1,3 +1,5 @@ +2.03 2013-05-15 - added new symbol newSwitch and new option ison (cs) +2.02 2011-05-11 - fix bug with \psdot in transistor module 2.01 2011-03-03 - typos 2.00 2011-01-28 - new IEEE symbols for integrated circuits - some more new symbols 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 03300e68917..a3fb5f3091a 100644 Binary files a/Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.pdf and b/Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.pdf 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 8fd5c4d2031..1ba9c0ebd15 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,4 +1,4 @@ -%% $Id: pst-circ-doc.tex 468 2011-03-03 18:04:29Z herbert $ +%% $Id: pst-circ-doc.tex 780 2013-05-15 06:35:30Z herbert $ \documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings headexclude,footexclude,oneside]{pst-doc} \usepackage[utf8]{inputenc} @@ -97,8 +97,8 @@ All should be already part of your local \TeX\ installation. If not, or in case of having older versions, go to \url{http://www.CTAN.org/} and load the newest version. \vfill\noindent -\begingroup\setlength\emergencystretch{3em}\raggedright -\sloppy +\raggedright +\begin{sloppypar} Thanks to: \\ \mbox{Rafal Bartczuk}, \mbox{Christoph Bersch}, @@ -116,9 +116,11 @@ Thanks to: \\ \mbox{Steven P. McPherson}, \mbox{Ted Pavlic}, \mbox{Alan Ristow}, + \mbox{Uwe Siart}, + \mbox{Carlos Marcelo de Oliveira Stein}, \mbox{Douglas Waud}, and \mbox{Richard Weissnar}. -\endgroup +\end{sloppypar} \end{abstract} \clearpage @@ -1308,9 +1310,136 @@ the coils are drawn as rectangles and the resistor as a \Lkeyword{zigzag}. \end{pspicture} \end{LTXexample} +% +% Modified pst-circ Components +% +\section{Modified default symbols} + +\subsection{Dipole} -\subsection{Examples} +% +% New Diode +% +\subsubsection{New Diode} +\xLcs{NewDiode} +\begin{LTXexample}[width=3.5cm] +\begin{pspicture}[showgrid=false](3,4) + \pnode(0,1){A} + \pnode(3,1){B} + \pnode(0,3){C} + \pnode(3,3){D} + \newdiode(C)(D){$D_1$} + \newdiode[ison=false](A)(B){$D_2$} +\end{pspicture} +\end{LTXexample} + +% +% New Zener +% +\subsubsection{New Zener} +\xLcs{NewZener} +\begin{LTXexample}[width=3.5cm] +\begin{pspicture}[showgrid=false](3,4) + \pnode(0,1){A} + \pnode(3,1){B} + \pnode(0,3){C} + \pnode(3,3){D} + \newZener(C)(D){$D_1$} + \newZener[ison=false](A)(B){$D_2$} +\end{pspicture} +\end{LTXexample} + +% +% New LED +% +\subsubsection{New LED} +\xLcs{NewLED} +\begin{LTXexample}[width=3.5cm] +\begin{pspicture}[showgrid=false](3,4) + \pnode(0,1){A} + \pnode(3,1){B} + \pnode(0,3){C} + \pnode(3,3){D} + \newLED(C)(D){$D_1$} + \newLED[ison=false](A)(B){$D_2$} +\end{pspicture} +\end{LTXexample} + +% +% New Ideal Switch +% +\subsubsection{New Ideal Switch} +\xLcs{NewSwitch} +\begin{LTXexample}[width=3.5cm] +\begin{pspicture}[showgrid=false](3,4) + \pnode(0,1){A} + \pnode(3,1){B} + \pnode(0,3){C} + \pnode(3,3){D} + \newSwitch(C)(D){$S_1$} + \newSwitch[ison=false](A)(B){$S_2$} +\end{pspicture} +\end{LTXexample} + +% +% New Capacitor +% +\subsubsection{New Capacitor} +\xLcs{RFLine} +\begin{LTXexample}[width=3.5cm] +\begin{pspicture}[showgrid=false](3,2) + \pnode(0,1){A} + \pnode(3,1){B} + \newcapacitor(A)(B){$C_1$} +\end{pspicture} +\end{LTXexample} + +% +% New Armature +% +\subsubsection{New Armature (motor or generator)} +\xLcs{RFLine} +\begin{LTXexample}[width=3.5cm] +\begin{pspicture}[showgrid=false](3,4) + \pnode(0,1){A} + \pnode(3,1){B} + \pnode(0,3){C} + \pnode(3,3){D} + \newarmature[labelInside=1](C)(D){$M_{CC}$} + \newarmature[labelInside=2](A)(B){$G_{CC}$} +\end{pspicture} +\end{LTXexample} + +% +% VDC +% +\subsubsection{V DC} +\xLcs{RFLine} +\begin{LTXexample}[width=3.5cm] +\begin{pspicture}[showgrid=false](3,2) + \pnode(0,1){A} + \pnode(3,1){B} + \vdc(A)(B){$V_{DC}$} +\end{pspicture} +\end{LTXexample} + +% +% VAC +% +\subsubsection{V AC} +\xLcs{RFLine} +\begin{LTXexample}[width=3.5cm] +\begin{pspicture}[showgrid=false](3,2) + \pnode(0,1){A} + \pnode(3,1){B} + \vac(A)(B){$V_{AC}$} +\end{pspicture} +\end{LTXexample} + + + +\section{Examples} \begin{LTXexample}[pos=t] \begin{pspicture}(-1.5,-1)(6,5) @@ -1575,7 +1704,7 @@ The following example was written by Manuel Luque. \begin{LTXexample}[pos=t] \begin{pspicture}(0,-0.5)(14,4) % [subgriddiv=1,griddots=10] - \pnode(0,0){B}\pnode(0,3){A} + \pnode(0,-0.50){B}\pnode(0,3){A} \pnode(2.5,3.5){C}\pnode(2.5,-0.5){D}\pnode(5,3){E}\pnode(6.5,1.5){F} \pnode(5,0){G}\pnode(3.5,1.5){H} \pnode(8,2.5){I}\pnode(8,1){J} \pnode(10,2.5){K}\pnode(10,1){L} \pnode(14,2.5){M}\pnode(12,1){N} @@ -3163,6 +3292,7 @@ all is finished. % % IC Example 8-pins % +\clearpage \subsubsection{8-Pin DIP IC} \begin{LTXexample}[pos=t] \begin{pspicture}(-1,-2)(5,4) @@ -3208,6 +3338,7 @@ all is finished. % % IC Example 14-pin % +\clearpage \subsubsection{14-Pin DIP IC} \begin{LTXexample}[pos=t] \begin{pspicture}(-1,-2)(5,6) @@ -3233,6 +3364,7 @@ all is finished. \end{LTXexample} % +\clearpage \subsubsection{14-Pin DIP IC all inverted} % IC Example 14-pin all inverted % @@ -3266,6 +3398,7 @@ all is finished. % % IC Example 16-pin % +\clearpage \subsubsection{16-Pin DIP IC} \begin{LTXexample}[pos=t] \begin{pspicture}(-1,-2)(5,6) @@ -3292,6 +3425,7 @@ all is finished. % IC Example 16-pin all inverted % +\clearpage \subsubsection{16-Pin DIP IC all inverted} \begin{LTXexample}[pos=t] \begin{pspicture}(-1,-2)(5,6) @@ -3323,6 +3457,7 @@ all is finished. % % IC Example 20-pin % +\clearpage \subsubsection{20-Pin DIP IC} \begin{LTXexample}[pos=t] \begin{pspicture}(-1,-2)(5,7) @@ -3352,6 +3487,7 @@ all is finished. % % IC Example 20-pin all inverted % +\clearpage \subsubsection{20-Pin DIP IC all inverted} \begin{LTXexample}[pos=t] \begin{pspicture}(-1,-2)(5,7) @@ -3386,78 +3522,72 @@ all is finished. % % IC Example 32-pin % +\clearpage \subsubsection{32-Pin DIP IC} \begin{LTXexample}[pos=t] \begin{pspicture}(-1,-2)(6,9.5) - \logicic[nicpins=32,% - pintl=true,pintllabel=tl,pintlnumber=1,% - pintc=true,pintclabel=tc,pintcnumber=2,% - pintr=true,pintrlabel=tr,pintrnumber=3,% - invertpintl=true,invertpintc=true,invertpintr=true,% - pinbl=true,pinbllabel=bl,pinblnumber=1,% - pinbc=true,pinbclabel=bc,pinbcnumber=2,% - pinbr=true,pinbrlabel=br,pinbrnumber=3,% - invertpinbl=true,invertpinbc=true,invertpinbr=true,% - pinalabel=a,pinblabel=b,pinclabel=c,pindlabel=d,% - pinelabel=e,pinflabel=f,pinglabel=g,pinhlabel=h,% - pinilabel=i,pinjlabel=j,pinklabel=k,pinllabel=l,% - pinmlabel=m,pinnlabel=n,pinolabel=o,pinplabel=p,% - pinqlabel=q,pinrlabel=r,pinslabel=s,pintlabel=t,% - pinulabel=u,pinvlabel=v,pinwlabel=w,pinxlabel=x,% - pinylabel=y,pinzlabel=z,pinaalabel=aa,pinablabel=ab,% - pinaclabel=ac,pinadlabel=ad,pinaelabel=ae,pinaflabel=af,% - pinanumber=1,pinbnumber=2,pincnumber=3,pindnumber=4,% - pinenumber=5,pinfnumber=6,pingnumber=7,pinhnumber=8, - pininumber=9,pinjnumber=10,pinknumber=11,pinlnumber=12,% - pinmnumber=13,pinnnumber=14,pinonumber=15,pinpnumber=16,% - pinqnumber=17,pinrnumber=18,pinsnumber=19,pintnumber=20,% - pinunumber=21,pinvnumber=22,pinwnumber=23,pinxnumber=24,% - pinynumber=25,pinznumber=26,pinaanumber=27,pinabnumber=28,% - pinacnumber=29,pinadnumber=30,pinaenumber=31,pinafnumber=32]% - (0,0){Name} +\logicic[nicpins=32, pintl=true,pintllabel=tl,pintlnumber=1, + pintc=true,pintclabel=tc,pintcnumber=2,pintr=true,pintrlabel=tr,pintrnumber=3,% + invertpintl=true,invertpintc=true,invertpintr=true, + pinbl=true,pinbllabel=bl,pinblnumber=1,pinbc=true,pinbclabel=bc,pinbcnumber=2,% + pinbr=true,pinbrlabel=br,pinbrnumber=3,% + invertpinbl=true,invertpinbc=true,invertpinbr=true,% + pinalabel=a,pinblabel=b,pinclabel=c,pindlabel=d,% + pinelabel=e,pinflabel=f,pinglabel=g,pinhlabel=h,% + pinilabel=i,pinjlabel=j,pinklabel=k,pinllabel=l,% + pinmlabel=m,pinnlabel=n,pinolabel=o,pinplabel=p,% + pinqlabel=q,pinrlabel=r,pinslabel=s,pintlabel=t,% + pinulabel=u,pinvlabel=v,pinwlabel=w,pinxlabel=x,% + pinylabel=y,pinzlabel=z,pinaalabel=aa,pinablabel=ab,% + pinaclabel=ac,pinadlabel=ad,pinaelabel=ae,pinaflabel=af,% + pinanumber=1,pinbnumber=2,pincnumber=3,pindnumber=4,% + pinenumber=5,pinfnumber=6,pingnumber=7,pinhnumber=8, + pininumber=9,pinjnumber=10,pinknumber=11,pinlnumber=12,% + pinmnumber=13,pinnnumber=14,pinonumber=15,pinpnumber=16,% + pinqnumber=17,pinrnumber=18,pinsnumber=19,pintnumber=20,% + pinunumber=21,pinvnumber=22,pinwnumber=23,pinxnumber=24,% + pinynumber=25,pinznumber=26,pinaanumber=27,pinabnumber=28,% + pinacnumber=29,pinadnumber=30,pinaenumber=31,pinafnumber=32](0,0){Name} \end{pspicture} \end{LTXexample} % % IC Example 32-pin all inverted % +\clearpage \subsubsection{32-Pin DIP IC all inverted} \begin{center} \begin{pspicture}(-1,-2)(6,9.5) - \logicic[nicpins=32,% - pintl=true,pintllabel=tl,pintlnumber=1,% - pintc=true,pintclabel=tc,pintcnumber=2,% - pintr=true,pintrlabel=tr,pintrnumber=3,% - invertpintl=true,invertpintc=true,invertpintr=true,% - pinbl=true,pinbllabel=bl,pinblnumber=1,% - pinbc=true,pinbclabel=bc,pinbcnumber=2,% - pinbr=true,pinbrlabel=br,pinbrnumber=3,% - invertpinbl=true,invertpinbc=true,invertpinbr=true,% - pinalabel=a,pinblabel=b,pinclabel=c,pindlabel=d,% - pinelabel=e,pinflabel=f,pinglabel=g,pinhlabel=h,% - pinilabel=i,pinjlabel=j,pinklabel=k,pinllabel=l,% - pinmlabel=m,pinnlabel=n,pinolabel=o,pinplabel=p,% - pinqlabel=q,pinrlabel=r,pinslabel=s,pintlabel=t,% - pinulabel=u,pinvlabel=v,pinwlabel=w,pinxlabel=x,% - pinylabel=y,pinzlabel=z,pinaalabel=aa,pinablabel=ab,% - pinaclabel=ac,pinadlabel=ad,pinaelabel=ae,pinaflabel=af,% - pinanumber=1,pinbnumber=2,pincnumber=3,pindnumber=4,% - pinenumber=5,pinfnumber=6,pingnumber=7,pinhnumber=8, - pininumber=9,pinjnumber=10,pinknumber=11,pinlnumber=12,% - pinmnumber=13,pinnnumber=14,pinonumber=15,pinpnumber=16,% - pinqnumber=17,pinrnumber=18,pinsnumber=19,pintnumber=20,% - pinunumber=21,pinvnumber=22,pinwnumber=23,pinxnumber=24,% - pinynumber=25,pinznumber=26,pinaanumber=27,pinabnumber=28,% - pinacnumber=29,pinadnumber=30,pinaenumber=31,pinafnumber=32,% - invertpina=true,invertpinb=true,invertpinc=true,invertpind=true,% - invertpine=true,invertpinf=true,invertping=true,invertpinh=true,% - invertpini=true,invertpinj=true,invertpink=true,invertpinl=true,% - invertpinm=true,invertpinn=true,invertpino=true,invertpinp=true,% - invertpinq=true,invertpinr=true,invertpins=true,invertpint=true,% - invertpinu=true,invertpinv=true,invertpinw=true,invertpinx=true,% - invertpiny=true,invertpinz=true,invertpinaa=true,invertpinab=true,% - invertpinac=true,invertpinad=true,invertpinae=true,invertpinaf=true]% - (0,0){Name} +\logicic[nicpins=32,pintl=true,pintllabel=tl,pintlnumber=1, + pintc=true,pintclabel=tc,pintcnumber=2,pintr=true,pintrlabel=tr,pintrnumber=3, + invertpintl=true,invertpintc=true,invertpintr=true,% + pinbl=true,pinbllabel=bl,pinblnumber=1,pinbc=true,pinbclabel=bc,pinbcnumber=2,% + pinbr=true,pinbrlabel=br,pinbrnumber=3, + invertpinbl=true,invertpinbc=true,invertpinbr=true,% + pinalabel=a,pinblabel=b,pinclabel=c,pindlabel=d,% + pinelabel=e,pinflabel=f,pinglabel=g,pinhlabel=h,% + pinilabel=i,pinjlabel=j,pinklabel=k,pinllabel=l,% + pinmlabel=m,pinnlabel=n,pinolabel=o,pinplabel=p,% + pinqlabel=q,pinrlabel=r,pinslabel=s,pintlabel=t,% + pinulabel=u,pinvlabel=v,pinwlabel=w,pinxlabel=x,% + pinylabel=y,pinzlabel=z,pinaalabel=aa,pinablabel=ab,% + pinaclabel=ac,pinadlabel=ad,pinaelabel=ae,pinaflabel=af,% + pinanumber=1,pinbnumber=2,pincnumber=3,pindnumber=4,% + pinenumber=5,pinfnumber=6,pingnumber=7,pinhnumber=8, + pininumber=9,pinjnumber=10,pinknumber=11,pinlnumber=12,% + pinmnumber=13,pinnnumber=14,pinonumber=15,pinpnumber=16,% + pinqnumber=17,pinrnumber=18,pinsnumber=19,pintnumber=20,% + pinunumber=21,pinvnumber=22,pinwnumber=23,pinxnumber=24,% + pinynumber=25,pinznumber=26,pinaanumber=27,pinabnumber=28,% + pinacnumber=29,pinadnumber=30,pinaenumber=31,pinafnumber=32,% + invertpina=true,invertpinb=true,invertpinc=true,invertpind=true,% + invertpine=true,invertpinf=true,invertping=true,invertpinh=true,% + invertpini=true,invertpinj=true,invertpink=true,invertpinl=true,% + invertpinm=true,invertpinn=true,invertpino=true,invertpinp=true,% + invertpinq=true,invertpinr=true,invertpins=true,invertpint=true,% + invertpinu=true,invertpinv=true,invertpinw=true,invertpinx=true,% + invertpiny=true,invertpinz=true,invertpinaa=true,invertpinab=true,% + invertpinac=true,invertpinad=true,invertpinae=true,invertpinaf=true](0,0){Name} \end{pspicture} \end{center} @@ -3501,6 +3631,8 @@ all is finished. \end{pspicture} \end{lstlisting} +\clearpage +\section{Relay Ladder Logic} % % XIC @@ -3651,35 +3783,50 @@ all is finished. \end{pspicture} \end{LTXexample} -% -% Modified pst-circ Components -% -\subsubsection{Modified default symbols} + +\clearpage + +\subsection{Examples} + \begin{LTXexample}[pos=t] -\begin{pspicture}(-1,-1)(5,10) -\newdiode[labeloffset=-0.8](0,0)(4,0){$\backslash$newdiode} -\newLED[labeloffset=-0.8](0,2)(4,2){$\backslash$newLED} -\newZener[labeloffset=-0.8](0,4)(4,4){$\backslash$newZener} -\newcapacitor[labeloffset=-0.8](0,6)(4,6){$\backslash$newcapacitor} -\newcapacitor[labeloffset=-0.8](0,6)(4,6){$\backslash$newcapacitor} -\newcapacitor[labeloffset=-0.8](0,6)(4,6){$\backslash$newcapacitor} -\vdc[labeloffset=-0.8](0,8)(4,8){$\backslash$vdc} -\vac[labeloffset=-0.8](0,10)(4,10){$\backslash$vac} +\begin{pspicture}(0,0)(15,6) + \pnode(0.5,0){A} \pnode(0.5,2.75){B} \pnode(0.5,5.5){C} + \pnode(3,0){D} \pnode(3,2.75){E} \pnode(3,5.5){F} + \pnode(4.75,0){G} \pnode(4.75,5.50){H} + \pnode(6.5,0){I} \pnode(6.5,5.5){J} + \vac(B)(E){$V$} + \newdiode(B)(C){$D_1$} + \newdiode[ison=false](E)(F){$D_2$} + \newdiode[ison=false](A)(B){$D_3$} + \newdiode(D)(E){$D_4$} + \capacitor(G)(H){$C$} + \newarmature[labelInside=1](I)(J){} + \wire(C)(F) \wire(A)(D) \wire(D)(G) \wire(I)(G) \wire(F)(H) \wire(H)(J) + + \pnode(9,0){K} \pnode(9,2.75){L} \pnode(9,5.5){M} + \pnode(11.5,0){N} \pnode(11.5,2.75){O} + \pnode(11.5,5.5){P} + \pnode(13.25,0){Q} \pnode(13.25,5.5){R} + \pnode(15,0){S} \pnode(15,5.5){T} + \vac(L)(O){$V$} + \newdiode[ison=false](L)(M){$D_1$} + \newdiode(O)(P){$D_2$} + \newdiode(K)(L){$D_3$} + \newdiode[ison=false](N)(O){$D_4$} + \newcapacitor(Q)(R){$C$} + \newarmature[labelInside=1](S)(T){} + \wire(M)(P) \wire(K)(N) \wire(N)(Q) \wire(S)(Q) \wire(P)(R) \wire(R)(T) \end{pspicture} \end{LTXexample} -% -% \vac -% \begin{LTXexample}[pos=l] -\begin{pspicture}(-1,-1)(5,4) +\begin{pspicture}(-1,-1)(4,4) \vac[labeloffset=-0.7](0,0)(4,0){$\backslash$vac} \vac[labeloffset=1](0,0)(2,3.464){$\backslash$vac} \vac[labeloffset=1](2,3.464)(4,0){$\backslash$vac} \end{pspicture} \end{LTXexample} - \section{Adding new components} Adding new components is not simple unless you need only a simple dipole. For dipoles a macro is provided that generates all helping macros for a new component so that you need to write only the actual drawing code. 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 aa304969004..18e4bdaad34 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,5 @@ -%% This is file `pst-circ.tex', +%% $Id: pst-circ.tex 780 2013-05-15 06:35:30Z herbert $ +%% This is file `pst-circ.tex' %% %% IMPORTANT NOTICE: %% @@ -25,8 +26,8 @@ \ifx\PSTXKeyLoaded\endinput \else\input pst-xkey \fi \ifx\PSTMultidoLoaded\endinput\else\input multido.tex\fi % -\def\fileversion{2.02} -\def\filedate{2011/05/11} +\def\fileversion{2.03} +\def\filedate{2013/05/15} \message{`pst-circ' v\fileversion (hv)} % \edef\PstAtCode{\the\catcode`\@} @@ -389,6 +390,9 @@ % Bipole If Statements \newif\ifPst@polarized +% Diodes +\newif\ifPst@ison + % Define Integer Keys \define@choicekey[psset]{pst-circ}{ninputs}{0,1,2,3,4}[2]{\def\psk@ninputs{#1}} \define@choicekey[psset]{pst-circ}{segmentdisplay}{0,1,2,3,4,5,6,7,8,9,10}[10]{\def\psk@segmentdisplay{#1}} @@ -696,10 +700,6 @@ \define@key[psset]{pst-circ}{pinaf}[true]{\@nameuse{Pst@pinaf#1}} \define@key[psset]{pst-circ}{invertpinaf}[false]{\@nameuse{Pst@invertpinaf#1}} - - - - \define@key[psset]{pst-circ}{pinla}[true]{\@nameuse{Pst@pinla#1}} \define@key[psset]{pst-circ}{invertpinla}[false]{\@nameuse{Pst@invertpinla#1}} \define@key[psset]{pst-circ}{pinlb}[true]{\@nameuse{Pst@pinlb#1}} @@ -768,10 +768,6 @@ \define@key[psset]{pst-circ}{pinrp}[true]{\@nameuse{Pst@pinrp#1}} \define@key[psset]{pst-circ}{invertpinrp}[false]{\@nameuse{Pst@invertpinrp#1}} - - - - \define@key[psset]{pst-circ}{pintl}[false]{\@nameuse{Pst@pintl#1}} \define@key[psset]{pst-circ}{invertpintl}[false]{\@nameuse{Pst@invertpintl#1}} \define@key[psset]{pst-circ}{pintc}[false]{\@nameuse{Pst@pintc#1}} @@ -819,6 +815,9 @@ % Define Ladder Bipole Keys \define@key[psset]{pst-circ}{polarized}[false]{\@nameuse{Pst@polarized#1}} +% Define Diodes +\define@key[psset]{pst-circ}{ison}[true]{\@nameuse{Pst@ison#1}} + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % @@ -909,7 +908,8 @@ pintb=false,invertpintb=false,pintc=false,invertpintc=false,pintd=false,invertpintd=false, pinte=false,invertpinte=false,pinba=false,invertpinba=false,pinbb=false,invertpinbb=false, pinbc=false,invertpinbc=false,pinbd=false,invertpinbd=false,pinbe=false,invertpinbe=false, - dpleft=false,dpright=true,latch=false,unlatch=false,contactclosed=false,polarized=false + dpleft=false,dpright=true,latch=false,unlatch=false,contactclosed=false,polarized=false, + ison=true }% hv %\psset[pstricks]{radius=0.5} @@ -4103,7 +4103,7 @@ \def\logicor{\@ifnextchar[{\pst@logicor}{\pst@logicor[]}} \def\pst@logicor[#1]{\@ifnextchar({\pst@logicori[#1]{0}}{\pst@logicori[#1]}} \def\pst@logicori[#1]#2(#3)#4{{% - \psset{#1}% + \psset{#1}% \rput{#2}(#3){ % Inputs \ifcase\psk@ninputs\or @@ -4218,7 +4218,7 @@ \def\pst@logicxor[#1]{\@ifnextchar({\pst@logicxori[#1]{0}}{\pst@logicxori[#1]}} \def\pst@logicxori[#1]#2(#3)#4{{% \psset{#1}% - \rput{#2}(#3){ + \rput{#2}(#3){% % Inputs \ifcase\psk@ninputs\or \ifPst@inputa @@ -5017,8 +5017,13 @@ \psline[arrows=-,linewidth=1.5\pslinewidth](0.25,-0.4)(0.25,0.4) \psline[arrows=-,linewidth=\pslinewidth](0.25,-0.2)(0.5,-0.3)(0.5,-0.6) \else - \pspolygon[arrows=-,linewidth=1.5\pslinewidth,% + \ifPst@ison% + \pspolygon[arrows=-,linewidth=1.5\pslinewidth,% fillstyle=solid,fillcolor=black](-0.25,-0.3)(-0.25,0.3)(0.25,0) + \else + \pspolygon[arrows=-,linewidth=1.5\pslinewidth]% + (-0.25,-0.3)(-0.25,0.3)(0.25,0) + \fi \psline[arrows=-,linewidth=1.5\pslinewidth](0.25,0.3)(0.25,-0.3) \ifx\psk@Dstyle\pst@Dstyle@thyristor \psline[arrows=-,linewidth=1.5\pslinewidth](0,-0.1)(0,-0.35) @@ -5041,8 +5046,13 @@ \ignorespaces} % \def\pst@draw@newZener{{% - \pspolygon[arrows=-,linewidth=1.5\pslinewidth,% + \ifPst@ison% + \pspolygon[arrows=-,linewidth=1.5\pslinewidth,% fillstyle=solid,fillcolor=black](-0.25,-0.3)(-0.25,0.3)(0.25,0) + \else + \pspolygon[arrows=-,linewidth=1.5\pslinewidth]% + (-0.25,-0.3)(-0.25,0.3)(0.25,0) + \fi \psline[arrows=-,linewidth=1.5\pslinewidth](0.1,0.4)(0.25,0.3)(0.25,-0.3)(0.4,-0.4) \pnode(-0.25,0){dipole@1} \pnode(0.25,0){dipole@2} @@ -5059,14 +5069,43 @@ \ignorespaces} % \def\pst@draw@newLED{{% - \pspolygon[arrows=-,linewidth=1.5\pslinewidth,% + \ifPst@ison% + \pspolygon[arrows=-,linewidth=1.5\pslinewidth,% fillstyle=solid,fillcolor=black](-0.25,-0.3)(-0.25,0.3)(0.25,0) + \else + \pspolygon[arrows=-,linewidth=1.5\pslinewidth]% + (-0.25,-0.3)(-0.25,0.3)(0.25,0) + \fi \psline[arrows=-,linewidth=1.5\pslinewidth](0.25,0.3)(0.25,-0.3) \multips(-0.15,0.35)(0.2,0){2}{\psline[arrows=->](0,0)(0.2,0.25)} \pnode(-0.25,0){dipole@1} \pnode(0.25,0){dipole@2} }} +% +% \newarmature +% +\def\newarmature{\@ifnextchar[{\pst@newarmature}{\pst@newarmature[]}} +\def\pst@newarmature[#1](#2)(#3)#4{{% + \pst@draw@dipole{#1}{#2}{#3}{#4}\pst@draw@newarmature}\ignorespaces} +% +\def\pst@draw@newarmature{{% + \pnode(-1,0){dipole@1} + \pnode(1,0){dipole@2} + % Input + \psline(-1,0)(-0.7,0) + % Body + \psline(-0.7,0.2)(0.7,0.2)(0.7,-0.2)(-0.7,-0.2)(-0.7,0.2) + \pscircle[fillstyle=solid](0,0){0.5} + % Output + \psline(1,0)(0.7,0) + % Name + \ifcase\psk@labelInside\or% do nothing + \rput(0,0){\large\bf M}\or% case 1 - motor + \rput(0,0){\large\bf G}% case 2 - generator + \fi +}} + % % \vdc % @@ -5109,9 +5148,32 @@ \pscircle[linewidth=1.5\pslinewidth](0,0){0.5} }} -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\catcode`\@=\PstAtCode\relax % -\endinput +% \newSwitch (New Switch) +% +\def\newSwitch{\@ifnextchar[{\pst@newSwitch}{\pst@newSwitch[]}} +\def\pst@newSwitch[#1](#2)(#3)#4{{% + \pst@draw@dipole{#1}{#2}{#3}{#4}\pst@draw@newSwitch} + \pst@getcoor{#2}\pst@tempa + \pst@getcoor{#3}\pst@tempb + \ignorespaces} +% +\def\pst@draw@newSwitch{{% + \ifPst@ison + \pnode(-0.6,0){dipole@1} + \pnode(0.6,0){dipole@2} + \psline[arrows=-,linewidth=4\pslinewidth](-0.5,-0.005)(0.5,-0.005) + \pscircle[fillstyle=solid,fillcolor=black](-0.5,0){0.1} + \pscircle[fillstyle=solid,fillcolor=black](0.5,0){0.1} + \else + \pnode(-0.6,0){dipole@1} + \pnode(0.6,0){dipole@2} + \psline[arrows=-,linewidth=2\pslinewidth](-0.5,0)(0.5,0.5) + \pscircle[fillstyle=solid](-0.5,0){0.1} + \pscircle[fillstyle=solid](0.5,0){0.1} + \fi +}} +% +\catcode`\@=\PstAtCode\relax % +\endinput \ No newline at end of file diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check index 54b2f5cf225..dbfdee3178c 100755 --- a/Master/tlpkg/bin/tlpkg-ctan-check +++ b/Master/tlpkg/bin/tlpkg-ctan-check @@ -216,7 +216,8 @@ my @TLP_working = qw( gloss glossaries gmdoc gmdoc-enhance gmeometric gmiflink gmp gmutils gmverb gmverse gnuplottex go gost gradientframe grafcet graphics graphics-pln - graphicx-psmin greek-inputenc greekdates greektex greenpoint grfpaste + graphicx-psmin greek-fontenc greek-inputenc + greekdates greektex greenpoint grfpaste grid gridset gtrcrd gu guitar guitlogo hacm hands hanging hanoi happy4th har2nat hardwrap harmony harnon-cv harpoon harvard harvmac hatching hausarbeit-jura diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index b917ed250aa..9c067841d93 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -1372,6 +1372,7 @@ $standardtex='\.(.bx|cfg|sty|clo|ldf|cls|def|fd|cmap|4ht)$'; 'getoptk', '\.tex', 'ginpenc', '\.gie|\.sty', 'graphics-pln','^[^e].*\.tex|.*\.sty', # not exmpl* + 'greek-fontenc','NULL', 'hanoi', 'hanoi\.tex', 'harvmac', 'mac\.tex', 'hc', '\.hld|' . $standardtex, @@ -2400,6 +2401,7 @@ $standardxmt='\.xmt'; 'ulqda' => '\.pl$', 'urlbst' => 'urlbst$', 'vpe' => '\.pl$', + 'wheretotrim' => '\.pl$', ); @@ -2437,6 +2439,7 @@ $standardxmt='\.xmt'; 'sty2dtx' => '\.1$', 'texdiff' => 'texdiff.1', 'texdirflatten' => 'texdirflatten.1', + 'wheretotrim' => '\.1$', ); # which suffixes to remove after building. Checked after runins and at diff --git a/Master/tlpkg/tlpsrc/collection-langgreek.tlpsrc b/Master/tlpkg/tlpsrc/collection-langgreek.tlpsrc index 907bacdb184..3ada5ded557 100644 --- a/Master/tlpkg/tlpsrc/collection-langgreek.tlpsrc +++ b/Master/tlpkg/tlpsrc/collection-langgreek.tlpsrc @@ -10,6 +10,7 @@ depend bgreek depend cbfonts depend gfsbaskerville depend gfsporson +depend greek-fontenc depend greek-inputenc depend greekdates depend greektex -- cgit v1.2.3