texlive[42990] Master/texmf-dist: pst-plot (18jan17)
commits+karl at tug.org
commits+karl at tug.org
Thu Jan 19 02:23:55 CET 2017
Revision: 42990
http://tug.org/svn/texlive?view=revision&revision=42990
Author: karl
Date: 2017-01-19 02:23:55 +0100 (Thu, 19 Jan 2017)
Log Message:
-----------
pst-plot (18jan17)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/generic/pst-plot/Changes
trunk/Master/texmf-dist/doc/generic/pst-plot/README
trunk/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.pdf
trunk/Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex
Modified: trunk/Master/texmf-dist/doc/generic/pst-plot/Changes
===================================================================
--- trunk/Master/texmf-dist/doc/generic/pst-plot/Changes 2017-01-19 01:23:21 UTC (rev 42989)
+++ trunk/Master/texmf-dist/doc/generic/pst-plot/Changes 2017-01-19 01:23:55 UTC (rev 42990)
@@ -1,4 +1,5 @@
----- pst-plot.tex
+1.76 2017-01-18 - allow yLabels and xLabels for negative axes
1.75 2016-05-18 - fix bug with psgraph and position of labels
1.74 2016-05-11 - fix bug with trailing space
1.73 2016-05-10 - added option plotYMax to ignore values
Modified: trunk/Master/texmf-dist/doc/generic/pst-plot/README
===================================================================
--- trunk/Master/texmf-dist/doc/generic/pst-plot/README 2017-01-19 01:23:21 UTC (rev 42989)
+++ trunk/Master/texmf-dist/doc/generic/pst-plot/README 2017-01-19 01:23:55 UTC (rev 42990)
@@ -1,7 +1,8 @@
-This version of pst-plot uses the xkeyval package, the extended
-version of keyval.
+pst-plot: Plotting data and functions with PSTricks.
-Save the files pst-plot.sty|.tex| in a directory, which is part of your
+If you are using any TeX distribution then everything is done
+by the update manager. For a personal installation
+save the files pst-plot.sty|.tex| in a directory, which is part of your
local TeX node. Then do not forget to run texhash to update this node
if these packages are new to your TeX distribution.
For more information see the documentation of your LaTeX distribution
@@ -13,3 +14,4 @@
local TeX installation, otherwise get it from a CTAN server, f.ex.
http://mirror.ctan.org/graphics/pstricks/
+pst-plot97.tex is only here for some hostorical reason.
Modified: trunk/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex 2017-01-19 01:23:21 UTC (rev 42989)
+++ trunk/Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex 2017-01-19 01:23:55 UTC (rev 42990)
@@ -6,7 +6,7 @@
%% See the betadoc documentation for usage.
%%
%% COPYRIGHT 1993, 1994, 1999 by Timothy Van Zandt, tvz at nwu.edu.
-%% COPYRIGHT 2009-2015 by Herbert Voss, hvoss at tug.org.
+%% COPYRIGHT 2009- by Herbert Voss, hvoss at tug.org.
%%
%% This program can be redistributed and/or modified under the terms
%% of the LaTeX Project Public License Distributed from CTAN
@@ -23,8 +23,8 @@
\ifx\PSTFPloaded\endinput\else \input pst-fp.tex \fi
\ifx\MultidoLoaded\endinput\else \input multido.tex \fi
%
-\def\fileversion{1.75}
-\def\filedate{2016/05/18}
+\def\fileversion{1.76}
+\def\filedate{2017/01/18}
\message{ v\fileversion, \filedate\space (tvz,hv)}
%
\edef\TheAtCode{\the\catcode`\@}
@@ -1347,7 +1347,7 @@
%
\def\setDefaulthLabels{%
\ifPst at xmathLabel\def\pshlabel##1{$\psk at xlabelFontSize##1$}\else\def\pshlabel##1{\psk at xlabelFontSize##1}\fi
- \def\pst@@@hlabel##1{%
+ \def\pst@@@hlabel##1{%
\edef\@xyDecimals{\psk at xDecimals}%
% \ifnum\psk at ticks<\tw@ % ticks=all|x
\ifnum\psk at labels<\tw@ % labels=all|x
@@ -1928,6 +1928,7 @@
\ifPst at yAxis\psxs@@axes\pst at dima\pst at dimb\pst at dimc\pst at dimd{exch}{y}\fi%
}}
%
+\newif\ifSpecialLabelsDone
\def\psaxes{\pst at object{psaxes}}
\def\psaxes at i{\pst at getarrows\psaxes at ii}
\def\psaxes at ii(#1){\@ifnextchar({\psaxes at iii(#1)}{\psaxes at iv(0,0)(0,0)(#1)}}
@@ -1978,6 +1979,7 @@
% Make lines/arrows or frame:
\@nameuse{psxs@\psk at axesstyle}% \psxs at axes or \psxs at frame or \psxs at polar
\ifPst at yAxis
+ \SpecialLabelsDonefalse
\begingroup
\ifdim\pst at dima=\z@ \else\showoriginfalse\fi
\ifnum\psk at dy=\z@
@@ -1986,12 +1988,13 @@
\edef\psk at dy{\number\pst at dimg}%
\fi
% \ifPst at xAxis\else\showorigintrue\fi% 2009-10-21
+ \pst at vlabels{\pst at dimb}{\psk at arrowA}{#4}{#6}%
+ \ifPst at xAxis\ifdim\pst at dima<\z@ \showoriginfalse\fi\fi% no 0 when x- axis is crossing
\pst at vlabels{\pst at dimd}{\psk at arrowB}{#4}{#6}%
- \ifPst at xAxis\ifdim\pst at dima<\z@ \showoriginfalse\fi\fi% no 0 when x- axis is crossing
- \pst at vlabels{\pst at dimb}{\psk at arrowA}{#4}{#6}%
\endgroup
\fi
\ifPst at xAxis
+ \SpecialLabelsDonefalse
\begingroup
\ifdim\pst at dimb=\z@\else\showoriginfalse\fi
\ifnum\psk at dx=\z@
@@ -2353,6 +2356,7 @@
%
% #1:Max/Min in pt from origin; #2:arrow; #3:min; #4:max
\def\pst at hlabels#1#2#3#4{%
+ \ifSpecialLabelsDone\else
\kern\psk at xlabelOffset pt% % set the x offset?
\ifx\empty\psk at xLabels
\ifdim#1=\z@\else% % start from 0 ?
@@ -2368,18 +2372,22 @@
\fi%
\else
% \pst at cnta=#1\relax% % Distance (in sp) to end.
- \edef\pst at tempA{\strip at pt#1}%
- \pstFPmul\pst at tempA{\pst at tempA}{65536}%
- \pstFPdiv\pst at tempA{\pst at tempA}{\psk at dx}%
- \pstFPadd\pst at tempA{1.55}{\pst at tempA}% % to prevent rounding errors
- \edef\pst at tempB{\pst at int{\pst at tempA}}%
+% \edef\pst at tempA{\strip at pt#1}%
+% \pstFPmul\pst at tempA{\pst at tempA}{65536}%
+% \pstFPdiv\pst at tempA{\pst at tempA}{\psk at dx}%
+% \pstFPadd\pst at tempA{1.55}{\pst at tempA}% % to prevent rounding errors
+% \edef\pst at tempB{\pst at int{\pst at tempA}}%
% \divide\pst at cnta\psk at dx\relax% % Number of ticks/labels
- \edef\pst at tempA{\psk at Dx}%
+% \edef\pst at tempA{\psk at Dx}%
\ifnum\psk at xlabelPos=\tw@ \def\pst at tempC{90}\else\def\pst at tempC{-90}\fi
- \multido{\iB=#3+1,\rB=#3+\pst at tempA}{\pst at tempB}%
- {\uput{\psxlabelsep}[\pst at tempC]{\pst at xLabelsRot}(\rB,0)%\psxlabelsep)
- {\strut\pshlabel{\psPutXLabel{\iB}}}}%
- \fi%
+% \multido{\iB=#3+1,\rB=#3+\pst at tempA}{\pst at tempB}%
+% {\uput{\psxlabelsep}[\pst at tempC]{\pst at xLabelsRot}(\rB,0)%\psxlabelsep)
+% {\strut\pshlabel{\psPutXLabel{\iB}}}}%
+ \multido{\nA=0+1,\rA=#3+\psk at Dx}{\numexpr#4-#3+1}{\uput{\psxlabelsep}[\pst at tempC]{\pst at xLabelsRot}(\rA,0){%
+ \strut\expandafter\pshlabel\expandafter{\psPutXLabel{\nA}}}}%
+ \SpecialLabelsDonetrue
+ \fi
+\fi
}
% Knows \pst at dimb and \pst at cnta
\def\pst@@hlabels{%
@@ -2406,34 +2414,25 @@
% #1:Max/Min in pt from origin; #2:arrow; #3:min; #4:max
% \psk at labels 0:all; 1:x; 2:y; 3:none
\def\pst at vlabels#1#2#3#4{%
- \ifx\empty\psk at yLabels
- \ifdim#1=\z@\else
- \ifx#2\empty\else
- \ifdim#1>\z@
- \advance#1 by -7\pslinewidth
- \else
- \advance#1 by 7\pslinewidth
+ \ifSpecialLabelsDone\else
+ \ifx\empty\psk at yLabels
+ \ifdim#1=\z@\else
+ \ifx#2\empty\else\ifdim#1>\z@ \advance#1 by -7\pslinewidth\else\advance#1 by 7\pslinewidth\fi\fi
+ \pst at cnta=#1\relax % % Distance (in sp) to end.
+ \divide\pst at cnta\psk at dy\relax% % Number of ticks/labels
+ \ifnum\pst at cnta=\z@\else
+ \pst at dima=\psk at dy sp % Space between ticks.
+ \ifodd\number\psk at labels\else\ifPst at yAxis\pst@@vlabels\fi
+ \fi
+ \showoriginfalse
+ \fi
\fi
+ \else
+ \multido{\nA=0+1,\rA=#3+\psk at Dy}{\numexpr#4-#3+1}{\uput{\psylabelsep}[180]{\pst at yLabelsRot}(0,\rA){%
+ \strut\expandafter\psvlabel\expandafter{\psPutYLabel{\nA}}}}%
+ \SpecialLabelsDonetrue
\fi
- \pst at cnta=#1\relax% % % Distance (in sp) to end.
- \divide\pst at cnta\psk at dy\relax% % Number of ticks/labels
- \ifnum\pst at cnta=\z@\else
- \pst at dima=\psk at dy sp % Space between ticks.
- \ifodd\number\psk at labels\else\ifPst at yAxis\pst@@vlabels\fi\fi
- \showoriginfalse
- \fi
\fi
- \else
- \edef\pst at tempA{\strip at pt#1}%
- \pstFPmul\pst at tempA{\pst at tempA}{65536}%
- \pstFPdiv\pst at tempA{\pst at tempA}{\psk at dy}%
- \pstFPadd\pst at tempA{1.55}{\pst at tempA}% % to prevent rounding errors
- \edef\pst at tempB{\pst at int{\pst at tempA}}%
-% \divide\pst at cnta\psk at dy\relax% % Number of ticks/labels
- \edef\pst at tempA{\psk at Dy}%
- \multido{\nA=#3+1,\rA=#3+\pst at tempA}{\pst at tempB}{\uput{\psylabelsep}[180]{\pst at yLabelsRot}(0,\rA){%
- \strut\expandafter\psvlabel\expandafter{\psPutYLabel{\nA}}}}%
- \fi%
}
% \pst at dima: the width between two labels in pt
% \pst at dimc: the coordinate of the origin in pt
More information about the tex-live-commits
mailing list