fix \points macro; add \iforalsolutions and \ifnonoralsolutions

2 files changed, 11 insertions, 7 deletions

diff --git a/exercisesheets.sty b/exercisesheets.sty
index 159cf43..f19228d 100644
--- a/exercisesheets.sty
+++ b/exercisesheets.sty
@@ -600,6 +600,7 @@
   \exsh@subexpoints{#1}%
 }
 \newcommand{\points}[2][]{%
+  \exshset{points=#2}%
   \bgroup
   \exshset{#1}%
   \ifthenelse{\equal{}{\pgfkeysvalueof{/exsh/pointsinfo}}}{%
@@ -608,10 +609,8 @@
     \def\exsh@tmp{, \pgfkeysvalueof{/exsh/pointsinfo}}%
   }%
   \ifthenelse{\equal{#2}{oral}}{%
-    \exshset{oral}%
     \exsh@subexpoints{\pgfkeysvalueof{/exsh/strings/oral}\exsh@tmp}%
   }{%
-    \exshset{points=#2}%
     \ifthenelse{\equal{#2}{}}{%
       \exsh@subexpoints{\pgfkeysvalueof{/exsh/pointsinfo}}%
     }{%
@@ -639,9 +638,12 @@
 }
 
 \newcommand{\ifsolutions}[2]{%
-  \ifthenelse{\equal{oral}{\pgfkeysvalueof{/exsh/points}}}{%
-    \ifbool{exsh@oralsolutions}{#1}{#2}%
-  }{%
-    \ifbool{exsh@nonoralsolutions}{#1}{#2}%
-  }%
+  \ifbool{exsh@solutions}{#1}{#2}%
+}
+
+\newcommand{\iforalsolutions}[2]{%
+  \ifbool{exsh@oralsolutions}{#1}{#2}%
+}
+\newcommand{\ifnonoralsolutions}[2]{%
+  \ifbool{exsh@nonoralsolutions}{#1}{#2}%
 }
diff --git a/exercisesheets.tex b/exercisesheets.tex
index 81dec8f..9ebf550 100644
--- a/exercisesheets.tex
+++ b/exercisesheets.tex
@@ -397,6 +397,8 @@ The following options allow fine-tuning of the spacing:
 \subsection{Special Code for Solutions}
 \begin{lstlisting}
 \ifsolutions{(*\param{if true}*)}{(*\param{if false}*)}
+\iforalsolutions{(*\param{if true}*)}{(*\param{if false}*)}
+\ifnonoralsolutions{(*\param{if true}*)}{(*\param{if false}*)}
 \end{lstlisting}
 
 Example: Only include points for sub-exercises when solutions are typeset: