diff options
author | Karl Berry <karl@freefriends.org> | 2009-02-24 01:37:56 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2009-02-24 01:37:56 +0000 |
commit | 4b8a8e3619a77ff4d53e491418d36958a2461cb0 (patch) | |
tree | 930dcd333cf3d9346064cc0eaa7f6aa01368c49d /Master/texmf-dist/tex | |
parent | e53878f5d965690a73010793723c0942c80d7818 (diff) |
pst-circ 1.51 (23feb09)
git-svn-id: svn://tug.org/texlive/trunk@12220 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r-- | Master/texmf-dist/tex/generic/pst-circ/pst-circ.tex | 47 |
1 files changed, 43 insertions, 4 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 aef09754ac7..e3977b6e1cd 100644 --- a/Master/texmf-dist/tex/generic/pst-circ/pst-circ.tex +++ b/Master/texmf-dist/tex/generic/pst-circ/pst-circ.tex @@ -29,8 +29,8 @@ \ifx\PSTXKeyLoaded\endinput\else\input pst-xkey \fi \ifx\PSTMultidoLoaded\endinput\else\input multido.tex\fi % -\def\fileversion{1.50} -\def\filedate{2009/01/18} +\def\fileversion{1.51} +\def\filedate{2009/02/20} \message{`pst-circ' v\fileversion (CJ,hv,pd)} % \edef\PstAtCode{\the\catcode`\@} @@ -692,6 +692,43 @@ % % end hv 2003-08-29 % +%% SQUID def added 2009-02-18 Amit Finkler +\def\SQUID{\@ifnextchar[{\pst@SQUID}{\pst@SQUID[]}} +\def\pst@SQUID[#1](#2)(#3)#4{{% + \pst@draw@dipole{#1}{#2}{#3}{#4}\pst@draw@SQUID}\ignorespaces} +% +\def\pst@multidipole@SQUID{\@ifnextchar[{\pst@multidipole@SQUID@}{\pst@multidipole@SQUID@[]}} +% +\def\pst@multidipole@SQUID@[#1]#2{% + \expandafter\def\csname pst@circ@tmp@\number\pst@circ@count@iii\endcsname{#2}% + {\psset{#1}% + \ifPst@circ@parallel\aftergroup\advance\aftergroup\pst@circ@count@i\aftergroup\ + m@ne\fi}% + \pst@circ@count@ii=\pst@circ@count@i% + \advance\pst@circ@count@ii\@ne% + \toks0\expandafter{\pst@multidipole@output}% + \edef\pst@multidipole@output{% + \the\toks0% + \pst@multidipole@def@coor% + \noexpand\SQUID[#1]% + (! X@\the\pst@circ@count@i\space Y@\the\pst@circ@count@i)% + (! X@\the\pst@circ@count@ii\space Y@\the\pst@circ@count@ii)% + {\noexpand\csname pst@circ@tmp@\number\pst@circ@count@iii\endcsname}% + }% + \pst@multidipole@} +% +\def\pst@draw@SQUID{% + \pscircle[linewidth=1.5\pslinewidth](0,0){0.5} + \psline(0.1,-0.6)(-0.1,-0.4) + \psline(0.1,-0.4)(-0.1,-0.6) + \psline(0.1,0.6)(-0.1,0.4) + \psline(0.1,0.4)(-0.1,0.6) + \pnode(-0.5,0){dipole@1} + \pnode(0.5,0){dipole@2}% +} +%% End of SQUID def + +% %%%%%%%%%%%%% \def\multidipole{\@ifnextchar[{\pst@multidipole}{\pst@multidipole[]}} \def\pst@multidipole[#1](#2)(#3)#4{% @@ -737,10 +774,11 @@ \else\ifx\vco #4\let\pscirc@next\pst@multidipole@vco % 20 \else\ifx\amplifier #4\let\pscirc@next\pst@multidipole@amplifier% \else\ifx\detector #4\let\pscirc@next\pst@multidipole@detector% 22 + \else\ifx\SQUID #4\let\pscirc@next\pst@multidipole@SQUID% 23 \else\let\pscirc@next\ignorespaces \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi% 1..10 \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi%11..20 - \fi\fi% 21..22 + \fi\fi\fi% 21..23 \advance\pst@count@i\@ne \advance\pst@count@iii\@ne \pscirc@next} @@ -768,10 +806,11 @@ \else\ifx\vco #1\let\pscirc@next\pst@multidipole@vco % 20 \else\ifx\amplifier#1\let\pscirc@next\pst@multidipole@amplifier% \else\ifx\detector #1\let\pscirc@next\pst@multidipole@detector% 22 + \else\ifx\SQUID #1\let\pscirc@next\pst@multidipole@SQUID% 23 \else\let\pscirc@next\ignorespaces\pst@multidipole@output \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi - \fi\fi + \fi\fi\fi \advance\pst@count@i\@ne \advance\pst@count@iii\@ne \pscirc@next |