summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Master/texmf-dist/doc/latex/ducksay/README.md10
-rw-r--r--Master/texmf-dist/doc/latex/ducksay/ducksay.pdfbin483002 -> 483609 bytes
-rw-r--r--Master/texmf-dist/source/latex/ducksay/ducksay.dtx86
-rw-r--r--Master/texmf-dist/tex/latex/ducksay/ducksay.animals.tex5
-rw-r--r--Master/texmf-dist/tex/latex/ducksay/ducksay.code.v1.tex5
-rw-r--r--Master/texmf-dist/tex/latex/ducksay/ducksay.code.v2.tex45
-rw-r--r--Master/texmf-dist/tex/latex/ducksay/ducksay.sty9
7 files changed, 65 insertions, 95 deletions
diff --git a/Master/texmf-dist/doc/latex/ducksay/README.md b/Master/texmf-dist/doc/latex/ducksay/README.md
index b498e2762d8..01e4ad7eafb 100644
--- a/Master/texmf-dist/doc/latex/ducksay/README.md
+++ b/Master/texmf-dist/doc/latex/ducksay/README.md
@@ -1,7 +1,13 @@
ducksay: cowsay for LaTeX
-This package is distributed under the terms of GPLv3 or later, or the LPPL 1.3c
-or later, which ever license fits your needs the best.
+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 (at your
+option) any later version. The latest version of this license is in the file:
+
+ http://www.latex-project.org/lppl.txt
+
+This work is "maintained" (as per LPPL maintenance status) by
+ Jonathan P. Spratte.
Copyright (C) 2017-2018 by Jonathan P. Spratte
diff --git a/Master/texmf-dist/doc/latex/ducksay/ducksay.pdf b/Master/texmf-dist/doc/latex/ducksay/ducksay.pdf
index cefc599336e..1adb1df4383 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 92de1ce5d73..c1b82e7bda1 100644
--- a/Master/texmf-dist/source/latex/ducksay/ducksay.dtx
+++ b/Master/texmf-dist/source/latex/ducksay/ducksay.dtx
@@ -9,11 +9,6 @@
%
% http://www.latex-project.org/lppl.txt
%
-% Alternatively you can use this work under the terms of the GNU General Public
-% Licensce (GPL), version 3 or later, except that you might not redistribute it
-% under the same name if you change its functionality. Choose which of these
-% licenses fits your needs the best.
-%
% ------------------------------------------------------------------------------
%
%<*driver>^^A>>>
@@ -41,11 +36,6 @@ the file:
http://www.latex-project.org/lppl.txt
-Alternatively you can use this work under the terms of the GNU General Public
-Licensce (GPL), version 3 or later, except that you might not redistribute it
-under the same name if you change its functionality. Choose which of these
-licenses fits your needs the best.
-
This work is "maintained" (as per LPPL maintenance status) by
Jonathan P. Spratte.
@@ -197,8 +187,8 @@ and the derived files ducksay.pdf
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{xparse,l3keys2e}
-\def\ducksay@version{2.0}
-\def\ducksay@date{2018/09/21}
+\def\ducksay@version{2.1}
+\def\ducksay@date{2018/10/19}
\ProvidesExplPackage
{ducksay} {\ducksay@date}
@@ -404,7 +394,7 @@ and the derived files ducksay.pdf
%
% This version is included for legacy support (old documents should behave the
% same without any change to them -- except the usage of |version=1| as an
-% option. For the bleeding edge version of \pkg{ducksay} skip this subsection
+% option). For the bleeding edge version of \pkg{ducksay} skip this subsection
% and read \autoref{sec:v2}.
%
% \subsubsection{Macros}\label{sec:macros1}^^A>>>
@@ -647,7 +637,7 @@ and the derived files ducksay.pdf
% the left delimiters used to fill the gap if more than two lines of
% delimiters are needed. Package default is \verb+|+.
% \item[bubble-delim-left-4=\meta{token list}]
-% the lower most left delimiters used if more than one line of delimiters is
+% the lower most left delimiter used if more than one line of delimiters is
% needed. Package default is |\|.
% \item[bubble-delim-right-1=\meta{token list}]
% the right delimiter used if only one line of delimiters is needed. Package
@@ -659,7 +649,7 @@ and the derived files ducksay.pdf
% the right delimiters used to fill the gap if more than two lines of
% delimiters are needed. Package default is \verb+|+.
% \item[bubble-delim-right-4=\meta{token list}]
-% the lower most right delimiters used if more than one line of delimiters
+% the lower most right delimiter used if more than one line of delimiters
% is needed. Package default is |/|.
% \item[bubble-delim-top=\meta{token list}]
% the delimiter used to create the top and bottom border of the bubble. The
@@ -756,6 +746,9 @@ and the derived files ducksay.pdf
% \item[out-y=\meta{dimen}]
% specifies an additional vertical offset of the print out of the complete
% result of \cs{ducksay} and \cs{duckthink}
+% \item[strip-spaces=\meta{bool}]
+% if set |true| leading and trailing spaces are stripped from the \msg\ if
+% |arg=box| is used. Initially this is set to |false|.
% \item[t]
% shortcut for |out-v=t|.
% \item[vpad=\meta{count}]
@@ -798,7 +791,8 @@ and the derived files ducksay.pdf
% }%
% }
% The package depends on the two packages \pkg{xparse} and \pkg{l3keys2e}
-% and all of their dependencies. Version 2 additionally depends on \pkg{array}.
+% and all of their dependencies. Version 2 additionally depends on \pkg{array}
+% and \pkg{grabbox}.
%^^A<<<
%
% \subsection{Available Animals}\label{sec:animals}^^A>>>
@@ -859,11 +853,15 @@ and the derived files ducksay.pdf
% \rlap
% {%
% \tiny
-% \ducksay[squirrel,MSG=\footnotesize,align=t]{I'd choose WTFPL}%
+% \ducksay[squirrel,MSG=\footnotesize,align=t]
+% {WTFPL would be a\\better license.}%
% }%
% }
-% This package is distributed under the terms of the GPLv3 or later, or the LPPL
-% 1.3c or later, choose which ever license fits your needs the best.
+% 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 (at your option) any later version. The latest version of this license is
+% in the file:
+% \url{http://www.latex-project.org/lppl.txt}
%
% The package is hosted on \url{https://github.com/Skillmon/ltx_ducksay}, you
% might report bugs there.
@@ -1362,7 +1360,7 @@ and the derived files ducksay.pdf
%
% Load the additional dependencies of version 2.
% \begin{macrocode}
-\RequirePackage{array}
+\RequirePackage{array,grabbox}
% \end{macrocode}
%
% \subsubsection{Messages}^^A>>>
@@ -1521,6 +1519,7 @@ and the derived files ducksay.pdf
,bubble-delim-right-2 .initial:n = \c_backslash_str
,bubble-delim-right-3 .initial:n = |
,bubble-delim-right-4 .initial:n = /
+ ,strip-spaces .bool_set:N = \l_ducksay_msg_strip_spaces_bool
}
% \end{macrocode}
%
@@ -1903,19 +1902,10 @@ and the derived files ducksay.pdf
% \begin{macrocode}
\cs_new_protected_nopar:Npn \ducksay_eat_argument_hbox:w
{
- \afterassignment \ducksay_eat_argument_hbox_inner:w
- \let \l_ducksay_nothing =
- }
-% \end{macrocode}
-% \end{macro}^^A<<<
-%
-% \begin{macro}{\ducksay_eat_argument_hbox_inner:w}^^A>>>
-% \begin{macrocode}
-\cs_new_protected_nopar:Npn \ducksay_eat_argument_hbox_inner:w
- {
- \setbox \l_ducksay_msg_box \hbox \c_group_begin_token
- \group_insert_after:N \ducksay_shipout:
- \l_ducksay_msg_fount_tl
+ \bool_if:NTF \l_ducksay_msg_strip_spaces_bool
+ { \grabbox }
+ { \grabbox* }
+ \l_ducksay_msg_box [ \l_ducksay_msg_fount_tl ] \hbox \ducksay_shipout:
}
% \end{macrocode}
% \end{macro}^^A<<<
@@ -1925,23 +1915,19 @@ and the derived files ducksay.pdf
\cs_new_protected_nopar:Npn \ducksay_eat_argument_vbox:w
{
\ducksay_evaluate_message_alignment_fixed_width_vbox:
- \afterassignment \ducksay_eat_argument_vbox_inner:w
- \let \l_ducksay_nothing =
- }
-% \end{macrocode}
-% \end{macro}^^A<<<
-%
-% \begin{macro}{\ducksay_eat_argument_vbox_inner:w}^^A>>>
-% \begin{macrocode}
-\cs_new_protected_nopar:Npn \ducksay_eat_argument_vbox_inner:w
- {
- \setbox \l_ducksay_msg_box \vbox \c_group_begin_token
- \hsize \l_ducksay_msg_width_dim
- \group_insert_after:N \ducksay_shipout:
- \l_ducksay_msg_fount_tl
- \l_ducksay_msg_align_vbox_tl
- \@afterindentfalse
- \@afterheading
+ \bool_if:NTF \l_ducksay_msg_strip_spaces_bool
+ { \grabbox }
+ { \grabbox* }
+ \l_ducksay_msg_box
+ [
+ \hsize \l_ducksay_msg_width_dim
+ \linewidth \hsize
+ \l_ducksay_msg_fount_tl
+ \l_ducksay_msg_align_vbox_tl
+ \@afterindentfalse
+ \@afterheading
+ ]
+ \vbox \ducksay_shipout:
}
% \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 ce5cc6cbdb1..07c8bcbdb27 100644
--- a/Master/texmf-dist/tex/latex/ducksay/ducksay.animals.tex
+++ b/Master/texmf-dist/tex/latex/ducksay/ducksay.animals.tex
@@ -22,11 +22,6 @@
%%
%% http://www.latex-project.org/lppl.txt
%%
-%% Alternatively you can use this work under the terms of the GNU General Public
-%% Licensce (GPL), version 3 or later, except that you might not redistribute it
-%% under the same name if you change its functionality. Choose which of these
-%% licenses fits your needs the best.
-%%
%% This work is "maintained" (as per LPPL maintenance status) by
%% Jonathan P. Spratte.
%%
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 b34e6d42784..c82246eef77 100644
--- a/Master/texmf-dist/tex/latex/ducksay/ducksay.code.v1.tex
+++ b/Master/texmf-dist/tex/latex/ducksay/ducksay.code.v1.tex
@@ -22,11 +22,6 @@
%%
%% http://www.latex-project.org/lppl.txt
%%
-%% Alternatively you can use this work under the terms of the GNU General Public
-%% Licensce (GPL), version 3 or later, except that you might not redistribute it
-%% under the same name if you change its functionality. Choose which of these
-%% licenses fits your needs the best.
-%%
%% This work is "maintained" (as per LPPL maintenance status) by
%% Jonathan P. Spratte.
%%
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 df1e7f870b2..44cd4a1c4b7 100644
--- a/Master/texmf-dist/tex/latex/ducksay/ducksay.code.v2.tex
+++ b/Master/texmf-dist/tex/latex/ducksay/ducksay.code.v2.tex
@@ -22,11 +22,6 @@
%%
%% http://www.latex-project.org/lppl.txt
%%
-%% Alternatively you can use this work under the terms of the GNU General Public
-%% Licensce (GPL), version 3 or later, except that you might not redistribute it
-%% under the same name if you change its functionality. Choose which of these
-%% licenses fits your needs the best.
-%%
%% This work is "maintained" (as per LPPL maintenance status) by
%% Jonathan P. Spratte.
%%
@@ -37,7 +32,7 @@
%% ducksay.code.v2.tex and
%% ducksay.animals.tex.
%%
-\RequirePackage{array}
+\RequirePackage{array,grabbox}
\msg_new:nnn { ducksay } { justify~unavailable }
{
Justified~content~is~not~available~for~tabular~argument~mode~without~fixed~
@@ -162,6 +157,7 @@
,bubble-delim-right-2 .initial:n = \c_backslash_str
,bubble-delim-right-3 .initial:n = |
,bubble-delim-right-4 .initial:n = /
+ ,strip-spaces .bool_set:N = \l_ducksay_msg_strip_spaces_bool
}
\cs_new:Npn \ducksay_evaluate_message_alignment_fixed_width_tabular:
{
@@ -459,30 +455,27 @@
{ \ducksay_eat_argument_tabular_inner:w { #1 } }
\cs_new_protected_nopar:Npn \ducksay_eat_argument_hbox:w
{
- \afterassignment \ducksay_eat_argument_hbox_inner:w
- \let \l_ducksay_nothing =
- }
-\cs_new_protected_nopar:Npn \ducksay_eat_argument_hbox_inner:w
- {
- \setbox \l_ducksay_msg_box \hbox \c_group_begin_token
- \group_insert_after:N \ducksay_shipout:
- \l_ducksay_msg_fount_tl
+ \bool_if:NTF \l_ducksay_msg_strip_spaces_bool
+ { \grabbox }
+ { \grabbox* }
+ \l_ducksay_msg_box [ \l_ducksay_msg_fount_tl ] \hbox \ducksay_shipout:
}
\cs_new_protected_nopar:Npn \ducksay_eat_argument_vbox:w
{
\ducksay_evaluate_message_alignment_fixed_width_vbox:
- \afterassignment \ducksay_eat_argument_vbox_inner:w
- \let \l_ducksay_nothing =
- }
-\cs_new_protected_nopar:Npn \ducksay_eat_argument_vbox_inner:w
- {
- \setbox \l_ducksay_msg_box \vbox \c_group_begin_token
- \hsize \l_ducksay_msg_width_dim
- \group_insert_after:N \ducksay_shipout:
- \l_ducksay_msg_fount_tl
- \l_ducksay_msg_align_vbox_tl
- \@afterindentfalse
- \@afterheading
+ \bool_if:NTF \l_ducksay_msg_strip_spaces_bool
+ { \grabbox }
+ { \grabbox* }
+ \l_ducksay_msg_box
+ [
+ \hsize \l_ducksay_msg_width_dim
+ \linewidth \hsize
+ \l_ducksay_msg_fount_tl
+ \l_ducksay_msg_align_vbox_tl
+ \@afterindentfalse
+ \@afterheading
+ ]
+ \vbox \ducksay_shipout:
}
\cs_generate_variant:Nn \coffin_join:NnnNnnnn { NVnNVnnn }
\cs_generate_variant:Nn \coffin_attach:NnnNnnnn { NVnNVnnn }
diff --git a/Master/texmf-dist/tex/latex/ducksay/ducksay.sty b/Master/texmf-dist/tex/latex/ducksay/ducksay.sty
index b966fad7e29..eb37d4258a1 100644
--- a/Master/texmf-dist/tex/latex/ducksay/ducksay.sty
+++ b/Master/texmf-dist/tex/latex/ducksay/ducksay.sty
@@ -22,11 +22,6 @@
%%
%% http://www.latex-project.org/lppl.txt
%%
-%% Alternatively you can use this work under the terms of the GNU General Public
-%% Licensce (GPL), version 3 or later, except that you might not redistribute it
-%% under the same name if you change its functionality. Choose which of these
-%% licenses fits your needs the best.
-%%
%% This work is "maintained" (as per LPPL maintenance status) by
%% Jonathan P. Spratte.
%%
@@ -40,8 +35,8 @@
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{xparse,l3keys2e}
-\def\ducksay@version{2.0}
-\def\ducksay@date{2018/09/21}
+\def\ducksay@version{2.1}
+\def\ducksay@date{2018/10/19}
\ProvidesExplPackage
{ducksay} {\ducksay@date}
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-15 09:53:43 +0000