diff options
Diffstat (limited to 'Master/texmf-dist')
| -rw-r--r-- | Master/texmf-dist/doc/generic/pst-plot/Changes | 3 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.pdf | bin | 1217251 -> 1228929 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.tex | 28 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex | 43 |
4 files changed, 54 insertions, 20 deletions
diff --git a/Master/texmf-dist/doc/generic/pst-plot/Changes b/Master/texmf-dist/doc/generic/pst-plot/Changes index 54691bdb897..5490ff2fd77 100644 --- a/Master/texmf-dist/doc/generic/pst-plot/Changes +++ b/Master/texmf-dist/doc/generic/pst-plot/Changes @@ -1,4 +1,7 @@ ----- pst-plot.tex +1.68 2014-08-04 - set trigLabels=false for \psx|yTick + added documentation for options psgrid, gridpara and gridcoor +1.67 2014-07-31 - option showgrid is valid for \psaxes with gridstyleA 1.66 2014-07-30 - option showpoints is valid for \psCoordinates preset to true 1.65 2014-07-12 - allow PostScript expression for \psx|yTick diff --git a/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.pdf b/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.pdf Binary files differindex 9b61ad2bea5..75e2c6df063 100644 --- a/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.pdf +++ b/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.pdf diff --git a/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.tex b/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.tex index 15754f1290d..edf562a3bc9 100644 --- a/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.tex +++ b/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.tex @@ -1,4 +1,4 @@ -% $Id: pst-plot-doc.tex 56 2014-07-30 07:34:07Z herbert $ +% $Id: pst-plot-doc.tex 64 2014-08-04 07:26:55Z herbert $ \documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings headexclude,footexclude,oneside,dvipsnames,svgnames]{pst-doc} \listfiles @@ -1144,6 +1144,7 @@ redefinition, then do it for \Lcs{pst@@@hlabel} and \Lkeyword{plotstyle} & style & \Lkeyval{line} & \pageref{plotstyle}\\ \Lkeyword{polarplot} & boolean & \false & \pageref{polarplots}\\ \Lkeyword{PSfont} & PS font & \Lkeyval{Times-Romasn} & \pageref{values}\\ +\Lkeyword{psgrid} & boolean & \false & \pageref{psgrid}\\ \Lkeyword{quadrant} & integer & 4 & \pageref{quadrant}\\ \Lkeyword{subtickcolor} & color & \Lkeyval{darkgray} & \pageref{tickcolor}\\ \Lkeyword{subticklinestyle} & \Lkeyval{solid}|\Lkeyval{dashed}|\Lkeyval{dotted}|\Lkeyval{none} @@ -2716,6 +2717,31 @@ This is only a demonstration that the default option \xLkeyword{xylogBase}=\{\} \end{LTXexample} + +\subsection{Option \nxLkeyword{psgrid}, \nxLkeyword{gridcoor}, and \nxLkeyword{gridpara}}\label{psgrid} + +A simple grid can be set with the optional argument \Lkeyword{psgrid} which uses +the setting of \Lkeyword{gridpara} and \Lkeyword{gridcoor}. +\Lkeyword{gridpara} is preset to +\begin{lstlisting} +\gridpara={gridlabels=0pt,gridcolor=red!30,subgridcolor=green!30, + subgridwidth=0.5\pslinewidth,subgriddiv=5},... +\end{lstlisting} + +\begin{LTXexample}[pos=t] +\usepackage{pst-plot} +\psset{llx=-5mm,lly=-5mm,urx=5mm,ury=5mm,labelFontSize=\scriptstyle, + algebraic,plotpoints=200,psgrid,gridcoor={(0,0)(9,4)}} +\begin{psgraph}[linecolor=gray]{->}(0,0)(9,4){10cm}{!} +\psplot[linecolor=NavyBlue]{0}{9}{sqrt(x)}% needs dvipsnames +\psdots(*2 {sqrt(2)})(4,2)(4,0) +\uput[90](*2 {sqrt(2)}){$(x,y)$}\uput[90](4,2){$(4,2)$}\uput[90](4,0){$(4,0)$} +\rput(7,2.2){\textcolor{NavyBlue}{$y=\sqrt{x}$}} +\end{psgraph} +\end{LTXexample} + +%$ + %------------------------------------------------------------------------------------ \section{New options for \nxLcs{readdata}}\label{ignorelines} %------------------------------------------------------------------------------------ diff --git a/Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex b/Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex index f68a5473f94..d38596eddc2 100644 --- a/Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex +++ b/Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex @@ -1,4 +1,4 @@ -% $Id: pst-plot.tex 56 2014-07-30 07:34:07Z herbert $ +% $Id: pst-plot.tex 64 2014-08-04 07:26:55Z herbert $ %% %% BEGIN pst-plot.tex %% @@ -22,8 +22,8 @@ \ifx\PSTFPloaded\endinput\else \input pst-fp.tex \fi \ifx\MultidoLoaded\endinput\else \input multido.tex \fi % -\def\fileversion{1.66} -\def\filedate{2014/07/30} +\def\fileversion{1.68} +\def\filedate{2014/08/04} \message{ v\fileversion, \filedate\space (tvz,hv)} % \edef\TheAtCode{\the\catcode`\@} @@ -1464,6 +1464,7 @@ D\space##1% \def\psxTick@ii#1(#2)#3{{% \pst@killglue \addbefore@par{arrows=-,linewidth=\psk@xtickwidth\pslinewidth} + \ifPst@xtrigLabels\addto@par{xtrigLabels=false}\fi \use@par \edef\temp@coor{(!#2 \pst@number\pst@xticksizeB \pst@number\psyunit div)(!#2 \pst@number\pst@xticksizeA \pst@number\psyunit div)}% \expandafter\psline\temp@coor @@ -1481,6 +1482,7 @@ D\space##1% \def\psyTick@ii#1(#2)#3{{% \pst@killglue \addbefore@par{arrows=-,linewidth=\psk@ytickwidth\pslinewidth} + \ifPst@ytrigLabels\addto@par{ytrigLabels=false}\fi \use@par \edef\temp@coor{(!\pst@number\pst@yticksizeB \pst@number\psxunit div #2)(!\pst@number\pst@yticksizeA \pst@number\psxunit div #2)}% \expandafter\psline\temp@coor @@ -1749,6 +1751,7 @@ D\space##1% \begingroup% \SpecialCoor \use@par + \ifshowgrid\psgrid[style=gridstyleA]\fi \uput{\psxlabelsep}[#5](#3|#1){#4}\uput{\psylabelsep}[#7](#1|#3){#6}% \endgroup% \ignorespaces} @@ -1762,6 +1765,7 @@ D\space##1% \addbefore@par{xlabelPos=top,ylabelPos=right}\fi\fi% \setbox\pst@hbox=\hbox\bgroup% \use@par% now the same with an optional unit=... in par + \ifshowgrid\psgrid[style=gridstyleA]\fi \pssetxlength\pst@dimg{#1}% o-x \pssetylength\pst@dimh{#2}% o-y \pssetxlength\pst@dima{#3}% ll-x @@ -2280,7 +2284,8 @@ D\space##1% \define@boolkey[psset]{pst-plot}[Pst@]{psgrid}[true]{} \define@key[psset]{pst-plot}{gridpara}[{}]{\def\psk@gridpara{#1}} \define@key[psset]{pst-plot}{gridcoor}[\relax]{\def\psk@gridcoor{#1}} -\psset[pst-plot]{psgrid=false,gridpara={},gridcoor=\relax} +\psset[pst-plot]{psgrid=false,gridpara={gridlabels=0pt,gridcolor=red!30,subgridcolor=green!30,subgridwidth=0.5\pslinewidth, + subgriddiv=5},gridcoor=\relax} % \define@key[psset]{pst-plot}{axespos}[bottom]{\pst@expandafter\psset@@axespos{#1}\@nil} \def\psset@@axespos#1#2\@nil{% @@ -2318,14 +2323,10 @@ D\space##1% % minX | minY | maxX | maxY | Length x-axis | length y-axis% \pst@killglue% \let\psgraph@para\pst@par - \begingroup% - \bgroup% - \use@keep@par% - \ifPst@psgrid% - \expandafter\psset\expandafter{\psk@gridpara}% - \rput(0,0){\expandafter\psgrid\psk@gridcoor} - \fi% - \egroup% + \begingroup +% \bgroup + \use@keep@par +% \egroup% \pstFPsub\pst@tempA{#3}{#1}% \pst@dimm=#5% \pst@dimo=\pst@tempA pt% @@ -2350,6 +2351,10 @@ D\space##1% \ifdim\pst@xunit=\pst@yunit\relax\psset[pstricks]{runit=\pst@xunit}\fi% \bgroup \use@par + \ifPst@psgrid + \expandafter\psset\expandafter{\psk@gridpara}% + \rput[lb](0,0){\expandafter\psgrid\psk@gridcoor} + \fi \ifnum\psk@axespos=0 \psaxes(#1,#2)(#3,#4)% \else @@ -2363,13 +2368,9 @@ D\space##1% \pst@killglue% \let\psgraph@para\pst@par \begingroup% - \bgroup% - \use@keep@par% - \ifPst@psgrid% - \expandafter\psset\expandafter{\psk@gridpara}% - \rput(0,0){\expandafter\psgrid\psk@gridcoor} - \fi% - \egroup% +% \bgroup% + \use@keep@par +% \egroup% \pstFPsub\pst@tempA{#5}{#3}% \pst@dimm=#7% \pst@dimo=\pst@tempA pt% @@ -2393,6 +2394,10 @@ D\space##1% \ifdim\pst@xunit=\pst@yunit \psset[pstricks]{runit=\pst@xunit}\fi% \bgroup% \use@par% + \ifPst@psgrid + \expandafter\psset\expandafter{\psk@gridpara}% + \rput[lb](0,0){\expandafter\psgrid\psk@gridcoor} + \fi% \ifnum\psk@axespos=0 \psaxes(#1,#2)(#3,#4)(#5,#6)% \else |