diff options
author | Karl Berry <karl@freefriends.org> | 2016-05-15 22:11:11 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2016-05-15 22:11:11 +0000 |
commit | 48121dcc91b2cbbccc5bbfbb1cc9c60ca2a695b2 (patch) | |
tree | 90f8a31739bf5ebe5437a43867fa9b17f751668d /Master/texmf-dist/source/latex/l3experimental | |
parent | 5f70b2c1fb388056ec31bb162ff177ff3b7b49fa (diff) |
l3 (15may16)
git-svn-id: svn://tug.org/texlive/trunk@41163 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/l3experimental')
5 files changed, 74 insertions, 30 deletions
diff --git a/Master/texmf-dist/source/latex/l3experimental/l3sort/l3sort.dtx b/Master/texmf-dist/source/latex/l3experimental/l3sort/l3sort.dtx index 2dbc55d8f01..c6a0962d867 100644 --- a/Master/texmf-dist/source/latex/l3experimental/l3sort/l3sort.dtx +++ b/Master/texmf-dist/source/latex/l3experimental/l3sort/l3sort.dtx @@ -37,8 +37,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/04/20] -%<package>\@ifpackagelater{expl3}{2016/04/20} +\RequirePackage{expl3}[2016/05/14] +%<package>\@ifpackagelater{expl3}{2016/05/14} %<package> {} %<package> {% %<package> \PackageError{l3sort}{Support package l3kernel too old} @@ -50,7 +50,7 @@ %<package> }% %<package> \endinput %<package> } -\GetIdInfo$Id: l3sort.dtx 6476 2016-04-20 19:46:45Z joseph $ +\GetIdInfo$Id: l3sort.dtx 6492 2016-05-14 20:27:55Z joseph $ {L3 Experimental sorting functions} %</driver|package> %<*driver> diff --git a/Master/texmf-dist/source/latex/l3experimental/l3str/l3flag.dtx b/Master/texmf-dist/source/latex/l3experimental/l3str/l3flag.dtx index 016b1191bee..d929259efaa 100644 --- a/Master/texmf-dist/source/latex/l3experimental/l3str/l3flag.dtx +++ b/Master/texmf-dist/source/latex/l3experimental/l3str/l3flag.dtx @@ -36,8 +36,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/04/20] -%<package>\@ifpackagelater{expl3}{2016/04/20} +\RequirePackage{expl3}[2016/05/14] +%<package>\@ifpackagelater{expl3}{2016/05/14} %<package> {} %<package> {% %<package> \PackageError{l3flag}{Support package l3kernel too old} @@ -49,7 +49,7 @@ %<package> }% %<package> \endinput %<package> } -\GetIdInfo$Id: l3flag.dtx 6476 2016-04-20 19:46:45Z joseph $ +\GetIdInfo$Id: l3flag.dtx 6492 2016-05-14 20:27:55Z joseph $ {L3 Experimental flags} %</driver|package> %<*driver> diff --git a/Master/texmf-dist/source/latex/l3experimental/l3str/l3regex.dtx b/Master/texmf-dist/source/latex/l3experimental/l3str/l3regex.dtx index 470ee3ad4e3..e9fc42c8cf2 100644 --- a/Master/texmf-dist/source/latex/l3experimental/l3str/l3regex.dtx +++ b/Master/texmf-dist/source/latex/l3experimental/l3str/l3regex.dtx @@ -36,8 +36,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/04/20] -%<package>\@ifpackagelater{expl3}{2016/04/20} +\RequirePackage{expl3}[2016/05/14] +%<package>\@ifpackagelater{expl3}{2016/05/14} %<package> {} %<package> {% %<package> \PackageError{l3regex}{Support package l3kernel too old} @@ -49,7 +49,7 @@ %<package> }% %<package> \endinput %<package> } -\GetIdInfo$Id: l3regex.dtx 6476 2016-04-20 19:46:45Z joseph $ +\GetIdInfo$Id: l3regex.dtx 6492 2016-05-14 20:27:55Z joseph $ {L3 Experimental regular expressions} %</driver|package> %<*driver> diff --git a/Master/texmf-dist/source/latex/l3experimental/l3str/l3tl-build.dtx b/Master/texmf-dist/source/latex/l3experimental/l3str/l3tl-build.dtx index 2d87c600ef9..db33b260adc 100644 --- a/Master/texmf-dist/source/latex/l3experimental/l3str/l3tl-build.dtx +++ b/Master/texmf-dist/source/latex/l3experimental/l3str/l3tl-build.dtx @@ -36,8 +36,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/04/20] -%<package>\@ifpackagelater{expl3}{2016/04/20} +\RequirePackage{expl3}[2016/05/14] +%<package>\@ifpackagelater{expl3}{2016/05/14} %<package> {} %<package> {% %<package> \PackageError{l3tl-build}{Support package l3kernel too old} @@ -49,7 +49,7 @@ %<package> }% %<package> \endinput %<package> } -\GetIdInfo$Id: l3tl-build.dtx 6476 2016-04-20 19:46:45Z joseph $ +\GetIdInfo$Id: l3tl-build.dtx 6492 2016-05-14 20:27:55Z joseph $ {L3 Experimental token list construction} %</driver|package> %<*driver> diff --git a/Master/texmf-dist/source/latex/l3experimental/xgalley/l3galley.dtx b/Master/texmf-dist/source/latex/l3experimental/xgalley/l3galley.dtx index 5e8185bd7b2..a35de8f7643 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/04/20] -%<package>\@ifpackagelater{expl3}{2016/04/20} +\RequirePackage{expl3}[2016/05/14] +%<package>\@ifpackagelater{expl3}{2016/05/14} %<package> {} %<package> {% %<package> \PackageError{l3galley}{Support package l3kernel too old} @@ -51,7 +51,7 @@ %<package> }% %<package> \endinput %<package> } -\GetIdInfo$Id: l3galley.dtx 6476 2016-04-20 19:46:45Z joseph $ +\GetIdInfo$Id: l3galley.dtx 6493 2016-05-14 21:08:13Z joseph $ {L3 Experimental galley code} %</driver|package> %<*driver> @@ -227,20 +227,29 @@ % \begin{function}{\galley_penalty_set_single:n} % \begin{syntax} % \cs{galley_penalty_set_single:n} \Arg{penalty} +% \cs{galley_penalty_add_single:n} \Arg{penalty} % \end{syntax} % Sets the \meta{penalty} for a break between the current and next % paragraph on a one-off basis. This function is intended for user-level % adjustments to design, and takes precedent over both settings from % \cs{l_galley_interpar_penalty_int} and from \cs{galley_no_break_next:}. +% The \texttt{add} variant adds the penalty to any existing values. % \end{function} % -% \begin{function}{\galley_vspace_set_single:n} +% \begin{function} +% { +% \galley_vspace_set_single:n , +% \galley_vspace_add_single:n , +% \galley_vspace_max_single:n +% } % \begin{syntax} % \cs{galley_vspace_set_single:n} \Arg{space} % \end{syntax} % Sets the \meta{space} to be inserted between the current and next % paragraph on a one-off basis. This function is intended for user-level -% adjustments to design. +% adjustments to design. The \texttt{add} and \texttt{max} variants add +% to the existing spacing and set to the maximum of the existing value +% and the argument, respectively. % \end{function} % % \subsection{Paragraph shape} @@ -909,7 +918,6 @@ \int_new:N \l_@@_current_par_lines_int % \end{macrocode} % \end{variable} -% \end{variable} % % \begin{variable}{\g_galley_restore_running_tl, \l_@@_restore_running_tl} % When a parameter is altered from the \enquote{running} value to a @@ -1249,7 +1257,6 @@ % \end{macro} % \end{macro} % \end{macro} -% \end{macro} % % \begin{macro}{\galley_par:n} % Inserts tokens such that they are appended to the end of the last @@ -1767,8 +1774,6 @@ % \end{macro} % \end{macro} % \end{macro} -% \end{macro} -% \end{macro} % % \subsection{Setting the primitive paragraph shape} % @@ -1962,11 +1967,17 @@ % \end{macro} % \end{macro} % \end{macro} -% \end{macro} % % \subsection{Between paragraphs} % -% \begin{macro}{\galley_penalty_set_single:n, \galley_vspace_set_single:n} +% \begin{macro} +% { +% \galley_penalty_set_single:n, +% \galley_penalty_add_single:n, +% \galley_vspace_set_single:n, +% \galley_vspace_add_single:n, +% \galley_vspace_max_single:n +% } % User supplied penalties and spaces only apply for a single paragraph. % In both cases, the input values need to be checked for the correct % form but are stored as token lists. The \texttt{x}-type expansion @@ -1974,10 +1985,46 @@ % \begin{macrocode} \cs_new_protected:Npn \galley_penalty_set_single:n #1 { \tl_gset:Nx \g_@@_interpar_penalty_user_tl { \int_eval:n {#1} } } +\cs_new_protected:Npn \galley_penalty_add_single:n #1 + { + \tl_gset:Nx \g_@@_interpar_penalty_user_tl + { + \int_eval:n + { + \tl_if_empty:NF \g_@@_interpar_penalty_user_tl + { \g_@@_interpar_penalty_user_tl + } + #1 + } + } + } \cs_new_protected:Npn \galley_vspace_set_single:n #1 { \tl_gset:Nx \g_@@_interpar_vspace_user_tl { \skip_eval:n {#1} } } +\cs_new_protected:Npn \galley_vspace_add_single:n #1 + { + \tl_gset:Nx \g_@@_interpar_vspace_user_tl + { + \skip_eval:n + { + \tl_if_empty:NF \g_@@_interpar_vspace_user_tl + { \g_@@_interpar_vspace_user_tl + } + #1 + } + } + } +\cs_new_protected:Npn \galley_vspace_max_single:n #1 + { + \tl_if_empty:NTF \g_@@_interpar_vspace_user_tl + { \galley_vspace_set_single:n {#1} } + { + \dim_compare:nNnT + { \etex_glueexpr:D \g_@@_interpar_vspace_user_tl } + < { \etex_glueexpr:D #1 \scan_stop: } + { \galley_vspace_set_single:n {#1} } + } + } % \end{macrocode} % \end{macro} +% % % \begin{macro}{\parskip} % For the package, the \cs{parskip} primitive is moved out of the @@ -2472,9 +2519,6 @@ } } \newpage - \tl_gput_right:Nn \g_galley_whatsit_next_tl - { \iow_shipout:Nx \c_minus_one { } } - \tex_vbox:D { } \galley_penalty_set_single:n { -\@Mi } } % \end{macrocode} @@ -2503,14 +2547,14 @@ % \begin{macrocode} % At present we don't have a proper handling for the starred version % of \tn{vspace}: just ignore it for the moment! -% \end{macrocode} +% \begin{macrocode} \DeclareRobustCommand \vspace { \@ifstar \@vspace \@vspace } -\cs_set:Npn \@vspace #1 { \galley_vspace_set_single:n {#1} } +\cs_set:Npn \@vspace #1 { \galley_vspace_add_single:n {#1} } % \end{macrocode} % \end{macro} % \end{macro} @@ -2558,8 +2602,8 @@ % \begin{macro}{\addpenalty, \addvspace} % The mechanism here is entirely different, but at least this works! % \begin{macrocode} -\cs_set_nopar:Npn \addpenalty { \galley_penalty_set_single:n } -\cs_set_nopar:Npn \addvspace { \galley_vspace_set_single:n } +\cs_set_nopar:Npn \addpenalty { \galley_penalty_add_single:n } +\cs_set_nopar:Npn \addvspace { \galley_vspace_max_single:n } % \end{macrocode} %\end{macro} % |