diff options
-rw-r--r-- | Master/texmf-dist/doc/generic/pst-magneticfield/Changes | 1 | ||||
-rw-r--r-- | Master/texmf-dist/doc/generic/pst-magneticfield/pst-magneticfield-doc.pdf (renamed from Master/texmf-dist/doc/generic/pst-magneticfield/pst-magneticfield-docEN.pdf) | bin | 29922691 -> 29875894 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/generic/pst-magneticfield/pst-magneticfield-doc.tex (renamed from Master/texmf-dist/doc/generic/pst-magneticfield/pst-magneticfield-docEN.tex) | 24 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/pst-magneticfield/pst-magneticfield.tex | 32 |
4 files changed, 32 insertions, 25 deletions
diff --git a/Master/texmf-dist/doc/generic/pst-magneticfield/Changes b/Master/texmf-dist/doc/generic/pst-magneticfield/Changes index 38ac4bcbc41..7db4a1f61a6 100644 --- a/Master/texmf-dist/doc/generic/pst-magneticfield/Changes +++ b/Master/texmf-dist/doc/generic/pst-magneticfield/Changes @@ -3,6 +3,7 @@ pst-magneticfield.sty -------- pst-magneticfield.tex -------- +1.16 2019-01-21 - fix for linewidtht 1.15 2019-01-17 - added bar magnet 1.14 2011-05-01 - allow arrow definition for the current 1.13 2010-06-08 - fixed aspurious blank in \pstmageneticfield diff --git a/Master/texmf-dist/doc/generic/pst-magneticfield/pst-magneticfield-docEN.pdf b/Master/texmf-dist/doc/generic/pst-magneticfield/pst-magneticfield-doc.pdf Binary files differindex 9f418f3c532..3cb0021fa78 100644 --- a/Master/texmf-dist/doc/generic/pst-magneticfield/pst-magneticfield-docEN.pdf +++ b/Master/texmf-dist/doc/generic/pst-magneticfield/pst-magneticfield-doc.pdf diff --git a/Master/texmf-dist/doc/generic/pst-magneticfield/pst-magneticfield-docEN.tex b/Master/texmf-dist/doc/generic/pst-magneticfield/pst-magneticfield-doc.tex index 7332ee4e06d..cec15ab89c7 100644 --- a/Master/texmf-dist/doc/generic/pst-magneticfield/pst-magneticfield-docEN.tex +++ b/Master/texmf-dist/doc/generic/pst-magneticfield/pst-magneticfield-doc.tex @@ -1,4 +1,4 @@ -%% $Id: pst-magneticfield-docEN.tex 912 2019-01-17 10:46:15Z herbert $ +%% $Id: pst-magneticfield-doc.tex 916 2019-01-20 19:52:57Z herbert $ \documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings, headexclude,footexclude,oneside]{pst-doc} \usepackage{pst-magneticfield} @@ -12,7 +12,7 @@ \newcommand\Cadre[1]{\psframebox[fillstyle=solid,fillcolor=black,linestyle=none,framesep=0]{#1}} \def\bgImage{} -\addbibresource{pst-magneticfield-doc.bib} +\addbibresource{\jobname.bib} \begin{document} @@ -588,45 +588,51 @@ Bar magnet and field can be put of the other by single commands: \begin{LTXexample} -\begin{pspicture*}[showgrid=false](-5,-8)(5,8) +\begin{pspicture*}[showgrid=false](-7,-8)(7,8) \psset{linecolor=blue} -\psscalebox{0.8 1.2}{\psmagneticfield[R=1,L=5,N=5,pointsS=200,nL=9,nS=0,PasB=0.1,numSpires=0](-8,-10)(8,10)} +\psscalebox{0.8 1.2}{\psmagneticfield[R=1,L=5,N=5,pointsS=200,nL=18,nS=0,PasB=0.1,numSpires=0](-8,-10)(8,10)} \rput(0,0){\psscalebox{2.2 3.0}{\psBarMagnet}} \end{pspicture*} \end{LTXexample} +\clearpage or by using the optional argument \Lkeyword{showField}: \begin{LTXexample} -\begin{pspicture*}(-5,-8)(5,8) +\begin{pspicture*}(-7,-8)(7,8) \psBarMagnet[showField](0,0) \end{pspicture*} \end{LTXexample} + +\clearpage + A rotation has to be done with the command \Lcs{rotatebox} from package \LPack{graphicx}: \begin{LTXexample} -\begin{pspicture*}(-5,-8)(5,8) +\begin{pspicture*}(-7,-8)(7,8) \rotatebox{180}{\psBarMagnet[showField](0,0)} \end{pspicture*} \end{LTXexample} +\clearpage + + Scaling is possible with the optional argument \Lkeyword{magnetscale} and all options which are valid for \begin{LTXexample} -\begin{pspicture*}(-5,-8)(5,8) -\psBarMagnet[showField,nL=18,magnetScale=1 1.5](0,0) +\begin{pspicture*}(-7,-8)(7,8) +\psBarMagnet[showField,magnetScale=1 2](0,0) \end{pspicture*} \end{LTXexample} - \clearpage \section{List of all optional arguments for \texttt{pst-magneticfield}} diff --git a/Master/texmf-dist/tex/generic/pst-magneticfield/pst-magneticfield.tex b/Master/texmf-dist/tex/generic/pst-magneticfield/pst-magneticfield.tex index cf548ae4367..690afeca273 100644 --- a/Master/texmf-dist/tex/generic/pst-magneticfield/pst-magneticfield.tex +++ b/Master/texmf-dist/tex/generic/pst-magneticfield/pst-magneticfield.tex @@ -22,8 +22,8 @@ \ifx\MultidoLoaded\endinput\else \input multido.tex\fi \ifx\PSTXKeyLoaded\endinput\else \input pst-xkey \fi % -\def\fileversion{1.15} -\def\filedate{2019/01/17} +\def\fileversion{1.16} +\def\filedate{2019/01/21} \message{`pst-magneticfield' v\fileversion, \filedate\space (ml,jg,hv)} % \edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax @@ -196,18 +196,18 @@ \define@boolkey[psset]{pst-magneticfield}[Pst@]{showField}[true]{} \define@boolkey[psset]{pst-magneticfield}[Pst@]{showPoleLabels}[true]{} \define@key[psset]{pst-magneticfield}{fontstyle}[\large\bfseries\sffamily]{\def\psk@label@fontstyle{#1}} -\define@key[psset]{pst-magneticfield}{magnetScale}[1 1]{\pst@getscale{#1}\pst@magnetscale} +\define@key[psset]{pst-magneticfield}{magnetScale}[1 1]{\def\pst@magnetscale{#1}} \psset[pst-magneticfield]{showPoleLabels,fontstyle=\large\bfseries\sffamily,showField=false, - magnetScale=1} + magnetScale=1 1} \def\ps@Bar@Magnet{% \psscalebox{\pst@magnetscale}{% - \psframe*[linecolor=Green](-0.5,-1.5)(0.5,0)% - \psframe*[linecolor=BrickRed](-0.5,0)(0.5,1.5)% - \ifPst@showPoleLabels - \rput{0}(0,1){\textcolor{white}{\psk@label@fontstyle N}}% - \rput{0}(0,-1){\textcolor{white}{\psk@label@fontstyle S}}% - \fi}% + \psframe*[linecolor=Green](-0.75,-1.75)(0.75,0)% + \psframe*[linecolor=BrickRed](-0.75,0)(0.75,1.75)% + \ifPst@showPoleLabels + \rput{0}(0,1){\textcolor{white}{\psk@label@fontstyle N}}% + \rput{0}(0,-1){\textcolor{white}{\psk@label@fontstyle S}}% + \fi} }% \def\psBarMagnet{\pst@object{psBarMagnet}} @@ -215,15 +215,15 @@ \def\psBarMagnet@ii(#1){% \pst@killglue \begingroup - \addbefore@par{R=0.8,L=3,N=4,pointsS=200,nL=9,nS=0,PasB=0.1,numSpires=0}% + \addbefore@par{linewidth=2pt,R=0.8,L=3,N=4,pointsS=200,nL=9,nS=0,PasB=0.1,numSpires=0,arrowscale=1.5,arrowinset=0.1}% \use@par \ifPst@showField \rput(#1){% - \psscalebox{0.4 0.7}{\psmagneticfield(-8,-10)(8,10)}% - \multido{\rA=0.3+0.3,\rB=0.8+0.1,\iA=-60+20,\iB=60+-20}{4}{% - \pccurve[ncurv=\rB,linewidth=0.1\pslinewidth,angleA=\iA,angleB=\iB,ArrowInside=->](0.5,\rA)(0.5,-\rA) - \psscalebox{-1 1}{\pccurve[ncurv=\rB,linewidth=0.1\pslinewidth,angleA=\iA,angleB=\iB,ArrowInside=->](0.5,\rA)(0.5,-\rA)}% - }}% + \psscalebox{0.4 0.5}{\psmagneticfield[drawSelf=false](-8,-10)(8,10)% + \multido{\rA=0.6+0.3,\rB=0.8+0.4,\iA=-60+20,\iB=60+-20}{4}{% + \pccurve[ncurv=\rB,angleA=\iA,angleB=\iB,ArrowInside=->,ArrowInsideNo=2](0.7,\rA)(0.7,-\rA)% + \psscalebox{-1 1}{\pccurve[ncurv=\rB,angleA=\iA,angleB=\iB,ArrowInside=->,ArrowInsideNo=2](0.7,\rA)(0.7,-\rA)}% + }}}% \fi \rput(#1){\ps@Bar@Magnet}% \endgroup |