From dbda656a2032cb7b44e95537a74c56aa58f2e33a Mon Sep 17 00:00:00 2001 From: Joseph Wright Date: Wed, 28 Mar 2018 11:53:16 +0100 Subject: [PATCH] Define tl_act quarks by hand --- l3kernel/l3quark.dtx | 9 --------- l3kernel/l3tl.dtx | 8 ++++++-- l3kernel/testfiles/m3expl001.luatex.tlg | 4 ++-- l3kernel/testfiles/m3expl001.ptex.tlg | 4 ++-- l3kernel/testfiles/m3expl001.tlg | 4 ++-- l3kernel/testfiles/m3expl001.uptex.tlg | 4 ++-- l3kernel/testfiles/m3expl001.xetex.tlg | 4 ++-- l3kernel/testfiles/m3expl003.luatex.tlg | 4 ++-- l3kernel/testfiles/m3expl003.ptex.tlg | 4 ++-- l3kernel/testfiles/m3expl003.tlg | 4 ++-- l3kernel/testfiles/m3expl003.uptex.tlg | 4 ++-- l3kernel/testfiles/m3expl003.xetex.tlg | 4 ++-- 12 files changed, 26 insertions(+), 31 deletions(-) diff --git a/l3kernel/l3quark.dtx b/l3kernel/l3quark.dtx index b100ffef5f..2679e5ce71 100644 --- a/l3kernel/l3quark.dtx +++ b/l3kernel/l3quark.dtx @@ -580,15 +580,6 @@ % \end{macro} % \end{macro} % -% \begin{variable}{\q__tl_act_mark, \q__tl_act_stop} -% These private quarks are needed by \pkg{l3tl}, but that is loaded -% before the quark module, hence their definition is deferred. -% \begin{macrocode} -\quark_new:N \q__tl_act_mark -\quark_new:N \q__tl_act_stop -% \end{macrocode} -% \end{variable} -% % \subsection{Scan marks} % % \begin{macrocode} diff --git a/l3kernel/l3tl.dtx b/l3kernel/l3tl.dtx index 70a45e350c..e87650fa3b 100644 --- a/l3kernel/l3tl.dtx +++ b/l3kernel/l3tl.dtx @@ -2479,8 +2479,12 @@ % Hence, we use two private quarks, to allow any token, even quarks, % in the token list. % Only \cs{q_@@_act_mark} and \cs{q_@@_act_stop} may not appear -% in the token lists manipulated by \cs{@@_act:NNNnn} functions. The quarks -% are effectively defined in \pkg{l3quark}. +% in the token lists manipulated by \cs{@@_act:NNNnn} functions. +% No quark module yet, so do things by hand. +% \begin{macrocode} +\cs_new_nopar:Npn \q_@@_act_mark { \q_@@_act_mark } +\cs_new_nopar:Npn \q_@@_act_stop { \q_@@_act_stop } +% \end{macrocode} % \end{variable} % % \begin{macro}[EXP]{\@@_act:NNNnn} diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg index d0d5d61f22..8dcb971268 100644 --- a/l3kernel/testfiles/m3expl001.luatex.tlg +++ b/l3kernel/testfiles/m3expl001.luatex.tlg @@ -539,6 +539,8 @@ Defining \__tl_trim_spaces_auxi:w on line ... Defining \__tl_trim_spaces_auxii:w on line ... Defining \__tl_trim_spaces_auxiii:w on line ... Defining \__tl_trim_spaces_auxiv:w on line ... +Defining \q__tl_act_mark on line ... +Defining \q__tl_act_stop on line ... Defining \__tl_act:NNNnn on line ... Defining \__tl_act_loop:w on line ... Defining \__tl_act_normal:NwnNNN on line ... @@ -1929,8 +1931,6 @@ Defining \quark_if_nil:oT on line ... Defining \quark_if_nil:VF on line ... Defining \quark_if_nil:oF on line ... Defining \__quark_if_empty_return:o on line ... -Defining \q__tl_act_mark on line ... -Defining \q__tl_act_stop on line ... Defining \g__scan_marks_tl on line ... Defining \__scan_new:N on line ... Defining \s__stop on line ... diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg index 385335e8dc..8631c7ed8a 100644 --- a/l3kernel/testfiles/m3expl001.ptex.tlg +++ b/l3kernel/testfiles/m3expl001.ptex.tlg @@ -538,6 +538,8 @@ Defining \__tl_trim_spaces_auxi:w on line ... Defining \__tl_trim_spaces_auxii:w on line ... Defining \__tl_trim_spaces_auxiii:w on line ... Defining \__tl_trim_spaces_auxiv:w on line ... +Defining \q__tl_act_mark on line ... +Defining \q__tl_act_stop on line ... Defining \__tl_act:NNNnn on line ... Defining \__tl_act_loop:w on line ... Defining \__tl_act_normal:NwnNNN on line ... @@ -1610,8 +1612,6 @@ Defining \quark_if_nil:oT on line ... Defining \quark_if_nil:VF on line ... Defining \quark_if_nil:oF on line ... Defining \__quark_if_empty_return:o on line ... -Defining \q__tl_act_mark on line ... -Defining \q__tl_act_stop on line ... Defining \g__scan_marks_tl on line ... Defining \__scan_new:N on line ... Defining \s__stop on line ... diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg index 3fb3f5c8ab..b37f8dafc2 100644 --- a/l3kernel/testfiles/m3expl001.tlg +++ b/l3kernel/testfiles/m3expl001.tlg @@ -538,6 +538,8 @@ Defining \__tl_trim_spaces_auxi:w on line ... Defining \__tl_trim_spaces_auxii:w on line ... Defining \__tl_trim_spaces_auxiii:w on line ... Defining \__tl_trim_spaces_auxiv:w on line ... +Defining \q__tl_act_mark on line ... +Defining \q__tl_act_stop on line ... Defining \__tl_act:NNNnn on line ... Defining \__tl_act_loop:w on line ... Defining \__tl_act_normal:NwnNNN on line ... @@ -1610,8 +1612,6 @@ Defining \quark_if_nil:oT on line ... Defining \quark_if_nil:VF on line ... Defining \quark_if_nil:oF on line ... Defining \__quark_if_empty_return:o on line ... -Defining \q__tl_act_mark on line ... -Defining \q__tl_act_stop on line ... Defining \g__scan_marks_tl on line ... Defining \__scan_new:N on line ... Defining \s__stop on line ... diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg index e14d08a36f..f503307278 100644 --- a/l3kernel/testfiles/m3expl001.uptex.tlg +++ b/l3kernel/testfiles/m3expl001.uptex.tlg @@ -538,6 +538,8 @@ Defining \__tl_trim_spaces_auxi:w on line ... Defining \__tl_trim_spaces_auxii:w on line ... Defining \__tl_trim_spaces_auxiii:w on line ... Defining \__tl_trim_spaces_auxiv:w on line ... +Defining \q__tl_act_mark on line ... +Defining \q__tl_act_stop on line ... Defining \__tl_act:NNNnn on line ... Defining \__tl_act_loop:w on line ... Defining \__tl_act_normal:NwnNNN on line ... @@ -1610,8 +1612,6 @@ Defining \quark_if_nil:oT on line ... Defining \quark_if_nil:VF on line ... Defining \quark_if_nil:oF on line ... Defining \__quark_if_empty_return:o on line ... -Defining \q__tl_act_mark on line ... -Defining \q__tl_act_stop on line ... Defining \g__scan_marks_tl on line ... Defining \__scan_new:N on line ... Defining \s__stop on line ... diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg index d37a8e1a70..9fe683ea54 100644 --- a/l3kernel/testfiles/m3expl001.xetex.tlg +++ b/l3kernel/testfiles/m3expl001.xetex.tlg @@ -538,6 +538,8 @@ Defining \__tl_trim_spaces_auxi:w on line ... Defining \__tl_trim_spaces_auxii:w on line ... Defining \__tl_trim_spaces_auxiii:w on line ... Defining \__tl_trim_spaces_auxiv:w on line ... +Defining \q__tl_act_mark on line ... +Defining \q__tl_act_stop on line ... Defining \__tl_act:NNNnn on line ... Defining \__tl_act_loop:w on line ... Defining \__tl_act_normal:NwnNNN on line ... @@ -1927,8 +1929,6 @@ Defining \quark_if_nil:oT on line ... Defining \quark_if_nil:VF on line ... Defining \quark_if_nil:oF on line ... Defining \__quark_if_empty_return:o on line ... -Defining \q__tl_act_mark on line ... -Defining \q__tl_act_stop on line ... Defining \g__scan_marks_tl on line ... Defining \__scan_new:N on line ... Defining \s__stop on line ... diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg index d0d5d61f22..8dcb971268 100644 --- a/l3kernel/testfiles/m3expl003.luatex.tlg +++ b/l3kernel/testfiles/m3expl003.luatex.tlg @@ -539,6 +539,8 @@ Defining \__tl_trim_spaces_auxi:w on line ... Defining \__tl_trim_spaces_auxii:w on line ... Defining \__tl_trim_spaces_auxiii:w on line ... Defining \__tl_trim_spaces_auxiv:w on line ... +Defining \q__tl_act_mark on line ... +Defining \q__tl_act_stop on line ... Defining \__tl_act:NNNnn on line ... Defining \__tl_act_loop:w on line ... Defining \__tl_act_normal:NwnNNN on line ... @@ -1929,8 +1931,6 @@ Defining \quark_if_nil:oT on line ... Defining \quark_if_nil:VF on line ... Defining \quark_if_nil:oF on line ... Defining \__quark_if_empty_return:o on line ... -Defining \q__tl_act_mark on line ... -Defining \q__tl_act_stop on line ... Defining \g__scan_marks_tl on line ... Defining \__scan_new:N on line ... Defining \s__stop on line ... diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg index 385335e8dc..8631c7ed8a 100644 --- a/l3kernel/testfiles/m3expl003.ptex.tlg +++ b/l3kernel/testfiles/m3expl003.ptex.tlg @@ -538,6 +538,8 @@ Defining \__tl_trim_spaces_auxi:w on line ... Defining \__tl_trim_spaces_auxii:w on line ... Defining \__tl_trim_spaces_auxiii:w on line ... Defining \__tl_trim_spaces_auxiv:w on line ... +Defining \q__tl_act_mark on line ... +Defining \q__tl_act_stop on line ... Defining \__tl_act:NNNnn on line ... Defining \__tl_act_loop:w on line ... Defining \__tl_act_normal:NwnNNN on line ... @@ -1610,8 +1612,6 @@ Defining \quark_if_nil:oT on line ... Defining \quark_if_nil:VF on line ... Defining \quark_if_nil:oF on line ... Defining \__quark_if_empty_return:o on line ... -Defining \q__tl_act_mark on line ... -Defining \q__tl_act_stop on line ... Defining \g__scan_marks_tl on line ... Defining \__scan_new:N on line ... Defining \s__stop on line ... diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg index 3fb3f5c8ab..b37f8dafc2 100644 --- a/l3kernel/testfiles/m3expl003.tlg +++ b/l3kernel/testfiles/m3expl003.tlg @@ -538,6 +538,8 @@ Defining \__tl_trim_spaces_auxi:w on line ... Defining \__tl_trim_spaces_auxii:w on line ... Defining \__tl_trim_spaces_auxiii:w on line ... Defining \__tl_trim_spaces_auxiv:w on line ... +Defining \q__tl_act_mark on line ... +Defining \q__tl_act_stop on line ... Defining \__tl_act:NNNnn on line ... Defining \__tl_act_loop:w on line ... Defining \__tl_act_normal:NwnNNN on line ... @@ -1610,8 +1612,6 @@ Defining \quark_if_nil:oT on line ... Defining \quark_if_nil:VF on line ... Defining \quark_if_nil:oF on line ... Defining \__quark_if_empty_return:o on line ... -Defining \q__tl_act_mark on line ... -Defining \q__tl_act_stop on line ... Defining \g__scan_marks_tl on line ... Defining \__scan_new:N on line ... Defining \s__stop on line ... diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg index e14d08a36f..f503307278 100644 --- a/l3kernel/testfiles/m3expl003.uptex.tlg +++ b/l3kernel/testfiles/m3expl003.uptex.tlg @@ -538,6 +538,8 @@ Defining \__tl_trim_spaces_auxi:w on line ... Defining \__tl_trim_spaces_auxii:w on line ... Defining \__tl_trim_spaces_auxiii:w on line ... Defining \__tl_trim_spaces_auxiv:w on line ... +Defining \q__tl_act_mark on line ... +Defining \q__tl_act_stop on line ... Defining \__tl_act:NNNnn on line ... Defining \__tl_act_loop:w on line ... Defining \__tl_act_normal:NwnNNN on line ... @@ -1610,8 +1612,6 @@ Defining \quark_if_nil:oT on line ... Defining \quark_if_nil:VF on line ... Defining \quark_if_nil:oF on line ... Defining \__quark_if_empty_return:o on line ... -Defining \q__tl_act_mark on line ... -Defining \q__tl_act_stop on line ... Defining \g__scan_marks_tl on line ... Defining \__scan_new:N on line ... Defining \s__stop on line ... diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg index d37a8e1a70..9fe683ea54 100644 --- a/l3kernel/testfiles/m3expl003.xetex.tlg +++ b/l3kernel/testfiles/m3expl003.xetex.tlg @@ -538,6 +538,8 @@ Defining \__tl_trim_spaces_auxi:w on line ... Defining \__tl_trim_spaces_auxii:w on line ... Defining \__tl_trim_spaces_auxiii:w on line ... Defining \__tl_trim_spaces_auxiv:w on line ... +Defining \q__tl_act_mark on line ... +Defining \q__tl_act_stop on line ... Defining \__tl_act:NNNnn on line ... Defining \__tl_act_loop:w on line ... Defining \__tl_act_normal:NwnNNN on line ... @@ -1927,8 +1929,6 @@ Defining \quark_if_nil:oT on line ... Defining \quark_if_nil:VF on line ... Defining \quark_if_nil:oF on line ... Defining \__quark_if_empty_return:o on line ... -Defining \q__tl_act_mark on line ... -Defining \q__tl_act_stop on line ... Defining \g__scan_marks_tl on line ... Defining \__scan_new:N on line ... Defining \s__stop on line ...