summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-02-21 22:16:40 +0000
committerKarl Berry <karl@freefriends.org>2021-02-21 22:16:40 +0000
commite90023659322c8f937d5d8fc06425a33ac918f03 (patch)
treed561ac7b9625c6a3655ee530179b3a26ebd68101 /Master/texmf-dist/tex/latex
parent833f25c6d03923d81c7b6c4ef4ea868bb926d7ce (diff)
tasks (21feb21)
git-svn-id: svn://tug.org/texlive/trunk@57835 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r--Master/texmf-dist/tex/latex/tasks/tasks.cfg2
-rw-r--r--Master/texmf-dist/tex/latex/tasks/tasks.sty35
2 files changed, 20 insertions, 17 deletions
diff --git a/Master/texmf-dist/tex/latex/tasks/tasks.cfg b/Master/texmf-dist/tex/latex/tasks/tasks.cfg
index c04ea4dabef..4bba3187471 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--2020 Clemens Niederberger
+% Copyright 2013--2021 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 42afb7320ec..60dd49a4a50 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--2020 Clemens Niederberger
+% Copyright 2013--2021 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3c
@@ -28,10 +28,10 @@
\RequirePackage {expl3,xparse,xtemplate}
\ExplSyntaxOn
-\tl_const:Nn \c_tasks_date_tl {2020/08/19}
+\tl_const:Nn \c_tasks_date_tl {2021/02/20}
\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_subrelease_tl {}
+\tl_const:Nn \c_tasks_version_subrelease_tl {a}
\tl_const:Nx \c_tasks_version_number_tl
{
\c_tasks_version_major_number_tl .
@@ -53,7 +53,8 @@
% --------------------------------------------------------------------------
% variants of kernel functions:
\cs_generate_variant:Nn \tl_if_eq:nnTF {V}
-\cs_generate_variant:Nn \tl_if_eq:nnT {V}
+\cs_generate_variant:Nn \tl_if_eq:nnT {V}
+\cs_generate_variant:Nn \tl_if_eq:nnF {V}
\cs_generate_variant:Nn \coffin_attach:NnnNnnnn {NnnNx}
\cs_generate_variant:Nn \tl_set_rescan:Nnn {NnV}
\cs_generate_variant:Nn \tl_set:Nn {cV}
@@ -135,6 +136,12 @@
\tl_new:N \l__tasks_item_tl
\tl_new:N \l__tasks_tmp_label_tl
+\cs_set:Nx \__tasks_restore_dollar:
+ { \char_set_catcode:nn {36} { \char_value_catcode:n {36} } }
+\char_set_catcode_alignment:N \$
+\tl_const:Nn \c__tasks_default_label_tl {$tasks$default$label$}
+\__tasks_restore_dollar:
+
\dim_new:N \l__tasks_item_indent_dim
\dim_new:N \l__tasks_item_default_indent_dim
\dim_new:N \l__tasks_item_width_dim
@@ -454,12 +461,6 @@
after-item-skip : skip = 1ex plus 1ex minus 1ex
}
-% in the next three commands we want a really unlikely to occur marker; for
-% this we use $ with unusual catcode in ``$tasks$default$label$'':
-\cs_set:Nx \__tasks_restore_dollar:
- { \char_set_catcode:nn {36} { \char_value_catcode:n {36} } }
-\char_set_catcode_alignment:N \$
-
% the `default' template code:
\DeclareTemplateCode {tasks} {default} {3}
{
@@ -561,7 +562,8 @@
{
\__tasks_read_item:www ##1 \q_stop
% TODO
- \refstepcounter { \l__tasks_counter_tl }
+ \tl_if_eq:NNT \l__tasks_tmp_label_tl \c__tasks_default_label_tl
+ { \refstepcounter { \l__tasks_counter_tl } }
\tl_set:Nx \l__tasks_label_tl { { \exp_not:V \l__tasks_tmpa_tl } }
\tl_set:cV {tasklabel} \l__tasks_label_tl
\bool_if:NTF \l__tasks_custom_label_format_bool
@@ -581,7 +583,7 @@
{ \dim_to_decimal:n { \box_wd:N \l__tasks_tmpa_box } }
}
\bool_set_false:N \l__tasks_measuring_bool
- \tl_if_eq:VnTF \l__tasks_tmp_label_tl { $tasks$default$label$ }
+ \tl_if_eq:NNTF \l__tasks_tmp_label_tl \c__tasks_default_label_tl
{
\__tasks_task:VVV
\l__tasks_label_tl
@@ -632,13 +634,13 @@
{
\peek_meaning:NTF [ % ]
{ \__tasks_read_item_aux_ii:ww }
- { \__tasks_read_item_aux_ii:ww [$tasks$default$label$] }
+ { \__tasks_read_item_aux_ii:ww [\c__tasks_default_label_tl] }
}
\cs_new_protected:Npn \__tasks_read_item_aux_ii:ww [#1]#2 \q_stop
{
- \tl_if_eq:nnTF {#1} {$tasks$default$label$}
- { \tl_set:Nn \l__tasks_tmp_label_tl {#1} }
+ \tl_if_eq:nnTF {#1} {\c__tasks_default_label_tl}
+ { \tl_set:NV \l__tasks_tmp_label_tl \c__tasks_default_label_tl }
{
\tl_set:Nn \l__tasks_tmp_label_tl {{#1}}
\tl_put_left:NV \l__tasks_tmp_label_tl \l__tasks_label_format_tl
@@ -882,4 +884,5 @@
- rename manual files
2020/04/19 v1.2a - only use arabic numbers for \theHtask
2020/05/11 v1.2b - options are set to late for `before-skip' -- fixed
-2020/05/11 v1.3 - add `ref' option
+2020/08/19 v1.3 - add `ref' option
+2021/02/20 v1.3a - fix issue #23