[latex3-commits] [git/LaTeX3-latex3-latex3] master: Move \mode_leave_vertical: to stable (d6f2be312)
Joseph Wright
joseph.wright at morningstar2.co.uk
Fri Sep 20 18:27:40 CEST 2019
Repository : https://github.com/latex3/latex3
On branch : master
Link : https://github.com/latex3/latex3/commit/d6f2be312d87cf4ddba08213f5b5dfddae7f77ef
>---------------------------------------------------------------
commit d6f2be312d87cf4ddba08213f5b5dfddae7f77ef
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Fri Sep 20 17:27:40 2019 +0100
Move \mode_leave_vertical: to stable
>---------------------------------------------------------------
d6f2be312d87cf4ddba08213f5b5dfddae7f77ef
l3kernel/CHANGELOG.md | 1 +
l3kernel/l3basics.dtx | 40 +++++++++++++++++++++++++++++++++
l3kernel/l3candidates.dtx | 38 -------------------------------
l3kernel/testfiles/m3expl001.luatex.tlg | 2 +-
l3kernel/testfiles/m3expl001.ptex.tlg | 2 +-
l3kernel/testfiles/m3expl001.tlg | 2 +-
l3kernel/testfiles/m3expl001.uptex.tlg | 2 +-
l3kernel/testfiles/m3expl001.xetex.tlg | 2 +-
l3kernel/testfiles/m3expl003.luatex.tlg | 2 +-
l3kernel/testfiles/m3expl003.ptex.tlg | 2 +-
l3kernel/testfiles/m3expl003.tlg | 2 +-
l3kernel/testfiles/m3expl003.uptex.tlg | 2 +-
l3kernel/testfiles/m3expl003.xetex.tlg | 2 +-
13 files changed, 51 insertions(+), 48 deletions(-)
diff --git a/l3kernel/CHANGELOG.md b/l3kernel/CHANGELOG.md
index 01ea90892..5d7b19f9b 100644
--- a/l3kernel/CHANGELOG.md
+++ b/l3kernel/CHANGELOG.md
@@ -19,6 +19,7 @@ this project uses date-based 'snapshot' version identifiers.
- `\intarray_show:N`
- `\ior_map_variable:NNn`
- `\ior_str_map_variable:NNn`
+ - `\mode_leave_vertical:`
- `\prop_(g)set_from_clist:Nn`
- `\prop_const_from_clist:Nn`
- `\seq_const_from_clist:Nn`
diff --git a/l3kernel/l3basics.dtx b/l3kernel/l3basics.dtx
index 190144781..da045c091 100644
--- a/l3kernel/l3basics.dtx
+++ b/l3kernel/l3basics.dtx
@@ -1275,6 +1275,24 @@
% execute <false code>. Similar for the other functions.
% \end{function}
%
+% \section{Starting a paragraph}
+%
+% \begin{function}[added = 2017-07-04]{\mode_leave_vertical:}
+% \begin{syntax}
+% \cs{mode_leave_vertical:}
+% \end{syntax}
+% Ensures that \TeX{} is not in vertical (inter-paragraph) mode. In
+% horizontal or math mode this command has no effect, in vertical mode it
+% switches to horizontal mode, and inserts a box of width
+% \tn{parindent}, followed by the \tn{everypar} token list.
+% \begin{texnote}
+% This results in the contents of the \tn{everypar} token register being
+% inserted, after \cs{mode_leave_vertical:} is complete. Notice that in
+% contrast to the \LaTeXe{} \tn{leavevmode} approach, no box is used
+% by the method implemented here.
+% \end{texnote}
+% \end{function}
+%
% \end{documentation}
%
% \begin{implementation}
@@ -3591,6 +3609,28 @@
% \end{macro}
% \end{macro}
%
+% \subsection{Starting a paragraph}
+%
+% \begin{macro}{\mode_leave_vertical:}
+% The approach here is different to that used by \LaTeXe{} or plain \TeX{},
+% which unbox a void box to force horizontal mode. That inserts the
+% \tn{everypar} tokens \emph{before} the re-inserted unboxing tokens. The
+% approach here uses either the \tn{quitvmode} primitive or the equivalent
+% protected macro. In vertical mode, the \tn{indent} primitive is inserted:
+% this will switch to horizontal mode and insert \tn{everypar} tokens and
+% nothing else. Unlike the \LaTeXe{} version, the availability of \eTeX{}
+% means using a mode test can be done at for example the start of an
+% \tn{halign}.
+% \begin{macrocode}
+\cs_new_protected:Npn \mode_leave_vertical:
+ {
+ \if_mode_vertical:
+ \exp_after:wN \tex_indent:D
+ \fi:
+ }
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macrocode}
%</initex|package>
% \end{macrocode}
diff --git a/l3kernel/l3candidates.dtx b/l3kernel/l3candidates.dtx
index 865cf9f2d..e81d23b49 100644
--- a/l3kernel/l3candidates.dtx
+++ b/l3kernel/l3candidates.dtx
@@ -123,22 +123,6 @@
% See for instance \pkg{l3coffins}.
% \end{function}
%
-% \begin{function}[added = 2017-07-04]{\mode_leave_vertical:}
-% \begin{syntax}
-% \cs{mode_leave_vertical:}
-% \end{syntax}
-% Ensures that \TeX{} is not in vertical (inter-paragraph) mode. In
-% horizontal or math mode this command has no effect, in vertical mode it
-% switches to horizontal mode, and inserts a box of width
-% \tn{parindent}, followed by the \tn{everypar} token list.
-% \begin{texnote}
-% This results in the contents of the \tn{everypar} token register being
-% inserted, after \cs{mode_leave_vertical:} is complete. Notice that in
-% contrast to the \LaTeXe{} \tn{leavevmode} approach, no box is used
-% by the method implemented here.
-% \end{texnote}
-% \end{function}
-%
% \section{Additions to \pkg{l3box}}
%
% \subsection{Viewing part of a box}
@@ -1055,28 +1039,6 @@
%<*initex|package>
% \end{macrocode}
%
-% \subsection{Additions to \pkg{l3basics}}
-%
-% \begin{macro}{\mode_leave_vertical:}
-% The approach here is different to that used by \LaTeXe{} or plain \TeX{},
-% which unbox a void box to force horizontal mode. That inserts the
-% \tn{everypar} tokens \emph{before} the re-inserted unboxing tokens. The
-% approach here uses either the \tn{quitvmode} primitive or the equivalent
-% protected macro. In vertical mode, the \tn{indent} primitive is inserted:
-% this will switch to horizontal mode and insert \tn{everypar} tokens and
-% nothing else. Unlike the \LaTeXe{} version, the availability of \eTeX{}
-% means using a mode test can be done at for example the start of an
-% \tn{halign}.
-% \begin{macrocode}
-\cs_new_protected:Npn \mode_leave_vertical:
- {
- \if_mode_vertical:
- \exp_after:wN \tex_indent:D
- \fi:
- }
-% \end{macrocode}
-% \end{macro}
-%
% \subsection{Additions to \pkg{l3box}}
%
% \begin{macrocode}
diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index e31758050..36b08f30b 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -139,6 +139,7 @@ Defining \prg_map_break:Nn on line ...
Defining \prg_break_point: on line ...
Defining \prg_break: on line ...
Defining \prg_break:n on line ...
+Defining \mode_leave_vertical: on line ...
Defining \__exp_arg_next:nnn on line ...
Defining \__exp_arg_next:Nnn on line ...
Defining \::: on line ...
@@ -6459,7 +6460,6 @@ Defining \c__char_upper_case_ῇ_tl on line ...
Defining \c__char_mixed_case_ῇ_tl on line ...
Defining \c__char_upper_case_ῷ_tl on line ...
Defining \c__char_mixed_case_ῷ_tl on line ...
-Defining \mode_leave_vertical: on line ...
Defining \box_clip:N on line ...
Defining \box_clip:c on line ...
Defining \box_gclip:N on line ...
diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
index 8c5c55b3d..d167ed1d9 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -138,6 +138,7 @@ Defining \prg_map_break:Nn on line ...
Defining \prg_break_point: on line ...
Defining \prg_break: on line ...
Defining \prg_break:n on line ...
+Defining \mode_leave_vertical: on line ...
Defining \__exp_arg_next:nnn on line ...
Defining \__exp_arg_next:Nnn on line ...
Defining \::: on line ...
@@ -6455,7 +6456,6 @@ Defining \c__char_upper_case_z_tl on line ...
Defining \c__char_lower_case_Z_tl on line ...
Defining \c__char_fold_case_Z_tl on line ...
\g__char_data_ior=\read...
-Defining \mode_leave_vertical: on line ...
Defining \box_clip:N on line ...
Defining \box_clip:c on line ...
Defining \box_gclip:N on line ...
diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg
index a3f1ea67c..3c513ac6c 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -138,6 +138,7 @@ Defining \prg_map_break:Nn on line ...
Defining \prg_break_point: on line ...
Defining \prg_break: on line ...
Defining \prg_break:n on line ...
+Defining \mode_leave_vertical: on line ...
Defining \__exp_arg_next:nnn on line ...
Defining \__exp_arg_next:Nnn on line ...
Defining \::: on line ...
@@ -6455,7 +6456,6 @@ Defining \c__char_upper_case_z_tl on line ...
Defining \c__char_lower_case_Z_tl on line ...
Defining \c__char_fold_case_Z_tl on line ...
\g__char_data_ior=\read...
-Defining \mode_leave_vertical: on line ...
Defining \box_clip:N on line ...
Defining \box_clip:c on line ...
Defining \box_gclip:N on line ...
diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
index b6a398bcb..bdb67adee 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -138,6 +138,7 @@ Defining \prg_map_break:Nn on line ...
Defining \prg_break_point: on line ...
Defining \prg_break: on line ...
Defining \prg_break:n on line ...
+Defining \mode_leave_vertical: on line ...
Defining \__exp_arg_next:nnn on line ...
Defining \__exp_arg_next:Nnn on line ...
Defining \::: on line ...
@@ -6451,7 +6452,6 @@ Defining \c__char_upper_case_z_tl on line ...
Defining \c__char_lower_case_Z_tl on line ...
Defining \c__char_fold_case_Z_tl on line ...
\g__char_data_ior=\read...
-Defining \mode_leave_vertical: on line ...
Defining \box_clip:N on line ...
Defining \box_clip:c on line ...
Defining \box_gclip:N on line ...
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index 73a9eb979..03be7bf6b 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -138,6 +138,7 @@ Defining \prg_map_break:Nn on line ...
Defining \prg_break_point: on line ...
Defining \prg_break: on line ...
Defining \prg_break:n on line ...
+Defining \mode_leave_vertical: on line ...
Defining \__exp_arg_next:nnn on line ...
Defining \__exp_arg_next:Nnn on line ...
Defining \::: on line ...
@@ -6459,7 +6460,6 @@ Defining \c__char_upper_case_ῇ_tl on line ...
Defining \c__char_mixed_case_ῇ_tl on line ...
Defining \c__char_upper_case_ῷ_tl on line ...
Defining \c__char_mixed_case_ῷ_tl on line ...
-Defining \mode_leave_vertical: on line ...
Defining \box_clip:N on line ...
Defining \box_clip:c on line ...
Defining \box_gclip:N on line ...
diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index e31758050..36b08f30b 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -139,6 +139,7 @@ Defining \prg_map_break:Nn on line ...
Defining \prg_break_point: on line ...
Defining \prg_break: on line ...
Defining \prg_break:n on line ...
+Defining \mode_leave_vertical: on line ...
Defining \__exp_arg_next:nnn on line ...
Defining \__exp_arg_next:Nnn on line ...
Defining \::: on line ...
@@ -6459,7 +6460,6 @@ Defining \c__char_upper_case_ῇ_tl on line ...
Defining \c__char_mixed_case_ῇ_tl on line ...
Defining \c__char_upper_case_ῷ_tl on line ...
Defining \c__char_mixed_case_ῷ_tl on line ...
-Defining \mode_leave_vertical: on line ...
Defining \box_clip:N on line ...
Defining \box_clip:c on line ...
Defining \box_gclip:N on line ...
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index 8c5c55b3d..d167ed1d9 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -138,6 +138,7 @@ Defining \prg_map_break:Nn on line ...
Defining \prg_break_point: on line ...
Defining \prg_break: on line ...
Defining \prg_break:n on line ...
+Defining \mode_leave_vertical: on line ...
Defining \__exp_arg_next:nnn on line ...
Defining \__exp_arg_next:Nnn on line ...
Defining \::: on line ...
@@ -6455,7 +6456,6 @@ Defining \c__char_upper_case_z_tl on line ...
Defining \c__char_lower_case_Z_tl on line ...
Defining \c__char_fold_case_Z_tl on line ...
\g__char_data_ior=\read...
-Defining \mode_leave_vertical: on line ...
Defining \box_clip:N on line ...
Defining \box_clip:c on line ...
Defining \box_gclip:N on line ...
diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg
index a3f1ea67c..3c513ac6c 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -138,6 +138,7 @@ Defining \prg_map_break:Nn on line ...
Defining \prg_break_point: on line ...
Defining \prg_break: on line ...
Defining \prg_break:n on line ...
+Defining \mode_leave_vertical: on line ...
Defining \__exp_arg_next:nnn on line ...
Defining \__exp_arg_next:Nnn on line ...
Defining \::: on line ...
@@ -6455,7 +6456,6 @@ Defining \c__char_upper_case_z_tl on line ...
Defining \c__char_lower_case_Z_tl on line ...
Defining \c__char_fold_case_Z_tl on line ...
\g__char_data_ior=\read...
-Defining \mode_leave_vertical: on line ...
Defining \box_clip:N on line ...
Defining \box_clip:c on line ...
Defining \box_gclip:N on line ...
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index b6a398bcb..bdb67adee 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -138,6 +138,7 @@ Defining \prg_map_break:Nn on line ...
Defining \prg_break_point: on line ...
Defining \prg_break: on line ...
Defining \prg_break:n on line ...
+Defining \mode_leave_vertical: on line ...
Defining \__exp_arg_next:nnn on line ...
Defining \__exp_arg_next:Nnn on line ...
Defining \::: on line ...
@@ -6451,7 +6452,6 @@ Defining \c__char_upper_case_z_tl on line ...
Defining \c__char_lower_case_Z_tl on line ...
Defining \c__char_fold_case_Z_tl on line ...
\g__char_data_ior=\read...
-Defining \mode_leave_vertical: on line ...
Defining \box_clip:N on line ...
Defining \box_clip:c on line ...
Defining \box_gclip:N on line ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index 73a9eb979..03be7bf6b 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -138,6 +138,7 @@ Defining \prg_map_break:Nn on line ...
Defining \prg_break_point: on line ...
Defining \prg_break: on line ...
Defining \prg_break:n on line ...
+Defining \mode_leave_vertical: on line ...
Defining \__exp_arg_next:nnn on line ...
Defining \__exp_arg_next:Nnn on line ...
Defining \::: on line ...
@@ -6459,7 +6460,6 @@ Defining \c__char_upper_case_ῇ_tl on line ...
Defining \c__char_mixed_case_ῇ_tl on line ...
Defining \c__char_upper_case_ῷ_tl on line ...
Defining \c__char_mixed_case_ῷ_tl on line ...
-Defining \mode_leave_vertical: on line ...
Defining \box_clip:N on line ...
Defining \box_clip:c on line ...
Defining \box_gclip:N on line ...
More information about the latex3-commits
mailing list