diff options
author | Karl Berry <karl@freefriends.org> | 2013-04-25 22:32:22 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2013-04-25 22:32:22 +0000 |
commit | 7961bdb11ded0df109c55b8dcf8418ee3c5b1239 (patch) | |
tree | 64cce4513a2e890039c5c8398fcd1223e542a5aa /Master/texmf-dist/tex | |
parent | d5e3c90d94a967b4c6fd0a3867d9ffdf47925a06 (diff) |
numericplots (25apr13)
git-svn-id: svn://tug.org/texlive/trunk@30103 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r-- | Master/texmf-dist/tex/latex/numericplots/NumericPlots.sty | 49 |
1 files changed, 30 insertions, 19 deletions
diff --git a/Master/texmf-dist/tex/latex/numericplots/NumericPlots.sty b/Master/texmf-dist/tex/latex/numericplots/NumericPlots.sty index c6bc42e9c4b..babea7d8338 100644 --- a/Master/texmf-dist/tex/latex/numericplots/NumericPlots.sty +++ b/Master/texmf-dist/tex/latex/numericplots/NumericPlots.sty @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{NumericPlots}% - [2013/04/19 v. 2.0 LaTeX package to plot numeric data] + [2013/04/25 v. 2.0.1 LaTeX package to plot numeric data] \RequirePackage{calc} @@ -158,6 +158,11 @@ \fi } +\define@boolkey[NumericDataPlot]{Axis}{xLogNoSubGrid}[true]{ +} +\define@boolkey[NumericDataPlot]{Axis}{yLogNoSubGrid}[true]{ +} + \define@boolkey[NumericDataPlot]{Axis}{yNearlyTight}[false]{} % xMin and yMin also set xO/yO. It will later be ensured that if the user @@ -455,14 +460,17 @@ } \newcommand{\xLogSubGrid}[1]{ - \ifNumericDataPlot@Axis@xLog - \multido{\iSubb=2+2}{4}{ - \FPln{\NumDataPlotBuffer}{\iSubb} - \FPdiv{\NumDataPlotBuffer}{\NumDataPlotBuffer}{\NumDataPlotLnTen} - \FPmul{\NumDataPlotBuffer}{\NumDataPlotBuffer}{\NumDataPlotxDataCoordRatio} - \FPadd{\NumDataPlotTickPos}{#1}{\NumDataPlotBuffer} - \plotxSubGridLine{\NumDataPlotTickPos} - } + \ifNumericDataPlot@Axis@xLogNoSubGrid + \else + \ifNumericDataPlot@Axis@xLog + \multido{\iSubb=2+1}{8}{ + \FPln{\NumDataPlotBuffer}{\iSubb} + \FPdiv{\NumDataPlotBuffer}{\NumDataPlotBuffer}{\NumDataPlotLnTen} + \FPmul{\NumDataPlotBuffer}{\NumDataPlotBuffer}{\NumDataPlotxDataCoordRatio} + \FPadd{\NumDataPlotTickPos}{#1}{\NumDataPlotBuffer} + \plotxSubGridLine{\NumDataPlotTickPos} + } + \fi \fi } @@ -575,7 +583,7 @@ % \FPifpos{\NumDataPlotyMin} \FPmul{\NumDataPlotyMin}{\NumDataPlotyMin}{0.9} \else \FPmul{\NumDataPlotyMin}{\NumDataPlotyMin}{1.1}\fi % \fi - % for logarithmic axes: calculate log(xMax), log(xMin), Dx=1, xO=ceil(xMin) + % for logarithmic axes: calculate log(xMax), log(xMin), Dy=1, xO=ceil(xMin) \ifNumericDataPlot@Axis@yLog \FPln{\NumDataPlotBuffer}{\NumDataPlotyMax} \FPdiv{\NumDataPlotyMax}{\NumDataPlotBuffer}{\NumDataPlotLnTen} @@ -682,14 +690,17 @@ \newcommand{\yLogSubGrid}[1]{% % plots the subgrid for logarithmic axes, i.e. the grid between the two lines % 10^x and 10^(x+1) - \ifNumericDataPlot@Axis@yLog - \multido{\iSubb=2+2}{4}{ - \FPln{\NumDataPlotBuffer}{\iSubb} - \FPdiv{\NumDataPlotBuffer}{\NumDataPlotBuffer}{\NumDataPlotLnTen} - \FPmul{\NumDataPlotBuffer}{\NumDataPlotBuffer}{\NumDataPlotyDataCoordRatio} - \FPadd{\NumDataPlotTickPos}{#1}{\NumDataPlotBuffer} - \plotySubGridLine{\NumDataPlotTickPos} - } + \ifNumericDataPlot@Axis@yLogNoSubGrid + \else + \ifNumericDataPlot@Axis@yLog + \multido{\iSubb=2+1}{8}{ + \FPln{\NumDataPlotBuffer}{\iSubb} + \FPdiv{\NumDataPlotBuffer}{\NumDataPlotBuffer}{\NumDataPlotLnTen} + \FPmul{\NumDataPlotBuffer}{\NumDataPlotBuffer}{\NumDataPlotyDataCoordRatio} + \FPadd{\NumDataPlotTickPos}{#1}{\NumDataPlotBuffer} + \plotySubGridLine{\NumDataPlotTickPos} + } + \fi \fi } @@ -894,7 +905,7 @@ yMax=100, yMin=0, Dy=10, yCoordMax=\NumDataPlotGyPicMax, yCoordMin=\NumDataPlotGyPicMin, yLog=false, - yNearlyTight=false, + yNearlyTight=false }{} \presetkeys[NumericDataPlot]{xAxis}{ NoGrid=false, NoTicks=false, NoLabel=false, NoTickLabel=false |