diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty b/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty index a05256b4f44..ec016098bdd 100644 --- a/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty +++ b/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty @@ -14,7 +14,7 @@ %% Do not distribute a modified version of this file. %% %% File: l3galley.dtx Copyright (C) 1999-2001, 2004-2009 Frank Mittelbach -%% (C) 2010-2012 The LaTeX3 Project +%% (C) 2010-2013 The LaTeX3 Project %% %% It may be distributed and/or modified under the conditions of the %% LaTeX Project Public License (LPPL), either version 1.3c of this @@ -48,7 +48,7 @@ %% ----------------------------------------------------------------------- %% \RequirePackage{xparse} -\GetIdInfo$Id: l3galley.dtx 4402 2013-01-08 08:59:44Z bruno $ +\GetIdInfo$Id: l3galley.dtx 4494 2013-05-24 06:27:01Z joseph $ {L3 Experimental galley code} \ProvidesExplPackage {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} @@ -486,7 +486,7 @@ { \__galley_parshape_measure: } } { - \prg_replicate:nn \g__galley_previous_par_lines_int + \prg_replicate:nn \g_galley_previous_par_lines_int { \seq_gpop:NN \g__galley_cutout_left_seq \l__galley_tmp_tl \seq_gpop:NN \g__galley_cutout_right_seq \l__galley_tmp_tl @@ -611,7 +611,7 @@ \int_compare:nNnTF \tex_parshape:D = \c_zero { \tl_put_right:Nn \l__galley_tmp_tl - { \l__galley_total_left_margin_dim \l__galley_text_width_dim } + { \l__galley_total_left_margin_dim \l_galley_text_width_dim } } { \tl_put_right:Nx \l__galley_tmp_tl @@ -636,7 +636,7 @@ { \dim_eval:n { \l__galley_total_left_margin_dim + ( #1 ) } \c_space_tl - \dim_eval:n { \l__galley_text_width_dim - ( #1 ) } + \dim_eval:n { \l_galley_text_width_dim - ( #1 ) } \c_space_tl } { @@ -652,10 +652,19 @@ \int_incr:N \l__galley_tmp_int \tl_put_right:Nx \l__galley_tmp_tl { - \dim_eval:n { \etex_parshapeindent:D \l__galley_tmp_int } - \c_space_tl - \dim_eval:n { \etex_parshapelength:D \l__galley_tmp_int - ( #1 ) } - \c_space_tl + \int_compare:nNnTF \l__galley_tmp_int > \tex_parshape:D + { + \dim_use:N \l__galley_total_left_margin_dim + \c_space_tl + \dim_eval:n { \l_galley_text_width_dim - ( #1 ) } + \c_space_tl + } + { + \dim_eval:n { \etex_parshapeindent:D \l__galley_tmp_int } + \c_space_tl + \dim_eval:n { \etex_parshapelength:D \l__galley_tmp_int - ( #1 ) } + \c_space_tl + } } } \cs_new_protected:Npn \__galley_cutout_end:n #1 |