summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/l3experimental/xgalley/l3galley.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/source/latex/l3experimental/xgalley/l3galley.dtx')
-rw-r--r--Master/texmf-dist/source/latex/l3experimental/xgalley/l3galley.dtx69
1 files changed, 26 insertions, 43 deletions
diff --git a/Master/texmf-dist/source/latex/l3experimental/xgalley/l3galley.dtx b/Master/texmf-dist/source/latex/l3experimental/xgalley/l3galley.dtx
index e96b5b65cdd..ae956e6e333 100644
--- a/Master/texmf-dist/source/latex/l3experimental/xgalley/l3galley.dtx
+++ b/Master/texmf-dist/source/latex/l3experimental/xgalley/l3galley.dtx
@@ -2,44 +2,30 @@
%
%% File: l3galley.dtx Copyright (C) 1999-2001, 2004-2009 Frank Mittelbach
%% (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
-%% license or (at your option) any later version. The latest version
-%% of this license is in the file
-%%
-%% http://www.latex-project.org/lppl.txt
-%%
-%% This file is part of the "l3experimental bundle" (The Work in LPPL)
-%% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%% http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%% Snapshots taken from the repository represent work in progress and may
-%% not work or may contain conflicting material! We therefore ask
-%% people _not_ to put them into distributions, archives, etc. without
-%% prior consultation with the LaTeX Project Team.
-%%
-%% -----------------------------------------------------------------------
-%%
+%
+% It may be distributed and/or modified under the conditions of the
+% LaTeX Project Public License (LPPL), either version 1.3c of this
+% license or (at your option) any later version. The latest version
+% of this license is in the file
+%
+% http://www.latex-project.org/lppl.txt
+%
+% This file is part of the "l3experimental bundle" (The Work in LPPL)
+% and all files in that bundle must be distributed together.
+%
+% -----------------------------------------------------------------------
+%
+% The development version of the bundle can be found at
+%
+% https://github.com/latex3/latex3
+%
+% for those people who are interested.
%
%<*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/11/21]
-%<package>\@ifpackagelater{expl3}{2016/11/21}
+\RequirePackage{expl3}[2017/01/28]
+%<package>\@ifpackagelater{expl3}{2017/01/28}
%<package> {}
%<package> {%
%<package> \PackageError{l3galley}{Support package l3kernel too old}
@@ -51,7 +37,7 @@
%<package> }%
%<package> \endinput
%<package> }
-\GetIdInfo$Id: l3galley.dtx 6760 2016-11-21 20:35:31Z joseph $
+\GetIdInfo$Id: l3galley.dtx 6829 2017-01-28 08:52:51Z joseph $
{L3 Experimental galley code}
%</driver|package>
%<*driver>
@@ -1949,11 +1935,8 @@
{
\seq_gset_eq:Nc \g_@@_tmpa_seq { g_@@_cutout_ #1 _seq }
\seq_gset_eq:Nc \g_@@_tmpb_seq { l_@@_parshape_ #1 _indent_seq }
- \tl_set:Nx \l_@@_tmp_tl
- {
- \seq_item:Nn \g_@@_tmpb_seq
- { \seq_count:N \g_@@_tmpb_seq }
- }
+ \seq_get_right:NNF \g_@@_tmpb_seq \l_@@_tmp_tl
+ { \tl_clear:N \l_@@_tmp_tl }
\tl_if_empty:NT \l_@@_tmp_tl
{ \tl_set:Nn \l_@@_tmp_tl { 0pt } }
\int_set:Nn \l_@@_tmp_int
@@ -1978,8 +1961,8 @@
% \begin{macrocode}
\cs_new_protected:Npn \@@_parshape_set_cutouts:N #1
{
- \tl_set:Nx \l_@@_tmp_tl
- { \seq_item:Nn #1 { \seq_count:N #1 } }
+ \seq_get_right:NNF #1 \l_@@_tmp_tl
+ { \tl_clear:N \l_@@_tmp_tl }
\tl_if_empty:NT \l_@@_tmp_tl
{ \tl_set:Nn \l_@@_tmp_tl { 0pt } }
\prg_replicate:nn { \int_abs:n \l_@@_tmp_int }
@@ -2540,7 +2523,7 @@
{
\mode_if_vertical:T
{
- \int_compare:nNnT \@dbltopnum = \c_minus_one
+ \int_compare:nNnT \@dbltopnum = { - \c_one }
{
\dim_compare:nNnT \tex_pagetotal:D < \topskip
{ \tex_hbox:D { } }