summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/makeplot
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2006-10-04 08:43:01 +0000
committerNorbert Preining <preining@logic.at>2006-10-04 08:43:01 +0000
commitba9472aebfed07843bc4faa00c7b96bc86194691 (patch)
tree4a952a012e2f1663beaac6384dec265fb50dd361 /Master/texmf-dist/tex/latex/makeplot
parenta88bdfe70c672cfced299babf0a54881a916bcca (diff)
Fix ctan2tds for pgf installation
comment powerdot-doc-vn in tpm-ctan-check, it always breaks Update of the following packages: labelcas pstricks-add sectionbox ltxmisc frenchle flowfram verse emulateapj pst-pdf poemscol babelbib dk-bib breakurl screenplay ncctools xkeyval bibleref muthesis pst-labo pgf ncclatex active-conf xcolor commath lineno dottex makeplo git-svn-id: svn://tug.org/texlive/trunk@2240 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/makeplot')
-rw-r--r--Master/texmf-dist/tex/latex/makeplot/makeplot.sty78
1 files changed, 49 insertions, 29 deletions
diff --git a/Master/texmf-dist/tex/latex/makeplot/makeplot.sty b/Master/texmf-dist/tex/latex/makeplot/makeplot.sty
index bc67dc5f99a..a9b45792196 100644
--- a/Master/texmf-dist/tex/latex/makeplot/makeplot.sty
+++ b/Master/texmf-dist/tex/latex/makeplot/makeplot.sty
@@ -40,8 +40,8 @@
%% Right brace \} Tilde \~}
%%
\NeedsTeXFormat{LaTeX2e}%
-\ProvidesPackage{makeplot}[2005/09/22 %
- v1.0 %
+\ProvidesPackage{makeplot}[2005/12/20 %
+ v1.0.5 %
Plots utility from Jose-Emilio Vila-Forcen]%
\RequirePackage[nomessages]{fp}%
\RequirePackage{pst-plot}%
@@ -52,14 +52,21 @@
\DeclareOption{color}{%
\MP@colortrue%
\typeout{ ------}%
- \typeout{ ------ startPlot package working in color}%
+ \typeout{ ------ makePlot package working in color}%
\typeout{ ------}}%
\newif\ifMP@drawmargins%
\MP@drawmarginsfalse%
\DeclareOption{drawmargins}{%
\MP@drawmarginstrue%
\typeout{ ------}%
- \typeout{ ------ startPlot package drawing the margins}%
+ \typeout{ ------ makePlot package drawing the margins}%
+ \typeout{ ------}}%
+\newif\ifMP@big%
+\MP@bigfalse%
+\DeclareOption{big}{%
+\MP@bigtrue
+ \typeout{ ------}%
+ \typeout{ ------ makePlot package in big size}%
\typeout{ ------}}%
\DeclareOption*{%
\PackageWarning{startPlot}{%
@@ -150,12 +157,16 @@
\define@key[psset]{makeplot}{orgY}%
{\def\orgYmakeplot{#1}} %
\pst@addfams{makeplot}%
-\psset{linewidth=0.5pt, Dx=1, Dy=1,%
+\psset{Dx=1, Dy=1,%
width=50, heightFactor=1, startX=0, endX=1, startY=0, endY=1,%
showorigin=true, axesstyle=frame, ticks=all, labels=all, %
factorBoundaryX=1, factorBoundaryY=1, captionY=100, captionX=100, %
-xsubticks=0, subticksize=1, tickwidth=0.2pt, subtickwidth=0.2pt, %
-subtickcolor=black}%
+xsubticks=0, subticksize=1, subtickcolor=black}%
+\ifMP@big%
+ \psset{tickwidth=0.5pt, subtickwidth=0.5pt, linewidth=1pt}%
+\else%
+ \psset{tickwidth=0.2pt, subtickwidth=0.2pt, linewidth=0.5pt}%
+\fi%
\psset{tickyplot=all}%
\psset{changeEndXsize=0, changeEndXpos=no}%
\ifMP@drawmargins%
@@ -274,41 +285,50 @@ subtickcolor=black}%
\ifnum \ticky=0%
\psaxes[Ox=\xa,Oy=\ya,Dx=\gridDx,Dy=\gridDy, #1,%
ticksize=-4pt 4pt, subticks=0, subticksize=0,%
- tickwidth=0.5pt, linewidth=0pt, labels=none,%
- axesstyle=axes, linecolor=white, #1, ticks=all]%
+ tickwidth=0.5pt, linewidth=0pt,%
+ axesstyle=axes, linecolor=white, #1, ticks=all, labels=none]%
{-}(\xa,\ya)(\xa,\ya)(\xz,\yz)%
\fi%
\ifnum \ticky=1%
\psaxes[Ox=\xa,Oy=\ya,Dx=\gridDx,Dy=\gridDy, #1,%
ticksize=-4pt 4pt, subticks=0, subticksize=0,%
- tickwidth=0.5pt, linewidth=0pt, labels=none,%
- axesstyle=axes, linecolor=white, #1, ticks=x]%
+ tickwidth=0.5pt, linewidth=0pt,%
+ axesstyle=axes, linecolor=white, #1, ticks=x, labels=none]%
{-}(\xa,\ya)(\xa,\ya)(\xz,\yz)%
\fi%
\ifnum \ticky=2%
\psaxes[Ox=\xa,Oy=\ya,Dx=\gridDx,Dy=\gridDy, #1,%
ticksize=-4pt 4pt, subticks=0, subticksize=0,%
- tickwidth=0.5pt, linewidth=0pt, labels=none,%
- axesstyle=axes, linecolor=white, #1, ticks=y]%
+ tickwidth=0.5pt, linewidth=0pt,%
+ axesstyle=axes, linecolor=white, #1, ticks=y, labels=none]%
{-}(\xa,\ya)(\xa,\ya)(\xz,\yz)%
\fi%
\ifnum \ticky=3%
- \psset{ticks=none}%
\fi%
%
% Put the main axes and the grid
- \psaxes[xticksize=0pt \tickHerex mm, yticksize=0pt \tickHerey mm,%
+ \FPround\tickHerex{\tickHerex}{10}%
+ \FPround\tickHerey{\tickHerey}{10}%
+ \psaxes[xticksize=0mm \tickHerex mm, yticksize=0mm \tickHerey mm,%
Ox=\xa,Oy=\ya,Dx=\gridDx,Dy=\gridDy, #1]%
{-}(\xaOrigin,\yaOrigin)(\xa,\ya)(\xz,\yz)%
+\def\MP@xa{\xaOrigin}%
+\def\MP@ya{\yaOrigin}%
+\def\MP@xz{\xz}%
+\def\MP@yz{\yz}%
%
% Write the legend of the plot
\rput(\xaa,\ymid){\rotateleft{\fonttitleY #2}}%
\rput(\xmid,\yaa){\fonttitleX #3}%
- \psset{linewidth=1pt}%
+ \ifMP@big%
+ \psset{linewidth=2pt}%
+ \else%
+ \psset{linewidth=1pt}%
+ \fi%
}%
\def\plotFile{\@ifnextchar[\@plotFile{\@plotFile[]}}%
\def\@plotFile[#1]#2{%
- \readdata{\data}{#2}\dataplot[#1]{\data}}%
+ \readdata[#1]{\data}{#2}\listplot[#1]{\data}}%
\def\plotFileA{\@ifnextchar[\@plotFileA{\@plotFileA[]}}%
\def\@plotFileA[#1]#2{%
\styleoflineA%
@@ -463,14 +483,14 @@ subtickcolor=black}%
\whiteBG[#1]{\leftX}{\lowY}{\rightX}{\highY}}%
\def\legendUL{\@ifnextchar[\@legendUL{\@legendUL[]}}%
\def\@legendUL[#1]#2#3{%
- \FPmul\xUL\xa{1}%
- \FPmul\yUL\yz{1}%
+ \FPmul\xUL\MP@xa{1}%
+ \FPmul\yUL\MP@yz{1}%
\legendXY[#1](\xUL,\yUL){#2}{#3}}%
%
\def\legendUR{\@ifnextchar[\@legendUR{\@legendUR[]}}%
\def\@legendUR[#1]#2#3{%
- \FPmul\xUR\xz{1}%
- \FPmul\yUR\yz{1}%
+ \FPmul\xUR\MP@xz{1}%
+ \FPmul\yUR\MP@yz{1}%
\def\sep{0.5}%
\FPdiv\xp\sep\unitX% To separate \sep mm the legend from the axe
\FPmul\xp\xp{2}%
@@ -484,10 +504,10 @@ subtickcolor=black}%
\psset{#1}%
\def\sepY{\sepYlegendXY}%
\def\sepTx{\sepTxlegendXY}%
- \FPmul\xzDL\xz{1}%
- \FPmul\xaDL\xa{1}%
- \FPmul\yzDL\yz{1}%
- \FPmul\yaDL\ya{1}%
+ \FPmul\xzDL\MP@xz{1}%
+ \FPmul\xaDL\MP@xa{1}%
+ \FPmul\yzDL\MP@yz{1}%
+ \FPmul\yaDL\MP@ya{1}%
\FPdiv\sep\sepY{8}%
\FPdiv\sep\sepY{8}%
\FPdiv\sepYy\sepY{1.33} %
@@ -515,10 +535,10 @@ subtickcolor=black}%
\psset{#1}%
\def\sepY{\sepYlegendXY}%
\def\sepTx{\sepTxlegendXY}%
- \FPmul\xzDR\xz{1}%
- \FPmul\xaDR\xa{1}%
- \FPmul\yzDR\yz{1}%
- \FPmul\yaDR\ya{1}%
+ \FPmul\xzDR\MP@xz{1}%
+ \FPmul\xaDR\MP@xa{1}%
+ \FPmul\yzDR\MP@yz{1}%
+ \FPmul\yaDR\MP@ya{1}%
\FPdiv\sep\sepY{8}%
\FPdiv\sepYy\sepY{1.33} %
\FPdiv\x\sep\unitX% To separate \sep mm the legend from the axe