From 5627c9f15d7142e0756a366f193c57443239ebed Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 5 Aug 2022 21:33:40 +0000 Subject: wrapstuff (5aug22) git-svn-id: svn://tug.org/texlive/trunk@64058 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/source/latex/wrapstuff/wrapstuff.dtx | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'Master/texmf-dist/source') 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 % %\NeedsTeXFormat{LaTeX2e}[2021-06-01] %\@ifundefined{ExplLoaderFileDate}{\RequirePackage{expl3}}{} -%<+package>\GetIdInfo$Id: wrapstuff.dtx e891159 2022-07-26 19:00:31 +0800 Qing Lee $ +%<+package>\GetIdInfo$Id: wrapstuff.dtx 3be38c0 2022-08-05 21:01:02 +0800 Qing Lee $ % {Wrapping text around stuff} %\ProvidesExplPackage{\ExplFileName} -% {\ExplFileDate}{0.2}{\ExplFileDescription} +% {\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 -- cgit v1.2.3