3 files changed, 18 insertions, 4 deletions
diff --git a/Master/texmf-dist/doc/latex/exsol/exsol.pdf b/Master/texmf-dist/doc/latex/exsol/exsol.pdf
index 6d691e672d1..95da401bdba 100644
--- a/Master/texmf-dist/doc/latex/exsol/exsol.pdf
+++ b/Master/texmf-dist/doc/latex/exsol/exsol.pdf
diff --git a/Master/texmf-dist/source/latex/exsol/exsol.dtx b/Master/texmf-dist/source/latex/exsol/exsol.dtx
index 524cb631760..a0c1538c422 100644
--- a/Master/texmf-dist/source/latex/exsol/exsol.dtx
+++ b/Master/texmf-dist/source/latex/exsol/exsol.dtx
@@ -87,6 +87,8 @@
 % \changes{v0.7}{2014/07/14}{. Fixed UTF8 compatibility issues}
 % \changes{v0.8}{2014/07/15}{. Fixed missing babel tag and running out
 % of write hanles}
+% \changes{v0.9}{2014/07/28}{. Changed default behavior
+% w.r.t. minipage-wraping of exercises} 
 %
 % \DoNotIndex{\newcommand,\newenvironment}
 % \setlength{\parindent}{0em}
@@ -400,6 +402,17 @@
 %    \end{macrocode}
 % \end{macro}
 %
+% \changes{v0.9}{2014/07/28}{. Changed default behavior
+% w.r.t. minipage-wraping of exercises}
+% \begin{macro}{minipage}
+%  This boolean option (true, false) causes the exercises to be
+%  wrapped in minipages. This avoids them getting split by a page
+%  boundary.
+%    \begin{macrocode}
+\DeclareBoolOption[false]{minipage}
+%    \end{macrocode}
+% \end{macro}
+%
 % The options are processed using:
 %    \begin{macrocode}
 \ProcessKeyvalOptions*
@@ -539,7 +552,7 @@
 %    \begin{macrocode}
 \newenvironment{exsol@exercise}[0]
 {%
-  \begin{minipage}[t]{\textwidth}%
+  \ifthenelse{\boolean{exsol@minipage}}{\begin{minipage}[t]{\textwidth}}{}%
     \ifthenelse{\boolean{exsol@exerciseaslist}}
                {\begin{list}%
                    {%
@@ -561,7 +574,7 @@
 {%
   \ifthenelse{\boolean{exsol@exerciseaslist}}
              {\end{list}}{}
-  \end{minipage}
+  \ifthenelse{\boolean{exsol@minipage}}{\end{minipage}}{}
   \vspace{1ex}\par
 }
 %    \end{macrocode}
diff --git a/Master/texmf-dist/tex/latex/exsol/exsol.sty b/Master/texmf-dist/tex/latex/exsol/exsol.sty
index b8980fb5ca9..94f5fc2fc12 100644
--- a/Master/texmf-dist/tex/latex/exsol/exsol.sty
+++ b/Master/texmf-dist/tex/latex/exsol/exsol.sty
@@ -29,6 +29,7 @@
 \DeclareStringOption[normalsize]{exercisesfontsize}
 \DeclareBoolOption[false]{exerciseaslist}
 \DeclareBoolOption[false]{copyexercisesinsolutions}
+\DeclareBoolOption[false]{minipage}
 \ProcessKeyvalOptions*
 \newcommand{\exercisesfontsize}{\csname \exsol@exercisesfontsize\endcsname}
 \AtBeginDocument{
@@ -100,7 +101,7 @@
 \DefineVerbatimEnvironment{exercise}{exercise}{}
 \newenvironment{exsol@exercise}[0]
 {%
-  \begin{minipage}[t]{\textwidth}%
+  \ifthenelse{\boolean{exsol@minipage}}{\begin{minipage}[t]{\textwidth}}{}%
     \ifthenelse{\boolean{exsol@exerciseaslist}}
                {\begin{list}%
                    {%
@@ -122,7 +123,7 @@
 {%
   \ifthenelse{\boolean{exsol@exerciseaslist}}
              {\end{list}}{}
-  \end{minipage}
+  \ifthenelse{\boolean{exsol@minipage}}{\end{minipage}}{}
   \vspace{1ex}\par
 }
 \def\solution{\FV@Environment{}{solution}}