summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-07-29 20:47:01 +0000
committerKarl Berry <karl@freefriends.org>2015-07-29 20:47:01 +0000
commitdb0facd61cf60ed3452c300b54f11c0524a50a53 (patch)
tree74963ac7b29b8e5c006ddeee61b1fe8b5c28a068 /Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty
parentc65840a39db649af13ec3ceefaa2481d37d1e086 (diff)
l3 (29jul15)
git-svn-id: svn://tug.org/texlive/trunk@37997 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.sty35
1 files changed, 16 insertions, 19 deletions
diff --git a/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty b/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty
index afb35d711b3..6ce235f7c03 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty
@@ -47,8 +47,8 @@
%%
%% -----------------------------------------------------------------------
%%
-\RequirePackage{expl3}[2015/07/14]
-\@ifpackagelater{expl3}{2015/07/14}
+\RequirePackage{expl3}[2015/07/28]
+\@ifpackagelater{expl3}{2015/07/28}
{}
{%
\PackageError{l3galley}{Support package l3kernel too old}
@@ -60,7 +60,7 @@
}%
\endinput
}
-\GetIdInfo$Id: l3galley.dtx 5662 2015-07-14 21:32:38Z joseph $
+\GetIdInfo$Id: l3galley.dtx 5700 2015-07-28 19:26:39Z joseph $
{L3 Experimental galley code}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -390,15 +390,19 @@
}
}
\box_new:N \g__galley_last_box
-\cs_new_protected_nopar:Npn \__galley_start_paragraph_std:
+\cs_new_protected:Npn \__galley_start_paragraph_common:N #1
{
\group_begin:
\box_gset_to_last:N \g__galley_last_box
\tex_par:D
- \__galley_insert_vertical_items:
+ #1
\tex_everypar:D { }
\tex_noindent:D
\group_end:
+ }
+\cs_new_protected_nopar:Npn \__galley_start_paragraph_std:
+ {
+ \__galley_start_paragraph_common:N \__galley_insert_vertical_items:
\__galley_insert_horizontal_items:
\__galley_restore_running_parameters:
}
@@ -406,19 +410,16 @@
{
\bool_gset_false:N \g__galley_begin_level_bool
\mode_if_horizontal:TF
- {
- \group_begin:
- \box_gset_to_last:N \g__galley_last_box
- \tex_par:D
- \__galley_insert_vspace:
- \tex_everypar:D { }
- \tex_noindent:D
- \group_end:
- }
- { \__galley_insert_vspace: }
+ { \__galley_start_paragraph_common:N \__galley_insert_vspace_first: }
+ { \__galley_insert_vspace_first: }
\__galley_insert_horizontal_items:
\__galley_restore_running_parameters:
}
+\cs_new_protected_nopar:Npn \__galley_insert_vspace_first:
+ {
+ \tl_if_empty:NF \g__galley_interpar_vspace_user_tl
+ { \skip_vertical:n { \g__galley_interpar_vspace_user_tl } }
+ }
\cs_new_protected_nopar:Npn \__galley_insert_vertical_items:
{
\g_galley_whatsit_previous_tl
@@ -435,10 +436,6 @@
\tl_gclear:N \g__galley_interpar_penalty_user_tl
}
\bool_gset_false:N \g_galley_no_break_next_bool
- \__galley_insert_vspace:
- }
-\cs_new_protected_nopar:Npn \__galley_insert_vspace:
- {
\tl_if_empty:NTF \g__galley_interpar_vspace_user_tl
{ \skip_vertical:N \l_galley_interpar_vspace_skip }
{