From c31f480b8d6278b6485dc4aa74cbab6ee025bac8 Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Tue, 8 May 2012 22:49:33 +0000
Subject: exercise (8may12)

git-svn-id: svn://tug.org/texlive/trunk@26260 c570f23f-e606-0410-a88d-b1316a301751
---
 Master/texmf-dist/doc/latex/exercise/README        |   1 +
 Master/texmf-dist/doc/latex/exercise/exercise.pdf  | Bin 440075 -> 440120 bytes
 .../texmf-dist/source/latex/exercise/exercise.dtx  |  12 ++++++------
 Master/texmf-dist/tex/latex/exercise/exercise.sty  |  10 +++++-----
 4 files changed, 12 insertions(+), 11 deletions(-)

(limited to 'Master')

diff --git a/Master/texmf-dist/doc/latex/exercise/README b/Master/texmf-dist/doc/latex/exercise/README
index 1c42253ede6..a17636a17e7 100644
--- a/Master/texmf-dist/doc/latex/exercise/README
+++ b/Master/texmf-dist/doc/latex/exercise/README
@@ -70,6 +70,7 @@ To do:
 
 Change log:
 -----------
+- v1.58 2012-05-08    Minor modification to avoid pagebreak after exercise and answer heading (thx to Mathias Magdowski)
 - v1.57 2011/07/19    Bug correction on exercise selection (thx to Tobias Isenberg)
 - v1.56 2011/05/10    Portuguese translation added (thx to José Romildo Malaquias)
 - v1.55 2011/03/13    Command \refAnswer added (thx to Ferenc Wettl)
diff --git a/Master/texmf-dist/doc/latex/exercise/exercise.pdf b/Master/texmf-dist/doc/latex/exercise/exercise.pdf
index 1a9ada604ef..18bc8c78954 100644
Binary files a/Master/texmf-dist/doc/latex/exercise/exercise.pdf and b/Master/texmf-dist/doc/latex/exercise/exercise.pdf differ
diff --git a/Master/texmf-dist/source/latex/exercise/exercise.dtx b/Master/texmf-dist/source/latex/exercise/exercise.dtx
index 20170d33293..036c2440f3f 100644
--- a/Master/texmf-dist/source/latex/exercise/exercise.dtx
+++ b/Master/texmf-dist/source/latex/exercise/exercise.dtx
@@ -21,7 +21,7 @@
 % \iffalse
 %<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
 %<package>\ProvidesPackage{exercise}
-%<package> [2011/07/19 v1.57 Exercise package (P.Pichaureau)]
+%<package> [2012/05/08 v1.58 Exercise package (P.Pichaureau)]
 %<*driver>
 \documentclass{ltxdoc}
 \usepackage{exercise}
@@ -84,7 +84,7 @@
 % \DoNotIndex{\setlength,\string,\textbf,\textsc,\emph,\whiledo,\vbox}
 % \DoNotIndex{\unvbox,\usefont,\usecounter,\value,\vskip,\setbox,\setcounter}
 %
-%\CheckSum{2002}
+%\CheckSum{2004}
 %
 %
 % \GetFileInfo{exercise.sty}
