brandeis-problemset (31mar19)

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

5 files changed, 20 insertions, 12 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 fdb84c66e97..31e9c7b90f1 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 bcd159a466e..b29e76787d7 100644
--- a/Master/texmf-dist/doc/latex/brandeis-problemset/brandeis-problemset.tex
+++ b/Master/texmf-dist/doc/latex/brandeis-problemset/brandeis-problemset.tex
@@ -63,7 +63,7 @@ automatically enabled.}
 
 \author{Rebecca Turner\thanks{Brandeis University; \email{rebeccaturner@brandeis.edu}}}
 \title{The \bps\ Document Class}
-\date{2019/03/13 0.5.2}
+\date{2019/03/30 0.5.3}
 \begin{document}
 \maketitle
 \begin{abstract}
@@ -739,6 +739,11 @@ $\Rm{Foo}(a, n)$ computes $a^n$, and will run in $O(n)$ time always.
 	context-free grammars.
 \end{version}
 
+\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.2, date=2019-03-13, changes={Scheme code highlighting
 	erroneously highlighted \texttt{c\textbf{b}r},
 	\texttt{ca\textbf{b}r}, etc.\ rather than
diff --git a/Master/texmf-dist/doc/latex/brandeis-problemset/example.pdf b/Master/texmf-dist/doc/latex/brandeis-problemset/example.pdf
index 2d2c40611e3..253c6335c51 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 77649e0f814..1abfe89e936 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/03/13 0.5.2 COSI problem sets at
+\ProvidesClass{brandeis-problemset}[2019/03/30 0.5.3 COSI problem sets at
 	Brandeis University]
 \NeedsTeXFormat{LaTeX2e}
 % Description: A document class for Brandeis University's computer science
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 e071d53a7b4..6cdeb03f06e 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/03/13 0.5.2 Commands for COSI
+\ProvidesPackage{brandeis-problemset}[2019/03/30 0.5.3 Commands for COSI
 	problem sets at Brandeis University]
 \NeedsTeXFormat{LaTeX2e}
 
@@ -339,10 +339,11 @@
 \newcommand{\bps@problemkeys}[2]{%
 	\expandafter\newlength\csname bps@#1indent\endcsname
 	\expandafter\setlength\csname bps@#1indent\endcsname{1in}%
-	\expandafter\def\csname bps@#1@title\endcsname{}%
+	\expandafter\def\csname bps@#1@title\endcsname{%
+		\@ifundefined{cmdKV@#1@title}%
+			{}%
+			{: \csname cmdKV@#1@title\endcsname}}%
 	\expandafter\def\csname bps@#1@number\endcsname{\arabic{#1number}}%
-	\define@key{#1}{title}{%
-		\expandafter\renewcommand{\csname bps@#1@title\endcsname}{: #1}}%
 	\expandafter\def\csname bps@#1pagebreak\endcsname{%
 		\csname ifKV@#1@pagebreak\endcsname
 			\vfill\pagebreak
@@ -354,7 +355,7 @@
 			*%
 		\fi}%
 	\define@boolkey{#1}{toc}[true]{}%
-	\define@cmdkeys{#1}{number, label}%
+	\define@cmdkeys{#1}{number, label, title}%
 	\presetkeys{#1}{pagebreak=#2, toc}{}%
 }
 
@@ -379,13 +380,15 @@
 	\@ifundefined{cmdKV@#1@number}{%
 		\stepcounter{#1number}%
 	}{%
-		\expandafter\let\csname bps@#1@number\expandafter\endcsname
-			\csname cmdKV@#1@number\endcsname
+		\expandafter\def\csname bps@#1@number\endcsname
+			{\expandafter\noexpand\csname cmdKV@#1@number\endcsname}%
 	}%
 	% define labels for \ref and the like
-	\edef\@currentlabel{#2}%
-	\edef\bps@problem@title@{Problem \@currentlabel\csname bps@#1@title\endcsname}
-	\edef\@currentlabelname{\bps@problem@title@}%
+	\def\@currentlabel{#2}%
+	\edef\bps@problem@title@{Problem
+		\@currentlabel% the problem number
+		\expandafter\noexpand\csname bps@#1@title\endcsname}
+	\def\@currentlabelname{\bps@problem@title@}%
 	% no spaces or numbers before the \section command
 	\renewcommand{\@seccntformat}[1]{}%
 	\typeout{\@currentlabelname}