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 --- Master/texmf-dist/source/latex/ducksay/ducksay.dtx | 43 +++++++++++----------- 1 file changed, 22 insertions(+), 21 deletions(-) (limited to 'Master/texmf-dist/source') diff --git a/Master/texmf-dist/source/latex/ducksay/ducksay.dtx b/Master/texmf-dist/source/latex/ducksay/ducksay.dtx index c1b82e7bda1..c92f13f5943 100644 --- a/Master/texmf-dist/source/latex/ducksay/ducksay.dtx +++ b/Master/texmf-dist/source/latex/ducksay/ducksay.dtx @@ -187,8 +187,8 @@ and the derived files ducksay.pdf \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} @@ -571,8 +571,8 @@ and the derived files ducksay.pdf % the argument is read in either as a \cs{hbox} or a \cs{vbox} (the % latter if a fixed width is specified with either |wd| or |wd*|). Note % that in this mode any arguments relying on category code changes like -% e.g.\@ \cs{verb} will work (provided that you don't use \cs{ducksay} or -% \cs{duckthink} inside of an argument of another macro of course). +% e.g.\@ \cs{verb} will work (provided that you don't use \cs{ducksay} +% or \cs{duckthink} inside of an argument of another macro of course). % \item[tab] % the argument is read in as the contents of a \env{tabular}. Note that % in this mode any arguments relying on category code changes like @@ -1529,6 +1529,21 @@ and the derived files ducksay.pdf % % \paragraph{Internal}^^A>>> % +% \begin{macro}{\ducksay_evaluate_message_alignment_fixed_width_common:}^^A>>> +% \begin{macrocode} +\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 } + } + } +% \end{macrocode} +% \end{macro}^^A<<< +% % \begin{macro}{\ducksay_evaluate_message_alignment_fixed_width_tabular:}^^A>>> % \begin{macrocode} \cs_new:Npn \ducksay_evaluate_message_alignment_fixed_width_tabular: @@ -1539,13 +1554,7 @@ and the derived files ducksay.pdf { > { - \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 } @@ -1560,15 +1569,7 @@ and the derived files ducksay.pdf \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: } } % \end{macrocode} % \end{macro}^^A<<< @@ -1918,7 +1919,6 @@ and the derived files ducksay.pdf \bool_if:NTF \l_ducksay_msg_strip_spaces_bool { \grabbox } { \grabbox* } - \l_ducksay_msg_box [ \hsize \l_ducksay_msg_width_dim \linewidth \hsize @@ -1927,6 +1927,7 @@ and the derived files ducksay.pdf \@afterindentfalse \@afterheading ] + \l_ducksay_msg_box \vbox \ducksay_shipout: } % \end{macrocode} -- cgit v1.2.3