From ba9472aebfed07843bc4faa00c7b96bc86194691 Mon Sep 17 00:00:00 2001
From: Norbert Preining <preining@logic.at>
Date: Wed, 4 Oct 2006 08:43:01 +0000
Subject: 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
---
 .../texmf-dist/source/latex/makeplot/makeplot.dtx  | 138 +++++++++++++--------
 1 file changed, 89 insertions(+), 49 deletions(-)

(limited to 'Master/texmf-dist/source/latex/makeplot/makeplot.dtx')

diff --git a/Master/texmf-dist/source/latex/makeplot/makeplot.dtx b/Master/texmf-dist/source/latex/makeplot/makeplot.dtx
index e2c6a448ecf..eec8239864e 100644
--- a/Master/texmf-dist/source/latex/makeplot/makeplot.dtx
+++ b/Master/texmf-dist/source/latex/makeplot/makeplot.dtx
@@ -48,7 +48,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{1200}
+% \CheckSum{1234}
 %
 %% \CharacterTable
 %%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -75,8 +75,16 @@
 %     \@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.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}
+% \changes{v1.0.3}{2005/10/24}{added optional parameters to readdata, changed fileplot to listplot command (allows more options from pstricks-add) and corrected a bug related to the option tickyplot}
+% \changes{v1.0.2}{2005/10/04}{rounded some calculated parameters to avoid overflow (tickherex and tickherey)}
+% \changes{v1.0.1}{2005/09/24}{data1.mat and data2.mat files are now generated automatically, thanks to Dan}
 % \changes{v1.0}{2005/09/22}{Initial version by Jose-Emilio Vila-Forcen}
 %
+%
+%
+%
 % \GetFileInfo{makeplot.sty}
 %
 % \title{A plot package for \LaTeXe\thanks{^^A
@@ -95,6 +103,11 @@
 % objective is to create a easy and fast framework to create plots with
 % the same style, proper fonts, and just enough parameters.
 %
+% \section{Known problems}
+% \begin{itemize}
+%  \item Sometimes a combination of numbers in the dimensions of the plot might cause an error in latex. That is because the combination of numbers has caused some kind of overflow. The source of the problem might be in the makeplot package or in the pstricks family (supposed to be solved in v2.64 of pstricks-add). Send an email to the package author with all the data and hopefully you will receive an answer with an update of the package: the workaround solution is to use a different number, a close one to the original numbe might work.
+%
+% \end{itemize}
 %
 %
 % \section{Description}
@@ -150,7 +163,7 @@
 % The |makeplot| environment is the starting point to create the plot. The 
 % command line is as follows:
 %  \begin{quote}
-%        |\begin{makeplot}|\oarg{keys}\marg{legend in Y}\marg{legend in X}
+%        |\begin{makeplot}|\oarg{keys}\marg{label in Y}\marg{label in X}
 %        .....
 %        |\end{makeplot}|
 %   \end{quote}
@@ -229,6 +242,25 @@
 %         \marg{width in mm}
 % \end{quote}
 %
+% There exist some different ways to write the legends into the box. The easiest one is to use the
+% next commands:
+%
+% \DescribeMacro{\legend[ABCDEFG]f}
+% These macros write the legends into the box in the order of the tex source. Each one has a different
+% line style as it was for the plot. The syntax is:
+% \begin{quote}
+%    |\legendCf|\oarg{keys}\marg{text}%
+% \end{quote}
+% where the keys might modify the line style.
+%
+%
+% \DescribeMacro{\legendText}
+% The |\legendText| macro includes some text in the legend without a line: 
+% \begin{quote}
+%    |\legendText|\oarg{keys}\marg{text}%
+% \end{quote}
+% where the keys are not used, but kept in the definition of the macro for paralelism.
+%
 % \section{Record proper Matlab data}
 % \index{Matlab}
 % Matlab is one of the most famous data processing software in the 
@@ -439,32 +471,14 @@
 %<*makeplot>
 %    \end{macrocode}
 %
-% There exist some different ways to write the legends into the box. The easiest one is to use the
-% next commands:
-%
-% \DescribeMacro{\legend[ABCDEFG]f}
-% These macros write the legends into the box in the order of the tex source. Each one has a different
-% line style as it was for the plot. The syntax is:
-% \begin{quote}
-%    |\legendCf|\oarg{keys}\marg{text}%
-% \end{quote}
-% where the keys might modify the line style.
-%
-%
-% \DescribeMacro{\legendText}
-% The |\legendText| macro includes some text in the legend without a line: 
-% \begin{quote}
-%    |\legendText|\oarg{keys}\marg{text}%
-% \end{quote}
-% where the keys are not used, but kept in the definition of the macro for paralelism.
 %
 %    \subsection{Headers}
 %
 %    First we test that we got the right format and name the package, and load external packages.
 %    \begin{macrocode}
 \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}%
@@ -482,7 +496,7 @@
 \DeclareOption{color}{%
   \MP@colortrue%
   \typeout{ ------}%
-  \typeout{ ------   startPlot package working in color}%
+  \typeout{ ------   makePlot package working in color}%
   \typeout{ ------}}%
 %    \end{macrocode}
 %    \end{macro}
@@ -497,7 +511,20 @@
 \DeclareOption{drawmargins}{%
   \MP@drawmarginstrue%
   \typeout{ ------}%
-  \typeout{ ------   startPlot package drawing the margins}%
+  \typeout{ ------   makePlot package drawing the margins}%
+  \typeout{ ------}}%
+%    \end{macrocode}
+%    \end{macro}
+%
+%    \begin{macro}{big}
+% The option | big | put the lines of the plot larger
+%    \begin{macrocode}
+\newif\ifMP@big%
+\MP@bigfalse%
+\DeclareOption{big}{%
+	\MP@bigtrue
+  \typeout{ ------}%
+  \typeout{ ------   makePlot package in big size}%
   \typeout{ ------}}%
 %    \end{macrocode}
 %    \end{macro}
@@ -639,12 +666,16 @@
 %
 % Default values for the above parameters
 %    \begin{macrocode}
-\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%
@@ -786,37 +817,46 @@
   \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%
 }%
 %    \end{macrocode}
 % \end{macro}
@@ -827,7 +867,7 @@
 %    \begin{macrocode}
 \def\plotFile{\@ifnextchar[\@plotFile{\@plotFile[]}}%
 \def\@plotFile[#1]#2{%
-  \readdata{\data}{#2}\dataplot[#1]{\data}}%
+  \readdata[#1]{\data}{#2}\listplot[#1]{\data}}%
 %    \end{macrocode}
 % \end{macro}
 % And now, a specific function for each linestyle predefined:
@@ -1080,14 +1120,14 @@
 %    \begin{macrocode}
 \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}%
@@ -1101,10 +1141,10 @@
   \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} % 
@@ -1132,10 +1172,10 @@
   \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
-- 
cgit v1.2.3

