flowfram (7jun14)

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

2 files changed, 115 insertions, 11 deletions

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