flowfram (7jun14)

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

1 files changed, 73 insertions, 4 deletions

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