[latex3-commits] [git/LaTeX3-latex3-latex3] master: Reorder some loading (5456373)
Joseph Wright
joseph.wright at morningstar2.co.uk
Thu Apr 5 19:22:30 CEST 2018
Repository : https://github.com/latex3/latex3
On branch : master
Link : https://github.com/latex3/latex3/commit/54563733786b6697500b33370f3b727e2a1cffa2
>---------------------------------------------------------------
commit 54563733786b6697500b33370f3b727e2a1cffa2
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Thu Apr 5 18:16:52 2018 +0100
Reorder some loading
>---------------------------------------------------------------
54563733786b6697500b33370f3b727e2a1cffa2
l3kernel/l3.ins | 4 ++--
l3kernel/l3format.ins | 4 ++--
l3kernel/source3body.tex | 2 +-
l3kernel/testfiles/m3expl001.luatex.tlg | 16 ++++++++--------
l3kernel/testfiles/m3expl001.ptex.tlg | 16 ++++++++--------
l3kernel/testfiles/m3expl001.tlg | 16 ++++++++--------
l3kernel/testfiles/m3expl001.uptex.tlg | 16 ++++++++--------
l3kernel/testfiles/m3expl001.xetex.tlg | 16 ++++++++--------
l3kernel/testfiles/m3expl003.luatex.tlg | 16 ++++++++--------
l3kernel/testfiles/m3expl003.ptex.tlg | 16 ++++++++--------
l3kernel/testfiles/m3expl003.tlg | 16 ++++++++--------
l3kernel/testfiles/m3expl003.uptex.tlg | 16 ++++++++--------
l3kernel/testfiles/m3expl003.xetex.tlg | 16 ++++++++--------
13 files changed, 85 insertions(+), 85 deletions(-)
diff --git a/l3kernel/l3.ins b/l3kernel/l3.ins
index 593bf0d..538712d 100644
--- a/l3kernel/l3.ins
+++ b/l3kernel/l3.ins
@@ -98,9 +98,9 @@ and all files in that bundle must be distributed together.
\from{l3color-base.dtx} {package}
\from{l3coffins.dtx} {package}
\from{l3sys.dtx} {package}
- \from{l3deprecation.dtx}{package}
- \from{l3candidates.dtx} {package}
\from{l3luatex.dtx} {package,tex}
+ \from{l3candidates.dtx} {package}
+ \from{l3deprecation.dtx}{package}
}
}
diff --git a/l3kernel/l3format.ins b/l3kernel/l3format.ins
index 22c6408..81eb208 100644
--- a/l3kernel/l3format.ins
+++ b/l3kernel/l3format.ins
@@ -98,9 +98,9 @@ and all files in that bundle must be distributed together.
\from{l3color-base.dtx} {initex}
\from{l3coffins.dtx} {initex}
\from{l3sys.dtx} {initex}
- \from{l3deprecation.dtx}{initex}
- \from{l3candidates.dtx} {initex}
\from{l3luatex.dtx} {initex,tex}
+ \from{l3candidates.dtx} {initex}
+ \from{l3deprecation.dtx}{initex}
% ======== FORMAT ONLY =========
\from{l3final.dtx} {initex}
% ==============================
diff --git a/l3kernel/source3body.tex b/l3kernel/source3body.tex
index af46504..0ea31c8 100644
--- a/l3kernel/source3body.tex
+++ b/l3kernel/source3body.tex
@@ -451,9 +451,9 @@ used on top of \LaTeXe{} if \cs{outer} tokens are used in the arguments.
\DocInput{l3coffins.dtx}
\DocInput{l3color-base.dtx}
\DocInput{l3sys.dtx}
+\DocInput{l3luatex.dtx}
\DocInput{l3deprecation.dtx}
\DocInput{l3candidates.dtx}
-\DocInput{l3luatex.dtx}
\DocInput{l3drivers.dtx}
\endinput
diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index 201bd01..7572dbf 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -5690,7 +5690,13 @@ Defining \sys_if_output_pdf:F on line ...
Defining \sys_if_output_pdf:TF on line ...
Defining \sys_if_output_pdf_p: on line ...
Defining \c_sys_output_str on line ...
-Defining \__kernel_deprecation_error:Nnn on line ...
+Defining \lua_now_x:n on line ...
+Defining \lua_now:n on line ...
+Defining \lua_shipout_x:n on line ...
+Defining \lua_shipout:n on line ...
+Defining \lua_escape_x:n on line ...
+Defining \lua_escape:n on line ...
+Defining message LaTeX/kernel/luatex-required on line ...
Defining \mode_leave_vertical: on line ...
Defining \box_clip:N on line ...
Defining \box_clip:c on line ...
@@ -6027,13 +6033,7 @@ Defining \__peek_N_type_aux:nnw on line ...
Defining \peek_N_type:TF on line ...
Defining \peek_N_type:T on line ...
Defining \peek_N_type:F on line ...
-Defining \lua_now_x:n on line ...
-Defining \lua_now:n on line ...
-Defining \lua_shipout_x:n on line ...
-Defining \lua_shipout:n on line ...
-Defining \lua_escape_x:n on line ...
-Defining \lua_escape:n on line ...
-Defining message LaTeX/kernel/luatex-required on line ...
+Defining \__kernel_deprecation_error:Nnn on line ...
)
Defining message LaTeX/expl/wrong-driver on line ...
Defining \l__expl_driver_tl on line ...
diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
index 80a1fef..9f9a8f5 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -5629,7 +5629,13 @@ Defining \sys_if_output_pdf:F on line ...
Defining \sys_if_output_pdf:TF on line ...
Defining \sys_if_output_pdf_p: on line ...
Defining \c_sys_output_str on line ...
-Defining \__kernel_deprecation_error:Nnn on line ...
+Defining \lua_now_x:n on line ...
+Defining \lua_now:n on line ...
+Defining \lua_shipout_x:n on line ...
+Defining \lua_shipout:n on line ...
+Defining \lua_escape_x:n on line ...
+Defining \lua_escape:n on line ...
+Defining message LaTeX/kernel/luatex-required on line ...
Defining \mode_leave_vertical: on line ...
Defining \box_clip:N on line ...
Defining \box_clip:c on line ...
@@ -5967,13 +5973,7 @@ Defining \__peek_N_type_aux:nnw on line ...
Defining \peek_N_type:TF on line ...
Defining \peek_N_type:T on line ...
Defining \peek_N_type:F on line ...
-Defining \lua_now_x:n on line ...
-Defining \lua_now:n on line ...
-Defining \lua_shipout_x:n on line ...
-Defining \lua_shipout:n on line ...
-Defining \lua_escape_x:n on line ...
-Defining \lua_escape:n on line ...
-Defining message LaTeX/kernel/luatex-required on line ...
+Defining \__kernel_deprecation_error:Nnn on line ...
)
Defining message LaTeX/expl/wrong-driver on line ...
Defining \l__expl_driver_tl on line ...
diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg
index e6437fb..9bdd3ea 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -5629,7 +5629,13 @@ Defining \sys_if_output_pdf:F on line ...
Defining \sys_if_output_pdf:TF on line ...
Defining \sys_if_output_pdf_p: on line ...
Defining \c_sys_output_str on line ...
-Defining \__kernel_deprecation_error:Nnn on line ...
+Defining \lua_now_x:n on line ...
+Defining \lua_now:n on line ...
+Defining \lua_shipout_x:n on line ...
+Defining \lua_shipout:n on line ...
+Defining \lua_escape_x:n on line ...
+Defining \lua_escape:n on line ...
+Defining message LaTeX/kernel/luatex-required on line ...
Defining \mode_leave_vertical: on line ...
Defining \box_clip:N on line ...
Defining \box_clip:c on line ...
@@ -6168,13 +6174,7 @@ Defining \__peek_N_type_aux:nnw on line ...
Defining \peek_N_type:TF on line ...
Defining \peek_N_type:T on line ...
Defining \peek_N_type:F on line ...
-Defining \lua_now_x:n on line ...
-Defining \lua_now:n on line ...
-Defining \lua_shipout_x:n on line ...
-Defining \lua_shipout:n on line ...
-Defining \lua_escape_x:n on line ...
-Defining \lua_escape:n on line ...
-Defining message LaTeX/kernel/luatex-required on line ...
+Defining \__kernel_deprecation_error:Nnn on line ...
)
Defining message LaTeX/expl/wrong-driver on line ...
Defining \l__expl_driver_tl on line ...
diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
index f75e0c9..4ba2c4e 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -5627,7 +5627,13 @@ Defining \sys_if_output_pdf:F on line ...
Defining \sys_if_output_pdf:TF on line ...
Defining \sys_if_output_pdf_p: on line ...
Defining \c_sys_output_str on line ...
-Defining \__kernel_deprecation_error:Nnn on line ...
+Defining \lua_now_x:n on line ...
+Defining \lua_now:n on line ...
+Defining \lua_shipout_x:n on line ...
+Defining \lua_shipout:n on line ...
+Defining \lua_escape_x:n on line ...
+Defining \lua_escape:n on line ...
+Defining message LaTeX/kernel/luatex-required on line ...
Defining \mode_leave_vertical: on line ...
Defining \box_clip:N on line ...
Defining \box_clip:c on line ...
@@ -6166,13 +6172,7 @@ Defining \__peek_N_type_aux:nnw on line ...
Defining \peek_N_type:TF on line ...
Defining \peek_N_type:T on line ...
Defining \peek_N_type:F on line ...
-Defining \lua_now_x:n on line ...
-Defining \lua_now:n on line ...
-Defining \lua_shipout_x:n on line ...
-Defining \lua_shipout:n on line ...
-Defining \lua_escape_x:n on line ...
-Defining \lua_escape:n on line ...
-Defining message LaTeX/kernel/luatex-required on line ...
+Defining \__kernel_deprecation_error:Nnn on line ...
)
Defining message LaTeX/expl/wrong-driver on line ...
Defining \l__expl_driver_tl on line ...
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index c65d62b..ed14473 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -5663,7 +5663,13 @@ Defining \sys_if_output_pdf:F on line ...
Defining \sys_if_output_pdf:TF on line ...
Defining \sys_if_output_pdf_p: on line ...
Defining \c_sys_output_str on line ...
-Defining \__kernel_deprecation_error:Nnn on line ...
+Defining \lua_now_x:n on line ...
+Defining \lua_now:n on line ...
+Defining \lua_shipout_x:n on line ...
+Defining \lua_shipout:n on line ...
+Defining \lua_escape_x:n on line ...
+Defining \lua_escape:n on line ...
+Defining message LaTeX/kernel/luatex-required on line ...
Defining \mode_leave_vertical: on line ...
Defining \box_clip:N on line ...
Defining \box_clip:c on line ...
@@ -6001,13 +6007,7 @@ Defining \__peek_N_type_aux:nnw on line ...
Defining \peek_N_type:TF on line ...
Defining \peek_N_type:T on line ...
Defining \peek_N_type:F on line ...
-Defining \lua_now_x:n on line ...
-Defining \lua_now:n on line ...
-Defining \lua_shipout_x:n on line ...
-Defining \lua_shipout:n on line ...
-Defining \lua_escape_x:n on line ...
-Defining \lua_escape:n on line ...
-Defining message LaTeX/kernel/luatex-required on line ...
+Defining \__kernel_deprecation_error:Nnn on line ...
)
Defining message LaTeX/expl/wrong-driver on line ...
Defining \l__expl_driver_tl on line ...
diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index 201bd01..7572dbf 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -5690,7 +5690,13 @@ Defining \sys_if_output_pdf:F on line ...
Defining \sys_if_output_pdf:TF on line ...
Defining \sys_if_output_pdf_p: on line ...
Defining \c_sys_output_str on line ...
-Defining \__kernel_deprecation_error:Nnn on line ...
+Defining \lua_now_x:n on line ...
+Defining \lua_now:n on line ...
+Defining \lua_shipout_x:n on line ...
+Defining \lua_shipout:n on line ...
+Defining \lua_escape_x:n on line ...
+Defining \lua_escape:n on line ...
+Defining message LaTeX/kernel/luatex-required on line ...
Defining \mode_leave_vertical: on line ...
Defining \box_clip:N on line ...
Defining \box_clip:c on line ...
@@ -6027,13 +6033,7 @@ Defining \__peek_N_type_aux:nnw on line ...
Defining \peek_N_type:TF on line ...
Defining \peek_N_type:T on line ...
Defining \peek_N_type:F on line ...
-Defining \lua_now_x:n on line ...
-Defining \lua_now:n on line ...
-Defining \lua_shipout_x:n on line ...
-Defining \lua_shipout:n on line ...
-Defining \lua_escape_x:n on line ...
-Defining \lua_escape:n on line ...
-Defining message LaTeX/kernel/luatex-required on line ...
+Defining \__kernel_deprecation_error:Nnn on line ...
)
Defining message LaTeX/expl/wrong-driver on line ...
Defining \l__expl_driver_tl on line ...
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index 80a1fef..9f9a8f5 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -5629,7 +5629,13 @@ Defining \sys_if_output_pdf:F on line ...
Defining \sys_if_output_pdf:TF on line ...
Defining \sys_if_output_pdf_p: on line ...
Defining \c_sys_output_str on line ...
-Defining \__kernel_deprecation_error:Nnn on line ...
+Defining \lua_now_x:n on line ...
+Defining \lua_now:n on line ...
+Defining \lua_shipout_x:n on line ...
+Defining \lua_shipout:n on line ...
+Defining \lua_escape_x:n on line ...
+Defining \lua_escape:n on line ...
+Defining message LaTeX/kernel/luatex-required on line ...
Defining \mode_leave_vertical: on line ...
Defining \box_clip:N on line ...
Defining \box_clip:c on line ...
@@ -5967,13 +5973,7 @@ Defining \__peek_N_type_aux:nnw on line ...
Defining \peek_N_type:TF on line ...
Defining \peek_N_type:T on line ...
Defining \peek_N_type:F on line ...
-Defining \lua_now_x:n on line ...
-Defining \lua_now:n on line ...
-Defining \lua_shipout_x:n on line ...
-Defining \lua_shipout:n on line ...
-Defining \lua_escape_x:n on line ...
-Defining \lua_escape:n on line ...
-Defining message LaTeX/kernel/luatex-required on line ...
+Defining \__kernel_deprecation_error:Nnn on line ...
)
Defining message LaTeX/expl/wrong-driver on line ...
Defining \l__expl_driver_tl on line ...
diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg
index e6437fb..9bdd3ea 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -5629,7 +5629,13 @@ Defining \sys_if_output_pdf:F on line ...
Defining \sys_if_output_pdf:TF on line ...
Defining \sys_if_output_pdf_p: on line ...
Defining \c_sys_output_str on line ...
-Defining \__kernel_deprecation_error:Nnn on line ...
+Defining \lua_now_x:n on line ...
+Defining \lua_now:n on line ...
+Defining \lua_shipout_x:n on line ...
+Defining \lua_shipout:n on line ...
+Defining \lua_escape_x:n on line ...
+Defining \lua_escape:n on line ...
+Defining message LaTeX/kernel/luatex-required on line ...
Defining \mode_leave_vertical: on line ...
Defining \box_clip:N on line ...
Defining \box_clip:c on line ...
@@ -6168,13 +6174,7 @@ Defining \__peek_N_type_aux:nnw on line ...
Defining \peek_N_type:TF on line ...
Defining \peek_N_type:T on line ...
Defining \peek_N_type:F on line ...
-Defining \lua_now_x:n on line ...
-Defining \lua_now:n on line ...
-Defining \lua_shipout_x:n on line ...
-Defining \lua_shipout:n on line ...
-Defining \lua_escape_x:n on line ...
-Defining \lua_escape:n on line ...
-Defining message LaTeX/kernel/luatex-required on line ...
+Defining \__kernel_deprecation_error:Nnn on line ...
)
Defining message LaTeX/expl/wrong-driver on line ...
Defining \l__expl_driver_tl on line ...
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index f75e0c9..4ba2c4e 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -5627,7 +5627,13 @@ Defining \sys_if_output_pdf:F on line ...
Defining \sys_if_output_pdf:TF on line ...
Defining \sys_if_output_pdf_p: on line ...
Defining \c_sys_output_str on line ...
-Defining \__kernel_deprecation_error:Nnn on line ...
+Defining \lua_now_x:n on line ...
+Defining \lua_now:n on line ...
+Defining \lua_shipout_x:n on line ...
+Defining \lua_shipout:n on line ...
+Defining \lua_escape_x:n on line ...
+Defining \lua_escape:n on line ...
+Defining message LaTeX/kernel/luatex-required on line ...
Defining \mode_leave_vertical: on line ...
Defining \box_clip:N on line ...
Defining \box_clip:c on line ...
@@ -6166,13 +6172,7 @@ Defining \__peek_N_type_aux:nnw on line ...
Defining \peek_N_type:TF on line ...
Defining \peek_N_type:T on line ...
Defining \peek_N_type:F on line ...
-Defining \lua_now_x:n on line ...
-Defining \lua_now:n on line ...
-Defining \lua_shipout_x:n on line ...
-Defining \lua_shipout:n on line ...
-Defining \lua_escape_x:n on line ...
-Defining \lua_escape:n on line ...
-Defining message LaTeX/kernel/luatex-required on line ...
+Defining \__kernel_deprecation_error:Nnn on line ...
)
Defining message LaTeX/expl/wrong-driver on line ...
Defining \l__expl_driver_tl on line ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index c65d62b..ed14473 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -5663,7 +5663,13 @@ Defining \sys_if_output_pdf:F on line ...
Defining \sys_if_output_pdf:TF on line ...
Defining \sys_if_output_pdf_p: on line ...
Defining \c_sys_output_str on line ...
-Defining \__kernel_deprecation_error:Nnn on line ...
+Defining \lua_now_x:n on line ...
+Defining \lua_now:n on line ...
+Defining \lua_shipout_x:n on line ...
+Defining \lua_shipout:n on line ...
+Defining \lua_escape_x:n on line ...
+Defining \lua_escape:n on line ...
+Defining message LaTeX/kernel/luatex-required on line ...
Defining \mode_leave_vertical: on line ...
Defining \box_clip:N on line ...
Defining \box_clip:c on line ...
@@ -6001,13 +6007,7 @@ Defining \__peek_N_type_aux:nnw on line ...
Defining \peek_N_type:TF on line ...
Defining \peek_N_type:T on line ...
Defining \peek_N_type:F on line ...
-Defining \lua_now_x:n on line ...
-Defining \lua_now:n on line ...
-Defining \lua_shipout_x:n on line ...
-Defining \lua_shipout:n on line ...
-Defining \lua_escape_x:n on line ...
-Defining \lua_escape:n on line ...
-Defining message LaTeX/kernel/luatex-required on line ...
+Defining \__kernel_deprecation_error:Nnn on line ...
)
Defining message LaTeX/expl/wrong-driver on line ...
Defining \l__expl_driver_tl on line ...
More information about the latex3-commits
mailing list