texlive[64058] Master/texmf-dist: wrapstuff (5aug22)

[commits+karl at tug.org]

Revision: 64058
          http://tug.org/svn/texlive?view=revision&revision=64058
Author:   karl
Date:     2022-08-05 23:33:40 +0200 (Fri, 05 Aug 2022)
Log Message:
-----------
wrapstuff (5aug22)

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

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

Modified: trunk/Master/texmf-dist/source/latex/wrapstuff/wrapstuff.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/wrapstuff/wrapstuff.dtx	2022-08-05 21:33:25 UTC (rev 64057)
+++ trunk/Master/texmf-dist/source/latex/wrapstuff/wrapstuff.dtx	2022-08-05 21:33:40 UTC (rev 64058)
@@ -121,10 +121,10 @@
 %</internal>
 %<package>\NeedsTeXFormat{LaTeX2e}[2021-06-01]
 %<package>\@ifundefined{ExplLoaderFileDate}{\RequirePackage{expl3}}{}
-%<+package>\GetIdInfo$Id: wrapstuff.dtx e891159 2022-07-26 19:00:31 +0800 Qing Lee <sobenlee at gmail.com> $
+%<+package>\GetIdInfo$Id: wrapstuff.dtx 3be38c0 2022-08-05 21:01:02 +0800 Qing Lee <sobenlee at gmail.com> $
 %<package>  {Wrapping text around stuff}
 %<package>\ProvidesExplPackage{\ExplFileName}
-%<package>  {\ExplFileDate}{0.2}{\ExplFileDescription}
+%<package>  {\ExplFileDate}{0.3}{\ExplFileDescription}
 %<*driver>
 \documentclass{ctxdoc}
 \usepackage{wrapstuff}
@@ -239,6 +239,8 @@
 %     width = <宽度>
 %   \end{syntax}
 %   设置绕排内容的宽度，初始值为 \qty{0}{pt}，代表自然宽度。
+%   此时，\env{wrapstuff} 环境内的内容只能有一行，不能使用 |\\| 换行或者 \tn{par} 分段。
+%   如果需要在环境内换行或者分段，就需要将 \opt{width} 设置成合适的宽度。
 % \end{function}
 %
 % \begin{function}{height}
@@ -687,14 +689,12 @@
 \group_begin:
 \cs_set:Npn \@@_tmp:nn #1
   {
-    \group_begin:
-      \exp_args:Ncc \@@_tmp_aux:NNn
-        { @@_if_last_ #1 : }
-        { c_@@_ #1 _node }
+    \exp_args:Ncc \@@_tmp_aux:NNn
+      { @@_if_last_ #1 : }
+      { c_@@_ #1 _node }
   }
 \cs_set:Npn \@@_tmp_aux:NNn #1#2#3
   {
-    \group_end:
     \int_const:Nn #2 {#3}
     \prg_new_conditional:Npnn #1 { T , F , TF }
       {
@@ -2422,6 +2422,8 @@
 %    \end{macrocode}
 % \end{macro}
 %
+% \changes{v0.3}{2022/07/31}{修复 stuff 深度不为零时的垂直对齐问题。}
+%
 % \begin{macro}{\@@_put_box:}
 %    \begin{macrocode}
 \cs_new_protected_nopar:Npn \@@_put_box:
@@ -2537,6 +2539,7 @@
         \@@_parshape_kern:
         \box_move_up:nn
           {
+              \box_dp:N \g_@@_stuff_box
             + \box_ht:N \l_@@_window_box
             - (   \l_@@_window_ht_dim
                 + \box_ht_plus_dp:N \g_@@_stuff_box ) / 2

Modified: trunk/Master/texmf-dist/tex/latex/wrapstuff/wrapstuff.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/wrapstuff/wrapstuff.sty	2022-08-05 21:33:25 UTC (rev 64057)
+++ trunk/Master/texmf-dist/tex/latex/wrapstuff/wrapstuff.sty	2022-08-05 21:33:40 UTC (rev 64058)
@@ -27,10 +27,10 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[2021-06-01]
 \@ifundefined{ExplLoaderFileDate}{\RequirePackage{expl3}}{}
-\GetIdInfo$Id: wrapstuff.dtx e891159 2022-07-26 19:00:31 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: wrapstuff.dtx 3be38c0 2022-08-05 21:01:02 +0800 Qing Lee <sobenlee at gmail.com> $
   {Wrapping text around stuff}
 \ProvidesExplPackage{\ExplFileName}
-  {\ExplFileDate}{0.2}{\ExplFileDescription}
+  {\ExplFileDate}{0.3}{\ExplFileDescription}
 \@ifl at t@r \fmtversion { 2021-06-01 }
   { }
   {
@@ -267,14 +267,12 @@
 \group_begin:
 \cs_set:Npn \__wstf_tmp:nn #1
   {
-    \group_begin:
-      \exp_args:Ncc \__wstf_tmp_aux:NNn
-        { __wstf_if_last_ #1 : }
-        { c__wstf_ #1 _node }
+    \exp_args:Ncc \__wstf_tmp_aux:NNn
+      { __wstf_if_last_ #1 : }
+      { c__wstf_ #1 _node }
   }
 \cs_set:Npn \__wstf_tmp_aux:NNn #1#2#3
   {
-    \group_end:
     \int_const:Nn #2 {#3}
     \prg_new_conditional:Npnn #1 { T , F , TF }
       {
@@ -1911,6 +1909,7 @@
         \__wstf_parshape_kern:
         \box_move_up:nn
           {
+              \box_dp:N \g__wstf_stuff_box
             + \box_ht:N \l__wstf_window_box
             - (   \l__wstf_window_ht_dim
                 + \box_ht_plus_dp:N \g__wstf_stuff_box ) / 2