diff options
author | Norbert Preining <preining@logic.at> | 2014-07-30 23:47:34 +0000 |
---|---|---|
committer | Norbert Preining <preining@logic.at> | 2014-07-30 23:47:34 +0000 |
commit | 3e444f8fbe48cab7d9127ddc71e3db4bebacd6b6 (patch) | |
tree | 83759ee8500299e728573158f92f7250b89b4663 /Master/texmf-dist/tex | |
parent | 58e63462b28333284caa1815413fefd43cfc7d61 (diff) |
tasks (30Jul)
git-svn-id: svn://tug.org/texlive/trunk@34779 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r-- | Master/texmf-dist/tex/latex/tasks/tasks.sty | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/Master/texmf-dist/tex/latex/tasks/tasks.sty b/Master/texmf-dist/tex/latex/tasks/tasks.sty index 7de903b8e35..0efe96b43a0 100644 --- a/Master/texmf-dist/tex/latex/tasks/tasks.sty +++ b/Master/texmf-dist/tex/latex/tasks/tasks.sty @@ -25,8 +25,8 @@ % If you have any ideas, questions, suggestions or bugs to report, please % feel free to contact me. % -------------------------------------------------------------------------- -\def\@tasks@date{2014/07/20} -\def\@tasks@version{0.10} +\def\@tasks@date{2014/07/29} +\def\@tasks@version{0.10a} \RequirePackage { expl3 , xparse , l3keys2e } \ProvidesExplPackage @@ -169,7 +169,9 @@ } \cs_generate_variant:Nn \__tasks:nnnn { VnnV } -\cs_new_protected:Npn \__tasks_task:nnwwwwww #1#2[#3,#4][#5,#6](#7,#8) +% #1: label +% #2: item +\cs_new_protected:Npn \__tasks_task:nn #1#2 { % start a new item line if \l__tasks_item_full_line_bool \bool_if:NT \l__tasks_item_full_line_bool @@ -247,7 +249,7 @@ { \vcoffin_set:Nnn \l__tasks_tmpa_coffin { \l__tasks_item_width_dim } - { \__tasks_setup: #2 } + { \__tasks_setup: #2 \strut } \__tasks_debug:n { \coffin_typeset:Nnnnn \l__tasks_tmpa_coffin @@ -320,7 +322,7 @@ \bool_set_false:N \l__tasks_item_full_line_bool \bool_set_false:N \l__tasks_item_rest_of_line_bool } -\cs_generate_variant:Nn \__tasks_task:nnwwwwww { VV } +\cs_generate_variant:Nn \__tasks_task:nn { VV } \cs_new_protected:Npn \__tasks_setup: { @@ -487,16 +489,14 @@ \tl_put_left:NV \l__tasks_label_tl \l__tasks_label_format_tl \tl_if_eq:VnTF \l__tasks_tmp_label_tl { $tasks$default$label$ } { - \__tasks_task:VVwwwwww + \__tasks_task:VV \l__tasks_label_tl \l__tasks_item_tl - [ l , b ] [ l , t ] ( 0pt , 0pt ) } { - \__tasks_task:VVwwwwww + \__tasks_task:VV \l__tasks_tmp_label_tl \l__tasks_item_tl - [ l , b ] [ l , t ] ( 0pt , 0pt ) \tl_clear:N \l__tasks_tmp_label_tl } } @@ -625,7 +625,7 @@ item-indent .code:n = \dim_set:Nn \l__tasks_item_indent_dim { #1 } \bool_set_true:N \l__tasks_item_indent_bool , - columns-sep .dim_set:N = \l__tasks_column_sep_dim , + column-sep .dim_set:N = \l__tasks_column_sep_dim , before-skip .skip_set:N = \l__tasks_before_list_skip , after-skip .skip_set:N = \l__tasks_after_list_skip , after-item-skip .code:n = @@ -641,8 +641,7 @@ \keys_set:nn { tasks / list } { #2 } \tl_if_blank:VT \l__tasks_instance_tl { \keys_set:nn { tasks / list } { style = alphabetize } } - \skip_vertical:N \l__tasks_before_list_skip - \skip_vertical:N \c_zero_skip + \vspace {\l__tasks_before_list_skip} \list {} { \dim_set:Nn \leftmargin { 0pt } @@ -652,7 +651,7 @@ \int_incr:N \l__tasks_depth_int \__tasks:VnnV \l__tasks_instance_tl { #3 } { #1 } \BODY \endlist - \skip_vertical:N \l__tasks_after_list_skip + \vspace {\l__tasks_after_list_skip} } % -------------------------------------------------------------------------- @@ -740,7 +739,7 @@ 2014/05/11 v0.9c - remove definition of the \task macro: it is not necessary for `tasks' to function but it conflicts e.g. with `ltxdoc' class -2014/07/11 v0.20 - new option `debug' +2014/07/20 v0.10 - new option `debug' - new option `column-sep - renamed a few internal variables - remove package from the `exsheets' bundle and distribute @@ -751,3 +750,8 @@ complete remaining line (\task*); the star has itself has an optional argument for specifying the number of columns to span (\task*(<num>)) +2014/07/29 v0.10a - bug-fix: correct typo in option definition of `column-sep' + - insert before/after skip with \vspace* + - remove unnecessary (and unused) arguments of + \__tasks_task:nn + - add \strut to the end of an item |