texlive[73803] Build/source/texk/web2c: (e)(u)ptex: increase eqtb
commits+hironobu at tug.org
commits+hironobu at tug.org
Sun Feb 9 09:50:07 CET 2025
Revision: 73803
https://tug.org/svn/texlive?view=revision&revision=73803
Author: hironobu
Date: 2025-02-09 09:50:06 +0100 (Sun, 09 Feb 2025)
Log Message:
-----------
(e)(u)ptex: increase eqtb size to support 1024 KINSOKU/INHIBIT tables
Modified Paths:
--------------
trunk/Build/source/texk/web2c/euptexdir/ChangeLog
trunk/Build/source/texk/web2c/euptexdir/tests/kinsoku_table.log
trunk/Build/source/texk/web2c/euptexdir/tests/kinsoku_table.tex
trunk/Build/source/texk/web2c/ptexdir/ChangeLog
trunk/Build/source/texk/web2c/ptexdir/ptex-base.ch
trunk/Build/source/texk/web2c/uptexdir/ChangeLog
trunk/Build/source/texk/web2c/uptexdir/ptex-base.ch
trunk/Build/source/texk/web2c/uptexdir/uptex-m.ch
Modified: trunk/Build/source/texk/web2c/euptexdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/euptexdir/ChangeLog 2025-02-09 08:14:25 UTC (rev 73802)
+++ trunk/Build/source/texk/web2c/euptexdir/ChangeLog 2025-02-09 08:50:06 UTC (rev 73803)
@@ -2,6 +2,8 @@
* suppresserrors.ch: Format \ignoreprimitiveerror printing
as in pdfTeX and XeTeX.
+ * kinsoku_table.log, kinsoku_table.tex: No error after
+ increasing inhibit_xsp/kinsoku tables 256 -> 1024.
2025-02-02 TANAKA Takuji <ttk at t-lab.opal.ne.jp>
Modified: trunk/Build/source/texk/web2c/euptexdir/tests/kinsoku_table.log
===================================================================
--- trunk/Build/source/texk/web2c/euptexdir/tests/kinsoku_table.log 2025-02-09 08:14:25 UTC (rev 73802)
+++ trunk/Build/source/texk/web2c/euptexdir/tests/kinsoku_table.log 2025-02-09 08:50:06 UTC (rev 73803)
@@ -26,13 +26,6 @@
12912 12915 12918 12921 12924 12927 12930 12933 12936 12939 12942 12945 12948
12951 12954 12957 12960 12963 12966 12969 12972 12975 12978 12981 12984 12987
12990 12993 12996 12999 13002 13005 13008 13011 13014 13017 13020 13023 13026
-13029 13032 13035 13038 13041 13044 13047 13050 13053 <2, 0>
-! KINSOKU table is full!!.
-<to be read again>
- \relax
-l.23 \global\prebreakpenalty"4000=1\relax
- % error
-I'm skipping this control sequences.
-
-<0, 0> <2, 0> <0, 1> <0, 0> <0, 1, 0> <0, 0, 1> )
+13029 13032 13035 13038 13041 13044 13047 13050 13053 <2, 0> <0, 1> <2, 1>
+<0, 1> <0, 1> <0, 1, 0> <0, 0, 1> )
No pages of output.
Modified: trunk/Build/source/texk/web2c/euptexdir/tests/kinsoku_table.tex
===================================================================
--- trunk/Build/source/texk/web2c/euptexdir/tests/kinsoku_table.tex 2025-02-09 08:14:25 UTC (rev 73802)
+++ trunk/Build/source/texk/web2c/euptexdir/tests/kinsoku_table.tex 2025-02-09 08:50:06 UTC (rev 73803)
@@ -20,7 +20,7 @@
\message{<\the\prebreakpenalty"3003, \the\prebreakpenalty"4000>}% 2, D
{
\prebreakpenalty"3003=\dflt\relax
- \global\prebreakpenalty"4000=1\relax% error
+ \global\prebreakpenalty"4000=1\relax% error if 256, no error in 1024
\message{<\the\prebreakpenalty"3003, \the\prebreakpenalty"4000>}% D, D
}
Modified: trunk/Build/source/texk/web2c/ptexdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/ptexdir/ChangeLog 2025-02-09 08:14:25 UTC (rev 73802)
+++ trunk/Build/source/texk/web2c/ptexdir/ChangeLog 2025-02-09 08:50:06 UTC (rev 73803)
@@ -1,3 +1,11 @@
+2025-02-09 Hironori Kitagawa <h_kitagawa2001 at yahoo.co.jp>
+
+ * ptex-base.ch:
+ Forgot to increase size of eqtb[] 256 -> 1024, when
+ inhibit_xsp/kinsoku tables were increased 256 -> 1024.
+ (Commit 2022-12-12 r65246-65248 was incomplete, and the
+ fix on commit 2024-09-22 r72333 was incorrect).
+
2025-02-02 TANAKA Takuji <ttk at t-lab.opal.ne.jp>
* ptex-prntknj.test, tests/pknj-{e,s}.log: Update tests.
Modified: trunk/Build/source/texk/web2c/ptexdir/ptex-base.ch
===================================================================
--- trunk/Build/source/texk/web2c/ptexdir/ptex-base.ch 2025-02-09 08:14:25 UTC (rev 73802)
+++ trunk/Build/source/texk/web2c/ptexdir/ptex-base.ch 2025-02-09 08:50:06 UTC (rev 73803)
@@ -1307,11 +1307,10 @@
begin cat_code(k):=other_char; kcat_code(k):=other_kchar;
math_code(k):=hi(k); sf_code(k):=1000;
auto_xsp_code(k):=0;
- inhibit_xsp_type(k):=0; kinsoku_type(k):=0;
end;
for k:=0 to 1023 do
- begin inhibit_xsp_code(k):=0;
- kinsoku_code(k):=0;
+ begin inhibit_xsp_code(k):=0; inhibit_xsp_type(k):=0;
+ kinsoku_code(k):=0; kinsoku_type(k):=0;
end;
@z
@x [17.232] l.4971 - pTeX: initialize cat_code, cur_jfont, cur_tfont
@@ -1505,8 +1504,8 @@
@d dimen_pars=23 {total number of dimension parameters}
@d scaled_base=dimen_base+dimen_pars
{table of 256 user-defined \.{\\dimen} registers}
- at d kinsoku_penalty_base=scaled_base+256 {table of 256 kinsoku registers}
- at d eqtb_size=kinsoku_penalty_base+255 {largest subscript of |eqtb|}
+ at d kinsoku_penalty_base=scaled_base+256 {table of 1024 kinsoku registers}
+ at d eqtb_size=kinsoku_penalty_base+1023 {largest subscript of |eqtb|}
@z
@x l.5498 - pTeX: kinsoku, t_baseline_shift, y_baseline_shift
Modified: trunk/Build/source/texk/web2c/uptexdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/uptexdir/ChangeLog 2025-02-09 08:14:25 UTC (rev 73802)
+++ trunk/Build/source/texk/web2c/uptexdir/ChangeLog 2025-02-09 08:50:06 UTC (rev 73803)
@@ -1,3 +1,11 @@
+2025-02-09 Hironori Kitagawa <h_kitagawa2001 at yahoo.co.jp>
+
+ * ptex-base.ch, uptex-m.ch:
+ Forgot to increase size of eqtb[] 256 -> 1024, when
+ inhibit_xsp/kinsoku tables were increased 256 -> 1024.
+ (Commit 2022-12-12 r65246-65248 was incomplete, and the
+ fix on commit 2024-09-22 r72333 was incorrect).
+
2025-02-08 TANAKA Takuji <ttk at t-lab.opal.ne.jp>
* uptex-m.ch: Enable ^^^^xyzw format only when
Modified: trunk/Build/source/texk/web2c/uptexdir/ptex-base.ch
===================================================================
--- trunk/Build/source/texk/web2c/uptexdir/ptex-base.ch 2025-02-09 08:14:25 UTC (rev 73802)
+++ trunk/Build/source/texk/web2c/uptexdir/ptex-base.ch 2025-02-09 08:50:06 UTC (rev 73803)
@@ -1307,11 +1307,10 @@
begin cat_code(k):=other_char; kcat_code(k):=other_kchar;
math_code(k):=hi(k); sf_code(k):=1000;
auto_xsp_code(k):=0;
- inhibit_xsp_type(k):=0; kinsoku_type(k):=0;
end;
for k:=0 to 1023 do
- begin inhibit_xsp_code(k):=0;
- kinsoku_code(k):=0;
+ begin inhibit_xsp_code(k):=0; inhibit_xsp_type(k):=0;
+ kinsoku_code(k):=0; kinsoku_type(k):=0;
end;
@z
@x [17.232] l.4971 - pTeX: initialize cat_code, cur_jfont, cur_tfont
@@ -1505,8 +1504,8 @@
@d dimen_pars=23 {total number of dimension parameters}
@d scaled_base=dimen_base+dimen_pars
{table of 256 user-defined \.{\\dimen} registers}
- at d kinsoku_penalty_base=scaled_base+256 {table of 256 kinsoku registers}
- at d eqtb_size=kinsoku_penalty_base+255 {largest subscript of |eqtb|}
+ at d kinsoku_penalty_base=scaled_base+256 {table of 1024 kinsoku registers}
+ at d eqtb_size=kinsoku_penalty_base+1023 {largest subscript of |eqtb|}
@z
@x l.5498 - pTeX: kinsoku, t_baseline_shift, y_baseline_shift
Modified: trunk/Build/source/texk/web2c/uptexdir/uptex-m.ch
===================================================================
--- trunk/Build/source/texk/web2c/uptexdir/uptex-m.ch 2025-02-09 08:14:25 UTC (rev 73802)
+++ trunk/Build/source/texk/web2c/uptexdir/uptex-m.ch 2025-02-09 08:50:06 UTC (rev 73803)
@@ -328,7 +328,6 @@
begin cat_code(k):=other_char; kcat_code(k):=other_kchar;
math_code(k):=hi(k); sf_code(k):=1000;
auto_xsp_code(k):=0;
- inhibit_xsp_type(k):=0; kinsoku_type(k):=0;
end;
@y
eqtb[auto_xspacing_code]:=eqtb[cat_code_base];
@@ -337,7 +336,6 @@
begin cat_code(k):=other_char;
math_code(k):=hi(k);
auto_xsp_code(k):=0;
- inhibit_xsp_type(k):=0; kinsoku_type(k):=0;
end;
for k:=0 to 511 do
begin kcat_code(k):=other_kchar;
More information about the tex-live-commits
mailing list.