summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/exesheet
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2024-02-13 23:48:03 +0000
committerKarl Berry <karl@freefriends.org>2024-02-13 23:48:03 +0000
commit7bf6cb7522ed05d9e300c4a34b443c0a47ea57ed (patch)
treefe1a8fd8e2d87a250971dd71c3ff8988ef62b7f5 /Master/texmf-dist/tex/latex/exesheet
parentcc8813833c00cb38998f0095eb179fd5a4fc1251 (diff)
exesheet (14feb24)
git-svn-id: svn://tug.org/texlive/trunk@69838 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/exesheet')
-rw-r--r--Master/texmf-dist/tex/latex/exesheet/exesheet.cls2
-rw-r--r--Master/texmf-dist/tex/latex/exesheet/exesheet.sty51
2 files changed, 33 insertions, 20 deletions
diff --git a/Master/texmf-dist/tex/latex/exesheet/exesheet.cls b/Master/texmf-dist/tex/latex/exesheet/exesheet.cls
index 3bf4aea5292..334147724e1 100644
--- a/Master/texmf-dist/tex/latex/exesheet/exesheet.cls
+++ b/Master/texmf-dist/tex/latex/exesheet/exesheet.cls
@@ -22,7 +22,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[2005/12/01]
\ProvidesClass{exesheet}
-[2024/02/03 v2.6 .dtx Typesetting exercise or exam sheets]
+[2024/02/13 v2.7 .dtx Typesetting exercise or exam sheets]
\RequirePackage{kvoptions}
\DeclareBoolOption[true]{exetoc}
diff --git a/Master/texmf-dist/tex/latex/exesheet/exesheet.sty b/Master/texmf-dist/tex/latex/exesheet/exesheet.sty
index 461a4a4471f..a57a3636bcc 100644
--- a/Master/texmf-dist/tex/latex/exesheet/exesheet.sty
+++ b/Master/texmf-dist/tex/latex/exesheet/exesheet.sty
@@ -22,7 +22,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[2005/12/01]
\ProvidesPackage{exesheet}
-[2024/02/03 v2.6 .dtx Typesetting exercise or exam sheets]
+[2024/02/13 v2.7 .dtx Typesetting exercise or exam sheets]
\@ifclassloaded{exesheet}{}{
\RequirePackage{kvoptions}
@@ -107,8 +107,8 @@
\renewcommand{\noteragged}{#1}
}
\newcommand*{\displaynotesright}[1][\RaggedRight]{%
- \PackageWarning{exesheet}{Old command \string\displaynotesright\space
- is used. \MessageBreak
+ \PackageWarning{exesheet}{Old command \string\displaynotesright
+ \space is used. \MessageBreak
It can be replaced by the options `display=notes, margin=right'}
\renewcommand\exesheet@display{notes}
\exs@process@display
@@ -277,8 +277,10 @@
\par\noindent\textbf{\exlabel}~}
\newcommand{\exe}{\@ifstar{\@@exe}{\@exe}}
+\newcommand\enumfont{\bfseries}
+
\newenvironment{exenumerate}[1][]{%
- \setlist[enumerate]{font=\bfseries}
+ \setlist[enumerate]{font=\enumfont}
\setlist[enumerate,1]{leftmargin=1.5em,
itemsep=3ex plus 1ex minus 1ex,topsep=3ex plus 1ex minus 1ex}
\setlist[enumerate,3]{noitemsep,nolistsep}
@@ -286,33 +288,30 @@
\begin{enumerate}[#1]
}{\end{enumerate}}
-\newcommand\standardfrenchlists{%
- \@ifpackagewith{babel}{french}{
- \frenchsetup{StandardLists=true}
- }{}
-}
\ifexesheet@setlist
- \standardfrenchlists
+ \@ifundefined{frenchsetup}{}{\frenchsetup{StandardLists=true}}
% must be executed here (and not at begin doc) if loaded after babel
\fi
\newcommand\labelenumone{\arabic{task}.}
\newcommand\labelenuma{(\alph{task})}
+\newcommand\refenuma{\alph{task}}
\def\exs@process@setlist{% must be executed at begin document
\ifexesheet@setlist
- \standardfrenchlists % executed at begin doc if loaded before babel
- \setlist[enumerate]{font=\bfseries}
+ \@ifundefined{frenchsetup}{}{\frenchsetup{StandardLists=true}}
+ % executed at begin doc if loaded before babel
+ \setlist[enumerate]{font=\enumfont}
\setlist[enumerate,1]{topsep=1.5ex plus 1ex minus 1ex,leftmargin=1.5em}
\fi
\ifexesheet@setlist
- \settasks{label-format=\bfseries}
+ \settasks{label-format=\enumfont}
\NewTasksEnvironment[label=\labelenumone,
column-sep=1em,label-align=right,
item-indent=1.5em,label-width=1em,label-offset=0.5em,
after-item-skip=0.5ex plus 0.5ex minus 0.5ex]{tablenum1}[\item](2)
- \NewTasksEnvironment[label=\labelenuma,ref=\alph{task},
+ \NewTasksEnvironment[label=\labelenuma,ref=\refenuma,
column-sep=1em,label-align=right,
item-indent=2.15em,label-width=1.6em,label-offset=0.5em,
after-item-skip=0.5ex plus 0.5ex minus 0.5ex]{tablenuma}[\item](2)
@@ -321,7 +320,7 @@
column-sep=1em,label-align=right,
label-width=1em,label-offset=0.5em,
after-item-skip=0.5ex plus 0.5ex minus 0.5ex]{tablenum1}[\item](2)
- \NewTasksEnvironment[label=\labelenuma,ref=\alph{task},
+ \NewTasksEnvironment[label=\labelenuma,ref=\refenuma,
column-sep=1em,label-align=right,
item-indent=2.15em,label-width=1.6em,label-offset=0.5em,
after-item-skip=0.5ex plus 0.5ex minus 0.5ex]{tablenuma}[\item](2)
@@ -468,9 +467,21 @@
\set@toclevel[#1]
\typeset@correctionname
\correctionstyle%
+ \ifexesheet@setlist
+ \settasks{
+ label-format = \color{correctioncolor}\enumfont,
+ item-format = \color{correctioncolor}
+ }%
+ \else
+ \settasks{
+ label-format = \color{correctioncolor},
+ item-format = \color{correctioncolor}
+ }%
+ \fi%
\ifexesheet@multicol
- \renewcommand{\columnseprulecolor}{\color{correctioncolor}}
- \fi
+ \renewcommand{\columnseprulecolor}{%
+ \color{correctioncolor}}
+ \fi%
}{}
}{\comment}
}{\ifthenelse{\boolean{exesheet@answers}}{}{\endcomment}}
@@ -744,7 +755,8 @@
\AtEndDocument{% final checking (global)
\ifthenelse{\equal{\exe@currentlabel}{none}}{
\ifthenelse{\lengthtest{\sum@pts = 0pt}}{
- \PackageWarningNoLine{exesheet}{checkpts: No points displayed}
+ \PackageWarningNoLine{exesheet}{checkpts:
+ No points displayed}
}{
\ifthenelse{\lengthtest{\sheet@total = \sum@pts}}{
\PackageWarningNoLine{exesheet}{Total:
@@ -757,7 +769,8 @@
}{% last exercise and final checking
\exe@check
\ifthenelse{\lengthtest{\sum@exe} = 0pt}{
- \PackageWarningNoLine{exesheet}{checkpts: No points displayed}
+ \PackageWarningNoLine{exesheet}{checkpts:
+ No points displayed}
}{
\ifthenelse{\lengthtest{\sheet@total = \sum@exe}}{
\PackageWarningNoLine{exesheet}{Total: