summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/l3experimental/xgalley/l3galley.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/source/latex/l3experimental/xgalley/l3galley.dtx')
-rw-r--r--Master/texmf-dist/source/latex/l3experimental/xgalley/l3galley.dtx75
1 files changed, 37 insertions, 38 deletions
diff --git a/Master/texmf-dist/source/latex/l3experimental/xgalley/l3galley.dtx b/Master/texmf-dist/source/latex/l3experimental/xgalley/l3galley.dtx
index f0ff78ee457..1821ea5a0f8 100644
--- a/Master/texmf-dist/source/latex/l3experimental/xgalley/l3galley.dtx
+++ b/Master/texmf-dist/source/latex/l3experimental/xgalley/l3galley.dtx
@@ -59,7 +59,7 @@
% }^^A
% }
%
-% \date{Released 2018/03/05}
+% \date{Released 2018-04-30}
%
% \maketitle
%
@@ -685,7 +685,7 @@
%
% \begin{macrocode}
%<*package>
-\ProvidesExplPackage{l3galley}{2018/03/05}{}
+\ProvidesExplPackage{l3galley}{2018-04-30}{}
{L3 Experimental galley code}
%</package>
% \end{macrocode}
@@ -1144,10 +1144,10 @@
%
% \subsection{The \cs{par} token}
%
-% \begin{variable}{\s__par_omit}
+% \begin{variable}{\s_@@_par_omit}
% Used to indicate that a paragraph should be omitted.
% \begin{macrocode}
-\__scan_new:N \s__par_omit
+\scan_new:N \s_@@_par_omit
% \end{macrocode}
% \end{variable}
%
@@ -1162,18 +1162,18 @@
% \begin{macrocode}
\cs_new_protected:Npn \galley_par:
{
- \s__par_omit
+ \s_@@_par_omit
\exp_after:wN \@@_par_auxi: \exp:w \exp_end_continue_f:w
}
\cs_new_protected:Npn \@@_par_auxi:
{
- \peek_meaning:NTF \s__par_omit
+ \peek_meaning:NTF \s_@@_par_omit
{ \@@_par_aux:N }
{ \@@_par_auxii: }
}
\cs_new_protected:Npn \@@_par_aux:N #1
{
- \str_if_eq_x:nnF {#1} { \s__par_omit }
+ \str_if_eq_x:nnF {#1} { \s_@@_par_omit }
{
\@@_par_auxii:
#1
@@ -1283,7 +1283,7 @@
% \begin{macrocode}
\cs_new_protected:Npn \galley_par:n #1
{
- \s__par_omit
+ \s_@@_par_omit
\bool_if:NF \g_@@_begin_level_bool
{
#1
@@ -1584,7 +1584,7 @@
}
{
\tex_penalty:D
- \__int_eval:n { \g_@@_interpar_penalty_user_tl }
+ \int_eval:n { \g_@@_interpar_penalty_user_tl } \exp_stop_f:
\tl_gclear:N \g_@@_interpar_penalty_user_tl
}
\bool_gset_false:N \g_galley_no_break_next_bool
@@ -1863,15 +1863,15 @@
\cs_new_protected:Npn \@@_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
\@@_parshape_set_indents:nn
}
\cs_new:Npn \@@_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:
}
% \end{macrocode}
% Calculating cutouts is by far the most complex operation here. The
@@ -2225,7 +2225,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} \@@_set_aux:n
0 \exp_stop_f:
}
@@ -2233,7 +2233,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} \@@_set_aux:n
0 \exp_stop_f:
}
@@ -2284,7 +2284,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} \@@_set_aux:n
0 \exp_stop_f:
\@@_calc_interline_penalties:
@@ -2311,18 +2311,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:
\@@_calc_interline_penalties:
}
{
\cs_set:Npn \@@_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 \@@_set_interline_penalty:nn
{ \clist_count:N \l_galley_line_penalties_clist } {#1}
@@ -2332,15 +2333,14 @@
{
\etex_interlinepenalties:D
\etex_interlinepenalties:D 0 \exp_stop_f:
- \int_step_function:nnnN { 1 } { 1 } {#1}
+ \int_step_function:nN {#1}
\@@_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 }
\@@_set_interline_penalty_auxii:n
- \__int_eval:n {#2}
+ \int_eval:n {#2} \exp_stop_f:
}
\cs_new:Npn \@@_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 \@@_set_interline_penalty_auxii:n #1 { }
% \end{macrocode}
% \end{macro}
@@ -2384,29 +2384,31 @@
\cs_new_protected:Npn \@@_calc_interline_penalties:nn #1#2
{
\etex_interlinepenalties:D #1 ~
- \int_step_function:nnnN { 1 } { 1 } {#2}
+ \int_step_function:nN {#2}
\@@_calc_interline_penalties_auxi:n
- \int_step_function:nnnN { #2 + 1 } { 1 } { #1 - 1 }
+ \int_step_function:nnN { #2 + 1 } { #1 - 1 }
\@@_calc_interline_penalties_auxii:n
\etex_interlinepenalties:D \etex_interlinepenalties:D 0 \exp_stop_f:
}
\cs_new:Npn \@@_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 \@@_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:
}
% \end{macrocode}
% \end{macro}
@@ -2443,45 +2445,42 @@
{
\clist_set:Nx #1
{
- \int_step_function:nnnN { 1 } { 1 }
- { \etex_clubpenalties:D 0 - 1 }
+ \int_step_function:nN { \etex_clubpenalties:D 0 - 1 }
\@@_save_display_club_penalties:n
}
}
\cs_new:Npn \@@_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 }
\@@_save_display_widow_penalties:n
}
}
\cs_new:Npn \@@_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 }
\@@_save_widow_penalties:n
}
}
\cs_new:Npn \@@_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} , }
% \end{macrocode}
% This one is not an array, but is stored in a primitive, so there is
% a simple conversion. The general interline penalty is always the
% last value in the primitive array.
% \begin{macrocode}
\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: }
% \end{macrocode}
% \end{macro}
% \end{macro}