summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/Changes.dvips2
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/Changes.generic3
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/pst-news12.pdfbin75024 -> 79428 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/pst-news12.tex19
-rw-r--r--Master/texmf-dist/dvips/pstricks/pstricks.pro72
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/pstricks.tex40
6 files changed, 109 insertions, 27 deletions
diff --git a/Master/texmf-dist/doc/generic/pstricks/Changes.dvips b/Master/texmf-dist/doc/generic/pstricks/Changes.dvips
index 4cfc3302bcd..01afcb9a69e 100644
--- a/Master/texmf-dist/doc/generic/pstricks/Changes.dvips
+++ b/Master/texmf-dist/doc/generic/pstricks/Changes.dvips
@@ -1,4 +1,6 @@
---- pstricks.pro
+1.12 2012-02-12 - add option tickAngle and symbolLinewidth
+1.11 2012-02-09 - fix bug
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
diff --git a/Master/texmf-dist/doc/generic/pstricks/Changes.generic b/Master/texmf-dist/doc/generic/pstricks/Changes.generic
index 752bea40ca5..91b577bebd9 100644
--- a/Master/texmf-dist/doc/generic/pstricks/Changes.generic
+++ b/Master/texmf-dist/doc/generic/pstricks/Changes.generic
@@ -1,4 +1,7 @@
pstricks.tex --------
+2.27 2012-03-11 - activate \tx@strokeopacity for \psgrid
+2.26 2012-02-19 - showgrid=top is now possible
+2.25 2012-02-12 - modifications to the code of curveticks
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
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news12.pdf b/Master/texmf-dist/doc/generic/pstricks/pst-news12.pdf
index dbbcd83e543..dbcaa3ebd6a 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 27718ddec1f..384bca12e4e 100644
--- a/Master/texmf-dist/doc/generic/pstricks/pst-news12.tex
+++ b/Master/texmf-dist/doc/generic/pstricks/pst-news12.tex
@@ -46,15 +46,29 @@ supports \PS\ code in the document.
%--------------------------------------------------------------------------------------
-\section{\texttt{pstricks.sty}}
+%\section{\texttt{pstricks.sty}}
%--------------------------------------------------------------------------------------
-\subsection{New optional argument}
+%\subsection{New optional argument}
+
%--------------------------------------------------------------------------------------
\section{\texttt{pstricks.tex} (\pstricksFV -- \pstricksFD)}
%--------------------------------------------------------------------------------------
+\subsection{Grid}
+
+The optional argument \Lkeyval{showgrid} can have the values \Lkeyval{bottom},
+\Lkeyval{true},
+\Lkeyval{false}, and
+\Lkeyval{top}, where \Lkeyval{false is the default} and \Lkeyval{true} the same as
+\Lkeyval{bottom}. With the latter it is set first and with \Lkeyval{top} it is set
+at the end of the \Lenv{pspitcure} environment.
+
+
+
+
+\subsection{Symbol line}
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]
@@ -94,6 +108,7 @@ width if the \Lkeyword{symbolStep} is set by a negative number without a unit.
+
\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 4aba4593eb5..77519c55514 100644
--- a/Master/texmf-dist/dvips/pstricks/pstricks.pro
+++ b/Master/texmf-dist/dvips/pstricks/pstricks.pro
@@ -1,7 +1,7 @@
-% $Id: pstricks.pro 642 2012-02-09 15:00:52Z herbert $
+% $Id: pstricks.pro 647 2012-02-12 15:03:40Z herbert $
%
%% PostScript prologue for pstricks.tex.
-%% Version 1.10, 2012/02/09
+%% Version 1.12, 2012/02/12
%%
%% This program can be redistributed and/or modified under the terms
%% of the LaTeX Project Public License Distributed from CTAN archives
@@ -123,22 +123,56 @@ tx@Dict begin
/YLength YB YA sub def
/PAngle YLength XLength Atan def
/XYLength XLength YLength Pyth def
- /nSym XYLength SymStep div cvi def
+
+ %% for negative SymStep we calculate the distance
+ SymStep 0 lt
+ { %XYLength SymStep div abs cvi
+ /nSym SymStep abs cvi def }
+ { /nSym XYLength SymStep div cvi def }
+ ifelse
+ 0.5 setflat
/Shift Symbol stringwidth pop 2 div def
/deltaX XLength nSym div def
/deltaY YLength nSym div def
- XA Shift sub YA Shift sub moveto
+ curveticks
+ { XA YA moveto }
+ { XA Shift sub YA Shift sub moveto }
+ ifelse
nSym {
- gsave rotateSymbol { PAngle 180 sub CorrAngle sub rotate } if
- Symbol show
+ gsave
+ curveticks
+ { PAngle 180 sub CorrAngle sub tickAngle add /rotAngle ED
+ currentpoint translate rotAngle rotate
+ 0 SymbolWidth 2 div moveto 0 SymbolWidth 2 div neg lineto
+ SymbolLinewidth setlinewidth stroke
+ }
+ {
+ rotateSymbol { PAngle 180 sub CorrAngle sub rotate } if
+ Symbol show
+ }
+ ifelse
grestore
deltaX deltaY rmoveto
} repeat
/YA YB def /XA XB def
} repeat
- XA Shift sub YA Shift sub moveto
- gsave rotateSymbol { PAngle 180 sub CorrAngle sub rotate } if
- Symbol show grestore
+ curveticks
+ { XA YA moveto }
+ { XA Shift sub YA Shift sub moveto }
+ ifelse
+ gsave
+ curveticks
+ { PAngle 180 sub CorrAngle sub tickAngle add /rotAngle ED
+ XA YA translate rotAngle rotate
+ 0 SymbolWidth 2 div moveto 0 SymbolWidth 2 div neg lineto
+ SymbolLinewidth setlinewidth stroke
+ }
+ {
+ rotateSymbol { PAngle 180 sub CorrAngle sub rotate } if
+ Symbol show
+ }
+ ifelse
+ grestore
pop % delete the mark symbol
} def
%
@@ -551,7 +585,8 @@ tx@Dict begin
gsave
curveticks
{ x1 y1 translate startAngle rotate
- 0 5 moveto 0 -5 lineto stroke
+ 0 SymbolWidth 2 div moveto 0 SymbolWidth 2 div neg lineto
+ SymbolLinewidth setlinewidth stroke
}
{ startAngle rotate Symbol show }
ifelse
@@ -562,7 +597,8 @@ tx@Dict begin
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
+ 0 SymbolWidth 2 div moveto 0 SymbolWidth 2 div neg lineto
+ SymbolLinewidth setlinewidth stroke
}
{
rotateSymbol { y yOld sub x xOld sub Atan 180 sub CorrAngle sub rotate } if
@@ -578,7 +614,8 @@ tx@Dict begin
curveticks
{ y yOld sub x xOld sub Atan 180 sub /rotAngle ED
x y translate rotAngle rotate
- 0 5 moveto 0 -5 lineto stroke
+ 0 SymbolWidth 2 div moveto 0 SymbolWidth 2 div neg lineto
+ SymbolLinewidth setlinewidth stroke
}
{
x Shift sub y Shift sub moveto
@@ -589,11 +626,12 @@ tx@Dict begin
grestore
}
pathforall
- curveticks
- { gsave
- x y translate rotAngle rotate
- 0 5 moveto 0 -5 lineto stroke grestore
- } if
+% curveticks
+% { gsave
+% x y translate rotAngle rotate
+% 0 SymbolWidth 2 div moveto 0 SymbolWidth 2 div neg lineto
+% SymbolLinewidth setlinewidth 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 23974eed06f..2e0c4e83b5e 100644
--- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
+++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
@@ -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.24}
-\def\filedate{2012/02/09}
+\def\fileversion{2.27}
+\def\filedate{2012/03/11}
\catcode`\@=11\relax
\pst@addfams{pstricks}
%
@@ -1072,11 +1072,13 @@
[ 0 \psk@dotsep CLW add ] 0 setdash 1 setlinecap stroke
\fi
}
+%
\define@key[psset]{pstricks}{linestyle}[solid]{%
\@ifundefined{psls@#1}%
{\@pstrickserr{Line style `#1' not defined}\@eha}%
{\def\pslinestyle{#1}}}
\psset[pstricks]{linestyle=solid}
+%
\define@key[psset]{pstricks}{linecap}[0]{%
\def\psk@linecap{0}%
\ifnum#1>-1
@@ -2318,15 +2320,20 @@
\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
+\newdimen\pst@symbolLinewidth
\define@key[psset]{pstricks}{symbolWidth}[10pt]{\pssetlength\pst@symbolWidth{#1}}
-\psset[pstricks]{symbolWidth=10pt}
+\define@key[psset]{pstricks}{symbolLinewidth}[0.5pt]{\pssetlength\pst@symbolLinewidth{#1}}
+\psset[pstricks]{symbolWidth=10pt,symbolLinewidth=0.5pt}
+
\define@key[psset]{pstricks}{symbolFont}[Dingbats]{\def\psk@symbolFont{/#1 }}
\psset[pstricks]{symbolFont=Dingbats}
\define@boolkey[psset]{pstricks}[Pst@]{rotateSymbol}[true]{}
\psset[pstricks]{rotateSymbol=false}
\define@key[psset]{pstricks}{startAngle}[0]{\pst@getangle{#1}\psk@startAngle}
-\psset[pstricks]{startAngle=0}
+\define@key[psset]{pstricks}{tickAngle}[0]{\pst@getangle{#1}\psk@tickAngle}
+\psset[pstricks]{startAngle=0,tickAngle=0}
\define@boolkey[psset]{pstricks}[Pst@]{curveticks}[true]{}
\psset[pstricks]{curveticks=false}
@@ -2334,14 +2341,17 @@
\def\psls@symbol{
/Symbol \psk@symbol def
/SymbolWidth \pst@number\pst@symbolWidth def
+ /SymbolLinewidth \pst@number\pst@symbolLinewidth def
/SymStep \pst@number\pst@symbolStep def
\psk@symbolFont findfont %0. [1.0 0.0 0.0 1.0 0.0 0.0]
\pst@number\pst@symbolWidth scalefont %dup
setfont
/rotateSymbol \ifPst@rotateSymbol true \else false \fi def
+ /tickAngle \psk@tickAngle\space 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
+ \pst@number\pslinewidth SLW
}
\def\psls@@symbol{symbol}
%
@@ -2586,6 +2596,7 @@
\ifnum\psk@subgriddiv>1\relax
\addto@pscode{
gsave
+ \tx@setStrokeTransparency
\psk@subgridwidth SLW
\pst@usecolor\pssubgridcolor
\pst@tempB \pst@coor \pst@tempA % hv 1.11
@@ -2600,6 +2611,7 @@
\fi%
\addto@pscode{
gsave
+ \tx@setStrokeTransparency
\psk@gridwidth SLW
\pst@usecolor\psgridcolor
\pst@tempB \pst@coor \pst@tempA % hv 1.11
@@ -2618,11 +2630,12 @@
\def\pst@mathflag{\z@}
\newtoks\everypsbox
\let\pst@thisbox\relax
+%
\long\def\pst@makenotverbbox#1#2{%
\edef\pst@mathflag{%
\ifpsmathbox\ifmmode\ifinner 1\else 2\fi\else\z@\fi\else\z@\fi}%
\setbox\pst@hbox=\hbox{%
- \ifcase\pst@mathflag\or$\m@th\textstyle\or$\m@th\displaystyle\fi
+ \ifcase\pst@mathflag\or$\m@th\textstyle\or$\m@th\displaystyle\fi%
{\pst@thisbox\the\everypsbox#2}%
\ifnum\pst@mathflag>\z@$\fi% $
}%
@@ -3923,9 +3936,19 @@ pop
\def\OldPsput{\let\psput\oldpsput}
\def\NewPsput{\let\psput\rput}
%
-% ----------- 1.10/12 beg hv -------------------
+% ----------- hv 20120219 -------------------
\newpsstyle{gridstyle}{subgriddiv=0,gridcolor=lightgray,griddots=10,gridlabels=8pt}
-\define@boolkey[psset]{pstricks}[]{showgrid}[true]{}
+%\define@boolkey[psset]{pstricks}[]{showgrid}[true]{}
+\newif\ifshowgrid
+\define@key[psset]{pstricks}{showgrid}[b]{\pst@@showgrid#1\@nil}
+\def\pst@@showgrid#1#2\@nil{%
+ \ifx#1b\showgridtrue\def\showgridp@s{0}\else% bottom
+ \ifx#1f\showgridfalse\else
+ \ifx#1t
+ \ifx#2r\showgridtrue\def\showgridp@s{0}\else% true->bottom
+ \showgridtrue\def\showgridp@s{1}\fi% top
+ \fi\fi\fi%
+}
\psset[pstricks]{showgrid=false}
%
\newdimen\pst@shift
@@ -3973,13 +3996,14 @@ pop
\psset{showgrid=false}% % for nested pspicture environemnets
\def\pst@tempA{#1}%
\ifx\pst@tempA\@empty\else\psset{#1}\fi% sets the shift and grid option
- \ifshowgrid\psgrid[style=gridstyle]\fi%
+ \ifshowgrid\ifnum\showgridp@s=0\psgrid[style=gridstyle]\fi\fi%
% ----------- 1.10/12 end hv -------------------
\ignorespaces% % 2008-12-07
}
\def\pic@coor{(0,0)(0,0)(10,10)}
%\newdimen\pst@shift
\def\endpspicture{%
+ \ifshowgrid\ifnum\showgridp@s>0\psgrid[style=gridstyle]\fi\fi%
\pst@killglue
% \global\pst@shift=\pst@shift% in fact of the following endgroup
\endgroup
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-17 04:19:13 +0000