pst-circ 1.51 (23feb09)

git-svn-id: svn://tug.org/texlive/trunk@12220 c570f23f-e606-0410-a88d-b1316a301751

5 files changed, 55 insertions, 6 deletions

diff --git a/Master/texmf-dist/doc/generic/pst-circ/Changes b/Master/texmf-dist/doc/generic/pst-circ/Changes
index 9761c52a5f2..a89f6d49004 100644
--- a/Master/texmf-dist/doc/generic/pst-circ/Changes
+++ b/Master/texmf-dist/doc/generic/pst-circ/Changes
@@ -1,3 +1,4 @@
+1.51 2009-02-21 - add SQUID symbol
 1.50 2009-02-01 - add RFLine symbol
                 - internal changes to the code
                 - make all microwave symbols work with
diff --git a/Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.pdf b/Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.pdf
index 16a79365bc4..9a7bd221d6e 100644
--- a/Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.pdf
+++ b/Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.pdf
diff --git a/Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.tex b/Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.tex
index 680995da294..144df1a3960 100644
--- a/Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.tex
+++ b/Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.tex
@@ -1,4 +1,4 @@
-%% $Id: pst-circ-doc.tex 91 2009-02-01 15:51:45Z herbert $
+%% $Id: pst-circ-doc.tex 96 2009-02-21 09:18:47Z herbert $
 \documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings
     headexclude,footexclude,oneside]{pst-doc}
 \usepackage[utf8]{inputenc}
@@ -53,6 +53,7 @@ Thanks to: \\
 \mbox{Fran\c{c}ois Boone}, 
     \mbox{Jean-C\^ome Charpentier},
     \mbox{Patrick Drechsler},
+    \mbox{Amit Finkler},
     \mbox{Henning Heinze},
     \mbox{Manuel Luque}, 
     \mbox{Ted Pavlic}, 
@@ -261,6 +262,14 @@ objects you are drawing. You'll find a list in Section~\ref{sec:para} on p.~\pag
 \end{pspicture}
 \end{LTXexample}
 
+\begin{LTXexample}[width=3.5cm]
+\begin{pspicture}(3,2)
+  \pnode(0,1){A}
+  \pnode(3,1){B}
+  \SQUID(A)(B){S}
+\end{pspicture}
+\end{LTXexample}
+
 \bigskip
 \subsubsection{Tripole macros}
 
diff --git a/Master/texmf-dist/tex/generic/pst-circ/pst-circ.tex b/Master/texmf-dist/tex/generic/pst-circ/pst-circ.tex
index aef09754ac7..e3977b6e1cd 100644
--- a/Master/texmf-dist/tex/generic/pst-circ/pst-circ.tex
+++ b/Master/texmf-dist/tex/generic/pst-circ/pst-circ.tex
@@ -29,8 +29,8 @@
 \ifx\PSTXKeyLoaded\endinput\else\input pst-xkey \fi
 \ifx\PSTMultidoLoaded\endinput\else\input multido.tex\fi
 %
-\def\fileversion{1.50}
-\def\filedate{2009/01/18}
+\def\fileversion{1.51}
+\def\filedate{2009/02/20}
 \message{`pst-circ' v\fileversion (CJ,hv,pd)}
 %
 \edef\PstAtCode{\the\catcode`\@}
@@ -692,6 +692,43 @@
 %
 % end hv 2003-08-29
 %
+%% SQUID def added 2009-02-18 Amit Finkler
+\def\SQUID{\@ifnextchar[{\pst@SQUID}{\pst@SQUID[]}}
+\def\pst@SQUID[#1](#2)(#3)#4{{%
+  \pst@draw@dipole{#1}{#2}{#3}{#4}\pst@draw@SQUID}\ignorespaces}
+%
+\def\pst@multidipole@SQUID{\@ifnextchar[{\pst@multidipole@SQUID@}{\pst@multidipole@SQUID@[]}}
+%
+\def\pst@multidipole@SQUID@[#1]#2{%
+  \expandafter\def\csname pst@circ@tmp@\number\pst@circ@count@iii\endcsname{#2}%
+  {\psset{#1}%
+  \ifPst@circ@parallel\aftergroup\advance\aftergroup\pst@circ@count@i\aftergroup\
+     m@ne\fi}%
+  \pst@circ@count@ii=\pst@circ@count@i%
+  \advance\pst@circ@count@ii\@ne%
+  \toks0\expandafter{\pst@multidipole@output}%
+  \edef\pst@multidipole@output{%
+    \the\toks0%
+    \pst@multidipole@def@coor%
+    \noexpand\SQUID[#1]%
+  (! X@\the\pst@circ@count@i\space Y@\the\pst@circ@count@i)%
+  (! X@\the\pst@circ@count@ii\space Y@\the\pst@circ@count@ii)%
+      {\noexpand\csname pst@circ@tmp@\number\pst@circ@count@iii\endcsname}%
+  }%
+  \pst@multidipole@}
+%
+\def\pst@draw@SQUID{%
+  \pscircle[linewidth=1.5\pslinewidth](0,0){0.5}
+  \psline(0.1,-0.6)(-0.1,-0.4)
+  \psline(0.1,-0.4)(-0.1,-0.6)
+  \psline(0.1,0.6)(-0.1,0.4)
+  \psline(0.1,0.4)(-0.1,0.6)
+  \pnode(-0.5,0){dipole@1}
+  \pnode(0.5,0){dipole@2}%
+}
+%% End of SQUID def
+
+%
 %%%%%%%%%%%%%
 \def\multidipole{\@ifnextchar[{\pst@multidipole}{\pst@multidipole[]}}
 \def\pst@multidipole[#1](#2)(#3)#4{%
@@ -737,10 +774,11 @@
   \else\ifx\vco         #4\let\pscirc@next\pst@multidipole@vco %   	20
   \else\ifx\amplifier   #4\let\pscirc@next\pst@multidipole@amplifier%   
   \else\ifx\detector    #4\let\pscirc@next\pst@multidipole@detector%   22
+  \else\ifx\SQUID       #4\let\pscirc@next\pst@multidipole@SQUID%   23
   \else\let\pscirc@next\ignorespaces
   \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi% 1..10
   \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi%11..20 
-  \fi\fi%			 21..22
+  \fi\fi\fi%			 21..23
   \advance\pst@count@i\@ne
   \advance\pst@count@iii\@ne
   \pscirc@next}
@@ -768,10 +806,11 @@
   \else\ifx\vco      #1\let\pscirc@next\pst@multidipole@vco %   	20
   \else\ifx\amplifier#1\let\pscirc@next\pst@multidipole@amplifier%   
   \else\ifx\detector #1\let\pscirc@next\pst@multidipole@detector%   22
+  \else\ifx\SQUID    #1\let\pscirc@next\pst@multidipole@SQUID%   23
   \else\let\pscirc@next\ignorespaces\pst@multidipole@output
   \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi
   \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi
-  \fi\fi
+  \fi\fi\fi
   \advance\pst@count@i\@ne
   \advance\pst@count@iii\@ne
   \pscirc@next
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index 27c1902bc83..d8e3181d7b7 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -215,7 +215,7 @@ my @WorkingTLP = qw(
 	  tamethebeast tdclock tdsfrmath
           ted templates-fenn templates-sommer tengwarscript
           tensor termcal termlist teubner tex-ewd tex-gyre texcount
-          texilikecover texloganalyzer texmate texments
+          texilikecover texloganalyser texmate texments
           texpower texshade
           textcase textfit textopo textpath textpos
           theoremref thesis-titlepage-fhac