summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-12-02 00:52:27 +0000
committerKarl Berry <karl@freefriends.org>2014-12-02 00:52:27 +0000
commit678070a4380cc78691a99a83eb71160adbddc4a6 (patch)
tree1c488fbc006b6fe80b6b10d5c5a99b1bf183b652
parent2d61f61469832711b5c4f930c95962f722e9a88c (diff)
pstricks-add (1dec14)
git-svn-id: svn://tug.org/texlive/trunk@35710 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/generic/pstricks-add/Changes3
-rw-r--r--Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.pdfbin5129927 -> 5062733 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.tex15
-rw-r--r--Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex22
4 files changed, 23 insertions, 17 deletions
diff --git a/Master/texmf-dist/doc/generic/pstricks-add/Changes b/Master/texmf-dist/doc/generic/pstricks-add/Changes
index 0eb8b8ca235..06ed4924c88 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 37 2014-07-22 13:52:12Z herbert $
+%% $Id: Changes 134 2014-11-29 21:09:24Z herbert $
%%
pstricks-add.pro -----------
0.23 2009-12-17 - add RGBtoGRAY and WavelengthToGRAY
@@ -39,6 +39,7 @@ pstricks-add.sty ----------- (hv)
pstricks-add.tex ----------- (hv)
+ v 3.76 2014-11-29 - fix bug with color setting and \psrotate
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
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 a2a1a744531..aa3c893ab3d 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 f45535b555e..fdc449c34ee 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 37 2014-07-22 13:52:12Z herbert $
+%% $Id: pstricks-add-doc.tex 101 2014-09-02 14:37:17Z herbert $
\documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings
headexclude,footexclude,oneside]{pst-doc}
\listfiles
@@ -1404,18 +1404,18 @@ of the special PostScript characters.
the following example was created by Patrice Mégret.
-
+\psset{unit=1cm}
\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)
+\begin{pspicture}[showgrid=true](-5,-2)(3,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
+\psRelLine[linewidth=1.5pt,arrows=->,angle=90](NUa)(U1){-5}{NUb}\nbput{\tiny $-j\omega L_{\sigma2}\pmIc_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
@@ -1426,12 +1426,15 @@ the following example was created by Patrice Mégret.
\pcline[linewidth=1.5pt,arrows=->,linecolor=blue](0,0)(NUe)\naput{$\pmUc_{1}$}%I_1
\end{pspicture}
-\begin{lstlisting}
+%$
+
+
+\begin{lstlisting}[basicstyle=\footnotesize\ttfamily]
\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)
+\begin{pspicture}[showgrid=true](-5,-2)(3,8)
\psStartPoint[I](0,0)
\psVector[linewidth=1.5pt,linecolor=red](1.5;235)\ncput*{$\pmIc_2$}%I_2
\psStartPoint[U](0,0)
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 e271f7be387..124a8819b0d 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 37 2014-07-22 13:52:12Z herbert $
+%% $Id: pstricks-add.tex 135 2014-11-30 08:28:22Z 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.75}
-\def\filedate{2014/07/22}
+\def\fileversion{3.76}
+\def\filedate{2014/11/29}
\message{`pstricks-add' v\fileversion, \filedate\space (dr,hv)}
%
\edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax
@@ -89,10 +89,11 @@
\begingroup%
\use@par\pst@makebox{\psrotate@ii(#1){#2}}}
\def\psrotate@ii(#1)#2{%
- \pst@getcoor{#1}\pst@tempA%
- \pst@getangle{#2}\pst@tempB%
- \leavevmode%
- \pst@Verb{%
+ \pst@getcoor{#1}\pst@tempA
+ \pst@getangle{#2}\pst@tempB
+ \leavevmode
+ \pst@Verb{
+ gsave
{ \pst@tempA /yRot ED /xRot ED
\pst@tempB dup cos /cosA ED sin /sinA ED
/ax cosA def
@@ -101,9 +102,10 @@
/dy cosA def
/ex xRot cosA mul neg xRot add yRot sinA mul add def
/fy xRot sinA mul neg yRot add yRot cosA mul sub def
- [ax by cx dy ex fy] concat } \tx@TMChange }%
- \box\pst@hbox%
- \pst@Verb{ \tx@TMRestore }\endgroup}
+ [ax by cx dy ex fy] concat } \tx@TMChange
+ }%
+ \box\pst@hbox
+ \pst@Verb{ \tx@TMRestore grestore }\endgroup}
%
% [#1]: obtargs; (#2,#3): center; {#4}: factor; {#5}: object
\def\psHomothetie{\def\pst@par{}\pst@object{psHomothetie}}