diff options
Diffstat (limited to 'Master/texmf-dist/tex/generic/pst-circ')
| -rw-r--r-- | Master/texmf-dist/tex/generic/pst-circ/pst-circ.tex | 40 |
1 files changed, 30 insertions, 10 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 595811ece18..884f709eae8 100644 --- a/Master/texmf-dist/tex/generic/pst-circ/pst-circ.tex +++ b/Master/texmf-dist/tex/generic/pst-circ/pst-circ.tex @@ -8,7 +8,7 @@ %% Original idea: A.Premoli I.Maio, M.Luque, %% %% Christophe Jorssen <CJ@PSTricks.de> -%% Herbert Voss <voss@Pstricks.de> +%% Herbert Voss <voss@PSTricks.de> %% %% This program can be redistributed and/or modified under the terms %% of the LaTeX Project Public License Distributed from CTAN archives @@ -29,8 +29,8 @@ \ifx\PSTnodeLoaded\endinput\else\input pst-node.tex\fi \ifx\PSTXKeyLoaded\endinput\else\input pst-xkey \fi % -\def\fileversion{1.45} -\def\filedate{2008/03/15} +\def\fileversion{1.46} +\def\filedate{2008/07/15} \message{`pst-circ' v\fileversion (CJ,hv,pd)} % \edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax @@ -91,6 +91,7 @@ \def\pst@Dstyle@normal{normal} \def\pst@Dstyle@chemical{chemical} \def\pst@Dstyle@elektor{elektor} +\def\pst@Dstyle@crystal{crystal} \def\pst@Dstyle@elektorchemical{elektorchemical} \def\pst@Dstyle@elektorcurved{elektorcurved} \def\pst@Dstyle@curved{curved} @@ -693,7 +694,9 @@ hatchwidth=0.5\pslinewidth](-0.5,-0.7)(0.5,-0.5) \psline[linewidth=1.5\pslinewidth](-0.5,-0.5)(0.5,-0.5) \psline(0,0)(0,-0.5) - \pscircle*(#3){2\pslinewidth}% + \ifPst@connectingdot + \pscircle*(0,0){2\pslinewidth} + \fi } \ignorespaces% }} @@ -1368,10 +1371,18 @@ \pnode(-0.2284123,0){dipole@1} \pnode(0.2284123,0){dipole@2} \else - \psline[arrows=-](-0.2,-0.5)(-0.2,0.5) - \psline[arrows=-](0.2,-0.5)(0.2,0.5) - \pnode(-0.2,0){dipole@1} - \pnode(0.2,0){dipole@2} + \ifx\psk@Dstyle\pst@Dstyle@crystal + \psline[arrows=-](-0.3,-0.4)(-0.3,0.4) + \psline[arrows=-](0.3,-0.4)(0.3,0.4) + \psframe(-0.2,-0.5)(0.2,0.5) + \pnode(-0.3,0){dipole@1} + \pnode(0.3,0){dipole@2} + \else + \psline[arrows=-](-0.2,-0.5)(-0.2,0.5) + \psline[arrows=-](0.2,-0.5)(0.2,0.5) + \pnode(-0.2,0){dipole@1} + \pnode(0.2,0){dipole@2} + \fi \fi \fi \fi @@ -1948,6 +1959,10 @@ \define@key[psset]{pst-circ}{tripoleconfig}{\def\psk@Tconfig{#1}} \define@key[psset]{pst-circ}{couplerstyle}{\def\psk@Qstyle{#1}} \define@key[psset]{pst-circ}{quadripoleinput}{\def\psk@Qinput{#1}} +% +\newif\ifPst@connectingdot +\define@key[psset]{pst-circ}{connectingdot}[true]{\@nameuse{Pst@connectingdot#1}} +% \psset{groundstyle=ads,% antennastyle=two,% output=top,% @@ -1960,7 +1975,9 @@ tripolestyle=bottom,% tripoleconfig=left,% quadripoleinput=left,% - couplerstyle=hybrid} + couplerstyle=hybrid,% + connectingdot=true, +} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%% monopole @@ -1968,6 +1985,7 @@ %%% Antenna: antennastyle: (two), three, triangle %%% Oscillator: oscioutput: (top), right, bottom, left, %%% inputarrow: (false), true +%%% connectingdot: (true), false %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%% newground %%% \def\newground{\@ifnextchar[{\pst@newground}{\pst@newground[]}} @@ -1989,7 +2007,9 @@ \pstriangle[linewidth=1.5\pslinewidth](0,-0.5)(0.4,-0.4) \fi \psline(0,0)(0,-0.5) - \pscircle*(#3){2\pslinewidth}% + \ifPst@connectingdot + \pscircle*(0,0){2\pslinewidth} + \fi } \ignorespaces% } |