diff options
author | Karl Berry <karl@freefriends.org> | 2009-11-27 01:29:02 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2009-11-27 01:29:02 +0000 |
commit | 6d2deb683c6f5f51f911abd9ffca4096dc128772 (patch) | |
tree | eb049e1e8613e7c83326fce3b63223cdb67077d2 /Master/texmf-dist/source | |
parent | 79474f0d3d3d93dc34197967b9f0d728d7d48cc3 (diff) |
flowfram update (25nov09)
git-svn-id: svn://tug.org/texlive/trunk@16186 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source')
-rw-r--r-- | Master/texmf-dist/source/latex/flowfram/flowfram.dtx | 354 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/flowfram/flowfram.ins | 4 |
2 files changed, 227 insertions, 131 deletions
diff --git a/Master/texmf-dist/source/latex/flowfram/flowfram.dtx b/Master/texmf-dist/source/latex/flowfram/flowfram.dtx index 7ad71e5b94c..57cdcdd2391 100644 --- a/Master/texmf-dist/source/latex/flowfram/flowfram.dtx +++ b/Master/texmf-dist/source/latex/flowfram/flowfram.dtx @@ -6,7 +6,7 @@ % -author "Nicola Talbot" % -dir "source" % flowfram -% Created on 2008/7/1 14:05 +% Created on 2009/11/25 11:29 %\fi %\iffalse %<*package> @@ -29,13 +29,13 @@ %\fi % \iffalse % Doc-Source file to use with LaTeX2e -% Copyright (C) 2008 Nicola Talbot, all rights reserved. +% Copyright (C) 2009 Nicola Talbot, all rights reserved. % \fi % \iffalse %<*driver> \documentclass{ltxdoc} -\CheckSum{9387} +\CheckSum{9498} \PageIndex \usepackage{url} @@ -132,9 +132,9 @@ IDN}]{idl}{IDL}{identification label} \end{document} %</driver> %\fi -%\title{Documented Source Code for flowfram.sty v1.11} +%\title{Documented Source Code for flowfram.sty v1.12} %\author{Nicola L. C. Talbot} -%\date{28th June 2008} +%\date{25th November 2009} %\maketitle % %This is the documented source code for the flowfram package. @@ -157,7 +157,7 @@ IDN}]{idl}{IDL}{identification label} % Declare package, and identify it as a \LaTeXe\ package. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{flowfram}[2008/06/27 v1.11] +\ProvidesPackage{flowfram}[2009/11/25 v1.12] % \end{macrocode} % Load packages needed by this package % \begin{macrocode} @@ -317,6 +317,20 @@ IDN}]{idl}{IDL}{identification label} \renewcommand{\@ffbackground}[1]{#1} } % \end{macrocode} +%\begin{macro}{\iflefttorightcolumns} +% Determine whether to define the Ncolumn style frames from left +% to right or from right to left. +%\changes{1.12}{2009/11/25}{new} +% \begin{macrocode} +\newif\iflefttorightcolumns +\lefttorightcolumnstrue +% \end{macrocode} +%\end{macro} +% Define options that set the direction: +% \begin{macrocode} +\DeclareOption{LR}{\lefttorightcolumnstrue} +\DeclareOption{RL}{\lefttorightcolumnsfalse} +% \end{macrocode} % Check to see if the document class has the draft option % set. The easiest way to do this is to check the length % of "\overfullrule" (the marker that indicates overfull @@ -5251,18 +5265,28 @@ adding new one}% %\begin{macro}{\@twocolumninarea} % \begin{macrocode} \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 } % \end{macrocode} %\end{macro} @@ -5311,22 +5335,32 @@ adding new one}% % between them all. % \begin{macrocode} \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 } % \end{macrocode} %\end{macro} @@ -5468,28 +5502,46 @@ Available frame types are: 'flow', 'static' and 'dynamic'}}}}} % \begin{macrocode} \newcommand*{\twocolumntopinarea}{\@twocolumntopinarea} \newcommand*{\@twocolumntopinarea}[7][all]{% -\setlength{\@ff@staticH}{#3}% + \setlength{\@ff@staticH}{#3}% +% \end{macrocode} % work out where to put the static frame -\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}% +% \begin{macrocode} + \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}% +% \end{macrocode} % work out height of the flow frames -\addtolength{\columnheight}{-\vcolumnsep}% -\ifffvadjust\adjustheight{\columnheight}\fi% +% \begin{macrocode} + \addtolength{\columnheight}{-\vcolumnsep}% + \ifffvadjust\adjustheight{\columnheight}\fi +% \end{macrocode} % work out the widths of the flow frames -\setlength{\columnwidth}{#4}% -\addtolength{\columnwidth}{-\columnsep}% -\divide\columnwidth by 2\relax -% work out the offset of the second column -\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}% +% \begin{macrocode} + \setlength{\columnwidth}{#4}% + \addtolength{\columnwidth}{-\columnsep}% + \divide\columnwidth by 2\relax +% \end{macrocode} +% work out the offset of the right column +% \begin{macrocode} + \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} % \end{macrocode} @@ -5567,42 +5619,57 @@ Available frame types are: 'flow', 'static' and 'dynamic'}}}}} % \cs{Ncolumntopinarea}\oarg{pages}\marg{type}\marg{n}\marg{H}\marg{w}\marg{h}\marg{x}\marg{y}. % \begin{macrocode} \newcommand*{\@Ncolumntopinarea}[8][all]{% -\setlength{\@ff@staticH}{#4}% + \setlength{\@ff@staticH}{#4}% % \end{macrocode} % work out where to put the static frame % \begin{macrocode} -\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}% + \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}% % \end{macrocode} % work out height of the flow frames % \begin{macrocode} -\addtolength{\columnheight}{-\vcolumnsep}% + \addtolength{\columnheight}{-\vcolumnsep}% % \end{macrocode} % adjust the flow frame height so that it is a multiple of % \cs{baselineskip} % \begin{macrocode} -\ifffvadjust\adjustheight{\columnheight}\fi% + \ifffvadjust\adjustheight{\columnheight}\fi% % \end{macrocode} % work out the widths of the flow frames % \begin{macrocode} -\@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}% + \@colN=#3\relax + \advance\@colN by -1\relax + \setlength{\columnwidth}{#5}% + \addtolength{\columnwidth}{-\@colN\columnsep}% + \divide\columnwidth by #3\relax +% \end{macrocode} +% Set the $x$ position of the first frame +% \begin{macrocode} + \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}% +% \end{macrocode} % work out the offset for the next column -\addtolength{\@ff@tmp@x}{\columnwidth}% -\addtolength{\@ff@tmp@x}{\columnsep}% -\ifnum\@colN<#3 -\repeat +% \begin{macrocode} + \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 } % \end{macrocode} %\end{macro} @@ -5661,16 +5728,16 @@ Available frame types are: 'flow', 'static' and 'dynamic'}}}}} % height \meta{h}. % \begin{macrocode} \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}% } % \end{macrocode} %\end{macro} @@ -5724,38 +5791,53 @@ Available frame types are: 'flow', 'static' and 'dynamic'}}}}} % \cs{twocolumnbottominarea}\oarg{pages}\marg{type}\marg{H}\marg{w}\marg{h}\marg{x}\marg{y}. % \begin{macrocode} \newcommand*{\twocolumnbottominarea}[7][all]{% -\setlength{\@ff@staticW}{#4}% -\setlength{\@ff@staticH}{#3}% + \setlength{\@ff@staticW}{#4}% + \setlength{\@ff@staticH}{#3}% % \end{macrocode} % work out height of the flow frames % \begin{macrocode} -\setlength{\columnheight}{#5}% -\addtolength{\columnheight}{-\@ff@staticH}% -\addtolength{\columnheight}{-\vcolumnsep}% -\ifffvadjust\adjustheight{\columnheight}\fi% -\newframe[#1]{#2}{\@ff@staticW}{\@ff@staticH}{#6}{#7}% + \setlength{\columnheight}{#5}% + \addtolength{\columnheight}{-\@ff@staticH}% + \addtolength{\columnheight}{-\vcolumnsep}% + \ifffvadjust\adjustheight{\columnheight}\fi% + \newframe[#1]{#2}{\@ff@staticW}{\@ff@staticH}{#6}{#7}% % \end{macrocode} % work out the $y$ position of the flow frames % \begin{macrocode} -\setlength{\@ff@tmp@y}{#5}% -\addtolength{\@ff@tmp@y}{-\columnheight}% -\addtolength{\@ff@tmp@y}{#7}% + \setlength{\@ff@tmp@y}{#5}% + \addtolength{\@ff@tmp@y}{-\columnheight}% + \addtolength{\@ff@tmp@y}{#7}% % \end{macrocode} % work out the widths of the flow frames % \begin{macrocode} -\setlength{\columnwidth}{\@ff@staticW}% -\addtolength{\columnwidth}{-\columnsep}% -\divide\columnwidth by 2\relax + \setlength{\columnwidth}{\@ff@staticW}% + \addtolength{\columnwidth}{-\columnsep}% + \divide\columnwidth by 2\relax % \end{macrocode} -% work out the $x$ offset of the second column +% work out the $x$ offset of the right column % \begin{macrocode} -\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@tmp@x}{\columnwidth}% + \addtolength{\@ff@tmp@x}{\columnsep}% + \addtolength{\@ff@tmp@x}{#6}% +% \end{macrocode} +% Define the frames +% \begin{macrocode} + \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} % \end{macrocode} @@ -5832,45 +5914,59 @@ Available frame types are: 'flow', 'static' and 'dynamic'}}}}} % underneath them all, filling the specified area. % \begin{macrocode} \newcommand*{\@NcolumnSbottominarea}[8][all]{% -\setlength{\@ff@staticH}{#4}% + \setlength{\@ff@staticH}{#4}% % \end{macrocode} % work out height of the flow frames % \begin{macrocode} -\setlength{\columnheight}{#6}% -\addtolength{\columnheight}{-\@ff@staticH}% -\addtolength{\columnheight}{-\vcolumnsep}% + \setlength{\columnheight}{#6}% + \addtolength{\columnheight}{-\@ff@staticH}% + \addtolength{\columnheight}{-\vcolumnsep}% % \end{macrocode} % adjust the flow frame height so that it is a multiple of % \cs{baselineskip} % \begin{macrocode} -\ifffvadjust\adjustheight{\columnheight}\fi -\newframe[#1]{#2}{#5}{\@ff@staticH}{#7}{#8}% + \ifffvadjust\adjustheight{\columnheight}\fi + \newframe[#1]{#2}{#5}{\@ff@staticH}{#7}{#8}% % \end{macrocode} % work out the $y$ offset of the flow frames % \begin{macrocode} -\setlength{\@ff@tmp@y}{#6}% -\addtolength{\@ff@tmp@y}{-\columnheight}% -\addtolength{\@ff@tmp@y}{#8}% + \setlength{\@ff@tmp@y}{#6}% + \addtolength{\@ff@tmp@y}{-\columnheight}% + \addtolength{\@ff@tmp@y}{#8}% % \end{macrocode} % work out the widths of the flow frames % \begin{macrocode} -\@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}% + \@colN=#3\relax + \advance\@colN by -1\relax + \setlength{\columnwidth}{#5}% + \addtolength{\columnwidth}{-\@colN\columnsep}% + \divide\columnwidth by #3\relax +% \end{macrocode} +% Set the $x$ offset of the first frame. +% \begin{macrocode} + \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}% % \end{macrocode} % work out the offset for the next column % \begin{macrocode} -\addtolength{\@ff@tmp@x}{\columnwidth}% -\addtolength{\@ff@tmp@x}{\columnsep}% -\ifnum\@colN<#3 -\repeat + \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 } % \end{macrocode} %\end{macro} diff --git a/Master/texmf-dist/source/latex/flowfram/flowfram.ins b/Master/texmf-dist/source/latex/flowfram/flowfram.ins index 39d4d46d06c..78f6abf9788 100644 --- a/Master/texmf-dist/source/latex/flowfram/flowfram.ins +++ b/Master/texmf-dist/source/latex/flowfram/flowfram.ins @@ -1,10 +1,10 @@ -% flowfram.ins generated using makedtx version 0.94b 2008/7/1 14:05 +% flowfram.ins generated using makedtx version 0.94b 2009/11/25 11:29 \input docstrip \preamble 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 |