texlive[49545] Master/texmf-dist: ducksay (30dec18)

commits+karl at tug.org commits+karl at tug.org
Sun Dec 30 23:12:45 CET 2018


Revision: 49545
          http://tug.org/svn/texlive?view=revision&revision=49545
Author:   karl
Date:     2018-12-30 23:12:44 +0100 (Sun, 30 Dec 2018)
Log Message:
-----------
ducksay (30dec18)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/latex/ducksay/ducksay.pdf
    trunk/Master/texmf-dist/source/latex/ducksay/ducksay.dtx
    trunk/Master/texmf-dist/tex/latex/ducksay/ducksay.code.v2.tex
    trunk/Master/texmf-dist/tex/latex/ducksay/ducksay.sty

Removed Paths:
-------------
    trunk/Master/texmf-dist/doc/latex/ducksay/ducksay.hd

Deleted: trunk/Master/texmf-dist/doc/latex/ducksay/ducksay.hd
===================================================================
Modified: trunk/Master/texmf-dist/doc/latex/ducksay/ducksay.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/source/latex/ducksay/ducksay.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/ducksay/ducksay.dtx	2018-12-30 22:12:20 UTC (rev 49544)
+++ trunk/Master/texmf-dist/source/latex/ducksay/ducksay.dtx	2018-12-30 22:12:44 UTC (rev 49545)
@@ -187,8 +187,8 @@
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{xparse,l3keys2e}
 
-\def\ducksay at version{2.1}
-\def\ducksay at date{2018/10/19}
+\def\ducksay at version{2.2}
+\def\ducksay at date{2018-12-29}
 
 \ProvidesExplPackage
   {ducksay}           {\ducksay at date}
@@ -571,8 +571,8 @@
 %         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 @@
 %
 % \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 @@
           {
             >
             {
-              \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 @@
 \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 @@
     \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 @@
         \@afterindentfalse
         \@afterheading
       ]
+      \l_ducksay_msg_box
       \vbox \ducksay_shipout:
   }
 %    \end{macrocode}

Modified: trunk/Master/texmf-dist/tex/latex/ducksay/ducksay.code.v2.tex
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ducksay/ducksay.code.v2.tex	2018-12-30 22:12:20 UTC (rev 49544)
+++ trunk/Master/texmf-dist/tex/latex/ducksay/ducksay.code.v2.tex	2018-12-30 22:12:44 UTC (rev 49545)
@@ -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 }

Modified: trunk/Master/texmf-dist/tex/latex/ducksay/ducksay.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ducksay/ducksay.sty	2018-12-30 22:12:20 UTC (rev 49544)
+++ trunk/Master/texmf-dist/tex/latex/ducksay/ducksay.sty	2018-12-30 22:12:44 UTC (rev 49545)
@@ -35,8 +35,8 @@
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{xparse,l3keys2e}
 
-\def\ducksay at version{2.1}
-\def\ducksay at date{2018/10/19}
+\def\ducksay at version{2.2}
+\def\ducksay at date{2018-12-29}
 
 \ProvidesExplPackage
   {ducksay}           {\ducksay at date}



More information about the tex-live-commits mailing list