synchronized texlive 73803.

clerkma · Feb 9, 2025 · dcdff49 · dcdff49
1 parent deebaa7
commit dcdff49
Show file tree

Hide file tree

Showing 10 changed files with 42 additions and 30 deletions.
diff --git a/texlive/texk/README b/texlive/texk/README
@@ -1,5 +1,5 @@
-$Id: README 73743 2025-02-05 23:12:41Z karl $
-Copyright 2006-2024 TeX Users Group.
+$Id: README 73801 2025-02-09 08:07:05Z hironobu $
+Copyright 2006-2025 TeX Users Group.
 You may freely use, modify and/or distribute this file.
 
 This TeX Live directory contains the programs that use the kpathsea
@@ -54,7 +54,7 @@ dvipdfm-x - maintained here, by us, contains
   dvipdfmx and xdvipdfmx.
     old info: https://project.ktug.org/dvipdfmx/
 
-dvipng 1.17 - checked 5feb25
+dvipng 1.18 - checked 5feb25
   https://mirror.ctan.org/dviware/dvipng/
   aka https://mirror.ctan.org/dviware/dvipng.zip
 

diff --git a/texlive/texk/web2c/euptexdir/ChangeLog b/texlive/texk/web2c/euptexdir/ChangeLog
@@ -1,3 +1,10 @@
+2025-02-09  Hironobu Yamashita  <[email protected]>
+
+	* 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  <[email protected]>
 
 	* euptex-{ofm,prntknj}.test, tests/eup-ofm.{tex,log},

diff --git a/texlive/texk/web2c/euptexdir/suppresserrors.ch b/texlive/texk/web2c/euptexdir/suppresserrors.ch
@@ -25,8 +25,8 @@
 @d print_ignored_err(#)==begin if interaction=error_stop_mode then
   wake_up_terminal;
   if file_line_error_style_p then print_file_line
-  else print_nl("! ");
-  print_nl("ignored error: "); print(#);
+  else print_nl("");
+  print("ignored error: "); print(#);
   end
 @z
 

diff --git a/texlive/texk/web2c/euptexdir/tests/kinsoku_table.log b/texlive/texk/web2c/euptexdir/tests/kinsoku_table.log
@@ -26,13 +26,6 @@ entering extended mode
 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.
diff --git a/texlive/texk/web2c/euptexdir/tests/kinsoku_table.tex b/texlive/texk/web2c/euptexdir/tests/kinsoku_table.tex
@@ -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
 }
 

diff --git a/texlive/texk/web2c/ptexdir/ChangeLog b/texlive/texk/web2c/ptexdir/ChangeLog
@@ -1,3 +1,11 @@
+2025-02-09  Hironori Kitagawa  <[email protected]>
+
+	* 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  <[email protected]>
 
 	* ptex-prntknj.test, tests/pknj-{e,s}.log: Update tests.

diff --git a/texlive/texk/web2c/ptexdir/ptex-base.ch b/texlive/texk/web2c/ptexdir/ptex-base.ch
@@ -1,4 +1,4 @@
-% $Id: ptex-base.ch 72344 2024-09-22 05:07:14Z takuji $
+% $Id: ptex-base.ch 73803 2025-02-09 08:50:06Z hironobu $
 % This is a change file for pTeX
 % By Sadayuki Tanaka and ASCII MEDIA WORKS.
 %
@@ -1307,11 +1307,10 @@ for k:=0 to 255 do
   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 @@ primitive("ptextracingfonts",assign_int,int_base+ptex_tracing_fonts_code);@/
 @d dimen_pars=23 {total number of dimension parameters}
 @d scaled_base=dimen_base+dimen_pars
   {table of 256 user-defined \.{\\dimen} registers}
-@d kinsoku_penalty_base=scaled_base+256 {table of 256 kinsoku registers}
-@d eqtb_size=kinsoku_penalty_base+255 {largest subscript of |eqtb|}
+@d kinsoku_penalty_base=scaled_base+256 {table of 1024 kinsoku registers}
+@d eqtb_size=kinsoku_penalty_base+1023 {largest subscript of |eqtb|}
 @z
 
 @x l.5498 - pTeX: kinsoku, t_baseline_shift, y_baseline_shift

diff --git a/texlive/texk/web2c/uptexdir/ChangeLog b/texlive/texk/web2c/uptexdir/ChangeLog
@@ -1,3 +1,11 @@
+2025-02-09  Hironori Kitagawa  <[email protected]>
+
+	* 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  <[email protected]>
 
 	* uptex-m.ch: Enable ^^^^xyzw format only when

diff --git a/texlive/texk/web2c/uptexdir/ptex-base.ch b/texlive/texk/web2c/uptexdir/ptex-base.ch
@@ -1,4 +1,4 @@
-% $Id: ptex-base.ch 72344 2024-09-22 05:07:14Z takuji $
+% $Id: ptex-base.ch 73803 2025-02-09 08:50:06Z hironobu $
 % This is a change file for pTeX
 % By Sadayuki Tanaka and ASCII MEDIA WORKS.
 %
@@ -1307,11 +1307,10 @@ for k:=0 to 255 do
   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 @@ primitive("ptextracingfonts",assign_int,int_base+ptex_tracing_fonts_code);@/
 @d dimen_pars=23 {total number of dimension parameters}
 @d scaled_base=dimen_base+dimen_pars
   {table of 256 user-defined \.{\\dimen} registers}
-@d kinsoku_penalty_base=scaled_base+256 {table of 256 kinsoku registers}
-@d eqtb_size=kinsoku_penalty_base+255 {largest subscript of |eqtb|}
+@d kinsoku_penalty_base=scaled_base+256 {table of 1024 kinsoku registers}
+@d eqtb_size=kinsoku_penalty_base+1023 {largest subscript of |eqtb|}
 @z
 
 @x l.5498 - pTeX: kinsoku, t_baseline_shift, y_baseline_shift

diff --git a/texlive/texk/web2c/uptexdir/uptex-m.ch b/texlive/texk/web2c/uptexdir/uptex-m.ch
@@ -1,4 +1,4 @@
-% $Id: uptex-m.ch 73769 2025-02-08 11:29:24Z takuji $
+% $Id: uptex-m.ch 73803 2025-02-09 08:50:06Z hironobu $
 % This is a change file for upTeX u2.00
 % By Takuji Tanaka.
 %
@@ -328,7 +328,6 @@ for k:=0 to 255 do
   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 @@ for k:=0 to 255 do
   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;