diff options
author | Karl Berry <karl@freefriends.org> | 2016-03-26 22:56:01 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2016-03-26 22:56:01 +0000 |
commit | acbc4b3c1d3629ae290305ff7c6056eb83d1151c (patch) | |
tree | 59c4ad13167b9bad138b2c231cbd6bc9f2c9c311 /Master/texmf-dist/source/latex/l3experimental/xgalley | |
parent | 473c539aefe98fc932ea0ed651464b9f91482938 (diff) |
l3 (26mar16)
git-svn-id: svn://tug.org/texlive/trunk@40146 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/l3experimental/xgalley')
-rw-r--r-- | Master/texmf-dist/source/latex/l3experimental/xgalley/l3galley.dtx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/Master/texmf-dist/source/latex/l3experimental/xgalley/l3galley.dtx b/Master/texmf-dist/source/latex/l3experimental/xgalley/l3galley.dtx index 8bc0bafa285..602463015fe 100644 --- a/Master/texmf-dist/source/latex/l3experimental/xgalley/l3galley.dtx +++ b/Master/texmf-dist/source/latex/l3experimental/xgalley/l3galley.dtx @@ -38,8 +38,8 @@ %<*driver|package> % The version of expl3 required is tested as early as possible, as % some really old versions do not define \ProvidesExplPackage. -\RequirePackage{expl3}[2016/01/19] -%<package>\@ifpackagelater{expl3}{2016/01/19} +\RequirePackage{expl3}[2016/03/26] +%<package>\@ifpackagelater{expl3}{2016/03/26} %<package> {} %<package> {% %<package> \PackageError{l3galley}{Support package l3kernel too old} @@ -51,7 +51,7 @@ %<package> }% %<package> \endinput %<package> } -\GetIdInfo$Id: l3galley.dtx 6377 2016-01-19 22:28:13Z joseph $ +\GetIdInfo$Id: l3galley.dtx 6466 2016-03-26 16:23:41Z joseph $ {L3 Experimental galley code} %</driver|package> %<*driver> @@ -1798,7 +1798,7 @@ \@@_parshape_set_cutouts: \tl_set:Nx \l_@@_tmp_tl { - \int_use:N \tex_parshape:D + \__int_value:w \tex_parshape:D \int_step_function:nnnN \c_one \c_one \tex_parshape:D \tmp } @@ -1806,8 +1806,8 @@ } \def\tmp#1{% \c_space_tl - \int_use:N \etex_parshapeindent:D #1 \c_space_tl \c_space_tl - \int_use:N \etex_parshapelength:D #1 \c_space_tl + \__int_value:w \etex_parshapeindent:D #1 \c_space_tl \c_space_tl + \__int_value:w \etex_parshapelength:D #1 \c_space_tl } % \end{macrocode} % Setting the margins is simple. Either they are zero, using the full measure, @@ -2408,7 +2408,7 @@ } } \cs_new:Npn \@@_save_display_club_penalties:n #1 - { \int_use:N \etex_clubpenalties:D \__int_eval:w #1 \__int_eval_end: , } + { \__int_value:w \etex_clubpenalties:D \__int_eval:w #1 \__int_eval_end: , } \cs_new_protected:Npn \galley_save_display_widow_penalties:N #1 { \clist_set:Nx #1 @@ -2419,7 +2419,7 @@ } } \cs_new:Npn \@@_save_display_widow_penalties:n #1 - { \int_use:N \etex_displaywidowpenalties:D \__int_eval:w #1 \__int_eval_end: , } + { \__int_value:w \etex_displaywidowpenalties:D \__int_eval:w #1 \__int_eval_end: , } \cs_new_protected:Npn \galley_save_widow_penalties:N #1 { \clist_set:Nx #1 @@ -2430,14 +2430,14 @@ } } \cs_new:Npn \@@_save_widow_penalties:n #1 - { \int_use:N \etex_widowpenalties:D \__int_eval:w #1 \__int_eval_end: , } + { \__int_value:w \etex_widowpenalties:D \__int_eval:w #1 \__int_eval_end: , } % \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_nopar:Npn \galley_interline_penalty: - { \int_use:N \etex_interlinepenalties:D \etex_interlinepenalties:D \c_zero } + { \__int_value:w \etex_interlinepenalties:D \etex_interlinepenalties:D \c_zero } % \end{macrocode} % \end{macro} % \end{macro} |