bangorexam (13nov16)

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

1 files changed, 34 insertions, 7 deletions

diff --git a/Master/texmf-dist/tex/latex/bangorexam/bangorexam.cls b/Master/texmf-dist/tex/latex/bangorexam/bangorexam.cls
index e7076ac3c7d..f7163b7e76f 100644
--- a/Master/texmf-dist/tex/latex/bangorexam/bangorexam.cls
+++ b/Master/texmf-dist/tex/latex/bangorexam/bangorexam.cls
@@ -39,11 +39,11 @@
 %%   Right bracket \] Circumflex\^ Underscore\_
 %%   Grave accent  \` Left brace\{ Vertical bar  \|
 %%   Right brace   \} Tilde \~}
-\def\version{1.1.1}
+\def\version{1.1.2 }
 
 \NeedsTeXFormat{LaTeX2e}
 
-\ProvidesClass{bangorexam}[2016/10/18 \version{} C. Gray]
+\ProvidesClass{bangorexam}[2016/10/29 \version C. Gray]
 
 
 \RequirePackage[dvipsnames]{xcolor}
@@ -104,7 +104,7 @@
 
 \pagestyle{headandfoot}%
 \coverfooter{}{}{\iflastpage{}{/ troi drosodd\\/ turn over}{}}%
-\footer{}{}{\oddeven{}{\iflastpage{}{/ troi drosodd\\/ turn over}}}%
+\footer{}{\thepage}{\oddeven{}{\iflastpage{}{/ troi drosodd\\/ turn over}}}%
 
 \newcolumntype{C}[1]{>{\centering\arraybackslash}p{#1}}
 
@@ -116,6 +116,9 @@
 \newtotcounter{tf}
 \newtotcounter{sectiona}
 \newtotcounter{sectionb}
+\newcounter{lq}
+\newcounter{lqp}
+\setcounter{lq}{-1}
 
 \newcommand{\school}[2] {%
 \def \engSchool {\expandafter\MakeUppercase\expandafter{#1}}%
@@ -238,6 +241,7 @@ Time allowed:~\timeAllowed~hours
 \setlength{\marginparwidth}{0pt}
 \maketitle
 \end{coverpages}
+\setcounter{page}{2}
 \pointsinrightmargin
 \ifthenelse{\equal{\examtype}{twofour}}{
 \clearpage
@@ -299,6 +303,7 @@ Time allowed:~\timeAllowed~hours
 }
 
 \renewcommand{\questionshook}{%
+\setlength{\itemsep}{14pt}%
     \edef\mytemp{{\inDoc}}%
     \expandafter\ifstrequal\mytemp{secB}{\addtocounter{question}{100}}{}%
 }
@@ -311,8 +316,21 @@ Time allowed:~\timeAllowed~hours
 }
 
 \newcommand{\be@adduppoints}[1]{%
-    \edef\mytemp{{\inDoc}}%
-    \expandafter\ifstrequal\mytemp{secA}%
+    \ifnumcomp{\value{question}}{=}{\value{lq}}
+     {% Same question
+     \addtocounter{lqp}{#1}%
+     }
+     {% Moved onto next question
+     \be@addpoints{\totalpoints}%
+     \setcounter{lq}{\value{question}}%
+     \setcounter{lqp}{0}%
+     \addtocounter{lqp}{#1}%
+     }%
+}
+
+\newcommand{\be@addpoints}[1]{%
+\edef\mytemp{{\inDoc}}%
+\expandafter\ifstrequal\mytemp{secA}%
         {%
             \addtocounter{sectiona}{#1}%
             \addtocounter{all}{#1}%
@@ -329,7 +347,10 @@ Time allowed:~\timeAllowed~hours
             \ifnumcomp{\value{sectionb}}{=}{#1}%
                 {}%
                 {%
-                    \ClassError{bangorexam}{Section B question \arabic{question} does not have an equal number of points (Existing Section B question worth \arabic{sectionb})}\relax%
+                 \setcounter{tmp}{0}%
+     \addtocounter{tmp}{\value{question}}%
+     \addtocounter{tmp}{-100}
+                    \ClassError{bangorexam}{Section B question \arabic{tmp} does not have an equal number of points (Existing Section B question worth \arabic{sectionb})}\relax%
                 }%
         }%
         {}%
@@ -352,7 +373,7 @@ Time allowed:~\timeAllowed~hours
 }
 
 \newcommand{\patchqnumaddpoints}{%
-\be@adduppoints{\totalpoints}%
+\be@adduppoints{\@points}%
 }
 \pointformat{[\thepoints]}
 \pointname{\null\patchqnumaddpoints}
@@ -361,6 +382,12 @@ Time allowed:~\timeAllowed~hours
 }
 
 
+\let\horizontalchoices\oneparchoices
+\let\endhorizontalchoices\endoneparchoices
+\let\horizontalcheckboxes\oneparcheckboxes
+\let\endhorizontalcheckboxes\endoneparcheckboxes
+
+
 \AfterEndDocument{%
 \edef\mytemp{{\examtype}}%
     \expandafter\ifstrequal\mytemp{twofour}%