diff options
author | Karl Berry <karl@freefriends.org> | 2012-02-07 22:41:58 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2012-02-07 22:41:58 +0000 |
commit | 7dd80542eb368ed18c1298c24250b409350a2059 (patch) | |
tree | b2e1a4782f380070ebda613cbdbd81bf6da4bd7e /Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty | |
parent | 31c0645d94c7626cab0b433b855f6c2a6893f133 (diff) |
l3experimental 3331 (7feb12)
git-svn-id: svn://tug.org/texlive/trunk@25328 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty | 28 |
1 files changed, 21 insertions, 7 deletions
diff --git a/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty b/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty index 590062f47ae..cb77ed14d8f 100644 --- a/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty +++ b/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty @@ -48,7 +48,7 @@ %% ----------------------------------------------------------------------- %% \RequirePackage{xparse} -\GetIdInfo$Id: l3galley.dtx 3253 2012-01-28 14:59:55Z joseph $ +\GetIdInfo$Id: l3galley.dtx 3325 2012-02-06 22:07:00Z joseph $ {L3 Experimental galley code} \ProvidesExplPackage {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} @@ -113,8 +113,6 @@ \cs_new_protected_nopar:Npn \galley_initialise_settings: { \dim_set_eq:NN \l_galley_text_width_dim \l_galley_width_dim - \dim_zero:N \l_galley_left_margin_dim - \dim_zero:N \l_galley_right_margin_dim \dim_zero:N \l_galley_total_left_margin_dim \dim_zero:N \l_galley_total_right_margin_dim } @@ -776,6 +774,22 @@ { \int_use:N \etex_interlinepenalties:D \etex_interlinepenalties:D \c_zero } \msg_kernel_new:nnn { galley } { no-line-to-end } { There's~no~line~here~to~end. } +\RenewDocumentCommand \clearpage { } + { + \mode_if_vertical:T + { + \int_compare:nNnT \@dbltopnum = \c_minus_one + { + \dim_compare:nNnT \tex_pagetotal:D < \topskip + { \tex_hbox:D { } } + } + } + \newpage + \tl_gput_right:Nn \g_galley_whatsit_next_tl + { \iow_shipout:Nx \c_minus_one { } } + \tex_vbox:D { } + \galley_set_user_penalty:n { -\@Mi } + } \RenewDocumentCommand \nobreak { } { \bool_gset_true:N \g_galley_no_break_next_bool } \RenewDocumentCommand \noindent { } @@ -783,11 +797,11 @@ \tex_noindent:D \bool_gset_false:N \g_galley_omit_next_indent_bool } -\RenewDocumentCommand \vspace { m } +\RenewDocumentCommand \vspace { s m } { - \@ifstar - { \galley_set_user_vspace:n {#1} } - { \galley_set_user_vspace:n {#1} } + \IfBooleanTF #1 + { \galley_set_user_vspace:n {#2} } + { \galley_set_user_vspace:n {#2} } } \RenewDocumentCommand \\ { s O { 0 pt } } { \galley_break_line:Nn #1 {#2} } |