summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-07-23 22:05:08 +0000
committerKarl Berry <karl@freefriends.org>2014-07-23 22:05:08 +0000
commitad32167044ecf7374eaa397a2bc8f1b142f34c5c (patch)
treebd7f4247978534454d13f099f822b1048f3547c4 /Master
parentf3e14f60640da99c60f8a344d2ce48d6cab12b8c (diff)
pstricks-add (22jul14)
git-svn-id: svn://tug.org/texlive/trunk@34702 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/generic/pstricks-add/Changes4
-rw-r--r--Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.pdfbin5116132 -> 5129927 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.tex56
-rw-r--r--Master/texmf-dist/dvips/pstricks-add/pstricks-add.pro2
-rw-r--r--Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex10
-rw-r--r--Master/texmf-dist/tex/latex/pstricks-add/pstricks-add.sty2
6 files changed, 65 insertions, 9 deletions
diff --git a/Master/texmf-dist/doc/generic/pstricks-add/Changes b/Master/texmf-dist/doc/generic/pstricks-add/Changes
index 2426c7bd2d0..0eb8b8ca235 100644
--- a/Master/texmf-dist/doc/generic/pstricks-add/Changes
+++ b/Master/texmf-dist/doc/generic/pstricks-add/Changes
@@ -1,4 +1,4 @@
-%% $Id: Changes 932 2014-07-10 19:59:36Z herbert $
+%% $Id: Changes 37 2014-07-22 13:52:12Z herbert $
%%
pstricks-add.pro -----------
0.23 2009-12-17 - add RGBtoGRAY and WavelengthToGRAY
@@ -39,6 +39,8 @@ pstricks-add.sty ----------- (hv)
pstricks-add.tex ----------- (hv)
+ v 3.75 2014-07-22 - use \pcline instead of \psline for \psRelLine
+ and \psParallelLine
v 3.74 2014-07-15 - Allow a node as a startpoint for \psVector
v 3.73 2014-06-16 - enable \ncput et al for \psVector
v 3.72 2014-06-12 - allow multiple coors for \psVector
diff --git a/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.pdf b/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.pdf
index d6c13d48ecb..a2a1a744531 100644
--- a/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.pdf
+++ b/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.tex b/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.tex
index ae7e83a0114..f45535b555e 100644
--- a/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.tex
+++ b/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.tex
@@ -1,4 +1,4 @@
-%% $Id: pstricks-add-doc.tex 933 2014-07-11 19:23:25Z herbert $
+%% $Id: pstricks-add-doc.tex 37 2014-07-22 13:52:12Z herbert $
\documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings
headexclude,footexclude,oneside]{pst-doc}
\listfiles
@@ -1402,6 +1402,59 @@ of the special PostScript characters.
\end{pspicture*}
\end{LTXexample}
+the following example was created by Patrice Mégret.
+
+
+\newcommand\pmsc[1]{\ensuremath{\underline{#1}}}
+\newcommand\pmIc{\pmsc{I}}
+\newcommand\pmUc{\pmsc{U}}
+\newcommand\pmEc{\pmsc{E}}
+\begin{pspicture}[showgrid=true](-5,-5)(5,8)
+\psStartPoint[I](0,0)
+\psVector[linewidth=1.5pt,linecolor=red](1.5;235)\ncput*{$\pmIc_2$}%I_2
+\psStartPoint[U](0,0)
+\psVector[linewidth=1.5pt](2;90)\ncput*{$\pmUc_2$}%U_2
+\psParallelLine[linewidth=1.5pt,arrows=->](0,0)(I1)(U1){-0.3}{NUa}\nbput{\tiny $-R_2\pmIc_2$}%-R_2.I_2
+\psRelLine[linewidth=1.5pt,arrows=->,angle=90](NUa)(U1){-5}{NUb}\nbput{\tiny $-j\omega L_{\sigma2}\pmIc_2$}%-j\omega I_2
+\pcline[linewidth=3.5pt,arrows=->](0,0)(NUb)\naput{$\pmEc_2$}%E_2
+\psParallelLine[linewidth=1.5pt,arrows=->,linecolor=blue](0,0)(NUb)(0,0){1.428}{NUc}\nbput[npos=0.8]{$\pmEc_1$}%E_1 (m=0.7)
+\psRelLine[linewidth=1.5pt,arrows=->,angle=-85,linecolor=orange](0,0)(NUc){0.2}{NIm1}\nbput{\tiny $\pmIc_{m1}$}%I_m1
+\psParallelLine[linewidth=1.5pt,arrows=->,linecolor=orange](0,0)(I1)(NIm1){-0.7}{NI1}\nbput{\tiny $-m\pmIc_2$}%m.I_2
+\pcline[linewidth=1.5pt,arrows=->,linecolor=orange](0,0)(NI1)\naput{\tiny $\pmIc_{1}$}%I_1
+\psParallelLine[linewidth=1.5pt,arrows=->,linecolor=blue](0,0)(NI1)(NUc){0.2}{NUd}\nbput{\tiny $R_1\pmIc_1$}%R_1 I_1
+\psRelLine[linewidth=1.5pt,arrows=->,angle=90,linecolor=blue](NUd)(NUc){-5}{NUe}\nbput{\tiny $j\omega L_{\sigma1}\pmIc_1$}%-j\omega I_2
+\pcline[linewidth=1.5pt,arrows=->,linecolor=blue](0,0)(NUe)\naput{$\pmUc_{1}$}%I_1
+\end{pspicture}
+
+\begin{lstlisting}
+\newcommand\pmsc[1]{\ensuremath{\underline{#1}}}
+\newcommand\pmIc{\pmsc{I}}
+\newcommand\pmUc{\pmsc{U}}
+\newcommand\pmEc{\pmsc{E}}
+\begin{pspicture}[showgrid=true](-5,-5)(5,8)
+\psStartPoint[I](0,0)
+\psVector[linewidth=1.5pt,linecolor=red](1.5;235)\ncput*{$\pmIc_2$}%I_2
+\psStartPoint[U](0,0)
+\psVector[linewidth=1.5pt](2;90)\ncput*{$\pmUc_2$}%U_2
+\psParallelLine[linewidth=1.5pt,arrows=->](0,0)(I1)(U1){-0.3}{NUa}\nbput{\tiny $-R_2\pmIc_2$}
+\psRelLine[linewidth=1.5pt,arrows=->,angle=90](NUa)(U1){-5}{NUb}%
+ \nbput{\tiny $-j\omega L_{\sigma2}\pmIc_2$}%-j\omega I_2
+\pcline[linewidth=3.5pt,arrows=->](0,0)(NUb)\naput{$\pmEc_2$}%E_2
+\psParallelLine[linewidth=1.5pt,arrows=->,linecolor=blue](0,0)(NUb)(0,0){1.428}{NUc}%
+ \nbput[npos=0.8]{$\pmEc_1$}%E_1 (m=0.7)
+\psRelLine[linewidth=1.5pt,arrows=->,angle=-85,linecolor=orange](0,0)(NUc){0.2}{NIm1}
+ \nbput{\tiny $\pmIc_{m1}$}%I_m1
+\psParallelLine[linewidth=1.5pt,arrows=->,linecolor=orange](0,0)(I1)(NIm1){-0.7}{NI1}
+ \nbput{\tiny $-m\pmIc_2$}%m.I_2
+\pcline[linewidth=1.5pt,arrows=->,linecolor=orange](0,0)(NI1)\naput{\tiny $\pmIc_{1}$}%I_1
+\psParallelLine[linewidth=1.5pt,arrows=->,linecolor=blue](0,0)(NI1)(NUc){0.2}{NUd}
+ \nbput{\tiny $R_1\pmIc_1$}%R_1 I_1
+\psRelLine[linewidth=1.5pt,arrows=->,angle=90,linecolor=blue](NUd)(NUc){-5}{NUe}
+ \nbput{\tiny $j\omega L_{\sigma1}\pmIc_1$}%-j\omega I_2
+\pcline[linewidth=1.5pt,arrows=->,linecolor=blue](0,0)(NUe)\naput{$\pmUc_{1}$}%I_1
+\end{pspicture}
+\end{lstlisting}
+
%--------------------------------------------------------------------------------------
\section{\nxLcs{psIntersectionPoint}}
@@ -5401,3 +5454,4 @@ This refers to all options of the packages \LPack{pstricks},
\end{document}
+
diff --git a/Master/texmf-dist/dvips/pstricks-add/pstricks-add.pro b/Master/texmf-dist/dvips/pstricks-add/pstricks-add.pro
index 2929ab66490..e30317ca78d 100644
--- a/Master/texmf-dist/dvips/pstricks-add/pstricks-add.pro
+++ b/Master/texmf-dist/dvips/pstricks-add/pstricks-add.pro
@@ -1,4 +1,4 @@
-%% $Id: pstricks-add.pro 692 2012-06-04 06:47:40Z herbert $
+%% $Id: pstricks-add.pro 37 2014-07-22 13:52:12Z herbert $
%%
% PostScript prologue for pstricks-add.tex.
%
diff --git a/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex b/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex
index cc9e083a2be..e271f7be387 100644
--- a/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex
+++ b/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex
@@ -1,4 +1,4 @@
-%% $Id: pstricks-add.tex 933 2014-07-11 19:23:25Z herbert $
+%% $Id: pstricks-add.tex 37 2014-07-22 13:52:12Z herbert $
%%
%% This is file `pstricks-add.tex',
%%
@@ -30,8 +30,8 @@
\ifx\PSTXKeyLoaded\endinput\else \input pst-xkey \fi
\ifx\PSTmathLoaded\endinput\else \input pst-math \fi
%
-\def\fileversion{3.74}
-\def\filedate{2014/07/15}
+\def\fileversion{3.75}
+\def\filedate{2014/07/22}
\message{`pstricks-add' v\fileversion, \filedate\space (dr,hv)}
%
\edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax
@@ -1189,7 +1189,7 @@ a add
\pst@killglue
\use@par
\psRelNode(#1)(#2){#3}{#4}
- \psline(#1)(#4)%
+ \pcline(#1)(#4)%%%% \psline->\pcline 20140722
}\ignorespaces}
%
% #1 options
@@ -1222,7 +1222,7 @@ a add
/Alpha dy dx atan def
laenge Alpha cos mul XC add
laenge Alpha sin mul YC add ){#5}%
- \psline(#3)(#5)
+ \pcline(#3)(#5)%%%% \psline->\pcline 20140722
}\ignorespaces}
%
\def\psIntersectionPoint(#1)(#2)(#3)(#4)#5{%
diff --git a/Master/texmf-dist/tex/latex/pstricks-add/pstricks-add.sty b/Master/texmf-dist/tex/latex/pstricks-add/pstricks-add.sty
index 9daea6d7044..9d039bd5bf2 100644
--- a/Master/texmf-dist/tex/latex/pstricks-add/pstricks-add.sty
+++ b/Master/texmf-dist/tex/latex/pstricks-add/pstricks-add.sty
@@ -1,4 +1,4 @@
-%% $Id: pstricks-add.sty 566 2011-08-20 07:19:32Z herbert $
+%% $Id: pstricks-add.sty 37 2014-07-22 13:52:12Z herbert $
%
\RequirePackage{pstricks}
\RequirePackage{pst-plot}