summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/tasks
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2020-01-12 03:00:58 +0000
committerNorbert Preining <norbert@preining.info>2020-01-12 03:00:58 +0000
commitb0cb2086fcb39d89f7f5f6b8a9eea09f78272b52 (patch)
tree6b5e775789bf238282cfd6aa98a49d173834c74b /macros/latex/contrib/tasks
parent005d294a77f2494010cde294f7dac04af93c194d (diff)
CTAN sync 202001120300
Diffstat (limited to 'macros/latex/contrib/tasks')
-rw-r--r--macros/latex/contrib/tasks/README4
-rw-r--r--macros/latex/contrib/tasks/tasks.cfg2
-rw-r--r--macros/latex/contrib/tasks/tasks.sty23
-rw-r--r--macros/latex/contrib/tasks/tasks_en.pdfbin448183 -> 448228 bytes
-rw-r--r--macros/latex/contrib/tasks/tasks_en.tex11
5 files changed, 23 insertions, 17 deletions
diff --git a/macros/latex/contrib/tasks/README b/macros/latex/contrib/tasks/README
index c0cd02c7f8..aa177739fa 100644
--- a/macros/latex/contrib/tasks/README
+++ b/macros/latex/contrib/tasks/README
@@ -1,5 +1,5 @@
--------------------------------------------------------------------------
-the TASKS package v1.1 2019/11/03
+the TASKS package v1.1a 2020/01/11
horizontally columned lists
@@ -8,7 +8,7 @@ Clemens Niederberger
Web: https://github.com/cgnieder/tasks/
E-Mail: contact@mychemistry.eu
--------------------------------------------------------------------------
-Copyright 2013--2019 Clemens Niederberger
+Copyright 2013--2020 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/macros/latex/contrib/tasks/tasks.cfg b/macros/latex/contrib/tasks/tasks.cfg
index d76ad264cd..127d78f273 100644
--- a/macros/latex/contrib/tasks/tasks.cfg
+++ b/macros/latex/contrib/tasks/tasks.cfg
@@ -8,7 +8,7 @@
% Web: https://github.com/cgnieder/tasks/
% E-Mail: contact@mychemistry.eu
% --------------------------------------------------------------------------
-% Copyright 2013--2019 Clemens Niederberger
+% Copyright 2013--2020 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/macros/latex/contrib/tasks/tasks.sty b/macros/latex/contrib/tasks/tasks.sty
index ed0bc10610..e9332a378c 100644
--- a/macros/latex/contrib/tasks/tasks.sty
+++ b/macros/latex/contrib/tasks/tasks.sty
@@ -8,7 +8,7 @@
% Web: https://github.com/cgnieder/tasks/
% E-Mail: contact@mychemistry.eu
% --------------------------------------------------------------------------
-% Copyright 2013--2019 Clemens Niederberger
+% Copyright 2013--2020 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -28,10 +28,10 @@
\RequirePackage {expl3,xparse,xtemplate}
\ExplSyntaxOn
-\tl_const:Nn \c_tasks_date_tl {2019/11/03}
+\tl_const:Nn \c_tasks_date_tl {2020/01/11}
\tl_const:Nn \c_tasks_version_major_number_tl {1}
\tl_const:Nn \c_tasks_version_minor_number_tl {1}
-\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 .
@@ -63,13 +63,13 @@
\msg_new:nnn {tasks} {width-too-small}
{
The~ width~ of~ `#1'~ is~ too~ small~ \msg_line_context: .~
- Please~ set~ it~ at~ least~ to~ #2.
+ Please~ set~ it~ at~ least~ to~ #2 pt.
}
\msg_new:nnn {tasks} {no-item}
{
You've~ placed~ `#1'~ before~ the~ first~ #2~ \msg_line_context: .~
- I~ will~ through~ it~ away~ and~ ignore~ it~ for~ the~ rest~ of~ the~
+ I~ will~ throw~ it~ away~ and~ ignore~ it~ for~ the~ rest~ of~ the~
list.
}
@@ -530,7 +530,7 @@
{
\__tasks_read_item:www ##1 \q_stop
\refstepcounter {task}
- \tl_set:NV \l__tasks_label_tl \l__tasks_tmpa_tl
+ \tl_set:Nx \l__tasks_label_tl { { \exp_not:V \l__tasks_tmpa_tl } }
\bool_if:NTF \l__tasks_custom_label_format_bool
{ \tl_put_left:NV \l__tasks_label_tl \l__tasks_custom_label_format_tl }
{ \tl_put_left:NV \l__tasks_label_tl \l__tasks_label_format_tl }
@@ -602,9 +602,12 @@
\cs_new_protected:Npn \__tasks_read_item_aux_ii:ww [#1]#2 \q_stop
{
- \tl_set:Nn \l__tasks_tmp_label_tl {#1}
- \tl_if_eq:nnF {#1} { $tasks$default$label$ }
- { \tl_put_left:NV \l__tasks_tmp_label_tl \l__tasks_label_format_tl }
+ \tl_if_eq:nnTF {#1} {$tasks$default$label$}
+ { \tl_set:Nn \l__tasks_tmp_label_tl {#1} }
+ {
+ \tl_set:Nn \l__tasks_tmp_label_tl {{#1}}
+ \tl_put_left:NV \l__tasks_tmp_label_tl \l__tasks_label_format_tl
+ }
\tl_set:Nx \l__tasks_item_tl { \tl_trim_spaces:n {#2} }
}
@@ -825,3 +828,5 @@
2019/11/03 v1.1 - fix typo
- make \settasks' argument long
- new option `start'
+2020/01/11 v1.2 - allow `label-format' to end with command that needs an
+ argument
diff --git a/macros/latex/contrib/tasks/tasks_en.pdf b/macros/latex/contrib/tasks/tasks_en.pdf
index d39fa59b12..27389741a3 100644
--- a/macros/latex/contrib/tasks/tasks_en.pdf
+++ b/macros/latex/contrib/tasks/tasks_en.pdf
Binary files differ
diff --git a/macros/latex/contrib/tasks/tasks_en.tex b/macros/latex/contrib/tasks/tasks_en.tex
index b9f3a4f350..8821283a82 100644
--- a/macros/latex/contrib/tasks/tasks_en.tex
+++ b/macros/latex/contrib/tasks/tasks_en.tex
@@ -8,7 +8,7 @@
% Web: https://github.com/cgnieder/tasks/
% E-Mail: contact@mychemistry.eu
% --------------------------------------------------------------------------
-% Copyright 2013--2019 Clemens Niederberger
+% Copyright 2013--2020 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -270,8 +270,9 @@ following ones that can be set using a setup command:
Choose the instance to be used. Read more on this in
section~\ref{sec:tasks}.
\keyval{label-format}{code}\Default
- \changedversion{0.9}Can be used to apply a formatting like, \eg,
- \cs*{bfseries} to the labels.
+ \changedversion{1.1a}Can be used to apply a formatting like, \eg,
+ \cs*{bfseries} to the labels. This may be code accepting the item as
+ mandatory argument.
\keyval{label}{code}\Default{\cs*{alph}\code{*)}}
\changedversion{1.0}Sets a custom label. The \code{*} is replaced by
\Marg{task}. This is heavily inspired by
@@ -283,7 +284,7 @@ following ones that can be set using a setup command:
item.
\keyval{item-format}{code}\Default
\sinceversion{0.11}Can be used to apply a formatting like, \eg,
- \cs*{bfseries} to the items. This may be a macro accepting the item as
+ \cs*{bfseries} to the items. This may be code accepting the item as
mandatory argument.
\keyval{item-indent}{dim}\Default{2.5em}
\sinceversion{0.9a}The indent of an item, \ie, the horizontal space
@@ -341,7 +342,7 @@ following ones that can be set using a setup command:
\draw[<->] (0,-.5) --node[below]{item indent} (2,-.5) ;
\draw[<->] (2,-.5) --node[below]{item width} (10,-.5) ;
\draw[<->] (labeledge1) ++(0,1) --node[above]{label width} ++(-1,0) ;
- \draw[<->] (labeledge1) --node[above]{item offset} ++(.5,0) ;
+ \draw[<->] (labeledge1) --node[above]{label offset} ++(.5,0) ;
\end{tikzpicture}
\caption{A visual representation of the used lengths.}
\label{fig:lengths}