summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-06-12 00:12:11 +0000
committerKarl Berry <karl@freefriends.org>2010-06-12 00:12:11 +0000
commit452c9d0af12acb085390fe26cc37a9e93d689d5a (patch)
tree2a28496b755aa54c3ca3a7c8de80510899f14dbb /Master/texmf-dist
parent3ca859b7c25a23c6fa253978191197782df3d799 (diff)
pst-magneticfield 1.12 (11jun10)
git-svn-id: svn://tug.org/texlive/trunk@18901 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/doc/generic/pst-magneticfield/Changes6
-rw-r--r--Master/texmf-dist/doc/generic/pst-magneticfield/README15
-rw-r--r--Master/texmf-dist/doc/generic/pst-magneticfield/pst-magneticfield-doc.bib (renamed from Master/texmf-dist/doc/generic/pst-magneticfield/pst-magneticfield-docDE.bib)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-magneticfield/pst-magneticfield-docDE.pdfbin6928568 -> 1921039 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pst-magneticfield/pst-magneticfield-docDE.tex316
-rw-r--r--Master/texmf-dist/doc/generic/pst-magneticfield/pst-magneticfield-docEN.bib79
-rw-r--r--Master/texmf-dist/doc/generic/pst-magneticfield/pst-magneticfield-docEN.pdfbin6760355 -> 1918514 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pst-magneticfield/pst-magneticfield-docEN.tex312
-rw-r--r--Master/texmf-dist/doc/generic/pst-magneticfield/pst-magneticfield-docFR.bib79
-rw-r--r--Master/texmf-dist/doc/generic/pst-magneticfield/pst-magneticfield-docFR.pdfbin6762897 -> 1919464 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pst-magneticfield/pst-magneticfield-docFR.tex314
-rw-r--r--Master/texmf-dist/dvips/pst-magneticfield/pst-magneticfield.pro303
-rw-r--r--Master/texmf-dist/source/generic/pst-magneticfield/Makefile83
-rw-r--r--Master/texmf-dist/tex/generic/pst-magneticfield/pst-magneticfield.tex325
14 files changed, 1234 insertions, 598 deletions
diff --git a/Master/texmf-dist/doc/generic/pst-magneticfield/Changes b/Master/texmf-dist/doc/generic/pst-magneticfield/Changes
index 2bf408e520e..ab18ab44275 100644
--- a/Master/texmf-dist/doc/generic/pst-magneticfield/Changes
+++ b/Master/texmf-dist/doc/generic/pst-magneticfield/Changes
@@ -3,6 +3,12 @@ pst-magneticfield.sty --------
pst-magneticfield.tex --------
+1.12 2010-06-07 - allow density plots
+ - move PS code into a pro file
1.11 2010-05-20 - change order for the different lines
in the 3d view (dashed lines first) (hv)
1.10 2010-05-16 - first CTAN version
+
+
+pst-magneticfield.pro --------
+0.01 2010-06-07 - initial pro file
diff --git a/Master/texmf-dist/doc/generic/pst-magneticfield/README b/Master/texmf-dist/doc/generic/pst-magneticfield/README
index a7776adf323..f23740077a2 100644
--- a/Master/texmf-dist/doc/generic/pst-magneticfield/README
+++ b/Master/texmf-dist/doc/generic/pst-magneticfield/README
@@ -1,3 +1,4 @@
+The files ----------------
Save the files pst-magneticfield.sty|tex in a directory, which is part of your
local TeX tree.
Then do not forget to run texhash to update this tree.
@@ -6,3 +7,17 @@ on installing packages into your LATEX distribution or the
TeX Frequently Asked Questions:
(http://www.tex.ac.uk/cgi-bin/texfaq2html?label=instpackages).
+
+The documentation -------------------
+To get a smaller size of the generated pdf file run the
+Makefile or by hand
+"pst2pdf <file> --Iext=.png --Iscale=0.5 --DPI=150". This will
+create eps/pdf/png images in a subdirectory images/ and then
+using only the png ones for the last _pdflatex_ run. The
+file size can be reduced to about 20% of the one created with
+ps2pdf. The pdf file is saved as yfile>-pdf.pdf.
+
+When running the documentation in a traditional way, then
+uncomment the line (in the preamble)
+
+%\newenvironment{postscript}{}{} % uncomment, when running with latex
diff --git a/Master/texmf-dist/doc/generic/pst-magneticfield/pst-magneticfield-docDE.bib b/Master/texmf-dist/doc/generic/pst-magneticfield/pst-magneticfield-doc.bib
index b96d8703ff5..b96d8703ff5 100644
--- a/Master/texmf-dist/doc/generic/pst-magneticfield/pst-magneticfield-docDE.bib
+++ b/Master/texmf-dist/doc/generic/pst-magneticfield/pst-magneticfield-doc.bib
diff --git a/Master/texmf-dist/doc/generic/pst-magneticfield/pst-magneticfield-docDE.pdf b/Master/texmf-dist/doc/generic/pst-magneticfield/pst-magneticfield-docDE.pdf
index ffd5e4ffefd..4fef5b85367 100644
--- a/Master/texmf-dist/doc/generic/pst-magneticfield/pst-magneticfield-docDE.pdf
+++ b/Master/texmf-dist/doc/generic/pst-magneticfield/pst-magneticfield-docDE.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/pst-magneticfield/pst-magneticfield-docDE.tex b/Master/texmf-dist/doc/generic/pst-magneticfield/pst-magneticfield-docDE.tex
index 3f5c6492df4..441d705c0a5 100644
--- a/Master/texmf-dist/doc/generic/pst-magneticfield/pst-magneticfield-docDE.tex
+++ b/Master/texmf-dist/doc/generic/pst-magneticfield/pst-magneticfield-docDE.tex
@@ -1,19 +1,16 @@
-%% $Id: pst-magneticfield-docEN.tex 322 2010-05-16 08:07:26Z herbert $
+%% $Id: pst-magneticfield-docDE.tex 343 2010-06-10 15:08:37Z herbert $
\documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings
headexclude,footexclude,oneside]{pst-doc}
\usepackage[latin1]{inputenc}
\usepackage{pst-magneticfield}
\let\pstMFfv\fileversion
+
+%\newenvironment{postscript}{}{} % uncomment, when running with latex
+
\lstset{pos=t,language=PSTricks,
morekeywords={psmagneticfield,psmagneticfieldThreeD},basicstyle=\footnotesize\ttfamily}
\newcommand\Cadre[1]{\psframebox[fillstyle=solid,fillcolor=black,linestyle=none,framesep=0]{#1}}
-\def\bgImage{%
-\psset{unit=0.5cm}
-\begin{pspicture}(-7,-6)(7,6)
-\psmagneticfieldThreeD[N=2,R=2,L=2,linecolor=blue](-7,-8)(7,8)
-\ThreeDput{\rput(0,-7){\textbf{HELMHOLTZ-Spule}}}
-\end{pspicture}
-}
+\def\bgImage{}
%
\begin{document}
@@ -80,56 +77,115 @@ Der Befehl \Lcs{psmagneticfieldThreeD} erlaubt eine 3D-Ansicht der Spule und der
\section{Einfluss der physikalischen Gr\"{o}{\ss}en auf das Erscheinungsbild der Feldlinien}
\subsection{Die L\"{a}nge der Spule}
-\begin{LTXexample}[pos=t]
+\begin{center}
+\begin{postscript}
+\psset{unit=0.5cm}
+\begin{pspicture*}[showgrid](-7,-8)(7,8)
+\psmagneticfield[linecolor={[HTML]{006633}},N=3,R=2,nS=1](-7,-8)(7,8)
+\psframe*[linecolor={[HTML]{99FF66}}](-7,-8)(7,-7)
+\rput(0,-7.5){[\Cadre{\textcolor{white}{L=4}},N=3,R=2,nS=1]}
+\end{pspicture*}
+\begin{pspicture*}[showgrid](-7,-8)(7,8)
+\psmagneticfield[linecolor={[HTML]{006633}},L=8,N=3,R=2,nS=1,PasB=0.0025,pointsB=5500](-7,-8)(7,8)
+\psframe*[linecolor={[HTML]{99FF66}}](-7,-8)(7,-7)
+\rput(0,-7.5){[\Cadre{\textcolor{white}{L=8}},N=3,R=2,nS=1]}
+\end{pspicture*}
+\end{postscript}
+\end{center}
+
+\begin{lstlisting}
\psset{unit=0.5cm}
\begin{pspicture*}[showgrid](-7,-8)(7,8)
-\psmagneticfield[linecolor={[HTML]{006633}},N=3,R=2,nS=1]
+\psmagneticfield[linecolor={[HTML]{006633}},N=3,R=2,nS=1](-7,-8)(7,8)
\psframe*[linecolor={[HTML]{99FF66}}](-7,-8)(7,-7)
\rput(0,-7.5){[\Cadre{\textcolor{white}{L=4}},N=3,R=2,nS=1]}
\end{pspicture*}
\begin{pspicture*}[showgrid](-7,-8)(7,8)
-\psmagneticfield[linecolor={[HTML]{006633}},L=8,N=3,R=2,nS=1,PasB=0.0025,pointsB=5500]
+\psmagneticfield[linecolor={[HTML]{006633}},L=8,N=3,R=2,nS=1,PasB=0.0025,pointsB=5500](-7,-8)(7,8)
\psframe*[linecolor={[HTML]{99FF66}}](-7,-8)(7,-7)
\rput(0,-7.5){[\Cadre{\textcolor{white}{L=8}},N=3,R=2,nS=1]}
\end{pspicture*}
-\end{LTXexample}
+\end{lstlisting}
+
\textbf{Anmerkung:} Um das Erscheinungsbild der zweiten Spule zu verbessern, mussten wir die Anzahl der Berechungspunkte erh\"{o}hen und die Schrittweite verkleinern,
- \Cadre{\textcolor{white}{pointsB=5500,PasB=0.0025}}, was jedoch eine Erh\"{o}hung der Rechenzeit mit sich brachte.
+ \begin{postscript}
+\Cadre{\textcolor{white}{pointsB=5500,PasB=0.0025}}
+\end{postscript},
+was jedoch eine Erh\"{o}hung der Rechenzeit mit sich brachte.
\clearpage
\subsection{Die Anzahl der Windungen}
-\begin{LTXexample}[pos=t]
+
+
+\begin{center}
+\begin{postscript}
\psset{unit=0.5}
\begin{pspicture*}[showgrid](-7,-8)(7,8)
-\psmagneticfield[linecolor={[HTML]{006633}},N=1,R=2,nS=0]
+\psmagneticfield[linecolor={[HTML]{006633}},N=1,R=2,nS=0](-7,-8)(7,8)
\psframe*[linecolor={[HTML]{99FF66}}](-7,-8)(7,-7)
\rput(0,-7.5){[\Cadre{\textcolor{white}{N=1}},R=2,nS=0]}
\end{pspicture*}
\begin{pspicture*}[showgrid](-7,-8)(7,8)
-\psmagneticfield[linecolor={[HTML]{006633}},N=2,R=2,L=2,PasS=0.003,nS=2]
+\psmagneticfield[linecolor={[HTML]{006633}},N=2,R=2,L=2,PasS=0.003,nS=2](-7,-8)(7,8)
\psframe*[linecolor={[HTML]{99FF66}}](-7,7)(7,8)
\rput(0,7.5){\Cadre{\textcolor{white}{Bobines de Helmholtz}}}
\psframe*[linecolor={[HTML]{99FF66}}](-7,-8)(7,-7)
\rput(0,-7.5){[\Cadre{\textcolor{white}{N=2}},R=2,L=2,PasS=0.003,nS=2]}
\end{pspicture*}
-\end{LTXexample}
+\end{postscript}
+\end{center}
-\begin{LTXexample}[pos=t]
+\begin{lstlisting}
\psset{unit=0.5}
\begin{pspicture*}[showgrid](-7,-8)(7,8)
-\psmagneticfield[linecolor={[HTML]{006633}},N=4,R=2,numSpires=2 3]
+\psmagneticfield[linecolor={[HTML]{006633}},N=1,R=2,nS=0](-7,-8)(7,8)
+\psframe*[linecolor={[HTML]{99FF66}}](-7,-8)(7,-7)
+\rput(0,-7.5){[\Cadre{\textcolor{white}{N=1}},R=2,nS=0]}
+\end{pspicture*}
+\begin{pspicture*}[showgrid](-7,-8)(7,8)
+\psmagneticfield[linecolor={[HTML]{006633}},N=2,R=2,L=2,PasS=0.003,nS=2](-7,-8)(7,8)
+\psframe*[linecolor={[HTML]{99FF66}}](-7,7)(7,8)
+\rput(0,7.5){\Cadre{\textcolor{white}{Bobines de Helmholtz}}}
+\psframe*[linecolor={[HTML]{99FF66}}](-7,-8)(7,-7)
+\rput(0,-7.5){[\Cadre{\textcolor{white}{N=2}},R=2,L=2,PasS=0.003,nS=2]}
+\end{pspicture*}
+\end{lstlisting}
+
+
+\begin{center}
+\begin{postscript}
+\psset{unit=0.5}
+\begin{pspicture*}[showgrid](-7,-8)(7,8)
+\psmagneticfield[linecolor={[HTML]{006633}},N=4,R=2,numSpires=2 3](-7,-8)(7,8)
\psframe*[linecolor={[HTML]{99FF66}}](-7,-8)(7,-7)
\rput(0,-7.5){[\Cadre{\textcolor{white}{N=4}},R=2,L=4]}
\end{pspicture*}
\begin{pspicture*}[showgrid](-7,-8)(7,8)
-\psmagneticfield[linecolor={[HTML]{006633}},N=5,R=2,L=5,PasS=0.004,nS=2 3 4]
+\psmagneticfield[linecolor={[HTML]{006633}},N=5,R=2,L=5,PasS=0.004,numSpires=2 3 4](-7,-8)(7,8)
\psframe*[linecolor={[HTML]{99FF66}}](-7,-8)(7,-7)
\rput(0,-7.5){[\Cadre{\textcolor{white}{N=5}},R=2,L=5]}
\end{pspicture*}
-\end{LTXexample}
+\end{postscript}
+\end{center}
+
+\begin{lstlisting}
+\psset{unit=0.5}
+\begin{pspicture*}[showgrid](-7,-8)(7,8)
+\psmagneticfield[linecolor={[HTML]{006633}},N=4,R=2,numSpires=2 3](-7,-8)(7,8)
+\psframe*[linecolor={[HTML]{99FF66}}](-7,-8)(7,-7)
+\rput(0,-7.5){[\Cadre{\textcolor{white}{N=4}},R=2,L=4]}
+\end{pspicture*}
+\begin{pspicture*}[showgrid](-7,-8)(7,8)
+\psmagneticfield[linecolor={[HTML]{006633}},N=5,R=2,L=5,PasS=0.004,numSpires=2 3 4](-7,-8)(7,8)
+\psframe*[linecolor={[HTML]{99FF66}}](-7,-8)(7,-7)
+\rput(0,-7.5){[\Cadre{\textcolor{white}{N=5}},R=2,L=5]}
+\end{pspicture*}
+\end{lstlisting}
+
+
\clearpage
\section{Optionen f\"{u}r die Linien}
@@ -137,81 +193,156 @@ Der Befehl \Lcs{psmagneticfieldThreeD} erlaubt eine 3D-Ansicht der Spule und der
Auf Grund der Symmetrie des Problems ist die gew\"{a}hlte Anzahl der Feldlinien \Lkeyword{nL} nur die H\"{a}lfte der tats\"{a}chlich gezeichneten Feldlinien. Hinzu kommt noch eine Feldlinie, die in Richtung der Symmetrieachse der Spule zeigt. Die Anzahl der Feldlinien um die Windungen herum \Lkeyword{nS} kommen auch noch hinzu, diese k\"{o}nnen jedoch mit \Lkeyword{numSpires} individuell ausgew\"{a}hlt werden.
-\begin{LTXexample}[pos=t]
+
+
+\begin{center}
+\begin{postscript}
+\psset{unit=0.5}
+\begin{pspicture*}[showgrid](-7,-8)(7,8)
+\psmagneticfield[linecolor={[HTML]{000099}},N=1,R=2](-7,-8)(7,8)
+\psframe*[linecolor={[HTML]{3399FF}}](-7,-8)(7,-7)
+\rput(0,-7.5){[\Cadre{\textcolor{white}{nL=8}},N=1,R=2]}
+\end{pspicture*}
+\begin{pspicture*}[showgrid](-7,-8)(7,8)
+\psmagneticfield[linecolor={[HTML]{000099}},N=1,R=2,nL=12](-7,-8)(7,8)
+\psframe*[linecolor={[HTML]{3399FF}}](-7,-8)(7,-7)
+\rput(0,-7.5){[\Cadre{\textcolor{white}{nL=12}},N=1,R=2]}
+\end{pspicture*}
+\end{postscript}
+\end{center}
+
+\begin{lstlisting}
\psset{unit=0.5}
\begin{pspicture*}[showgrid](-7,-8)(7,8)
-\psmagneticfield[linecolor={[HTML]{000099}},N=1,R=2]
+\psmagneticfield[linecolor={[HTML]{000099}},N=1,R=2](-7,-8)(7,8)
\psframe*[linecolor={[HTML]{3399FF}}](-7,-8)(7,-7)
\rput(0,-7.5){[\Cadre{\textcolor{white}{nL=8}},N=1,R=2]}
\end{pspicture*}
\begin{pspicture*}[showgrid](-7,-8)(7,8)
-\psmagneticfield[linecolor={[HTML]{000099}},N=1,R=2,nL=12]
+\psmagneticfield[linecolor={[HTML]{000099}},N=1,R=2,nL=12](-7,-8)(7,8)
\psframe*[linecolor={[HTML]{3399FF}}](-7,-8)(7,-7)
\rput(0,-7.5){[\Cadre{\textcolor{white}{nL=12}},N=1,R=2]}
\end{pspicture*}
-\end{LTXexample}
+\end{lstlisting}
\clearpage
\subsection{Die Anzahl der Berechnungspunkte und die Schrittweite}
Die Feldlinien wurden mit einem numerischen Verfahren (Runge-Kutta 2) berechnet und dementsprechend h\"{a}ngt die Genauigkeit der Linien entscheidend ab von der Schrittweite und der Anzahl der Berechnungspunkte, wie in den folgenden zwei Beispielen gezeigt wird:
-\begin{LTXexample}[pos=t]
+\begin{center}
+\begin{postscript}
+\psset{unit=0.5}
+\begin{pspicture*}[showgrid](-7,-8)(7,8)
+\psmagneticfield[linecolor={[HTML]{660066}},N=2,R=2,L=2,PasB=0.1,nS=0,nL=7,pointsB=100](-7,-8)(7,8)
+\psframe*[linecolor={[HTML]{996666}}](-7,7)(7,8)
+\rput(0,7.5){\Cadre{\textcolor{white}{Bobines de Helmholtz}}}
+\psframe*[linecolor={[HTML]{996666}}](-7,-8)(7,-7)
+\rput(0,-7.5){[\Cadre{\textcolor{white}{PasB=0.1,nL=4,pointsB=100}}]}
+\end{pspicture*}
+\begin{pspicture*}[showgrid](-7,-8)(7,8)
+\psmagneticfield[linecolor={[HTML]{660066}},N=2,R=2,L=2,PasB=0.4,nS=0,nL=7,pointsB=100](-7,-8)(7,8)
+\psframe*[linecolor={[HTML]{996666}}](-7,7)(7,8)
+\rput(0,7.5){\Cadre{\textcolor{white}{Bobines de Helmholtz}}}
+\psframe*[linecolor={[HTML]{996666}}](-7,-8)(7,-7)
+\rput(0,-7.5){[\Cadre{\textcolor{white}{PasS=0.4,pointsB=100}}]}
+\end{pspicture*}
+\end{postscript}
+\end{center}
+
+\begin{lstlisting}
\psset{unit=0.5}
\begin{pspicture*}[showgrid](-7,-8)(7,8)
-\psmagneticfield[linecolor={[HTML]{660066}},N=2,R=2,L=2,PasB=0.1,nS=0,nL=7,pointsB=100]
+\psmagneticfield[linecolor={[HTML]{660066}},N=2,R=2,L=2,PasB=0.1,nS=0,nL=7,pointsB=100](-7,-8)(7,8)
\psframe*[linecolor={[HTML]{996666}}](-7,7)(7,8)
\rput(0,7.5){\Cadre{\textcolor{white}{Bobines de Helmholtz}}}
\psframe*[linecolor={[HTML]{996666}}](-7,-8)(7,-7)
\rput(0,-7.5){[\Cadre{\textcolor{white}{PasB=0.1,nL=4,pointsB=100}}]}
\end{pspicture*}
\begin{pspicture*}[showgrid](-7,-8)(7,8)
-\psmagneticfield[linecolor={[HTML]{660066}},N=2,R=2,L=2,PasB=0.4,nS=0,nL=7,pointsB=100]
+\psmagneticfield[linecolor={[HTML]{660066}},N=2,R=2,L=2,PasB=0.4,nS=0,nL=7,pointsB=100](-7,-8)(7,8)
\psframe*[linecolor={[HTML]{996666}}](-7,7)(7,8)
\rput(0,7.5){\Cadre{\textcolor{white}{Bobines de Helmholtz}}}
\psframe*[linecolor={[HTML]{996666}}](-7,-8)(7,-7)
\rput(0,-7.5){[\Cadre{\textcolor{white}{PasS=0.4,pointsB=100}}]}
\end{pspicture*}
-\end{LTXexample}
+\end{lstlisting}
+
Sollten die voreingestellten Werte f\"{u}r eine individuelle Gestaltung nicht passen, dann muss man mit den Werten \Lkeyword{pasB}, \Lkeyword{pointsB} (bzw. \Lkeyword{pasS}, \Lkeyword{pointsS}) spielen, bis es passt.
+
+
\clearpage
\section{Der Parameter \nxLkeyword{numSpires}}
-\begin{LTXexample}[pos=t,wide]
+\begin{center}
+\begin{postscript}
+\psset{unit=0.5}
+\begin{pspicture*}[showgrid](-8,-10)(8,10)
+\psset{linecolor=blue}
+\psmagneticfield[R=2,L=12,N=8,pointsS=500,nL=14,nS=1,numSpires=1 3 6 8,PasB=0.075](-8,-10)(8,10)
+\psframe*[linecolor={[HTML]{99FF66}}](-8,-10)(8,-9)
+\rput(0,-9.5){[\Cadre{\textcolor{white}{numSpires=1 3 6 8}},R=2,L=14]}
+\multido{\i=0+1}{8}{\rput[l](!6 6 12 7 div \i\space mul sub){\the\multidocount}}
+\end{pspicture*}\quad
+\begin{pspicture*}[showgrid](0,-10)(16,10)
+\psset{linecolor=blue}
+\psmagneticfield[R=2,L=12,N=8,pointsS=500,nL=14,numSpires=,nS=1,PasB=0.075](0,-10)(16,10)
+\psframe*[linecolor={[HTML]{99FF66}}](0,-10)(16,-9)
+\rput(8,-9.5){[\Cadre{\textcolor{white}{numSpires=all}},R=2,L=14]}
+\multido{\i=0+1}{8}{\rput[l](!6 6 12 7 div \i\space mul sub){\the\multidocount}}
+\end{pspicture*}
+\end{postscript}
+\end{center}
+
+
+\begin{lstlisting}
\psset{unit=0.5}
\begin{pspicture*}[showgrid](-8,-10)(8,10)
\psset{linecolor=blue}
-\psmagneticfield[R=2,L=12,N=8,pointsS=500,nL=14,nS=1,numSpires=1 3 6 8,PasB=0.075]
+\psmagneticfield[R=2,L=12,N=8,pointsS=500,nL=14,nS=1,numSpires=1 3 6 8,PasB=0.075](-8,-10)(8,10)
\psframe*[linecolor={[HTML]{99FF66}}](-8,-10)(8,-9)
\rput(0,-9.5){[\Cadre{\textcolor{white}{numSpires=1 3 6 8}},R=2,L=14]}
\multido{\i=0+1}{8}{\rput[l](!6 6 12 7 div \i\space mul sub){\the\multidocount}}
\end{pspicture*}\quad
\begin{pspicture*}[showgrid](0,-10)(16,10)
\psset{linecolor=blue}
-\psmagneticfield[R=2,L=12,N=8,pointsS=500,nL=14,numSpires=,nS=1,PasB=0.075]
+\psmagneticfield[R=2,L=12,N=8,pointsS=500,nL=14,numSpires=,nS=1,PasB=0.075](0,-10)(16,10)
\psframe*[linecolor={[HTML]{99FF66}}](0,-10)(16,-9)
\rput(8,-9.5){[\Cadre{\textcolor{white}{numSpires=all}},R=2,L=14]}
\multido{\i=0+1}{8}{\rput[l](!6 6 12 7 div \i\space mul sub){\the\multidocount}}
\end{pspicture*}
-\end{LTXexample}
+\end{lstlisting}
\clearpage
\section{Der Parameter \nxLkeyword{AntiHelmholtz}}
-\begin{LTXexample}[pos=t]
+\begin{center}
+\begin{postscript}
\psset{unit=0.75,AntiHelmholtz,N=2,
R=2,pointsB=500,pointsS=1000,PasB=0.02,PasS=0.00275,nS=10,
nL=2,drawSelf=true,styleSpire=styleSpire,styleCourant=sensCourant}
\newpsstyle{grille}{subgriddiv=0,gridcolor=blue!50,griddots=10}
\newpsstyle{cadre}{linecolor=yellow!50}
\begin{pspicture*}[showgrid](-7,-6)(7,6)
-\psframe*[linecolor={[HTML]{996666}}](-7,7)(7,8)
+\psframe*[linecolor={[HTML]{996666}}](-7,6)(7,6)
\psmagneticfield[linecolor={[HTML]{660066}}]
\end{pspicture*}
-\end{LTXexample}
+\end{postscript}
+\end{center}
+\begin{lstlisting}
+\psset{unit=0.75,AntiHelmholtz,N=2,
+ R=2,pointsB=500,pointsS=1000,PasB=0.02,PasS=0.00275,nS=10,
+ nL=2,drawSelf=true,styleSpire=styleSpire,styleCourant=sensCourant}
+\newpsstyle{grille}{subgriddiv=0,gridcolor=blue!50,griddots=10}
+\newpsstyle{cadre}{linecolor=yellow!50}
+\begin{pspicture*}[showgrid](-7,-6)(7,6)
+\psframe*[linecolor={[HTML]{996666}}](-7,6)(7,6)
+\psmagneticfield[linecolor={[HTML]{660066}}]
+\end{pspicture*}
+\end{lstlisting}
\clearpage
@@ -234,24 +365,48 @@ Koordinaten der linken unteren und rechten oberen Ecke des Gitternetzes festgele
M\"{o}glichkeiten zur Gestaltung des Gitternetzes zeigen die folgenden zwei Beispiele:
-\begin{LTXexample}[pos=t]
+
+\begin{center}
+\begin{postscript}
+\psset{unit=0.7cm}
+\newpsstyle{grille}{subgriddiv=0,gridcolor=blue!50,griddots=10}
+\newpsstyle{cadre}{linecolor=yellow!50}
+\begin{pspicture}(-7,-6)(7,6)
+\psmagneticfieldThreeD[N=8,R=2,L=8,pointsB=1200,linecolor=blue,pointsS=2000](-7,-6)(7,6)
+\end{pspicture}
+\end{postscript}
+\end{center}
+
+\begin{lstlisting}
\psset{unit=0.7cm}
\newpsstyle{grille}{subgriddiv=0,gridcolor=blue!50,griddots=10}
\newpsstyle{cadre}{linecolor=yellow!50}
\begin{pspicture}(-7,-6)(7,6)
-\psmagneticfieldThreeD[N=8,R=2,L=8,pointsB=1200,linecolor=blue,pointsS=1000](-7,-8)(7,8)
+\psmagneticfieldThreeD[N=8,R=2,L=8,pointsB=1200,linecolor=blue,pointsS=2000](-7,-6)(7,6)
\end{pspicture}
-\end{LTXexample}
+\end{lstlisting}
-\begin{LTXexample}[pos=t]
+
+\begin{center}
+\begin{postscript}
+\psset{unit=0.7cm}
+\begin{pspicture}(-7,-6)(7,6)
+\psmagneticfieldThreeD[N=2,R=2,L=2,linecolor=blue](-7,-6)(7,6)
+\ThreeDput{\rput(0,-7){\textbf{Bobines de HELMHOLTZ}}}
+\end{pspicture}
+\end{postscript}
+\end{center}
+
+\begin{lstlisting}
\psset{unit=0.7cm}
\begin{pspicture}(-7,-6)(7,6)
-\psmagneticfieldThreeD[N=2,R=2,L=2,linecolor=blue](-7,-8)(7,8)
-\ThreeDput{\rput(0,-7){\textbf{HELMHOLTZ-Spule}}}
+\psmagneticfieldThreeD[N=2,R=2,L=2,linecolor=blue](-7,-6)(7,6)
+\ThreeDput{\rput(0,-7){\textbf{Bobines de HELMHOLTZ}}}
\end{pspicture}
-\end{LTXexample}
+\end{lstlisting}
-\begin{LTXexample}[pos=t]
+\begin{center}
+\begin{postscript}
\psset{unit=0.75cm,AntiHelmholtz,N=2,
R=2,pointsB=500,pointsS=1000,PasB=0.02,PasS=0.00275,nS=10,
nL=2,drawSelf,styleSpire=styleSpire,styleCourant=sensCourant}
@@ -260,7 +415,76 @@ M\"{o}glichkeiten zur Gestaltung des Gitternetzes zeigen die folgenden zwei Beis
\begin{pspicture}(-7,-6)(7,6)
\psmagneticfieldThreeD[linecolor={[HTML]{660066}}](-7,-6)(7,6)
\end{pspicture}
-\end{LTXexample}
+\end{postscript}
+\end{center}
+
+\begin{lstlisting}
+\psset{unit=0.75cm,AntiHelmholtz,N=2,
+ R=2,pointsB=500,pointsS=1000,PasB=0.02,PasS=0.00275,nS=10,
+ nL=2,drawSelf,styleSpire=styleSpire,styleCourant=sensCourant}
+\newpsstyle{grille}{subgriddiv=0,gridcolor=blue!50,griddots=10}
+\newpsstyle{cadre}{linecolor=yellow!50}
+\begin{pspicture}(-7,-6)(7,6)
+\psmagneticfieldThreeD[linecolor={[HTML]{660066}}](-7,-6)(7,6)
+\end{pspicture}
+\end{lstlisting}
+
+\clearpage
+
+
+\section{Feldstärkendichte}
+
+\begin{center}
+\begin{postscript}
+\begin{pspicture}(-6,-4)(6,4)
+\psmagneticfield[N=3,R=2,L=2,StreamDensityPlot](-6,-4)(6,4)
+\end{pspicture}
+\end{postscript}
+\end{center}
+
+\begin{lstlisting}
+\begin{pspicture}(-6,-4)(6,4)
+\psmagneticfield[N=3,R=2,L=2,StreamDensityPlot](-6,-4)(6,4)
+\end{pspicture}
+\end{lstlisting}
+
+\begin{center}
+\begin{postscript}
+\psset{unit=0.75}
+\begin{pspicture}(-6,-5)(6,5)
+\psmagneticfield[N=2,R=2,L=1,StreamDensityPlot,setgray](-6,-5)(6,5)
+\end{pspicture}
+\end{postscript}
+\end{center}
+
+\begin{lstlisting}
+\psset{unit=0.75}
+\begin{pspicture}(-6,-5)(6,5)
+\psmagneticfield[N=2,R=2,L=1,StreamDensityPlot,setgray](-6,-5)(6,5)
+\end{pspicture}
+\end{lstlisting}
+
+
+\begin{center}
+\begin{postscript}
+\psset{unit=0.75,AntiHelmholtz,
+ R=2,pointsB=500,pointsS=2000,PasB=0.02,PasS=0.00275,nS=10,
+ nL=2,drawSelf=true,styleSpire=styleSpire,styleCourant=sensCourant}
+\begin{pspicture*}(-7,-6)(7,6)
+\psmagneticfield[linecolor={[HTML]{660066}},StreamDensityPlot](-7,-6)(7,6)
+\end{pspicture*}
+\end{postscript}
+\end{center}
+
+
+\begin{lstlisting}
+\psset{unit=0.75,AntiHelmholtz,
+ R=2,pointsB=500,pointsS=2000,PasB=0.02,PasS=0.00275,nS=10,
+ nL=2,drawSelf=true,styleSpire=styleSpire,styleCourant=sensCourant}
+\begin{pspicture*}(-7,-6)(7,6)
+\psmagneticfield[linecolor={[HTML]{660066}},StreamDensityPlot](-7,-6)(7,6)
+\end{pspicture*}
+\end{lstlisting}
\clearpage
@@ -272,7 +496,7 @@ M\"{o}glichkeiten zur Gestaltung des Gitternetzes zeigen die folgenden zwei Beis
\bgroup
\raggedright
\bibliographystyle{plain}
-\bibliography{\jobname}
+\bibliography{pst-magneticfield-doc}
\egroup
\printindex
diff --git a/Master/texmf-dist/doc/generic/pst-magneticfield/pst-magneticfield-docEN.bib b/Master/texmf-dist/doc/generic/pst-magneticfield/pst-magneticfield-docEN.bib
deleted file mode 100644
index b96d8703ff5..00000000000
--- a/Master/texmf-dist/doc/generic/pst-magneticfield/pst-magneticfield-docEN.bib
+++ /dev/null
@@ -1,79 +0,0 @@
-%% -*-bibtex-*-
-@STRING{tugboat = {TUGboat} }
-@STRING{dtk = {{D}ie {\TeX}nische {K}om{\"o}die} }
-
-@Book{companion,
- author = {Michel Goosens and Frank Mittelbach and Sebastian Rahtz and Dennis Roegel and Herbert Vo\ss},
- title = {The {\LaTeX} {G}raphics {C}ompanion},
- publisher = {{Addison-Wesley Publishing Company}},
- edition = {second},
- year = {2007},
- address = {Reading, Mass.}
-}
-
-@Article{girou:01:,
- author = {Denis Girou},
- title = {Pr\'esentation de {PST}ricks},
- journal = {Cahier {GUT}enberg},
- year = 1994,
- volume = {16},
- month = apr,
- pages = {21-70}
-}
-
-@Article{girou:02:,
- author = {{Timothy Van} Zandt and Denis Girou},
- title = {Inside {PST}ricks},
- journal = TUGboat,
- year = 1994,
- volume = {15},
- month = sep,
- pages = {239-246}
-}
-
-@Book{PostScript,
- Author = {Kollock, Nikolai G.},
- Title = {Post{S}cript richtig eingesetzt: vom {K}onzept zum
- praktischen {E}insatz},
- Publisher = {IWT},
- Address = {Vaterstetten},
- year = 1989,
-}
-
-@Manual{multido,
- Title = {\texttt{multido.tex} - a loop macro, that supports fixed-point addition},
- Author = {{Timothy Van} Zandt},
- Organization = {},
- Address = {\url{CTAN:/graphics/pstricks/generic/multido.tex}},
- Note = {},
- year = 1997
-}
-
-@Book{PSTricks2,
- author = {Herbert Vo\ss{}},
- title = {\texttt{PSTricks} -- {G}rafik f\"ur \TeX{} und \LaTeX},
- edition = {fifth},
- publisher = {DANTE -- Lehmanns},
- year = {2008},
- address = {Heidelberg/Hamburg}
-}
-
-@Book{abramowitz,
- author = {M. Abramowitz and I. A. Stegun },
- year = 1964,
- title = {Handbook of {M}athematical {F}unctions with {F}ormulas, {G}raphs, and
- {M}athematical {T}ables},
- publisher = {National Bureau of Standards Applied Mathematics Series,
- U.S. Government Printing Office},
- address = {Washington, D.C., USA},
- Note = {Corrections appeared in later printings up to the 10th Printing},
-}
-
-@Book{dolan,
-author = {Thomas~J. Dolan},
-title = {Fusion {R}esearch, {V}olume {III} ``{T}echnology''},
-publisher= {Pergamon Press},
-year=1982,
-Note= {Chapter 20 ``Water-cooled magnets'' ,
- pages 600 ff ``circular loops'' -- Integrating the Biot-Savart Law (in cylindrical geometry)},
-}
diff --git a/Master/texmf-dist/doc/generic/pst-magneticfield/pst-magneticfield-docEN.pdf b/Master/texmf-dist/doc/generic/pst-magneticfield/pst-magneticfield-docEN.pdf
index 5cb39a83b04..fa7089315ae 100644
--- a/Master/texmf-dist/doc/generic/pst-magneticfield/pst-magneticfield-docEN.pdf
+++ b/Master/texmf-dist/doc/generic/pst-magneticfield/pst-magneticfield-docEN.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/pst-magneticfield/pst-magneticfield-docEN.tex b/Master/texmf-dist/doc/generic/pst-magneticfield/pst-magneticfield-docEN.tex
index 9425f93f6c5..6755a7eaa97 100644
--- a/Master/texmf-dist/doc/generic/pst-magneticfield/pst-magneticfield-docEN.tex
+++ b/Master/texmf-dist/doc/generic/pst-magneticfield/pst-magneticfield-docEN.tex
@@ -1,4 +1,4 @@
-%% $Id: pst-magneticfield-docEN.tex 323 2010-05-16 11:39:35Z herbert $
+%% $Id: pst-magneticfield-docEN.tex 343 2010-06-10 15:08:37Z herbert $
\documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings
headexclude,footexclude,oneside]{pst-doc}
\usepackage[latin1]{inputenc}
@@ -6,21 +6,17 @@
\let\pstMFfv\fileversion
\lstset{pos=t,language=PSTricks,
morekeywords={psmagneticfield,psmagneticfieldThreeD},basicstyle=\footnotesize\ttfamily}
+
+%\newenvironment{postscript}{}{} % uncomment, when running with latex
+
\newcommand\Cadre[1]{\psframebox[fillstyle=solid,fillcolor=black,linestyle=none,framesep=0]{#1}}
-\def\bgImage{%
-\psset{unit=0.5cm}
-\begin{pspicture}(-7,-6)(7,6)
-\psmagneticfieldThreeD[N=2,R=2,L=2,linecolor=blue](-7,-8)(7,8)
-\ThreeDput{\rput(0,-7){\textbf{Bobines de HELMHOLTZ}}}
-\end{pspicture}
-}
+\def\bgImage{}
%
\begin{document}
\title{\texttt{pst-magneticfield}}
\subtitle{Magnetic field lines of a solenoid; v.\pstMFfv}
\author{Juergen Gilg\\ Manuel Luque\\Herbert Vo\ss}
-%\docauthor{Juergen Gilg\\Manuel Luque\\Herbert Vo\ss}
\date{\today}
\maketitle
@@ -83,26 +79,54 @@ The route options, with the default values are as follows:
A command \Lcs{psmagneticfieldThreeD} allows 3D visualization of the solenoid and
field lines.
+\begin{BDef}
+\Lcs{psmagneticfield}\OptArgs\OptArg*{\coord1}\OptArg*{\coord2}\\
+\Lcs{psmagneticfieldThreeD}\OptArgs\OptArg*{\coord1}\OptArg*{\coord2}
+\end{BDef}
+
+Missing coordinates are substituted to \verb+(-6,-5)(6,5)+!
\clearpage
\section{Influence of physical parameters on the map magnetic field}
+
\subsection{The length of the solenoid}
-\begin{LTXexample}[pos=t]
+\begin{center}
+\begin{postscript}
\psset{unit=0.5cm}
\begin{pspicture*}[showgrid](-7,-8)(7,8)
-\psmagneticfield[linecolor={[HTML]{006633}},N=3,R=2,nS=1]
+\psmagneticfield[linecolor={[HTML]{006633}},N=3,R=2,nS=1](-7,-8)(7,8)
\psframe*[linecolor={[HTML]{99FF66}}](-7,-8)(7,-7)
\rput(0,-7.5){[\Cadre{\textcolor{white}{L=4}},N=3,R=2,nS=1]}
\end{pspicture*}
\begin{pspicture*}[showgrid](-7,-8)(7,8)
-\psmagneticfield[linecolor={[HTML]{006633}},L=8,N=3,R=2,nS=1,PasB=0.0025,pointsB=5500]
+\psmagneticfield[linecolor={[HTML]{006633}},L=8,N=3,R=2,nS=1,PasB=0.0025,pointsB=5500](-7,-8)(7,8)
\psframe*[linecolor={[HTML]{99FF66}}](-7,-8)(7,-7)
\rput(0,-7.5){[\Cadre{\textcolor{white}{L=8}},N=3,R=2,nS=1]}
\end{pspicture*}
-\end{LTXexample}
+\end{postscript}
+\end{center}
+
+\begin{lstlisting}
+\psset{unit=0.5cm}
+\begin{pspicture*}[showgrid](-7,-8)(7,8)
+\psmagneticfield[linecolor={[HTML]{006633}},N=3,R=2,nS=1](-7,-8)(7,8)
+\psframe*[linecolor={[HTML]{99FF66}}](-7,-8)(7,-7)
+\rput(0,-7.5){[\Cadre{\textcolor{white}{L=4}},N=3,R=2,nS=1]}
+\end{pspicture*}
+\begin{pspicture*}[showgrid](-7,-8)(7,8)
+\psmagneticfield[linecolor={[HTML]{006633}},L=8,N=3,R=2,nS=1,PasB=0.0025,pointsB=5500](-7,-8)(7,8)
+\psframe*[linecolor={[HTML]{99FF66}}](-7,-8)(7,-7)
+\rput(0,-7.5){[\Cadre{\textcolor{white}{L=8}},N=3,R=2,nS=1]}
+\end{pspicture*}
+\end{lstlisting}
+
+
\textbf{Note:} To refine the layout of the second solenoid, we had to increase the
-points and lower the pitch of the route: \Cadre{\textcolor{white}{pointsB=5500,PasB=0.0025}}, which
+points and lower the pitch of the route:
+\begin{postscript}
+\Cadre{\textcolor{white}{pointsB=5500,PasB=0.0025}}
+\end{postscript}, which
takes more time for the calculations.
@@ -110,35 +134,70 @@ takes more time for the calculations.
\clearpage
\subsection{The number of turns}
-\begin{LTXexample}[pos=t]
+\begin{center}
+\begin{postscript}
\psset{unit=0.5}
\begin{pspicture*}[showgrid](-7,-8)(7,8)
-\psmagneticfield[linecolor={[HTML]{006633}},N=1,R=2,nS=0]
+\psmagneticfield[linecolor={[HTML]{006633}},N=1,R=2,nS=0](-7,-8)(7,8)
\psframe*[linecolor={[HTML]{99FF66}}](-7,-8)(7,-7)
\rput(0,-7.5){[\Cadre{\textcolor{white}{N=1}},R=2,nS=0]}
\end{pspicture*}
\begin{pspicture*}[showgrid](-7,-8)(7,8)
-\psmagneticfield[linecolor={[HTML]{006633}},N=2,R=2,L=2,PasS=0.003,nS=2]
+\psmagneticfield[linecolor={[HTML]{006633}},N=2,R=2,L=2,PasS=0.003,nS=2](-7,-8)(7,8)
\psframe*[linecolor={[HTML]{99FF66}}](-7,7)(7,8)
\rput(0,7.5){\Cadre{\textcolor{white}{Bobines de Helmholtz}}}
\psframe*[linecolor={[HTML]{99FF66}}](-7,-8)(7,-7)
\rput(0,-7.5){[\Cadre{\textcolor{white}{N=2}},R=2,L=2,PasS=0.003,nS=2]}
\end{pspicture*}
-\end{LTXexample}
+\end{postscript}
+\end{center}
-\begin{LTXexample}[pos=t]
+\begin{lstlisting}
\psset{unit=0.5}
\begin{pspicture*}[showgrid](-7,-8)(7,8)
-\psmagneticfield[linecolor={[HTML]{006633}},N=4,R=2,numSpires=2 3]
+\psmagneticfield[linecolor={[HTML]{006633}},N=1,R=2,nS=0](-7,-8)(7,8)
+\psframe*[linecolor={[HTML]{99FF66}}](-7,-8)(7,-7)
+\rput(0,-7.5){[\Cadre{\textcolor{white}{N=1}},R=2,nS=0]}
+\end{pspicture*}
+\begin{pspicture*}[showgrid](-7,-8)(7,8)
+\psmagneticfield[linecolor={[HTML]{006633}},N=2,R=2,L=2,PasS=0.003,nS=2](-7,-8)(7,8)
+\psframe*[linecolor={[HTML]{99FF66}}](-7,7)(7,8)
+\rput(0,7.5){\Cadre{\textcolor{white}{Bobines de Helmholtz}}}
+\psframe*[linecolor={[HTML]{99FF66}}](-7,-8)(7,-7)
+\rput(0,-7.5){[\Cadre{\textcolor{white}{N=2}},R=2,L=2,PasS=0.003,nS=2]}
+\end{pspicture*}
+\end{lstlisting}
+
+
+\begin{center}
+\begin{postscript}
+\psset{unit=0.5}
+\begin{pspicture*}[showgrid](-7,-8)(7,8)
+\psmagneticfield[linecolor={[HTML]{006633}},N=4,R=2,numSpires=2 3](-7,-8)(7,8)
+\psframe*[linecolor={[HTML]{99FF66}}](-7,-8)(7,-7)
+\rput(0,-7.5){[\Cadre{\textcolor{white}{N=4}},R=2,L=4]}
+\end{pspicture*}
+\begin{pspicture*}[showgrid](-7,-8)(7,8)
+\psmagneticfield[linecolor={[HTML]{006633}},N=5,R=2,L=5,PasS=0.004,numSpires=2 3 4](-7,-8)(7,8)
+\psframe*[linecolor={[HTML]{99FF66}}](-7,-8)(7,-7)
+\rput(0,-7.5){[\Cadre{\textcolor{white}{N=5}},R=2,L=5]}
+\end{pspicture*}
+\end{postscript}
+\end{center}
+
+\begin{lstlisting}
+\psset{unit=0.5}
+\begin{pspicture*}[showgrid](-7,-8)(7,8)
+\psmagneticfield[linecolor={[HTML]{006633}},N=4,R=2,numSpires=2 3](-7,-8)(7,8)
\psframe*[linecolor={[HTML]{99FF66}}](-7,-8)(7,-7)
\rput(0,-7.5){[\Cadre{\textcolor{white}{N=4}},R=2,L=4]}
\end{pspicture*}
\begin{pspicture*}[showgrid](-7,-8)(7,8)
-\psmagneticfield[linecolor={[HTML]{006633}},N=5,R=2,L=5,PasS=0.004,numSpires=2 3 4]
+\psmagneticfield[linecolor={[HTML]{006633}},N=5,R=2,L=5,PasS=0.004,numSpires=2 3 4](-7,-8)(7,8)
\psframe*[linecolor={[HTML]{99FF66}}](-7,-8)(7,-7)
\rput(0,-7.5){[\Cadre{\textcolor{white}{N=5}},R=2,L=5]}
\end{pspicture*}
-\end{LTXexample}
+\end{lstlisting}
\clearpage
@@ -152,19 +211,35 @@ these turns can be selected individually \Lkeyword{numSpires}.
-\begin{LTXexample}[pos=t]
+\begin{center}
+\begin{postscript}
+\psset{unit=0.5}
+\begin{pspicture*}[showgrid](-7,-8)(7,8)
+\psmagneticfield[linecolor={[HTML]{000099}},N=1,R=2](-7,-8)(7,8)
+\psframe*[linecolor={[HTML]{3399FF}}](-7,-8)(7,-7)
+\rput(0,-7.5){[\Cadre{\textcolor{white}{nL=8}},N=1,R=2]}
+\end{pspicture*}
+\begin{pspicture*}[showgrid](-7,-8)(7,8)
+\psmagneticfield[linecolor={[HTML]{000099}},N=1,R=2,nL=12](-7,-8)(7,8)
+\psframe*[linecolor={[HTML]{3399FF}}](-7,-8)(7,-7)
+\rput(0,-7.5){[\Cadre{\textcolor{white}{nL=12}},N=1,R=2]}
+\end{pspicture*}
+\end{postscript}
+\end{center}
+
+\begin{lstlisting}
\psset{unit=0.5}
\begin{pspicture*}[showgrid](-7,-8)(7,8)
-\psmagneticfield[linecolor={[HTML]{000099}},N=1,R=2]
+\psmagneticfield[linecolor={[HTML]{000099}},N=1,R=2](-7,-8)(7,8)
\psframe*[linecolor={[HTML]{3399FF}}](-7,-8)(7,-7)
\rput(0,-7.5){[\Cadre{\textcolor{white}{nL=8}},N=1,R=2]}
\end{pspicture*}
\begin{pspicture*}[showgrid](-7,-8)(7,8)
-\psmagneticfield[linecolor={[HTML]{000099}},N=1,R=2,nL=12]
+\psmagneticfield[linecolor={[HTML]{000099}},N=1,R=2,nL=12](-7,-8)(7,8)
\psframe*[linecolor={[HTML]{3399FF}}](-7,-8)(7,-7)
\rput(0,-7.5){[\Cadre{\textcolor{white}{nL=12}},N=1,R=2]}
\end{pspicture*}
-\end{LTXexample}
+\end{lstlisting}
\clearpage
\subsection{The number of points for the path}
@@ -173,23 +248,43 @@ follows the step of the route and the number of selected points affect the accur
as in the two examples below:
-\begin{LTXexample}[pos=t]
+\begin{center}
+\begin{postscript}
\psset{unit=0.5}
\begin{pspicture*}[showgrid](-7,-8)(7,8)
-\psmagneticfield[linecolor={[HTML]{660066}},N=2,R=2,L=2,PasB=0.1,nS=0,nL=7,pointsB=100]
+\psmagneticfield[linecolor={[HTML]{660066}},N=2,R=2,L=2,PasB=0.1,nS=0,nL=7,pointsB=100](-7,-8)(7,8)
\psframe*[linecolor={[HTML]{996666}}](-7,7)(7,8)
\rput(0,7.5){\Cadre{\textcolor{white}{Bobines de Helmholtz}}}
\psframe*[linecolor={[HTML]{996666}}](-7,-8)(7,-7)
\rput(0,-7.5){[\Cadre{\textcolor{white}{PasB=0.1,nL=4,pointsB=100}}]}
\end{pspicture*}
\begin{pspicture*}[showgrid](-7,-8)(7,8)
-\psmagneticfield[linecolor={[HTML]{660066}},N=2,R=2,L=2,PasB=0.4,nS=0,nL=7,pointsB=100]
+\psmagneticfield[linecolor={[HTML]{660066}},N=2,R=2,L=2,PasB=0.4,nS=0,nL=7,pointsB=100](-7,-8)(7,8)
\psframe*[linecolor={[HTML]{996666}}](-7,7)(7,8)
\rput(0,7.5){\Cadre{\textcolor{white}{Bobines de Helmholtz}}}
\psframe*[linecolor={[HTML]{996666}}](-7,-8)(7,-7)
\rput(0,-7.5){[\Cadre{\textcolor{white}{PasS=0.4,pointsB=100}}]}
\end{pspicture*}
-\end{LTXexample}
+\end{postscript}
+\end{center}
+
+\begin{lstlisting}
+\psset{unit=0.5}
+\begin{pspicture*}[showgrid](-7,-8)(7,8)
+\psmagneticfield[linecolor={[HTML]{660066}},N=2,R=2,L=2,PasB=0.1,nS=0,nL=7,pointsB=100](-7,-8)(7,8)
+\psframe*[linecolor={[HTML]{996666}}](-7,7)(7,8)
+\rput(0,7.5){\Cadre{\textcolor{white}{Bobines de Helmholtz}}}
+\psframe*[linecolor={[HTML]{996666}}](-7,-8)(7,-7)
+\rput(0,-7.5){[\Cadre{\textcolor{white}{PasB=0.1,nL=4,pointsB=100}}]}
+\end{pspicture*}
+\begin{pspicture*}[showgrid](-7,-8)(7,8)
+\psmagneticfield[linecolor={[HTML]{660066}},N=2,R=2,L=2,PasB=0.4,nS=0,nL=7,pointsB=100](-7,-8)(7,8)
+\psframe*[linecolor={[HTML]{996666}}](-7,7)(7,8)
+\rput(0,7.5){\Cadre{\textcolor{white}{Bobines de Helmholtz}}}
+\psframe*[linecolor={[HTML]{996666}}](-7,-8)(7,-7)
+\rput(0,-7.5){[\Cadre{\textcolor{white}{PasS=0.4,pointsB=100}}]}
+\end{pspicture*}
+\end{lstlisting}
If the defaults do not suit it must be found by testing the
@@ -200,38 +295,72 @@ values that give a correct path.
\clearpage
\section{The parameter \nxLkeyword{numSpires}}
-\begin{LTXexample}[pos=t,wide]
+\begin{center}
+\begin{postscript}
+\psset{unit=0.5}
+\begin{pspicture*}[showgrid](-8,-10)(8,10)
+\psset{linecolor=blue}
+\psmagneticfield[R=2,L=12,N=8,pointsS=500,nL=14,nS=1,numSpires=1 3 6 8,PasB=0.075](-8,-10)(8,10)
+\psframe*[linecolor={[HTML]{99FF66}}](-8,-10)(8,-9)
+\rput(0,-9.5){[\Cadre{\textcolor{white}{numSpires=1 3 6 8}},R=2,L=14]}
+\multido{\i=0+1}{8}{\rput[l](!6 6 12 7 div \i\space mul sub){\the\multidocount}}
+\end{pspicture*}\quad
+\begin{pspicture*}[showgrid](0,-10)(16,10)
+\psset{linecolor=blue}
+\psmagneticfield[R=2,L=12,N=8,pointsS=500,nL=14,numSpires=,nS=1,PasB=0.075](0,-10)(16,10)
+\psframe*[linecolor={[HTML]{99FF66}}](0,-10)(16,-9)
+\rput(8,-9.5){[\Cadre{\textcolor{white}{numSpires=all}},R=2,L=14]}
+\multido{\i=0+1}{8}{\rput[l](!6 6 12 7 div \i\space mul sub){\the\multidocount}}
+\end{pspicture*}
+\end{postscript}
+\end{center}
+
+
+\begin{lstlisting}
\psset{unit=0.5}
\begin{pspicture*}[showgrid](-8,-10)(8,10)
\psset{linecolor=blue}
-\psmagneticfield[R=2,L=12,N=8,pointsS=500,nL=14,nS=1,numSpires=1 3 6 8,PasB=0.075]
+\psmagneticfield[R=2,L=12,N=8,pointsS=500,nL=14,nS=1,numSpires=1 3 6 8,PasB=0.075](-8,-10)(8,10)
\psframe*[linecolor={[HTML]{99FF66}}](-8,-10)(8,-9)
\rput(0,-9.5){[\Cadre{\textcolor{white}{numSpires=1 3 6 8}},R=2,L=14]}
\multido{\i=0+1}{8}{\rput[l](!6 6 12 7 div \i\space mul sub){\the\multidocount}}
\end{pspicture*}\quad
\begin{pspicture*}[showgrid](0,-10)(16,10)
\psset{linecolor=blue}
-\psmagneticfield[R=2,L=12,N=8,pointsS=500,nL=14,numSpires=,nS=1,PasB=0.075]
+\psmagneticfield[R=2,L=12,N=8,pointsS=500,nL=14,numSpires=,nS=1,PasB=0.075](0,-10)(16,10)
\psframe*[linecolor={[HTML]{99FF66}}](0,-10)(16,-9)
\rput(8,-9.5){[\Cadre{\textcolor{white}{numSpires=all}},R=2,L=14]}
\multido{\i=0+1}{8}{\rput[l](!6 6 12 7 div \i\space mul sub){\the\multidocount}}
\end{pspicture*}
-\end{LTXexample}
+\end{lstlisting}
\clearpage
\section{The parameter \nxLkeyword{AntiHelmholtz}}
-\begin{LTXexample}[pos=t]
+\begin{center}
+\begin{postscript}
\psset{unit=0.75,AntiHelmholtz,N=2,
R=2,pointsB=500,pointsS=1000,PasB=0.02,PasS=0.00275,nS=10,
nL=2,drawSelf=true,styleSpire=styleSpire,styleCourant=sensCourant}
\newpsstyle{grille}{subgriddiv=0,gridcolor=blue!50,griddots=10}
\newpsstyle{cadre}{linecolor=yellow!50}
\begin{pspicture*}[showgrid](-7,-6)(7,6)
-\psframe*[linecolor={[HTML]{996666}}](-7,7)(7,8)
+\psframe*[linecolor={[HTML]{996666}}](-7,6)(7,6)
\psmagneticfield[linecolor={[HTML]{660066}}]
\end{pspicture*}
-\end{LTXexample}
+\end{postscript}
+\end{center}
+\begin{lstlisting}
+\psset{unit=0.75,AntiHelmholtz,N=2,
+ R=2,pointsB=500,pointsS=1000,PasB=0.02,PasS=0.00275,nS=10,
+ nL=2,drawSelf=true,styleSpire=styleSpire,styleCourant=sensCourant}
+\newpsstyle{grille}{subgriddiv=0,gridcolor=blue!50,griddots=10}
+\newpsstyle{cadre}{linecolor=yellow!50}
+\begin{pspicture*}[showgrid](-7,-6)(7,6)
+\psframe*[linecolor={[HTML]{996666}}](-7,6)(7,6)
+\psmagneticfield[linecolor={[HTML]{660066}}]
+\end{pspicture*}
+\end{lstlisting}
\clearpage
@@ -255,24 +384,59 @@ is encapsulated as the field map for \Lcs{psframe}. We can use the option
In the following example we can see the handling of these two psstyles.
-\begin{LTXexample}[pos=t]
+\begin{center}
+\begin{postscript}
+\psset{unit=0.7cm}
+\newpsstyle{grille}{subgriddiv=0,gridcolor=blue!50,griddots=10}
+\newpsstyle{cadre}{linecolor=yellow!50}
+\begin{pspicture}(-7,-6)(7,6)
+\psmagneticfieldThreeD[N=8,R=2,L=8,pointsB=1200,linecolor=blue,pointsS=2000](-7,-6)(7,6)
+\end{pspicture}
+\end{postscript}
+\end{center}
+
+\begin{lstlisting}
\psset{unit=0.7cm}
\newpsstyle{grille}{subgriddiv=0,gridcolor=blue!50,griddots=10}
\newpsstyle{cadre}{linecolor=yellow!50}
\begin{pspicture}(-7,-6)(7,6)
-\psmagneticfieldThreeD[N=8,R=2,L=8,pointsB=1200,linecolor=blue,pointsS=1000](-7,-8)(7,8)
+\psmagneticfieldThreeD[N=8,R=2,L=8,pointsB=1200,linecolor=blue,pointsS=2000](-7,-6)(7,6)
+\end{pspicture}
+\end{lstlisting}
+
+
+\begin{center}
+\begin{postscript}
+\psset{unit=0.7cm}
+\begin{pspicture}(-7,-6)(7,6)
+\psmagneticfieldThreeD[N=2,R=2,L=2,linecolor=blue](-7,-6)(7,6)
+\ThreeDput{\rput(0,-7){\textbf{Bobines de HELMHOLTZ}}}
\end{pspicture}
-\end{LTXexample}
+\end{postscript}
+\end{center}
-\begin{LTXexample}[pos=t]
+\begin{lstlisting}
\psset{unit=0.7cm}
\begin{pspicture}(-7,-6)(7,6)
-\psmagneticfieldThreeD[N=2,R=2,L=2,linecolor=blue](-7,-8)(7,8)
+\psmagneticfieldThreeD[N=2,R=2,L=2,linecolor=blue](-7,-6)(7,6)
\ThreeDput{\rput(0,-7){\textbf{Bobines de HELMHOLTZ}}}
\end{pspicture}
-\end{LTXexample}
+\end{lstlisting}
+
+\begin{center}
+\begin{postscript}
+\psset{unit=0.75cm,AntiHelmholtz,N=2,
+ R=2,pointsB=500,pointsS=1000,PasB=0.02,PasS=0.00275,nS=10,
+ nL=2,drawSelf,styleSpire=styleSpire,styleCourant=sensCourant}
+\newpsstyle{grille}{subgriddiv=0,gridcolor=blue!50,griddots=10}
+\newpsstyle{cadre}{linecolor=yellow!50}
+\begin{pspicture}(-7,-6)(7,6)
+\psmagneticfieldThreeD[linecolor={[HTML]{660066}}](-7,-6)(7,6)
+\end{pspicture}
+\end{postscript}
+\end{center}
-\begin{LTXexample}[pos=t]
+\begin{lstlisting}
\psset{unit=0.75cm,AntiHelmholtz,N=2,
R=2,pointsB=500,pointsS=1000,PasB=0.02,PasS=0.00275,nS=10,
nL=2,drawSelf,styleSpire=styleSpire,styleCourant=sensCourant}
@@ -281,9 +445,65 @@ In the following example we can see the handling of these two psstyles.
\begin{pspicture}(-7,-6)(7,6)
\psmagneticfieldThreeD[linecolor={[HTML]{660066}}](-7,-6)(7,6)
\end{pspicture}
-\end{LTXexample}
+\end{lstlisting}
+
+\clearpage
+\section{Density plots}
+The optional argument \Lkeyword{StreamDensityPlot} allows to plot the
+magnetic field as a colored stream density. A gray colored output is possioble
+with setting the keyword \Lkeyword{setgray}.
+
+\begin{center}
+\begin{postscript}
+\begin{pspicture}(-6,-4)(6,4)
+\psmagneticfield[N=3,R=2,L=2,StreamDensityPlot](-6,-4)(6,4)
+\end{pspicture}
+\end{postscript}
+\end{center}
+
+\begin{lstlisting}
+\begin{pspicture}(-6,-4)(6,4)
+\psmagneticfield[N=3,R=2,L=2,StreamDensityPlot](-6,-4)(6,4)
+\end{pspicture}
+\end{lstlisting}
+
+\begin{center}
+\begin{postscript}
+\psset{unit=0.75}
+\begin{pspicture}(-6,-5)(6,5)
+\psmagneticfield[N=2,R=2,L=1,StreamDensityPlot,setgray](-6,-5)(6,5)
+\end{pspicture}
+\end{postscript}
+\end{center}
+
+\begin{lstlisting}
+\psset{unit=0.75}
+\begin{pspicture}(-6,-5)(6,5)
+\psmagneticfield[N=2,R=2,L=1,StreamDensityPlot,setgray](-6,-5)(6,5)
+\end{pspicture}
+\end{lstlisting}
+
+
+\begin{center}
+\begin{postscript}
+\psset{unit=0.75,AntiHelmholtz,
+ R=2,pointsB=500,pointsS=2000,PasB=0.02,PasS=0.00275,nS=10,
+ nL=2,drawSelf=true,styleSpire=styleSpire,styleCourant=sensCourant}
+\begin{pspicture*}(-7,-6)(7,6)
+\psmagneticfield[linecolor={[HTML]{660066}},StreamDensityPlot](-7,-6)(7,6)
+\end{pspicture*}
+\end{postscript}
+\end{center}
+\begin{lstlisting}
+\psset{unit=0.75,AntiHelmholtz,
+ R=2,pointsB=500,pointsS=2000,PasB=0.02,PasS=0.00275,nS=10,
+ nL=2,drawSelf=true,styleSpire=styleSpire,styleCourant=sensCourant}
+\begin{pspicture*}(-7,-6)(7,6)
+\psmagneticfield[linecolor={[HTML]{660066}},StreamDensityPlot](-7,-6)(7,6)
+\end{pspicture*}
+\end{lstlisting}
\clearpage
@@ -295,7 +515,7 @@ In the following example we can see the handling of these two psstyles.
\bgroup
\raggedright
\bibliographystyle{plain}
-\bibliography{\jobname}
+\bibliography{pst-magneticfield-doc}
\egroup
diff --git a/Master/texmf-dist/doc/generic/pst-magneticfield/pst-magneticfield-docFR.bib b/Master/texmf-dist/doc/generic/pst-magneticfield/pst-magneticfield-docFR.bib
deleted file mode 100644
index 14a8466e948..00000000000
--- a/Master/texmf-dist/doc/generic/pst-magneticfield/pst-magneticfield-docFR.bib
+++ /dev/null
@@ -1,79 +0,0 @@
-%% -*-bibtex-*-
-@STRING{tugboat = {TUGboat} }
-@STRING{dtk = {{D}ie {\TeX}nische {K}om{\"o}die} }
-
-@Book{companion,
- author = {Michel Goosens and Frank Mittelbach and Sebastian Rahtz and Dennis Roegel and Herbert Vo\ss},
- title = {The {\LaTeX} {G}raphics {C}ompanion},
- publisher = {{Addison-Wesley Publishing Company}},
- edition = {second},
- year = {2007},
- address = {Reading, Mass.}
-}
-
-@Article{girou:01:,
- author = {Denis Girou},
- title = {Pr\'esentation de {PST}ricks},
- journal = {Cahier {GUT}enberg},
- year = 1994,
- volume = {16},
- month = apr,
- pages = {21-70}
-}
-
-@Article{girou:02:,
- author = {{Timothy Van} Zandt and Denis Girou},
- title = {Inside {PST}ricks},
- journal = TUGboat,
- year = 1994,
- volume = {15},
- month = sep,
- pages = {239-246}
-}
-
-@Book{PostScript,
- Author = {Kollock, Nikolai G.},
- Title = {Post{S}cript richtig eingesetzt: vom {K}onzept zum
- praktischen {E}insatz},
- Publisher = {IWT},
- Address = {Vaterstetten},
- year = 1989,
-}
-
-@Manual{multido,
- Title = {\texttt{multido.tex} - a loop macro, that supports fixed-point addition},
- Author = {{Timothy Van} Zandt},
- Organization = {},
- Address = {\url{CTAN:/graphics/pstricks/generic/multido.tex}},
- Note = {},
- year = 1997
-}
-
-@Book{PSTricks2,
- author = {Herbert Vo\ss{}},
- title = {\texttt{PSTricks} -- {G}rafik f\"ur \TeX{} und \LaTeX},
- edition = {fifth},
- publisher = {DANTE -- Lehmanns},
- year = {2008},
- address = {Heidelberg/Hamburg}
-}
-
-@Book{abramowitz,
- author = {M. Abramowitz and I. A. Stegun },
- year = 1964,
- title = {Handbook of {M}athematical {F}unctions with {F}ormulas, {G}raphs, and
- {M}athematical {T}ables},
- publisher = {National Bureau of Standards Applied Mathematics Series,
- U.S. Government Printing Office},
- address = {Washington, D.C., USA},
- Note = {Corrections appeared in later printings up to the 10th Printing},
-}
-
-@Book{dolan,
-author = {Thomas~J. ,Dolan},
-title = {Fusion {R}esearch, {V}olume {III} ``{T}echnology''},
-publisher= {Pergamon Press},
-year=1982,
-Note= {Chapter 20 ``Water-cooled magnets'' ,
- pages 600 ff ``circular loops'' -- Integrating the Biot-Savart Law (in cylindrical geometry)},
-}
diff --git a/Master/texmf-dist/doc/generic/pst-magneticfield/pst-magneticfield-docFR.pdf b/Master/texmf-dist/doc/generic/pst-magneticfield/pst-magneticfield-docFR.pdf
index 3eff5d5d839..4e5dd583c65 100644
--- a/Master/texmf-dist/doc/generic/pst-magneticfield/pst-magneticfield-docFR.pdf
+++ b/Master/texmf-dist/doc/generic/pst-magneticfield/pst-magneticfield-docFR.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/pst-magneticfield/pst-magneticfield-docFR.tex b/Master/texmf-dist/doc/generic/pst-magneticfield/pst-magneticfield-docFR.tex
index 6a13361b7f4..6b0e5a2b96a 100644
--- a/Master/texmf-dist/doc/generic/pst-magneticfield/pst-magneticfield-docFR.tex
+++ b/Master/texmf-dist/doc/generic/pst-magneticfield/pst-magneticfield-docFR.tex
@@ -1,19 +1,16 @@
-%% $Id: pst-magneticfield-docFR.tex 323 2010-05-16 11:39:35Z herbert $
+%% $Id: pst-magneticfield-docFR.tex 343 2010-06-10 15:08:37Z herbert $
\documentclass[11pt,english,french,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings
headexclude,footexclude,oneside]{pst-doc}
\usepackage[latin1]{inputenc}
\usepackage{pst-magneticfield}
\let\pstMFfv\fileversion
+
+%\newenvironment{postscript}{}{} % uncomment, when running with latex
+
\lstset{pos=t,language=PSTricks,
morekeywords={psmagneticfield,psmagneticfieldThreeD},basicstyle=\footnotesize\ttfamily}
\newcommand\Cadre[1]{\psframebox[fillstyle=solid,fillcolor=black,linestyle=none,framesep=0]{#1}}
-\def\bgImage{%
-\psset{unit=0.5cm}
-\begin{pspicture}(-7,-6)(7,6)
-\psmagneticfieldThreeD[N=2,R=2,L=2,linecolor=blue](-7,-8)(7,8)
-\ThreeDput{\rput(0,-7){\textbf{Bobines de HELMHOLTZ}}}
-\end{pspicture}
-}
+\def\bgImage{}
%
\begin{document}
@@ -85,22 +82,42 @@ des lignes de champ.
\section{Influence des paramètres physiques sur la carte du champ magnétique}
\subsection{La longueur du solénoïde}
-\begin{LTXexample}[pos=t]
+\begin{center}
+\begin{postscript}
\psset{unit=0.5cm}
\begin{pspicture*}[showgrid](-7,-8)(7,8)
-\psmagneticfield[linecolor={[HTML]{006633}},N=3,R=2,nS=1]
+\psmagneticfield[linecolor={[HTML]{006633}},N=3,R=2,nS=1](-7,-8)(7,8)
\psframe*[linecolor={[HTML]{99FF66}}](-7,-8)(7,-7)
\rput(0,-7.5){[\Cadre{\textcolor{white}{L=4}},N=3,R=2,nS=1]}
\end{pspicture*}
\begin{pspicture*}[showgrid](-7,-8)(7,8)
-\psmagneticfield[linecolor={[HTML]{006633}},L=8,N=3,R=2,nS=1,PasB=0.0025,pointsB=5500]
+\psmagneticfield[linecolor={[HTML]{006633}},L=8,N=3,R=2,nS=1,PasB=0.0025,pointsB=5500](-7,-8)(7,8)
\psframe*[linecolor={[HTML]{99FF66}}](-7,-8)(7,-7)
\rput(0,-7.5){[\Cadre{\textcolor{white}{L=8}},N=3,R=2,nS=1]}
\end{pspicture*}
-\end{LTXexample}
+\end{postscript}
+\end{center}
+
+\begin{lstlisting}
+\psset{unit=0.5cm}
+\begin{pspicture*}[showgrid](-7,-8)(7,8)
+\psmagneticfield[linecolor={[HTML]{006633}},N=3,R=2,nS=1](-7,-8)(7,8)
+\psframe*[linecolor={[HTML]{99FF66}}](-7,-8)(7,-7)
+\rput(0,-7.5){[\Cadre{\textcolor{white}{L=4}},N=3,R=2,nS=1]}
+\end{pspicture*}
+\begin{pspicture*}[showgrid](-7,-8)(7,8)
+\psmagneticfield[linecolor={[HTML]{006633}},L=8,N=3,R=2,nS=1,PasB=0.0025,pointsB=5500](-7,-8)(7,8)
+\psframe*[linecolor={[HTML]{99FF66}}](-7,-8)(7,-7)
+\rput(0,-7.5){[\Cadre{\textcolor{white}{L=8}},N=3,R=2,nS=1]}
+\end{pspicture*}
+\end{lstlisting}
+
\textbf{Remarque :} pour affiner le tracé du deuxième solénoïde, on a du augmenter
-le nombre de points et diminuer le pas du tracé : \Cadre{\textcolor{white}{pointsB=5500,PasB=0.0025}},
+le nombre de points et diminuer le pas du tracé :
+\begin{postscript}
+\Cadre{\textcolor{white}{pointsB=5500,PasB=0.0025}}
+\end{postscript},
ce qui rallonge la durée des calculs.
@@ -108,35 +125,70 @@ ce qui rallonge la durée des calculs.
\clearpage
\subsection{Le nombre de spires}
-\begin{LTXexample}[pos=t]
+\begin{center}
+\begin{postscript}
\psset{unit=0.5}
\begin{pspicture*}[showgrid](-7,-8)(7,8)
-\psmagneticfield[linecolor={[HTML]{006633}},N=1,R=2,nS=0]
+\psmagneticfield[linecolor={[HTML]{006633}},N=1,R=2,nS=0](-7,-8)(7,8)
\psframe*[linecolor={[HTML]{99FF66}}](-7,-8)(7,-7)
\rput(0,-7.5){[\Cadre{\textcolor{white}{N=1}},R=2,nS=0]}
\end{pspicture*}
\begin{pspicture*}[showgrid](-7,-8)(7,8)
-\psmagneticfield[linecolor={[HTML]{006633}},N=2,R=2,L=2,PasS=0.003,nS=2]
+\psmagneticfield[linecolor={[HTML]{006633}},N=2,R=2,L=2,PasS=0.003,nS=2](-7,-8)(7,8)
\psframe*[linecolor={[HTML]{99FF66}}](-7,7)(7,8)
\rput(0,7.5){\Cadre{\textcolor{white}{Bobines de Helmholtz}}}
\psframe*[linecolor={[HTML]{99FF66}}](-7,-8)(7,-7)
\rput(0,-7.5){[\Cadre{\textcolor{white}{N=2}},R=2,L=2,PasS=0.003,nS=2]}
\end{pspicture*}
-\end{LTXexample}
+\end{postscript}
+\end{center}
+
+\begin{lstlisting}
+\psset{unit=0.5}
+\begin{pspicture*}[showgrid](-7,-8)(7,8)
+\psmagneticfield[linecolor={[HTML]{006633}},N=1,R=2,nS=0](-7,-8)(7,8)
+\psframe*[linecolor={[HTML]{99FF66}}](-7,-8)(7,-7)
+\rput(0,-7.5){[\Cadre{\textcolor{white}{N=1}},R=2,nS=0]}
+\end{pspicture*}
+\begin{pspicture*}[showgrid](-7,-8)(7,8)
+\psmagneticfield[linecolor={[HTML]{006633}},N=2,R=2,L=2,PasS=0.003,nS=2](-7,-8)(7,8)
+\psframe*[linecolor={[HTML]{99FF66}}](-7,7)(7,8)
+\rput(0,7.5){\Cadre{\textcolor{white}{Bobines de Helmholtz}}}
+\psframe*[linecolor={[HTML]{99FF66}}](-7,-8)(7,-7)
+\rput(0,-7.5){[\Cadre{\textcolor{white}{N=2}},R=2,L=2,PasS=0.003,nS=2]}
+\end{pspicture*}
+\end{lstlisting}
+
+
+\begin{center}
+\begin{postscript}
+\psset{unit=0.5}
+\begin{pspicture*}[showgrid](-7,-8)(7,8)
+\psmagneticfield[linecolor={[HTML]{006633}},N=4,R=2,numSpires=2 3](-7,-8)(7,8)
+\psframe*[linecolor={[HTML]{99FF66}}](-7,-8)(7,-7)
+\rput(0,-7.5){[\Cadre{\textcolor{white}{N=4}},R=2,L=4]}
+\end{pspicture*}
+\begin{pspicture*}[showgrid](-7,-8)(7,8)
+\psmagneticfield[linecolor={[HTML]{006633}},N=5,R=2,L=5,PasS=0.004,numSpires=2 3 4](-7,-8)(7,8)
+\psframe*[linecolor={[HTML]{99FF66}}](-7,-8)(7,-7)
+\rput(0,-7.5){[\Cadre{\textcolor{white}{N=5}},R=2,L=5]}
+\end{pspicture*}
+\end{postscript}
+\end{center}
-\begin{LTXexample}[pos=t]
+\begin{lstlisting}
\psset{unit=0.5}
\begin{pspicture*}[showgrid](-7,-8)(7,8)
-\psmagneticfield[linecolor={[HTML]{006633}},N=4,R=2,numSpires=2 3]
+\psmagneticfield[linecolor={[HTML]{006633}},N=4,R=2,numSpires=2 3](-7,-8)(7,8)
\psframe*[linecolor={[HTML]{99FF66}}](-7,-8)(7,-7)
\rput(0,-7.5){[\Cadre{\textcolor{white}{N=4}},R=2,L=4]}
\end{pspicture*}
\begin{pspicture*}[showgrid](-7,-8)(7,8)
-\psmagneticfield[linecolor={[HTML]{006633}},N=5,R=2,L=5,PasS=0.004,numSpires=2 3 4]
+\psmagneticfield[linecolor={[HTML]{006633}},N=5,R=2,L=5,PasS=0.004,numSpires=2 3 4](-7,-8)(7,8)
\psframe*[linecolor={[HTML]{99FF66}}](-7,-8)(7,-7)
\rput(0,-7.5){[\Cadre{\textcolor{white}{N=5}},R=2,L=5]}
\end{pspicture*}
-\end{LTXexample}
+\end{lstlisting}
\clearpage
@@ -150,19 +202,35 @@ avec \Lkeyword{numSpires}.
-\begin{LTXexample}[pos=t]
+\begin{center}
+\begin{postscript}
+\psset{unit=0.5}
+\begin{pspicture*}[showgrid](-7,-8)(7,8)
+\psmagneticfield[linecolor={[HTML]{000099}},N=1,R=2](-7,-8)(7,8)
+\psframe*[linecolor={[HTML]{3399FF}}](-7,-8)(7,-7)
+\rput(0,-7.5){[\Cadre{\textcolor{white}{nL=8}},N=1,R=2]}
+\end{pspicture*}
+\begin{pspicture*}[showgrid](-7,-8)(7,8)
+\psmagneticfield[linecolor={[HTML]{000099}},N=1,R=2,nL=12](-7,-8)(7,8)
+\psframe*[linecolor={[HTML]{3399FF}}](-7,-8)(7,-7)
+\rput(0,-7.5){[\Cadre{\textcolor{white}{nL=12}},N=1,R=2]}
+\end{pspicture*}
+\end{postscript}
+\end{center}
+
+\begin{lstlisting}
\psset{unit=0.5}
\begin{pspicture*}[showgrid](-7,-8)(7,8)
-\psmagneticfield[linecolor={[HTML]{000099}},N=1,R=2]
+\psmagneticfield[linecolor={[HTML]{000099}},N=1,R=2](-7,-8)(7,8)
\psframe*[linecolor={[HTML]{3399FF}}](-7,-8)(7,-7)
\rput(0,-7.5){[\Cadre{\textcolor{white}{nL=8}},N=1,R=2]}
\end{pspicture*}
\begin{pspicture*}[showgrid](-7,-8)(7,8)
-\psmagneticfield[linecolor={[HTML]{000099}},N=1,R=2,nL=12]
+\psmagneticfield[linecolor={[HTML]{000099}},N=1,R=2,nL=12](-7,-8)(7,8)
\psframe*[linecolor={[HTML]{3399FF}}](-7,-8)(7,-7)
\rput(0,-7.5){[\Cadre{\textcolor{white}{nL=12}},N=1,R=2]}
\end{pspicture*}
-\end{LTXexample}
+\end{lstlisting}
\clearpage
\subsection{Le nombre de points et le pas du tracé}
@@ -170,23 +238,44 @@ Le tracé des lignes de champ est réalisé par une méthode numérique (RK2) et il s
le pas du tracé et le nombre de points choisis influent sur la précision du tracé,
comme dans les deux exemples ci-dessous :
-\begin{LTXexample}[pos=t]
+\begin{center}
+\begin{postscript}
\psset{unit=0.5}
\begin{pspicture*}[showgrid](-7,-8)(7,8)
-\psmagneticfield[linecolor={[HTML]{660066}},N=2,R=2,L=2,PasB=0.1,nS=0,nL=7,pointsB=100]
+\psmagneticfield[linecolor={[HTML]{660066}},N=2,R=2,L=2,PasB=0.1,nS=0,nL=7,pointsB=100](-7,-8)(7,8)
\psframe*[linecolor={[HTML]{996666}}](-7,7)(7,8)
\rput(0,7.5){\Cadre{\textcolor{white}{Bobines de Helmholtz}}}
\psframe*[linecolor={[HTML]{996666}}](-7,-8)(7,-7)
\rput(0,-7.5){[\Cadre{\textcolor{white}{PasB=0.1,nL=4,pointsB=100}}]}
\end{pspicture*}
\begin{pspicture*}[showgrid](-7,-8)(7,8)
-\psmagneticfield[linecolor={[HTML]{660066}},N=2,R=2,L=2,PasB=0.4,nS=0,nL=7,pointsB=100]
+\psmagneticfield[linecolor={[HTML]{660066}},N=2,R=2,L=2,PasB=0.4,nS=0,nL=7,pointsB=100](-7,-8)(7,8)
\psframe*[linecolor={[HTML]{996666}}](-7,7)(7,8)
\rput(0,7.5){\Cadre{\textcolor{white}{Bobines de Helmholtz}}}
\psframe*[linecolor={[HTML]{996666}}](-7,-8)(7,-7)
\rput(0,-7.5){[\Cadre{\textcolor{white}{PasS=0.4,pointsB=100}}]}
\end{pspicture*}
-\end{LTXexample}
+\end{postscript}
+\end{center}
+
+\begin{lstlisting}
+\psset{unit=0.5}
+\begin{pspicture*}[showgrid](-7,-8)(7,8)
+\psmagneticfield[linecolor={[HTML]{660066}},N=2,R=2,L=2,PasB=0.1,nS=0,nL=7,pointsB=100](-7,-8)(7,8)
+\psframe*[linecolor={[HTML]{996666}}](-7,7)(7,8)
+\rput(0,7.5){\Cadre{\textcolor{white}{Bobines de Helmholtz}}}
+\psframe*[linecolor={[HTML]{996666}}](-7,-8)(7,-7)
+\rput(0,-7.5){[\Cadre{\textcolor{white}{PasB=0.1,nL=4,pointsB=100}}]}
+\end{pspicture*}
+\begin{pspicture*}[showgrid](-7,-8)(7,8)
+\psmagneticfield[linecolor={[HTML]{660066}},N=2,R=2,L=2,PasB=0.4,nS=0,nL=7,pointsB=100](-7,-8)(7,8)
+\psframe*[linecolor={[HTML]{996666}}](-7,7)(7,8)
+\rput(0,7.5){\Cadre{\textcolor{white}{Bobines de Helmholtz}}}
+\psframe*[linecolor={[HTML]{996666}}](-7,-8)(7,-7)
+\rput(0,-7.5){[\Cadre{\textcolor{white}{PasS=0.4,pointsB=100}}]}
+\end{pspicture*}
+\end{lstlisting}
+
Si les valeurs par défaut ne conviennent pas il faut donc trouver par des
essais les valeurs qui donnent un tracé correct.
@@ -195,38 +284,72 @@ essais les valeurs qui donnent un tracé correct.
\clearpage
\section{Le paramètre: numSpires}
-\begin{LTXexample}[pos=t,wide]
+\begin{center}
+\begin{postscript}
\psset{unit=0.5}
\begin{pspicture*}[showgrid](-8,-10)(8,10)
\psset{linecolor=blue}
-\psmagneticfield[R=2,L=12,N=8,pointsS=500,nL=14,nS=1,numSpires=1 3 6 8,PasB=0.075]
+\psmagneticfield[R=2,L=12,N=8,pointsS=500,nL=14,nS=1,numSpires=1 3 6 8,PasB=0.075](-8,-10)(8,10)
\psframe*[linecolor={[HTML]{99FF66}}](-8,-10)(8,-9)
\rput(0,-9.5){[\Cadre{\textcolor{white}{numSpires=1 3 6 8}},R=2,L=14]}
\multido{\i=0+1}{8}{\rput[l](!6 6 12 7 div \i\space mul sub){\the\multidocount}}
\end{pspicture*}\quad
\begin{pspicture*}[showgrid](0,-10)(16,10)
\psset{linecolor=blue}
-\psmagneticfield[R=2,L=12,N=8,pointsS=500,nL=14,numSpires=,nS=1,PasB=0.075]
+\psmagneticfield[R=2,L=12,N=8,pointsS=500,nL=14,numSpires=,nS=1,PasB=0.075](0,-10)(16,10)
\psframe*[linecolor={[HTML]{99FF66}}](0,-10)(16,-9)
\rput(8,-9.5){[\Cadre{\textcolor{white}{numSpires=all}},R=2,L=14]}
\multido{\i=0+1}{8}{\rput[l](!6 6 12 7 div \i\space mul sub){\the\multidocount}}
\end{pspicture*}
-\end{LTXexample}
+\end{postscript}
+\end{center}
+\begin{lstlisting}
+\psset{unit=0.5}
+\begin{pspicture*}[showgrid](-8,-10)(8,10)
+\psset{linecolor=blue}
+\psmagneticfield[R=2,L=12,N=8,pointsS=500,nL=14,nS=1,numSpires=1 3 6 8,PasB=0.075](-8,-10)(8,10)
+\psframe*[linecolor={[HTML]{99FF66}}](-8,-10)(8,-9)
+\rput(0,-9.5){[\Cadre{\textcolor{white}{numSpires=1 3 6 8}},R=2,L=14]}
+\multido{\i=0+1}{8}{\rput[l](!6 6 12 7 div \i\space mul sub){\the\multidocount}}
+\end{pspicture*}\quad
+\begin{pspicture*}[showgrid](0,-10)(16,10)
+\psset{linecolor=blue}
+\psmagneticfield[R=2,L=12,N=8,pointsS=500,nL=14,numSpires=,nS=1,PasB=0.075](0,-10)(16,10)
+\psframe*[linecolor={[HTML]{99FF66}}](0,-10)(16,-9)
+\rput(8,-9.5){[\Cadre{\textcolor{white}{numSpires=all}},R=2,L=14]}
+\multido{\i=0+1}{8}{\rput[l](!6 6 12 7 div \i\space mul sub){\the\multidocount}}
+\end{pspicture*}
+\end{lstlisting}
+
\clearpage
-\section{The parameter \nxLkeyword{AntiHelmholtz}}
-\begin{LTXexample}[pos=t]
+\section{Le param\`etre \nxLkeyword{AntiHelmholtz}}
+\begin{center}
+\begin{postscript}
\psset{unit=0.75,AntiHelmholtz,N=2,
R=2,pointsB=500,pointsS=1000,PasB=0.02,PasS=0.00275,nS=10,
nL=2,drawSelf=true,styleSpire=styleSpire,styleCourant=sensCourant}
\newpsstyle{grille}{subgriddiv=0,gridcolor=blue!50,griddots=10}
\newpsstyle{cadre}{linecolor=yellow!50}
\begin{pspicture*}[showgrid](-7,-6)(7,6)
-\psframe*[linecolor={[HTML]{996666}}](-7,7)(7,8)
+\psframe*[linecolor={[HTML]{996666}}](-7,6)(7,6)
\psmagneticfield[linecolor={[HTML]{660066}}]
\end{pspicture*}
-\end{LTXexample}
+\end{postscript}
+\end{center}
+
+\begin{lstlisting}
+\psset{unit=0.75,AntiHelmholtz,N=2,
+ R=2,pointsB=500,pointsS=1000,PasB=0.02,PasS=0.00275,nS=10,
+ nL=2,drawSelf=true,styleSpire=styleSpire,styleCourant=sensCourant}
+\newpsstyle{grille}{subgriddiv=0,gridcolor=blue!50,griddots=10}
+\newpsstyle{cadre}{linecolor=yellow!50}
+\begin{pspicture*}[showgrid](-7,-6)(7,6)
+\psframe*[linecolor={[HTML]{996666}}](-7,6)(7,6)
+\psmagneticfield[linecolor={[HTML]{660066}}]
+\end{pspicture*}
+\end{lstlisting}
\clearpage
@@ -251,24 +374,61 @@ Les options du cadre sont, par défaut, les suivantes :
\end{verbatim}
Ce sont donc celles-ci qu'il faudra modifier si on souhaite en changer, comme dans l'exemple ci-dessous.
-\begin{LTXexample}[pos=t]
-\psset{unit=0.7}
+
+
+\begin{center}
+\begin{postscript}
+\psset{unit=0.7cm}
\newpsstyle{grille}{subgriddiv=0,gridcolor=blue!50,griddots=10}
\newpsstyle{cadre}{linecolor=yellow!50}
\begin{pspicture}(-7,-6)(7,6)
-\psmagneticfieldThreeD[N=8,R=2,L=8,pointsB=1200,linecolor=blue,pointsS=1000](-7,-8)(7,8)
+\psmagneticfieldThreeD[N=8,R=2,L=8,pointsB=1200,linecolor=blue,pointsS=2000](-7,-6)(7,6)
\end{pspicture}
-\end{LTXexample}
+\end{postscript}
+\end{center}
-\begin{LTXexample}[pos=t]
-\psset{unit=0.7}
+\begin{lstlisting}
+\psset{unit=0.7cm}
+\newpsstyle{grille}{subgriddiv=0,gridcolor=blue!50,griddots=10}
+\newpsstyle{cadre}{linecolor=yellow!50}
+\begin{pspicture}(-7,-6)(7,6)
+\psmagneticfieldThreeD[N=8,R=2,L=8,pointsB=1200,linecolor=blue,pointsS=2000](-7,-6)(7,6)
+\end{pspicture}
+\end{lstlisting}
+
+
+\begin{center}
+\begin{postscript}
+\psset{unit=0.7cm}
\begin{pspicture}(-7,-6)(7,6)
-\psmagneticfieldThreeD[N=2,R=2,L=2,linecolor=blue](-7,-8)(7,8)
+\psmagneticfieldThreeD[N=2,R=2,L=2,linecolor=blue](-7,-6)(7,6)
\ThreeDput{\rput(0,-7){\textbf{Bobines de HELMHOLTZ}}}
\end{pspicture}
-\end{LTXexample}
+\end{postscript}
+\end{center}
-\begin{LTXexample}[pos=t]
+\begin{lstlisting}
+\psset{unit=0.7cm}
+\begin{pspicture}(-7,-6)(7,6)
+\psmagneticfieldThreeD[N=2,R=2,L=2,linecolor=blue](-7,-6)(7,6)
+\ThreeDput{\rput(0,-7){\textbf{Bobines de HELMHOLTZ}}}
+\end{pspicture}
+\end{lstlisting}
+
+\begin{center}
+\begin{postscript}
+\psset{unit=0.75cm,AntiHelmholtz,N=2,
+ R=2,pointsB=500,pointsS=1000,PasB=0.02,PasS=0.00275,nS=10,
+ nL=2,drawSelf,styleSpire=styleSpire,styleCourant=sensCourant}
+\newpsstyle{grille}{subgriddiv=0,gridcolor=blue!50,griddots=10}
+\newpsstyle{cadre}{linecolor=yellow!50}
+\begin{pspicture}(-7,-6)(7,6)
+\psmagneticfieldThreeD[linecolor={[HTML]{660066}}](-7,-6)(7,6)
+\end{pspicture}
+\end{postscript}
+\end{center}
+
+\begin{lstlisting}
\psset{unit=0.75cm,AntiHelmholtz,N=2,
R=2,pointsB=500,pointsS=1000,PasB=0.02,PasS=0.00275,nS=10,
nL=2,drawSelf,styleSpire=styleSpire,styleCourant=sensCourant}
@@ -277,7 +437,65 @@ Ce sont donc celles-ci qu'il faudra modifier si on souhaite en changer, comme da
\begin{pspicture}(-7,-6)(7,6)
\psmagneticfieldThreeD[linecolor={[HTML]{660066}}](-7,-6)(7,6)
\end{pspicture}
-\end{LTXexample}
+\end{lstlisting}
+
+\clearpage
+
+\section{Density plots}
+\begin{center}
+\begin{postscript}
+\begin{pspicture}(-6,-4)(6,4)
+\psmagneticfield[N=3,R=2,L=2,StreamDensityPlot](-6,-4)(6,4)
+\end{pspicture}
+\end{postscript}
+\end{center}
+
+\begin{lstlisting}
+\begin{pspicture}(-6,-4)(6,4)
+\psmagneticfield[N=3,R=2,L=2,StreamDensityPlot](-6,-4)(6,4)
+\end{pspicture}
+\end{lstlisting}
+
+\begin{center}
+\begin{postscript}
+\psset{unit=0.75}
+\begin{pspicture}(-6,-5)(6,5)
+\psmagneticfield[N=2,R=2,L=1,StreamDensityPlot,setgray](-6,-5)(6,5)
+\end{pspicture}
+\end{postscript}
+\end{center}
+
+\begin{lstlisting}
+\psset{unit=0.75}
+\begin{pspicture}(-6,-5)(6,5)
+\psmagneticfield[N=2,R=2,L=1,StreamDensityPlot,setgray](-6,-5)(6,5)
+\end{pspicture}
+\end{lstlisting}
+
+
+\begin{center}
+\begin{postscript}
+\psset{unit=0.75,AntiHelmholtz,
+ R=2,pointsB=500,pointsS=2000,PasB=0.02,PasS=0.00275,nS=10,
+ nL=2,drawSelf=true,styleSpire=styleSpire,styleCourant=sensCourant}
+\begin{pspicture*}(-7,-6)(7,6)
+\psmagneticfield[linecolor={[HTML]{660066}},StreamDensityPlot](-7,-6)(7,6)
+\end{pspicture*}
+\end{postscript}
+\end{center}
+
+
+\begin{lstlisting}
+\psset{unit=0.75,AntiHelmholtz,
+ R=2,pointsB=500,pointsS=2000,PasB=0.02,PasS=0.00275,nS=10,
+ nL=2,drawSelf=true,styleSpire=styleSpire,styleCourant=sensCourant}
+\begin{pspicture*}(-7,-6)(7,6)
+\psmagneticfield[linecolor={[HTML]{660066}},StreamDensityPlot](-7,-6)(7,6)
+\end{pspicture*}
+\end{lstlisting}
+
+
+
\clearpage
@@ -289,7 +507,7 @@ Ce sont donc celles-ci qu'il faudra modifier si on souhaite en changer, comme da
\bgroup
\raggedright
\bibliographystyle{plain}
-\bibliography{\jobname}
+\bibliography{pst-magneticfield-doc}
\egroup
diff --git a/Master/texmf-dist/dvips/pst-magneticfield/pst-magneticfield.pro b/Master/texmf-dist/dvips/pst-magneticfield/pst-magneticfield.pro
new file mode 100644
index 00000000000..fdd24b8217c
--- /dev/null
+++ b/Master/texmf-dist/dvips/pst-magneticfield/pst-magneticfield.pro
@@ -0,0 +1,303 @@
+%% $Id: pst-magneticfield.pro 339 2010-06-07 20:50:23Z herbert $
+%%
+%% This is file `pst-magneticfield.pro',
+%%
+%% IMPORTANT NOTICE:
+%%
+%% Package `pst-magneticfield.tex'
+%% Jürgen Gilg
+%% Manuel Luque
+%% Herbert Voss
+%%
+%% This program can be redistributed and/or modified under the terms
+%% of the LaTeX Project Public License Distributed from CTAN archives
+%% in directory macros/latex/base/lppl.txt.
+%%
+%% DESCRIPTION:
+%% `pst-magneticfield' is a PSTricks package to draw fields of Helmholtz coils
+%%
+%% version 0.01 / 2010-06-07 Herbert Voss <hvoss _at_ tug.org>
+%%
+%
+/tx@MFieldDict 60 dict def
+tx@MFieldDict begin
+%
+% helper functions
+/setpixel { 1 0 360 arc fill } bind def
+%
+/fleche {
+ gsave
+ x2 y2 moveto
+ y2 y1 sub x2 x1 sub atan rotate % 1 1 scale
+ -1 CLW mul 2 CLW mul rlineto
+ 7 CLW mul -2 CLW mul rlineto
+ -7 CLW mul -2 CLW mul rlineto
+ closepath
+ fill
+ grestore
+} def
+/Calcul_B_Spires {
+ /Bx 0 def
+ /By 0 def
+ 1 1 NombreSpires { % on calcule le champ resultant de toutes les spires
+ /iS ED % numero de la spire
+ /yi yA iS 1 sub inter mul sub def % position de la spire
+ /Bx0 {
+ /arz {1 Radius xP add dup mul yP yi add dup mul add sqrt div} def
+ yP yi add xP div arz mul
+ EllipticK neg
+ Radius dup mul xP dup mul add yP yi add dup mul add
+ Radius xP sub dup mul yP yi add dup mul add div
+ EllipticE mul
+ add
+ mul
+ } def
+ /By0 {
+ /arz {1 Radius xP add dup mul yP yi add dup mul add sqrt div} def
+ arz
+ EllipticK
+ Radius dup mul xP dup mul sub yP yi add dup mul sub
+ Radius xP sub dup mul yP yi add dup mul add div
+ EllipticE mul
+ add
+ mul
+ } def
+ AntiHelmholtz { iS 2 eq {/Bx0 Bx0 neg def /By0 By0 neg def} if } if
+ /Bx Bx Bx0 add def
+ /By By By0 add def
+ } for
+} def
+/EllipticKE{
+ /K {2 Radius xP mul sqrt mul arz mul} def
+ /m1 {1 K dup mul sub} def
+ /m2 {m1 dup mul} def
+ /m3 {m2 m1 mul} def
+ /m4 {m2 dup mul} def
+ /m_1 {1 m1 div} def
+ /EllipticK {
+ 0.5
+ 0.12498593597 m1 mul add
+ 0.06880248576 m2 mul add
+ 0.03328355376 m3 mul add
+ 0.00441787012 m4 mul add
+ m_1 ln mul
+ 1.38629436112 add
+ 0.09666344259 m1 mul add
+ 0.03590092383 m2 mul add
+ 0.03742563713 m3 mul add
+ 0.01451196212 m4 mul add
+ } def
+ /EllipticE {
+ 0.24998368310 m1 mul
+ 0.09200180037 m2 mul add
+ 0.04069697526 m3 mul add
+ 0.00526449639 m4 mul add
+ m_1 ln mul
+ 1 add
+ 0.44325141463 m1 mul add
+ 0.062606012206 m2 mul add
+ 0.04757383546 m3 mul add
+ 0.01736506451 m4 mul add
+ } def
+ Calcul_B_Spires
+% au point Pi
+ /xPi xP def
+ /yPi yP def
+ /NormeB Bx dup mul By dup mul add sqrt def
+ /dX Bx NormeB div Pas mul def
+ /dXi dX def
+ /dY By NormeB div Pas mul def
+ /dYi dY def
+ /xCi xPi dX add def
+ /yCi yPi dY add def
+ /xP xCi def
+ /yP yCi def
+ Calcul_B_Spires
+% au point C
+ /NormeB Bx dup mul By dup mul add sqrt def
+ /dX Bx NormeB div Pas mul def
+ /dY By NormeB div Pas mul def
+ /yP yPi dY dYi add 2 div add def
+} def
+%
+%0 0 translate
+%
+/setValues { % on stack +1 or -1
+ /yfactor ED /xfactor ED
+ Ligne_Champ dup length 1 sub 1.5 div cvi get aload pop
+ yfactor 0 gt {
+ /y2 exch yfactor mul def
+ /x2 exch xfactor mul def
+ }{
+ /y1 exch yfactor mul def
+ /x1 exch xfactor mul def
+ } ifelse
+ Ligne_Champ dup length 1 sub 1.5 div cvi 1 add get aload pop
+ yfactor 0 gt {
+ /y1 exch yfactor mul def
+ /x1 exch xfactor mul def
+ }{
+ /y2 exch yfactor mul def
+ /x2 exch xfactor mul def
+ } ifelse
+} def
+%
+/Lignes_Champ {
+ /Ligne_Champ [
+ NbrePoints {%
+ EllipticKE
+ [ xP yP yUnit mul exch xUnit mul exch ]
+ trace 1 eq {By 0 lt Bx 0 lt and {exit} if} if
+ AntiHelmholtz not { xP xMax ge yP yMax ge or {exit} if } if
+ } repeat
+ ] def
+%
+ Ligne_Champ 0 get aload pop moveto % xP yP
+ 1 1 Ligne_Champ length 1 sub {
+ /iCompteur exch def
+ Ligne_Champ iCompteur get aload pop lineto
+ } for
+ stroke
+% les flèches (xP,yP)
+ 1 1 setValues
+ nCount 0 eq {/yAxe1 y1 def /yAxe2 y2 def} if
+ fleche
+%
+ Ligne_Champ 0 get aload pop neg moveto % xP -yP
+ 1 1 Ligne_Champ length 1 sub {
+ /iCompteur ED
+ Ligne_Champ iCompteur get aload pop neg lineto
+ } for
+ stroke
+ trace 1 eq {
+% (xP,-yP)
+ 1 -1 setValues
+ fleche
+ } if
+ Ligne_Champ 0 get aload pop exch neg exch moveto % -xP yP
+ 1 1 Ligne_Champ length 1 sub {
+ /iCompteur ED
+ Ligne_Champ iCompteur get aload pop exch neg exch lineto
+ } for
+ stroke
+% (-xP,yP)
+ -1 1 setValues
+ fleche
+ Ligne_Champ 0 get aload pop exch neg exch neg moveto % -xP -yP
+ 1 1 Ligne_Champ length 1 sub {
+ /iCompteur ED
+ Ligne_Champ iCompteur get aload pop exch neg exch neg lineto
+ } for
+ stroke
+ trace 1 eq {
+% (-xP,-yP)
+ -1 -1 setValues
+ fleche
+ } if
+ } def
+%
+/MagneticField {
+StreamDensityPlot {
+ /Bmax 0 def
+ /Pas PasB def
+ % recherche du Bmax
+ AntiHelmholtz {
+ Radius 0.1 sub 0.1 Radius 1.5 mul {
+ /xP exch def
+ 0 0.1 yMax {
+ /yP exch def
+ EllipticKE
+ NormeB Bmax gt {/Bmax NormeB def} if
+ } for
+ }for
+ }{
+ 0.01 0.1 Radius 0.1 sub {
+ /xP exch def
+ 0 0.1 yMax {
+ /yP exch def
+ EllipticKE
+ NormeB Bmax gt {/Bmax NormeB def} if
+ } for
+ }for
+ } ifelse
+%/xP 0.001 def
+%/yP 0 def
+%EllipticKE
+%/Bmax NormeB def
+ /StepPixel
+ 1 Unit div store
+ gsave
+ 0.009 StepPixel xMax {
+ /xPos ED
+ /xP xPos def
+ 0.009 StepPixel yMax {
+ /yPos ED
+ /yP yPos def
+ EllipticKE
+ /HB NormeB Bmax div store
+ Setgray { /HB HB 25 mul round 25 div def } if % 25 niveaux de gris
+ xPos xUnit mul yPos yUnit mul
+ Setgray { HB setgray setpixel }{ HB 0.7 1 sethsbcolor setpixel } ifelse
+ xPos xUnit mul neg yPos yUnit mul
+ Setgray { HB setgray }{ HB 0.7 1 sethsbcolor } ifelse setpixel
+ xPos xUnit mul neg yPos yUnit mul neg
+ Setgray { HB setgray }{ HB 0.7 1 sethsbcolor } ifelse setpixel
+ xPos xUnit mul yPos yUnit mul neg
+ Setgray { HB setgray }{ HB 0.7 1 sethsbcolor } ifelse setpixel
+ } for
+ }for
+ grestore
+} if
+% lignes de champ de l'ensemble de la bobine
+ /trace 1 def
+ /nCount 0 def
+% 0.1 Radius mul StepLines Radius mul 0.9 Radius mul {
+ StepLines StepLines Radius 1.5 StepLines mul sub {
+ /NbrePoints NbrePointsB def
+ /xStart ED
+ /yStart 0 def
+ /Pas PasB def
+ /xP xStart def
+ /yP yStart Pas sub def
+ Lignes_Champ
+ /nCount nCount 1 add def
+ } for
+ AntiHelmholtz not {
+ % l'axe oriente de la bobine
+ 0 yMin yUnit mul moveto
+ 0 yMax yUnit mul lineto
+ stroke
+ /x1 0 def
+ /y1 yAxe1 def
+ /y2 yAxe2 def
+ /x2 0 def
+ fleche
+ %/x1 0 def
+ /y1 yAxe2 neg def
+ /y2 yAxe1 neg def
+ %/x2 0 def
+ fleche } if
+ % quelques lignes de champ autour de chaque spire
+ /trace 0 def
+ /increment 0.25 Radius mul def
+ AntiHelmholtz { /Pas PasS def /NbrePoints NbrePointsS def } if
+ nS { % nS lignes
+ 0 1 TS length 1 sub {
+ /nTemp ED
+ /iS TS nTemp get def % numero de la spire en partant du haut
+ iS 0 eq { /iS 1 def } if % iS ne peut pas = 0
+ iS NombreSpires gt { /iS NombreSpires def } if % iS ne peut pas > nbre spires
+ /yi yA iS 1 sub inter mul sub def % position du centre de la spire
+ AntiHelmholtz not { /NbrePoints NbrePointsS def /Pas PasS def } if
+ /xStart Radius increment add def
+ /yStart yi def
+ /xP xStart def
+ /yP yStart Pas sub def
+ Lignes_Champ
+ } for
+ AntiHelmholtz { /NbrePoints NbrePoints 750 add def } if
+ /increment increment 0.2 Radius mul add def
+ } repeat
+} def % /MagneticField
+end
+%%
diff --git a/Master/texmf-dist/source/generic/pst-magneticfield/Makefile b/Master/texmf-dist/source/generic/pst-magneticfield/Makefile
index 96b8b8a3ef4..5ab44b5e071 100644
--- a/Master/texmf-dist/source/generic/pst-magneticfield/Makefile
+++ b/Master/texmf-dist/source/generic/pst-magneticfield/Makefile
@@ -1,55 +1,70 @@
-# `Makefile' for `pst-magneticfield.pdf', hv, 2007/03/17
+# `Makefile' for `pst-magneticfield.pdf', Rolf Niepraschk, 2010/05/21
-.SUFFIXES : .tex .ltx .dvi .ps .pdf .eps
+.SUFFIXES : .tex .ltx .dvi .ps .pdf .eps .pro
PACKAGE = pst-magneticfield
+MAIN = $(PACKAGE)-doc
+LANGUAGES = FR
-MAIN = $(PACKAGE)-docFR
+empty=
+space=$(empty) $(empty)
+DOC_SOURCES = $(addprefix $(PACKAGE)-doc,$(LANGUAGES)$(space))
+DOC_SOURCES := $(addsuffix .tex, $(DOC_SOURCES))
+DOCS = $(DOC_SOURCES:.tex=.pdf)
TDS = ~/PSTricks/PSTricks-TDS
-LATEX = latex
+LATEX = pst2pdf
+PDFLATEX = pdflatex
+OPTIONS= --Iext=.png --Iscale=0.5 --DPI=150
-ARCHNAME = $(MAIN)-$(shell date +%y%m%d)
+ARCHNAME = $(PACKAGE)-$(shell date +%Y%m%d)
-ARCHFILES = $(PACKAGE).sty $(PACKAGE).tex $(PACKAGE).pro $(MAIN).tex README Changes Makefile
+#PRO = foo.pro
-all : doc clean tds
-doc: $(MAIN).pdf
+ARCHFILES = $(PACKAGE).sty $(PACKAGE).tex $(PACKAGE).pro $(DOC_SOURCES) \
+ README Changes Makefile
-$(MAIN).pdf : $(MAIN).ps
- GS_OPTIONS=-dAutoRotatePages=/None ps2pdf $<
+all : $(DOCS) clean
-$(MAIN).ps : $(MAIN).dvi
- dvips $<
+%.pdf : %.tex
+ $(LATEX) $(basename $<) $(OPTIONS)
+# makeindex -s gglo.ist -t $(basename $<)-pdf.glg -o $(basename $<)-pdf.gls $(basename $<)-pdf.glo
+ makeindex -s pst-doc.ist -t $(basename $<)-pdf.ilg -o $(basename $<)-pdf.ind $(basename $<)-pdf.idx
+ bibtex $(basename $<)-pdf
+ $(PDFLATEX) $(basename $<)-pdf
+ $(PDFLATEX) $(basename $<)-pdf
+ mv $(basename $<)-pdf.pdf $(basename $<).pdf
+ rm -f $(basename $<)-tmp.* $(basename $<)-pdf.*
-$(MAIN).dvi : $(MAIN).tex
- $(LATEX) $<
- $(LATEX) $<
- if ! test -f $(basename $<).glo ; then touch $(basename $<).glo; fi
- if ! test -f $(basename $<).idx ; then touch $(basename $<).idx; fi
- makeindex -t $(basename $<).ilg -s pst-doc.ist -o $(basename $<).ind $(basename $<).idx
- makeindex -s gglo.ist -t $(basename $<).glg -o $(basename $<).gls \
- $(basename $<).glo
- bibtex $(basename $<)
- $(LATEX) $<
- $(LATEX) $<
-
-clean :
- $(RM) $(addprefix $(MAIN), .log .aux .glg .glo .gls .ilg .idx .ind .tmp .toc .out .blg .bbl )
- $(RM) $(addprefix $(MAIN), .dvi .ps .xcp)
+clean :
+ $(RM) $(foreach i,$(DOC_SOURCES:.tex=),$(addprefix $i, \
+ .log .plog .preamble .aux .glg .glo .gls .ilg .idx .ind .tmp .toc .out .blg .bbl))
veryclean : clean
- $(RM) $(addprefix $(MAIN), .pdf .bbl .blg)
+ $(RM) $(foreach i,$(DOC_SOURCES:.tex=),$(addprefix $i, \
+ .pdf .bbl .blg))
arch :
zip $(ARCHNAME).zip $(ARCHFILES)
-tds:
+ifneq ($(strip $(PRO)),)
+installPRO :
+ @echo "Installiere PRO-Dateien ($(PRO))..."
+ cp -u Changes $(TDS)/dvips/$(PACKAGE)/
+ cp -u $(PACKAGE).pro $(TDS)/dvips/$(PACKAGE)/
+ cp -u $(PACKAGE).pro ~/Links/dvips-local/
+else
+installPRO :
+ @:
+endif
+
+tds : installPRO
+ @echo "Installiere TeX-Zeug..."
cp -u Changes $(TDS)/doc/generic/$(PACKAGE)/
cp -u README $(TDS)/doc/generic/$(PACKAGE)/
- cp -u $(MAIN).pdf $(TDS)/doc/generic/$(PACKAGE)/
+ cp -u *.pdf $(TDS)/doc/generic/$(PACKAGE)/
#
cp -u Changes $(TDS)/tex/latex/$(PACKAGE)/
cp -u $(PACKAGE).sty $(TDS)/tex/latex/$(PACKAGE)/
@@ -57,14 +72,12 @@ tds:
cp -u Changes $(TDS)/tex/generic/$(PACKAGE)/
cp -u $(PACKAGE).tex $(TDS)/tex/generic/$(PACKAGE)/
#
-# cp -u Changes $(TDS)/dvips/$(PACKAGE)/
-# cp -u $(PACKAGE).pro $(TDS)/dvips/$(PACKAGE)/
-# cp -u $(PACKAGE).pro ~/Links/dvips-local/
-#
cp -u Changes $(TDS)/source/$(PACKAGE)/
- cp -u $(MAIN).tex $(TDS)/source/$(PACKAGE)/
+ cp -u *-doc??.tex $(TDS)/source/$(PACKAGE)/
cp -u $(MAIN).bib $(TDS)/source/$(PACKAGE)/
cp -u Makefile $(TDS)/source/$(PACKAGE)/
+debug :
+ @echo $(DOC_SOURCES)
# EOF
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 5e18949bd2f..417a78dade5 100644
--- a/Master/texmf-dist/tex/generic/pst-magneticfield/pst-magneticfield.tex
+++ b/Master/texmf-dist/tex/generic/pst-magneticfield/pst-magneticfield.tex
@@ -1,6 +1,6 @@
%% Package `pst-magneticfield.tex'
%%
-%% Manuel Luque
+%% Manuel Luque
%% Jürgen Gilg
%% Herbert Voß
%%
@@ -20,14 +20,18 @@
\ifx\MultidoLoaded\endinput\else \input multido.tex\fi
\ifx\PSTXKeyLoaded\endinput\else \input pst-xkey \fi
%
-\def\fileversion{1.11}
-\def\filedate{2010/05/16}
+\def\fileversion{1.12}
+\def\filedate{2010/06/07}
\message{`pst-magneticfield' v\fileversion, \filedate\space (ml,jg,hv)}
%
\edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax
%
\SpecialCoor
\pst@addfams{pst-magneticfield}
+
+%% prologue for postcript
+\pstheader{pst-magneticfield.pro}%
+
% the first three parameter cannot be read with \pst@getint, because \pstFP.. do not like
% the values ... used in \psmagenticfieldThreeD
\define@key[psset]{pst-magneticfield}{R}[1]{\def\psk@magneticfieldR{#1}}% rayon d'une spire
@@ -46,272 +50,73 @@
%
\newpsstyle{styleSpire}{linecap=1,linecolor=red,linewidth=2\pslinewidth}
\newpsstyle{sensCourant}{linecolor=red,linewidth=2\pslinewidth,arrowinset=0.1}
-\newpsstyle{grille}{subgriddiv=0,gridcolor=lightgray,griddots=10}
-\newpsstyle{cadre}{linecolor=green!20}
%
\define@boolkey[psset]{pst-magneticfield}[Pst@]{drawSelf}[true]{}
\define@boolkey[psset]{pst-magneticfield}[Pst@]{AntiHelmholtz}[true]{}
+\define@boolkey[psset]{pst-magneticfield}[Pst@]{StreamDensityPlot}[true]{}
+\define@boolkey[psset]{pst-magneticfield}[Pst@]{setgray}[true]{}
%
\psset[pst-magneticfield]{R=1,L=4,N=6,pointsB=500,pointsS=1000,
PasB=0.02,PasS=0.00275,nS=1,nL=8,drawSelf,styleSpire=styleSpire,
- styleCourant=sensCourant,AntiHelmholtz=false}
+ styleCourant=sensCourant,AntiHelmholtz=false,StreamDensityPlot=false,setgray=false}
+%
+\def\tx@MFieldDict{ tx@MFieldDict begin }
%
\def\psmagneticfield{\pst@object{psmagneticfield}}
-\def\psmagneticfield@i{%
+\def\psmagneticfield@i{\@ifnextchar({\psmagneticfield@ii}{\psmagneticfield@iii(-6,-5)(6,5)}}
+\def\psmagneticfield@ii(#1,#2){\@ifnextchar({\psmagneticfield@iii(#1,#2)}{\psmagneticfield@iii(#1,#2)(6,5)}}
+\def\psmagneticfield@iii(#1,#2)(#3,#4){%
\pst@killglue%
- \ifPst@AntiHelmholtz\addbefore@par{N=2}\fi
+ \ifPst@AntiHelmholtz\addto@par{N=2}\fi
\begin@SpecialObj%
\pst@Verb{% make it global
/NombreSpires \psk@magneticfieldN\space def
/Radius \psk@magneticfieldR\space def
/nombreLignes \psk@magneticfieldNL\space def
/TableauSpires [\psk@magneticfieldChoixSpires] def
+ /StepLines Radius nombreLignes 1 add div def
+ NombreSpires 1 eq
+ { /Longueur 0 def
+ /inter 0 def }
+ { /Longueur \psk@magneticfieldL\space def
+ /inter Longueur NombreSpires 1 sub div def } ifelse % intervalle entre 2 spires
\ifPst@AntiHelmholtz
+ /AntiHelmholtz true def
TableauSpires length 0 eq {/TS [1 2] def}
{/TS TableauSpires def } ifelse
+ /inter Radius def
+ /yA Radius 2 div def
\else
+ /AntiHelmholtz false def
TableauSpires length 0 eq {/TS [1 1 NombreSpires {} for] def}
{/TS TableauSpires def } ifelse
+ /yA Longueur 2 div def
\fi
- /StepLines Radius nombreLignes 1 add div def
- NombreSpires 1 eq
- { /Longueur 0 def
- /inter 0 def }
- { /Longueur \psk@magneticfieldL\space def
- /inter Longueur NombreSpires 1 sub div def } ifelse % intervalle entre 2 spires
/NbrePointsB \psk@magneticfieldB\space def
/NbrePointsS \psk@magneticfieldS\space def
- \ifPst@AntiHelmholtz
- /inter Radius def
- /yA Radius 2 div def
- \else
- /yA Longueur 2 div def
- \fi
/PasB \psk@magneticfieldPasB\space def
/PasS \psk@magneticfieldPasS\space def
- /nS \psk@magneticfieldNS\space def
- }%
- \addto@pscode{
- /fleche {
- gsave
- x2 y2 moveto
- y2 y1 sub x2 x1 sub atan rotate % 1 1 scale
- -1 CLW mul 2 CLW mul rlineto
- 7 CLW mul -2 CLW mul rlineto
- -7 CLW mul -2 CLW mul rlineto
- closepath
- fill
- grestore
- } def
- /Calcul_B_Spires {
- /Bx 0 def
- /By 0 def
- 1 1 NombreSpires { % on calcule le champ resultant de toutes les spires
- /iS ED % numero de la spire
- /yi yA iS 1 sub inter mul sub def % position de la spire
- /Bx0 {
- /arz {1 Radius xP add dup mul yP yi add dup mul add sqrt div} def
- yP yi add xP div arz mul
- EllipticK neg
- Radius dup mul xP dup mul add yP yi add dup mul add
- Radius xP sub dup mul yP yi add dup mul add div
- EllipticE mul
- add
- mul
- } def
- /By0 {
- /arz {1 Radius xP add dup mul yP yi add dup mul add sqrt div} def
- arz
- EllipticK
- Radius dup mul xP dup mul sub yP yi add dup mul sub
- Radius xP sub dup mul yP yi add dup mul add div
- EllipticE mul
- add
- mul
- } def
- \ifPst@AntiHelmholtz
- iS 2 eq {/Bx0 Bx0 neg def /By0 By0 neg def} if
- \fi
- /Bx Bx Bx0 add def
- /By By By0 add def
- } for
- } def
- /EllipticKE{
- /K {2 Radius xP mul sqrt mul arz mul} def
- /m1 {1 K dup mul sub} def
- /m2 {m1 dup mul} def
- /m3 {m2 m1 mul} def
- /m4 {m2 dup mul} def
- /m_1 {1 m1 div} def
- /EllipticK {
- 0.5
- 0.12498593597 m1 mul add
- 0.06880248576 m2 mul add
- 0.03328355376 m3 mul add
- 0.00441787012 m4 mul add
- m_1 ln mul
- 1.38629436112 add
- 0.09666344259 m1 mul add
- 0.03590092383 m2 mul add
- 0.03742563713 m3 mul add
- 0.01451196212 m4 mul add
- } def
- /EllipticE {
- 0.24998368310 m1 mul
- 0.09200180037 m2 mul add
- 0.04069697526 m3 mul add
- 0.00526449639 m4 mul add
- m_1 ln mul
- 1 add
- 0.44325141463 m1 mul add
- 0.062606012206 m2 mul add
- 0.04757383546 m3 mul add
- 0.01736506451 m4 mul add
- } def
- Calcul_B_Spires
-% au point Pi
- /xPi xP def
- /yPi yP def
- /NormeB Bx dup mul By dup mul add sqrt def
- /dX Bx NormeB div Pas mul def
- /dXi dX def
- /dY By NormeB div Pas mul def
- /dYi dY def
- /xCi xPi dX add def
- /yCi yPi dY add def
- /xP xCi def
- /yP yCi def
- Calcul_B_Spires
-% au point C
- /NormeB Bx dup mul By dup mul add sqrt def
- /dX Bx NormeB div Pas mul def
- /dY By NormeB div Pas mul def
- /yP yPi dY dYi add 2 div add def
- } def
-%
- 0 0 translate
- /Lignes_Champ {
- /Ligne_Champ [
- NbrePoints {%
- EllipticKE
- [ xP yP \tx@ScreenCoor ]
- trace 1 eq {By 0 lt Bx 0 lt and {exit} if} if
- } repeat
- ] def
-%
- Ligne_Champ 0 get aload pop moveto % xP yP
- 1 1 Ligne_Champ length 1 sub {
- /iCompteur exch def
- Ligne_Champ iCompteur get aload pop lineto
- } for
- stroke
-% les flèches (xP,yP)
- Ligne_Champ dup length 1 sub 3 div cvi get aload pop /y1 exch def /x1 exch def
- Ligne_Champ dup length 1 sub 3 div cvi 1 add get aload pop /y2 exch def /x2 exch def
- nCount 0 eq {/yAxe1 y1 def /yAxe2 y2 def} if
- fleche
-%
- Ligne_Champ 0 get aload pop neg moveto % xP -yP
- 1 1 Ligne_Champ length 1 sub {
- /iCompteur ED
- Ligne_Champ iCompteur get aload pop neg lineto
- } for
- stroke
- trace 1 eq {
-% (xP,-yP)
- Ligne_Champ dup length 1 sub 3 div cvi get aload pop /y2 exch neg def /x2 ED
- Ligne_Champ dup length 1 sub 3 div cvi 1 add get aload pop /y1 exch neg def /x1 ED
- fleche
- } if
- Ligne_Champ 0 get aload pop exch neg exch moveto % -xP yP
- 1 1 Ligne_Champ length 1 sub {
- /iCompteur ED
- Ligne_Champ iCompteur get aload pop exch neg exch lineto
- } for
- stroke
-% (-xP,yP)
- Ligne_Champ dup length 1 sub 3 div cvi get aload pop /y1 exch def /x1 exch neg def
- Ligne_Champ dup length 1 sub 3 div cvi 1 add get aload pop /y2 exch def /x2 exch neg def
- fleche
- Ligne_Champ 0 get aload pop exch neg exch neg moveto % -xP -yP
- 1 1 Ligne_Champ length 1 sub {
- /iCompteur ED
- Ligne_Champ iCompteur get aload pop exch neg exch neg lineto
- } for
- stroke
- trace 1 eq {
-% (-xP,-yP)
- Ligne_Champ dup length 1 sub 3 div cvi get aload pop /y2 exch neg def /x2 exch neg def
- Ligne_Champ dup length 1 sub 3 div cvi 1 add get aload pop /y1 exch neg def /x1 exch neg def
- fleche
- } if
- } def
-%
-% lignes de champ de l'ensemble de la bobine
- /trace 1 def
- /nCount 0 def
-% 0.1 Radius mul StepLines Radius mul 0.9 Radius mul {
- StepLines StepLines Radius 1.5 StepLines mul sub {
- /NbrePoints NbrePointsB def
- /xStart ED
- /yStart 0 def
- /Pas PasB def
- /xP xStart def
- /yP yStart Pas sub def
- Lignes_Champ
- /nCount nCount 1 add def
- } for
- \ifPst@AntiHelmholtz\else
- % l'axe orienté de la bobine
- 0 -10 \tx@ScreenCoor moveto
- 0 10 \tx@ScreenCoor lineto
- stroke
- /x1 0 def
- /y1 yAxe1 def
- /y2 yAxe2 def
- /x2 0 def
- fleche
- %/x1 0 def
- /y1 yAxe2 neg def
- /y2 yAxe1 neg def
- %/x2 0 def
- fleche
- \fi
- % quelques lignes de champ autour de chaque spire
- /trace 0 def
- /increment 0.25 Radius mul def
- \ifPst@AntiHelmholtz
- /Pas PasS def
- /NbrePoints NbrePointsS def
- \fi
- nS { % nS lignes
- 0 1 TS length 1 sub {
- /nTemp ED
- /iS TS nTemp get def % numero de la spire en partant du haut
- iS 0 eq { /iS 1 def } if % iS ne peut pas = 0
- iS NombreSpires gt { /iS NombreSpires def } if % iS ne peut pas > nbre spires
- /yi yA iS 1 sub inter mul sub def % position du centre de la spire
- \ifPst@AntiHelmholtz\else
- /NbrePoints NbrePointsS def
- /Pas PasS def
- \fi
- /xStart Radius increment add def
- /yStart yi def
- /xP xStart def
- /yP yStart Pas sub def
- Lignes_Champ
- } for
- \ifPst@AntiHelmholtz /NbrePoints NbrePoints 750 add def \fi
- /increment increment 0.2 Radius mul add def
- } repeat
+ /nS \psk@magneticfieldNS\space def
+% pour la carte de densite
+ /xMin #1 def
+ /xMax #3 def
+ % NombreSpires 1 eq {/yMax 2 Radius mul def}{/yMax Longueur 2 mul def} ifelse
+ /yMax #4 def
+ /yMin #2 def
+ /Unit \pst@number\psunit def
+ /xUnit \pst@number\psxunit def
+ /yUnit \pst@number\psyunit def
+ /StreamDensityPlot \ifPst@StreamDensityPlot true \else false \fi def
+ /Setgray \ifPst@setgray true \else false \fi def
}%
+ \addto@pscode{ \tx@MFieldDict MagneticField end}
\ifPst@drawSelf
\ifPst@AntiHelmholtz
\psline[style=\psk@styleSpire](!Radius neg Radius 2 div)(!Radius Radius 2 div)
\psline[style=\psk@styleCourant]{<-}(!-0.2 Radius 2 div)(!0.2 Radius 2 div)
\psline[style=\psk@styleSpire](!Radius neg Radius 2 div neg)(!Radius Radius 2 div neg)
\psline[style=\psk@styleCourant]{->}(!-0.2 Radius 2 div neg)(!0.2 Radius 2 div neg)
- \else
+ \else
\multido{\i=1+1}{\psk@magneticfieldN}{% numero de la spire
\pst@Verb{ /Yspire yA \i\space 1 sub inter mul sub def } % position de la spire
\psline[style=\psk@styleSpire](! Radius neg Yspire)(! Radius Yspire)
@@ -321,36 +126,32 @@
\end@SpecialObj%
\ignorespaces}
%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%\psmagneticfieldThreeD%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\newpsstyle{grille}{subgriddiv=0,gridcolor=lightgray,griddots=10}
+\newpsstyle{cadre}{linecolor=green!20}
%
\def\psmagneticfieldThreeD{\pst@object{psmagneticfieldThreeD}}
\def\psmagneticfieldThreeD@i(#1,#2)(#3,#4){%
- \ifPst@AntiHelmholtz\addbefore@par{N=2}\fi
+ \ifPst@AntiHelmholtz\addto@par{N=2}\fi
\begingroup
\use@par
\ifPst@AntiHelmholtz
- \ThreeDput{%
- \psframe*[style=cadre](#1,#2)(#3,#4)
- \psgrid[style=grille](#1,#2)(#3,#4)}
\pstFPdiv\yA{\psk@magneticfieldR}{2}
- \ThreeDput[normal=0 1 0](0,\yA,0){%
- \psarc[linecolor=red,linewidth=1\pslinewidth,linestyle=dashed](0,0){\psk@magneticfieldR}{180}{360}}
- \ThreeDput[normal=0 1 0](0,-\yA,0){%
- \psarc[linecolor=red,linewidth=1\pslinewidth,linestyle=dashed](0,0){\psk@magneticfieldR}{180}{360}}
\ThreeDput{%
\begin{psclip}{\psframe(#1,#2)(#3,#4)}
- \psmagneticfield[drawSelf=false]%
+ \psframe*[style=cadre](#1,#2)(#3,#4)
+ \psgrid[style=grille](#1,#2)(#3,#4)
+ \psmagneticfield[drawSelf=false](#1,#2)(#3,#4)%
\end{psclip}}
\ThreeDput[normal=0 1 0](0,\yA,0){%
\psarc[linecolor=red,linewidth=3\pslinewidth](0,0){\psk@magneticfieldR}{0}{180}
- \psarc[linecolor=red,linewidth=3\pslinewidth]{<-}(0,0){\psk@magneticfieldR}{80}{90}}
- \ThreeDput[normal=0 1 0](0,-\yA,0){%
+ \psarc[linecolor=red,linewidth=3\pslinewidth]{<-}(0,0){\psk@magneticfieldR}{80}{90}
+ \psarc[linecolor=red,linewidth=1\pslinewidth,linestyle=dashed](0,0){\psk@magneticfieldR}{180}{360}}
+ \ThreeDput[normal=0 1 0](0,-\yA,0){%
\psarc[linecolor=red,linewidth=3\pslinewidth](0,0){\psk@magneticfieldR}{0}{180}
- \psarc[linecolor=red,linewidth=3\pslinewidth]{->}(0,0){\psk@magneticfieldR}{80}{90}}
+ \psarc[linecolor=red,linewidth=3\pslinewidth]{->}(0,0){\psk@magneticfieldR}{80}{90}
+ \psarc[linecolor=red,linewidth=1\pslinewidth,linestyle=dashed](0,0){\psk@magneticfieldR}{180}{360}}
\else
- \ifnum\psk@magneticfieldN=1
+ \ifnum\psk@magneticfieldN=1
\def\MF@inter{0}
\def\yA{0}
\else
@@ -359,24 +160,18 @@
\pstFPdiv\yA{\psk@magneticfieldL}{2}
\fi
\ThreeDput{%
- \psframe*[style=cadre](#1,#2)(#3,#4)
- \psgrid[style=grille](#1,#2)(#3,#4)}
- \multido{\iN=1+1,\iS=0+1}{\psk@magneticfieldN}{%
- \pstFPmul\MF@calcA{\iS}{\MF@inter}
- \pstFPsub\posSpire{\yA}{\MF@calcA}
- \ThreeDput[normal=0 1 0](0,\posSpire,0){%
- \psarc[linecolor=red,linewidth=1\pslinewidth,linestyle=dashed](0,0){\psk@magneticfieldR}{180}{360}}
- }%
- \ThreeDput{%
\begin{psclip}{\psframe(#1,#2)(#3,#4)}
- \psmagneticfield[drawSelf=false]%
+ \psframe*[style=cadre](#1,#2)(#3,#4)
+ \psgrid[style=grille](#1,#2)(#3,#4)
+ \psmagneticfield[drawSelf=false](#1,#2)(#3,#4)%
\end{psclip}}
\multido{\iN=1+1,\iS=0+1}{\psk@magneticfieldN}{%
\pstFPmul\MF@calcA{\iS}{\MF@inter}
\pstFPsub\posSpire{\yA}{\MF@calcA}
\ThreeDput[normal=0 1 0](0,\posSpire,0){%
- \psarc[linecolor=red,linewidth=3\pslinewidth](0,0){\psk@magneticfieldR}{0}{180}
- \psarc[linecolor=red,linewidth=3\pslinewidth]{->}(0,0){\psk@magneticfieldR}{80}{90}}
+ \psarc[style=\psk@styleSpire](0,0){\psk@magneticfieldR}{0}{180}
+ \psarc[style=\psk@styleCourant]{->}(0,0){\psk@magneticfieldR}{80}{90}
+ \psarc[style=\psk@styleSpire,linestyle=dashed](0,0){\psk@magneticfieldR}{180}{360}}%
}%
\fi
\endgroup}
@@ -384,5 +179,5 @@
\catcode`\@=\PstAtCode\relax
%
%% END
-\endinput
+\endinput