miniplot update (15mar10)

git-svn-id: svn://tug.org/texlive/trunk@17483 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 386 insertions, 256 deletions

diff --git a/Master/texmf-dist/tex/latex/miniplot/miniplot.sty b/Master/texmf-dist/tex/latex/miniplot/miniplot.sty
index 117551fad90..ab3bd116656 100644
--- a/Master/texmf-dist/tex/latex/miniplot/miniplot.sty
+++ b/Master/texmf-dist/tex/latex/miniplot/miniplot.sty
@@ -1,4 +1,4 @@
-% This file supplies Figure Tools
+% This file supplies Figure Tools: MiniPlot ver 0.0.2
 % (C) Tobias Wahl - 2001
 %
 % Caution: Mind the global variables created!
@@ -106,8 +106,18 @@
 % \doextractminiplota{figures/file} -> file
 % extract filename from path, from Peter Schmitt
 
-\def\doextractminiplota #1/#2\\{\ifx|#2|#1\else\doextractminiplota#2\\\fi}
-\def\extractminiplota #1{\doextractminiplota#1/\\}
+\def\doextractminiplotpath #1/#2\\{\ifx|#2|#1\else\doextractminiplotpath#2\\\fi}
+\def\extractminiplotpath #1{\doextractminiplotpath#1/\\}
+
+
+
+%----------------------------------------------
+% \begin{centerlineenv}
+% \centerline command for use in environment form, by Dan Luecking
+
+\newenvironment{centerlineenv}%
+  {\par\hbox to \linewidth\bgroup\hss\ignorespaces}%
+  {\unskip\hss\egroup\par\ignorespaces}%
 
 
 
@@ -122,8 +132,6 @@
 \newlength{\figTabWidth}            % width of table to include in frame as big as the eps figure
 \newlength{\figTabMiddle}           % height in the frame where the table middle is placed
 
-\newcounter{printCaption}           % prints caption in info table {1} or not {0}
-\setcounter{printCaption}{1}
 
 \newlength{\captionHeight}          % measures the height of the caption
 \newlength{\captionSpace}           % provides the space available for the caption,
@@ -137,6 +145,10 @@
 \setlength{\aboveWrapFigureSpace}{0mm}
 
 
+\newlength{\wrapFigOverhangDefault} % set wrap figures overhang default value
+\setlength{\wrapFigOverhangDefault}{0mm}
+
+
 \newcommand{\standardGraphScale}{1} % This value specifies the scaling factor by which the standard graph is scaled
 
 \newcounter{scaleToStandardFigureWidth}     % 1 = scales figure to \myStandardFigureWidth
@@ -214,10 +226,10 @@
                                                     % sub sub captions
 
 \newlength{\horizontalSubSubFigSpace}               % used to equalize space between rows of sub-sub-figures
-\setlength{\horizontalSubSubFigSpace}{0mm}
+\setlength{\horizontalSubSubFigSpace}{-1mm}
 
 \newlength{\subFigureBelowCaptionSpace}             % determines the space below the sub figure caption: Figure ...
-\setlength{\subFigureBelowCaptionSpace}{3mm}
+\setlength{\subFigureBelowCaptionSpace}{5mm}
 
 \newlength{\subCaptionPenalty}                      % used to move sub-sub-caption into middle of subsubfigure
 \setlength{\subCaptionPenalty}{0mm}
@@ -226,6 +238,29 @@
 \newcounter{plotFigures}
 \setcounter{plotFigures}{1}             % plot figures {1} or not {0}
 
+\newlength{\labelPenalty}                           % This is a compensator length in order to compensate for the extra
+\setlength{\labelPenalty}{-1.5mm}                   % space inserted by writing the label if plotFigures == 0 for arranged figures
+                                                    % -1.5mm is good when \printLabel results in a single line in small font
+
+\newlength{\labelHeight}                            % length used to compensate for the extra space inserted by including
+                                                    % the label for arranged figures when plotFigures == 0
+
+
+\newlength{\captionWidthPenalty}                    % using thi slength one can increase or decrease the width the caption
+\setlength{\captionWidthPenalty}{0mm}               % uses relativ to the width of the figure
+
+
+\newlength{\minimumCaptionWidth}                    % defines the minimum width of the standard caption, not wrap, not arranged figures
+\setlength{\minimumCaptionWidth}{\linewidth * 4 / 6}
+
+
+\newlength{\minimumSideWaysCaptionWidth}            % defines the minimum width of the standard side ways caption, not wrap, not arranged figures
+\setlength{\minimumSideWaysCaptionWidth}{\textheight * 4 / 6}
+
+\newcommand{\labelPrefix}{fig:}                     % defines the label's prefix
+
+\newcommand{\subLabelSuffix}{-\alph{subfigure}}     % defines the sub-sub-figures label suffix
+
 
 
 %========================================================================
@@ -236,6 +271,32 @@
 %
 
 
+% \epsContent[placement]{path}{caption}{label}{scaling}{figure width}{figure height}
+\newcommand{\epsContent}[7][htpb]%
+    {%
+    \setlength{\figWidth}{#6 - \frameBoxPenalty}%
+    \setlength{\figHeight}{#7 - \frameBoxPenalty}%
+    %
+    \setlength{\figTabWidth}{\figWidth - 31mm}%                                % calculate width of table in frame
+    \setlength{\figTabMiddle}{\figHeight / 2}%                                  % calculate middle of figure height
+    %
+    \centerline{\framebox{%
+        %
+        \setlength{\unitlength}{1sp}%%                                      % 1sp = 0.0000152587890625pt = 1/65536pt
+        \begin{picture}(\number\figWidth,\number\figHeight)%%
+            \put(655360,\number\figTabMiddle)%%
+                {%
+                \begin{tabular}{lp{\the\figTabWidth}}%
+                    \emph{Source:} & #2.eps \\%%
+                    \emph{Scaling:} & #5 \\%%
+                    \emph{Label:} & \labelPrefix#4 \\%%
+                    \emph{Position:} & #1%%
+                \end{tabular}%
+                }%    
+        \end{picture}%%
+        }}%
+    }%
+
 
 \newcommand{\includeEps}[5][htpb]%                      % idea for code from verbatim manual page 3
     {%
@@ -246,40 +307,21 @@
         {%
         \settowidth{\figWidth}{\epsfig{file={#2},scale = #5}}%              % obtain eps figure width
         \settoheight{\figHeight}{\epsfig{file={#2},scale = #5}}%            % obtain eps figure height
-        %\the\figHeight%                                                    % used to tune the scaling factor for \captionSpace, also see captionSpace.xls
-        %
-        \setlength{\figTabWidth}{\figWidth - 31mm}%                         % calculate width of table in frame
-        %
-        \setlength{\figTabMiddle}{\figHeight / 2}%                          % calculate middle of figure height
-        %
-        \settoheight{\captionHeight}{\parbox{\figTabWidth}{#3}}%            % calculate height of caption in table
-        \setlength{\captionSpace}{\figHeight - (\figHeight / 1000 * 198)}%  % calculate height for caption available in table
-        %                                                                   % 25mm for small figures, 44mm for standard 7cm high graphs, 51mm for large figures
         %
         \bigskip\medskip%%
         \begin{figure}[#1]%%
             \begin{center}%%
-                \centerline{\framebox{%
-                    %
-                    \setlength{\figWidth}{\figWidth - \frameBoxPenalty}%
-                    \setlength{\figHeight}{\figHeight - \frameBoxPenalty}%
-                    %
-                    \setlength{\unitlength}{1sp}%%         % 1sp = 0.0000152587890625pt = 1/65536pt
-                    \begin{picture}(\number\figWidth,\number\figHeight)%%
-                    \put(655360,\number\figTabMiddle)%%
-                        {%
-                        \begin{tabular}{lp{\the\figTabWidth}}%
-                            \emph{Source:} & #2.eps \\%%
-                            \emph{Scaling:} & #5 \\%%
-                            \ifthenelse{\value{printCaption}=1}{\ifthenelse{\lengthtest{\captionSpace > \captionHeight}}{\emph{Caption:} & #3 \\}{}}{}%%
-                            \emph{Label:} & fig:#4 \\%%
-                            \emph{Position:} & #1 \\%%
-                        \end{tabular}%
-                        }%
-                    \end{picture}%%
-                    }}%
+                \centerline{%
+                \ifthenelse{\lengthtest{\figWidth > \minimumCaptionWidth}}%
+                    {\begin{minipage}{\figWidth + \captionWidthPenalty}}%
+                    {\begin{minipage}{\minimumCaptionWidth + \captionWidthPenalty}}%
+                %
+                \epsContent[#1]{#2}{#3}{#4}{#5}{\figWidth}{\figHeight}%
+                %
                 \caption{#3}%%
-                \label{fig:#4}%%
+                \label{\labelPrefix#4}%%
+                %
+                \end{minipage}}%
             \end{center}%%
         \end{figure}%%
         }%
@@ -291,9 +333,15 @@
     \bigskip\medskip%%
     \begin{figure}[#1]%%
         \begin{center}%%
-            \centerline{\epsfig{file={#2},scale = #5}}%%
-            \caption{#3}%%
-            \label{fig:#4}%%
+            \centerline{%
+            \settowidth{\figWidth}{\epsfig{file={#2},scale = #5}}%              % obtain eps figure width
+            \ifthenelse{\lengthtest{\figWidth > \minimumCaptionWidth}}%
+                {\begin{minipage}{\figWidth + \captionWidthPenalty}}%
+                {\begin{minipage}{\minimumCaptionWidth + \captionWidthPenalty}}%
+                    \centerline{\epsfig{file={#2},scale = #5}}%%
+                    \caption{#3}%%
+                    \label{\labelPrefix#4}%%
+            \end{minipage}}%
         \end{center}%%
     \end{figure}%%
     }%
@@ -382,27 +430,17 @@
         \bigskip\medskip%%
         \begin{sidewaysfigure}[#1]%%
             \begin{center}%%
-                \centerline{\framebox{%
-                    %
-                    \setlength{\figWidth}{\figWidth - \frameBoxPenalty}%
-                    \setlength{\figHeight}{\figHeight - \frameBoxPenalty}%
-                    %
-                    \setlength{\unitlength}{1sp}%%         % 1sp = 0.0000152587890625pt = 1/65536pt
-                    \begin{picture}(\number\figWidth,\number\figHeight)%%
-                    \put(655360,\number\figTabMiddle)%%
-                        {%
-                        \begin{tabular}{lp{\the\figTabWidth}}%
-                            \emph{Source:} & #2.eps \\%%
-                            \emph{Scaling:} & #5 \\%%
-                            \ifthenelse{\value{printCaption}=1}{\ifthenelse{\lengthtest{\captionSpace > \captionHeight}}{\emph{Caption:} & #3 \\}{}}{}%%
-                            \emph{Label:} & fig:#4 \\%%
-                            \emph{Position:} & #1 \\%%
-                        \end{tabular}%
-                        }%
-                    \end{picture}%%
-                    }}%
+                \centerline{%
+                \ifthenelse{\lengthtest{\figWidth > \minimumSideWaysCaptionWidth}}%
+                    {\begin{minipage}{\figWidth + \captionWidthPenalty}}%
+                    {\begin{minipage}{\minimumSideWaysCaptionWidth + \captionWidthPenalty}}%
+                %
+                \epsContent[#1]{#2}{#3}{#4}{#5}{\figWidth}{\figHeight}%
+                %
                 \caption{#3}%%
-                \label{fig:#4}%%
+                \label{\labelPrefix#4}%%
+                %
+                \end{minipage}}%                    
             \end{center}%%
         \end{sidewaysfigure}%%
         }%
@@ -414,9 +452,15 @@
     \bigskip\medskip%%
     \begin{sidewaysfigure}[#1]%%
         \begin{center}%%
-            \centerline{\epsfig{file={#2},scale = #5}}%%
-            \caption{#3}%%
-            \label{fig:#4}%%
+            \centerline{%
+            \settowidth{\figWidth}{\epsfig{file={#2},scale = #5}}%              % obtain eps figure width
+            \ifthenelse{\lengthtest{\figWidth > \minimumSideWaysCaptionWidth}}%
+                {\begin{minipage}{\figWidth + \captionWidthPenalty}}%
+                {\begin{minipage}{\minimumSideWaysCaptionWidth + \captionWidthPenalty}}%
+                    \centerline{\epsfig{file={#2},scale = #5}}%%
+                    \caption{#3}%%
+                    \label{\labelPrefix#4}%%
+            \end{minipage}}%
         \end{center}%%
     \end{sidewaysfigure}%%
     }%
@@ -475,129 +519,35 @@
     }%
 
 
-%========================================================================
-% INSERT WRAPED FIGURES
 
+%========================================================================
+% INSERT LUMPED FIGURES
 
-\newcommand{\includeEpsWrap}[6][noPar]%
+% \arrangedFigContent[sub-sub-caption]{path}{figure width}{figure height}
+\newcommand{\arrangedFigContent}[4][noParMiniPlot]%
     {%
-    \ifthenelse{\value{plotFigures}>0}%%
-        {%
-        \includeEpsWrapNow[#1]{#2}{#3}{#4}{#5}{#6}%%
-        }%
-        {%
-        \settowidth{\figWidth}{\epsfig{file={#3},scale = #6}}%              % obtain eps figure width
-        \settoheight{\figHeight}{\epsfig{file={#3},scale = #6}}%            % obtain eps figure height
-        %\the\figHeight%                                                    % used to tune the scaling factor for \captionSpace, also see captionSpace.xls
-        %
-        \setlength{\figTabWidth}{\figHeight - 31mm}%                         % calculate width of table in frame
-        %
-        %\setlength{\figTabMiddle}{\figWidth / 2}%                          % calculate middle of figure height
-        \setlength{\figTabMiddle}{7mm}%                          % calculate middle of figure height
-        %
-        \settoheight{\captionHeight}{\parbox{\figTabWidth}{#4}}%            % calculate height of caption in table
-        \setlength{\captionSpace}{\figHeight - (\figHeight / 1000 * 198)}%  % calculate height for caption available in table
-        %                                                                   % 25mm for small figures, 44mm for standard 7cm high graphs, 51mm for large figures
-        %
-        \ifthenelse{\equal{#1}{noPar}}%
-            {%
-            \begin{wrapfigure}{#2}{\figWidth+\extraWrapWidth}%%
-                %
-                \vspace{\aboveWrapFigureSpace}%
-                %
-                \framebox{%
-                    %
-                    \setlength{\figWidth}{\figWidth - \frameBoxPenalty}%
-                    \setlength{\figHeight}{\figHeight - \frameBoxPenalty}%
-                    %
-                    \setlength{\unitlength}{1sp}%%         % 1sp = 0.0000152587890625pt = 1/65536pt
-                    \begin{picture}(\number\figWidth,\number\figHeight)%%
-                    \put(\number\figTabMiddle,655360)%%
-                        {%
-                        \tiny%
-                        \rotatebox{90}{%
-                            \begin{tabular}{lp{\the\figTabWidth}}%
-                                \emph{Source:} & #3.eps \\%%
-                                \emph{Scaling:} & #6 \\%%
-                                \ifthenelse{\value{printCaption}=1}{\ifthenelse{\lengthtest{\captionSpace > \captionHeight}}{\emph{Caption:} & #4 \\}{}}{}%%
-                                \emph{Label:} & fig:#5 \\%%
-                            \end{tabular}%
-                            }%
-                        \textnormal%
-                        }%
-                    \end{picture}%%
-                    }%
-                \caption{#4}%%
-                \label{fig:#5}%%
-            \end{wrapfigure}%%
-            }%
+    \setlength{\figWidth}{#3 - \frameBoxPenalty}%
+    \setlength{\figHeight}{#4 - \frameBoxPenalty}%
+    %
+    \setlength{\figTabMiddle}{\figHeight / 2}%
+    %
+    \framebox{%
+        \setlength{\unitlength}{1sp}%
+        \tiny%
+        \begin{picture}(\number\figWidth,\number\figHeight)%
+        \put(0,\number\figTabMiddle)%%
             {%
-            \begin{wrapfigure}[#1]{#2}{\figWidth+\extraWrapWidth}%%
-                %
-                \vspace{\aboveWrapFigureSpace}%
-                %
-                \framebox{%
-                    %
-                    \setlength{\figWidth}{\figWidth - \frameBoxPenalty}%
-                    \setlength{\figHeight}{\figHeight - \frameBoxPenalty}%
-                    %
-                    \setlength{\unitlength}{1sp}%%         % 1sp = 0.0000152587890625pt = 1/65536pt
-                    \begin{picture}(\number\figWidth,\number\figHeight)%%
-                    \put(\number\figTabMiddle,655360)%%
-                        {%
-                        \tiny%
-                        \rotatebox{90}{%
-                            \begin{tabular}{lp{\the\figTabWidth}}%
-                                \emph{Source:} & #3.eps \\%%
-                                \emph{Scaling:} & #6 \\%%
-                                \ifthenelse{\value{printCaption}=1}{\ifthenelse{\lengthtest{\captionSpace > \captionHeight}}{\emph{Caption:} & #4 \\}{}}{}%%
-                                \emph{Label:} & fig:#5 \\%%
-                            \end{tabular}%
-                            }%
-                        \textnormal%
-                        }%
-                    \end{picture}%%
-                    }%
-                \caption{#4}%%
-                \label{fig:#5}%%
-            \end{wrapfigure}%%
+            \begin{tabular}{p{\the\figWidth}}%
+                \extractminiplotpath{#2} \\%%
+                \subFigScale \\%%
+                \subLabelSuffix%%
+            \end{tabular}%
             }%
+        \end{picture}%    
         }%
     }%
 
 
-\newcommand{\includeEpsWrapNow}[6][noPar]%
-    {%
-    \settowidth{\figWidth}{\epsfig{file={#3},scale = #6}}%              % obtain eps figure width
-    \ifthenelse{\equal{#1}{noPar}}%
-        {%
-        \begin{wrapfigure}{#2}{\figWidth+\extraWrapWidth}%
-            \vspace{\aboveWrapFigureSpace}%
-            \epsfig{file=#3,scale=#6}%
-            \caption{#4}%%
-            \label{fig:#5}%%
-        \end{wrapfigure}%
-        }%
-        {%
-        \begin{wrapfigure}[#1]{#2}{\figWidth+\extraWrapWidth}%
-            \vspace{\aboveWrapFigureSpace}%
-            \epsfig{file=#3,scale=#6}%
-            \caption{#4}%%
-            \label{fig:#5}%%
-        \end{wrapfigure}%
-        }%
-    }%
-
-
-
-
-
-
-%========================================================================
-% INSERT LUMPED FIGURES
-
-
-
 \newcommand{\setSubFigScale}[3]%
     {%
     %
@@ -610,9 +560,7 @@
     }%
 
 
-%\newcommand{\printLabel}[1]{; \large\textsc{Label}$\blacktriangleright\mathrm{fig\hspace{-1mm}:\hspace{-1mm}#1}$}  % _ is allowed in label
-%\newcommand{\printLabel}[1]{; \large\textsc{Label}$\blacktriangleright$\texttt{fig:#1}}                             % don't use _ in your label
-\newcommand{\printLabel}[1]{; \large\textsc{Label}$\Rightarrow$\texttt{fig:#1}}                             % don't use _ in your label
+\newcommand{\printLabel}[1]{\centerline{\small{\emph{Label}: $\mathtt{\labelPrefix#1}$}}}
 
 
 \newcommand{\aboveCaptionSpace}[1]{\setlength{\subFigureAboveCaptionSpace}{#1 + \subFigureAboveCaptionSpaceDefaultOffset}}
@@ -621,10 +569,16 @@
 \newcommand{\newSubFig}[3][\subFigureAboveCaptionSpaceDefault]%
     {%
     \vspace{\subFigureAboveCaptionSpace}%
-    \ifthenelse{\value{plotFigures}>0}%
-        {\caption{\myCaptionText}}%
-        {\caption{\myCaptionText\printLabel{\myLabel}}}%
-    \label{fig:\myLabel}%
+    \vspace{-\horizontalSubSubFigSpace}%
+    \caption{\myCaptionText}
+    \label{\labelPrefix\myLabel}%
+    \ifthenelse{\value{plotFigures}>0}{}%
+        {%
+        \printLabel{\myLabel}%
+        \settoheight{\labelHeight}{\printLabel{\myLabel}}%
+        \setlength{\labelHeight}{\labelHeight + \labelPenalty}%
+        \vspace{-\labelHeight}%
+        }%
     \end{minipage}%
     \renewcommand{\myCaptionText}{#3}%                                                   % assign caption
     \renewcommand{\myLabel}{#2}%                                                                % assign label
@@ -635,7 +589,7 @@
     }%
 
 
-\newcommand{\subFig}[2][.]%
+\newcommand{\subFig}[2][noParMiniPlot]%
     {%
     %
     \ifthenelse{\value{scaleFigureIndividual}=1}%
@@ -655,57 +609,29 @@
         {\renewcommand{\subfigcapmargin}{10pt}}%                        % default value by subfigure.sty
     \ifthenelse{\value{plotFigures}>0}%%
         {%
-        \ifthenelse{\equal{#1}{.}}%
-            {\subfigure{\epsfig{file={#2},scale=\subFigScale}}}%
-            {\subfigure[#1]{\epsfig{file={#2},scale=\subFigScale}}}%
+        \ifthenelse{\equal{#1}{noParMiniPlot}}%
+            {\subfigure{\label{\labelPrefix\myLabel\subLabelSuffix}\epsfig{file={#2},scale=\subFigScale}}}%
+            {\subfigure[#1]{\label{\labelPrefix\myLabel\subLabelSuffix}\epsfig{file={#2},scale=\subFigScale}}}%
         }%
         {%
         \settowidth{\figWidth}{\epsfig{file={#2},scale = \subFigScale}}%
         \settoheight{\figHeight}{\epsfig{file={#2},scale = \subFigScale}}%
         %
-        \setlength{\figWidth}{\figWidth - \frameBoxPenalty}%
-        \setlength{\figHeight}{\figHeight - \frameBoxPenalty}%
-        %
-        \setlength{\figTabWidth}{\figWidth - 20mm}%
-        \setlength{\figTabMiddle}{\figHeight / 2}%
-        %
-        \ifthenelse{\equal{#1}{.}}%
+        \ifthenelse{\equal{#1}{noParMiniPlot}}%
             {%
             \subfigure{%
-                \framebox{%
-                    \setlength{\unitlength}{1sp}%
-                    \tiny%
-                    \begin{picture}(\number\figWidth,\number\figHeight)%
-                    \put(0,\number\figTabMiddle)%%
-                        {%
-                        \begin{tabular}{lp{\the\figTabWidth}}%
-                            \emph{Source:} & #2.eps \\%%
-                            \emph{Scaling:} & \subFigScale \\%%
-                            %\emph{Label:} & $\mathrm{\myLabel}$-\thesubfigure \\%%
-                            \emph{Label:} & -\thesubfigure \\%%
-                        \end{tabular}%
-                        }%
-                    \end{picture}%
-                    }%
+                %
+                \label{\labelPrefix\myLabel\subLabelSuffix}%                  % \alph{subfigure} by Dan Luecking
+                %
+                \arrangedFigContent{#2}{\figWidth}{\figHeight}%
                 }%
             }%
             {%
             \subfigure[#1]{%
-                \framebox{%
-                    \setlength{\unitlength}{1sp}%
-                    \tiny%
-                    \begin{picture}(\number\figWidth,\number\figHeight)%
-                    \put(0,\number\figTabMiddle)%%
-                        {%
-                        \begin{tabular}{lp{\the\figTabWidth}}%
-                            \emph{Source:} & \extractminiplota{#2} \\%%
-                            \emph{Scaling:} & \subFigScale \\%%
-                            %\emph{Label:} & $\mathrm{\myLabel}$ \\%%
-                            \emph{Label:} & -\thesubfigure \\%%
-                        \end{tabular}%
-                        }%
-                    \end{picture}%
-                    }%
+                %
+                \label{\labelPrefix\myLabel\subLabelSuffix}%
+                %
+                \arrangedFigContent[#1]{#2}{\figWidth}{\figHeight}%
                 }%
             }%
         }%
@@ -739,16 +665,26 @@
     }%
     {%
                         \vspace{\subFigureAboveCaptionSpace}%
-                        \ifthenelse{\value{plotFigures}>0}%
-                            {\caption{\myCaptionText}}%
-                            {\caption{\myCaptionText\printLabel{\myLabel}}}%
-                        \label{fig:\myLabel}%
+                        \vspace{-\horizontalSubSubFigSpace}%
+                        \caption{\myCaptionText}
+                        \label{\labelPrefix\myLabel}%
+                        \ifthenelse{\value{plotFigures}>0}{}%
+                            {%
+                            \printLabel{\myLabel}%
+                            \settoheight{\labelHeight}{\printLabel{\myLabel}}%
+                            \setlength{\labelHeight}{\labelHeight + \labelPenalty}%
+                            \vspace{-\labelHeight}%
+                            }%
                     \end{minipage}%
                 \end{minipage}%
             %}%
         %\end{center}%
     \end{figure}%
     %
+    %\ifthenelse{\value{plotFigures}>0}%
+    %    {}%
+    %    {\marginpar{\rotatebox{90}{Figure \ref{\labelPrefix\myLabel}: \printLabel{\myLabel}}}}%
+    %
     \setlength{\subFigScaleLength}{0pt}%
     }%
 
@@ -798,10 +734,16 @@
     }%
     {%
                         \vspace{\subFigureAboveCaptionSpace}%
-                        \ifthenelse{\value{plotFigures}>0}%
-                            {\caption{\myCaptionText}}%
-                            {\caption{\myCaptionText\printLabel{\myLabel}}}%
-                        \label{fig:\myLabel}%
+                        \vspace{-\horizontalSubSubFigSpace}%
+                        \caption{\myCaptionText}
+                        \label{\labelPrefix\myLabel}%
+                        \ifthenelse{\value{plotFigures}>0}{}%
+                            {%
+                            \printLabel{\myLabel}%
+                            \settoheight{\labelHeight}{\printLabel{\myLabel}}%
+                            \setlength{\labelHeight}{\labelHeight + \labelPenalty}%
+                            \vspace{-\labelHeight}%
+                            }%
                     \end{minipage}%
                 \end{minipage}%
             %}%
@@ -830,33 +772,221 @@
     }%
 
 
+
+
+
+
+
+%========================================================================
+% INSERT WRAPED FIGURES
+
+
+\newcommand{\setWrapFigOverhang}[1][\wrapFigOverhangDefault]{\setlength{\wrapoverhang}{#1}}
+
+
+% \wrappedEpsContent[lines]{position}{path}{caption}{label}{scaling}{figure width}{figure height}
+\newcommand{\wrappedEpsContent}[8][noPar]%
+    {%
+    \setlength{\figWidth}{#7 - \frameBoxPenalty}%
+    \setlength{\figHeight}{#8 - \frameBoxPenalty}%
+    %
+    \setlength{\figTabMiddle}{\figWidth / 2 - 6.6mm}%                         % calculate width of table in frame
+    %
+    \centerline{\framebox{%
+        %
+        \setlength{\unitlength}{1sp}%%                                      % 1sp = 0.0000152587890625pt = 1/65536pt
+        \begin{picture}(\number\figWidth,\number\figHeight)%%
+            \scriptsize%
+            \put(\number\figTabMiddle,65536)%%
+                {%
+                \rotatebox{90}{%
+                    \begin{tabular}{p{\the\figHeight}}%
+                        \extractminiplotpath{#3}.eps \\%%
+                        #6 (scale) \\%%
+                        \labelPrefix#5 \\%%
+                    \end{tabular}%
+                    }%
+                }%
+        \end{picture}%%
+        }}%
+    }%
+
+
+
+\newcommand{\includeEpsWrap}[6][noPar]%
+    {%
+    \ifthenelse{\value{plotFigures}>0}%%
+        {%
+        \includeEpsWrapNow[#1]{#2}{#3}{#4}{#5}{#6}%%
+        }%
+        {%
+        \settowidth{\figWidth}{\epsfig{file={#3},scale = #6}}%              % obtain eps figure width
+        \settoheight{\figHeight}{\epsfig{file={#3},scale = #6}}%            % obtain eps figure height
+        %
+        \ifthenelse{\equal{#1}{noPar}}%
+            {%
+            \begin{wrapfigure}{#2}{\figWidth+\extraWrapWidth}%%
+                %
+                \vspace{\aboveWrapFigureSpace}%
+                %
+                \wrappedEpsContent{#2}{#3}{#4}{#5}{#6}{\figWidth}{\figHeight}%
+                %
+                \caption{#4}%%
+                \label{\labelPrefix#5}%%
+            \end{wrapfigure}%%
+            }%
+            {%
+            \begin{wrapfigure}[#1]{#2}{\figWidth+\extraWrapWidth}%%
+                %
+                \vspace{\aboveWrapFigureSpace}%
+                %
+                \wrappedEpsContent[#1]{#2}{#3}{#4}{#5}{#6}{\figWidth}{\figHeight}%
+                %
+                \caption{#4}%%
+                \label{\labelPrefix#5}%%
+            \end{wrapfigure}%%
+            }%
+        }%
+    }%
+
+
+\newcommand{\includeEpsWrapNow}[6][noPar]%
+    {%
+    \settowidth{\figWidth}{\epsfig{file={#3},scale = #6}}%              % obtain eps figure width
+    \ifthenelse{\equal{#1}{noPar}}%
+        {%
+        \begin{wrapfigure}{#2}{\figWidth+\extraWrapWidth}%
+            \vspace{\aboveWrapFigureSpace}%
+            \epsfig{file=#3,scale=#6}%
+            \caption{#4}%%
+            \label{\labelPrefix#5}%%
+        \end{wrapfigure}%
+        }%
+        {%
+        \begin{wrapfigure}[#1]{#2}{\figWidth+\extraWrapWidth}%
+            \vspace{\aboveWrapFigureSpace}%
+            \epsfig{file=#3,scale=#6}%
+            \caption{#4}%%
+            \label{\labelPrefix#5}%%
+        \end{wrapfigure}%
+        }%
+    }%
+
+
+
+
+
+
+
+
+%========================================================================
+% INSERT WRAPPED-LUMPED FIGURES
+
+
+
+\newenvironment{arrangedWrapFigure}[7][noPar]%
+    {%
+    \renewcommand{\myCaptionText}{#7}%                                                          % assign caption
+    \renewcommand{\myLabel}{#6}%                                                                % assign label
+    %
+    \setlength{\myStandardSubFigureWidth}{#3 / #4 - \interSubFigSpace + \interSubFigSpace / #4 - \subFigPenalty + \subFigPenalty / #4}%
+    %
+    \renewcommand{\numSubFigCol}{#4}%                                                           % assign number of columns to pass on to calculation of width
+    \renewcommand{\numSubSubFigCol}{#5}%                                                        % assign number of columns to pass on to calculation of width
+    \renewcommand{\isFirstSubFig}{true}%                                                        % initialize variable to calculate figure width for first subfigure listed
+    %
+    \setlength{\figTabMiddle}{\myStandardSubFigureWidth / #5 / 2 - \subSubFigPenalty / 2 + \subSubFigPenalty / #5 / 2 + \subCaptionPenalty}%                              % calculate middle of figure width to place subCaption in the middle of the subFigure
+    \renewcommand{\subfigcapmargin}{\figTabMiddle}%                                             % assign Value
+    %
+    \begin{wrapfigure}[#1]{#2}{#3+\extraWrapWidth}%
+        \vspace{\aboveWrapFigureSpace}%
+        %\begin{center}%
+            %\centerline{%
+            %\begin{centerlineenv}%
+                \begin{minipage}{#3}%
+            %        \begin{minipage}{\myStandardSubFigureWidth}%
+    }%
+    {%
+                        \vspace{\subFigureAboveCaptionSpace}%
+                        \vspace{-\horizontalSubSubFigSpace}%
+                        \caption{\myCaptionText}
+                        \label{\labelPrefix\myLabel}%
+                        \ifthenelse{\value{plotFigures}>0}{}%
+                            {%
+                            \printLabel{\myLabel}%
+                            \settoheight{\labelHeight}{\printLabel{\myLabel}}%
+                            \setlength{\labelHeight}{\labelHeight + \labelPenalty}%
+                            \vspace{-\labelHeight}%
+                            }%
+                    \end{minipage}%
+            %    \end{minipage}%
+            %\end{centerlineenv}%
+            %}%
+        %\end{center}%
+    \end{wrapfigure}%
+    %
+    \setlength{\subFigScaleLength}{0pt}%
+    }%
+
+
+
+
+
+\newenvironment{arrangedWrapFigureNow}[7][htpb]%
+    {%
+    \ifthenelse{\value{plotFigures}=0}%
+        {\setcounter{plotFigures}{1}}%
+        {\setcounter{plotFigures}{2}}%
+    \begin{arrangedWrapFigure}[#1]{#2}{#3}{#4}{#5}{#6}{#7}%
+    }%
+    {%
+    \end{arrangedWrapFigure}%
+    \ifthenelse{\value{plotFigures}=2}%
+        {\setcounter{plotFigures}{1}}%
+        {\setcounter{plotFigures}{0}}%
+    }%
+
+
+
+
+
+
+
+
+
 %========================================================================
 % RESET MINI PLOT
 
 
 \newcommand{\resetMiniPlot}%
     {%
-    \setcounter{printCaption}{1}
-    \setlength{\extraWrapWidth}{2mm}    % default value = 2mm, can be redefined in text
-    \setlength{\aboveWrapFigureSpace}{0mm}
-    \renewcommand{\standardGraphScale}{1} % This value specifies the scaling factor by which the standard graph is scaled
-    \setcounter{scaleToStandardFigureWidth}{1}
-    \setcounter{isFirstStandardFigure}{1}
-    \setcounter{scaleFigureIndividual}{1}
-    \setlength{\frameBoxPenalty}{2.4mm}
-    \setlength{\myStandardFigureWidth}{\linewidth}                  % sets the width of all standard figures, can be redefined
-    \setlength{\myStandardSubFigureWidth}{\myStandardFigureWidth}   % sets the width of all standard sub figures, is adjusted automatically
-    \setlength{\myStandardSideWaysFigureWidth}{\textheight}
-    \renewcommand{\isFirstSubFig}{false}                  % boolean value to calculate the subFigScale only the first time one calls \subFig[]{}
-    \setlength{\subFigPenalty}{0mm}                    % let subfigure.sty arrage all subfigures in the avaiable space
-    \setlength{\subSubFigPenalty}{0.001mm}               % let subfigure.sty arrage all subfigures in the avaiable space
-    \setlength{\interSubFigSpace}{8mm}
-    \setlength{\interSubSubFigSpace}{2.5mm}
-    \setlength{\subFigureAboveCaptionSpaceDefaultOffset}{0mm}
-    \setlength{\subFigureAboveCaptionSpaceDefault}{0mm} % use this to equal out spaces due to different number of lines of
-    \setlength{\subFigureAboveCaptionSpace}{\subFigureAboveCaptionSpaceDefault + \subFigureAboveCaptionSpaceDefaultOffset}
-    \setlength{\horizontalSubSubFigSpace}{0mm}
-    \setlength{\subFigureBelowCaptionSpace}{3mm}
-    \setlength{\subCaptionPenalty}{0mm}
-    %\setcounter{plotFigures}{1}             % plot figures {1} or not {0}
-    }%
+    \setcounter{printCaption}{1}%
+    \setcounter{scaleToStandardFigureWidth}{1}%
+    \setcounter{isFirstStandardFigure}{1}%
+    \setcounter{scaleFigureIndividual}{1}%
+    %\setcounter{plotFigures}{1}%                                    % plot figures {1} or not {0}
+    \setlength{\extraWrapWidth}{2mm}%                               % default value = 2mm, can be redefined in text
+    \setlength{\aboveWrapFigureSpace}{0mm}%
+    \setlength{\frameBoxPenalty}{2.4mm}%
+    \setlength{\myStandardFigureWidth}{\linewidth}%                 % sets the width of all standard figures, can be redefined
+    \setlength{\myStandardSideWaysFigureWidth}{\textheight}%
+    \setlength{\subFigPenalty}{0mm}%                                % let subfigure.sty arrage all subfigures in the avaiable space
+    \setlength{\subSubFigPenalty}{0.001mm}%                         % let subfigure.sty arrage all subfigures in the avaiable space
+    \setlength{\interSubFigSpace}{8mm}%
+    \setlength{\interSubSubFigSpace}{2.5mm}%
+    \setlength{\subFigureAboveCaptionSpaceDefaultOffset}{0mm}%
+    \setlength{\subFigureAboveCaptionSpaceDefault}{0mm}%            % use this to equal out spaces due to different number of lines of
+    \setlength{\subFigureAboveCaptionSpace}{\subFigureAboveCaptionSpaceDefault + \subFigureAboveCaptionSpaceDefaultOffset}%
+    \setlength{\horizontalSubSubFigSpace}{0mm}%
+    \setlength{\subFigureBelowCaptionSpace}{3mm}%
+    \setlength{\subCaptionPenalty}{0mm}%
+    \setlength{\minimumCaptionWidth}{\linewidth * 4 / 6}%
+    \setlength{\minimumSideWaysCaptionWidth}{\textheight * 4 / 6}%
+    \renewcommand{\standardGraphScale}{1}%                          % This value specifies the scaling factor by which the standard graph is scaled
+    \renewcommand{\isFirstSubFig}{false}%                           
+    }
+    
+    
+    
+%=======================================================================================
+% EOF