From 329b84461d7088869ea05712d9d046c622fb05ac Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 1 Mar 2021 22:38:04 +0000 Subject: exam (1mar21) git-svn-id: svn://tug.org/texlive/trunk@58023 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/exam/README | 4 +- Master/texmf-dist/doc/latex/exam/exam.md5 | 6 +- Master/texmf-dist/doc/latex/exam/examdoc.pdf | Bin 481243 -> 482795 bytes Master/texmf-dist/doc/latex/exam/examdoc.tex | 38 ++++++++--- Master/texmf-dist/tex/latex/exam/exam.cls | 93 +++++++++++++++++++++++++-- 5 files changed, 121 insertions(+), 20 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/exam/README b/Master/texmf-dist/doc/latex/exam/README index 01b54c4184c..c640150cd66 100644 --- a/Master/texmf-dist/doc/latex/exam/README +++ b/Master/texmf-dist/doc/latex/exam/README @@ -1,5 +1,5 @@ -This is version 2.603 of the exam document class, dated December 17, -2017. +This is version 2.7 of the exam document class, dated February 26, +2021. The exam document class, together with its user's guide examdoc.tex, attempts to make it easy for even a LaTeX novice to prepare exams. diff --git a/Master/texmf-dist/doc/latex/exam/exam.md5 b/Master/texmf-dist/doc/latex/exam/exam.md5 index 38fd1b65a1b..6dbd2d391e4 100644 --- a/Master/texmf-dist/doc/latex/exam/exam.md5 +++ b/Master/texmf-dist/doc/latex/exam/exam.md5 @@ -1,3 +1,3 @@ -08a9755a8f51d31edf6b4124c9b710f9 exam.cls -a9273b3443c367000e4a71b572c58a62 examdoc.pdf -a9a481f4f36ec3dbf90ffe63f57ce803 examdoc.tex +b210b790c86d89aeccb508074bd001ae exam.cls +c9c5a6648a0a34ff32595455124eec6c examdoc.tex +6de4faf2e619d56b8516369800d8a04a examdoc.pdf diff --git a/Master/texmf-dist/doc/latex/exam/examdoc.pdf b/Master/texmf-dist/doc/latex/exam/examdoc.pdf index 9386d25eaca..fcf3b7f84bd 100644 Binary files a/Master/texmf-dist/doc/latex/exam/examdoc.pdf and b/Master/texmf-dist/doc/latex/exam/examdoc.pdf differ diff --git a/Master/texmf-dist/doc/latex/exam/examdoc.tex b/Master/texmf-dist/doc/latex/exam/examdoc.tex index cbcfb377a58..579d551ae62 100644 --- a/Master/texmf-dist/doc/latex/exam/examdoc.tex +++ b/Master/texmf-dist/doc/latex/exam/examdoc.tex @@ -8,7 +8,7 @@ % The exam documentclass itself is in the file exam.cls. -%%% Copyright (c) 1997, 2000, 2004, 2008, 2011, 2015, 2017 +%%% Copyright (c) 1997, 2000, 2004, 2008, 2011, 2015, 2017, 2021 % Philip S. Hirschhorn % % This work may be distributed and/or modified under the @@ -47,11 +47,13 @@ % In case we're not using hyperref.sty: \providecommand{\texorpdfstring}[2]{#1} % The following can be used in \section commands -% without generating pdf warnings: +% to print a backslash (which will be omitted from the +% pdf string) without generating pdf warnings. +% Usage: \texttt{\bs documentclass} \newcommand{\bs}{\texorpdfstring{\char`\\}{}} -\newcommand{\docversion}{2.6} -\newcommand{\docdate}{November 5, 2017} +\newcommand{\docversion}{2.7} +\newcommand{\docdate}{February 26, 2021} %\newcommand{\docdate}{Draft: \today} %-------------------------------------------------------------------- @@ -129,7 +131,8 @@ Wellesley College\\ Wellesley, MA 02481\\ psh@math.mit.edu\\[\bigskipamount] - Copyright \copyright~1994, 1997, 2000, 2004, 2008, 2011, 2015, 2017\\ + Copyright \copyright~1994, 1997, 2000, 2004, 2008, 2011, 2015, 2017, + 2021\\ Philip Hirschhorn\\ All rights reserved} @@ -4868,9 +4871,12 @@ The six environments for solutions are divided into two types. \index{solution environment@\texttt{solution} environment!optional argument} % \begin{itemize} - \item the \verb"solution" enviroment inserts that amount of blank + \item the \verb"solution" environment inserts that amount of blank space, as if you had given a \verb"\vspace*"\indc{vspace*} command - (see section~\ref{sec:BlankSpace}), + (or, if you've given the command + \verb"\unstarredvspace"\indc{unstarredvspace}, as if you had given + a \verb"\vspace"\indc{vspace} command) (see + section~\ref{sec:BlankSpace}), \item the \verb"solutionorbox" environment inserts an empty box of that height, as if you had given a \verb"\makeemptybox"\indc{makeemptybox} command (see @@ -4890,6 +4896,15 @@ The six environments for solutions are divided into two types. \end{itemize} \end{itemize} +Note that there are two commands that affect the space inserted by the +optional argument to a \verb"solution" environment: The command +\verb"\unstarredvspace"\indc{unstarredvspace} causes any space +inserted by an optional argument to the \verb"solution" environment to +be inserted using a \verb"\vspace" command, instead of the +\verb"\vspace*" command. You can return to having such space inserted +using a \verb"\vspace*" command by giving the command +\verb"\nounstarredvspace"\indc{nounstarredvspace}. + You can use a parts, subparts, or subsubparts environment inside any of the solution environments without having their points (if any) counted as actual points on the exam. If there are points assigned to @@ -5295,7 +5310,9 @@ Each of the \texttt{solution}, \texttt{solutionorbox}, \index{solution environment@\texttt{solution} environment!optional argument} % environment this is an amount of blank space to be left (just as if - you had used a \verb"\vspace*"\indc{vspace*} command; see + you had used a \verb"\vspace*"\indc{vspace*} command (or, if you've + given the command \verb"\unstarredvspace"\indc{unstarredvspace}, as + if you had given a \verb"\vspace"\indc{vspace} command); see section~\ref{sec:BlankSpace}) when solutions are not being printed, \item in a % @@ -8768,3 +8785,8 @@ correct. %-------------------------------------------------------------------- %-------------------------------------------------------------------- %-------------------------------------------------------------------- + +%%% Local Variables: +%%% mode: latex +%%% TeX-master: t +%%% End: diff --git a/Master/texmf-dist/tex/latex/exam/exam.cls b/Master/texmf-dist/tex/latex/exam/exam.cls index cc587b3d659..ae851ef2031 100644 --- a/Master/texmf-dist/tex/latex/exam/exam.cls +++ b/Master/texmf-dist/tex/latex/exam/exam.cls @@ -4,7 +4,7 @@ %% exam.cls %% Copyright (c) 1994, 1997, 2000, 2004, 2008, 2011, -%% 2015, 2017 Philip S. Hirschhorn +%% 2015, 2017, 2021 Philip S. Hirschhorn % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -32,8 +32,8 @@ % from my web page: http://www-math.mit.edu/~psh/ -\def\fileversion{2.603} -\def\filedate{2017/12/17} +\def\fileversion{2.7} +\def\filedate{2021/02/26} %--------------------------------------------------------------------- %--------------------------------------------------------------------- % @@ -85,6 +85,46 @@ %-------------------------------------------------------------------- % Changelog since version 2.4: +%-------------------------------------------------------------------- +% Version 2.7, 2021/02/26 + +% No longer betatest. + +%-------------------------------------------------------------------- +% Version 2.607$\beta$, 2019/07/21 + +% We fixed a bug, apparently introduced in version 2.602, that affected +% vertical point tables (both regular and bonus, but not combined), +% shifting the total points in the table towards the right of the cell, +% rather than having the total points centered. The fix was to delete +% an \hspace*{\fill} that had no business being there. + +% -------------------------------------------------------------------- +% Version 2.606$\beta$, 2019/02/17 + +% We introduced a new command, \unstarredvspace, that changes the +% solution environment so that, when solutions are not being printed, +% any optional space called for is inserted with \vspace{amount}, +% instead of \vspace*{amount}. There is also a new command +% \nounstarredvpsace that reverts to the default. + +%-------------------------------------------------------------------- +% Version 2.605$\beta$, 2018/08/22 + +% We corrected the bug introduced in Version 2.604$\beta$ that caused a +% \ref to a \correctchoice in a choices environment to have the wrong +% value. The correction was to change \stepcounter to \refstepcounter. + +%-------------------------------------------------------------------- +% Version 2.604$\beta$, 2018/05/14 + +% We changed the code for the \correctchoice command in the checkboxes +% environment to correct a bug that causes the item label for the second +% item to appear in the wrong place when the first item is a +% \correctchoice and there's no text in between the \begin{checkboxes} +% and the \correctchoice. We made a similar change to the choices +% environment, which had the same problem. + %-------------------------------------------------------------------- % Version 2.603, 2017/12/15 @@ -4140,11 +4180,26 @@ % Motivated by the def of \leavevmode, % \def\leavevmode{\unhbox\voidb@x} % we will now leave hmode (if we're in hmode): + % 2018/05/13: We move the \item command to before the + % \begingroup and we also put + % \CorrectChoice@Emphasis\choicelabel (along with grouping) + % into the argument of the \item. We did this to correct + % the bug that appears when there is no text in between + % the \begin{choices} and the first item and that first + % item is a \correctchoice. The fact that a group had been + % begun before the first \item caused the label for the + % second item to appear in the position of the label for + % the item following that second item. \ifhmode \unskip\unskip\unvbox\voidb@x \fi + % 2018/08/22: We changed \stepcounter to \refstepcounter: + \refstepcounter{choice}% + \item[{\color@begingroup \CorrectChoice@Emphasis + \choicelabel \color@endgroup}]% \begingroup \color@begingroup \@correctchoicetrue \CorrectChoice@Emphasis + \else + \item \fi - \item \do@choice@pageinfo } % CorrectChoice \let\correctchoice\CorrectChoice @@ -4237,10 +4292,20 @@ % Motivated by the def of \leavevmode, % \def\leavevmode{\unhbox\voidb@x} % we will now leave hmode (if we're in hmode): + % 2018/05/13: We move the \item[\checked@char] to before + % the \begingroup and we also put \CorrectChoice@Emphasis + % (along with grouping) into the argument of the \item. We + % did this to correct the bug that appears when there is no + % text in between the \begin{checkboxes} and the first item + % and that first item is a \correctchoice. The fact that a + % group had been begun before the first \item caused the + % label for the second item to appear in the position of + % the label for the item following that second item. \ifhmode \unskip\unskip\unvbox\voidb@x \fi + \item[{\color@begingroup\CorrectChoice@Emphasis\checked@char + \color@endgroup}]% \begingroup \color@begingroup \@correctchoicetrue \CorrectChoice@Emphasis - \item[\checked@char] \else \item \fi @@ -7176,7 +7241,6 @@ \hidden@ampersand \hbox to \@cellwidth{\hfill}% \else - \hspace*{\fill}% \if@bonus \prt@tablebonuspoints \else @@ -7547,6 +7611,17 @@ \def\cancelspace{\cancelspacetrue} \def\nocancelspace{\cancelspacefalse} +% The command \unstarredvspace alters the solution environment so +% that, when solutions are not being printed, any optional space will +% be inserted with a \vspace{} command, instead of a \vspace*{} +% command. + +\newif\if@unstarredvspace +\def\unstarredvspace{\@unstarredvspacetrue} +\def\nounstarredvspace{\@unstarredvspacefalse} +\nounstarredvspace + + % \if@insolution will be true while we're inside of any of the % solution environments. This is used to supress \PgInfo@write and % \label commands generated if there's a parts (or subparts, or @@ -7579,7 +7654,11 @@ \else \par \penalty 0 - \vspace*{#1}% + \if@unstarredvspace + \vspace{#1}% + \else + \vspace*{#1}% + \fi \fi \setbox\z@\vbox\bgroup \fi -- cgit v1.2.3