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.dtx40
1 files changed, 31 insertions, 9 deletions
diff --git a/Master/texmf-dist/source/latex/l3experimental/xgalley/l3galley.dtx b/Master/texmf-dist/source/latex/l3experimental/xgalley/l3galley.dtx
index cb34e8a92aa..bb07281e01b 100644
--- a/Master/texmf-dist/source/latex/l3experimental/xgalley/l3galley.dtx
+++ b/Master/texmf-dist/source/latex/l3experimental/xgalley/l3galley.dtx
@@ -37,7 +37,7 @@
%
%<*driver|package>
\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}
%</driver|package>
%<*driver>
@@ -942,8 +942,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
}
@@ -2187,6 +2185,30 @@
%<*package>
% \end{macrocode}
%
+% \begin{macro}{\clearpage}
+% The \tn{clearpage} macro needs to place material into the correct
+% structures rather than directly onto the main vertical list. Other
+% than that it is the same as the \LaTeXe{} version.
+% \begin{macrocode}
+\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 }
+ }
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}{\nobreak}
% \begin{macro}{\noindent}
% \begin{macro}{\vspace}
@@ -2207,11 +2229,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} }
}
% \end{macrocode}
% \end{macro}
@@ -2228,8 +2250,8 @@
\RenewDocumentCommand \newline { }
{ \galley_break_line:Nn \c_true_bool { 0 pt } }
% \end{macrocode}
-%\end{macro}
-%\end{macro}
+% \end{macro}
+% \end{macro}
%
% \subsection{\LaTeXe{} fixes}
%