summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-02-11 00:50:34 +0000
committerKarl Berry <karl@freefriends.org>2012-02-11 00:50:34 +0000
commitb0eabb6758f016228a73f390ecede6bcf1f0c535 (patch)
tree0bedeea085c451e03e9ff9225ed40cb2241584ef
parent31705256b876f83730b07d6ba8dbb46889ffc05c (diff)
pstricks 2.24 (9feb12)
git-svn-id: svn://tug.org/texlive/trunk@25354 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/Changes.dvips1
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/Changes.generic1
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/pst-news12.pdfbin61370 -> 75024 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/pst-news12.tex41
-rw-r--r--Master/texmf-dist/dvips/pstricks/pstricks.pro46
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/pstricks.tex15
6 files changed, 90 insertions, 14 deletions
diff --git a/Master/texmf-dist/doc/generic/pstricks/Changes.dvips b/Master/texmf-dist/doc/generic/pstricks/Changes.dvips
index 7e925d91bb2..4cfc3302bcd 100644
--- a/Master/texmf-dist/doc/generic/pstricks/Changes.dvips
+++ b/Master/texmf-dist/doc/generic/pstricks/Changes.dvips
@@ -1,4 +1,5 @@
---- pstricks.pro
+1.10 2012-02-09 - add option for curveticks with option symbol
1.09 2011-10-31 - take values Ox and Oy into account for
plot styles LineToXAxis and LineToYAxis
1.08 2011-07-09 - added sibroutine DotFill
diff --git a/Master/texmf-dist/doc/generic/pstricks/Changes.generic b/Master/texmf-dist/doc/generic/pstricks/Changes.generic
index 10ed3f489ff..752bea40ca5 100644
--- a/Master/texmf-dist/doc/generic/pstricks/Changes.generic
+++ b/Master/texmf-dist/doc/generic/pstricks/Changes.generic
@@ -1,4 +1,5 @@
pstricks.tex --------
+2.24 2012-02-09 - add option for curveticks with option symbol
2.23 2011-09-04 - change also \psx|ylabelsep for pst-plot
2.22 2011-07-09 - added fillstyle dots
2.21 2011-06-07 - fix bug with a trailing space in \psForeach
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news12.pdf b/Master/texmf-dist/doc/generic/pstricks/pst-news12.pdf
index 56e78298a7f..dbbcd83e543 100644
--- a/Master/texmf-dist/doc/generic/pstricks/pst-news12.pdf
+++ b/Master/texmf-dist/doc/generic/pstricks/pst-news12.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news12.tex b/Master/texmf-dist/doc/generic/pstricks/pst-news12.tex
index 55025792662..27718ddec1f 100644
--- a/Master/texmf-dist/doc/generic/pstricks/pst-news12.tex
+++ b/Master/texmf-dist/doc/generic/pstricks/pst-news12.tex
@@ -4,7 +4,7 @@
\listfiles
\let\Lfile\LFile
\usepackage[utf8]{inputenc}
-\usepackage{pst-node}
+\usepackage{pst-node,pst-plot}
\usepackage{xkvview}
\let\pstnodeFV\fileversion
\let\pstnodeFD\filedate
@@ -55,6 +55,45 @@ supports \PS\ code in the document.
\section{\texttt{pstricks.tex} (\pstricksFV -- \pstricksFD)}
%--------------------------------------------------------------------------------------
+The optional argument \Lkeyword{symbol} for a linestyle can now be
+set with a negative \Lkeyword{symbolstep} for a computed width of the steps:
+\begin{LTXexample}[pos=t]
+\psset{unit=0.75cm}
+\begin{pspicture}(8,8)
+\psaxes[labels=none,ticks=none]{->}(0,0)(8,8)[$x$,0][$y$,0]
+\pscurve(1,1)(3,4)(6,6)(8,4)
+\pscurve[linestyle=symbol,symbolStep=-20,symbol=l](1,1)(3,4)(6,6)(8,4)
+\end{pspicture}
+\end{LTXexample}
+
+
+Instead of setting a symbol it is possible to set ticks on the curve with \Lkeyword{curveticks}. They can be set by a fixed width or a computed
+width if the \Lkeyword{symbolStep} is set by a negative number without a unit.
+
+\begin{LTXexample}[pos=t]
+\psset{unit=0.75cm}
+\begin{pspicture}(8,8)
+\psaxes[labels=none,ticks=none]{->}(0,0)(8,8)[$x$,0][$y$,0]
+\pscurve(1,1)(3,4)(6,6)(8,4)
+\pscurve[linestyle=symbol,symbolStep=12.25pt,
+ curveticks,startAngle=60](1,1)(3,4)(6,6)(8,4)
+\end{pspicture}
+\end{LTXexample}
+
+
+\begin{LTXexample}[pos=t]
+\psset{unit=0.75cm}
+\begin{pspicture}(8,8)
+\psaxes[labels=none,ticks=none]{->}(0,0)(8,8)[$x$,0][$y$,0]
+\pscurve(1,1)(3,4)(6,6)(8,4)
+\pscurve[linestyle=symbol,symbolStep=-12,
+ curveticks,startAngle=60](1,1)(3,4)(6,6)(8,4)
+\end{pspicture}
+\end{LTXexample}
+
+
+
+
\section{The PostScript header files}
\subsection{\nxLFile{pstricks.pro}}
%--------------------------------------------------------------------------------------
diff --git a/Master/texmf-dist/dvips/pstricks/pstricks.pro b/Master/texmf-dist/dvips/pstricks/pstricks.pro
index 707b9307f5d..4aba4593eb5 100644
--- a/Master/texmf-dist/dvips/pstricks/pstricks.pro
+++ b/Master/texmf-dist/dvips/pstricks/pstricks.pro
@@ -1,7 +1,7 @@
-% $Id: pstricks.pro 622 2012-01-01 15:36:14Z herbert $
+% $Id: pstricks.pro 642 2012-02-09 15:00:52Z herbert $
%
%% PostScript prologue for pstricks.tex.
-%% Version 1.09, 2011/10/31
+%% Version 1.10, 2012/02/09
%%
%% This program can be redistributed and/or modified under the terms
%% of the LaTeX Project Public License Distributed from CTAN archives
@@ -542,28 +542,58 @@ tx@Dict begin
} def
%
/CurvePath {
+ %% for negative SymStep we calculate the distance
+ SymStep 0 lt { gsave PathLength SymStep div abs /SymStep ED grestore } if
+ 0.5 setflat
flattenpath /z 0 def /z0 0 def
{ /y1 ED /x1 ED /y2 y1 def /x2 x1 def
x1 Shift sub y1 Shift sub moveto
gsave
- startAngle rotate Symbol show
+ curveticks
+ { x1 y1 translate startAngle rotate
+ 0 5 moveto 0 -5 lineto stroke
+ }
+ { startAngle rotate Symbol show }
+ ifelse
grestore /z0 z def }
{ /y ED /x ED PathLength@ z z0 sub SymStep ge {
x Shift sub y Shift sub moveto
gsave
- rotateSymbol { y yOld sub x xOld sub Atan 180 sub CorrAngle sub rotate } if
- Symbol show
+ curveticks
+ { y yOld sub x xOld sub Atan 180 sub CorrAngle sub /rotAngle ED
+ x y translate rotAngle rotate
+ 0 5 moveto 0 -5 lineto stroke
+ }
+ {
+ rotateSymbol { y yOld sub x xOld sub Atan 180 sub CorrAngle sub rotate } if
+ Symbol show
+ }
+ ifelse
grestore /z0 z def } if
/yOld y def /xOld x def }
- {}
+ {} %% the lineto part
{ /y y2 def /x x2 def PathLength@
x Shift sub y Shift sub moveto
gsave
- rotateSymbol { y yOld sub x xOld sub Atan 180 sub CorrAngle sub rotate } if
- Symbol show
+ curveticks
+ { y yOld sub x xOld sub Atan 180 sub /rotAngle ED
+ x y translate rotAngle rotate
+ 0 5 moveto 0 -5 lineto stroke
+ }
+ {
+ x Shift sub y Shift sub moveto
+ rotateSymbol { y yOld sub x xOld sub Atan 180 sub CorrAngle sub rotate } if
+ Symbol show
+ }
+ ifelse
grestore
}
pathforall
+ curveticks
+ { gsave
+ x y translate rotAngle rotate
+ 0 5 moveto 0 -5 lineto stroke grestore
+ } if
z
} def
%
diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
index eb4ff0639cc..23974eed06f 100644
--- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
+++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
@@ -1,7 +1,7 @@
%% pstricks.tex
%% COPYRIGHT 1993, 1994, 1999 by Timothy Van Zandt, tvz@nwu.edu.
%% COPYRIGHT 2000-2003 by Denis Girou.
-%% Copyright 2004-2011 Herbert Voss
+%% Copyright 2004-2012 Herbert Voss
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -66,8 +66,8 @@
\ifx\PSTXKeyLoaded\endinput\else \input pst-xkey.tex \fi
\ifx\PSTFPloaded\endinput\else \input pst-fp.tex\fi
%
-\def\fileversion{2.23}
-\def\filedate{2011/09/04}
+\def\fileversion{2.24}
+\def\filedate{2012/02/09}
\catcode`\@=11\relax
\pst@addfams{pstricks}
%
@@ -904,7 +904,7 @@
%
\def\special@angle#1#2)#3\@nil{%
\ifx!#1\relax
- \edef\pst@angle{#2 \pst@angleunit}%
+ \edef\pst@angle{#2\space \pst@angleunit}%
\else\ifx(#1\relax
\pst@@getcoor{#2}%
\edef\pst@angle{\pst@coor exch \tx@Atan}%
@@ -2315,7 +2315,8 @@
\psset[pstricks]{symbol=a}
%
\newdimen\pst@symbolStep
-\define@key[psset]{pstricks}{symbolStep}[20pt]{\pssetlength\pst@symbolStep{#1}}
+\define@key[psset]{pstricks}{symbolStep}[20pt]{\pst@expandafter\pst@@symbolStep#1\@nil}
+\def\pst@@symbolStep#1#2\@nil{\if-#1\pssetlength\pst@symbolStep{-#2pt}\else\pssetlength\pst@symbolStep{#1#2}\fi}
\psset[pstricks]{symbolStep=20pt}
\newdimen\pst@symbolWidth
\define@key[psset]{pstricks}{symbolWidth}[10pt]{\pssetlength\pst@symbolWidth{#1}}
@@ -2326,6 +2327,9 @@
\psset[pstricks]{rotateSymbol=false}
\define@key[psset]{pstricks}{startAngle}[0]{\pst@getangle{#1}\psk@startAngle}
\psset[pstricks]{startAngle=0}
+\define@boolkey[psset]{pstricks}[Pst@]{curveticks}[true]{}
+\psset[pstricks]{curveticks=false}
+
%
\def\psls@symbol{
/Symbol \psk@symbol def
@@ -2337,6 +2341,7 @@
/rotateSymbol \ifPst@rotateSymbol true \else false \fi def
/startAngle \psk@startAngle\space def
/CorrAngle \ifx\psk@rot\@empty 0 \else \psk@rot \fi def
+ /curveticks \ifPst@curveticks true \else false \fi def
}
\def\psls@@symbol{symbol}
%