summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-01-08 21:54:40 +0000
committerKarl Berry <karl@freefriends.org>2019-01-08 21:54:40 +0000
commitb405a4247e270ac2c19dff420c4dd88ad9bcd550 (patch)
treea5c44127158e0dc4fd2adfac886b0b8901b16c9a /Master
parent6cee10004a95f99a2b6746024a6f2833b79e2db4 (diff)
ducksay (8jan19)
git-svn-id: svn://tug.org/texlive/trunk@49644 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/ducksay/README.md2
-rw-r--r--Master/texmf-dist/doc/latex/ducksay/ducksay.pdfbin483471 -> 483844 bytes
-rw-r--r--Master/texmf-dist/source/latex/ducksay/ducksay.dtx61
-rw-r--r--Master/texmf-dist/tex/latex/ducksay/ducksay.animals.tex2
-rw-r--r--Master/texmf-dist/tex/latex/ducksay/ducksay.code.v1.tex2
-rw-r--r--Master/texmf-dist/tex/latex/ducksay/ducksay.code.v2.tex13
-rw-r--r--Master/texmf-dist/tex/latex/ducksay/ducksay.sty6
7 files changed, 55 insertions, 31 deletions
diff --git a/Master/texmf-dist/doc/latex/ducksay/README.md b/Master/texmf-dist/doc/latex/ducksay/README.md
index 01e4ad7eafb..b09e3d5fb2d 100644
--- a/Master/texmf-dist/doc/latex/ducksay/README.md
+++ b/Master/texmf-dist/doc/latex/ducksay/README.md
@@ -9,7 +9,7 @@ option) any later version. The latest version of this license is in the file:
This work is "maintained" (as per LPPL maintenance status) by
Jonathan P. Spratte.
-Copyright (C) 2017-2018 by Jonathan P. Spratte
+Copyright (C) 2017-2019 by Jonathan P. Spratte
The package draws ASCII art of animals saying a specified message. The following
macros are available:
diff --git a/Master/texmf-dist/doc/latex/ducksay/ducksay.pdf b/Master/texmf-dist/doc/latex/ducksay/ducksay.pdf
index a0b3608a414..940be196f80 100644
--- a/Master/texmf-dist/doc/latex/ducksay/ducksay.pdf
+++ b/Master/texmf-dist/doc/latex/ducksay/ducksay.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/ducksay/ducksay.dtx b/Master/texmf-dist/source/latex/ducksay/ducksay.dtx
index c92f13f5943..ec0e0cf52d2 100644
--- a/Master/texmf-dist/source/latex/ducksay/ducksay.dtx
+++ b/Master/texmf-dist/source/latex/ducksay/ducksay.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% File: ducksay.dtx Copyright (C) 2017-2018 Jonathan P. Spratte
+% File: ducksay.dtx Copyright (C) 2017-2019 Jonathan P. Spratte
%
% This work may be distributed and/or modified under the conditions of the
% LaTeX Project Public License (LPPL), either version 1.3c of this license or
@@ -27,7 +27,7 @@ Released under the LaTeX Project Public License v1.3c or later
See http://www.latex-project.org/lppl.txt
--------------------------------------------------------------
-Copyright (C) 2017-2018 Jonathan P. Spratte
+Copyright (C) 2017-2019 Jonathan P. Spratte
This work may be distributed and/or modified under the conditions of the
LaTeX Project Public License (LPPL), either version 1.3c of this license or
@@ -74,7 +74,7 @@ and the derived files ducksay.pdf
{%
\href{https://ctan.org/pkg/l3kernel}{\file{interface3.pdf}} and the
documentation of \href{https://ctan.org/pkg/xcoffins}{\pkg{xcoffins}} for
- information about coffin poles.%
+ information about coffin poles%
}
\usepackage{enumitem}
\newenvironment{options}[1][]
@@ -187,8 +187,8 @@ and the derived files ducksay.pdf
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{xparse,l3keys2e}
-\def\ducksay@version{2.2}
-\def\ducksay@date{2018-12-29}
+\def\ducksay@version{2.2.1}
+\def\ducksay@date{2019-01-08}
\ProvidesExplPackage
{ducksay} {\ducksay@date}
@@ -699,32 +699,35 @@ and the derived files ducksay.pdf
% \item[msg-align-c=\meta{token list}]
% set the \meta{token list} which is responsible to typeset the message
% centred if the option |msg-align=c| is used. It is used independent of the
-% |arg| key. For |arg=tab| and |arg=tab*| the macro \cs{arraybackslash}
-% provided by \pkg{array} is used afterwards. The package default is
-% |\centering|. It might be useful if you want to use \pkg{ragged2e}'s
-% \cs{Centering} for example.
+% |arg| key. For |arg=tab| and |arg=tab*| it is only used if a fixed width
+% is specified and the macro \cs{arraybackslash} provided by \pkg{array} is
+% used afterwards. The package default is |\centering|. It might be useful
+% if you want to use \pkg{ragged2e}'s \cs{Centering} for example.
% \item[msg-align-j=\meta{token list}]
% set the \meta{token list} which is responsible to typeset the message
% justified if the option |msg-align=j| is used. It is used independent of
-% the |arg| key. For |arg=tab| and |arg=tab*| the macro \cs{arraybackslash}
-% provided by \pkg{array} is used afterwards. The package default is
-% empty as justification is the default behaviour of contents of a |p|
-% column and of a \cs{vbox}. It might be useful if you want to use
-% \pkg{ragged2e}'s \cs{justifying} for example.
+% the |arg| key. For |arg=tab| and |arg=tab*| it is only used if a fixed
+% width is specified and the macro \cs{arraybackslash} provided by
+% \pkg{array} is used afterwards. The package default is empty as
+% justification is the default behaviour of contents of a |p| column and of
+% a \cs{vbox}. It might be useful if you want to use \pkg{ragged2e}'s
+% \cs{justifying} for example.
% \item[msg-align-l=\meta{token list}]
% set the \meta{token list} which is responsible to typeset the message
% flushed left if the option |msg-align=l| is used. It is used independent
-% of the |arg| key. For |arg=tab| and |arg=tab*| the macro
-% \cs{arraybackslash} provided by \pkg{array} is used afterwards. The
-% package default is |\raggedright|. It might be useful if you want to use
-% \pkg{ragged2e}'s \cs{RaggedRight} for example.
+% of the |arg| key. For |arg=tab| and |arg=tab*| it is only used if a fixed
+% width is specified and the macro \cs{arraybackslash} provided by
+% \pkg{array} is used afterwards. The package default is |\raggedright|. It
+% might be useful if you want to use \pkg{ragged2e}'s \cs{RaggedRight} for
+% example.
% \item[msg-align-r=\meta{token list}]
% set the \meta{token list} which is responsible to typeset the message
% flushed right if the option |msg-align=r| is used. It is used independent
-% of the |arg| key. For |arg=tab| and |arg=tab*| the macro
-% \cs{arraybackslash} provided by \pkg{array} is used afterwards. The
-% package default is |\raggedleft|. It might be useful if you want to use
-% \pkg{ragged2e}'s \cs{RaggedLeft} for example.
+% of the |arg| key. For |arg=tab| and |arg=tab*| it is only used if a fixed
+% width is specified and the macro \cs{arraybackslash} provided by
+% \pkg{array} is used afterwards. The package default is |\raggedleft|. It
+% might be useful if you want to use \pkg{ragged2e}'s \cs{RaggedLeft} for
+% example.
% \item[msg-to-bubble=\meta{pole}]
% defines the horizontal coffin \meta{pole} to be used as the reference
% point for the placement of the \anml\ beneath the \msg. See \PolesInfo.
@@ -936,6 +939,9 @@ and the derived files ducksay.pdf
\regex_const:Nn \c_ducksay_second_regex { \A(.[^\c{null}]*\c{null}\s*)\\ }
\regex_const:Nn \c_ducksay_third_regex {
\A(.[^\c{null}]*\c{null}[^\c{null}]*\c{null}\s*)\\ }
+% \end{macrocode}
+% And for \cs{AddColoredAnimal}
+% \begin{macrocode}
\regex_const:Nn \c_ducksay_textcolor_regex
{ \cO(?:\\textcolor\{(.*?)\}\{(.*?)\}) }
\regex_const:Nn \c_ducksay_color_delim_regex
@@ -1888,7 +1894,16 @@ and the derived files ducksay.pdf
% \begin{macrocode}
\NewDocumentCommand \ducksay_eat_argument_tabular_verb:w
{ >{ \ducksay_process_verb_newline:nnn { ~ } { ~ \par } } +v }
- { \ducksay_eat_argument_tabular_inner:w { \scantokens { #1 } } }
+ {
+ \ducksay_eat_argument_tabular_inner:w
+ {
+ \group_begin:
+ \tex_everyeof:D { \exp_not:N }
+ \exp_after:wN
+ \group_end:
+ \tex_scantokens:D { #1 }
+ }
+ }
% \end{macrocode}
% \end{macro}^^A<<<
%
diff --git a/Master/texmf-dist/tex/latex/ducksay/ducksay.animals.tex b/Master/texmf-dist/tex/latex/ducksay/ducksay.animals.tex
index 07c8bcbdb27..32f8df1aa2d 100644
--- a/Master/texmf-dist/tex/latex/ducksay/ducksay.animals.tex
+++ b/Master/texmf-dist/tex/latex/ducksay/ducksay.animals.tex
@@ -13,7 +13,7 @@
%% See http://www.latex-project.org/lppl.txt
%% --------------------------------------------------------------
%%
-%% Copyright (C) 2017-2018 Jonathan P. Spratte
+%% Copyright (C) 2017-2019 Jonathan P. Spratte
%%
%% This work may be distributed and/or modified under the conditions of the
%% LaTeX Project Public License (LPPL), either version 1.3c of this license or
diff --git a/Master/texmf-dist/tex/latex/ducksay/ducksay.code.v1.tex b/Master/texmf-dist/tex/latex/ducksay/ducksay.code.v1.tex
index c82246eef77..a5a1bab3414 100644
--- a/Master/texmf-dist/tex/latex/ducksay/ducksay.code.v1.tex
+++ b/Master/texmf-dist/tex/latex/ducksay/ducksay.code.v1.tex
@@ -13,7 +13,7 @@
%% See http://www.latex-project.org/lppl.txt
%% --------------------------------------------------------------
%%
-%% Copyright (C) 2017-2018 Jonathan P. Spratte
+%% Copyright (C) 2017-2019 Jonathan P. Spratte
%%
%% This work may be distributed and/or modified under the conditions of the
%% LaTeX Project Public License (LPPL), either version 1.3c of this license or
diff --git a/Master/texmf-dist/tex/latex/ducksay/ducksay.code.v2.tex b/Master/texmf-dist/tex/latex/ducksay/ducksay.code.v2.tex
index 66d11218951..fbd1143b637 100644
--- a/Master/texmf-dist/tex/latex/ducksay/ducksay.code.v2.tex
+++ b/Master/texmf-dist/tex/latex/ducksay/ducksay.code.v2.tex
@@ -13,7 +13,7 @@
%% See http://www.latex-project.org/lppl.txt
%% --------------------------------------------------------------
%%
-%% Copyright (C) 2017-2018 Jonathan P. Spratte
+%% Copyright (C) 2017-2019 Jonathan P. Spratte
%%
%% This work may be distributed and/or modified under the conditions of the
%% LaTeX Project Public License (LPPL), either version 1.3c of this license or
@@ -446,7 +446,16 @@
}
\NewDocumentCommand \ducksay_eat_argument_tabular_verb:w
{ >{ \ducksay_process_verb_newline:nnn { ~ } { ~ \par } } +v }
- { \ducksay_eat_argument_tabular_inner:w { \scantokens { #1 } } }
+ {
+ \ducksay_eat_argument_tabular_inner:w
+ {
+ \group_begin:
+ \tex_everyeof:D { \exp_not:N }
+ \exp_after:wN
+ \group_end:
+ \tex_scantokens:D { #1 }
+ }
+ }
\NewDocumentCommand \ducksay_eat_argument_tabular_normal:w { +m }
{ \ducksay_eat_argument_tabular_inner:w { #1 } }
\cs_new_protected_nopar:Npn \ducksay_eat_argument_hbox:w
diff --git a/Master/texmf-dist/tex/latex/ducksay/ducksay.sty b/Master/texmf-dist/tex/latex/ducksay/ducksay.sty
index 2689e0c5e05..6d140038d95 100644
--- a/Master/texmf-dist/tex/latex/ducksay/ducksay.sty
+++ b/Master/texmf-dist/tex/latex/ducksay/ducksay.sty
@@ -13,7 +13,7 @@
%% See http://www.latex-project.org/lppl.txt
%% --------------------------------------------------------------
%%
-%% Copyright (C) 2017-2018 Jonathan P. Spratte
+%% Copyright (C) 2017-2019 Jonathan P. Spratte
%%
%% This work may be distributed and/or modified under the conditions of the
%% LaTeX Project Public License (LPPL), either version 1.3c of this license or
@@ -35,8 +35,8 @@
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{xparse,l3keys2e}
-\def\ducksay@version{2.2}
-\def\ducksay@date{2018-12-29}
+\def\ducksay@version{2.2.1}
+\def\ducksay@date{2019-01-08}
\ProvidesExplPackage
{ducksay} {\ducksay@date}