diff options
Diffstat (limited to 'Master/texmf-dist/source/latex/l3experimental/xgalley/l3galley.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/l3experimental/xgalley/l3galley.dtx | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/Master/texmf-dist/source/latex/l3experimental/xgalley/l3galley.dtx b/Master/texmf-dist/source/latex/l3experimental/xgalley/l3galley.dtx index 47270bb408d..8bc0bafa285 100644 --- a/Master/texmf-dist/source/latex/l3experimental/xgalley/l3galley.dtx +++ b/Master/texmf-dist/source/latex/l3experimental/xgalley/l3galley.dtx @@ -1,7 +1,7 @@ % \iffalse % %% File: l3galley.dtx Copyright (C) 1999-2001, 2004-2009 Frank Mittelbach -%% (C) 2010-2015 The LaTeX3 Project +%% (C) 2010-2016 The LaTeX3 Project %% %% It may be distributed and/or modified under the conditions of the %% LaTeX Project Public License (LPPL), either version 1.3c of this @@ -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}[2015/12/20] -%<package>\@ifpackagelater{expl3}{2015/12/20} +\RequirePackage{expl3}[2016/01/19] +%<package>\@ifpackagelater{expl3}{2016/01/19} %<package> {} %<package> {% %<package> \PackageError{l3galley}{Support package l3kernel too old} @@ -51,7 +51,7 @@ %<package> }% %<package> \endinput %<package> } -\GetIdInfo$Id: l3galley.dtx 6326 2015-12-20 18:42:59Z joseph $ +\GetIdInfo$Id: l3galley.dtx 6377 2016-01-19 22:28:13Z joseph $ {L3 Experimental galley code} %</driver|package> %<*driver> @@ -240,8 +240,7 @@ % \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, and otherwise is analogous to -% \cs{galley_set_vspace:n}. +% adjustments to design. % \end{function} % % \subsection{Paragraph shape} @@ -2556,6 +2555,14 @@ % \end{macrocode} % \end{macro} % +% \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 } +% \end{macrocode} +%\end{macro} +% % \begin{macro}{\@afterheading} % Set some flags and hope for the best! % \begin{macrocode} @@ -2596,7 +2603,7 @@ % This is needed as \cs{@parboxrestore} sets |\\| equal to \cs{@normalcr}, % and the new definition must be used % \begin{macrocode} -\cs_set_eq:Nc \@normalcr { \token_to_str:N \\ } +\cs_set_eq:Nc \@normalcr { \cs_to_str:N \\ } % \end{macrocode} %\end{macro} % |