diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3experimental/xgalley')
-rw-r--r-- | Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty | 71 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/l3experimental/xgalley/xgalley.sty | 2 |
2 files changed, 36 insertions, 37 deletions
diff --git a/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty b/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty index 8eda49a62f0..5b7b539bd92 100644 --- a/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty +++ b/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty @@ -33,7 +33,7 @@ }% \endinput } -\ProvidesExplPackage{l3galley}{2018/03/05}{} +\ProvidesExplPackage{l3galley}{2018-04-30}{} {L3 Experimental galley code} \int_new:N \l__galley_tmp_int \seq_new:N \g__galley_tmpa_seq @@ -199,21 +199,21 @@ \__galley_restore_parameters: \group_end: } -\__scan_new:N \s__par_omit +\scan_new:N \s__galley_par_omit \cs_new_protected:Npn \galley_par: { - \s__par_omit + \s__galley_par_omit \exp_after:wN \__galley_par_auxi: \exp:w \exp_end_continue_f:w } \cs_new_protected:Npn \__galley_par_auxi: { - \peek_meaning:NTF \s__par_omit + \peek_meaning:NTF \s__galley_par_omit { \__galley_par_aux:N } { \__galley_par_auxii: } } \cs_new_protected:Npn \__galley_par_aux:N #1 { - \str_if_eq_x:nnF {#1} { \s__par_omit } + \str_if_eq_x:nnF {#1} { \s__galley_par_omit } { \__galley_par_auxii: #1 @@ -273,7 +273,7 @@ } \cs_new_protected:Npn \galley_par:n #1 { - \s__par_omit + \s__galley_par_omit \bool_if:NF \g__galley_begin_level_bool { #1 @@ -410,7 +410,7 @@ } { \tex_penalty:D - \__int_eval:n { \g__galley_interpar_penalty_user_tl } + \int_eval:n { \g__galley_interpar_penalty_user_tl } \exp_stop_f: \tl_gclear:N \g__galley_interpar_penalty_user_tl } \bool_gset_false:N \g_galley_no_break_next_bool @@ -560,15 +560,15 @@ \cs_new_protected:Npn \__galley_parshape_set_indents:NN #1#2 { \tex_parshape:D - \__int_eval:n - { \int_min:nn { \seq_count:N #1 } { \seq_count:N #2 } } + \int_min:nn { \seq_count:N #1 } { \seq_count:N #2 } + \exp_stop_f: \seq_mapthread_function:NNN #1 #2 \__galley_parshape_set_indents:nn } \cs_new:Npn \__galley_parshape_set_indents:nn #1#2 { - \__dim_eval:n { \l_galley_total_left_margin_dim + #1 } - \__dim_eval:n { \l_galley_text_width_dim - ( #1 + #2 ) } + \dim_eval:n { \l_galley_total_left_margin_dim + #1 } \exp_stop_f: + \dim_eval:n { \l_galley_text_width_dim - ( #1 + #2 ) } \exp_stop_f: } \cs_new_protected:Npn \__galley_parshape_set_cutouts: { @@ -728,7 +728,7 @@ \cs_new_protected:Npn \galley_display_widow_penalties_set:n #1 { \etex_displaywidowpenalties:D - \__int_eval:n { \clist_count:n {#1} + 1 } + \int_eval:n { \clist_count:n {#1} + 1 } \exp_stop_f: \clist_map_function:nN {#1} \__galley_set_aux:n 0 \exp_stop_f: } @@ -736,7 +736,7 @@ \cs_new_protected:Npn \galley_widow_penalties_set:n #1 { \etex_widowpenalties:D - \__int_eval:n { \clist_count:n {#1} + 1 } + \int_eval:n { \clist_count:n {#1} + 1 } \exp_stop_f: \clist_map_function:nN {#1} \__galley_set_aux:n 0 \exp_stop_f: } @@ -757,7 +757,7 @@ \cs_new_protected:Npn \galley_display_club_penalties_set:n #1 { \etex_clubpenalties:D - \__int_eval:n { \clist_count:n {#1} + 1 } + \int_eval:n { \clist_count:n {#1} + 1 } \exp_stop_f: \clist_map_function:nN {#1} \__galley_set_aux:n 0 \exp_stop_f: \__galley_calc_interline_penalties: @@ -767,18 +767,19 @@ { \int_compare:nNnTF { \etex_interlinepenalties:D 0 } = 0 { - \etex_interlinepenalties:D 1 = \__int_eval:n {#1} + \etex_interlinepenalties:D 1 = \int_eval:n {#1} \exp_stop_f: \__galley_calc_interline_penalties: } { \cs_set:Npn \__galley_set_interline_penalty_auxii:n ##1 { - \__int_eval:n + \int_eval:n { \etex_interlinepenalties:D ##1 - \etex_interlinepenalties:D \etex_interlinepenalties:D 0 + #1 } + \exp_stop_f: } \exp_args:Nf \__galley_set_interline_penalty:nn { \clist_count:N \l_galley_line_penalties_clist } {#1} @@ -788,15 +789,14 @@ { \etex_interlinepenalties:D \etex_interlinepenalties:D 0 \exp_stop_f: - \int_step_function:nnnN { 1 } { 1 } {#1} + \int_step_function:nN {#1} \__galley_set_interline_penalty_auxi:n - \int_step_function:nnnN { #1 + 1 } { 1 } - { \etex_interlinepenalties:D 0 - 1 } + \int_step_function:nnN { #1 + 1 } { \etex_interlinepenalties:D 0 - 1 } \__galley_set_interline_penalty_auxii:n - \__int_eval:n {#2} + \int_eval:n {#2} \exp_stop_f: } \cs_new:Npn \__galley_set_interline_penalty_auxi:n #1 - { \etex_interlinepenalties:D \__int_eval:n {#1} } + { \etex_interlinepenalties:D \int_eval:n {#1} \exp_stop_f: } \cs_new:Npn \__galley_set_interline_penalty_auxii:n #1 { } \cs_new_protected:Npn \__galley_calc_interline_penalties: { @@ -815,29 +815,31 @@ \cs_new_protected:Npn \__galley_calc_interline_penalties:nn #1#2 { \etex_interlinepenalties:D #1 ~ - \int_step_function:nnnN { 1 } { 1 } {#2} + \int_step_function:nN {#2} \__galley_calc_interline_penalties_auxi:n - \int_step_function:nnnN { #2 + 1 } { 1 } { #1 - 1 } + \int_step_function:nnN { #2 + 1 } { #1 - 1 } \__galley_calc_interline_penalties_auxii:n \etex_interlinepenalties:D \etex_interlinepenalties:D 0 \exp_stop_f: } \cs_new:Npn \__galley_calc_interline_penalties_auxi:n #1 { - \__int_eval:n + \int_eval:n { \clist_item:Nn \l_galley_line_penalties_clist {#1} + 0 \clist_item:Nn \l_galley_club_penalties_clist {#1} - \etex_clubpenalties:D #1 ~ } + \exp_stop_f: } \cs_new:Npn \__galley_calc_interline_penalties_auxii:n #1 { - \__int_eval:n + \int_eval:n { \etex_interlinepenalties:D \etex_interlinepenalties:D 0 \exp_stop_f: + 0 \clist_item:Nn \l_galley_club_penalties_clist {#1} - \etex_clubpenalties:D #1 ~ } + \exp_stop_f: } \cs_new_protected:Npn \galley_save_club_penalties:N #1 { \clist_set_eq:NN #1 \l_galley_club_penalties_clist } @@ -847,40 +849,37 @@ { \clist_set:Nx #1 { - \int_step_function:nnnN { 1 } { 1 } - { \etex_clubpenalties:D 0 - 1 } + \int_step_function:nN { \etex_clubpenalties:D 0 - 1 } \__galley_save_display_club_penalties:n } } \cs_new:Npn \__galley_save_display_club_penalties:n #1 - { \__int_value:w \etex_clubpenalties:D \__int_eval:n {#1} , } + { \int_value:w \etex_clubpenalties:D \int_eval:n {#1} , } \cs_new_protected:Npn \galley_save_display_widow_penalties:N #1 { \clist_set:Nx #1 { - \int_step_function:nnnN { 1 } { 1 } - { \etex_displaywidowpenalties:D 0 - 1 } + \int_step_function:nN { \etex_displaywidowpenalties:D 0 - 1 } \__galley_save_display_widow_penalties:n } } \cs_new:Npn \__galley_save_display_widow_penalties:n #1 { - \__int_value:w \etex_displaywidowpenalties:D - \__int_eval:n {#1} , + \int_value:w \etex_displaywidowpenalties:D + \int_eval:n {#1} , } \cs_new_protected:Npn \galley_save_widow_penalties:N #1 { \clist_set:Nx #1 { - \int_step_function:nnnN { 1 } { 1 } - { \etex_widowpenalties:D 0 - 1 } + \int_step_function:nN { \etex_widowpenalties:D 0 - 1 } \__galley_save_widow_penalties:n } } \cs_new:Npn \__galley_save_widow_penalties:n #1 - { \__int_value:w \etex_widowpenalties:D \__int_eval:n {#1} , } + { \int_value:w \etex_widowpenalties:D \int_eval:n {#1} , } \cs_new_protected:Npn \galley_interline_penalty: - { \__int_value:w \etex_interlinepenalties:D \etex_interlinepenalties:D 0 \exp_stop_f: } + { \int_value:w \etex_interlinepenalties:D \etex_interlinepenalties:D 0 \exp_stop_f: } \__kernel_msg_new:nnn { galley } { no-line-to-end } { There's~no~line~here~to~end. } \cs_set:Npn \clearpage diff --git a/Master/texmf-dist/tex/latex/l3experimental/xgalley/xgalley.sty b/Master/texmf-dist/tex/latex/l3experimental/xgalley/xgalley.sty index c7ca5f1732a..2f7a529d783 100644 --- a/Master/texmf-dist/tex/latex/l3experimental/xgalley/xgalley.sty +++ b/Master/texmf-dist/tex/latex/l3experimental/xgalley/xgalley.sty @@ -21,7 +21,7 @@ %% File: xgalley.dtx Copyright (C) 1999-2001, 2004-2009 Frank Mittelbach %% (C) 2010-2012,2014,2016-2018 The LaTeX3 Project \RequirePackage{xparse} -\ProvidesExplPackage{xgalley}{2018/03/05}{} +\ProvidesExplPackage{xgalley}{2018-04-30}{} {L3 Experimental galley} \RequirePackage{xparse,xtemplate,l3galley} \clist_new:N \l__galley_tmpa_clist |