From e254c61a0f08f0c1f098d9bf5ab644697dd7b807 Mon Sep 17 00:00:00 2001 From: Qing Lee Date: Fri, 22 Jul 2022 17:54:52 +0800 Subject: [PATCH] =?UTF-8?q?jiazhu:=20=E8=AE=BE=E7=BD=AE=20\interlinepenalt?= =?UTF-8?q?ies=20=E9=81=BF=E5=85=8D=E5=88=86=E7=A6=BB=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fixed #616 --- jiazhu/jiazhu.dtx | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/jiazhu/jiazhu.dtx b/jiazhu/jiazhu.dtx index 5d9fd207..20fea7ee 100644 --- a/jiazhu/jiazhu.dtx +++ b/jiazhu/jiazhu.dtx @@ -145,7 +145,7 @@ Copyright and Licence % % \fi % -% \CheckSum{977} +% \CheckSum{988} % \GetFileId{jiazhu.sty} % % \title{\bfseries\pkg{jiazhu} 宏包} @@ -699,6 +699,9 @@ Copyright and Licence \int_zero:N \tex_linepenalty:D \int_zero:N \tex_clubpenalty:D \int_zero:N \tex_widowpenalty:D + \int_zero:N \tex_interlinepenalty:D + \int_zero:N \tex_clubpenalties:D + \int_zero:N \tex_widowpenalties:D } % \end{macrocode} % \end{macro} @@ -996,8 +999,15 @@ Copyright and Licence \tex_parshape:D \int_eval:n { #1 + 1 } ~ \prg_replicate:nn - {#1} { \c_zero_dim \l_@@_remaining_width_dim } - \c_zero_dim \c_max_dim \scan_stop: + {#1} + { \c_zero_dim \l_@@_remaining_width_dim } + \c_zero_dim \c_max_dim + \tex_interlinepenalties:D + \int_eval:n {#1} ~ + \prg_replicate:nn + { #1 - 1 } + { \c_@@_nobreak_int } + \c_@@_break_int } } \int_new:N \l_@@_lines_int @@ -1125,6 +1135,7 @@ Copyright and Licence { \@@_dim_normalize:N \l_@@_remaining_width_dim } \@@_parshape: \hbox_unpack_drop:N \l_@@_text_box + \para_raw_end: } \vbox_set_split_to_ht:NNn \l_@@_typeset_box \l_@@_text_box { \l_@@_lines_int \tex_baselineskip:D } @@ -1218,7 +1229,8 @@ Copyright and Licence { \@@_halign: \dim_set_eq:NN \tex_hsize:D \l_@@_width_dim - \hbox_unpack:N \l_@@_text_box \par + \hbox_unpack:N \l_@@_text_box + \para_raw_end: \int_gset_eq:NN \g_@@_lines_int \tex_prevgraf:D } \int_compare:nNnTF \g_@@_lines_int > \l_@@_lines_int