[latex3-commits] [git/LaTeX3-latex3-latex3] master: Access full register range in (u)pTeX (565d38ddd)
Joseph Wright
joseph.wright at morningstar2.co.uk
Sun Oct 20 10:23:38 CEST 2019
Repository : https://github.com/latex3/latex3
On branch : master
Link : https://github.com/latex3/latex3/commit/565d38ddd4a008bc866764802e4f2cec76e16bcf
>---------------------------------------------------------------
commit 565d38ddd4a008bc866764802e4f2cec76e16bcf
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Sat Oct 19 21:10:08 2019 +0100
Access full register range in (u)pTeX
>---------------------------------------------------------------
565d38ddd4a008bc866764802e4f2cec76e16bcf
l3kernel/l3alloc.dtx | 6 +++++-
l3kernel/l3basics.dtx | 8 +++++++-
l3kernel/l3int.dtx | 11 +++++------
l3kernel/testfiles/m3int001.uptex.tlg | 19 +++++++++++++++++++
.../{m3int002.xetex.tlg => m3int002.ptex.tlg} | 4 ++--
l3kernel/testfiles/m3int002.uptex.tlg | 4 ++--
.../{m3ior001.uptex.tlg => m3ior001.ptex.tlg} | 4 ++--
l3kernel/testfiles/m3ior001.uptex.tlg | 4 ++--
.../{m3iow001.luatex.tlg => m3iow001.ptex.tlg} | 4 ++--
l3kernel/testfiles/m3iow001.uptex.tlg | 4 ++--
.../{m3sort001.luatex.tlg => m3sort001.ptex.tlg} | 18 ------------------
.../{m3sort001.luatex.tlg => m3sort001.uptex.tlg} | 18 ------------------
12 files changed, 48 insertions(+), 56 deletions(-)
diff --git a/l3kernel/l3alloc.dtx b/l3kernel/l3alloc.dtx
index edc3fb9dd..e03ee7dc1 100644
--- a/l3kernel/l3alloc.dtx
+++ b/l3kernel/l3alloc.dtx
@@ -145,7 +145,11 @@
\exp_not:N \@@_reg:nNnN { box }
\cs_if_exist:NTF \tex_luatexversion:D
{ \tex_chardef:D }
- { \tex_mathchardef:D }
+ {
+ \cs_if_exist:NTF \tex_omathchardef:D
+ { \tex_omathchardef:D }
+ { \tex_mathchardef:D }
+ }
\c_max_register_int
#1
}
diff --git a/l3kernel/l3basics.dtx b/l3kernel/l3basics.dtx
index 3046fbdf4..3d65af188 100644
--- a/l3kernel/l3basics.dtx
+++ b/l3kernel/l3basics.dtx
@@ -1508,11 +1508,17 @@
% \begin{variable}{\c_max_register_int}
% This is here as this particular integer is needed both in package
% mode and to bootstrap \pkg{l3alloc}, and is documented in \pkg{l3int}.
+% \LuaTeX{} and those which contain parts of the Omega extensions have
+% more registers available than \eTeX{}.
% \begin{macrocode}
\tex_ifdefined:D \tex_luatexversion:D
\tex_chardef:D \c_max_register_int = 65 535 ~
\tex_else:D
- \tex_mathchardef:D \c_max_register_int = 32 767 ~
+ \tex_ifdefined:D \tex_omathchardef:D
+ \tex_omathchardef:D \c_max_register_int = 65535 ~
+ \tex_else:D
+ \tex_mathchardef:D \c_max_register_int = 32767 ~
+ \tex_fi:D
\tex_fi:D
% \end{macrocode}
% \end{variable}
diff --git a/l3kernel/l3int.dtx b/l3kernel/l3int.dtx
index ca0f8c0bb..7d7151aa9 100644
--- a/l3kernel/l3int.dtx
+++ b/l3kernel/l3int.dtx
@@ -1285,12 +1285,11 @@
}
\cs_generate_variant:Nn \int_const:Nn { c }
\if_int_odd:w 0
- \cs_if_exist:NT \tex_luatexversion:D { 1 }
- \cs_if_exist:NT \tex_disablecjktoken:D
- { \if_int_compare:w \tex_jis:D "2121 = "3000 ~ 1 \fi: }
- \cs_if_exist:NT \tex_XeTeXversion:D { 1 } ~
- \cs_if_exist:NTF \tex_disablecjktoken:D
- { \cs_new_eq:NN \@@_constdef:Nw \tex_kchardef:D }
+ \cs_if_exist:NT \tex_luatexversion:D { 1 }
+ \cs_if_exist:NT \tex_omathchardef:D { 1 }
+ \cs_if_exist:NT \tex_XeTeXversion:D { 1 } ~
+ \cs_if_exist:NTF \tex_omathchardef:D
+ { \cs_new_eq:NN \@@_constdef:Nw \tex_omathchardef:D }
{ \cs_new_eq:NN \@@_constdef:Nw \tex_chardef:D }
\@@_constdef:Nw \c_@@_max_constdef_int 1114111 ~
\else:
diff --git a/l3kernel/testfiles/m3int001.uptex.tlg b/l3kernel/testfiles/m3int001.uptex.tlg
index f4d0f2fc7..10abd368a 100644
--- a/l3kernel/testfiles/m3int001.uptex.tlg
+++ b/l3kernel/testfiles/m3int001.uptex.tlg
@@ -77,6 +77,25 @@ TEST 7: trying invalid variables: expect errors
\c_one_int
l. ... }
I'm forgetting what you said and not changing anything.
+! Missing $ inserted.
+<inserted text>
+ $
+l. ... }
+I've inserted a begin-math/end-math symbol since I think
+you left one out. Proceed, with fingers crossed.
+LaTeX Font Info: External font `cmex10' loaded for size
+(Font) <7> on input line ....
+LaTeX Font Info: External font `cmex10' loaded for size
+(Font) <5> on input line ....
+! Missing $ inserted.
+<inserted text>
+ $
+l. ... }
+I've inserted something that you may have forgotten.
+(See the <inserted text> above.)
+With luck, this will get me unwedged. But if you
+really didn't forget anything, try typing `2' now; then
+my insertion and my current dilemma will both disappear.
============================================================
============================================================
TEST 8: using num expr
diff --git a/l3kernel/testfiles/m3int002.xetex.tlg b/l3kernel/testfiles/m3int002.ptex.tlg
similarity index 99%
copy from l3kernel/testfiles/m3int002.xetex.tlg
copy to l3kernel/testfiles/m3int002.ptex.tlg
index 0f158d30c..2b29cc942 100644
--- a/l3kernel/testfiles/m3int002.xetex.tlg
+++ b/l3kernel/testfiles/m3int002.ptex.tlg
@@ -230,7 +230,7 @@ Defining \g_B_int on line ...
TEST 16: Constant integer creation
============================================================
Defining \c_A_int on line ...
-\char"5
+\omathchar"5
5
Defining \c_B_int on line ...
\c_B_int=\count...
@@ -250,7 +250,7 @@ This is a coding error.
LaTeX has been asked to create a new control sequence '\c_A_int' but this name
has already been used elsewhere.
The current meaning is:
- \char"5
+ \omathchar"5
Defining \c_A_int on line ...
! LaTeX3 Error: Control sequence \c_B_int already defined.
For immediate help type H <return>.
diff --git a/l3kernel/testfiles/m3int002.uptex.tlg b/l3kernel/testfiles/m3int002.uptex.tlg
index c99db5643..2b29cc942 100644
--- a/l3kernel/testfiles/m3int002.uptex.tlg
+++ b/l3kernel/testfiles/m3int002.uptex.tlg
@@ -230,7 +230,7 @@ Defining \g_B_int on line ...
TEST 16: Constant integer creation
============================================================
Defining \c_A_int on line ...
-\kchar"5
+\omathchar"5
5
Defining \c_B_int on line ...
\c_B_int=\count...
@@ -250,7 +250,7 @@ This is a coding error.
LaTeX has been asked to create a new control sequence '\c_A_int' but this name
has already been used elsewhere.
The current meaning is:
- \kchar"5
+ \omathchar"5
Defining \c_A_int on line ...
! LaTeX3 Error: Control sequence \c_B_int already defined.
For immediate help type H <return>.
diff --git a/l3kernel/testfiles/m3ior001.uptex.tlg b/l3kernel/testfiles/m3ior001.ptex.tlg
similarity index 98%
copy from l3kernel/testfiles/m3ior001.uptex.tlg
copy to l3kernel/testfiles/m3ior001.ptex.tlg
index 561d06b21..213aa49d1 100644
--- a/l3kernel/testfiles/m3ior001.uptex.tlg
+++ b/l3kernel/testfiles/m3ior001.ptex.tlg
@@ -14,7 +14,7 @@ This is a coding error.
LaTeX has been asked to create a new control sequence '\testa' but this name
has already been used elsewhere.
The current meaning is:
- \kchar"10
+ \omathchar"10
Defining \testa on line ...
! LaTeX3 Error: Control sequence \testb already defined.
For immediate help type H <return>.
@@ -24,7 +24,7 @@ This is a coding error.
LaTeX has been asked to create a new control sequence '\testb' but this name
has already been used elsewhere.
The current meaning is:
- \kchar"10
+ \omathchar"10
Defining \testb on line ...
============================================================
============================================================
diff --git a/l3kernel/testfiles/m3ior001.uptex.tlg b/l3kernel/testfiles/m3ior001.uptex.tlg
index 561d06b21..213aa49d1 100644
--- a/l3kernel/testfiles/m3ior001.uptex.tlg
+++ b/l3kernel/testfiles/m3ior001.uptex.tlg
@@ -14,7 +14,7 @@ This is a coding error.
LaTeX has been asked to create a new control sequence '\testa' but this name
has already been used elsewhere.
The current meaning is:
- \kchar"10
+ \omathchar"10
Defining \testa on line ...
! LaTeX3 Error: Control sequence \testb already defined.
For immediate help type H <return>.
@@ -24,7 +24,7 @@ This is a coding error.
LaTeX has been asked to create a new control sequence '\testb' but this name
has already been used elsewhere.
The current meaning is:
- \kchar"10
+ \omathchar"10
Defining \testb on line ...
============================================================
============================================================
diff --git a/l3kernel/testfiles/m3iow001.luatex.tlg b/l3kernel/testfiles/m3iow001.ptex.tlg
similarity index 99%
copy from l3kernel/testfiles/m3iow001.luatex.tlg
copy to l3kernel/testfiles/m3iow001.ptex.tlg
index b01fbd2c8..3562cd543 100644
--- a/l3kernel/testfiles/m3iow001.luatex.tlg
+++ b/l3kernel/testfiles/m3iow001.ptex.tlg
@@ -14,7 +14,7 @@ This is a coding error.
LaTeX has been asked to create a new control sequence '\testa' but this name
has already been used elsewhere.
The current meaning is:
- \char"80
+ \omathchar"10
Defining \testa on line ...
! LaTeX3 Error: Control sequence \testb already defined.
For immediate help type H <return>.
@@ -24,7 +24,7 @@ This is a coding error.
LaTeX has been asked to create a new control sequence '\testb' but this name
has already been used elsewhere.
The current meaning is:
- \char"80
+ \omathchar"10
Defining \testb on line ...
============================================================
============================================================
diff --git a/l3kernel/testfiles/m3iow001.uptex.tlg b/l3kernel/testfiles/m3iow001.uptex.tlg
index e5dff00df..3562cd543 100644
--- a/l3kernel/testfiles/m3iow001.uptex.tlg
+++ b/l3kernel/testfiles/m3iow001.uptex.tlg
@@ -14,7 +14,7 @@ This is a coding error.
LaTeX has been asked to create a new control sequence '\testa' but this name
has already been used elsewhere.
The current meaning is:
- \kchar"10
+ \omathchar"10
Defining \testa on line ...
! LaTeX3 Error: Control sequence \testb already defined.
For immediate help type H <return>.
@@ -24,7 +24,7 @@ This is a coding error.
LaTeX has been asked to create a new control sequence '\testb' but this name
has already been used elsewhere.
The current meaning is:
- \kchar"10
+ \omathchar"10
Defining \testb on line ...
============================================================
============================================================
diff --git a/l3kernel/testfiles/m3sort001.luatex.tlg b/l3kernel/testfiles/m3sort001.ptex.tlg
similarity index 81%
copy from l3kernel/testfiles/m3sort001.luatex.tlg
copy to l3kernel/testfiles/m3sort001.ptex.tlg
index 9ec41ecc9..bb4d42401 100644
--- a/l3kernel/testfiles/m3sort001.luatex.tlg
+++ b/l3kernel/testfiles/m3sort001.ptex.tlg
@@ -30,24 +30,6 @@ TEST 3: Sort seq
============================================================
TEST 4: sort too long
============================================================
-! LaTeX3 Error: The list \l_tmpa_tl is too long to be sorted by TeX.
-For immediate help type H <return>.
- ...
-l. ... }
-TeX has 5535 toks registers still available: this only allows to sort with up
-to 3791 items. The list will not be sorted.
-! LaTeX3 Error: The list \l_tmpa_clist is too long to be sorted by TeX.
-For immediate help type H <return>.
- ...
-l. ... }
-TeX has 5534 toks registers still available: this only allows to sort with up
-to 3790 items. The list will not be sorted.
-! LaTeX3 Error: The list \l_tmpa_seq is too long to be sorted by TeX.
-For immediate help type H <return>.
- ...
-l. ... }
-TeX has 5533 toks registers still available: this only allows to sort with up
-to 3790 items. The list will not be sorted.
============================================================
============================================================
TEST 5: sort errors
diff --git a/l3kernel/testfiles/m3sort001.luatex.tlg b/l3kernel/testfiles/m3sort001.uptex.tlg
similarity index 81%
copy from l3kernel/testfiles/m3sort001.luatex.tlg
copy to l3kernel/testfiles/m3sort001.uptex.tlg
index 9ec41ecc9..bb4d42401 100644
--- a/l3kernel/testfiles/m3sort001.luatex.tlg
+++ b/l3kernel/testfiles/m3sort001.uptex.tlg
@@ -30,24 +30,6 @@ TEST 3: Sort seq
============================================================
TEST 4: sort too long
============================================================
-! LaTeX3 Error: The list \l_tmpa_tl is too long to be sorted by TeX.
-For immediate help type H <return>.
- ...
-l. ... }
-TeX has 5535 toks registers still available: this only allows to sort with up
-to 3791 items. The list will not be sorted.
-! LaTeX3 Error: The list \l_tmpa_clist is too long to be sorted by TeX.
-For immediate help type H <return>.
- ...
-l. ... }
-TeX has 5534 toks registers still available: this only allows to sort with up
-to 3790 items. The list will not be sorted.
-! LaTeX3 Error: The list \l_tmpa_seq is too long to be sorted by TeX.
-For immediate help type H <return>.
- ...
-l. ... }
-TeX has 5533 toks registers still available: this only allows to sort with up
-to 3790 items. The list will not be sorted.
============================================================
============================================================
TEST 5: sort errors
More information about the latex3-commits
mailing list