tasks (3nov19)

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

1 files changed, 28 insertions, 12 deletions

diff --git a/Master/texmf-dist/tex/latex/tasks/tasks.sty b/Master/texmf-dist/tex/latex/tasks/tasks.sty
index d1634835d57..ed0bc106103 100644
--- a/Master/texmf-dist/tex/latex/tasks/tasks.sty
+++ b/Master/texmf-dist/tex/latex/tasks/tasks.sty
@@ -28,10 +28,10 @@
 \RequirePackage {expl3,xparse,xtemplate}
 \ExplSyntaxOn
 
-\tl_const:Nn \c_tasks_date_tl                 {2019/10/07}
+\tl_const:Nn \c_tasks_date_tl                 {2019/11/03}
 \tl_const:Nn \c_tasks_version_major_number_tl {1}
-\tl_const:Nn \c_tasks_version_minor_number_tl {0}
-\tl_const:Nn \c_tasks_version_subrelease_tl   {c}
+\tl_const:Nn \c_tasks_version_minor_number_tl {1}
+\tl_const:Nn \c_tasks_version_subrelease_tl   {}
 \tl_const:Nx \c_tasks_version_number_tl
   {
     \c_tasks_version_major_number_tl .
@@ -62,7 +62,7 @@
 % --------------------------------------------------------------------------
 \msg_new:nnn {tasks} {width-too-small}
   {
-    The~ width~ off~ `#1'~ is~ too~ small~ \msg_line_context: .~
+    The~ width~ of~ `#1'~ is~ too~ small~ \msg_line_context: .~
     Please~ set~ it~ at~ least~ to~ #2.
   }
 
@@ -100,6 +100,7 @@
 \int_new:N    \g__tasks_current_row_num_int
 \int_new:N    \l__tasks_item_columns_int
 \int_new:N    \g__tasks_env_int
+\int_new:N    \l__tasks_start_int
 
 \bool_new:N   \l__tasks_resume_bool
 \bool_new:N   \l__tasks_load_tasks_bool
@@ -154,6 +155,7 @@
 \tl_new:N     \l__tasks_tmpa_tl
 \coffin_new:N \l__tasks_tmpa_coffin
 \box_new:N    \l__tasks_tmpa_box
+\bool_new:N   \l__tasks_tmpa_bool
 
 \cs_new:Npn \__tasks_debug:n #1
   {
@@ -480,7 +482,7 @@
     \__tasks_label_align:V \l__tasks_label_align_tl
     % need this for enumerate list:
     \bool_if:NF \l__tasks_resume_bool
-      { \setcounter {task} {0} }
+      { \setcounter {task} { \int_eval:n { \l__tasks_start_int -1 } } }
     \int_set:Nn \l__tasks_columns_int {#2}
     % set all the items in their own coffins and join with the ground:
     \int_gzero:N \g__tasks_current_col_num_int
@@ -503,9 +505,16 @@
         \bool_if:NTF \l__tasks_custom_label_bool
           { \tl_to_str:V \l__tasks_custom_label_tl }
           { \tl_to_str:V \l__tasks_label_tl }
-        }
-    \tl_replace_once:Nnn \l__tasks_tmpa_tl {*} {{task}}
+      }
+    \bool_set_false:N \l__tasks_tmpa_bool
+    \tl_if_in:NnT \l__tasks_tmpa_tl {*}
+      {
+        \tl_replace_once:Nnn \l__tasks_tmpa_tl {*} {{task}}
+        \bool_set_true:N \l__tasks_tmpa_bool
+      }
     \tl_set_rescan:NnV \l__tasks_tmpa_tl {} \l__tasks_tmpa_tl
+    \bool_if:NT \l__tasks_tmpa_bool
+      { \tl_set:NV \thetask \l__tasks_tmpa_tl }
     \dim_compare:nNnT
       { \l__tasks_item_indent_dim }
       <
@@ -635,7 +644,9 @@
     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} ,
-    resume           .bool_set:N = \l__tasks_resume_bool
+    resume           .bool_set:N = \l__tasks_resume_bool ,
+    start            .int_set:N  = \l__tasks_start_int ,
+    start            .initial:n  = 1
   }
 
 % --------------------------------------------------------------------------
@@ -729,7 +740,7 @@
 \cs_new_protected:Npn \tasks_setup:n #1
   { \keys_set:nn {tasks/list} {#1} }
 
-\NewDocumentCommand \settasks { m }
+\NewDocumentCommand \settasks { +m }
   { \tasks_setup:n {#1} }
 
 % default:
@@ -757,11 +768,12 @@
                      * the former `label-format' is now `counter-format'
                      * new: `label-format'
                   - changed defaults for `label-width' and `label-offset'
-                  - ensure that the `after-item-skip' is only
-                          inserted in between rows
+                  - ensure that the `after-item-skip' is only inserted in
+                    between rows
                   - new option `after-item-skip'
                   - improvements when label are set with optional argument:
-                     * a provided but empty argument is now correctly recognized
+                     * a provided but empty argument is now correctly
+                       recognized
                      * the counter is  _not_ stepped anymore for enumerated
                        lists when the optional argument is provided
                   - new command \startnewitemline that forces the next item to
@@ -809,3 +821,7 @@
 2019/10/06 v1.0b  - fix bug in `label-format' definition
 2019/10/07 v1.0c  - fix bug in width warning
                   - fix bug in deprecation of `counter-format'
+2019/10/08 v1.0d  - make \thetask usable; and correct \label/\ref
+2019/11/03 v1.1   - fix typo
+                  - make \settasks' argument long
+                  - new option `start'