From 67f2e7d5c34856c46dfc54d79dc9592984aefc17 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 26 Aug 2009 23:59:02 +0000 Subject: makeplot update (26aug09) git-svn-id: svn://tug.org/texlive/trunk@14876 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/makeplot/README | 4 +-- Master/texmf-dist/doc/latex/makeplot/data1.mat | 4 +-- Master/texmf-dist/doc/latex/makeplot/data2.mat | 4 +-- Master/texmf-dist/doc/latex/makeplot/makeplot.pdf | Bin 169148 -> 147019 bytes Master/texmf-dist/doc/latex/makeplot/mptest.tex | 4 +-- .../texmf-dist/source/latex/makeplot/makeplot.dtx | 39 +++++++++++---------- .../texmf-dist/source/latex/makeplot/makeplot.ins | 6 ++-- Master/texmf-dist/tex/latex/makeplot/makeplot.sty | 38 ++++++++++---------- 8 files changed, 50 insertions(+), 49 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/makeplot/README b/Master/texmf-dist/doc/latex/makeplot/README index b1980ebeb86..04a5433c1aa 100644 --- a/Master/texmf-dist/doc/latex/makeplot/README +++ b/Master/texmf-dist/doc/latex/makeplot/README @@ -2,7 +2,7 @@ I'd like to announce the availability of my LaTeX2e makeplot Package. -COPYRIGHT 2005-2007 by Jose-Emilio Vila-Forcen (jemilio@ieee.org) +COPYRIGHT 2005-2009 by Jose-Emilio Vila-Forcen (jemilio@gmail.com) This program can be redistributed and/or modified under the terms of the LaTeX Project Public License Distributed from CTAN @@ -23,7 +23,7 @@ DOCUMENTATION: EXAMPLE: Execute the following list of commands to create the PS example: (it works only in the postscript file, not in the dvi) - latex makeplot.ins (if you have not done it before + latex makeplot.ins (if you have not done it before) latex mptest.tex dvips mptest diff --git a/Master/texmf-dist/doc/latex/makeplot/data1.mat b/Master/texmf-dist/doc/latex/makeplot/data1.mat index 360184483c2..0d6bc637f48 100644 --- a/Master/texmf-dist/doc/latex/makeplot/data1.mat +++ b/Master/texmf-dist/doc/latex/makeplot/data1.mat @@ -5,7 +5,7 @@ %% The original source files were: %% %% makeplot.dtx (with options: `data1') -%% Copyright 2004--2008 by Jose Emilio Vila Forcen (jemilio@ieee.org) +%% Copyright 2004--2008 by Jose Emilio Vila Forcen (jemilio@gmail.com) %% %% All rights reserved. %% @@ -20,7 +20,7 @@ %% version 2003/12/01 or later. %% %% This work has the LPPL maintenance status "maintained". -%% The Current Maintainer of this work is Jose Emilio Vila Forcen (jemilio@ieee.org). +%% The Current Maintainer of this work is Jose Emilio Vila Forcen (jemilio@gmail.com). %% %% \CharacterTable diff --git a/Master/texmf-dist/doc/latex/makeplot/data2.mat b/Master/texmf-dist/doc/latex/makeplot/data2.mat index a88a51143da..f107acfec98 100644 --- a/Master/texmf-dist/doc/latex/makeplot/data2.mat +++ b/Master/texmf-dist/doc/latex/makeplot/data2.mat @@ -5,7 +5,7 @@ %% The original source files were: %% %% makeplot.dtx (with options: `data2') -%% Copyright 2004--2008 by Jose Emilio Vila Forcen (jemilio@ieee.org) +%% Copyright 2004--2008 by Jose Emilio Vila Forcen (jemilio@gmail.com) %% %% All rights reserved. %% @@ -20,7 +20,7 @@ %% version 2003/12/01 or later. %% %% This work has the LPPL maintenance status "maintained". -%% The Current Maintainer of this work is Jose Emilio Vila Forcen (jemilio@ieee.org). +%% The Current Maintainer of this work is Jose Emilio Vila Forcen (jemilio@gmail.com). %% %% \CharacterTable diff --git a/Master/texmf-dist/doc/latex/makeplot/makeplot.pdf b/Master/texmf-dist/doc/latex/makeplot/makeplot.pdf index f47b01e00bc..15efb926a85 100644 Binary files a/Master/texmf-dist/doc/latex/makeplot/makeplot.pdf and b/Master/texmf-dist/doc/latex/makeplot/makeplot.pdf differ diff --git a/Master/texmf-dist/doc/latex/makeplot/mptest.tex b/Master/texmf-dist/doc/latex/makeplot/mptest.tex index 5bfb4cfae43..0b954fade58 100644 --- a/Master/texmf-dist/doc/latex/makeplot/mptest.tex +++ b/Master/texmf-dist/doc/latex/makeplot/mptest.tex @@ -5,7 +5,7 @@ %% The original source files were: %% %% makeplot.dtx (with options: `mptest') -%% Copyright 2004--2008 by Jose Emilio Vila Forcen (jemilio@ieee.org) +%% Copyright 2004--2008 by Jose Emilio Vila Forcen (jemilio@gmail.com) %% %% All rights reserved. %% @@ -20,7 +20,7 @@ %% version 2003/12/01 or later. %% %% This work has the LPPL maintenance status "maintained". -%% The Current Maintainer of this work is Jose Emilio Vila Forcen (jemilio@ieee.org). +%% The Current Maintainer of this work is Jose Emilio Vila Forcen (jemilio@gmail.com). %% %% \CharacterTable diff --git a/Master/texmf-dist/source/latex/makeplot/makeplot.dtx b/Master/texmf-dist/source/latex/makeplot/makeplot.dtx index 4317812c254..c7b4874172d 100644 --- a/Master/texmf-dist/source/latex/makeplot/makeplot.dtx +++ b/Master/texmf-dist/source/latex/makeplot/makeplot.dtx @@ -2,7 +2,7 @@ % % Doc-Source file to use with LaTeX2e % -% Copyright 2005-2008 by Jose-Emilio Vila-Forcen (jemilio@ieee.org) +% Copyright 2005-2009 by Jose-Emilio Vila-Forcen (jemilio@gmail.com) % % All rights reserved. % @@ -75,6 +75,7 @@ % \@plotFileE,\@plotFileF,\@plotFileG,\@whiteBG} % \DoNotIndex{\begin,\CurrentOption,\data,\dataplot,\def,\define@choicekey, \define@key,\dif,\factorX,\factorXmakeplot,\factorY,\factorYmakeplot, \drawmargins,\drawmarginsmakeplot,\ff,\fi,\fillcolorWhiteBG, \fillstyleWhiteBG,\footnotesize,\FPadd,\FPdiv,\FPmul,\heightPlotFactor, \heightPlotFactormakeplot,\highY,\hspace,\ifMP@color,\ifMP@drawmargins, \ifnum,\l,\leftX,\linecolorWhiteBG,\linestyleWhiteBG,\linewidthWhiteBG, \llegendXY,\lowY,\makeatletter,\makeatother,\makebox,\MP@colorfalse, \MP@colortrue,\MP@drawmarginsfalse,\MP@drawmarginstrue,\n,\NeedsTeXFormat, \newcommand,\newenvironment,\newif\normalsize,\nr,\nrr,\orgX,\orgXmakeplot, \orgY,\orgYmakeplot,\posx,\posy,\ProvidesPackage,\psframe,\pshlabel, \psline,\psset,\pst@addfams,\psvlabel,\readdata,\relax,\RequirePackage, \rightX,\rotateleft,\rput,\s,\sep,\sepTx,\sepTxlegendXY,\sepY,\sepYleendXY, \sepYy,\slegendXY,\tickHerex,\tickHerey,\ticky,\tickymakeplot,\typeout, \unitX,\unitY,\val,\vall,\var,\w,widthPlot,\widthPlotmakeplot,\ww,\www, \x,\xa,\xaa,\xaaa,\xaDL,\xaDR,\xamakeplot,\xaOrigin,\xaXY,\xb,\xbb,\xc, \xDiff,\xinc,\xmid,\xp,\xUL,\xUR,\xx,\xz,\xzDL,\xzDR,\xzmakeplot,\xzz, \y,\ya,\yaa,\yaaa,\yaDL,\yaDR,\yamakeplot,\yaOrigin,\yDiff,\yinc,\ymid, \yUL,\yUR,\yz,\yzDL,\yzDR,\yzmakeplot,\yzXY,\factorBOUNDARYx, \factorBOUNDARYxmakeplot,\factorBOUNDARYy,\factorBOUNDARYymakeplot, \framearcWhiteBG,\newif,\gridDx,\gridDxmakeplot,\gridDy,\gridDymakeplot, \widthPlot,\sepYlegendXY,\sepTy,\ProcessOptions,\definecolor} % +% \changes{v1.0.7}{2009/08/26}{minor bugs corrected thanks to Herbert Voss} % \changes{v1.0.6}{2008/01/18}{minor bugs corrected due to other packages updates and improved slightly documentation} % \changes{v1.0.5}{2005/12/20}{added option big} % \changes{v1.0.4}{2005/11/23}{corrected small problem that made labels appear twice in the 'ticky' part} @@ -91,7 +92,7 @@ % \title{A plot package for \LaTeXe\thanks{^^A % This file has version number \fileversion, % last revised \filedate.}} -% \author{Jose-Emilio Vila-Forcen \\ \texttt{jemilio@ieee.org}} +% \author{Jose-Emilio Vila-Forcen \\ \texttt{jemilio@gmail.com}} % \date{\filedate} % \maketitle % @@ -478,8 +479,8 @@ % First we test that we got the right format and name the package, and load external packages. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e}% -\ProvidesPackage{makeplot}[2008/01/18 % - v1.0.6 % +\ProvidesPackage{makeplot}[2009/08/26 % + v1.0.7 % Plots utility from Jose-Emilio Vila-Forcen]% \RequirePackage[nomessages]{fp}% \RequirePackage{pst-plot}% @@ -667,10 +668,10 @@ % % Default values for the above parameters % \begin{macrocode} -\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, % +\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, subtickcolor=black}% \ifMP@big% \psset{tickwidth=0.5pt, subtickwidth=0.5pt, linewidth=1pt}% @@ -775,9 +776,9 @@ % Change of the size of the plot % if it is asked in the options, % like putting the legend at the right - \ifnum \endXb>0% + \ifnum \endXb>0 \FPdiv\w{\endXb}\unitX% - \ifnum \endXa=0% + \ifnum \endXa=0 \def\endXa{\xz}% \fi% \FPadd\ww{\endXa}{-\xz}% @@ -792,7 +793,7 @@ \begin{pspicture}(\xaaa,\yaaa)(\xzz,\yz)% % % Draw a box with the margins if requested - \ifnum \drawmargins=0% + \ifnum \drawmargins=0 \psframe(\xaaa,\yaaa)(\xzz,\yz)% \fi% % @@ -805,38 +806,38 @@ % not working yet \def\xaOrigin{\xa}% \def\yaOrigin{\ya}% - \ifnum \orgX=314% + \ifnum \orgX=314 \else% \def\xaOrigin{\orgX}% \fi% - \ifnum \orgY=314% + \ifnum \orgY=314 \else% \def\yaOrigin{\orgY}% \fi % % % Put the ticks as given in the options - \ifnum \ticky=0% + \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,% axesstyle=axes, linecolor=white, #1, ticks=all, labels=none]% {-}(\xa,\ya)(\xa,\ya)(\xz,\yz)% \fi% - \ifnum \ticky=1% + \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,% axesstyle=axes, linecolor=white, #1, ticks=x, labels=none]% {-}(\xa,\ya)(\xa,\ya)(\xz,\yz)% \fi% - \ifnum \ticky=2% + \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,% axesstyle=axes, linecolor=white, #1, ticks=y, labels=none]% {-}(\xa,\ya)(\xa,\ya)(\xz,\yz)% \fi% - \ifnum \ticky=3% + \ifnum \ticky=3 \fi% % % Put the main axes and the grid @@ -1047,8 +1048,8 @@ % \end{macrocode} % Default values for the above keys: % \begin{macrocode} -\psset{fillcolorWhiteBG=white, fillstyleWhiteBG=solid,% - framearcWhiteBG=0.3, linewidthWhiteBG=0.01, % +\psset{fillcolorWhiteBG=white, fillstyleWhiteBG=solid, + framearcWhiteBG=0.3, linewidthWhiteBG=0.01, linestyleWhiteBG=solid, linecolorWhiteBG=black}% % \end{macrocode} % diff --git a/Master/texmf-dist/source/latex/makeplot/makeplot.ins b/Master/texmf-dist/source/latex/makeplot/makeplot.ins index 65457ab844f..f116b381231 100644 --- a/Master/texmf-dist/source/latex/makeplot/makeplot.ins +++ b/Master/texmf-dist/source/latex/makeplot/makeplot.ins @@ -1,5 +1,5 @@ %% -%% Copyright (C) 2004-2008 by Jose Emilio Vila Forcen (jemilio@ieee.org) +%% Copyright (C) 2004-2009 by Jose Emilio Vila Forcen (jemilio@gmail.com) %% This file may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either %% version 1.3 of this license or (at your option) any later @@ -14,7 +14,7 @@ \keepsilent \usedir{tex/latex/makeplot} \preamble - Copyright 2004--2008 by Jose Emilio Vila Forcen (jemilio@ieee.org) + Copyright 2004--2008 by Jose Emilio Vila Forcen (jemilio@gmail.com) All rights reserved. @@ -29,7 +29,7 @@ version 2003/12/01 or later. This work has the LPPL maintenance status "maintained". - The Current Maintainer of this work is Jose Emilio Vila Forcen (jemilio@ieee.org). + The Current Maintainer of this work is Jose Emilio Vila Forcen (jemilio@gmail.com). \endpreamble \generate{% diff --git a/Master/texmf-dist/tex/latex/makeplot/makeplot.sty b/Master/texmf-dist/tex/latex/makeplot/makeplot.sty index 72b92bfb59b..516716b5fab 100644 --- a/Master/texmf-dist/tex/latex/makeplot/makeplot.sty +++ b/Master/texmf-dist/tex/latex/makeplot/makeplot.sty @@ -5,7 +5,7 @@ %% The original source files were: %% %% makeplot.dtx (with options: `makeplot') -%% Copyright 2004--2008 by Jose Emilio Vila Forcen (jemilio@ieee.org) +%% Copyright 2004--2008 by Jose Emilio Vila Forcen (jemilio@gmail.com) %% %% All rights reserved. %% @@ -20,7 +20,7 @@ %% version 2003/12/01 or later. %% %% This work has the LPPL maintenance status "maintained". -%% The Current Maintainer of this work is Jose Emilio Vila Forcen (jemilio@ieee.org). +%% The Current Maintainer of this work is Jose Emilio Vila Forcen (jemilio@gmail.com). %% %% \CharacterTable @@ -40,8 +40,8 @@ %% Right brace \} Tilde \~} %% \NeedsTeXFormat{LaTeX2e}% -\ProvidesPackage{makeplot}[2008/01/18 % - v1.0.6 % +\ProvidesPackage{makeplot}[2009/08/26 % + v1.0.7 % Plots utility from Jose-Emilio Vila-Forcen]% \RequirePackage[nomessages]{fp}% \RequirePackage{pst-plot}% @@ -157,10 +157,10 @@ \define@key[psset]{makeplot}{orgY}% {\def\orgYmakeplot{#1}} % \pst@addfams{makeplot}% -\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, % +\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, subtickcolor=black}% \ifMP@big% \psset{tickwidth=0.5pt, subtickwidth=0.5pt, linewidth=1pt}% @@ -242,9 +242,9 @@ xsubticks=0, subticksize=1, subtickcolor=black}% % Change of the size of the plot % if it is asked in the options, % like putting the legend at the right - \ifnum \endXb>0% + \ifnum \endXb>0 \FPdiv\w{\endXb}\unitX% - \ifnum \endXa=0% + \ifnum \endXa=0 \def\endXa{\xz}% \fi% \FPadd\ww{\endXa}{-\xz}% @@ -259,7 +259,7 @@ xsubticks=0, subticksize=1, subtickcolor=black}% \begin{pspicture}(\xaaa,\yaaa)(\xzz,\yz)% % % Draw a box with the margins if requested - \ifnum \drawmargins=0% + \ifnum \drawmargins=0 \psframe(\xaaa,\yaaa)(\xzz,\yz)% \fi% % @@ -272,38 +272,38 @@ xsubticks=0, subticksize=1, subtickcolor=black}% % not working yet \def\xaOrigin{\xa}% \def\yaOrigin{\ya}% - \ifnum \orgX=314% + \ifnum \orgX=314 \else% \def\xaOrigin{\orgX}% \fi% - \ifnum \orgY=314% + \ifnum \orgY=314 \else% \def\yaOrigin{\orgY}% \fi % % % Put the ticks as given in the options - \ifnum \ticky=0% + \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,% axesstyle=axes, linecolor=white, #1, ticks=all, labels=none]% {-}(\xa,\ya)(\xa,\ya)(\xz,\yz)% \fi% - \ifnum \ticky=1% + \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,% axesstyle=axes, linecolor=white, #1, ticks=x, labels=none]% {-}(\xa,\ya)(\xa,\ya)(\xz,\yz)% \fi% - \ifnum \ticky=2% + \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,% axesstyle=axes, linecolor=white, #1, ticks=y, labels=none]% {-}(\xa,\ya)(\xa,\ya)(\xz,\yz)% \fi% - \ifnum \ticky=3% + \ifnum \ticky=3 \fi% % % Put the main axes and the grid @@ -439,8 +439,8 @@ xsubticks=0, subticksize=1, subtickcolor=black}% \define@key[psset]{whiteBG}{linestyleWhiteBG}{\def\linestyleWhiteBG{#1}}% \define@key[psset]{whiteBG}{linecolorWhiteBG}{\def\linecolorWhiteBG{#1}}% \pst@addfams{whiteBG}% -\psset{fillcolorWhiteBG=white, fillstyleWhiteBG=solid,% - framearcWhiteBG=0.3, linewidthWhiteBG=0.01, % +\psset{fillcolorWhiteBG=white, fillstyleWhiteBG=solid, + framearcWhiteBG=0.3, linewidthWhiteBG=0.01, linestyleWhiteBG=solid, linecolorWhiteBG=black}% \def\whiteBG{\@ifnextchar[\@whiteBG{\@whiteBG[]}}% \def\@whiteBG[#1]#2#3#4#5{% -- cgit v1.2.3