5 files changed, 25 insertions, 19 deletions
diff --git a/Master/texmf-dist/doc/latex/brandeis-problemset/brandeis-problemset.pdf b/Master/texmf-dist/doc/latex/brandeis-problemset/brandeis-problemset.pdf
index b186846d0db..9daad320dcd 100644
--- a/Master/texmf-dist/doc/latex/brandeis-problemset/brandeis-problemset.pdf
+++ b/Master/texmf-dist/doc/latex/brandeis-problemset/brandeis-problemset.pdf
diff --git a/Master/texmf-dist/doc/latex/brandeis-problemset/brandeis-problemset.tex b/Master/texmf-dist/doc/latex/brandeis-problemset/brandeis-problemset.tex
index b2189b74721..ab0613e445c 100644
--- a/Master/texmf-dist/doc/latex/brandeis-problemset/brandeis-problemset.tex
+++ b/Master/texmf-dist/doc/latex/brandeis-problemset/brandeis-problemset.tex
@@ -63,11 +63,10 @@ automatically enabled.}
 
 \author{Rebecca Turner\thanks{Brandeis University; \email{rebeccaturner@brandeis.edu}}}
 \title{The \bps\ Document Class}
-\date{2019/04/02 0.5.4}
+\date{2019/04/15 0.5.5}
 \begin{document}
 \maketitle
 \begin{abstract}
-
 	Brandeis University's computer science (``\textsc{cosi}'') courses
 	often assign ``problem sets'' which require fairly rigorous
 	formatting. The \ctan{brandeis-problemset} document class, which
@@ -76,7 +75,6 @@ automatically enabled.}
 
 	Although \bps\ is compatible with all \LaTeX\ flavors, \fontspecok\
 	is recommended for \ctan{fontspec} support.
-
 \end{abstract}
 
 \begin{note}
@@ -730,7 +728,7 @@ $\Rm{Foo}(a, n)$ computes $a^n$, and will run in $O(n)$ time always.
 	\pid{1}{10}
 \end{ganttschedule}
 \end{document}
-\end{latexcode}
+\end{latexcode}%stopzone
 
 \begin{changelog}[author=Rebecca Turner]
 \begin{version}[v=Coming soon\dots]
@@ -739,15 +737,19 @@ $\Rm{Foo}(a, n)$ computes $a^n$, and will run in $O(n)$ time always.
 	context-free grammars.
 \end{version}
 
+\shortversion{v=0.5.5, date=2019-04-10, changes={Reordered package loading
+	to prevent \ctan{mathtools} from breaking \cs{overbrace} and \cs{underbrace}
+	commands.}}
+
 \shortversion{v=0.5.4, date=2019-04-02, changes={Fixed hanging indent in
 	\texttt{description}-lists; the hanging indent was accidentally
 	removed through a tweak to hang the list item markers for the
 	\texttt{itemize} and \texttt{enumerate} lists.}}
 
-\shortversion{v=0.5.3, date=2019-03-30, changes={Commands such as |\texttt|
-	won't automatically cause errors when used in the optional arguments
-	of the |problem| and |subproblem| environments. More complex
-	commands may still cause issues, however.}}
+\shortversion{v=0.5.3, date=2019-03-30, changes={Commands such as
+	\cs{texttt} won't automatically cause errors when used in the optional
+	arguments of the \texttt{problem} and \texttt{subproblem} environments.
+	More complex commands may still cause issues, however.}}
 
 \shortversion{v=0.5.2, date=2019-03-13, changes={Scheme code highlighting
 	erroneously highlighted \texttt{c\textbf{b}r},
diff --git a/Master/texmf-dist/doc/latex/brandeis-problemset/example.pdf b/Master/texmf-dist/doc/latex/brandeis-problemset/example.pdf
index eb4b1e4ebd9..45523106b4b 100644
--- a/Master/texmf-dist/doc/latex/brandeis-problemset/example.pdf
+++ b/Master/texmf-dist/doc/latex/brandeis-problemset/example.pdf
diff --git a/Master/texmf-dist/tex/latex/brandeis-problemset/brandeis-problemset.cls b/Master/texmf-dist/tex/latex/brandeis-problemset/brandeis-problemset.cls
index 05c8a947463..3d18eea40e7 100644
--- a/Master/texmf-dist/tex/latex/brandeis-problemset/brandeis-problemset.cls
+++ b/Master/texmf-dist/tex/latex/brandeis-problemset/brandeis-problemset.cls
@@ -1,4 +1,4 @@
-\ProvidesClass{brandeis-problemset}[2019/04/02 0.5.4 COSI problem sets at
+\ProvidesClass{brandeis-problemset}[2019/04/15 0.5.5 COSI problem sets at
 	Brandeis University]
 \NeedsTeXFormat{LaTeX2e}
 % Description: A document class for Brandeis University's computer science
@@ -59,6 +59,7 @@
 
 \bps@comploption{antonella}
 \bps@comploption{math}
+\bps@comploption[true]{fonts}
 
 \DeclareDefaultOption{\PassOptionsToClass{\CurrentOption}{article}}
 \ProcessKeyvalOptions*
@@ -96,8 +97,20 @@
 	bmargin=1.5in,
 ]{geometry}
 
+% math
+\ifbps@math
+	% see note below
+	\RequirePackage{mathtools}
+
+	% for whatever reason, redefining this before the \begin{document}
+	% has no effect
+	\AtBeginDocument{\renewcommand{\Re}{\mathbb{R}}}
+\fi
+
 % fonts
 % NOTE: The order these packages are loaded in is very important.
+% - mathtools has to be loaded before these or overbrackets and such get
+%   messed up
 % - unicode-math overwrites a bunch of commands, so should be loaded after
 %   amsmath and others
 % - amsmath should be loaded after stix2 (not sure why, but the stix2
@@ -144,15 +157,6 @@
 	\fi
 \fi
 
-% math
-\ifbps@math
-	\RequirePackage{mathtools}
-
-	% for whatever reason, redefining this before the \begin{document}
-	% has no effect
-	\AtBeginDocument{\renewcommand{\Re}{\mathbb{R}}}
-\fi
-
 \ifbps@antonella
 	\instructor{Dr.~Antonella DiLillio}
 	\iffontspec@ok
diff --git a/Master/texmf-dist/tex/latex/brandeis-problemset/brandeis-problemset.sty b/Master/texmf-dist/tex/latex/brandeis-problemset/brandeis-problemset.sty
index 602f9b4d9ca..209138d3909 100644
--- a/Master/texmf-dist/tex/latex/brandeis-problemset/brandeis-problemset.sty
+++ b/Master/texmf-dist/tex/latex/brandeis-problemset/brandeis-problemset.sty
@@ -1,4 +1,4 @@
-\ProvidesPackage{brandeis-problemset}[2019/04/02 0.5.4 Commands for COSI
+\ProvidesPackage{brandeis-problemset}[2019/04/15 0.5.5 Commands for COSI
 	problem sets at Brandeis University]
 \NeedsTeXFormat{LaTeX2e}