tasks (8jan22)

git-svn-id: svn://tug.org/texlive/trunk@61541 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 19 insertions, 9 deletions

diff --git a/Master/texmf-dist/tex/latex/tasks/tasks.cfg b/Master/texmf-dist/tex/latex/tasks/tasks.cfg
index 4bba3187471..e53bf69ee65 100644
--- a/Master/texmf-dist/tex/latex/tasks/tasks.cfg
+++ b/Master/texmf-dist/tex/latex/tasks/tasks.cfg
@@ -8,7 +8,7 @@
 % Web:    https://github.com/cgnieder/tasks/
 % E-Mail: contact@mychemistry.eu
 % --------------------------------------------------------------------------
-% Copyright 2013--2021 Clemens Niederberger
+% Copyright 2013--2022 Clemens Niederberger
 % 
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/tasks/tasks.sty b/Master/texmf-dist/tex/latex/tasks/tasks.sty
index 60dd49a4a50..a82a682c296 100644
--- a/Master/texmf-dist/tex/latex/tasks/tasks.sty
+++ b/Master/texmf-dist/tex/latex/tasks/tasks.sty
@@ -8,7 +8,7 @@
 % Web:    https://github.com/cgnieder/tasks/
 % E-Mail: contact@mychemistry.eu
 % --------------------------------------------------------------------------
-% Copyright 2013--2021 Clemens Niederberger
+% Copyright 2013--2022 Clemens Niederberger
 % 
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
@@ -28,9 +28,9 @@
 \RequirePackage {expl3,xparse,xtemplate}
 \ExplSyntaxOn
 
-\tl_const:Nn \c_tasks_date_tl                 {2021/02/20}
+\tl_const:Nn \c_tasks_date_tl                 {2022/01/08}
 \tl_const:Nn \c_tasks_version_major_number_tl {1}
-\tl_const:Nn \c_tasks_version_minor_number_tl {3}
+\tl_const:Nn \c_tasks_version_minor_number_tl {4}
 \tl_const:Nn \c_tasks_version_subrelease_tl   {a}
 \tl_const:Nx \c_tasks_version_number_tl
   {
@@ -401,8 +401,8 @@
 \cs_new_protected:Npn \__tasks_setup:
   {
     \dim_set:Nn \parskip {0pt}
-    \skip_set:Nn \parfillskip {0pt plus 1fil}
-    \dim_set_eq:NN \parskip \parsep
+    % \skip_set:Nn \parfillskip {0pt plus 1fil}
+    % \dim_set_eq:NN \parskip \parsep
     \dim_set_eq:NN \parindent \listparindent
     \noindent
     \strut
@@ -458,7 +458,7 @@
     label-width     : length      = 11pt    ,
     label-offset    : length      = .3333em ,
     item-format     : tokenlist             ,
-    after-item-skip : skip        = 1ex plus 1ex minus 1ex
+    after-item-skip : skip        = \itemsep
   }
 
 % the `default' template code:
@@ -685,10 +685,13 @@
       \bool_set_true:N \l__tasks_item_indent_bool ,
     column-sep       .dim_set:N  = \l__tasks_column_sep_dim ,
     before-skip      .skip_set:N = \l__tasks_before_list_skip ,
+    before-skip      .initial:n  = \topsep ,
     after-skip       .skip_set:N = \l__tasks_after_list_skip ,
+    after-skip       .initial:n  = \topsep ,
     after-item-skip .code:n     =
       \bool_set_true:N \l__tasks_custom_after_item_skip_bool
       \skip_set:Nn \l__tasks_custom_after_item_skip {#1} ,
+    after-item-skip  .initial:n  = \itemsep ,
     resume           .bool_set:N = \l__tasks_resume_bool ,
     start            .int_set:N  = \l__tasks_start_int ,
     start            .initial:n  = 1
@@ -712,18 +715,22 @@
       }
     \keys_set:nn {tasks/list} {#2}
     \dim_compare:nNnF { \l__tasks_before_list_skip } = {0pt}
-      { \vspace {\l__tasks_before_list_skip} }
+      { \par\addvspace {\l__tasks_before_list_skip} }
     \list {}
       {
         \dim_set:Nn \leftmargin  {0pt}
         \dim_set:Nn \rightmargin {0pt}
+        \dim_set:Nn \parsep {0pt}
+        \dim_set:Nn \partopsep {0pt}
+        \dim_set:Nn \topsep {0pt}
+        \dim_set:Nn \itemsep {0pt}
       }
       \item \scan_stop:
       \dim_set:Nn \l__tasks_full_width_dim { \linewidth }
       \tasks_environment:Vnnn \l__tasks_instance_tl {#3} {#1} {#4}
     \endlist
     \dim_compare:nNnF { \l__tasks_after_list_skip } = {0pt}
-      { \vspace {\l__tasks_after_list_skip} }
+      { \addvspace {\l__tasks_after_list_skip} }
   }
 
 % --------------------------------------------------------------------------
@@ -886,3 +893,6 @@
 2020/05/11 v1.2b  - options are set to late for `before-skip' -- fixed
 2020/08/19 v1.3   - add `ref' option
 2021/02/20 v1.3a  - fix issue #23
+2022/01/08 v1.4   - fix issue #27
+2022/01/08 v1.4a  - change \vspace into \addvspace so that consecutive lists don't add
+                    their vertical seps, see https://tex.stackexchange.com/q/222973/