diff options
author | Karl Berry <karl@freefriends.org> | 2017-01-29 22:34:57 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2017-01-29 22:34:57 +0000 |
commit | fabbcd2656be5dca3e1986ddcc8c827a23e9aedf (patch) | |
tree | 4f669dff01da1c31477e1e876fc878cddd5c06ab /Master/texmf-dist/tex/latex/l3experimental/xgalley | |
parent | ebc35af4250051fed5186c59ba4eaff9949142e2 (diff) |
l3 (29jan17)
git-svn-id: svn://tug.org/texlive/trunk@43088 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3experimental/xgalley')
-rw-r--r-- | Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty | 64 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/l3experimental/xgalley/xgalley.sty | 47 |
2 files changed, 27 insertions, 84 deletions
diff --git a/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty b/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty index 6c7ce4fcab5..7a75fac96d3 100644 --- a/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty +++ b/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty @@ -6,49 +6,22 @@ %% %% l3galley.dtx (with options: `package') %% -%% EXPERIMENTAL CODE +%% Copyright (C) 2010-2016 The LaTeX3 Project %% -%% Do not distribute this file without also distributing the -%% source files specified above. +%% 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: %% -%% Do not distribute a modified version of this file. -%% -%% 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. -%% -%% ----------------------------------------------------------------------- -%% -\RequirePackage{expl3}[2016/11/21] -\@ifpackagelater{expl3}{2016/11/21} +%% +%% File: l3galley.dtx Copyright (C) 1999-2001, 2004-2009 Frank Mittelbach +%% (C) 2010-2016 The LaTeX3 Project +\RequirePackage{expl3}[2017/01/28] +\@ifpackagelater{expl3}{2017/01/28} {} {% \PackageError{l3galley}{Support package l3kernel too old} @@ -60,7 +33,7 @@ }% \endinput } -\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} \ProvidesExplPackage {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} @@ -642,11 +615,8 @@ { \seq_gset_eq:Nc \g__galley_tmpa_seq { g__galley_cutout_ #1 _seq } \seq_gset_eq:Nc \g__galley_tmpb_seq { l__galley_parshape_ #1 _indent_seq } - \tl_set:Nx \l__galley_tmp_tl - { - \seq_item:Nn \g__galley_tmpb_seq - { \seq_count:N \g__galley_tmpb_seq } - } + \seq_get_right:NNF \g__galley_tmpb_seq \l__galley_tmp_tl + { \tl_clear:N \l__galley_tmp_tl } \tl_if_empty:NT \l__galley_tmp_tl { \tl_set:Nn \l__galley_tmp_tl { 0pt } } \int_set:Nn \l__galley_tmp_int @@ -667,8 +637,8 @@ } \cs_new_protected:Npn \__galley_parshape_set_cutouts:N #1 { - \tl_set:Nx \l__galley_tmp_tl - { \seq_item:Nn #1 { \seq_count:N #1 } } + \seq_get_right:NNF #1 \l__galley_tmp_tl + { \tl_clear:N \l__galley_tmp_tl } \tl_if_empty:NT \l__galley_tmp_tl { \tl_set:Nn \l__galley_tmp_tl { 0pt } } \prg_replicate:nn { \int_abs:n \l__galley_tmp_int } @@ -934,7 +904,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 { } } diff --git a/Master/texmf-dist/tex/latex/l3experimental/xgalley/xgalley.sty b/Master/texmf-dist/tex/latex/l3experimental/xgalley/xgalley.sty index 96d7bf29a06..598f757ad4f 100644 --- a/Master/texmf-dist/tex/latex/l3experimental/xgalley/xgalley.sty +++ b/Master/texmf-dist/tex/latex/l3experimental/xgalley/xgalley.sty @@ -6,49 +6,22 @@ %% %% xgalley.dtx (with options: `package') %% -%% EXPERIMENTAL CODE +%% Copyright (C) 2010-2016 The LaTeX3 Project %% -%% Do not distribute this file without also distributing the -%% source files specified above. +%% 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: %% -%% Do not distribute a modified version of this file. -%% -%% File: xgalley.dtx Copyright (C) 1999-2001, 2004-2009 Frank Mittelbach -%% (C) 2010-2012,2014 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. -%% -%% ----------------------------------------------------------------------- -%% +%% +%% File: xgalley.dtx Copyright (C) 1999-2001, 2004-2009 Frank Mittelbach +%% (C) 2010-2012,2014,2106 The LaTeX3 Project \RequirePackage{xparse} -\GetIdInfo$Id: xgalley.dtx 5375 2014-08-25 10:17:29Z joseph $ +\GetIdInfo$Id: xgalley.dtx 6805 2016-12-28 22:15:52Z joseph $ {L3 Experimental galley} \ProvidesExplPackage {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} |