diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3experimental/xgalley/xgalley.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/l3experimental/xgalley/xgalley.sty | 182 |
1 files changed, 91 insertions, 91 deletions
diff --git a/Master/texmf-dist/tex/latex/l3experimental/xgalley/xgalley.sty b/Master/texmf-dist/tex/latex/l3experimental/xgalley/xgalley.sty index 3e3d251791a..31fe465cef3 100644 --- a/Master/texmf-dist/tex/latex/l3experimental/xgalley/xgalley.sty +++ b/Master/texmf-dist/tex/latex/l3experimental/xgalley/xgalley.sty @@ -48,13 +48,13 @@ %% ----------------------------------------------------------------------- %% \RequirePackage{l3names} -\GetIdInfo$Id: xgalley.dtx 3253 2012-01-28 14:59:55Z joseph $ +\GetIdInfo$Id: xgalley.dtx 3879 2012-07-01 09:17:47Z joseph $ {L3 Experimental galley} \ProvidesExplPackage {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} \RequirePackage{xparse,xtemplate,l3galley} -\clist_new:N \l_galley_tmpa_clist -\clist_new:N \l_galley_tmpb_clist +\clist_new:N \l__galley_tmpa_clist +\clist_new:N \l__galley_tmpb_clist \DeclareObjectType { measure } { 0 } \DeclareTemplateInterface { measure } { absolute } { 0 } { @@ -66,27 +66,27 @@ left-margin : length = 0 pt , right-margin : length = 0 pt } -\cs_new_eq:NN \l_galley_left_margin_dim \leftmargin -\cs_new_eq:NN \l_galley_right_margin_dim \rightmargin +\cs_new_eq:NN \l__galley_left_margin_dim \leftmargin +\cs_new_eq:NN \l__galley_right_margin_dim \rightmargin \DeclareTemplateCode { measure } { absolute } { 0 } { - left-margin = \l_galley_left_margin_dim , - right-margin = \l_galley_right_margin_dim + left-margin = \l__galley_left_margin_dim , + right-margin = \l__galley_right_margin_dim } { \AssignTemplateKeys - \galley_margins_set_absolute:nn \l_galley_left_margin_dim - \l_galley_right_margin_dim + \galley_margins_set_absolute:nn \l__galley_left_margin_dim + \l__galley_right_margin_dim } \DeclareTemplateCode { measure } { relative } { 0 } { - left-margin = \l_galley_left_margin_dim , - right-margin = \l_galley_right_margin_dim + left-margin = \l__galley_left_margin_dim , + right-margin = \l__galley_right_margin_dim } { \AssignTemplateKeys - \galley_margins_set_relative:nn \l_galley_left_margin_dim - \l_galley_right_margin_dim + \galley_margins_set_relative:nn \l__galley_left_margin_dim + \l__galley_right_margin_dim } \DeclareObjectType { parshape } { 0 } \DeclareTemplateInterface { parshape } { hang } { 0 } @@ -103,58 +103,58 @@ } \DeclareTemplateCode { parshape } { hang } { 0 } { - indent = \l_galley_parshape_indent_dim , - on-left-side = \l_galley_parshape_on_left_bool , - lines = \l_galley_parshape_lines_int + indent = \l__galley_parshape_indent_dim , + on-left-side = \l__galley_parshape_on_left_bool , + lines = \l__galley_parshape_lines_int } { \AssignTemplateKeys - \bool_if:NTF \l_galley_parshape_on_left_bool + \bool_if:NTF \l__galley_parshape_on_left_bool { \galley_parshape_single_par:nVVN - \l_galley_parshape_lines_int - \l_galley_parshape_indent_dim + \l__galley_parshape_lines_int + \l__galley_parshape_indent_dim \c_zero_dim \c_false_bool } { \galley_parshape_single_par:nVVN - \l_galley_parshape_lines_int + \l__galley_parshape_lines_int \c_zero_dim - \l_galley_parshape_indent_dim + \l__galley_parshape_indent_dim \c_false_bool } } \DeclareTemplateCode { parshape } { initial } { 0 } { - indent = \l_galley_parshape_indent_dim , - on-left-side = \l_galley_parshape_on_left_bool , - lines = \l_galley_parshape_lines_int + indent = \l__galley_parshape_indent_dim , + on-left-side = \l__galley_parshape_on_left_bool , + lines = \l__galley_parshape_lines_int } { \AssignTemplateKeys - \clist_clear:N \l_galley_tmpa_clist - \clist_clear:N \l_galley_tmpb_clist - \prg_replicate:nn { \l_galley_parshape_lines_int } + \clist_clear:N \l__galley_tmpa_clist + \clist_clear:N \l__galley_tmpb_clist + \prg_replicate:nn { \l__galley_parshape_lines_int } { - \clist_put_right:Nn \l_galley_tmpa_clist - { \l_galley_parshape_indent_dim } - \clist_put_right:Nn \l_galley_tmpb_clist + \clist_put_right:Nn \l__galley_tmpa_clist + { \l__galley_parshape_indent_dim } + \clist_put_right:Nn \l__galley_tmpb_clist { \c_zero_dim } } - \bool_if:NTF \l_galley_parshape_on_left_bool + \bool_if:NTF \l__galley_parshape_on_left_bool { \galley_parshape_single_par:nVVN \c_zero - \l_galley_tmpa_clist - \l_galley_tmpb_clist + \l__galley_tmpa_clist + \l__galley_tmpb_clist \c_true_bool } { \galley_parshape_single_par:nVVN \c_zero - \l_galley_tmpb_clist - \l_galley_tmpa_clist + \l__galley_tmpb_clist + \l__galley_tmpa_clist \c_true_bool } } @@ -207,7 +207,7 @@ } \UseTemplate { hyphenation } { std } { } \tex_defaulthyphenchar:D 45 \scan_stop: -\tl_new:N \l_galley_justification_other_tl +\tl_new:N \l__galley_justification_other_tl \DeclareObjectType { justification } { 0 } \DeclareTemplateInterface { justification } { std } { 0 } { @@ -241,7 +241,7 @@ } { \AssignTemplateKeys - \tl_clear:N \l_galley_justification_other_tl + \tl_clear:N \l__galley_justification_other_tl \galley_set_interword_spacing:N \l_galley_fixed_spacing_bool \bool_if:NTF \l_galley_par_stretch_last_bool { \int_set_eq:NN \l_galley_last_line_fit_int \c_one_thousand } @@ -259,7 +259,7 @@ stretch-last-line = \l_galley_par_stretch_last_bool } { - \tl_put_left:Nx \l_galley_justification_other_tl + \tl_put_left:Nx \l__galley_justification_other_tl { \skip_set:Nn \exp_not:N \l_galley_par_end_skip { \skip_use:N \l_galley_par_end_skip } @@ -282,7 +282,7 @@ { \skip_use:N \l_galley_line_right_skip } } \tl_gput_right:Nn \g_galley_restore_running_tl - { \l_galley_justification_other_tl } + { \l__galley_justification_other_tl } \AssignTemplateKeys \galley_set_interword_spacing:N \l_galley_fixed_spacing_bool \bool_if:NTF \l_galley_par_stretch_last_bool @@ -337,16 +337,16 @@ } \DeclareTemplateCode { justification } { compound } { 0 } { - first-paragraph = \galley_justification_first: , - other-paragraphs = \galley_justification_other: + first-paragraph = \__galley_justification_first: , + other-paragraphs = \__galley_justification_other: } { \AssignTemplateKeys - \galley_justification_first: - \tl_set:Nn \l_galley_justification_other_tl - { \galley_justification_other: } + \__galley_justification_first: + \tl_set:Nn \l__galley_justification_other_tl + { \__galley_justification_other: } \tl_gput_right:Nn \g_galley_restore_running_tl - { \l_galley_justification_other_tl } + { \l__galley_justification_other_tl } } \DeclareObjectType { line-breaking } { 0 } \DeclareTemplateInterface { line-breaking } { std } { 0 } @@ -366,15 +366,15 @@ \DeclareTemplateCode{ line-breaking } { std } { 0 } { badness = \l_galley_linebreak_badness_int , - binop-penalty = \l_galley_binop_penalty_int , + binop-penalty = \l__galley_binop_penalty_int , double-hyphen-demerits = \l_galley_double_hyphen_demerits_int , emergency-stretch = \l_galley_emergency_stretch_skip , final-hyphen-demerits = \l_galley_final_hyphen_demerits_int , fuzz = \l_galley_linebreak_fuzz_dim , - line-penalty = \l_galley_linebreak_penalty_int , + line-penalty = \l__galley_linebreak_penalty_int , mismatch-demerits = \l_galley_mismatch_demerits_int , pretolerance = \l_galley_linebreak_pretolerance_int , - relation-penalty = \l_galley_relation_penalty_int , + relation-penalty = \l__galley_relation_penalty_int , tolerance = \l_galley_linebreak_tolerance_int } { \AssignTemplateKeys } @@ -397,23 +397,23 @@ \DeclareTemplateCode { paragraph-breaking } { std } { 0 } { badness = \l_galley_parbreak_badness_int , - broken-penalty = \l_galley_broken_penalty_int , - club-penalty = \l_galley_club_penalty_int , - display-club-penalty = \l_galley_display_club_penalty_int , - display-widow-penalty = \l_galley_display_widow_penalty_int , + broken-penalty = \l__galley_broken_penalty_int , + club-penalty = \l__galley_club_penalty_int , + display-club-penalty = \l__galley_display_club_penalty_int , + display-widow-penalty = \l__galley_display_widow_penalty_int , fuzz = \l_galley_parbreak_fuzz_dim , - interline-penalty = \l_galley_interline_penalty_int , - post-display-penalty = \l_galley_post_display_penalty_int , - pre-display-penalty = \l_galley_pre_display_penalty_int , - widow-penalty = \l_galley_widow_penalty_int + interline-penalty = \l__galley_interline_penalty_int , + post-display-penalty = \l__galley_post_display_penalty_int , + pre-display-penalty = \l__galley_pre_display_penalty_int , + widow-penalty = \l__galley_widow_penalty_int } { \AssignTemplateKeys - \galley_set_club_penalties:V \l_galley_club_penalty_int - \galley_set_display_club_penalties:V \l_galley_display_club_penalty_int - \galley_set_display_widow_penalties:V \l_galley_display_widow_penalty_int - \galley_set_interline_penalty:n \l_galley_interline_penalty_int - \galley_set_widow_penalties:V \l_galley_widow_penalty_int + \galley_set_club_penalties:V \l__galley_club_penalty_int + \galley_set_display_club_penalties:V \l__galley_display_club_penalty_int + \galley_set_display_widow_penalties:V \l__galley_display_widow_penalty_int + \galley_set_interline_penalty:n \l__galley_interline_penalty_int + \galley_set_widow_penalties:V \l__galley_widow_penalty_int } \DeclareInstance { paragraph-breaking } { std } { std } { } \UseInstance { paragraph-breaking } { std } @@ -444,39 +444,39 @@ } \DeclareTemplateCode { paragraph-breaking } { single } { 0 } { - badness = \l_galley_parbreak_badness_tl , - broken-penalty = \l_galley_broken_penalty_tl , - club-penalty = \l_galley_club_penalties_tl , - display-club-penalty = \l_galley_display_club_penalties_tl , - display-widow-penalty = \l_galley_display_widow_penalties_tl , - fuzz = \l_galley_parbreak_fuzz_tl , - interline-penalty = \l_galley_interline_penalty_tl , - post-display-penalty = \l_galley_post_display_penalty_tl , - pre-display-penalty = \l_galley_pre_display_penalty_tl , - widow-penalty = \l_galley_widow_penalties_tl + badness = \l__galley_parbreak_badness_tl , + broken-penalty = \l__galley_broken_penalty_tl , + club-penalty = \l__galley_club_penalties_tl , + display-club-penalty = \l__galley_display_club_penalties_tl , + display-widow-penalty = \l__galley_display_widow_penalties_tl , + fuzz = \l__galley_parbreak_fuzz_tl , + interline-penalty = \l__galley_interline_penalty_tl , + post-display-penalty = \l__galley_post_display_penalty_tl , + pre-display-penalty = \l__galley_pre_display_penalty_tl , + widow-penalty = \l__galley_widow_penalties_tl } { \AssignTemplateKeys - \tl_if_empty:NF \l_galley_interline_penalty_tl + \tl_if_empty:NF \l__galley_interline_penalty_tl { \tl_gput_right:Nx \g_galley_par_after_hook_tl { - \int_set:Nn \exp_not:N \l_galley_interline_penalty_int + \int_set:Nn \exp_not:N \l__galley_interline_penalty_int { \galley_interline_penalty: } } - \int_set:Nn \l_galley_interline_penalty_int - { \l_galley_interline_penalty_tl } + \int_set:Nn \l__galley_interline_penalty_int + { \l__galley_interline_penalty_tl } } - \tl_if_empty:NF \l_galley_parbreak_fuzz_tl + \tl_if_empty:NF \l__galley_parbreak_fuzz_tl { \tl_gput_right:Nx \g_galley_par_after_hook_tl { \dim_set:Nn \exp_not:N \l_galley_parbreak_fuzz_dim { \dim_use:N \l_galley_parbreak_fuzz_dim } } - \dim_set:Nn \l_galley_parbreak_fuzz_dim { \l_galley_parbreak_fuzz_tl } + \dim_set:Nn \l_galley_parbreak_fuzz_dim { \l__galley_parbreak_fuzz_tl } } - \seq_map_inline:Nn \c_galley_parbreak_single_seq + \seq_map_inline:Nn \c__galley_parbreak_single_seq { \tl_if_empty:cF { l_galley_ ##1 _tl } { @@ -489,30 +489,30 @@ { \tl_use:c { l_galley_ ##1 _tl } } } } - \seq_map_inline:Nn \c_galley_parbreak_multi_seq + \seq_map_inline:Nn \c__galley_parbreak_multi_seq { \tl_if_empty:cF { l_galley_ ##1 _tl } { - \use:c { galley_save_ ##1 :N } \l_galley_tmpa_clist + \use:c { galley_save_ ##1 :N } \l__galley_tmpa_clist \tl_gput_right:Nx \g_galley_par_after_hook_tl { \exp_not:c { galley_set_ ##1 :n } - { \exp_not:o \l_galley_tmpa_clist } + { \exp_not:o \l__galley_tmpa_clist } } \use:c { galley_set_ ##1 :v } { l_galley_ ##1 _tl } } } } -\seq_new:N \c_galley_parbreak_multi_seq -\seq_gput_right:Nn \c_galley_parbreak_multi_seq { club_penalties } -\seq_gput_right:Nn \c_galley_parbreak_multi_seq { display_club_penalties } -\seq_gput_right:Nn \c_galley_parbreak_multi_seq { display_widow_penalties } -\seq_gput_right:Nn \c_galley_parbreak_multi_seq { widow_penalties } -\seq_new:N \c_galley_parbreak_single_seq -\seq_gput_right:Nn \c_galley_parbreak_single_seq { parbreak_badness } -\seq_gput_right:Nn \c_galley_parbreak_single_seq { broken_penalty } -\seq_gput_right:Nn \c_galley_parbreak_single_seq { post_display_penalty } -\seq_gput_right:Nn \c_galley_parbreak_single_seq { pre_display_penalty } +\seq_new:N \c__galley_parbreak_multi_seq +\seq_gput_right:Nn \c__galley_parbreak_multi_seq { club_penalties } +\seq_gput_right:Nn \c__galley_parbreak_multi_seq { display_club_penalties } +\seq_gput_right:Nn \c__galley_parbreak_multi_seq { display_widow_penalties } +\seq_gput_right:Nn \c__galley_parbreak_multi_seq { widow_penalties } +\seq_new:N \c__galley_parbreak_single_seq +\seq_gput_right:Nn \c__galley_parbreak_single_seq { parbreak_badness } +\seq_gput_right:Nn \c__galley_parbreak_single_seq { broken_penalty } +\seq_gput_right:Nn \c__galley_parbreak_single_seq { post_display_penalty } +\seq_gput_right:Nn \c__galley_parbreak_single_seq { pre_display_penalty } \DeclareInstance { paragraph-breaking } { single-std } { single } { } \DeclareInstance { paragraph-breaking } { single-nobreak } { single } { |