From 827aa8a6199555795f58fb9d81e0c69c11c09ce6 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 5 Dec 2013 00:08:09 +0000 Subject: exsheets (4dec13) git-svn-id: svn://tug.org/texlive/trunk@32321 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/exsheets/README | 4 +- Master/texmf-dist/doc/latex/exsheets/tasks_en.pdf | Bin 443041 -> 443086 bytes Master/texmf-dist/tex/latex/exsheets/tasks.sty | 46 +++++++++++++++------- 3 files changed, 34 insertions(+), 16 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/exsheets/README b/Master/texmf-dist/doc/latex/exsheets/README index d464675a53e..5ceae383aaa 100644 --- a/Master/texmf-dist/doc/latex/exsheets/README +++ b/Master/texmf-dist/doc/latex/exsheets/README @@ -1,5 +1,5 @@ -------------------------------------------------------------------------- -EXSHEETS 2013/12/02 +EXSHEETS 2013/12/03 bundled packages: the EXSHEETS package v0.12 Yet another package for the creation of exercise sheets @@ -7,7 +7,7 @@ the EXSHEETS-LISTINGS package v0.2 Using listings in exsheets the CNTFORMATS package v0.6 A different way to read counters. -the TASKS package v0.9d +the TASKS package v0.9b Horizontal columned lists. -------------------------------------------------------------------------- diff --git a/Master/texmf-dist/doc/latex/exsheets/tasks_en.pdf b/Master/texmf-dist/doc/latex/exsheets/tasks_en.pdf index 39e41770f3b..03888e0a218 100644 Binary files a/Master/texmf-dist/doc/latex/exsheets/tasks_en.pdf and b/Master/texmf-dist/doc/latex/exsheets/tasks_en.pdf differ diff --git a/Master/texmf-dist/tex/latex/exsheets/tasks.sty b/Master/texmf-dist/tex/latex/exsheets/tasks.sty index 96441a80247..45726ca6519 100644 --- a/Master/texmf-dist/tex/latex/exsheets/tasks.sty +++ b/Master/texmf-dist/tex/latex/exsheets/tasks.sty @@ -28,8 +28,8 @@ % If you have any ideas, questions, suggestions or bugs to report, please % feel free to contact me. % -------------------------------------------------------------------------- -\def\@tasks@date{2013/04/22} -\def\@tasks@version{0.9a} +\def\@tasks@date{2013/12/03} +\def\@tasks@version{0.9b} \RequirePackage { expl3 , xparse , l3keys2e } \ProvidesExplPackage @@ -113,6 +113,8 @@ \coffin_new:N \l__tasks_tmpb_coffin \coffin_new:N \l__tasks_tmpc_coffin +\cs_new_eq:NN \__tasks_debug:n \use:n + % -------------------------------------------------------------------------- % collect the tasks: \cs_new_protected:Npn \__tasks_collect_tasks:nw #1#2 \end #3 @@ -171,24 +173,37 @@ { l } { T } { 0pt } { 0pt } } % the label: - \vcoffin_set:Nnn \l__tasks_tmpb_coffin - { \l__tasks_label_width_dim } + \hcoffin_set:Nn \l__tasks_tmpb_coffin { - \tl_use:N \l__tasks_item_fill_left_tl - \strut #1 - \tl_use:N \l__tasks_item_fill_right_tl + \vcoffin_set:Nnn \l__tasks_tmpc_coffin + { \l__tasks_label_width_dim } + { + \noindent + \tl_use:N \l__tasks_item_fill_left_tl + \strut #1 + \tl_use:N \l__tasks_item_fill_right_tl + } + \__tasks_debug:n + { + \coffin_typeset:Nnnnn \l__tasks_tmpc_coffin + { l } { T } { 0pt } { 0pt } + } } \coffin_attach:NnnNnnnn \l__tasks_tmpa_coffin { l } { T } \l__tasks_tmpb_coffin { l } { T } - { -\l__tasks_label_width_dim - \l__tasks_label_offset_dim } { 0pt } + { - \l__tasks_label_width_dim - \l__tasks_label_offset_dim } { 0pt } % typeset label & item: % need this when a new row starts: \int_compare:nT { \g__tasks_tmpa_int = 1 } { \skip_vertical:N \c_zero_skip } + \noindent \skip_horizontal:N \l__tasks_item_indent_dim - \coffin_typeset:Nnnnn \l__tasks_tmpa_coffin - { l } { T } { 0pt } { 0pt } + \__tasks_debug:n + { + \coffin_typeset:Nnnnn \l__tasks_tmpa_coffin + { l } { T } { 0pt } { 0pt } + } % need this before a new row starts: \bool_if:nT { @@ -209,6 +224,7 @@ \skip_set:Nn \parfillskip { 0pt plus 1fil } \dim_set_eq:NN \parskip \parsep \dim_set_eq:NN \parindent \listparindent + \noindent \strut } @@ -226,7 +242,7 @@ \tl_if_eq:nnT { #1 } { left } { \tl_clear:N \l__tasks_item_fill_left_tl - \tl_set_eq:NN \l__tasks_item_fill_right_tl \hfil + \tl_set_eq:NN \l__tasks_item_fill_right_tl \hfill } \tl_if_eq:nnT { #1 } { right } { @@ -235,13 +251,13 @@ } \tl_if_eq:nnT { #1 } { center } { - \tl_set_eq:NN \l__tasks_item_fill_left_tl \hfil - \tl_set_eq:NN \l__tasks_item_fill_right_tl \hfil + \tl_set_eq:NN \l__tasks_item_fill_left_tl \hfill + \tl_set_eq:NN \l__tasks_item_fill_right_tl \hfill } } { \tl_clear:N \l__tasks_item_fill_left_tl - \tl_set_eq:NN \l__tasks_item_fill_right_tl \hfil + \tl_set_eq:NN \l__tasks_item_fill_right_tl \hfill } } \cs_generate_variant:Nn \__tasks_label_align:n { V } @@ -578,3 +594,5 @@ 2013/04/22 v0.9a - new option `item-indent' - synchronized version number with `exsheets' until now but won't any more +2013/12/03 v0.9b - add missing \noindent for the case when \listparindent is + non-zero, fixes http://tex.stackexchange.com/q/148082/5049 -- cgit v1.2.3