ducksay (30dec18)

git-svn-id: svn://tug.org/texlive/trunk@49545 c570f23f-e606-0410-a88d-b1316a301751

5 files changed, 37 insertions, 40 deletions

diff --git a/Master/texmf-dist/doc/latex/ducksay/ducksay.hd b/Master/texmf-dist/doc/latex/ducksay/ducksay.hd
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/Master/texmf-dist/doc/latex/ducksay/ducksay.hd
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/ducksay/ducksay.pdf b/Master/texmf-dist/doc/latex/ducksay/ducksay.pdf
index 1adb1df4383..a0b3608a414 100644
--- a/Master/texmf-dist/doc/latex/ducksay/ducksay.pdf
+++ b/Master/texmf-dist/doc/latex/ducksay/ducksay.pdf
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}
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}