summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-09-20 23:36:00 +0000
committerKarl Berry <karl@freefriends.org>2010-09-20 23:36:00 +0000
commit84b35af663e689263e8d998df16e4a453a847c8e (patch)
tree3b411accb231e139e498a478b7416fcdad90efcb
parenta358fa9d16837cb01f6a4af05315484516597575 (diff)
pst-circ update (20sep10)
git-svn-id: svn://tug.org/texlive/trunk@19829 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/generic/pst-circ/Changes1
-rw-r--r--Master/texmf-dist/doc/generic/pst-circ/more_docs/dtk03-3.pdf (renamed from Master/texmf-dist/doc/generic/pst-circ/more_docs/dtk.pdf)bin184964 -> 184964 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.pdfbin515816 -> 519442 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.tex12
-rw-r--r--Master/texmf-dist/tex/generic/pst-circ/pst-circ.tex13
5 files changed, 20 insertions, 6 deletions
diff --git a/Master/texmf-dist/doc/generic/pst-circ/Changes b/Master/texmf-dist/doc/generic/pst-circ/Changes
index 0172eedfe8d..ed101279a1a 100644
--- a/Master/texmf-dist/doc/generic/pst-circ/Changes
+++ b/Master/texmf-dist/doc/generic/pst-circ/Changes
@@ -1,3 +1,4 @@
+1.56 2010-09-18 - fixed bug with \circledipole
1.55 2010-08-15 - circledipole with variable radius
- added macro \newCircDipole (cb)
1.54 2010-03-29 - fix bug in \Transformer
diff --git a/Master/texmf-dist/doc/generic/pst-circ/more_docs/dtk.pdf b/Master/texmf-dist/doc/generic/pst-circ/more_docs/dtk03-3.pdf
index f7c32c043e3..f7c32c043e3 100644
--- a/Master/texmf-dist/doc/generic/pst-circ/more_docs/dtk.pdf
+++ b/Master/texmf-dist/doc/generic/pst-circ/more_docs/dtk03-3.pdf
Binary files differ
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 862f71fcdae..65531aa9259 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
Binary files differ
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 da0d6b4cb95..087cea443b4 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
@@ -1638,6 +1638,18 @@ The following example was written by Christian Hoffmann.
\end{LTXexample}
+Variable radius for \xLcs{circledipole}
+
+\begin{LTXexample}[pos=t]
+\begin{pspicture}(8,5)
+\circledipole(0,1)(3,1){}
+\pnode(4,1){A}\pnode(7,1){B}
+\circledipole[radius=7mm,labeloffset=1cm](A)(B){Strommesser}\rput(5.5,1){\Huge I}
+\circledipole[radius=4mm,fillstyle=solid,fillcolor=blue!30](0,3)(3,3){C}
+\end{pspicture}
+\end{LTXexample}
+
+
\clearpage
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 73d5545608c..75d725f2eda 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.55}
-\def\filedate{2010/08/15}
+\def\fileversion{1.56}
+\def\filedate{2010/09/18}
\message{`pst-circ' v\fileversion (CJ,hv,pd)}
%
\edef\PstAtCode{\the\catcode`\@}
@@ -208,6 +208,7 @@
logicLabelstyle=\small, logicSymbolstyle=\large,
logicSymbolpos=0.5,logicNodestyle=\footnotesize
}% hv
+%\psset[pstricks]{radius=0.5}
%
\newpsstyle{baseOpt}{circedge=\pcline,arrows=-,arm=.5,angleA=0,angleB=180}
@@ -259,7 +260,7 @@
\newCircDipole{diode}
\newCircDipole{Zener}
\newCircDipole{lamp}
-\newCircDipole{circledipole}
+\newCircDipole[radius=0.5]{circledipole}
\newCircDipole{LED}
\newCircDipole[radius=2pt]{OpenDipol}
\newCircDipole[radius=2pt]{OpenTripol}
@@ -1258,9 +1259,9 @@
}
%
\def\pst@draw@circledipole{%
- \pscircle[linewidth=1.5\pslinewidth]{0.5}
- \pnode(-0.5,0){dipole@1}
- \pnode(0.5,0){dipole@2}
+ \pscircle[linewidth=1.5\pslinewidth]{\psk@radius}
+ \pnode(-\psk@radius,0){dipole@1}
+ \pnode(\psk@radius,0){dipole@2}
}
%
\def\pst@draw@LED{%