summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/flowfram/CHANGES10
-rw-r--r--Master/texmf-dist/doc/latex/flowfram/README4
-rw-r--r--Master/texmf-dist/doc/latex/flowfram/ffuserguide.pdfbin299967 -> 300802 bytes
-rw-r--r--Master/texmf-dist/doc/latex/flowfram/ffuserguide.tex15
-rw-r--r--Master/texmf-dist/doc/latex/flowfram/flowfram.pdfbin525444 -> 527295 bytes
-rw-r--r--Master/texmf-dist/doc/latex/flowfram/samples/sample-article.pdfbin163035 -> 163046 bytes
-rw-r--r--Master/texmf-dist/doc/latex/flowfram/samples/sample-brochure.pdfbin101913 -> 101913 bytes
-rw-r--r--Master/texmf-dist/doc/latex/flowfram/samples/sample-news.pdfbin48208 -> 48208 bytes
-rw-r--r--Master/texmf-dist/doc/latex/flowfram/samples/sample-news2.pdfbin52822 -> 52822 bytes
-rw-r--r--Master/texmf-dist/doc/latex/flowfram/samples/sample-pages.pdfbin136400 -> 136314 bytes
-rw-r--r--Master/texmf-dist/doc/latex/flowfram/samples/sample-poster.pdfbin91427 -> 91427 bytes
-rw-r--r--Master/texmf-dist/doc/latex/flowfram/samples/sample-rot.pdfbin54582 -> 54595 bytes
-rw-r--r--Master/texmf-dist/doc/latex/flowfram/samples/sample.pdfbin100471 -> 100471 bytes
-rw-r--r--Master/texmf-dist/doc/latex/flowfram/samples/sample1.pdfbin151306 -> 151306 bytes
-rw-r--r--Master/texmf-dist/doc/latex/flowfram/samples/sample2.pdfbin139363 -> 142717 bytes
-rw-r--r--Master/texmf-dist/doc/latex/flowfram/samples/sample3.pdfbin46660 -> 46660 bytes
-rw-r--r--Master/texmf-dist/doc/latex/flowfram/samples/sampleRL.pdfbin31646 -> 31657 bytes
-rw-r--r--Master/texmf-dist/source/latex/flowfram/flowfram.dtx124
-rw-r--r--Master/texmf-dist/source/latex/flowfram/flowfram.ins2
-rw-r--r--Master/texmf-dist/tex/latex/flowfram/flowfram.sty77
20 files changed, 211 insertions, 21 deletions
diff --git a/Master/texmf-dist/doc/latex/flowfram/CHANGES b/Master/texmf-dist/doc/latex/flowfram/CHANGES
index ec707b7e32e..a10df6dcc2f 100644
--- a/Master/texmf-dist/doc/latex/flowfram/CHANGES
+++ b/Master/texmf-dist/doc/latex/flowfram/CHANGES
@@ -1,11 +1,17 @@
flowfram change log
+1.16 (2014/06/04) :
+
+ * Added `hide' and `hidethis' attributes for static and dynamic
+ frames.
+ * Removed bug that modified \textwidth in output routine.
+
1.15 (2014/05/15) :
* Now allows \Shapepar as a valid shape command
- * Modified \@setcol so that it sets \linewidth as well as
- \textwidth
+ * Modified \@setcol so that it adjusts \linewidth if it's bigger
+ than the new column width
1.14 (2012/11/10) :
diff --git a/Master/texmf-dist/doc/latex/flowfram/README b/Master/texmf-dist/doc/latex/flowfram/README
index b70f2dab2fd..56197e19701 100644
--- a/Master/texmf-dist/doc/latex/flowfram/README
+++ b/Master/texmf-dist/doc/latex/flowfram/README
@@ -1,6 +1,6 @@
-LaTeX Package : flowfram v1.15
+LaTeX Package : flowfram v1.16
-Last Modified : 2014-05-15
+Last Modified : 2014-06-04
Author : Nicola Talbot
diff --git a/Master/texmf-dist/doc/latex/flowfram/ffuserguide.pdf b/Master/texmf-dist/doc/latex/flowfram/ffuserguide.pdf
index 857342e77fd..705023bf45f 100644
--- a/Master/texmf-dist/doc/latex/flowfram/ffuserguide.pdf
+++ b/Master/texmf-dist/doc/latex/flowfram/ffuserguide.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/flowfram/ffuserguide.tex b/Master/texmf-dist/doc/latex/flowfram/ffuserguide.tex
index 9c903e9bc62..3a2c96ac194 100644
--- a/Master/texmf-dist/doc/latex/flowfram/ffuserguide.tex
+++ b/Master/texmf-dist/doc/latex/flowfram/ffuserguide.tex
@@ -364,9 +364,9 @@ backcolor=blue,textcolor=white,style=footstyle,pages=none}
\begin{document}\label{top}
\title{Creating Flow Frames for Posters, Brochures or
-Magazines using flowfram.sty version 1.15}
+Magazines using flowfram.sty version 1.16}
\author{Nicola L. C. Talbot}
-\date{2014-05-15}
+\date{2014-06-04}
% swap frames around for title page
\ffswapoddeven*{main}
@@ -1574,6 +1574,16 @@ first argument must be a single \gls{idn}.}
See also \latexhtml{\autoref{sec:switch}}{\htmlref{Switching Frames
On and Off On-The-Fly}{sec:switch}}.
+\item[\key{hide}=\meta{boolean}] If this value is set, the static or
+dynamic frame will be hidden regardless of the \key{pages} or
+\key{excludedpages} settings.
+(New to version 1.16.)
+
+\item[\key{hidethis}=\meta{boolean}] Similar to \key{hide}, but is
+always reset back to false by the output routine, so it only affects
+the current page.
+(New to version 1.16.)
+
\item[\key{margin}=\meta{side}] The side of
the \gls*{flow} that its corresponding margin should go on. This
can take the values \texttt{left}, \texttt{right},
@@ -1630,6 +1640,7 @@ to version 1.03). If \meta{shape command} is \cmdname{relax}, no
paragraph shape will be applied. See
\latexhtml{\autoref{sec:parshape}}{\htmlref{Non-Rectangular
Frames}{sec:parshape}} for further details.
+
\end{description}
\htmlnav
diff --git a/Master/texmf-dist/doc/latex/flowfram/flowfram.pdf b/Master/texmf-dist/doc/latex/flowfram/flowfram.pdf
index e90d4686b5c..98120b11450 100644
--- a/Master/texmf-dist/doc/latex/flowfram/flowfram.pdf
+++ b/Master/texmf-dist/doc/latex/flowfram/flowfram.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/flowfram/samples/sample-article.pdf b/Master/texmf-dist/doc/latex/flowfram/samples/sample-article.pdf
index 58f7db5d42e..2c23b69394c 100644
--- a/Master/texmf-dist/doc/latex/flowfram/samples/sample-article.pdf
+++ b/Master/texmf-dist/doc/latex/flowfram/samples/sample-article.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/flowfram/samples/sample-brochure.pdf b/Master/texmf-dist/doc/latex/flowfram/samples/sample-brochure.pdf
index 0c488945cbc..0e0e16f8749 100644
--- a/Master/texmf-dist/doc/latex/flowfram/samples/sample-brochure.pdf
+++ b/Master/texmf-dist/doc/latex/flowfram/samples/sample-brochure.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/flowfram/samples/sample-news.pdf b/Master/texmf-dist/doc/latex/flowfram/samples/sample-news.pdf
index 8a8e6f36def..68f15731385 100644
--- a/Master/texmf-dist/doc/latex/flowfram/samples/sample-news.pdf
+++ b/Master/texmf-dist/doc/latex/flowfram/samples/sample-news.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/flowfram/samples/sample-news2.pdf b/Master/texmf-dist/doc/latex/flowfram/samples/sample-news2.pdf
index 11d0791c531..69706c2bfa5 100644
--- a/Master/texmf-dist/doc/latex/flowfram/samples/sample-news2.pdf
+++ b/Master/texmf-dist/doc/latex/flowfram/samples/sample-news2.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/flowfram/samples/sample-pages.pdf b/Master/texmf-dist/doc/latex/flowfram/samples/sample-pages.pdf
index 923879c65ab..e40baadf2f7 100644
--- a/Master/texmf-dist/doc/latex/flowfram/samples/sample-pages.pdf
+++ b/Master/texmf-dist/doc/latex/flowfram/samples/sample-pages.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/flowfram/samples/sample-poster.pdf b/Master/texmf-dist/doc/latex/flowfram/samples/sample-poster.pdf
index b775d2a2a87..5b80d3338f4 100644
--- a/Master/texmf-dist/doc/latex/flowfram/samples/sample-poster.pdf
+++ b/Master/texmf-dist/doc/latex/flowfram/samples/sample-poster.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/flowfram/samples/sample-rot.pdf b/Master/texmf-dist/doc/latex/flowfram/samples/sample-rot.pdf
index 7976d73e07b..9af2219927e 100644
--- a/Master/texmf-dist/doc/latex/flowfram/samples/sample-rot.pdf
+++ b/Master/texmf-dist/doc/latex/flowfram/samples/sample-rot.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/flowfram/samples/sample.pdf b/Master/texmf-dist/doc/latex/flowfram/samples/sample.pdf
index faf96623b10..0e8539c0a6c 100644
--- a/Master/texmf-dist/doc/latex/flowfram/samples/sample.pdf
+++ b/Master/texmf-dist/doc/latex/flowfram/samples/sample.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/flowfram/samples/sample1.pdf b/Master/texmf-dist/doc/latex/flowfram/samples/sample1.pdf
index 8b51ba4614d..098e36ae7ff 100644
--- a/Master/texmf-dist/doc/latex/flowfram/samples/sample1.pdf
+++ b/Master/texmf-dist/doc/latex/flowfram/samples/sample1.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/flowfram/samples/sample2.pdf b/Master/texmf-dist/doc/latex/flowfram/samples/sample2.pdf
index 13a79e53fa1..45d218a8f8e 100644
--- a/Master/texmf-dist/doc/latex/flowfram/samples/sample2.pdf
+++ b/Master/texmf-dist/doc/latex/flowfram/samples/sample2.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/flowfram/samples/sample3.pdf b/Master/texmf-dist/doc/latex/flowfram/samples/sample3.pdf
index 5702ae4e1d5..49e1033b743 100644
--- a/Master/texmf-dist/doc/latex/flowfram/samples/sample3.pdf
+++ b/Master/texmf-dist/doc/latex/flowfram/samples/sample3.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/flowfram/samples/sampleRL.pdf b/Master/texmf-dist/doc/latex/flowfram/samples/sampleRL.pdf
index 1557570dfdd..15867f881e3 100644
--- a/Master/texmf-dist/doc/latex/flowfram/samples/sampleRL.pdf
+++ b/Master/texmf-dist/doc/latex/flowfram/samples/sampleRL.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/flowfram/flowfram.dtx b/Master/texmf-dist/source/latex/flowfram/flowfram.dtx
index 37cbe1e0567..e23309351cc 100644
--- a/Master/texmf-dist/source/latex/flowfram/flowfram.dtx
+++ b/Master/texmf-dist/source/latex/flowfram/flowfram.dtx
@@ -13,7 +13,7 @@
% -doc "docstub.tex"
% -author "Nicola Talbot"
% flowfram
-% Created on 2014/5/15 15:25
+% Created on 2014/6/7 15:18
%\fi
%\iffalse
%<*package>
@@ -44,7 +44,7 @@
\addtolength{\marginparwidth}{10pt}
\addtolength{\oddsidemargin}{20pt}
-\CheckSum{12619}
+\CheckSum{12713}
\PageIndex
\usepackage{url}
@@ -145,13 +145,14 @@ IDN}]{idl}{IDL}{identification label}
\end{document}
%</driver>
%\fi
-%\title{Documented Source Code for flowfram.sty v1.15}
+%\title{Documented Source Code for flowfram.sty v1.16}
%\author{Nicola L. C. Talbot}
-%\date{2014-05-15}
+%\date{2014-06-04}
%\maketitle
%
%This is the documented source code for the flowfram package.
-%For a user manual, see \url{ffuserguide.pdf}.
+%For a user manual, see \url{ffuserguide.pdf} (or do \texttt{texdoc
+%ffuserguide}).
%
%\tableofcontents
%
@@ -171,7 +172,7 @@ IDN}]{idl}{IDL}{identification label}
% Declare package, and identify it as a \LaTeXe\ package.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{flowfram}[2014/05/15 v1.15 (NLCT)]
+\ProvidesPackage{flowfram}[2014/06/04 v1.16 (NLCT)]
% \end{macrocode}
% Load packages needed by this package
% \begin{macrocode}
@@ -1465,6 +1466,20 @@ IDN}]{idl}{IDL}{identification label}
\def\ff@valign{#1}%
}
% \end{macrocode}
+% This key is only for \glspl{static} and \glspl{dynamic}:
+%\changes{2014-06-04}{1.16}{added `hide' and `hidethis' keys}
+% \begin{macrocode}
+\define@choicekey{flowframe}{hide}{true,false}[true]{%
+ \def\ff@hide{#1}%
+}
+% \end{macrocode}
+% This key is only for \glspl{static} and \glspl{dynamic}:
+% \begin{macrocode}
+\define@choicekey{flowframe}{hidethis}{true,false}[true]{%
+ \def\ff@hidethis{#1}%
+}
+% \end{macrocode}
+%
%\begin{macro}{\setallflowframes}
% Provide a command to change the settings for all flow
% frames. This just iterates through all the \glspl{flow},
@@ -1562,6 +1577,7 @@ IDN}]{idl}{IDL}{identification label}
\def\ff@frame{}\def\ff@width{}\def\ff@height{}\def\ff@margin{}%
\def\ff@x{}\def\ff@y{}\def\ff@frametype{}\def\ff@col{}%
\def\ff@valign{}\def\ff@style{}%
+ \def\ff@hide{}\def\ff@hidethis{}%
\def\ff@txtcol{}\def\ff@clear{}\def\ff@offset{}\def\ff@pages{}%
\def\ff@label{}\def\ff@backcol{}\def\ff@evenx{}\def\ff@eveny{}%
\def\ff@oddx{}\def\ff@oddy{}\def\ff@angle{}%
@@ -1694,6 +1710,16 @@ IDN}]{idl}{IDL}{identification label}
\PackageError{flowfram}%
{Key 'valign' not available for flow frames}{}%
}%
+ \ifdefempty{\ff@hide}{}%
+ {%
+ \PackageError{flowfram}%
+ {Key 'hide' not available for flow frames}{}%
+ }%
+ \ifdefempty{\ff@hidethis}{}%
+ {%
+ \PackageError{flowfram}%
+ {Key 'hidethis' not available for flow frames}{}%
+ }%
}
% \end{macrocode}
%\end{macro}
@@ -2003,6 +2029,13 @@ IDN}]{idl}{IDL}{identification label}
fbox}%
\newboolean{@sf@clear@\romannumeral\c@maxstatic}%
\setboolean{@sf@clear@\romannumeral\c@maxstatic}{false}
+% \end{macrocode}
+%\changes{2014-06-04}{1.16}{added `hide' and `hidethis' attributes}
+% \begin{macrocode}
+ \newboolean{@sf@hide@\romannumeral\c@maxstatic}%
+ \setboolean{@sf@hide@\romannumeral\c@maxstatic}{false}%
+ \newboolean{@sf@hidethis@\romannumeral\c@maxstatic}%
+ \setboolean{@sf@hidethis@\romannumeral\c@maxstatic}{false}%
\@ifnextchar[{\@s@tstaticframeid{\c@maxstatic}}%
{\@s@tstaticframeid{\c@maxstatic}[\number\c@maxstatic]}%
}
@@ -2228,6 +2261,7 @@ IDN}]{idl}{IDL}{identification label}
\def\ff@clear{}\def\ff@margin{}\def\ff@offset{}\def\ff@pages{}%
\def\ff@label{}\def\ff@evenx{}\def\ff@eveny{}%
\def\ff@oddx{}\def\ff@oddy{}%
+ \def\ff@hide{}\def\ff@hidethis{}%
\let\ff@shape\undefined
\let\ff@xpages\undefined
\setkeys{flowframe}{#2}%
@@ -2325,6 +2359,14 @@ IDN}]{idl}{IDL}{identification label}
{%
\staticsetexclusion{#1}{\ff@xpages}%
}%
+ \ifdefempty{\ff@hide}{}%
+ {%
+ \setboolean{@sf@hide@\romannumeral#1}{\ff@hide}%
+ }%
+ \ifdefempty{\ff@hidethis}{}%
+ {%
+ \global\csletcs{if@sf@hidethis@\romannumeral#1}{if\ff@hidethis}%
+ }%
\ifdefempty{\ff@clear}{}%
{%
\setboolean{@sf@clear@\romannumeral#1}{\ff@clear}%
@@ -2878,6 +2920,13 @@ IDN}]{idl}{IDL}{identification label}
\gdef\csname @df@shape@\romannumeral\c@maxdynamic\endcsname{\relax}%
\newboolean{@df@clear@\romannumeral\c@maxdynamic}%
\setboolean{@df@clear@\romannumeral\c@maxdynamic}{false}%
+% \end{macrocode}
+%\changes{2014-06-04}{1.16}{added `hide' and `hidethis' attributes}
+% \begin{macrocode}
+ \newboolean{@df@hide@\romannumeral\c@maxdynamic}%
+ \setboolean{@df@hide@\romannumeral\c@maxdynamic}{false}%
+ \newboolean{@df@hidethis@\romannumeral\c@maxdynamic}%
+ \setboolean{@df@hidethis@\romannumeral\c@maxdynamic}{false}%
\@ifnextchar[{\@s@tdynamicframeid{\c@maxdynamic}}%
{\@s@tdynamicframeid{\c@maxdynamic}[\number\c@maxdynamic]}%
}
@@ -3120,6 +3169,7 @@ IDN}]{idl}{IDL}{identification label}
\def\ff@clear{}\def\ff@margin{}\def\ff@offset{}\def\ff@pages{}%
\def\ff@label{}\def\ff@evenx{}\def\ff@eveny{}%
\def\ff@oddx{}\def\ff@oddy{}\def\ff@angle{}%
+ \def\ff@hide{}\def\ff@hidethis{}%
\let\ff@shape\undefined
\let\ff@xpages\undefined
\setkeys{flowframe}{#2}%
@@ -3256,6 +3306,14 @@ IDN}]{idl}{IDL}{identification label}
}%
{dynamic frames don't have marginal notes}%
}%
+ \ifdefempty{\ff@hide}{}%
+ {%
+ \setboolean{@df@hide@\romannumeral#1}{\ff@hide}%
+ }%
+ \ifdefempty{\ff@hidethis}{}%
+ {%
+ \global\csletcs{if@df@hidethis@\romannumeral#1}{if\ff@hidethis}%
+ }%
}
% \end{macrocode}
%\end{macro}
@@ -5444,11 +5502,14 @@ IDN}]{idl}{IDL}{identification label}
% \cs{linewidth} to \cs{columnwidth}. Only modify \cs{linewidth} if
% it's larger than the new column width.
%\changes{1.15}{2014-05-15}{set \cs{linewidth} as well as \cs{textwidth}}
-%\begin{macrocode}
+% \begin{macrocode}
\ifnum\linewidth>\columnwidth
\global\linewidth\columnwidth
\fi
- \global\textwidth\columnwidth
+% \end{macrocode}
+%\changes{1.16}{2014-06-04}{Removed assignment of \cs{textwidth}}
+% \begin{macrocode}
+ %\global\textwidth\columnwidth
\setmargin
\fi
\stepcounter{displayedframe}%
@@ -9058,7 +9119,28 @@ IDN}]{idl}{IDL}{identification label}
% associated border.
% \begin{macrocode}
\newcommand*{\@putstaticbox}[1]{%
- \@sf@chckifthispg{#1}%
+%\changes{2014-06-04}{1.16}{added check for `hide' and `hidethis'
+%attributes}
+% Check the `hide' and `hidethis' attributes
+% \begin{macrocode}
+ \ifthenelse{\boolean{@sf@hidethis@\romannumeral#1}}%
+ {%
+ \@notthiscoltrue
+ \global\csletcs{if@sf@hidethis@\romannumeral#1}{iffalse}%
+ }%
+ {%
+ \ifthenelse{\boolean{@sf@hide@\romannumeral#1}}%
+ {%
+ \@notthiscoltrue
+ }%
+ {%
+% \end{macrocode}
+% Neither `hide' nor `hidethis' have been set so check the page
+% list.
+% \begin{macrocode}
+ \@sf@chckifthispg{#1}%
+ }%
+ }%
\if@notthiscol
\else
\@killglue
@@ -9287,7 +9369,29 @@ IDN}]{idl}{IDL}{identification label}
% Put the \gls{dynamic} "#1" at its given position
% \begin{macrocode}
\newcommand*{\@putdynamicbox}[1]{%
- \@df@chckifthispg{#1}%
+% \end{macrocode}
+%\changes{2014-06-04}{1.16}{added check for `hide' and `hidethis'
+%attributes}
+% Check the `hide' and `hidethis' attributes
+% \begin{macrocode}
+ \ifthenelse{\boolean{@df@hidethis@\romannumeral#1}}%
+ {%
+ \@notthiscoltrue
+ \global\csletcs{if@df@hidethis@\romannumeral#1}{iffalse}%
+ }%
+ {%
+ \ifthenelse{\boolean{@df@hide@\romannumeral#1}}%
+ {%
+ \@notthiscoltrue
+ }%
+ {%
+% \end{macrocode}
+% Neither `hide' nor `hidethis' have been set so check the page
+% list.
+% \begin{macrocode}
+ \@df@chckifthispg{#1}%
+ }%
+ }%
\if@notthiscol
\else
\@killglue
diff --git a/Master/texmf-dist/source/latex/flowfram/flowfram.ins b/Master/texmf-dist/source/latex/flowfram/flowfram.ins
index b8cbdfcfd26..557f81a1fbb 100644
--- a/Master/texmf-dist/source/latex/flowfram/flowfram.ins
+++ b/Master/texmf-dist/source/latex/flowfram/flowfram.ins
@@ -1,4 +1,4 @@
-% flowfram.ins generated using makedtx version 1.1 2014/5/15 15:25
+% flowfram.ins generated using makedtx version 1.1 2014/6/7 15:18
\input docstrip
\preamble
diff --git a/Master/texmf-dist/tex/latex/flowfram/flowfram.sty b/Master/texmf-dist/tex/latex/flowfram/flowfram.sty
index d33883457ae..d3d1fc31a89 100644
--- a/Master/texmf-dist/tex/latex/flowfram/flowfram.sty
+++ b/Master/texmf-dist/tex/latex/flowfram/flowfram.sty
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{flowfram}[2014/05/15 v1.15 (NLCT)]
+\ProvidesPackage{flowfram}[2014/06/04 v1.16 (NLCT)]
\RequirePackage{ifthen}
\RequirePackage{xkeyval}
\RequirePackage{graphics}
@@ -712,6 +712,12 @@
{%
\def\ff@valign{#1}%
}
+\define@choicekey{flowframe}{hide}{true,false}[true]{%
+ \def\ff@hide{#1}%
+}
+\define@choicekey{flowframe}{hidethis}{true,false}[true]{%
+ \def\ff@hidethis{#1}%
+}
\newcommand*{\setallflowframes}[1]{%
\@colN=0\relax
\whiledo{\@colN<\c@maxflow}%
@@ -774,6 +780,7 @@
\def\ff@frame{}\def\ff@width{}\def\ff@height{}\def\ff@margin{}%
\def\ff@x{}\def\ff@y{}\def\ff@frametype{}\def\ff@col{}%
\def\ff@valign{}\def\ff@style{}%
+ \def\ff@hide{}\def\ff@hidethis{}%
\def\ff@txtcol{}\def\ff@clear{}\def\ff@offset{}\def\ff@pages{}%
\def\ff@label{}\def\ff@backcol{}\def\ff@evenx{}\def\ff@eveny{}%
\def\ff@oddx{}\def\ff@oddy{}\def\ff@angle{}%
@@ -906,6 +913,16 @@
\PackageError{flowfram}%
{Key 'valign' not available for flow frames}{}%
}%
+ \ifdefempty{\ff@hide}{}%
+ {%
+ \PackageError{flowfram}%
+ {Key 'hide' not available for flow frames}{}%
+ }%
+ \ifdefempty{\ff@hidethis}{}%
+ {%
+ \PackageError{flowfram}%
+ {Key 'hidethis' not available for flow frames}{}%
+ }%
}
\newcommand*{\flowsetpagelist}[2]{%
\expandafter
@@ -1089,6 +1106,10 @@
fbox}%
\newboolean{@sf@clear@\romannumeral\c@maxstatic}%
\setboolean{@sf@clear@\romannumeral\c@maxstatic}{false}
+ \newboolean{@sf@hide@\romannumeral\c@maxstatic}%
+ \setboolean{@sf@hide@\romannumeral\c@maxstatic}{false}%
+ \newboolean{@sf@hidethis@\romannumeral\c@maxstatic}%
+ \setboolean{@sf@hidethis@\romannumeral\c@maxstatic}{false}%
\@ifnextchar[{\@s@tstaticframeid{\c@maxstatic}}%
{\@s@tstaticframeid{\c@maxstatic}[\number\c@maxstatic]}%
}
@@ -1225,6 +1246,7 @@
\def\ff@clear{}\def\ff@margin{}\def\ff@offset{}\def\ff@pages{}%
\def\ff@label{}\def\ff@evenx{}\def\ff@eveny{}%
\def\ff@oddx{}\def\ff@oddy{}%
+ \def\ff@hide{}\def\ff@hidethis{}%
\let\ff@shape\undefined
\let\ff@xpages\undefined
\setkeys{flowframe}{#2}%
@@ -1322,6 +1344,14 @@
{%
\staticsetexclusion{#1}{\ff@xpages}%
}%
+ \ifdefempty{\ff@hide}{}%
+ {%
+ \setboolean{@sf@hide@\romannumeral#1}{\ff@hide}%
+ }%
+ \ifdefempty{\ff@hidethis}{}%
+ {%
+ \global\csletcs{if@sf@hidethis@\romannumeral#1}{if\ff@hidethis}%
+ }%
\ifdefempty{\ff@clear}{}%
{%
\setboolean{@sf@clear@\romannumeral#1}{\ff@clear}%
@@ -1707,6 +1737,10 @@
\gdef\csname @df@shape@\romannumeral\c@maxdynamic\endcsname{\relax}%
\newboolean{@df@clear@\romannumeral\c@maxdynamic}%
\setboolean{@df@clear@\romannumeral\c@maxdynamic}{false}%
+ \newboolean{@df@hide@\romannumeral\c@maxdynamic}%
+ \setboolean{@df@hide@\romannumeral\c@maxdynamic}{false}%
+ \newboolean{@df@hidethis@\romannumeral\c@maxdynamic}%
+ \setboolean{@df@hidethis@\romannumeral\c@maxdynamic}{false}%
\@ifnextchar[{\@s@tdynamicframeid{\c@maxdynamic}}%
{\@s@tdynamicframeid{\c@maxdynamic}[\number\c@maxdynamic]}%
}
@@ -1852,6 +1886,7 @@
\def\ff@clear{}\def\ff@margin{}\def\ff@offset{}\def\ff@pages{}%
\def\ff@label{}\def\ff@evenx{}\def\ff@eveny{}%
\def\ff@oddx{}\def\ff@oddy{}\def\ff@angle{}%
+ \def\ff@hide{}\def\ff@hidethis{}%
\let\ff@shape\undefined
\let\ff@xpages\undefined
\setkeys{flowframe}{#2}%
@@ -1988,6 +2023,14 @@
}%
{dynamic frames don't have marginal notes}%
}%
+ \ifdefempty{\ff@hide}{}%
+ {%
+ \setboolean{@df@hide@\romannumeral#1}{\ff@hide}%
+ }%
+ \ifdefempty{\ff@hidethis}{}%
+ {%
+ \global\csletcs{if@df@hidethis@\romannumeral#1}{if\ff@hidethis}%
+ }%
}
\newcommand*{\dynamicsetpagelist}[2]{%
\expandafter
@@ -3361,7 +3404,7 @@
\ifnum\linewidth>\columnwidth
\global\linewidth\columnwidth
\fi
- \global\textwidth\columnwidth
+ %\global\textwidth\columnwidth
\setmargin
\fi
\stepcounter{displayedframe}%
@@ -5434,7 +5477,20 @@
{S:\number#1;\csname @sf@id@\romannumeral#1\endcsname}%
}
\newcommand*{\@putstaticbox}[1]{%
- \@sf@chckifthispg{#1}%
+ \ifthenelse{\boolean{@sf@hidethis@\romannumeral#1}}%
+ {%
+ \@notthiscoltrue
+ \global\csletcs{if@sf@hidethis@\romannumeral#1}{iffalse}%
+ }%
+ {%
+ \ifthenelse{\boolean{@sf@hide@\romannumeral#1}}%
+ {%
+ \@notthiscoltrue
+ }%
+ {%
+ \@sf@chckifthispg{#1}%
+ }%
+ }%
\if@notthiscol
\else
\@killglue
@@ -5610,7 +5666,20 @@
{D:\number#1;\csname @df@id@\romannumeral#1\endcsname}%
}
\newcommand*{\@putdynamicbox}[1]{%
- \@df@chckifthispg{#1}%
+ \ifthenelse{\boolean{@df@hidethis@\romannumeral#1}}%
+ {%
+ \@notthiscoltrue
+ \global\csletcs{if@df@hidethis@\romannumeral#1}{iffalse}%
+ }%
+ {%
+ \ifthenelse{\boolean{@df@hide@\romannumeral#1}}%
+ {%
+ \@notthiscoltrue
+ }%
+ {%
+ \@df@chckifthispg{#1}%
+ }%
+ }%
\if@notthiscol
\else
\@killglue