@@ -853,7 +853,7 @@
 \addto\captionsgerman{%
  \def\listexercisename{Liste der {\"U}bungen}%
  \def\ExerciseName{{\"U}bung}%
- \def\AnswerName{L{\"o}sung zu den {\"U}bung}%
+ \def\AnswerName{L{\"o}sung zu {\"U}bung}%
  \def\ExerciseListName{{\"U}b.}%
  \def\AnswerListName{L{\"o}sung}%
  \def\ExePartName{Teil}%
@@ -862,7 +862,7 @@
 \addto\captionsngerman{%
  \def\listexercisename{Liste der {\"U}bungen}%
  \def\ExerciseName{{\"U}bung}%
- \def\AnswerName{L{\"o}sung zu den {\"U}bung}%
+ \def\AnswerName{L{\"o}sung zu {\"U}bung}%
  \def\ExerciseListName{{\"U}b.}%
  \def\AnswerListName{L{\"o}sung}%
  \def\ExePartName{Teil}%
@@ -1155,7 +1155,7 @@
 \@selectExercise\global\@Answerfalse\@BeginExeBox\@@@ExeEnv}
 %
 \newcommand{\@@@ExeEnv}{%
-    \vskip\ExerciseSkipBefore
+    \pagebreak[1]\vskip\ExerciseSkipBefore
     \@QuestionLevel1
     \refstepExecounter
     \begingroup\@getExerciseInfo\ExerciseHeader
@@ -1518,7 +1518,7 @@
 %
 \newcommand{\@@@AnswerEnv}{%
     \@QuestionLevel1
-    \begingroup\@getAnswerInfo\AnswerHeader\endgroup}
+    \pagebreak[1]\begingroup\@getAnswerInfo\AnswerHeader\endgroup}
 %
 \def\endAnswerEnv{\termineliste{1}\@EndExeBox\termineliste{0}}
 %
diff --git a/Master/texmf-dist/tex/latex/exercise/exercise.sty b/Master/texmf-dist/tex/latex/exercise/exercise.sty
index b7dee401572..f09436ca270 100644
--- a/Master/texmf-dist/tex/latex/exercise/exercise.sty
+++ b/Master/texmf-dist/tex/latex/exercise/exercise.sty
@@ -27,7 +27,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesPackage{exercise}
- [2011/07/19 v1.57 Exercise package (P.Pichaureau)]
+ [2012/05/08 v1.58 Exercise package (P.Pichaureau)]
 %% \CharacterTable
 %%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
 %%   Lower-case    \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
@@ -108,7 +108,7 @@
 \addto\captionsgerman{%
  \def\listexercisename{Liste der {\"U}bungen}%
  \def\ExerciseName{{\"U}bung}%
- \def\AnswerName{L{\"o}sung zu den {\"U}bung}%
+ \def\AnswerName{L{\"o}sung zu {\"U}bung}%
  \def\ExerciseListName{{\"U}b.}%
  \def\AnswerListName{L{\"o}sung}%
  \def\ExePartName{Teil}%
@@ -117,7 +117,7 @@
 \addto\captionsngerman{%
  \def\listexercisename{Liste der {\"U}bungen}%
  \def\ExerciseName{{\"U}bung}%
- \def\AnswerName{L{\"o}sung zu den {\"U}bung}%
+ \def\AnswerName{L{\"o}sung zu {\"U}bung}%
  \def\ExerciseListName{{\"U}b.}%
  \def\AnswerListName{L{\"o}sung}%
  \def\ExePartName{Teil}%
@@ -348,7 +348,7 @@
 \def\@@ExeEnv[#1]{\setkeys{PPExercise}{#1}%
 \@selectExercise\global\@Answerfalse\@BeginExeBox\@@@ExeEnv}
 \newcommand{\@@@ExeEnv}{%
-    \vskip\ExerciseSkipBefore
+    \pagebreak[1]\vskip\ExerciseSkipBefore
     \@QuestionLevel1
     \refstepExecounter
     \begingroup\@getExerciseInfo\ExerciseHeader
@@ -640,7 +640,7 @@
 \global\@Answertrue\@selectAnswer\@BeginExeBox\@@@AnswerEnv}
 \newcommand{\@@@AnswerEnv}{%
     \@QuestionLevel1
-    \begingroup\@getAnswerInfo\AnswerHeader\endgroup}
+    \pagebreak[1]\begingroup\@getAnswerInfo\AnswerHeader\endgroup}
 \def\endAnswerEnv{\termineliste{1}\@EndExeBox\termineliste{0}}
 \newenvironment{Answer}{}{}
 \def\defineAnswerEnv{
-- 
cgit v1.2.3