synchronized texlive 73670.

texlive/texk/web2c/hitexdir/ChangeLog

@@ -1,4 +1,9 @@
+2025-01-31  Martin Ruckert <[email protected]>
+
+	* Adding the \ignoreprimitiveerror primitive
+
 2025-01-17  Martin Ruckert <[email protected]>
+
 	* Adding limited LaTeX color support
 
 2024-11-11  Martin Ruckert <[email protected]>

texlive/texk/web2c/hitexdir/hitex.w

@@ -1813,6 +1813,13 @@ message may be printed.
 @^system dependencies@>
 
 @<Error handling...@>=
+static void print_ignored_err(char *s)
+{@+if (interaction==error_stop_mode) wake_up_terminal;
+  if (filelineerrorstylep) print_file_line(); /* \TeX\ Live */
+  else  print_nl("");
+  print("ignored error: ");print(s);
+}
+
 static void print_err(char *s)
 {@+if (interaction==error_stop_mode) wake_up_terminal;
   if (filelineerrorstylep) print_file_line(); /* \TeX\ Live */
@@ -5192,7 +5199,8 @@ that will be defined later.
 @d saving_vdiscards_code (etex_int_base+5) /*save items discarded from vlists*/
 @d saving_hyph_codes_code (etex_int_base+6) /*save hyphenation codes for languages*/
 @d expand_depth_code (etex_int_base+7) /*maximum depth for expansion---\eTeX*/
-@d eTeX_state_code (etex_int_base+8) /*\eTeX\ state variables*/
+@d ignore_primitive_error_code (etex_int_base+8) /*ignore some primitive/engine errors*/
+@d eTeX_state_code (etex_int_base+9) /*\eTeX\ state variables*/
 @d etex_int_pars (eTeX_state_code+eTeX_states) /*total number of \eTeX's integer parameters*/
 @#
 @d int_pars etex_int_pars /*total number of integer parameters*/
@@ -5268,6 +5276,8 @@ that will be defined later.
 @d saving_vdiscards int_par(saving_vdiscards_code)
 @d saving_hyph_codes int_par(saving_hyph_codes_code)
 @d expand_depth int_par(expand_depth_code)
+@d ignore_primitive_error int_par(ignore_primitive_error_code)
+@d ignore_infinite_glue_shrinkage_bit 1
 
 @<Assign the values |depth_threshold:=show_box_depth|...@>=
 depth_threshold=show_box_depth;
@@ -19777,13 +19787,18 @@ else{@+q=glue_ptr(p);
   active_height[6]=active_height[6]+shrink(q);
   if ((shrink_order(q)!=normal)&&(shrink(q)!=0))
     {@+@t@>@;@/
-    print_err("Infinite glue shrinkage found in box being split");@/
+    if (ignore_primitive_error & ignore_infinite_glue_shrinkage_bit)
+      print_ignored_err("Infinite glue shrinkage found in box being split");@/
+    else{@+
+      print_err("Infinite glue shrinkage found in box being split");@/
 @.Infinite glue shrinkage...@>
     help4("The box you are \\vsplitting contains some infinitely",@/
       "shrinkable glue, e.g., `\\vss' or `\\vskip 0pt minus 1fil'.",@/
       "Such glue doesn't belong there; but you can safely proceed,",@/
       "since the offensive shrinkability has been made finite.");
-    error();r=new_spec(q);shrink_order(r)=normal;delete_glue_ref(q);
+      error();
+    }
+    r=new_spec(q);shrink_order(r)=normal;delete_glue_ref(q);
     glue_ptr(p)=r;q=r;
     }
   }
@@ -26844,6 +26859,8 @@ primitive("savingvdiscards", assign_int, int_base+saving_vdiscards_code);@/
 @!@:saving\_vdiscards\_}{\.{\\savingvdiscards} primitive@>
 primitive("savinghyphcodes", assign_int, int_base+saving_hyph_codes_code);@/
 @!@:saving\_hyph\_codes\_}{\.{\\savinghyphcodes} primitive@>
+primitive("ignoreprimitiveerror", assign_int, int_base+ignore_primitive_error_code);@/
+@!@:ignore\_primitive\_error\_}{\.{\\ignoreprimitiveerror} primitive@>
 
 @ @d every_eof equiv(every_eof_loc)
 
@@ -26858,6 +26875,7 @@ case tracing_scan_tokens_code: print_esc("tracingscantokens");@+break;
 case tracing_nesting_code: print_esc("tracingnesting");@+break;
 case saving_vdiscards_code: print_esc("savingvdiscards");@+break;
 case saving_hyph_codes_code: print_esc("savinghyphcodes");@+break;
+case ignore_primitive_error_code: print_esc("ignoreprimitiveerror");@+break;
 
 @ In order to handle \.{\\everyeof} we need an array |eof_seen| of
 boolean variables.

texlive/texk/web2c/pdftexdir/ChangeLog

@@ -1,5 +1,14 @@
+2025-01-31  Karl Berry  <[email protected]>
+
+	* pdftex.ch (l.1891): have print_ignored_error respect
+	--file-line-error; noted by Martin Ruckert.
+	* pdftex.web (etex_int_pars): add eTeX_states, not
+	eTeX_state_code, as it was before; noted by Martin Ruckert.
+
 2025-01-27  Karl Berry  <[email protected]>
 
+	* NEWS: 2025 font scaling entry; belated 2024 cross-engine entry.
+
 	* am/pdftex.am (pdftex-pool.c): exit 1 if makecpool failed.
 	(pdftex-final.ch): remove $@ and exit 1 if tie failed.
 
@@ -21,6 +30,7 @@
 	(Generate all \eTeX): define it.
 	(Cases for |print_param|): print it.
 	Request from Frank Mittelbach, 22 Jul 2024 22:37:26 (private mail).
+	* NEWS: mention this.
 
 2025-01-23  Thanh Han The  <[email protected]>
 

texlive/texk/web2c/pdftexdir/NEWS

@@ -16,7 +16,12 @@ pdfTeX 3.141592653-2.6-1.40.27 (TeX Live 2025)
     of the user's value.
 
 -----------------------------------------------------------------------------
-pdfTeX 3.141592653-2.6-1.40.26 (TeX Live 2024) (March 10, 2023)
+pdfTeX 3.141592653-2.6-1.40.26 (TeX Live 2024) (March 10, 2024)
+- changes:
+  - cross-engine update to provide the --output-directory value in
+    TEXMF_OUTPUT_DIRECTORY, and use TEXMF_OUTPUT_DIRECTORY if set when
+    the option is not given.
+
 - bugfixes:
   - more reliable text extraction on BigEndian systems.
   - more checks against corrupt pfb, fmt, pdf, files.

texlive/texk/web2c/pdftexdir/pdftex.ch

@@ -23,7 +23,6 @@
 
 % Change file to assist in creating the web2c-specific change file.
 % This one resolves inconsistencies between tex.ch and tex.ech.
-% Public domain.
 
 @x [1] m.2 l.188 - banner
 @d banner==TeX_banner
@@ -33,7 +32,15 @@
 @d banner_k==pdfTeX_banner
 @z
 
-@x [16.215] - e-TeX last_node_type
+@x l.1891 - have print_ignored_error respect --file-line-error
+  print_nl("ignored error: "); print(#);
+@y
+  if file_line_error_style_p then print_file_line
+  else print_nl("");
+  print("ignored error: "); print(#);
+@z
+
+@x [16.215] l.28025 - restore e-TeX last_node_type removed in tex.ch
 last_glue:=max_halfword; last_penalty:=0; last_kern:=0;
 @y
 last_glue:=max_halfword; last_penalty:=0; last_kern:=0;

texlive/texk/web2c/pdftexdir/pdftex.web

@@ -5725,7 +5725,7 @@ that will be defined later.
 @d saving_hyph_codes_code=etex_int_base+8 {save hyphenation codes for languages}
 @d ignore_primitive_error_code=etex_int_base+9 {ignore some primitive/engine errors}
 @d eTeX_state_code=etex_int_base+10 {\eTeX\ state variables}
-@d etex_int_pars=eTeX_state_code+eTeX_state_code {total number of \eTeX's integer parameters}
+@d etex_int_pars=eTeX_state_code+eTeX_states {total number of \eTeX's integer parameters}
 @#
 @d int_pars=etex_int_pars {total number of integer parameters}
 @d count_base=int_base+int_pars {256 user \.{\\count} registers}

texlive/texk/web2c/xetexdir/ChangeLog

@@ -1,5 +1,12 @@
+2025-01-31  Karl Berry  <[email protected]>
+
+	* xetex.ch (l.1891): have print_ignored_error respect
+	--file-line-error, a la pdftex.
+
 2025-01-27  Karl Berry  <[email protected]>
 
+	* NEWS: 2025 font scaling entry.
+
 	* am/xetex.am (xetex-pool.c): exit 1 if makecpool failed.
 	(tex-final.ch, mf-final.ch): remove $@ and exit 1 if tie failed.
 
@@ -12,7 +19,7 @@
 
 2025-01-25  Thanh Han The  <[email protected]>
 
-	* pdftex.web (print_ignored_err): new @d.
+	* xetex.web (print_ignored_err): new @d.
 	(ignore_primitive_error_code, ignore_primitive_error): new primitive
 	\ignoreprimitiveerror.
 	(is_bit_set): new fn.
@@ -22,6 +29,7 @@
 	(Cases for |print_param|): print it.
 	Same code as for pdfTeX; merged into XeTeX by karl.
 	Request from Frank Mittelbach, 22 Jul 2024 22:37:26 (private mail).
+	* NEWS: mention this.
 
 2024-05-18  Hironori Kitagawa  <[email protected]>
             TANAKA Takuji  <[email protected]>

texlive/texk/web2c/xetexdir/xetex.ch

@@ -1,8 +1,8 @@
 /****************************************************************************\
- $Id: xetex.ch 71288 2024-05-18 11:06:21Z takuji $
+ $Id: xetex.ch 73656 2025-01-31 17:50:57Z karl $
  Part of the XeTeX typesetting system
  Copyright (c) 1994-2008 by SIL International
- Copyright (c) 2009-2021 by Jonathan Kew
+ Copyright (c) 2009-2025 by Jonathan Kew
  Copyright (c) 2012 by Khaled Hosny
 
  SIL Author(s): Jonathan Kew
@@ -131,22 +131,30 @@ if translate_filename then begin
   wterm_ln('" ignored)');
 @z
 
-@x We add a new |history| value for failure of the output driver
+@x l.1891 - have print_ignored_error respect --file-line-error
+  print_nl("ignored error: "); print(#);
+@y
+  if file_line_error_style_p then print_file_line
+  else print_nl("");
+  print("ignored error: "); print(#);
+@z
+
+@x l.2020 - add a new |history| value for failure of the output driver
 has been detected. It has four possible values: |spotless|, |warning_issued|,
 |error_message_issued|, and |fatal_error_stop|.
 @y
 has been detected. It has five possible values: |spotless|, |warning_issued|,
 |error_message_issued|, |fatal_error_stop|, and |output_failure|.
 @z
 
-@x
+@x l.2031
 @d fatal_error_stop=3 {|history| value when termination was premature}
 @y
 @d fatal_error_stop=3 {|history| value when termination was premature}
 @d output_failure=4 {|history| value when output driver returned an error}
 @z
 
-@x
+@x l.2036
 @!history:spotless..fatal_error_stop; {has the source input been clean so far?}
 @y
 @!history:spotless..output_failure; {has the source input been clean so far?}