From fd0e6a66494a3aa9c7e6c66896ba52e83550804e Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 30 Dec 2018 22:12:44 +0000 Subject: ducksay (30dec18) git-svn-id: svn://tug.org/texlive/trunk@49545 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/ducksay/ducksay.code.v2.tex | 30 ++++++++++------------ Master/texmf-dist/tex/latex/ducksay/ducksay.sty | 4 +-- 2 files changed, 15 insertions(+), 19 deletions(-) (limited to 'Master/texmf-dist/tex/latex/ducksay') 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 44cd4a1c4b7..66d11218951 100644 --- a/Master/texmf-dist/tex/latex/ducksay/ducksay.code.v2.tex +++ b/Master/texmf-dist/tex/latex/ducksay/ducksay.code.v2.tex @@ -159,6 +159,16 @@ ,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_common: + { + \str_case:Vn \l_ducksay_msg_align_tl + { + { l } { \exp_not:N \l_ducksay_msg_align_l_tl } + { c } { \exp_not:N \l_ducksay_msg_align_c_tl } + { r } { \exp_not:N \l_ducksay_msg_align_r_tl } + { j } { \exp_not:N \l_ducksay_msg_align_j_tl } + } + } \cs_new:Npn \ducksay_evaluate_message_alignment_fixed_width_tabular: { \tl_if_empty:NT \l_ducksay_msg_tabular_column_tl @@ -167,13 +177,7 @@ { > { - \str_case:Vn \l_ducksay_msg_align_tl - { - { l } { \exp_not:N \l_ducksay_msg_align_l_tl } - { c } { \exp_not:N \l_ducksay_msg_align_c_tl } - { r } { \exp_not:N \l_ducksay_msg_align_r_tl } - { j } { \exp_not:N \l_ducksay_msg_align_j_tl } - } + \ducksay_evaluate_message_alignment_fixed_width_common: \exp_not:N \arraybackslash } p { \exp_not:N \l_ducksay_msg_width_dim } @@ -183,15 +187,7 @@ \cs_new:Npn \ducksay_evaluate_message_alignment_fixed_width_vbox: { \tl_set:Nx \l_ducksay_msg_align_vbox_tl - { - \str_case:Vn \l_ducksay_msg_align_tl - { - { l } { \exp_not:N \l_ducksay_msg_align_l_tl } - { c } { \exp_not:N \l_ducksay_msg_align_c_tl } - { r } { \exp_not:N \l_ducksay_msg_align_r_tl } - { j } { \exp_not:N \l_ducksay_msg_align_j_tl } - } - } + { \ducksay_evaluate_message_alignment_fixed_width_common: } } \cs_new:Npn \ducksay_calculate_msg_width_from_int: { @@ -466,7 +462,6 @@ \bool_if:NTF \l_ducksay_msg_strip_spaces_bool { \grabbox } { \grabbox* } - \l_ducksay_msg_box [ \hsize \l_ducksay_msg_width_dim \linewidth \hsize @@ -475,6 +470,7 @@ \@afterindentfalse \@afterheading ] + \l_ducksay_msg_box \vbox \ducksay_shipout: } \cs_generate_variant:Nn \coffin_join:NnnNnnnn { NVnNVnnn } diff --git a/Master/texmf-dist/tex/latex/ducksay/ducksay.sty b/Master/texmf-dist/tex/latex/ducksay/ducksay.sty index eb37d4258a1..2689e0c5e05 100644 --- a/Master/texmf-dist/tex/latex/ducksay/ducksay.sty +++ b/Master/texmf-dist/tex/latex/ducksay/ducksay.sty @@ -35,8 +35,8 @@ \NeedsTeXFormat{LaTeX2e} \RequirePackage{xparse,l3keys2e} -\def\ducksay@version{2.1} -\def\ducksay@date{2018/10/19} +\def\ducksay@version{2.2} +\def\ducksay@date{2018-12-29} \ProvidesExplPackage {ducksay} {\ducksay@date} -- cgit v1.2.3