texlive[45830] Master/texmf-dist: pst-plot (16nov17)
commits+karl at tug.org
commits+karl at tug.org
Thu Nov 16 23:14:00 CET 2017
Revision: 45830
http://tug.org/svn/texlive?view=revision&revision=45830
Author: karl
Date: 2017-11-16 23:14:00 +0100 (Thu, 16 Nov 2017)
Log Message:
-----------
pst-plot (16nov17)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/generic/pst-plot/Changes
trunk/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.pdf
trunk/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.tex
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-11-16 22:13:46 UTC (rev 45829)
+++ trunk/Master/texmf-dist/doc/generic/pst-plot/Changes 2017-11-16 22:14:00 UTC (rev 45830)
@@ -1,4 +1,5 @@
----- pst-plot.tex
+1.86 2017-11-16 - fix for trailing spaces in x|ylabelPos
1.85 2017-11-12 - try to prevent overfull hbox for the x axis
used \hbox to 0pt [...\hss}
- fix bug with wrong \use at par setting for \psaxes at vii
Modified: trunk/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.tex
===================================================================
--- trunk/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.tex 2017-11-16 22:13:46 UTC (rev 45829)
+++ trunk/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.tex 2017-11-16 22:14:00 UTC (rev 45830)
@@ -1,4 +1,4 @@
-% $Id: pst-plot-doc.tex 641 2017-11-13 18:56:40Z herbert $
+% $Id: pst-plot-doc.tex 648 2017-11-16 12:02:14Z herbert $
\documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings
headexclude,footexclude,oneside,dvipsnames,svgnames]{pst-doc}
\listfiles
@@ -65,7 +65,8 @@
Martin Paech;
Alan Ristow;
Christine Römer;
-Arnaud Schmittbuhl
+Arnaud Schmittbuhl;
+Uwe Siart
\end{abstract}
\clearpage
Modified: trunk/Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex 2017-11-16 22:13:46 UTC (rev 45829)
+++ trunk/Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex 2017-11-16 22:14:00 UTC (rev 45830)
@@ -1,4 +1,4 @@
-% $Id: pst-plot.tex 641 2017-11-13 18:56:40Z herbert $
+% $Id: pst-plot.tex 647 2017-11-16 10:35:12Z herbert $
%%
%% BEGIN pst-plot.tex
%%
@@ -23,8 +23,8 @@
\ifx\PSTFPloaded\endinput\else \input pst-fp.tex \fi
\ifx\MultidoLoaded\endinput\else \input multido.tex \fi
%
-\def\fileversion{1.85}
-\def\filedate{2017/11/12}
+\def\fileversion{1.86}
+\def\filedate{2017/11/16}
\message{ v\fileversion, \filedate\space (tvz,hv)}
%
\edef\TheAtCode{\the\catcode`\@}
@@ -1312,32 +1312,34 @@
\@nameuse{Pst at xAxis#1}\@nameuse{Pst at yAxis#1}}%
\psset[pst-plot]{xAxis,yAxis}%
%
-\define at key[psset]{pst-plot}{xlabelPos}[b]{\pst at expandafter\psset@@xlabelPos{#1}\@nil}
-\define at key[psset]{pst-plot}{ylabelPos}[l]{\pst at expandafter\psset@@ylabelPos{#1}\@nil}
+\define at key[psset]{pst-plot}{xlabelPos}[b]{\pst at expandafter\psset@@xlabelPos#1\@nil}
+\define at key[psset]{pst-plot}{ylabelPos}[l]{\pst at expandafter\psset@@ylabelPos#1\@nil}
\def\psset@@xlabelPos#1#2\@nil{%
- \ifx#1t
- \def\psk at xlabelPos{\tw@}% 2=top
- \pst at xticksizeC=\pst at xticksizeB%
+ \ifx#1t\relax
+ \let\psk at xlabelPos\tw@% 2=top
+ \pst at xticksizeC=\pst at xticksizeB
\else
- \ifx#1a
- \def\psk at xlabelPos{\@ne}% 1=axis
- \pst at xticksizeC=\z@%
+ \ifx#1a\relax
+ \let\psk at xlabelPos\@ne % 1=axis
+ \pst at xticksizeC=\z@
\else
\def\psk at xlabelPos{\z@}% 0=bottom
- \pst at xticksizeC=\pst at xticksizeA%
- \fi\fi}%
+ \pst at xticksizeC=\pst at xticksizeA
+ \fi\fi
+}
\def\psset@@ylabelPos#1#2\@nil{%
- \ifx#1r
+ \ifx#1r\relax
\def\psk at ylabelPos{\tw@}% 2=right
- \pst at yticksizeC=\pst at yticksizeB%
+ \pst at yticksizeC=\pst at yticksizeB
\else
- \ifx#1a
+ \ifx#1a\relax
\def\psk at ylabelPos{\@ne}% 1=axis
- \pst at yticksizeC=\z@%
+ \pst at yticksizeC=\z@
\else
\def\psk at ylabelPos{\z@}% 0=left
- \pst at yticksizeC=\pst at yticksizeA%
- \fi\fi}
+ \pst at yticksizeC=\pst at yticksizeA
+ \fi\fi
+}
\psset[pst-plot]{xlabelPos=b, ylabelPos=l}%
%
\define at key[psset]{pst-plot}{xyDecimals}[{}]{\def\psk at xDecimals{#1}\def\psk at yDecimals{#1}}
@@ -1776,11 +1778,11 @@
\pst at xticksizeB=\the\pst at dimn% first > second value
\fi%
\edef\psk at xticksize{\pst at number\pst at xticksizeA \pst at number\pst at xticksizeB}%
- \ifnum\psk at xlabelPos<\z@\relax % top
- \pst at xticksizeC=\pst at dimn%
- \else%
+ \ifnum\psk at xlabelPos<\z@\relax% top
+ \pst at xticksizeC=\pst at dimn
+ \else
\pst at xticksizeC=\pst at dimm% bottom
- \fi%
+ \fi
}
\def\set at yticksize#1{%
\pst at expandafter\pst at getxdimdim{#1} {} {}\@nil% x-unit!
@@ -1980,8 +1982,10 @@
\def\psaxes at vii(#1,#2)(#3,#4)(#5,#6){%
\pst at killglue
\begingroup
- \ifdim\pst at dimc<\z@\relax \ifdim\pst at dimd<\z@\relax % axes show to left and down
- \addbefore at par{xlabelPos=top,ylabelPos=right}\fi\fi
+ \ifdim\pst at dimc<\z@\relax
+ \ifdim\pst at dimd<\z@\relax % axes show to left and down
+ \addbefore at par{xlabelPos=t,ylabelPos=r}%
+ \fi\fi
\use at par% now the same with an optional unit=... in par
\pssetxlength\pst at dimc{#5}% ur-x
\pssetylength\pst at dimd{#6}% ur-y
@@ -2404,8 +2408,8 @@
\fi
\else
\ifnum\psk at xlabelPos=\tw@ \def\pst at tempC{90}\else\def\pst at tempC{-90}\fi
- \pstFPsub\pst at pmtempa{#4}{#3}
- \pstFPDiv\pst at pmtempb{\pst at pmtempa}{\psk at Dx}
+ \pstFPsub\pst at pmtempa{#4}{#3}%
+ \pstFPDiv\pst at pmtempb{\pst at pmtempa}{\psk at Dx}%
\pstFPadd\pst at pmtempc{\pst at pmtempb}{-1}%
\pstFPadd\pst at pmtempd{\pst at pmtempb}{1}%
\ifdim\pst at pmtempb pt < \z@
@@ -2424,10 +2428,10 @@
% Knows \pst at dimb and \pst at cnta
\def\pst@@hlabels{%
\setbox\z@=\vbox{% save all in a box
- \ifcase\psk at xlabelPos % 0
- \vskip-\pst at xticksizeA\vskip\psxlabelsep\or % 1
- \vskip-1ex\vskip-\pslabelsep\or % 2
- \vskip-\pst at xticksizeB\vskip-\psxlabelsep\vskip-1ex % 3
+ \ifcase\psk at xlabelPos
+ \vskip-\pst at xticksizeA\vskip\psxlabelsep\or% 1
+ \vskip-1ex\vskip-\pslabelsep\or% 2
+ \vskip-\pst at xticksizeB\vskip-\psxlabelsep\vskip-1ex% 3
\fi
\ifnum\pst at cnta<\z@ \pst at dimb=-\pst at dimb\fi
\hbox to \z@{%
@@ -2452,7 +2456,7 @@
\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.
+ \pst at dima=\psk at dy sp% % Space between ticks.
\ifodd\number\psk at labels\else\ifPst at yAxis\pst@@vlabels\fi
\fi
\showoriginfalse
@@ -2463,7 +2467,7 @@
\pstFPDiv\pst at pmtempb{\pst at pmtempa}{\psk at Dy}%
\pstFPadd\pst at pmtempc{\pst at pmtempb}{-1}%
\pstFPadd\pst at pmtempd{\pst at pmtempb}{1}%
- \ifdim\pst at pmtempb pt < \z@ \def\pst at pmtempe{\pst at int{\pst at pmtempc}}\else\def\pst at pmtempe{\pst at int{\pst at pmtempd}}\fi%
+ \ifdim\pst at pmtempb pt < \z@ \def\pst at pmtempe{\pst at int{\pst at pmtempc}}\else\def\pst at pmtempe{\pst at int{\pst at pmtempd}}\fi
\multido{\nA=0+1,\rA=#3+\psk at Dy}{\pst at pmtempe}{%
\ifdim \nA pt < \z@ \def\nB{-\nA}\else \def\nB{\nA}\fi
\uput{\psylabelsep}[180]{\pst at yLabelsRot}(0,\rA){%
@@ -2484,9 +2488,9 @@
\offinterlineskip
\ifshoworigin
\vbox to \z@{\vss\hbox to\z@{%
- \ifcase\psk at ylabelPos%
+ \ifcase\psk at ylabelPos
\hss\pst@@@vlabel{\psk at Oy}\hskip\psylabelsep\hskip-\pst at yticksizeA\or%
- \hskip\pslabelsep\hss\pst@@@vlabel{\psk at Oy}\hss\or % right labels
+ \hskip\pslabelsep\hss\pst@@@vlabel{\psk at Oy}\hss\or% % right labels
\hskip\pst at yticksizeB\hskip\psylabelsep\pst@@@vlabel{\psk at Oy}%
\fi}\vss}%
\fi
@@ -2495,9 +2499,9 @@
\vbox to \z@{%
\vss\hbox to\z@{%
\ifcase\psk at ylabelPos % and also check for -0
- \hss\ifdim\nA pt=\z@ \ifshoworigin\pst@@@vlabel{0}\fi\else\pst@@@vlabel{\nA}\fi%
+ \hss\ifdim\nA pt=\z@ \ifshoworigin\pst@@@vlabel{0}\fi\else\pst@@@vlabel{\nA}\fi
\hskip\psylabelsep\hskip-\pst at yticksizeA\or% top = 1
- \hss\ifdim\nA pt=\z@ \ifshoworigin\pst@@@vlabel{0}\fi\else\pst@@@vlabel{\nA}\fi%
+ \hss\ifdim\nA pt=\z@ \ifshoworigin\pst@@@vlabel{0}\fi\else\pst@@@vlabel{\nA}\fi
\ifdim\psylabelsep=\z@\hss\else\kern-\psylabelsep\fi\or% right=2
\hskip\pst at yticksizeB\hskip\psylabelsep
\ifdim\nA pt=\z@ \ifshoworigin\pst@@@vlabel{0}\fi\else\pst@@@vlabel{\nA}\fi% bottom
More information about the tex-live-commits
mailing list