summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/ducksay
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-10-19 20:36:50 +0000
committerKarl Berry <karl@freefriends.org>2018-10-19 20:36:50 +0000
commit501acd92a2153c7e76f9b5a42fafaa2b3a8370e5 (patch)
treee2a64ddc5fe78dff3936857e655d68dfcf85eb5d /Master/texmf-dist/tex/latex/ducksay
parent79b7f347d9c17447350d01f051b2cd30e09ee510 (diff)
ducksay (19oct18)
git-svn-id: svn://tug.org/texlive/trunk@48946 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/ducksay')
-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
4 files changed, 21 insertions, 43 deletions
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}