summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-05-13 21:56:47 +0000
committerKarl Berry <karl@freefriends.org>2018-05-13 21:56:47 +0000
commite6d38f40f0132914020c723840be3489c4b692f0 (patch)
treedac2c281e93cba461b3ff2c1e4b8e34aad401716 /Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty
parent55be422dc01e60cfae781a9a4a310a96c9e99256 (diff)
l3 (13may18)
git-svn-id: svn://tug.org/texlive/trunk@47705 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty')
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty60
1 files changed, 30 insertions, 30 deletions
diff --git a/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty b/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty
index 5b7b539bd92..8842c475e02 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-04-30}{}
+\ProvidesExplPackage{l3galley}{2018-05-12}{}
{L3 Experimental galley code}
\int_new:N \l__galley_tmp_int
\seq_new:N \g__galley_tmpa_seq
@@ -87,7 +87,7 @@
\int_new:N \l__galley_group_level_int
\cs_new_protected:Npn \__galley_initialise_variables:
{
- \int_set:Nn \l__galley_group_level_int { \etex_currentgrouplevel:D }
+ \int_set:Nn \l__galley_group_level_int { \tex_currentgrouplevel:D }
\bool_gset_true:N \g__galley_begin_level_bool
\bool_gset_false:N \g__galley_cutout_active_bool
\seq_gclear:N \g__galley_cutout_left_seq
@@ -263,7 +263,7 @@
}
\__galley_parshape_set:
}
- \int_compare:nNnT \l__galley_group_level_int = \etex_currentgrouplevel:D
+ \int_compare:nNnT \l__galley_group_level_int = \tex_currentgrouplevel:D
{
\bool_lazy_and:nnT
{ \seq_if_empty_p:N \g__galley_cutout_left_seq }
@@ -664,8 +664,8 @@
{ \galley_vspace_set_single:n {#1} }
{
\dim_compare:nNnT
- { \etex_glueexpr:D \g__galley_interpar_vspace_user_tl }
- < { \etex_glueexpr:D (#1) \scan_stop: }
+ { \tex_glueexpr:D \g__galley_interpar_vspace_user_tl }
+ < { \tex_glueexpr:D (#1) \scan_stop: }
{ \galley_vspace_set_single:n {#1} }
}
}
@@ -677,7 +677,7 @@
\dim_new:N \l_galley_par_begin_skip
\cs_new_eq:NN \l_galley_par_end_skip \tex_parfillskip:D
\cs_new_eq:NN \l_galley_par_indent_dim \tex_parindent:D
-\cs_new_eq:NN \l_galley_last_line_fit_int \etex_lastlinefit:D
+\cs_new_eq:NN \l_galley_last_line_fit_int \tex_lastlinefit:D
\cs_new_protected:Npn \galley_interword_spacing_set:N #1
{
\bool_if:NTF #1
@@ -727,7 +727,7 @@
\clist_new:N \l_galley_line_penalties_clist
\cs_new_protected:Npn \galley_display_widow_penalties_set:n #1
{
- \etex_displaywidowpenalties:D
+ \tex_displaywidowpenalties:D
\int_eval:n { \clist_count:n {#1} + 1 } \exp_stop_f:
\clist_map_function:nN {#1} \__galley_set_aux:n
0 \exp_stop_f:
@@ -735,7 +735,7 @@
\cs_generate_variant:Nn \galley_display_widow_penalties_set:n { V , v }
\cs_new_protected:Npn \galley_widow_penalties_set:n #1
{
- \etex_widowpenalties:D
+ \tex_widowpenalties:D
\int_eval:n { \clist_count:n {#1} + 1 } \exp_stop_f:
\clist_map_function:nN {#1} \__galley_set_aux:n
0 \exp_stop_f:
@@ -756,7 +756,7 @@
\cs_generate_variant:Nn \galley_interline_penalties_set:n { V , v }
\cs_new_protected:Npn \galley_display_club_penalties_set:n #1
{
- \etex_clubpenalties:D
+ \tex_clubpenalties:D
\int_eval:n { \clist_count:n {#1} + 1 } \exp_stop_f:
\clist_map_function:nN {#1} \__galley_set_aux:n
0 \exp_stop_f:
@@ -765,9 +765,9 @@
\cs_generate_variant:Nn \galley_display_club_penalties_set:n { V , v }
\cs_new_protected:Npn \galley_interline_penalty_set:n #1
{
- \int_compare:nNnTF { \etex_interlinepenalties:D 0 } = 0
+ \int_compare:nNnTF { \tex_interlinepenalties:D 0 } = 0
{
- \etex_interlinepenalties:D 1 = \int_eval:n {#1} \exp_stop_f:
+ \tex_interlinepenalties:D 1 = \int_eval:n {#1} \exp_stop_f:
\__galley_calc_interline_penalties:
}
{
@@ -775,8 +775,8 @@
{
\int_eval:n
{
- \etex_interlinepenalties:D ##1
- - \etex_interlinepenalties:D \etex_interlinepenalties:D 0
+ \tex_interlinepenalties:D ##1
+ - \tex_interlinepenalties:D \tex_interlinepenalties:D 0
+ #1
}
\exp_stop_f:
@@ -787,16 +787,16 @@
}
\cs_new_protected:Npn \__galley_set_interline_penalty:nn #1#2
{
- \etex_interlinepenalties:D
- \etex_interlinepenalties:D 0 \exp_stop_f:
+ \tex_interlinepenalties:D
+ \tex_interlinepenalties:D 0 \exp_stop_f:
\int_step_function:nN {#1}
\__galley_set_interline_penalty_auxi:n
- \int_step_function:nnN { #1 + 1 } { \etex_interlinepenalties:D 0 - 1 }
+ \int_step_function:nnN { #1 + 1 } { \tex_interlinepenalties:D 0 - 1 }
\__galley_set_interline_penalty_auxii:n
\int_eval:n {#2} \exp_stop_f:
}
\cs_new:Npn \__galley_set_interline_penalty_auxi:n #1
- { \etex_interlinepenalties:D \int_eval:n {#1} \exp_stop_f: }
+ { \tex_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:
{
@@ -807,19 +807,19 @@
{
\int_max:nn
{ \clist_count:N \l_galley_line_penalties_clist + 1 }
- { \etex_clubpenalties:D 0 }
+ { \tex_clubpenalties:D 0 }
}
}
{ \clist_count:N \l_galley_line_penalties_clist }
}
\cs_new_protected:Npn \__galley_calc_interline_penalties:nn #1#2
{
- \etex_interlinepenalties:D #1 ~
+ \tex_interlinepenalties:D #1 ~
\int_step_function:nN {#2}
\__galley_calc_interline_penalties_auxi:n
\int_step_function:nnN { #2 + 1 } { #1 - 1 }
\__galley_calc_interline_penalties_auxii:n
- \etex_interlinepenalties:D \etex_interlinepenalties:D 0 \exp_stop_f:
+ \tex_interlinepenalties:D \tex_interlinepenalties:D 0 \exp_stop_f:
}
\cs_new:Npn \__galley_calc_interline_penalties_auxi:n #1
{
@@ -827,7 +827,7 @@
{
\clist_item:Nn \l_galley_line_penalties_clist {#1}
+ 0 \clist_item:Nn \l_galley_club_penalties_clist {#1}
- - \etex_clubpenalties:D #1 ~
+ - \tex_clubpenalties:D #1 ~
}
\exp_stop_f:
}
@@ -835,9 +835,9 @@
{
\int_eval:n
{
- \etex_interlinepenalties:D \etex_interlinepenalties:D 0 \exp_stop_f:
+ \tex_interlinepenalties:D \tex_interlinepenalties:D 0 \exp_stop_f:
+ 0 \clist_item:Nn \l_galley_club_penalties_clist {#1}
- - \etex_clubpenalties:D #1 ~
+ - \tex_clubpenalties:D #1 ~
}
\exp_stop_f:
}
@@ -849,37 +849,37 @@
{
\clist_set:Nx #1
{
- \int_step_function:nN { \etex_clubpenalties:D 0 - 1 }
+ \int_step_function:nN { \tex_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 \tex_clubpenalties:D \int_eval:n {#1} , }
\cs_new_protected:Npn \galley_save_display_widow_penalties:N #1
{
\clist_set:Nx #1
{
- \int_step_function:nN { \etex_displaywidowpenalties:D 0 - 1 }
+ \int_step_function:nN { \tex_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_value:w \tex_displaywidowpenalties:D
\int_eval:n {#1} ,
}
\cs_new_protected:Npn \galley_save_widow_penalties:N #1
{
\clist_set:Nx #1
{
- \int_step_function:nN { \etex_widowpenalties:D 0 - 1 }
+ \int_step_function:nN { \tex_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 \tex_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 \tex_interlinepenalties:D \tex_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