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 | 491 |
1 files changed, 243 insertions, 248 deletions
diff --git a/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty b/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty index cb77ed14d8f..dcf3c5871fc 100644 --- a/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty +++ b/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty @@ -48,18 +48,15 @@ %% ----------------------------------------------------------------------- %% \RequirePackage{xparse} -\GetIdInfo$Id: l3galley.dtx 3325 2012-02-06 22:07:00Z joseph $ +\GetIdInfo$Id: l3galley.dtx 3918 2012-07-05 00:32:37Z bruno $ {L3 Experimental galley code} \ProvidesExplPackage {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} -\package_check_loaded_expl: -\cs_new_protected_nopar:Npn \galley_leave_vmode: - { \hbox_unpack:N \c_empty_box } -\clist_new:N \l_galley_parshape_left_indent_clist -\clist_new:N \l_galley_parshape_right_indent_clist -\bool_new:N \l_galley_parshape_multipar_bool -\bool_new:N \l_galley_parshape_resume_std_bool -\bool_new:N \l_galley_parshape_fixed_lines_bool +\clist_new:N \l__galley_parshape_left_indent_clist +\clist_new:N \l__galley_parshape_right_indent_clist +\bool_new:N \l__galley_parshape_multipar_bool +\bool_new:N \l__galley_parshape_resume_std_bool +\bool_new:N \l__galley_parshape_fixed_lines_bool \int_new:N \l_galley_parshape_std_lines_int \cs_new_eq:NN \l_galley_text_width_dim \linewidth \cs_new_eq:NN \l_galley_total_left_margin_dim \@totalleftmargin @@ -67,154 +64,154 @@ \int_new:N \l_galley_interpar_penalty_int \skip_new:N \l_galley_interpar_vspace_skip \cs_new_eq:NN \l_galley_width_dim \tex_hsize:D -\bool_new:N \g_galley_begin_level_bool -\bool_new:N \l_galley_begin_level_bool +\bool_new:N \g__galley_begin_level_bool +\bool_new:N \l__galley_begin_level_bool \bool_new:N \g_galley_omit_next_indent_bool -\bool_new:N \l_galley_omit_next_indent_bool -\bool_new:N \g_galley_parshape_set_bool -\bool_new:N \l_galley_parshape_set_bool -\bool_new:N \g_galley_nobreak_next_bool -\bool_new:N \l_galley_nobreak_next_bool +\bool_new:N \l__galley_omit_next_indent_bool +\bool_new:N \g__galley_parshape_set_bool +\bool_new:N \l__galley_parshape_set_bool +\bool_new:N \g_galley_no_break_next_bool +\bool_new:N \l__galley_no_break_next_bool \tl_new:N \g_galley_par_begin_hook_tl -\tl_new:N \l_galley_par_begin_hook_tl +\tl_new:N \l__galley_galley_par_begin_hook_tl \tl_new:N \g_galley_par_end_hook_tl -\tl_new:N \l_galley_par_end_hook_tl +\tl_new:N \l__galley_galley_par_end_hook_tl \tl_new:N \g_galley_par_after_hook_tl -\tl_new:N \l_galley_par_after_hook_tl +\tl_new:N \l__galley_par_after_hook_tl \int_new:N \g_galley_previous_par_lines_int -\int_new:N \l_galley_previous_par_lines_int +\int_new:N \l__galley_previous_par_lines_int \tl_new:N \g_galley_restore_running_tl -\tl_new:N \l_galley_restore_running_tl +\tl_new:N \l__galley_restore_running_tl \tl_new:N \g_galley_whatsit_next_tl -\tl_new:N \l_galley_whatsit_next_tl +\tl_new:N \l__galley_whatsit_next_tl \tl_new:N \g_galley_whatsit_previous_tl -\tl_new:N \l_galley_whatsit_previous_tl -\tl_new:N \g_galley_interpar_penalty_user_tl -\tl_new:N \l_galley_interpar_penalty_user_tl -\tl_new:N \g_galley_interpar_vspace_user_tl -\tl_new:N \l_galley_interpar_vspace_user_tl -\cs_new_protected_nopar:Npn \galley_initialise_variables: - { - \bool_gset_true:N \g_galley_begin_level_bool - \tl_gclear:N \g_galley_interpar_penalty_user_tl - \tl_gclear:N \g_galley_interpar_vspace_user_tl +\tl_new:N \l__galley_whatsit_previous_tl +\tl_new:N \g__galley_interpar_penalty_user_tl +\tl_new:N \l__galley_interpar_penalty_user_tl +\tl_new:N \g__galley_interpar_vspace_user_tl +\tl_new:N \l__galley_interpar_vspace_user_tl +\cs_new_protected_nopar:Npn \__galley_initialise_variables: + { + \bool_gset_true:N \g__galley_begin_level_bool + \tl_gclear:N \g__galley_interpar_penalty_user_tl + \tl_gclear:N \g__galley_interpar_vspace_user_tl \bool_gset_true:N \g_galley_omit_next_indent_bool - \bool_gset_false:N \g_galley_nobreak_next_bool + \bool_gset_false:N \g_galley_no_break_next_bool \tl_gclear:N \g_galley_par_begin_hook_tl \tl_gclear:N \g_galley_par_end_hook_tl \tl_gclear:N \g_galley_par_after_hook_tl - \bool_gset_false:N \g_galley_parshape_set_bool + \bool_gset_false:N \g__galley_parshape_set_bool \int_gzero:N \g_galley_previous_par_lines_int \tl_gclear:N \g_galley_restore_running_tl \tl_gclear:N \g_galley_whatsit_previous_tl \tl_gclear:N \g_galley_whatsit_next_tl } -\galley_initialise_variables: -\cs_new_protected_nopar:Npn \galley_initialise_settings: +\__galley_initialise_variables: +\cs_new_protected_nopar:Npn \__galley_initialise_settings: { \dim_set_eq:NN \l_galley_text_width_dim \l_galley_width_dim \dim_zero:N \l_galley_total_left_margin_dim \dim_zero:N \l_galley_total_right_margin_dim } -\cs_new_protected_nopar:Npn \galley_save_parameters: +\cs_new_protected_nopar:Npn \__galley_save_parameters: { - \bool_set_eq:NN \l_galley_begin_level_bool - \g_galley_begin_level_bool - \tl_set_eq:NN \l_galley_interpar_penalty_user_tl - \g_galley_interpar_penalty_user_tl - \tl_set_eq:NN \l_galley_interpar_vspace_user_tl - \g_galley_interpar_vspace_user_tl - \bool_set_eq:NN \l_galley_omit_next_indent_bool + \bool_set_eq:NN \l__galley_begin_level_bool + \g__galley_begin_level_bool + \tl_set_eq:NN \l__galley_interpar_penalty_user_tl + \g__galley_interpar_penalty_user_tl + \tl_set_eq:NN \l__galley_interpar_vspace_user_tl + \g__galley_interpar_vspace_user_tl + \bool_set_eq:NN \l__galley_omit_next_indent_bool \g_galley_omit_next_indent_bool - \bool_set_eq:NN \l_galley_nobreak_next_bool - \g_galley_nobreak_next_bool - \tl_set_eq:NN \l_galley_par_begin_hook_tl + \bool_set_eq:NN \l__galley_no_break_next_bool + \g_galley_no_break_next_bool + \tl_set_eq:NN \l__galley_galley_par_begin_hook_tl \g_galley_par_begin_hook_tl - \tl_set_eq:NN \l_galley_par_end_hook_tl + \tl_set_eq:NN \l__galley_galley_par_end_hook_tl \g_galley_par_end_hook_tl - \tl_set_eq:NN \l_galley_par_after_hook_tl + \tl_set_eq:NN \l__galley_par_after_hook_tl \g_galley_par_after_hook_tl - \bool_set_eq:NN \l_galley_parshape_set_bool - \g_galley_parshape_set_bool - \int_set_eq:NN \l_galley_previous_par_lines_int + \bool_set_eq:NN \l__galley_parshape_set_bool + \g__galley_parshape_set_bool + \int_set_eq:NN \l__galley_previous_par_lines_int \g_galley_previous_par_lines_int - \tl_set_eq:NN \l_galley_restore_running_tl + \tl_set_eq:NN \l__galley_restore_running_tl \g_galley_restore_running_tl - \tl_set_eq:NN \l_galley_whatsit_previous_tl + \tl_set_eq:NN \l__galley_whatsit_previous_tl \g_galley_whatsit_previous_tl - \tl_set_eq:NN \l_galley_whatsit_next_tl + \tl_set_eq:NN \l__galley_whatsit_next_tl \g_galley_whatsit_next_tl } -\cs_new_protected_nopar:Npn \galley_restore_parameters: +\cs_new_protected_nopar:Npn \__galley_restore_parameters: { - \bool_gset_eq:NN \g_galley_begin_level_bool - \l_galley_begin_level_bool - \tl_gset_eq:NN \g_galley_interpar_penalty_user_tl - \l_galley_interpar_penalty_user_tl - \tl_gset_eq:NN \g_galley_interpar_vspace_user_tl - \l_galley_interpar_vspace_user_tl + \bool_gset_eq:NN \g__galley_begin_level_bool + \l__galley_begin_level_bool + \tl_gset_eq:NN \g__galley_interpar_penalty_user_tl + \l__galley_interpar_penalty_user_tl + \tl_gset_eq:NN \g__galley_interpar_vspace_user_tl + \l__galley_interpar_vspace_user_tl \bool_gset_eq:NN \g_galley_omit_next_indent_bool - \l_galley_omit_next_indent_bool - \bool_gset_eq:NN \g_galley_nobreak_next_bool - \l_galley_nobreak_next_bool + \l__galley_omit_next_indent_bool + \bool_gset_eq:NN \g_galley_no_break_next_bool + \l__galley_no_break_next_bool \tl_gset_eq:NN \g_galley_par_begin_hook_tl - \l_galley_par_begin_hook_tl + \l__galley_galley_par_begin_hook_tl \tl_gset_eq:NN \g_galley_par_end_hook_tl - \l_galley_par_end_hook_tl + \l__galley_galley_par_end_hook_tl \tl_gset_eq:NN \g_galley_par_after_hook_tl - \l_galley_par_after_hook_tl - \bool_gset_eq:NN \g_galley_parshape_set_bool - \l_galley_parshape_set_bool + \l__galley_par_after_hook_tl + \bool_gset_eq:NN \g__galley_parshape_set_bool + \l__galley_parshape_set_bool \int_gset_eq:NN \g_galley_previous_par_lines_int - \l_galley_previous_par_lines_int + \l__galley_previous_par_lines_int \tl_gset_eq:NN \g_galley_restore_running_tl - \l_galley_restore_running_tl + \l__galley_restore_running_tl \tl_gset_eq:NN \g_galley_whatsit_previous_tl - \l_galley_whatsit_previous_tl + \l__galley_whatsit_previous_tl \tl_gset_eq:NN \g_galley_whatsit_next_tl - \l_galley_whatsit_next_tl + \l__galley_whatsit_next_tl } \cs_new_protected_nopar:Npn \galley_level: { - \galley_save_parameters: + \__galley_save_parameters: \group_begin: - \galley_initialise_variables: - \galley_initialise_settings: - \group_insert_after:N \galley_level_end: + \__galley_initialise_variables: + \__galley_initialise_settings: + \group_insert_after:N \__galley_level_end: } -\cs_new_protected_nopar:Npn \galley_level_end: +\cs_new_protected_nopar:Npn \__galley_level_end: { \par - \galley_restore_parameters: + \__galley_restore_parameters: \group_end: } -\scan_new:N \s_par_omit -\cs_new_protected_nopar:Npn \galley_std_par: +\__scan_new:N \s__par_omit +\cs_new_protected_nopar:Npn \__galley_std_par: { - \s_par_omit - \exp_after:wN \galley_std_par_aux_i: \tex_romannumeral:D - `0 + \s__par_omit + \exp_after:wN \__galley_std_par_aux_i: \tex_romannumeral:D - `0 } -\cs_new_protected:Npn \galley_std_par_aux_i: +\cs_new_protected:Npn \__galley_std_par_aux_i: { - \peek_meaning:NTF \s_par_omit - { \galley_std_par_aux:N } - { \galley_std_par_aux_ii: } + \peek_meaning:NTF \s__par_omit + { \__galley_std_par_aux:N } + { \__galley_std_par_aux_ii: } } -\cs_new_protected:Npn \galley_std_par_aux:N #1 +\cs_new_protected:Npn \__galley_std_par_aux:N #1 { - \str_if_eq:xxF {#1} { \s_par_omit } + \str_if_eq_x:nnF {#1} { \s__par_omit } { - \galley_std_par_aux_ii: + \__galley_std_par_aux_ii: #1 } } -\cs_new_protected_nopar:Npn \galley_std_par_aux_ii: +\cs_new_protected_nopar:Npn \__galley_std_par_aux_ii: { \mode_if_vertical:TF { \tex_par:D } { \g_galley_par_end_hook_tl - \galley_set_measure_and_parshape: + \__galley_set_measure_and_parshape: \group_begin: \tex_par:D \group_end: @@ -224,33 +221,33 @@ \tl_gclear:N \g_galley_par_after_hook_tl \tex_penalty:D \c_ten_thousand } -\cs_new_protected:Npn \galley_end_par:n #1 +\cs_new_protected:Npn \__galley_end_par:n #1 { - \s_par_omit - \bool_if:nF \g_galley_begin_level_bool + \s__par_omit + \bool_if:nF \g__galley_begin_level_bool { #1 - \galley_std_par: + \__galley_std_par: } } -\cs_set_protected_nopar:Npn \par { \galley_std_par: } -\tl_set:Nn \@par { \galley_std_par: } +\cs_set_protected_nopar:Npn \par { \__galley_std_par: } +\tl_set:Nn \@par { \__galley_std_par: } \cs_new_protected_nopar:Npn \galley_display_begin: { \group_begin: - \galley_save_parameters: + \__galley_save_parameters: \mode_if_vertical:TF { - \galley_display_penalty:N \l_galley_display_begin_par_penalty_tl - \galley_display_vspace:N \l_galley_display_begin_par_vspace_tl + \__galley_display_penalty:N \l_galley_display_begin_par_penalty_tl + \__galley_display_vspace:N \l_galley_display_begin_par_vspace_tl } { - \galley_display_penalty:N \l_galley_display_begin_penalty_tl - \galley_display_vspace:N \l_galley_display_begin_vspace_tl + \__galley_display_penalty:N \l_galley_display_begin_penalty_tl + \__galley_display_vspace:N \l_galley_display_begin_vspace_tl } \par } -\cs_new_protected:Npn \galley_display_penalty:N #1 +\cs_new_protected:Npn \__galley_display_penalty:N #1 { \tl_if_empty:NF #1 { @@ -262,7 +259,7 @@ \int_gset:Nn \g_galley_penalty_int {#1} } } -\cs_new_protected:Npn \galley_display_vspace:N #1 +\cs_new_protected:Npn \__galley_display_vspace:N #1 { \tl_if_empty:NF #1 { @@ -277,34 +274,34 @@ \cs_new_protected_nopar:Npn \galley_display_end: { \par - \galley_restore_parameters: + \__galley_restore_parameters: \group_end: \group_insert_after:N \group_insert_after:N - \group_insert_after:N \galley_display_par_setup: + \group_insert_after:N \__galley_display_par_setup: } -\cs_new_protected_nopar:Npn \galley_display_par_setup: +\cs_new_protected_nopar:Npn \__galley_display_par_setup: { \bool_gset_false:N \g_galley_omit_next_indent_bool - \cs_set_eq:NN \par \galley_display_par: + \cs_set_eq:NN \par \__galley_display_par: } -\cs_new_protected_nopar:Npn \galley_display_par: +\cs_new_protected_nopar:Npn \__galley_display_par: { - \cs_set_eq:NN \par \galley_std_par: + \cs_set_eq:NN \par \__galley_std_par: \mode_if_vertical:TF { \par \bool_gset_false:N \g_galley_omit_next_indent_bool - \galley_display_penalty:N \l_galley_display_end_par_penalty_tl - \galley_display_vspace:N \l_galley_display_end_par_vspace_tl + \__galley_display_penalty:N \l_galley_display_end_par_penalty_tl + \__galley_display_vspace:N \l_galley_display_end_par_vspace_tl } { - \galley_set_measure_and_parshape: + \__galley_set_measure_and_parshape: \group_begin: \tex_par:D \group_end: \int_gadd:Nn \g_galley_previous_par_lines_int \tex_prevgraf:D - \galley_display_penalty:N \l_galley_display_end_penalty_tl - \galley_display_vspace:N \l_galley_display_end_vspace_tl + \__galley_display_penalty:N \l_galley_display_end_penalty_tl + \__galley_display_vspace:N \l_galley_display_end_vspace_tl } } \cs_undefine:N \everypar @@ -313,84 +310,84 @@ { \tex_everypar:D { - \bool_if:NTF \g_galley_begin_level_bool - { \galley_start_paragraph_first: } - { \galley_start_paragraph_std: } + \bool_if:NTF \g__galley_begin_level_bool + { \__galley_start_paragraph_first: } + { \__galley_start_paragraph_std: } \tex_the:D \everypar } } -\box_new:N \g_galley_last_box -\cs_new_protected_nopar:Npn \galley_start_paragraph_std: +\box_new:N \g__galley_last_box +\cs_new_protected_nopar:Npn \__galley_start_paragraph_std: { \group_begin: - \box_gset_to_last:N \g_galley_last_box + \box_gset_to_last:N \g__galley_last_box \tex_par:D - \galley_insert_vertical_items: + \__galley_insert_vertical_items: \tex_everypar:D { } \tex_noindent:D \group_end: \int_gzero:N \g_galley_previous_par_lines_int - \galley_insert_horizontal_items: - \galley_restore_running_parameters: + \__galley_insert_horizontal_items: + \__galley_restore_running_parameters: } -\cs_new_protected_nopar:Npn \galley_start_paragraph_first: +\cs_new_protected_nopar:Npn \__galley_start_paragraph_first: { - \bool_gset_false:N \g_galley_begin_level_bool + \bool_gset_false:N \g__galley_begin_level_bool \mode_if_horizontal:TF { \group_begin: - \box_gset_to_last:N \g_galley_last_box + \box_gset_to_last:N \g__galley_last_box \tex_par:D - \galley_insert_vspace: + \__galley_insert_vspace: \tex_everypar:D { } \tex_noindent:D \group_end: } - { \galley_insert_vspace: } - \galley_insert_horizontal_items: - \galley_restore_running_parameters: + { \__galley_insert_vspace: } + \__galley_insert_horizontal_items: + \__galley_restore_running_parameters: } -\cs_new_protected_nopar:Npn \galley_insert_vertical_items: +\cs_new_protected_nopar:Npn \__galley_insert_vertical_items: { \g_galley_whatsit_previous_tl \tl_gclear:N \g_galley_whatsit_previous_tl - \tl_if_empty:NTF \g_galley_interpar_penalty_user_tl + \tl_if_empty:NTF \g__galley_interpar_penalty_user_tl { - \bool_if:NTF \g_galley_nobreak_next_bool + \bool_if:NTF \g_galley_no_break_next_bool { \tex_penalty:D \c_ten_thousand } { \tex_penalty:D \l_galley_interpar_penalty_int } } { \tex_penalty:D - \int_eval:w \g_galley_interpar_penalty_user_tl \int_eval_end: - \tl_gclear:N \g_galley_interpar_penalty_user_tl + \__int_eval:w \g__galley_interpar_penalty_user_tl \__int_eval_end: + \tl_gclear:N \g__galley_interpar_penalty_user_tl } - \bool_gset_false:N \g_galley_nobreak_next_bool - \galley_insert_vspace: + \bool_gset_false:N \g_galley_no_break_next_bool + \__galley_insert_vspace: } -\cs_new_protected_nopar:Npn \galley_insert_vspace: +\cs_new_protected_nopar:Npn \__galley_insert_vspace: { - \tl_if_empty:NTF \g_galley_interpar_vspace_user_tl + \tl_if_empty:NTF \g__galley_interpar_vspace_user_tl { \skip_vertical:N \l_galley_interpar_vspace_skip } { - \skip_vertical:n { \g_galley_interpar_vspace_user_tl } - \tl_gclear:N \g_galley_interpar_vspace_user_tl + \skip_vertical:n { \g__galley_interpar_vspace_user_tl } + \tl_gclear:N \g__galley_interpar_vspace_user_tl } } -\cs_new_protected_nopar:Npn \galley_insert_horizontal_items: +\cs_new_protected_nopar:Npn \__galley_insert_horizontal_items: { \g_galley_whatsit_next_tl \tl_gclear:N \g_galley_whatsit_next_tl \bool_if:NF \g_galley_omit_next_indent_bool { - \box_if_empty:NF \g_galley_last_box + \box_if_empty:NF \g__galley_last_box { \hbox_to_wd:nn \l_galley_par_indent_dim { } } } \skip_horizontal:N \l_galley_par_begin_skip \g_galley_par_begin_hook_tl \bool_gset_false:N \g_galley_omit_next_indent_bool } -\cs_new_protected_nopar:Npn \galley_restore_running_parameters: +\cs_new_protected_nopar:Npn \__galley_restore_running_parameters: { \g_galley_restore_running_tl \tl_gclear:N \g_galley_restore_running_tl @@ -419,50 +416,50 @@ } \cs_new_protected:Npn \galley_parshape_fixed_lines:nnn #1#2#3 { - \bool_gset_true:N \g_galley_parshape_set_bool - \bool_set_true:N \l_galley_parshape_fixed_lines_bool + \bool_gset_true:N \g__galley_parshape_set_bool + \bool_set_true:N \l__galley_parshape_fixed_lines_bool \int_set:Nn \l_galley_parshape_std_lines_int {#1} - \clist_set:Nn \l_galley_parshape_left_indent_clist {#2} - \clist_set:Nn \l_galley_parshape_right_indent_clist {#3} - \bool_set_true:N \l_galley_parshape_resume_std_bool + \clist_set:Nn \l__galley_parshape_left_indent_clist {#2} + \clist_set:Nn \l__galley_parshape_right_indent_clist {#3} + \bool_set_true:N \l__galley_parshape_resume_std_bool } \cs_new_protected:Npn \galley_parshape_multi_par:nnnN #1#2#3#4 { - \bool_gset_true:N \g_galley_parshape_set_bool - \bool_set_true:N \l_galley_parshape_multipar_bool - \bool_set_false:N \l_galley_parshape_fixed_lines_bool + \bool_gset_true:N \g__galley_parshape_set_bool + \bool_set_true:N \l__galley_parshape_multipar_bool + \bool_set_false:N \l__galley_parshape_fixed_lines_bool \int_set:Nn \l_galley_parshape_std_lines_int {#1} - \clist_set:Nn \l_galley_parshape_left_indent_clist {#2} - \clist_set:Nn \l_galley_parshape_right_indent_clist {#3} - \bool_set_eq:NN \l_galley_parshape_resume_std_bool #4 + \clist_set:Nn \l__galley_parshape_left_indent_clist {#2} + \clist_set:Nn \l__galley_parshape_right_indent_clist {#3} + \bool_set_eq:NN \l__galley_parshape_resume_std_bool #4 } \cs_new_protected:Npn \galley_parshape_single_par:nnnN #1#2#3#4 { - \bool_gset_true:N \g_galley_parshape_set_bool - \bool_set_false:N \l_galley_parshape_multipar_bool - \bool_set_false:N \l_galley_parshape_fixed_lines_bool + \bool_gset_true:N \g__galley_parshape_set_bool + \bool_set_false:N \l__galley_parshape_multipar_bool + \bool_set_false:N \l__galley_parshape_fixed_lines_bool \int_set:Nn \l_galley_parshape_std_lines_int {#1} - \clist_set:Nn \l_galley_parshape_left_indent_clist {#2} - \clist_set:Nn \l_galley_parshape_right_indent_clist {#3} - \bool_set_eq:NN \l_galley_parshape_resume_std_bool #4 + \clist_set:Nn \l__galley_parshape_left_indent_clist {#2} + \clist_set:Nn \l__galley_parshape_right_indent_clist {#3} + \bool_set_eq:NN \l__galley_parshape_resume_std_bool #4 } \cs_generate_variant:Nn \galley_parshape_fixed_lines:nnn { nVV } \cs_generate_variant:Nn \galley_parshape_multi_par:nnnN { nVV } \cs_generate_variant:Nn \galley_parshape_single_par:nnnN { nVV } -\cs_new_protected_nopar:Npn \galley_set_measure_and_parshape: +\cs_new_protected_nopar:Npn \__galley_set_measure_and_parshape: { - \bool_if:NTF \g_galley_parshape_set_bool + \bool_if:NTF \g__galley_parshape_set_bool { - \bool_if:NTF \l_galley_parshape_fixed_lines_bool + \bool_if:NTF \l__galley_parshape_fixed_lines_bool { \int_compare:nNnTF \g_galley_previous_par_lines_int > \c_zero - { \galley_generate_parshape_lines: } - { \galley_generate_parshape: } + { \__galley_generate_parshape_lines: } + { \__galley_generate_parshape: } } { - \bool_gset_eq:NN \g_galley_parshape_set_bool - \l_galley_parshape_multipar_bool - \galley_generate_parshape: + \bool_gset_eq:NN \g__galley_parshape_set_bool + \l__galley_parshape_multipar_bool + \__galley_generate_parshape: } } { @@ -473,16 +470,16 @@ \dim_use:N \l_galley_text_width_dim } } -\cs_new_protected_nopar:Npn \galley_generate_parshape: +\cs_new_protected_nopar:Npn \__galley_generate_parshape: { \tex_global:D \tex_parshape:D - \int_eval:w + \__int_eval:w \l_galley_parshape_std_lines_int + \int_min:nn - { \clist_length:N \l_galley_parshape_left_indent_clist } - { \clist_length:N \l_galley_parshape_right_indent_clist } - \bool_if:NT \l_galley_parshape_resume_std_bool { + 1 } - \int_eval_end: + { \clist_count:N \l__galley_parshape_left_indent_clist } + { \clist_count:N \l__galley_parshape_right_indent_clist } + \bool_if:NT \l__galley_parshape_resume_std_bool { + 1 } + \__int_eval_end: \prg_replicate:nn \l_galley_parshape_std_lines_int { \dim_use:N \l_galley_total_left_margin_dim @@ -490,10 +487,10 @@ \dim_use:N \l_galley_text_width_dim \c_space_tl } - \galley_set_parshape_map:oo - \l_galley_parshape_left_indent_clist - \l_galley_parshape_right_indent_clist - \bool_if:NT \l_galley_parshape_resume_std_bool + \__galley_set_parshape_map:oo + \l__galley_parshape_left_indent_clist + \l__galley_parshape_right_indent_clist + \bool_if:NT \l__galley_parshape_resume_std_bool { \c_space_tl \dim_use:N \l_galley_total_left_margin_dim @@ -501,10 +498,10 @@ \dim_use:N \l_galley_text_width_dim } } -\cs_new:Npn \galley_set_parshape_map:nn #1#2 - { \galley_set_parshape_map_aux:nw { } #1 , \q_mark #2 , \q_stop } -\cs_generate_variant:Nn \galley_set_parshape_map:nn { oo } -\cs_new:Npn \galley_set_parshape_map_aux:nw #1#2 , #3 \q_mark #4 , #5 \q_stop +\cs_new:Npn \__galley_set_parshape_map:nn #1#2 + { \__galley_set_parshape_map_aux:nw { } #1 , \q_mark #2 , \q_stop } +\cs_generate_variant:Nn \__galley_set_parshape_map:nn { oo } +\cs_new:Npn \__galley_set_parshape_map_aux:nw #1#2 , #3 \q_mark #4 , #5 \q_stop { \bool_if:nTF { \tl_if_empty_p:n {#3} || \tl_if_empty_p:n {#5} } { @@ -514,7 +511,7 @@ \dim_eval:n { \l_galley_text_width_dim - ( ( #2 ) + ( #4 ) ) } } { - \galley_set_parshape_map_aux:nw + \__galley_set_parshape_map_aux:nw { #1 \dim_eval:n { \l_galley_total_left_margin_dim + ( #2 ) } @@ -525,19 +522,19 @@ #3 \q_mark #5 \q_stop } } -\cs_new_protected_nopar:Npn \galley_generate_parshape_lines: +\cs_new_protected_nopar:Npn \__galley_generate_parshape_lines: { \int_compare:nNnTF \tex_parshape:D > \g_galley_previous_par_lines_int { \tex_global:D \tex_parshape:D - \int_eval:w \tex_parshape:D - \g_galley_previous_par_lines_int - \int_eval_end: - \prg_stepwise_function:nnnN + \__int_eval:w \tex_parshape:D - \g_galley_previous_par_lines_int + \__int_eval_end: + \int_step_function:nnnN { \g_galley_previous_par_lines_int + \c_one } - \c_one \tex_parshape:D \galley_generate_parshape_lines_aux:n + \c_one \tex_parshape:D \__galley_generate_parshape_lines:n } { - \bool_gset_false:N \g_galley_parshape_set_bool + \bool_gset_false:N \g__galley_parshape_set_bool \tex_global:D \tex_parshape:D \c_one \dim_use:N \l_galley_total_left_margin_dim @@ -545,16 +542,16 @@ \dim_use:N \l_galley_text_width_dim } } -\cs_new:Npn \galley_generate_parshape_lines_aux:n #1 +\cs_new:Npn \__galley_generate_parshape_lines:n #1 { \etex_parshapeindent:D #1 ~ \etex_parshapelength:D #1 } \cs_new_protected:Npn \galley_set_user_penalty:n #1 - { \tl_gset:Nx \g_galley_interpar_penalty_user_tl { \int_eval:n {#1} } } + { \tl_gset:Nx \g__galley_interpar_penalty_user_tl { \int_eval:n {#1} } } \cs_new_protected:Npn \galley_set_user_vspace:n #1 - { \tl_gset:Nx \g_galley_interpar_vspace_user_tl { \skip_eval:n {#1} } } + { \tl_gset:Nx \g__galley_interpar_vspace_user_tl { \skip_eval:n {#1} } } \dim_set:Nn \parskip \c_zero_dim \cs_undefine:N \parskip \skip_new:N \parskip @@ -591,7 +588,7 @@ \cs_new_protected:Npn \galley_break_line:Nn #1#2 { \mode_if_vertical:TF - { \msg_kernel_error:nn { galley } { no-line-to-end } } + { \__msg_kernel_error:nn { galley } { no-line-to-end } } { \tex_unskip:D \bool_if:NF #1 @@ -614,7 +611,7 @@ \cs_new_protected:Npn \galley_set_display_widow_penalties:n #1 { \etex_displaywidowpenalties:D - \int_eval:w \clist_length:n {#1} + \c_one \int_eval_end: + \__int_eval:w \clist_count:n {#1} + \c_one \__int_eval_end: \clist_map_function:nN {#1} \galley_set_aux:n \c_zero } @@ -622,7 +619,7 @@ \cs_new_protected:Npn \galley_set_widow_penalties:n #1 { \etex_widowpenalties:D - \int_eval:w \clist_length:n {#1} + \c_one \int_eval_end: + \__int_eval:w \clist_count:n {#1} + \c_one \__int_eval_end: \clist_map_function:nN {#1} \galley_set_aux:n \c_zero } @@ -631,107 +628,105 @@ \cs_new_protected:Npn \galley_set_club_penalties:n #1 { \clist_set:Nn \l_galley_club_penalties_clist {#1} - \galley_calc_interline_penalties: + \__galley_calc_interline_penalties: } \cs_generate_variant:Nn \galley_set_club_penalties:n { V , v } \cs_new_protected:Npn \galley_set_interline_penalties:n #1 { \clist_set:Nn \l_galley_line_penalties_clist {#1} - \galley_calc_interline_penalties: + \__galley_calc_interline_penalties: } \cs_generate_variant:Nn \galley_set_interline_penalties:n { V , v } \cs_new_protected:Npn \galley_set_display_club_penalties:n #1 { \etex_clubpenalties:D - \int_eval:w \clist_length:n {#1} + \c_one \int_eval_end: + \__int_eval:w \clist_count:n {#1} + \c_one \__int_eval_end: \clist_map_function:nN {#1} \galley_set_aux:n \c_zero - \galley_calc_interline_penalties: + \__galley_calc_interline_penalties: } \cs_generate_variant:Nn \galley_set_display_club_penalties:n { V , v } \cs_new_protected:Npn \galley_set_interline_penalty:n #1 { \int_compare:nNnTF { \etex_interlinepenalties:D \c_zero } = \c_zero { - \etex_interlinepenalties:D \c_one \int_eval:w #1 \int_eval_end: - \galley_calc_interline_penalties: + \etex_interlinepenalties:D \c_one \__int_eval:w #1 \__int_eval_end: + \__galley_calc_interline_penalties: } { - \cs_set:Npn \galley_set_interline_penalty_aux_ii:n ##1 + \cs_set:Npn \__galley_set_interline_penalty_ii:n ##1 { - \int_eval:w + \__int_eval:w \etex_interlinepenalties:D ##1 - \etex_interlinepenalties:D \etex_interlinepenalties:D \c_zero + #1 - \int_eval_end: + \__int_eval_end: } - \exp_args:Nf \galley_set_interline_penalty_aux:nn - { \clist_length:N \l_galley_line_penalties_clist } {#1} + \exp_args:Nf \__galley_set_interline_penalty:nn + { \clist_count:N \l_galley_line_penalties_clist } {#1} } } -\cs_new_protected:Npn \galley_set_interline_penalty_aux:nn #1#2 +\cs_new_protected:Npn \__galley_set_interline_penalty:nn #1#2 { \etex_interlinepenalties:D \etex_interlinepenalties:D \c_zero - \prg_stepwise_function:nnnN \c_one \c_one {#1} - \galley_set_interline_penalty_aux_i:n - \prg_stepwise_function:nnnN { #1 + \c_one } \c_one + \int_step_function:nnnN \c_one \c_one {#1} + \__galley_set_interline_penalty_i:n + \int_step_function:nnnN { #1 + \c_one } \c_one { \etex_interlinepenalties:D \c_zero - \c_one } - \galley_set_interline_penalty_aux_ii:n - \int_eval:w #2 \int_eval_end: + \__galley_set_interline_penalty_ii:n + \__int_eval:w #2 \__int_eval_end: } -\cs_new:Npn \galley_set_interline_penalty_aux_i:n #1 - { \etex_interlinepenalties:D \int_eval:w #1 \int_eval_end: } -\cs_new:Npn \galley_set_interline_penalty_aux_ii:n #1 { } -\cs_new_protected_nopar:Npn \galley_calc_interline_penalties: +\cs_new:Npn \__galley_set_interline_penalty_i:n #1 + { \etex_interlinepenalties:D \__int_eval:w #1 \__int_eval_end: } +\cs_new:Npn \__galley_set_interline_penalty_ii:n #1 { } +\cs_new_protected_nopar:Npn \__galley_calc_interline_penalties: { - \exp_args:Nff \galley_calc_interline_penalties_aux:nn + \exp_args:Nff \__galley_calc_interline_penalties:nn { \int_eval:n { \int_max:nn { - \clist_length:N \l_galley_club_penalties_clist + \clist_count:N \l_galley_club_penalties_clist + \c_one } { \int_max:nn { - \clist_length:N \l_galley_line_penalties_clist + \clist_count:N \l_galley_line_penalties_clist + \c_one } { \etex_clubpenalties:D \c_zero } } } } - { \clist_length:N \l_galley_line_penalties_clist } + { \clist_count:N \l_galley_line_penalties_clist } } -\cs_new_protected:Npn \galley_calc_interline_penalties_aux:nn #1#2 +\cs_new_protected:Npn \__galley_calc_interline_penalties:nn #1#2 { \etex_interlinepenalties:D #1 ~ - \prg_stepwise_function:nnnN \c_one \c_one {#2} - \galley_calc_interline_penalties_aux_i:n - \prg_stepwise_function:nnnN { #2 + \c_one } \c_one { #1 - \c_one } - \galley_calc_interline_penalties_aux_ii:n + \int_step_function:nnnN \c_one \c_one {#2} + \__galley_calc_interline_penalties_i:n + \int_step_function:nnnN { #2 + \c_one } \c_one { #1 - \c_one } + \__galley_calc_interline_penalties_ii:n \etex_interlinepenalties:D \etex_interlinepenalties:D \c_zero } -\cs_new:Npn \galley_calc_interline_penalties_aux_i:n #1 +\cs_new:Npn \__galley_calc_interline_penalties_i:n #1 { - \int_eval:w - \clist_item:Nn \l_galley_line_penalties_clist { #1 - \c_one } - + 0 \clist_item:Nn \l_galley_club_penalties_clist - { #1 - \c_one } + \__int_eval:w + \clist_item:Nn \l_galley_line_penalties_clist {#1} + + 0 \clist_item:Nn \l_galley_club_penalties_clist {#1} - \etex_clubpenalties:D #1 ~ - \int_eval_end: + \__int_eval_end: } -\cs_new:Npn \galley_calc_interline_penalties_aux_ii:n #1 +\cs_new:Npn \__galley_calc_interline_penalties_ii:n #1 { - \int_eval:w + \__int_eval:w \etex_interlinepenalties:D \etex_interlinepenalties:D \c_zero - + 0 \clist_item:Nn \l_galley_club_penalties_clist - { #1 - \c_one } + + 0 \clist_item:Nn \l_galley_club_penalties_clist {#1} - \etex_clubpenalties:D #1 ~ - \int_eval_end: + \__int_eval_end: } \cs_new_protected:Npn \galley_save_club_penalties:N #1 { \clist_set_eq:NN #1 \l_galley_club_penalties_clist } @@ -741,38 +736,38 @@ { \clist_set:Nx #1 { - \prg_stepwise_function:nnnN \c_one \c_one + \int_step_function:nnnN \c_one \c_one { \etex_clubpenalties:D \c_zero - \c_one } \galley_save_display_club_penalties:_aux:n } } \cs_new:Npn \galley_save_display_club_penalties:_aux:n #1 - { \int_use:N \etex_clubpenaltes:D \int_eval:w #1 \int_eval_end: , } + { \int_use:N \etex_clubpenaltes:D \__int_eval:w #1 \__int_eval_end: , } \cs_new_protected:Npn \galley_save_display_widow_penalties:N #1 { \clist_set:Nx #1 { - \prg_stepwise_function:nnnN \c_one \c_one + \int_step_function:nnnN \c_one \c_one { \etex_displaywidowpenalties:D \c_zero - \c_one } \galley_save_display_widow_penalties:_aux:n } } \cs_new:Npn \galley_save_display_widow_penalties:_aux:n #1 - { \int_use:N \etex_displaywidowpenalties:D \int_eval:w #1 \int_eval_end: , } + { \int_use:N \etex_displaywidowpenalties:D \__int_eval:w #1 \__int_eval_end: , } \cs_new_protected:Npn \galley_save_widow_penalties:N #1 { \clist_set:Nx #1 { - \prg_stepwise_function:nnnN \c_one \c_one + \int_step_function:nnnN \c_one \c_one { \etex_widowpenalties:D \c_zero - \c_one } \galley_save_widow_penalties:_aux:n } } \cs_new:Npn \galley_save_widow_penalties:_aux:n #1 - { \int_use:N \etex_widowpenalties:D \int_eval:w #1 \int_eval_end: , } + { \int_use:N \etex_widowpenalties:D \__int_eval:w #1 \__int_eval_end: , } \cs_new_protected_nopar:Npn \galley_interline_penalty: { \int_use:N \etex_interlinepenalties:D \etex_interlinepenalties:D \c_zero } -\msg_kernel_new:nnn { galley } { no-line-to-end } +\__msg_kernel_new:nnn { galley } { no-line-to-end } { There's~no~line~here~to~end. } \RenewDocumentCommand \clearpage { } { @@ -807,7 +802,7 @@ { \galley_break_line:Nn #1 {#2} } \RenewDocumentCommand \newline { } { \galley_break_line:Nn \c_true_bool { 0 pt } } -\cs_set_eq:NN \@@par \galley_std_par: +\cs_set_eq:NN \__galleypar \__galley_std_par: \cs_set_protected_nopar:Npn \@afterheading { \bool_gset_true:N \g_galley_no_break_next_bool |