From 61a2a6ffbaec59293a035c37c5bbfd42e3728b4b Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 29 Sep 2019 21:14:08 +0000 Subject: gatherenum (29sep19) git-svn-id: svn://tug.org/texlive/trunk@52209 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/gatherenum/LICENSE | 4 ++-- .../texmf-dist/doc/latex/gatherenum/gatherenum.pdf | Bin 411566 -> 393834 bytes .../source/latex/gatherenum/gatherenum.dtx | 14 +++++++------- .../texmf-dist/tex/latex/gatherenum/gatherenum.sty | 14 +++++++------- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Master/texmf-dist/doc/latex/gatherenum/LICENSE b/Master/texmf-dist/doc/latex/gatherenum/LICENSE index add821a62d2..561f558bee5 100644 --- a/Master/texmf-dist/doc/latex/gatherenum/LICENSE +++ b/Master/texmf-dist/doc/latex/gatherenum/LICENSE @@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. gatherenum - Copyright (C) 2018 RIVAUD Julien + Copyright (C) 2018-2019 RIVAUD Julien This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - gatherenum Copyright (C) 2018 RIVAUD Julien + gatherenum Copyright (C) 2018-2019 RIVAUD Julien This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/Master/texmf-dist/doc/latex/gatherenum/gatherenum.pdf b/Master/texmf-dist/doc/latex/gatherenum/gatherenum.pdf index 17e0975646d..f7de42134f1 100644 Binary files a/Master/texmf-dist/doc/latex/gatherenum/gatherenum.pdf and b/Master/texmf-dist/doc/latex/gatherenum/gatherenum.pdf differ diff --git a/Master/texmf-dist/source/latex/gatherenum/gatherenum.dtx b/Master/texmf-dist/source/latex/gatherenum/gatherenum.dtx index dec13ca1abd..80247541515 100644 --- a/Master/texmf-dist/source/latex/gatherenum/gatherenum.dtx +++ b/Master/texmf-dist/source/latex/gatherenum/gatherenum.dtx @@ -1,7 +1,7 @@ % \iffalse meta-comment % vim: tw=80 spl=en % -%% File: gatherenum.dtx (C) Copyright 2016-2018 RIVAUD Julien +%% File: gatherenum.dtx (C) Copyright 2016-2019 RIVAUD Julien %% %% It may be distributed and/or modified under the conditions of the %% General Public License (GPL), either version 3 of this @@ -11,11 +11,11 @@ % The version of expl3 required is tested as early as possible, as % some really old versions do not define \ProvidesExplPackage. \NeedsTeXFormat{LaTeX2e}[1995/12/01] -\RequirePackage{expl3}[2016/01/19] +\RequirePackage{expl3}[2018/06/19] \def\ExplFileName{gatherenum} \def\ExplFileDescription{Crossover between align* and enumerate} -\def\ExplFileDate{2018/06/19} -\def\ExplFileVersion{1.7} +\def\ExplFileDate{2019/09/29} +\def\ExplFileVersion{1.8} % %<*driver> \documentclass[full]{l3doc} @@ -261,7 +261,7 @@ % boxed. % \begin{macrocode} \penalty \predisplaypenalty - \begin{gatherenum}[ + \gatherenum[ itemjoin=\skip_horizontal:n{1em plus 1fil}, #1, mode=boxed, @@ -279,11 +279,11 @@ % less strict on widows and clubs than normal. % \begin{macrocode} \clist_if_in:nnTF { #1 } { gathered } { - \end{gatherenum} + \endgatherenum \unskip \int_set_eq:NN \clubpenalty \interlinepenalty \int_set_eq:NN \widowpenalty \interlinepenalty - \par + \use:c{@ @ par}% avoid l3docstrip replacement of @ }{ \@@_save_endenumerate:w } diff --git a/Master/texmf-dist/tex/latex/gatherenum/gatherenum.sty b/Master/texmf-dist/tex/latex/gatherenum/gatherenum.sty index 80f2ef139c4..4e8e7b65c59 100644 --- a/Master/texmf-dist/tex/latex/gatherenum/gatherenum.sty +++ b/Master/texmf-dist/tex/latex/gatherenum/gatherenum.sty @@ -6,17 +6,17 @@ %% %% gatherenum.dtx (with options: `package') %% -%% File: gatherenum.dtx (C) Copyright 2016-2018 RIVAUD Julien +%% File: gatherenum.dtx (C) Copyright 2016-2019 RIVAUD Julien %% %% It may be distributed and/or modified under the conditions of the %% General Public License (GPL), either version 3 of this %% license or (at your option) any later version. \NeedsTeXFormat{LaTeX2e}[1995/12/01] -\RequirePackage{expl3}[2016/01/19] +\RequirePackage{expl3}[2018/06/19] \def\ExplFileName{gatherenum} \def\ExplFileDescription{Crossover between align* and enumerate} -\def\ExplFileDate{2018/06/19} -\def\ExplFileVersion{1.7} +\def\ExplFileDate{2019/09/29} +\def\ExplFileVersion{1.8} \ProvidesExplPackage {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} \RequirePackage{enumitem} @@ -44,7 +44,7 @@ \centering \int_set_eq:NN \enitdp@gatherenum \enitdp@enumerate \penalty \predisplaypenalty - \begin{gatherenum}[ + \gatherenum[ itemjoin=\skip_horizontal:n{1em plus 1fil}, #1, mode=boxed, @@ -56,11 +56,11 @@ } }{ \clist_if_in:nnTF { #1 } { gathered } { - \end{gatherenum} + \endgatherenum \unskip \int_set_eq:NN \clubpenalty \interlinepenalty \int_set_eq:NN \widowpenalty \interlinepenalty - \par + \use:c{@ @ par}% avoid l3docstrip replacement of @ }{ \__gatherenum_save_endenumerate:w } -- cgit v1.2.3