From b7f4a9f61231acee4a00640b543cdd256a351ae9 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 30 Dec 2013 23:37:56 +0000 Subject: exsheets (27dec13) git-svn-id: svn://tug.org/texlive/trunk@32517 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/exsheets/exsheets.sty | 14 ++++++++++---- Master/texmf-dist/tex/latex/exsheets/exsheets_headings.def | 9 ++++++--- 2 files changed, 16 insertions(+), 7 deletions(-) (limited to 'Master/texmf-dist/tex/latex') diff --git a/Master/texmf-dist/tex/latex/exsheets/exsheets.sty b/Master/texmf-dist/tex/latex/exsheets/exsheets.sty index 033507e03a0..e3f631830bd 100644 --- a/Master/texmf-dist/tex/latex/exsheets/exsheets.sty +++ b/Master/texmf-dist/tex/latex/exsheets/exsheets.sty @@ -25,8 +25,8 @@ % If you have any ideas, questions, suggestions or bugs to report, please % feel free to contact me. % ---------------------------------------------------------------------------- -\def\exsheets@date{2013/12/08} -\def\exsheets@version{0.12a} +\def\exsheets@date{2013/12/27} +\def\exsheets@version{0.12b} \RequirePackage { expl3 , xparse } \ProvidesExplPackage @@ -1299,6 +1299,8 @@ \l__exsheets_tmpa_tl } { + \bool_if:NT \l__exsheets_only_print_points_bool + { \bool_set_false:N \l__exsheets_parse_points_bool } % might be dangerous to expand here... \tl_if_blank:xTF { \l__exsheets_questions_points_tl } { @@ -2388,8 +2390,8 @@ { \c_space_tl } { \exsheets_par: - \dim_compare:nNnT { \parskip } = { 0pt } - { \exsheets_glue:N \l__exsheets_solutions_skip_below_dim } + \dim_compare:nNnT { \parskip } = { 0pt } + { \exsheets_glue:N \l__exsheets_solutions_skip_below_dim } } } } @@ -2930,6 +2932,9 @@ HISTORY: points which seems to be more consistent - fix bug introduced in the last update: subtitles work again +2013/12/27 v0.12b - ensure that points are not parsed if a leading bang + is inserted + - fix bug in parsing the points %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % TODO: @@ -2937,3 +2942,4 @@ HISTORY: - points: swedish style - \examspace inside {tasks} => possible? (\pagegoal-\pagetotal) gives wrong values here +- remove doubled points name if total points are unknown diff --git a/Master/texmf-dist/tex/latex/exsheets/exsheets_headings.def b/Master/texmf-dist/tex/latex/exsheets/exsheets_headings.def index 7c79be05be9..a40d2187e8e 100644 --- a/Master/texmf-dist/tex/latex/exsheets/exsheets_headings.def +++ b/Master/texmf-dist/tex/latex/exsheets/exsheets_headings.def @@ -336,9 +336,12 @@ \group_begin: \tl_use:N \l__exsheets_heading_title_format_tl \strut \group_end: - \tl_use:N \l__exsheets_heading_points_pre_code_tl - { \exsheets_print_points:n { #3 } } - \tl_use:N \l__exsheets_heading_points_post_code_tl + \fp_compare:nF { #3 = 0 } + { + \tl_use:N \l__exsheets_heading_points_pre_code_tl + { \exsheets_print_points:n { #3 } } + \tl_use:N \l__exsheets_heading_points_post_code_tl + } } } % this allows users to provide their own point system while also using -- cgit v1.2.3