flowfram update (25nov09)

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

1 files changed, 190 insertions, 123 deletions

diff --git a/Master/texmf-dist/tex/latex/flowfram/flowfram.sty b/Master/texmf-dist/tex/latex/flowfram/flowfram.sty
index 149e8e7f238..adfb3eaef7d 100644
--- a/Master/texmf-dist/tex/latex/flowfram/flowfram.sty
+++ b/Master/texmf-dist/tex/latex/flowfram/flowfram.sty
@@ -7,7 +7,7 @@
 %% flowfram.dtx  (with options: `flowfram.sty,package')
 %% 
 %%  flowfram.dtx
-%%  Copyright 2008 Nicola Talbot
+%%  Copyright 2009 Nicola Talbot
 %% 
 %%  This work may be distributed and/or modified under the
 %%  conditions of the LaTeX Project Public License, either version 1.3
@@ -39,7 +39,7 @@
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{flowfram}[2008/06/27 v1.11]
+\ProvidesPackage{flowfram}[2009/11/25 v1.12]
 \RequirePackage{ifthen}
 \RequirePackage{keyval}
 \RequirePackage{graphics}
@@ -106,6 +106,10 @@
 \renewcommand{\@s@tffcol}{}\renewcommand{\@s@tfftextcol}{}
 \renewcommand{\@ffbackground}[1]{#1}
 }
+\newif\iflefttorightcolumns
+\lefttorightcolumnstrue
+\DeclareOption{LR}{\lefttorightcolumnstrue}
+\DeclareOption{RL}{\lefttorightcolumnsfalse}
 \ifdim\overfullrule=0pt
 \ExecuteOptions{final}
 \else
@@ -3002,18 +3006,28 @@ adding new one}%
 \newcommand*{\twocolumninarea}{\@twocolumninarea}
 \@onlypreamble{\twocolumninarea}
 \newcommand*{\@twocolumninarea}[5][all]{%
-\setlength{\columnheight}{#3}%
-\ifffvadjust\adjustheight{\columnheight}\fi%
-\setlength{\columnwidth}{#2}%
-\addtolength{\columnwidth}{-\columnsep}%
-\divide\columnwidth by 2\relax
-\setlength{\@ff@tmp@x}{#4}%
-\addtolength{\@ff@tmp@x}{\columnwidth}%
-\addtolength{\@ff@tmp@x}{\columnsep}%
-\@n@wflowframe[#1]{\columnwidth}{\columnheight}{#4}{#5}%
-\setflowframe{\c@maxflow}{margin=left}%
-\@n@wflowframe[#1]{\columnwidth}{\columnheight}{\@ff@tmp@x}{#5}%
-\setflowframe{\c@maxflow}{margin=right}%
+  \setlength{\columnheight}{#3}%
+  \ifffvadjust\adjustheight{\columnheight}\fi%
+  \setlength{\columnwidth}{#2}%
+  \addtolength{\columnwidth}{-\columnsep}%
+  \divide\columnwidth by 2\relax
+  \setlength{\@ff@tmp@x}{#4}%
+  \addtolength{\@ff@tmp@x}{\columnwidth}%
+  \addtolength{\@ff@tmp@x}{\columnsep}%
+  \iflefttorightcolumns
+    \@n@wflowframe[#1]{\columnwidth}{\columnheight}{#4}{#5}%
+    \setflowframe{\c@maxflow}{margin=left}%
+  \else
+    \@n@wflowframe[#1]{\columnwidth}{\columnheight}{\@ff@tmp@x}{#5}%
+    \setflowframe{\c@maxflow}{margin=right}%
+  \fi
+  \iflefttorightcolumns
+    \@n@wflowframe[#1]{\columnwidth}{\columnheight}{\@ff@tmp@x}{#5}%
+    \setflowframe{\c@maxflow}{margin=right}%
+  \else
+    \@n@wflowframe[#1]{\columnwidth}{\columnheight}{#4}{#5}%
+    \setflowframe{\c@maxflow}{margin=left}%
+  \fi
 }
 \newcommand*{\Ncolumn}[2][all]{%
 \Ncolumninarea[#1]{#2}{\textwidth}{\textheight}{0pt}{0pt}}
@@ -3041,22 +3055,32 @@ adding new one}%
 
 \@onlypreamble{\Ncolumninarea}
 \newcommand*{\@Ncolumninarea}[6][all]{%
-\@colN=#2\relax
-\advance\@colN by -1\relax
-\setlength{\columnwidth}{#3}%
-\addtolength{\columnwidth}{-\@colN\columnsep}%
-\divide\columnwidth by #2\relax
-\setlength{\@ff@tmp@x}{#5}%
-\setlength{\columnheight}{#4}%
-\ifffvadjust\adjustheight{\columnheight}\fi%
-\@colN=0\relax
-\loop
-\advance\@colN by 1\relax
-\newflowframe[#1]{\columnwidth}{\columnheight}{\@ff@tmp@x}{#6}%
-\addtolength{\@ff@tmp@x}{\columnwidth}%
-\addtolength{\@ff@tmp@x}{\columnsep}%
-\ifnum\@colN<#2
-\repeat
+  \@colN=#2\relax
+  \advance\@colN by -1\relax
+  \setlength{\columnwidth}{#3}%
+  \addtolength{\columnwidth}{-\@colN\columnsep}%
+  \divide\columnwidth by #2\relax
+  \setlength{\@ff@tmp@x}{#5}%
+  \iflefttorightcolumns
+  \else
+    \addtolength{\@ff@tmp@x}{#3}%
+    \addtolength{\@ff@tmp@x}{-\columnwidth}%
+  \fi
+  \setlength{\columnheight}{#4}%
+  \ifffvadjust\adjustheight{\columnheight}\fi%
+  \@colN=0\relax
+  \loop
+    \advance\@colN by 1\relax
+    \newflowframe[#1]{\columnwidth}{\columnheight}{\@ff@tmp@x}{#6}%
+    \iflefttorightcolumns
+      \addtolength{\@ff@tmp@x}{\columnwidth}%
+      \addtolength{\@ff@tmp@x}{\columnsep}%
+    \else
+      \addtolength{\@ff@tmp@x}{-\columnwidth}%
+      \addtolength{\@ff@tmp@x}{-\columnsep}%
+    \fi
+  \ifnum\@colN<#2
+  \repeat
 }
 \newlength{\vcolumnsep}
 \setlength{\vcolumnsep}{\columnsep}
@@ -3105,24 +3129,34 @@ Available frame types are: 'flow', 'static' and 'dynamic'}}}}}
 \twocolumntop[#1]{dynamic}{#2}}
 \newcommand*{\twocolumntopinarea}{\@twocolumntopinarea}
 \newcommand*{\@twocolumntopinarea}[7][all]{%
-\setlength{\@ff@staticH}{#3}%
-\setlength{\@ff@tmp@y}{#5}%
-\addtolength{\@ff@tmp@y}{-\@ff@staticH}%
-\setlength{\columnheight}{\@ff@tmp@y}%
-\addtolength{\@ff@tmp@y}{#7}%
-\newframe[#1]{#2}{#4}{\@ff@staticH}{#6}{\@ff@tmp@y}%
-\addtolength{\columnheight}{-\vcolumnsep}%
-\ifffvadjust\adjustheight{\columnheight}\fi%
-\setlength{\columnwidth}{#4}%
-\addtolength{\columnwidth}{-\columnsep}%
-\divide\columnwidth by 2\relax
-\setlength{\@ff@tmp@x}{\columnwidth}%
-\addtolength{\@ff@tmp@x}{\columnsep}%
-\addtolength{\@ff@tmp@x}{#6}%
-\@n@wflowframe[#1]{\columnwidth}{\columnheight}{#6}{#7}%
-\setflowframe{\c@maxflow}{margin=left}%
-\@n@wflowframe[#1]{\columnwidth}{\columnheight}{\@ff@tmp@x}{#7}%
-\setflowframe{\c@maxflow}{margin=right}%
+  \setlength{\@ff@staticH}{#3}%
+  \setlength{\@ff@tmp@y}{#5}%
+  \addtolength{\@ff@tmp@y}{-\@ff@staticH}%
+  \setlength{\columnheight}{\@ff@tmp@y}%
+  \addtolength{\@ff@tmp@y}{#7}%
+  \newframe[#1]{#2}{#4}{\@ff@staticH}{#6}{\@ff@tmp@y}%
+  \addtolength{\columnheight}{-\vcolumnsep}%
+  \ifffvadjust\adjustheight{\columnheight}\fi
+  \setlength{\columnwidth}{#4}%
+  \addtolength{\columnwidth}{-\columnsep}%
+  \divide\columnwidth by 2\relax
+  \setlength{\@ff@tmp@x}{\columnwidth}%
+  \addtolength{\@ff@tmp@x}{\columnsep}%
+  \addtolength{\@ff@tmp@x}{#6}%
+  \iflefttorightcolumns
+    \@n@wflowframe[#1]{\columnwidth}{\columnheight}{#6}{#7}%
+    \setflowframe{\c@maxflow}{margin=left}%
+  \else
+    \@n@wflowframe[#1]{\columnwidth}{\columnheight}{\@ff@tmp@x}{#7}%
+    \setflowframe{\c@maxflow}{margin=right}%
+  \fi
+  \iflefttorightcolumns
+    \@n@wflowframe[#1]{\columnwidth}{\columnheight}{\@ff@tmp@x}{#7}%
+    \setflowframe{\c@maxflow}{margin=right}%
+  \else
+    \@n@wflowframe[#1]{\columnwidth}{\columnheight}{#6}{#7}%
+    \setflowframe{\c@maxflow}{margin=left}%
+  \fi
 }
 \@onlypreamble{\twocolumntopinarea}
 \newcommand*{\twocolumnStopinarea}[6][all]{%
@@ -3158,28 +3192,38 @@ Available frame types are: 'flow', 'static' and 'dynamic'}}}}}
 }
 \@onlypreamble{\Ncolumntopinarea}
 \newcommand*{\@Ncolumntopinarea}[8][all]{%
-\setlength{\@ff@staticH}{#4}%
-\setlength{\@ff@tmp@y}{#6}%
-\addtolength{\@ff@tmp@y}{-\@ff@staticH}%
-\setlength{\columnheight}{\@ff@tmp@y}%
-\addtolength{\@ff@tmp@y}{#8}%
-\newframe[#1]{#2}{#5}{\@ff@staticH}{#7}{\@ff@tmp@y}%
-\addtolength{\columnheight}{-\vcolumnsep}%
-\ifffvadjust\adjustheight{\columnheight}\fi%
-\@colN=#3\relax
-\advance\@colN by -1\relax
-\setlength{\columnwidth}{#5}%
-\addtolength{\columnwidth}{-\@colN\columnsep}%
-\divide\columnwidth by #3\relax
-\setlength{\@ff@tmp@x}{#7}%
-\@colN=0\relax
-\loop
-\advance\@colN by 1\relax
-\newflowframe[#1]{\columnwidth}{\columnheight}{\@ff@tmp@x}{#8}%
-\addtolength{\@ff@tmp@x}{\columnwidth}%
-\addtolength{\@ff@tmp@x}{\columnsep}%
-\ifnum\@colN<#3
-\repeat
+  \setlength{\@ff@staticH}{#4}%
+  \setlength{\@ff@tmp@y}{#6}%
+  \addtolength{\@ff@tmp@y}{-\@ff@staticH}%
+  \setlength{\columnheight}{\@ff@tmp@y}%
+  \addtolength{\@ff@tmp@y}{#8}%
+  \newframe[#1]{#2}{#5}{\@ff@staticH}{#7}{\@ff@tmp@y}%
+  \addtolength{\columnheight}{-\vcolumnsep}%
+  \ifffvadjust\adjustheight{\columnheight}\fi%
+  \@colN=#3\relax
+  \advance\@colN by -1\relax
+  \setlength{\columnwidth}{#5}%
+  \addtolength{\columnwidth}{-\@colN\columnsep}%
+  \divide\columnwidth by #3\relax
+  \setlength{\@ff@tmp@x}{#7}%
+  \iflefttorightcolumns
+  \else
+    \addtolength{\@ff@tmp@x}{#5}%
+    \addtolength{\@ff@tmp@x}{-\columnwidth}%
+  \fi
+  \@colN=0\relax
+  \loop
+    \advance\@colN by 1\relax
+    \newflowframe[#1]{\columnwidth}{\columnheight}{\@ff@tmp@x}{#8}%
+    \iflefttorightcolumns
+      \addtolength{\@ff@tmp@x}{\columnwidth}%
+      \addtolength{\@ff@tmp@x}{\columnsep}%
+    \else
+      \addtolength{\@ff@tmp@x}{-\columnwidth}%
+      \addtolength{\@ff@tmp@x}{-\columnsep}%
+    \fi
+  \ifnum\@colN<#3
+  \repeat
 }
 \newcommand*{\NcolumnStopinarea}[7][all]{%
 \Ncolumntopinarea[#1]{static}{#2}{#3}{#4}{#5}{#6}{#7}}
@@ -3193,16 +3237,16 @@ Available frame types are: 'flow', 'static' and 'dynamic'}}}}}
 \newcommand*{\onecolumnDbottom}[2][all]{%
 \onecolumnbottom[#1]{dynamic}{#2}}
 \newcommand*{\onecolumnbottominarea}[7][all]{%
-\setlength{\@ff@staticH}{#3}%
-\setlength{\columnheight}{#5}%
-\addtolength{\columnheight}{-\@ff@staticH}%
-\addtolength{\columnheight}{-\vcolumnsep}%
-\ifffvadjust\adjustheight{\columnheight}\fi%
-\setlength{\@ff@tmp@y}{#5}%
-\addtolength{\@ff@tmp@y}{-\columnheight}%
-\addtolength{\@ff@tmp@y}{#7}%
-\newframe[#1]{#2}{#4}{\@ff@staticH}{#6}{#7}%
-\newflowframe[#1]{#4}{\columnheight}{#6}{\@ff@tmp@y}%
+  \setlength{\@ff@staticH}{#3}%
+  \setlength{\columnheight}{#5}%
+  \addtolength{\columnheight}{-\@ff@staticH}%
+  \addtolength{\columnheight}{-\vcolumnsep}%
+  \ifffvadjust\adjustheight{\columnheight}\fi%
+  \setlength{\@ff@tmp@y}{#5}%
+  \addtolength{\@ff@tmp@y}{-\columnheight}%
+  \addtolength{\@ff@tmp@y}{#7}%
+  \newframe[#1]{#2}{#4}{\@ff@staticH}{#6}{#7}%
+  \newflowframe[#1]{#4}{\columnheight}{#6}{\@ff@tmp@y}%
 }
 \@onlypreamble{\onecolumnbottominarea}
 \newcommand*{\onecolumnSbottominarea}[6][all]{%
@@ -3217,26 +3261,38 @@ Available frame types are: 'flow', 'static' and 'dynamic'}}}}}
 \newcommand*{\twocolumnDbottom}[2][all]{%
 \twocolumnbottom[#1]{dynamic}{#2}}
 \newcommand*{\twocolumnbottominarea}[7][all]{%
-\setlength{\@ff@staticW}{#4}%
-\setlength{\@ff@staticH}{#3}%
-\setlength{\columnheight}{#5}%
-\addtolength{\columnheight}{-\@ff@staticH}%
-\addtolength{\columnheight}{-\vcolumnsep}%
-\ifffvadjust\adjustheight{\columnheight}\fi%
-\newframe[#1]{#2}{\@ff@staticW}{\@ff@staticH}{#6}{#7}%
-\setlength{\@ff@tmp@y}{#5}%
-\addtolength{\@ff@tmp@y}{-\columnheight}%
-\addtolength{\@ff@tmp@y}{#7}%
-\setlength{\columnwidth}{\@ff@staticW}%
-\addtolength{\columnwidth}{-\columnsep}%
-\divide\columnwidth by 2\relax
-\setlength{\@ff@tmp@x}{\columnwidth}%
-\addtolength{\@ff@tmp@x}{\columnsep}%
-\addtolength{\@ff@tmp@x}{#6}%
-\newflowframe[#1]{\columnwidth}{\columnheight}{#6}{\@ff@tmp@y}%
-\setflowframe{\c@maxflow}{margin=left}%
-\newflowframe[#1]{\columnwidth}{\columnheight}{\@ff@tmp@x}{\@ff@tmp@y}%
-\setflowframe{\c@maxflow}{margin=right}%
+  \setlength{\@ff@staticW}{#4}%
+  \setlength{\@ff@staticH}{#3}%
+  \setlength{\columnheight}{#5}%
+  \addtolength{\columnheight}{-\@ff@staticH}%
+  \addtolength{\columnheight}{-\vcolumnsep}%
+  \ifffvadjust\adjustheight{\columnheight}\fi%
+  \newframe[#1]{#2}{\@ff@staticW}{\@ff@staticH}{#6}{#7}%
+  \setlength{\@ff@tmp@y}{#5}%
+  \addtolength{\@ff@tmp@y}{-\columnheight}%
+  \addtolength{\@ff@tmp@y}{#7}%
+  \setlength{\columnwidth}{\@ff@staticW}%
+  \addtolength{\columnwidth}{-\columnsep}%
+  \divide\columnwidth by 2\relax
+  \setlength{\@ff@tmp@x}{\columnwidth}%
+  \addtolength{\@ff@tmp@x}{\columnsep}%
+  \addtolength{\@ff@tmp@x}{#6}%
+  \iflefttorightcolumns
+    \newflowframe[#1]{\columnwidth}{\columnheight}{#6}{\@ff@tmp@y}%
+    \setflowframe{\c@maxflow}{margin=left}%
+  \else
+    \newflowframe[#1]{\columnwidth}{\columnheight}%
+      {\@ff@tmp@x}{\@ff@tmp@y}%
+    \setflowframe{\c@maxflow}{margin=right}%
+  \fi
+  \iflefttorightcolumns
+    \newflowframe[#1]{\columnwidth}{\columnheight}%
+      {\@ff@tmp@x}{\@ff@tmp@y}%
+    \setflowframe{\c@maxflow}{margin=right}%
+  \else
+    \newflowframe[#1]{\columnwidth}{\columnheight}{#6}{\@ff@tmp@y}%
+    \setflowframe{\c@maxflow}{margin=left}%
+  \fi
 }
 \@onlypreamble{\twocolumnbottominarea}
 \newcommand*{\twocolumnSbottominarea}[6][all]{%
@@ -3272,29 +3328,40 @@ Available frame types are: 'flow', 'static' and 'dynamic'}}}}}
 }
 \@onlypreamble{\Ncolumnbottominarea}
 \newcommand*{\@NcolumnSbottominarea}[8][all]{%
-\setlength{\@ff@staticH}{#4}%
-\setlength{\columnheight}{#6}%
-\addtolength{\columnheight}{-\@ff@staticH}%
-\addtolength{\columnheight}{-\vcolumnsep}%
-\ifffvadjust\adjustheight{\columnheight}\fi
-\newframe[#1]{#2}{#5}{\@ff@staticH}{#7}{#8}%
-\setlength{\@ff@tmp@y}{#6}%
-\addtolength{\@ff@tmp@y}{-\columnheight}%
-\addtolength{\@ff@tmp@y}{#8}%
-\@colN=#3\relax
-\advance\@colN by -1\relax
-\setlength{\columnwidth}{#5}%
-\addtolength{\columnwidth}{-\@colN\columnsep}%
-\divide\columnwidth by #3\relax
-\setlength{\@ff@tmp@x}{#7}%
-\@colN=0\relax
-\loop
-\advance\@colN by 1\relax
-\newflowframe[#1]{\columnwidth}{\columnheight}{\@ff@tmp@x}{\@ff@tmp@y}%
-\addtolength{\@ff@tmp@x}{\columnwidth}%
-\addtolength{\@ff@tmp@x}{\columnsep}%
-\ifnum\@colN<#3
-\repeat
+  \setlength{\@ff@staticH}{#4}%
+  \setlength{\columnheight}{#6}%
+  \addtolength{\columnheight}{-\@ff@staticH}%
+  \addtolength{\columnheight}{-\vcolumnsep}%
+  \ifffvadjust\adjustheight{\columnheight}\fi
+  \newframe[#1]{#2}{#5}{\@ff@staticH}{#7}{#8}%
+  \setlength{\@ff@tmp@y}{#6}%
+  \addtolength{\@ff@tmp@y}{-\columnheight}%
+  \addtolength{\@ff@tmp@y}{#8}%
+  \@colN=#3\relax
+  \advance\@colN by -1\relax
+  \setlength{\columnwidth}{#5}%
+  \addtolength{\columnwidth}{-\@colN\columnsep}%
+  \divide\columnwidth by #3\relax
+  \setlength{\@ff@tmp@x}{#7}%
+  \iflefttorightcolumns
+  \else
+    \addtolength{\@ff@tmp@x}{#5}%
+    \addtolength{\@ff@tmp@x}{-\columnwidth}%
+  \fi
+  \@colN=0\relax
+  \loop
+    \advance\@colN by 1\relax
+    \newflowframe[#1]{\columnwidth}{\columnheight}%
+       {\@ff@tmp@x}{\@ff@tmp@y}%
+    \iflefttorightcolumns
+      \addtolength{\@ff@tmp@x}{\columnwidth}%
+      \addtolength{\@ff@tmp@x}{\columnsep}%
+    \else
+      \addtolength{\@ff@tmp@x}{-\columnwidth}%
+      \addtolength{\@ff@tmp@x}{-\columnsep}%
+    \fi
+  \ifnum\@colN<#3
+  \repeat
 }
 \newcommand*{\NcolumnSbottominarea}[1][all]{%
 \Ncolumnbottominarea[#1]{static}}