summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/pst-circ
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-10-03 22:22:24 +0000
committerKarl Berry <karl@freefriends.org>2013-10-03 22:22:24 +0000
commitd5046892b80eb50260f48053ecb651524bb8fd99 (patch)
tree710105f2dfd3f760ff54db98126e27f0e7937bec /Master/texmf-dist/tex/generic/pst-circ
parente5eb637929530ade80eb06166f5c9bf94520cc8a (diff)
pst-circ (3oct13)
git-svn-id: svn://tug.org/texlive/trunk@31820 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic/pst-circ')
-rw-r--r--Master/texmf-dist/tex/generic/pst-circ/pst-circ.tex53
1 files changed, 34 insertions, 19 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 d531e094259..c11ba4d7115 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 792 2013-06-15 05:52:12Z herbert $
+%% $Id: pst-circ.tex 829 2013-10-03 10:50:06Z 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.04}
-\def\filedate{2013/06/13}
+\def\fileversion{2.05}
+\def\filedate{2013/10/03}
\message{`pst-circ' v\fileversion (hv)}
%
\edef\PstAtCode{\the\catcode`\@}
@@ -93,6 +93,8 @@
\define@key[psset]{pst-circ}{intensitycolor}[black]{\def\psk@I@color{#1}}
\define@key[psset]{pst-circ}{intensitywidth}[\pslinewidth]{\def\psk@I@width{#1}}
\define@boolkey[psset]{pst-circ}[Pst@]{tension}[true]{}
+\define@key[psset]{pst-circ}{tensionstyle}[line]{\expandafter\psk@tension@style@@#1\@nil}
+\def\psk@tension@style@@#1#2\@nil{\ifx#1p \def\psk@tension@style{1}\else\def\psk@tension@style{0}\fi}
\define@key[psset]{pst-circ}{tensionlabel}[]{\def\psk@tension@label{#1}}
\define@key[psset]{pst-circ}{tensionlabelcolor}[black]{\def\psk@tension@labelcolor{#1}}
\define@key[psset]{pst-circ}{tensionoffset}[1]{\def\psk@tension@offset{#1}}
@@ -828,6 +830,7 @@
intensity=false,intensitylabel={},
intensitylabeloffset=0.5,
intensitycolor=black,intensitylabelcolor=black,intensitywidth=\pslinewidth,
+ tensionstyle=line,
tension=false,tensionlabel={},tensionoffset=1,tensionlabeloffset=1.2,
tensioncolor=black,tensionlabelcolor=black,tensionwidth=\pslinewidth,
labeloffset=0.7,labelangle=0,dipoleconvention=receptor,directconvention=true,dipolestyle=normal
@@ -1661,33 +1664,45 @@
%
\def\pst@tension#1#2{%
\ifPst@tension
- \pcline[arrows=-,linestyle=none,fillstyle=none,%
- offset=\psk@tension@offset](#1)(dipole@1)
+ \pcline[arrows=-,linestyle=none,fillstyle=none,offset=\psk@tension@offset](#1)(dipole@1)
\ncput[npos=.5]{\pnode{tension@1}}
- \pcline[arrows=-,linestyle=none,fillstyle=none,
- offset=-\psk@tension@offset](#2)(dipole@2)
+ \pcline[arrows=-,linestyle=none,fillstyle=none,offset=-\psk@tension@offset](#2)(dipole@2)
\ncput[npos=.5]{\pnode{tension@2}}
\ifPst@directconvention
\ifPst@Dconvention
- \pcline[linecolor=\psk@tension@color,
- linewidth=\psk@tension@width,arrowinset=0]{<-}(tension@1)(tension@2)
+ \ifnum\psk@tension@style=1
+ \pcline[linestyle=none](tension@1)(tension@2)
+ \ncput[npos=0.25]{$-$}\ncput[npos=0.75]{$+$}%
+ \else
+ \pcline[linecolor=\psk@tension@color,linewidth=\psk@tension@width,arrowinset=0]{<-}(tension@1)(tension@2)
+ \fi
\else
- \pcline[linecolor=\psk@tension@color,
- linewidth=\psk@tension@width,arrowinset=0]{->}(tension@1)(tension@2)
+ \ifnum\psk@tension@style=1
+ \pcline[linestyle=none](tension@1)(tension@2)
+ \ncput[npos=0.25]{$+$}\ncput[npos=0.75]{$-$}%
+ \else
+ \pcline[linecolor=\psk@tension@color,linewidth=\psk@tension@width,arrowinset=0]{->}(tension@1)(tension@2)
+ \fi
\fi
\else
\ifPst@Dconvention
- \pcline[linecolor=\psk@tension@color,
- linewidth=\psk@tension@width,arrowinset=0]{->}(tension@1)(tension@2)
+ \ifnum\psk@tension@style=1
+ \pcline[linestyle=none](tension@1)(tension@2)
+ \ncput[npos=0.25]{$-$}\ncput[npos=0.75]{$+$}%
+ \else
+ \pcline[linecolor=\psk@tension@color,linewidth=\psk@tension@width,arrowinset=0]{->}(tension@1)(tension@2)
+ \fi
\else
- \pcline[linecolor=\psk@tension@color,
- linewidth=\psk@tension@width,arrowinset=0]{<-}(tension@1)(tension@2)
+ \ifnum\psk@tension@style=1
+ \pcline[linestyle=none](tension@1)(tension@2)
+ \ncput[npos=0.25]{$+$}\ncput[npos=0.75]{$-$}%
+ \else
+ \pcline[linecolor=\psk@tension@color,linewidth=\psk@tension@width,arrowinset=0]{<-}(tension@1)(tension@2)
+ \fi
\fi
\fi
- \pcline[arrows=-,linestyle=none,fillstyle=none,%
- offset=\psk@tension@label@offset](dipole@1)(dipole@2)
- \ncput[nrot=\psk@label@angle]{%
- \csname\psk@tension@labelcolor\endcsname\psk@tension@label}
+ \pcline[arrows=-,linestyle=none,fillstyle=none,offset=\psk@tension@label@offset](dipole@1)(dipole@2)
+ \ncput[nrot=\psk@label@angle]{\csname\psk@tension@labelcolor\endcsname\psk@tension@label}
\fi
}
%