summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/doc/latex/wrapstuff/wrapstuff.pdfbin449185 -> 451989 bytes
-rw-r--r--Master/texmf-dist/source/latex/wrapstuff/wrapstuff.dtx17
-rw-r--r--Master/texmf-dist/tex/latex/wrapstuff/wrapstuff.sty13
3 files changed, 16 insertions, 14 deletions
diff --git a/Master/texmf-dist/doc/latex/wrapstuff/wrapstuff.pdf b/Master/texmf-dist/doc/latex/wrapstuff/wrapstuff.pdf
index d190fafbd8a..b35cfb87d80 100644
--- a/Master/texmf-dist/doc/latex/wrapstuff/wrapstuff.pdf
+++ b/Master/texmf-dist/doc/latex/wrapstuff/wrapstuff.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/wrapstuff/wrapstuff.dtx b/Master/texmf-dist/source/latex/wrapstuff/wrapstuff.dtx
index 7fef0c95424..3cf86723c11 100644
--- a/Master/texmf-dist/source/latex/wrapstuff/wrapstuff.dtx
+++ b/Master/texmf-dist/source/latex/wrapstuff/wrapstuff.dtx
@@ -121,10 +121,10 @@ Copyright and Licence
%</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@gmail.com> $
+%<+package>\GetIdInfo$Id: wrapstuff.dtx 3be38c0 2022-08-05 21:01:02 +0800 Qing Lee <sobenlee@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 @@ Copyright and Licence
% width = <宽度>
% \end{syntax}
% 设置绕排内容的宽度,初始值为 \qty{0}{pt},代表自然宽度。
+% 此时,\env{wrapstuff} 环境内的内容只能有一行,不能使用 |\\| 换行或者 \tn{par} 分段。
+% 如果需要在环境内换行或者分段,就需要将 \opt{width} 设置成合适的宽度。
% \end{function}
%
% \begin{function}{height}
@@ -687,14 +689,12 @@ Copyright and Licence
\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 @@ Copyright and Licence
% \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 @@ Copyright and Licence
\@@_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
diff --git a/Master/texmf-dist/tex/latex/wrapstuff/wrapstuff.sty b/Master/texmf-dist/tex/latex/wrapstuff/wrapstuff.sty
index ad2e4ad87bc..a627b97a77a 100644
--- a/Master/texmf-dist/tex/latex/wrapstuff/wrapstuff.sty
+++ b/Master/texmf-dist/tex/latex/wrapstuff/wrapstuff.sty
@@ -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@gmail.com> $
+\GetIdInfo$Id: wrapstuff.dtx 3be38c0 2022-08-05 21:01:02 +0800 Qing Lee <sobenlee@gmail.com> $
{Wrapping text around stuff}
\ProvidesExplPackage{\ExplFileName}
- {\ExplFileDate}{0.2}{\ExplFileDescription}
+ {\ExplFileDate}{0.3}{\ExplFileDescription}
\@ifl@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