summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/latex/tasks/README6
-rw-r--r--Master/texmf-dist/doc/latex/tasks/tasks-manual.cls275
-rw-r--r--Master/texmf-dist/doc/latex/tasks/tasks-manual.pdfbin476534 -> 491114 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tasks/tasks-manual.tex17
-rw-r--r--Master/texmf-dist/tex/latex/tasks/tasks.cfg2
-rw-r--r--Master/texmf-dist/tex/latex/tasks/tasks.sty26
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds1
7 files changed, 306 insertions, 21 deletions
diff --git a/Master/texmf-dist/doc/latex/tasks/README b/Master/texmf-dist/doc/latex/tasks/README
index 8fa06e1888f..5d772f3de23 100644
--- a/Master/texmf-dist/doc/latex/tasks/README
+++ b/Master/texmf-dist/doc/latex/tasks/README
@@ -1,5 +1,5 @@
--------------------------------------------------------------------------
-the TASKS package v1.3a 2021/02/20
+the TASKS package v1.4 2022/01/08
lists with columns filled horizontally
@@ -8,7 +8,7 @@ Clemens Niederberger
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
@@ -24,7 +24,7 @@ The Current Maintainer of this work is Clemens Niederberger.
--------------------------------------------------------------------------
The tasks package consists of the files
- tasks.sty, tasks.cfg
- - tasks-manual.tex, task-manual.pdf, task-manual.cls
+ - tasks-manual.tex, task-manual.pdf, tasks-manual.cls
- README
--------------------------------------------------------------------------
If you have any ideas, questions, suggestions or bugs to report, please
diff --git a/Master/texmf-dist/doc/latex/tasks/tasks-manual.cls b/Master/texmf-dist/doc/latex/tasks/tasks-manual.cls
new file mode 100644
index 00000000000..31742f52386
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/tasks/tasks-manual.cls
@@ -0,0 +1,275 @@
+% --------------------------------------------------------------------------
+% the TASKS package
+%
+% lists with columns filled horizontally
+%
+% --------------------------------------------------------------------------
+% Clemens Niederberger
+% Web: https://github.com/cgnieder/tasks/
+% E-Mail: contact@mychemistry.eu
+% --------------------------------------------------------------------------
+% 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
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status `maintained'.
+%
+% The Current Maintainer of this work is Clemens Niederberger.
+% --------------------------------------------------------------------------
+% If you have any ideas, questions, suggestions or bugs to report, please
+% feel free to contact me.
+% --------------------------------------------------------------------------
+\ProvidesClass{tasks-manual}[2022/01/08]
+
+\LoadClass[load-preamble,add-index]{cnltx-doc}
+\RequirePackage{imakeidx}
+
+\RequirePackage{tasks}
+
+\setcnltx{
+ package = {tasks} ,
+ authors = Clemens Niederberger ,
+ email = {contact@mychemistry.eu} ,
+ url = {https://github.com/cgnieder/tasks/} ,
+ info = {lists with columns filled horizontally} ,
+ add-cmds = {
+ NewTasksEnvironment,
+ RenewTasksEnvironment,
+ settasks,
+ startnewitemline ,
+ task
+ } ,
+ add-silent-cmds = {
+ DeclareInstance, DeclareTemplateInterface,
+ faThumbsOUp,
+ sample, Sample , theexercise
+ } ,
+ index-setup = { othercode=\footnotesize, level=\section , noclearpage } ,
+ makeindex-setup = { columns=3, columnsep=1em }
+}
+
+\def\libertine@figurestyle{LF}
+\RequirePackage{amsmath}
+\undef\lvert \undef\lVert
+\undef\rvert \undef\rVert
+\RequirePackage[libertine]{newtxmath}
+\def\libertine@figurestyle{OsF}
+
+\newpackagename\ExSheets{ExSheets}
+\newpackagename\Tasks{tasks}
+
+% ----------------------------------------------------------------------------
+% other packages, bibliography, index
+\RequirePackage{xcoffins,tikz,wasysym,enumitem,booktabs,siunitx,accsupp}
+\RequirePackage{acro}
+\DeclareAcronym{id}{
+ short = id ,
+ long = Identifier ,
+ format = \scshape ,
+ pdfstring = ID ,
+ short-acc = ID
+}
+
+\RequirePackage{csquotes}
+
+% ----------------------------------------------------------------------------
+% example definitions that have to be done in the preamble:
+\RequirePackage{xsim}
+
+\newcommand*\sample{This is some sample text we will use to create a somewhat
+ longer text spanning a few lines.}
+\newcommand*\Sample{\sample\ \sample\par\sample}
+
+\RequirePackage{fontawesome}
+\RequirePackage{datetime2}
+\DTMsetup{useregional=numeric,datesep=/}
+\newrobustcmd*\tasks@add@version[2]{%
+ \csdef{tasks@ver@#2}{%
+ \DTMdate{#1}%
+ \csgdef{tasks@ver@#2used}{}%
+ \csdef{tasks@ver@#2}{\DTMdate{#1}}%
+ }%
+}
+
+\newrobustcmd*\tasks@date[1]{%
+ \ifcsdef{tasks@ver@#1used}{}{ (\csuse{tasks@ver@#1})}}
+\newrobustcmd*\tasks@ifnew[1]{\ifcsstring{c_tasks_version_tl}{#1}}
+\newrobustcmd*\tasks@NEW{\textcolor{red}{\faStarO\ New}}
+
+\renewrobustcmd*\sinceversion[1]{%
+ \tasks@ifnew{#1}%
+ {\cnltx@version@note{\tasks@NEW}}%
+ {\cnltx@version@note{introduced in v#1\tasks@date{#1}}}%
+}
+\renewrobustcmd*\changedversion[1]{%
+ \cnltx@version@note{updated in v#1\tasks@date{#1}}%
+}
+
+\newnote*\sincechanged[2]{%
+ introduced in v#1 and updated in v#2\tasks@date{#2}%
+}
+
+\RenewDocumentEnvironment{commands}{}
+ {%
+ \cnltx@set@catcode_{12}%
+ \let\command\cnltx@command
+ \cnltxlist
+ }
+ {\endcnltxlist}
+
+\RequirePackage{tcolorbox}
+\tcbuselibrary{skins,breakable}
+\tcbset{enhanced,enhanced jigsaw}
+
+\newtcolorbox{bewareofthedog}{
+ colback = red!2!white!98 ,
+ colframe = red ,
+ underlay={%
+ \path[draw=none]
+ (interior.south west)
+ rectangle node[red]{\Huge\bfseries !}
+ ([xshift=-4mm]interior.north west);
+ }%
+}
+
+\newtcolorbox{cnltxcode}[1][]{
+ boxrule = 1pt ,
+ colback = cnltxbg ,
+ colframe = cnltx ,
+ arc = 5pt ,
+ beforeafter skip = .5\baselineskip ,%
+ #1%
+}
+
+\newcommand*\tasks@readoptions[1]{%
+ \catcode`\^^M=13
+ \tasks@read@options{#1}%
+}
+
+\begingroup
+\catcode`\^^M=13
+\gdef\tasks@read@options#1#2^^M{%
+ \ifblank{#2}{}{\tasks@read@options@#2}%
+ #1%
+ \XSIMfilewritestart*{\jobname.tmp}%
+}%
+\endgroup
+
+\def\tasks@read@options@[#1]{\pgfqkeys{/cnltx}{#1}}
+
+\RenewDocumentEnvironment{sourcecode}{}
+ {%
+ \tasks@readoptions{%
+ \setlength\cnltx@sidebysidewidth
+ {\dimexpr .45\columnwidth -\lst@xleftmargin -\lst@xrightmargin\relax}%
+ \expanded{%
+ \noexpand\lstset{
+ style=cnltx,
+ \ifboolexpe{ bool {cnltx@sidebyside} and not bool {cnltx@codeonly} }
+ {linewidth=\cnltx@sidebysidewidth,}{}%
+ \expandonce\cnltx@local@listings@options
+ }%
+ }%
+ \XSIMgobblechars{2}%
+ }%
+ }
+ {%
+ \XSIMfilewritestop
+ \cnltxcode[breakable]%
+ \lstinputlisting[style=cnltx]{\jobname.tmp}%
+ \endcnltxcode
+ }
+
+\RenewDocumentEnvironment{example}{}
+ {%
+ \tasks@readoptions{%
+ \setlength\cnltx@sidebysidewidth
+ {\dimexpr .45\columnwidth -\lst@xleftmargin -\lst@xrightmargin\relax}%
+ \expanded{%
+ \noexpand\lstset{
+ style=cnltx,
+ \ifboolexpe{ bool {cnltx@sidebyside} and not bool {cnltx@codeonly} }
+ {linewidth=\cnltx@sidebysidewidth,}{}%
+ \expandonce\cnltx@local@listings@options
+ }%
+ }%
+ \XSIMgobblechars{2}%
+ }%
+ }
+ {%
+ \XSIMfilewritestop
+ \catcode`\^^M=5
+ \ifbool{cnltx@sidebyside}
+ {%
+ \cnltxcode
+ \noindent
+ \minipage[c]{\cnltx@sidebysidewidth}%
+ \cnltx@pre@source@hook
+ \lstinputlisting[style=cnltx] {\jobname.tmp}%
+ \cnltx@after@source@hook
+ \endminipage\hfill
+ \minipage[c]{\cnltx@sidebysidewidth}%
+ \cnltx@pre@example@hook
+ \input {\jobname.tmp}%
+ \cnltx@after@example@hook
+ \endminipage
+ }
+ {%
+ \cnltxcode[breakable]%
+ \cnltx@pre@source@hook
+ \lstinputlisting{\jobname.tmp}%
+ \cnltx@after@source@hook
+ \tcblower
+ \cnltx@pre@example@hook
+ \input {\jobname.tmp}%
+ \cnltx@after@example@hook
+ }%
+ \endcnltxcode
+ }
+
+\RequirePackage[
+ backend=biber,
+ style=cnltx,
+ sortlocale=en_US,
+ indexing=cite]{biblatex}
+\RequirePackage{csquotes,varioref}
+\defbibheading{bibliography}{\section{References}}
+\addbibresource{cnltx.bib}
+
+\RequirePackage[biblatex]{embrac}
+\ChangeEmph{[}[,.02em]{]}[.055em,-.08em]
+\ChangeEmph{(}[-.01em,.04em]{)}[.04em,-.05em]
+
+\tasks@add@version{2013-01-19}{0.7}
+\tasks@add@version{2013-04-04}{0.8a}
+\tasks@add@version{2013-04-07}{0.9}
+\tasks@add@version{2013-04-22}{0.9a}
+\tasks@add@version{2013-12-03}{0.9b}
+\tasks@add@version{2014-05-11}{0.9c}
+\tasks@add@version{2014-07-20}{0.10}
+\tasks@add@version{2014-07-29}{0.10a}
+\tasks@add@version{2016-05-03}{0.11}
+\tasks@add@version{2016-05-04}{0.11a}
+\tasks@add@version{2016-08-13}{0.12}
+\tasks@add@version{2016-08-16}{0.13}
+\tasks@add@version{2019-10-04}{1.0}
+\tasks@add@version{2019-10-05}{1.0a}
+\tasks@add@version{2019-10-06}{1.0b}
+\tasks@add@version{2019-10-07}{1.0c}
+\tasks@add@version{2019-10-08}{1.0d}
+\tasks@add@version{2019-11-03}{1.1}
+\tasks@add@version{2020-01-11}{1.1a}
+\tasks@add@version{2020-03-21}{1.2}
+\tasks@add@version{2020-04-19}{1.2a}
+\tasks@add@version{2020-08-19}{1.3}
+\tasks@add@version{2021-02-20}{1.3a}
+\tasks@add@version{2022-01-08}{1.4}
+\tasks@add@version{2022-01-08}{1.4a}
+
+\endinput
diff --git a/Master/texmf-dist/doc/latex/tasks/tasks-manual.pdf b/Master/texmf-dist/doc/latex/tasks/tasks-manual.pdf
index 04cb905ba99..d4d2860320a 100644
--- a/Master/texmf-dist/doc/latex/tasks/tasks-manual.pdf
+++ b/Master/texmf-dist/doc/latex/tasks/tasks-manual.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tasks/tasks-manual.tex b/Master/texmf-dist/doc/latex/tasks/tasks-manual.tex
index fa9628d79e6..ad424c2d21b 100644
--- a/Master/texmf-dist/doc/latex/tasks/tasks-manual.tex
+++ b/Master/texmf-dist/doc/latex/tasks/tasks-manual.tex
@@ -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
@@ -264,12 +264,12 @@ following ones that can be set using a setup command:
\keychoice{label-align}{left,right,center}\Default{left}
\sinceversion{0.7}Determines how the labels are aligned within the
label-box whose width is set with \option{label-width}.
- \keyval{before-skip}{skip}\Default{0pt}
- Sets the skip before the list.
- \keyval{after-skip}{skip}\Default{0pt}
- Sets the skip after the list.
- \keyval{after-item-skip}{skip}\Default{1ex plus 1ex minus 1ex}
- \sinceversion{0.9}This vertical skip is inserted between rows of items.
+ \keyval{before-skip}{skip}\Default{\cs*{topsep}}
+ \changedversion{1.4}Sets the skip before the list.
+ \keyval{after-skip}{skip}\Default{\cs*{topsep}}
+ \changedversion{1.4}Sets the skip after the list.
+ \keyval{after-item-skip}{skip}\Default{\cs*{itemsep}}
+ \changedversion{1.4}This vertical skip is inserted between rows of items.
\keybool{resume}\Default{false}
The enumeration will resume from a previous \env{tasks} environment. In
order to use this option properly you shouldn't mix different \env{tasks}
@@ -502,7 +502,7 @@ of their usage.
label-format : tokenlist ,
label-width : length = 1em ,
label-offset : length = .3333em ,
- after-item-skip : skip = 1ex plus 1ex minus 1ex
+ after-item-skip : skip = \itemsep
}
\end{sourcecode}
@@ -522,7 +522,6 @@ This is rather brief this time:
{ label = \arabic*. }
\end{sourcecode}
-\clearpage
\printbibliography
\end{document}
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/
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index f2e8d0c76cf..acf3688eb31 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -2272,6 +2272,7 @@ $standardtex
'tabto-generic','tabto.tex',
'tagpdf', '\.lua|' . $standardtex,
'tap', ,'tap.tex',
+ 'tasks', '\.(sty|cfg)$', # not tasks-manual.cls
'taylor', 'diagrams.tex',
'termmenu', '\.tex',
'termsim', '\.sty', # not ctxdoc-en.cls