{,e}uptex revert to ver.1.35 for regression tests (texjporg#170)

source/texk/web2c/euptexdir/char-warning-eptex.ch

@@ -2,7 +2,7 @@
 % Public domain. See ../pdftexdir/char-warning-pdftex.ch for info.
 
 @x [30] If \tracinglostchars > 2, then promote full errors.
-@p procedure char_warning(@!f:internal_font_number;@!c:sixteen_bits);
+@p procedure char_warning(@!f:internal_font_number;@!c:eight_bits);
 var @!l:0..255; {small indices or counters}
 old_setting: integer; {saved value of |tracing_online|}
 begin if tracing_lost_chars>0 then
@@ -11,16 +11,12 @@ begin if tracing_lost_chars>0 then
   begin begin_diagnostic;
   print_nl("Missing character: There is no ");
 @.Missing character@>
-  if (c<" ")or(c>"~") then begin
-    print_char("^"); print_char("^");
+  if (c<" ")or(c>"~") then
+    begin print_char("^"); print_char("^");
     if c<64 then print_char(c+64)
     else if c<128 then print_char(c-64)
-    else if c<256 then begin
-        print_lc_hex(c div 16);    print_lc_hex(c mod 16); end
-    else begin print_char("^"); print_char("^");
-        print_lc_hex(c div 4096);  print_lc_hex((c mod 4096) div 256);
-        print_lc_hex((c mod 256) div 16);  print_lc_hex(c mod 16); end
-             end
+    else begin print_lc_hex(c div 16);  print_lc_hex(c mod 16); end
+    end
   else print_ASCII(c);
   print(" in font ");
   slow_print(font_name[f]); print_char("!"); end_diagnostic(false);
@@ -29,7 +25,7 @@ begin if tracing_lost_chars>0 then
  end;
 end;
 @y
-@p procedure char_warning(@!f:internal_font_number;@!c:sixteen_bits);
+@p procedure char_warning(@!f:internal_font_number;@!c:eight_bits);
 var @!l:0..255; {small indices or counters}
 old_setting: integer; {saved value of |tracing_online|}
 begin if tracing_lost_chars>0 then
@@ -46,11 +42,7 @@ begin if tracing_lost_chars>0 then
    print_char("^"); print_char("^");
    if c<64 then print_char(c+64)
    else if c<128 then print_char(c-64)
-   else if c<256 then begin
-        print_lc_hex(c div 16);    print_lc_hex(c mod 16); end
-   else begin print_char("^"); print_char("^");
-        print_lc_hex(c div 4096);  print_lc_hex((c mod 4096) div 256);
-        print_lc_hex((c mod 256) div 16);  print_lc_hex(c mod 16); end
+        else begin print_lc_hex(c div 16);  print_lc_hex(c mod 16); end
              end
  else print_ASCII(c);
  if tracing_lost_chars > 2 then begin

source/texk/web2c/euptexdir/eptex.ech

@@ -33,8 +33,8 @@
 @y
 @d eTeX_version_string=='-2.6' {current \eTeX\ version}
 @#
-@d epTeX_version_string=='-241020'
-@d epTeX_version_number==241020
+@d epTeX_version_string=='-240930'
+@d epTeX_version_number==240930
 @z
 
 @x e-upTeX: banner
@@ -627,7 +627,7 @@ font_char_ic_code: begin scan_font_ident; q:=cur_val;
       end
     else cur_val:=0;
     end
-  else begin scan_latin_num;
+  else begin scan_ascii_num;
     if (font_bc[q]<=cur_val)and(font_ec[q]>=cur_val) then
       begin i:=orig_char_info(q)(qi(cur_val));
       case m of
@@ -729,7 +729,6 @@ if j=1 then
     if (multistrlen(ustringcast(buffer), limit+1,loc)>1)and
          check_kcat_code(cur_tok,cur_chr) then
       begin if (cur_tok=not_cjk) then cur_tok:=other_kchar;
-        if (cur_tok=latin_ucs) then cur_tok:=letter;
         cur_tok:=cur_chr+cur_tok*max_cjk_val;
         loc:=loc+multistrlen(ustringcast(buffer), limit+1,loc);
       end
@@ -797,8 +796,7 @@ if_font_char_code:begin scan_font_ident; n:=cur_val;
       b:=(font_bc[n]<=cur_val)and(font_ec[n]>=cur_val)
       end
     end
-  else begin scan_latin_num;
-    cur_val:=ptencucsto8bitcode(font_enc[n],cur_val);
+  else begin scan_ascii_num;
     if (font_bc[n]<=cur_val)and(font_ec[n]>=cur_val) then @/
       b:=char_exists(orig_char_info(n)(qi(cur_val)))
     else b:=false;

source/texk/web2c/euptexdir/eptex_version.h

@@ -1 +1 @@
-#define EPTEX_VERSION "241020"
+#define EPTEX_VERSION "240930"

source/texk/web2c/euptexdir/etex.ch0

@@ -155,46 +155,6 @@ hpack:=r;
 exit: hpack:=r;
 @z
 
-@x
-hn:=0;
-loop@+  begin if is_char_node(s) then
-    begin if font(s)<>hf then goto done3;
-    hyf_bchar:=character(s); c:=qo(hyf_bchar);
-    set_lc_code(c);
-    if hc[0]=0 then goto done3;
-    if hn=63 then goto done3;
-    hb:=s; incr(hn); hu[hn]:=c; hc[hn]:=hc[0]; hyf_bchar:=non_char;
-    end
-@y
-hn:=0;
-loop@+  begin if is_char_node(s) then
-    begin if font(s)<>hf then goto done3;
-    hyf_bchar:=character(s); c:=qo(hyf_bchar);
-    if lc_code(c)=0 then goto done3;
-    if hn=63 then goto done3;
-    hb:=s; incr(hn); hu[hn]:=c; hc[hn]:=lc_code(c); hyf_bchar:=non_char;
-    end
-@z
-
-@x
-while q>null do
-  begin c:=qo(character(q));
-  set_lc_code(c);
-  if hc[0]=0 then goto done3;
-  if j=63 then goto done3;
-  incr(j); hu[j]:=c; hc[j]:=hc[0];@/
-  q:=link(q);
-  end;
-@y
-while q>null do
-  begin c:=qo(character(q));
-  if lc_code(c)=0 then goto done3;
-  if j=63 then goto done3;
-  incr(j); hu[j]:=c; hc[j]:=lc_code(c);@/
-  q:=link(q);
-  end;
-@z
-
 @x [44.977]
 q:=prune_page_top(q,saving_vdiscards>0);
 p:=list_ptr(v); free_node(v,box_node_size);

source/texk/web2c/euptexdir/etex.ch1

@@ -73,10 +73,10 @@ last_node_type:=-1; last_node_subtype:=-1;
 @z
 
 @x [30.581]
-@p procedure char_warning(@!f:internal_font_number;@!c:sixteen_bits);
+@p procedure char_warning(@!f:internal_font_number;@!c:eight_bits);
 var @!l:0..255; {small indices or counters}
 @y
-@p procedure char_warning(@!f:internal_font_number;@!c:sixteen_bits);
+@p procedure char_warning(@!f:internal_font_number;@!c:eight_bits);
 var @!l:0..255; {small indices or counters}
 old_setting: integer; {saved value of |tracing_online|}
 @z
@@ -128,50 +128,6 @@ hpack:=r;
   disp_node:begin disp:=disp_dimen(p); revdisp:=disp; end;
 @z
 
-@x
-hn:=0;
-loop@+  begin if is_char_node(s) then
-    begin if font(s)<>hf then goto done3;
-    hyf_bchar:=character(s); c:=qo(hyf_bchar);
-    if lc_code(c)=0 then goto done3;
-    if lc_code(c)>max_hyph_char then goto done3;
-    if hn=63 then goto done3;
-    hb:=s; incr(hn); hu[hn]:=c; hc[hn]:=lc_code(c); hyf_bchar:=non_char;
-    end
-@y
-hn:=0;
-loop@+  begin if is_char_node(s) then
-    begin if font(s)<>hf then goto done3;
-    hyf_bchar:=character(s); c:=qo(hyf_bchar);
-    set_lc_code(c);
-    if hc[0]=0 then goto done3;
-    if hc[0]>max_hyph_char then goto done3;
-    if hn=63 then goto done3;
-    hb:=s; incr(hn); hu[hn]:=c; hc[hn]:=hc[0]; hyf_bchar:=non_char;
-    end
-@z
-
-@x
-while q>null do
-  begin c:=qo(character(q));
-  if lc_code(c)=0 then goto done3;
-  if lc_code(c)>max_hyph_char then goto done3;
-  if j=63 then goto done3;
-  incr(j); hu[j]:=c; hc[j]:=lc_code(c);@/
-  q:=link(q);
-  end;
-@y
-while q>null do
-  begin c:=qo(character(q));
-  set_lc_code(c);
-  if hc[0]=0 then goto done3;
-  if hc[0]>max_hyph_char then goto done3;
-  if j=63 then goto done3;
-  incr(j); hu[j]:=c; hc[j]:=hc[0];@/
-  q:=link(q);
-  end;
-@z
-
 @x [44.977]
 q:=prune_page_top(q); p:=list_ptr(v);
 if q=null then box(n):=null {the |eq_level| of the box stays the same}

source/texk/web2c/euptexdir/euptex.defines

@@ -32,8 +32,6 @@
 @define function UVScombinecode ();
 @define function UVSgetcodepointlength ();
 @define function UVSgetcodepointinsequence ();
-@define function ptencucsto8bitcode ();
-@define function ptenc8bitcodetoucs ();
 
 @define function setinfileenc ();
 @define function setstdinenc ();

source/texk/web2c/euptexdir/fam256.ch

@@ -556,11 +556,11 @@ function var_delimiter(@!d:pointer;@!s:integer;@!v:scaled):pointer;
 @z
 %-----------------------------------------------
 @x
-@!hd: sixteen_bits; {height-depth byte}
+@!hd: eight_bits; {height-depth byte}
 @!r: four_quarters; {extensible pieces}
 @!z: small_number; {runs through font family members}
 @y
-@!hd: sixteen_bits; {height-depth byte}
+@!hd: eight_bits; {height-depth byte}
 @!r: four_quarters; {extensible pieces}
 @!z: integer; {runs through font family members}
 @z
@@ -1205,10 +1205,7 @@ def_code: begin
   @<Let |n| be the largest legal code value, based on |cur_chr|@>;
   p:=cur_chr;
   if p=kcat_code_base then
-    begin scan_char_num; p:=p+kcatcodekey(cur_val);
-      if cur_val>=max_latin_val then m:=not_cjk; end
-  else if p<math_code_base then
-    begin scan_latin_num; p:=p+cur_val; end
+    begin scan_char_num; p:=p+kcatcodekey(cur_val) end
   else begin scan_ascii_num; p:=p+cur_val; end;
   scan_optional_equals; scan_int;
   if ((cur_val<m)and(p<del_code_base))or(cur_val>n) then
@@ -1253,9 +1250,7 @@ def_code: begin
     @<Let |m| be the minimal legal code value, based on |cur_chr|@>;
     @<Let |n| be the largest legal code value, based on |cur_chr|@>;
     p:=cur_chr; cur_val1:=p;
-    if p=kcat_code_base then begin scan_char_num; p:=p+kcatcodekey(cur_val);
-      if cur_val>=max_latin_val then m:=not_cjk; end
-    else if p<math_code_base then begin scan_latin_num; p:=p+cur_val; end
+    if p=kcat_code_base then begin scan_char_num; p:=p+kcatcodekey(cur_val) end
     else begin scan_ascii_num; p:=p+cur_val; end;
     scan_optional_equals; scan_int;
     if ((cur_val<m)and(p<del_code_base))or(cur_val>n) then
@@ -1301,11 +1296,9 @@ def_code: begin
 %-----------------------------------------------
 @x
 else if cur_chr=kcat_code_base then n:=max_char_code
-else if cur_chr<math_code_base then n:=max_latin_val
 else if cur_chr=math_code_base then n:=@'100000
 @y
 else if cur_chr=kcat_code_base then n:=max_char_code
-else if cur_chr<math_code_base then n:=max_latin_val
 else if cur_chr=math_code_base then n:=@"8000
 else if cur_chr=(math_code_base+128) then n:=@"8000000
 @z

source/texk/web2c/euptexdir/pdfutils.ch

@@ -1155,7 +1155,7 @@ pdf_file_dump_code:
 uniform_deviate_code:     scan_int;
 normal_deviate_code:      do_nothing;
 Uchar_convert_code: begin scan_char_num;
-    if not check_echar_range(cur_val) then
+    if not is_char_ascii(cur_val) then
       if kcat_code(kcatcodekey(cur_val))=not_cjk then cat:=other_kchar;
     end;
 Ucharcat_convert_code:
@@ -1171,7 +1171,7 @@ Ucharcat_convert_code:
         help1("I'm going to use 12 instead of that illegal code value.");@/
         error; cat:=12;
       end else cat:=cur_val;
-    end else if check_echar_range(i) then
+    end else if i<=@"FF then
       begin if (illegal_Ucharcat_ascii_catcode(cur_val))
         and (illegal_Ucharcat_wchar_catcode(cur_val)) then
         begin print_err("Invalid code ("); print_int(cur_val);
@@ -1201,9 +1201,9 @@ pdf_strcmp_code: print_int(cur_val);
 uniform_deviate_code:     print_int(unif_rand(cur_val));
 normal_deviate_code:      print_int(norm_rand);
 Uchar_convert_code:
-if check_echar_range(cur_val)>1 then print_char(cur_val) else print_kanji(cur_val);
+if is_char_ascii(cur_val) then print_char(cur_val) else print_kanji(cur_val);
 Ucharcat_convert_code:
-if (cat<kanji)and(check_echar_range(cur_val)>1) then print_char(cur_val) else print_kanji(cur_val);
+if cat<kanji then print_char(cur_val) else print_kanji(cur_val);
 @z
 
 @x e-pTeX: if primitives - leave room for \ifincsname

source/texk/web2c/lib/texmfmp.c

@@ -1107,9 +1107,6 @@ maininit (int ac, string *av)
 #else /* !Aleph */
   kpse_set_program_enabled (kpse_tfm_format, MAKE_TEX_TFM_BY_DEFAULT,
                             kpse_src_compile);
-#if (IS_upTeX)
-  kpse_set_program_enabled (kpse_ofm_format, false, kpse_src_compile);
-#endif
 #endif /* !Aleph */
   kpse_set_program_enabled (kpse_tex_format, MAKE_TEX_TEX_BY_DEFAULT,
                             kpse_src_compile);

source/texk/web2c/uptexdir/kanji.c

@@ -8,7 +8,7 @@
 #define CS_TOKEN_FLAG  0x1FFFFFFF
 #define IVS_CHAR_LIMIT  0x4400000
 #define CJK_CHAR_LIMIT  0x1000000
-#define LATIN_CHAR_LIMIT   0x2E80
+#define UCS_CHAR_LIMIT   0x120000
 #define CJK_TOKEN_FLAG   0xFFFFFF
 #define CAT_LEFT_BRACE  1
 #define CAT_DELIM_NUM  15
@@ -26,7 +26,7 @@ boolean check_kanji (integer c)
     c0 = c & CJK_TOKEN_FLAG;
     c1 = XXHi(c);
     if (c1>=CAT_LEFT_BRACE && c1<=CAT_DELIM_NUM &&
-            c0 < LATIN_CHAR_LIMIT) { /* kcatcode latin_ucs */
+            c0 < UCS_CHAR_LIMIT) {
         return is_char_kanji(c0);
     }
     else if (c1>=KCAT_KANJI && c1<=KCAT_MODIFIER) {
@@ -40,7 +40,7 @@ boolean check_kanji (integer c)
 
 boolean is_char_ascii(integer c)
 {
-    return (0 <= c && c < 0x2E80);
+    return (0 <= c && c < 0x100);
 }
 
 boolean is_char_kanji(integer c)

source/texk/web2c/uptexdir/kanji.h

@@ -74,8 +74,6 @@ extern void init_default_kanji_select (void);
 #define UVScombinecode(ucv,uvs) UVS_combine_code(ucv,uvs)
 #define UVSgetcodepointlength(ucv) UVS_get_codepoint_length(ucv)
 #define UVSgetcodepointinsequence(ucv,n) UVS_get_codepoint_in_sequence(ucv,n)
-#define ptencucsto8bitcode(enc,uch) ptenc_ucs_to_8bit_code(enc,uch)
-#define ptenc8bitcodetoucs(enc,ech) ptenc_8bit_code_to_ucs(enc,ech)
 
 extern void init_kanji (const_string file_str, const_string internal_str);
 extern void dump_kanji (gzFile fp);

source/texk/web2c/uptexdir/upbibtex.ch

@@ -60,7 +60,7 @@
 @d banner=='This is BibTeX, Version 0.99d' {printed when the program starts}
 @y
 @d my_name=='upbibtex'
-@d banner=='This is upBibTeX, Version 0.99d-j0.36-u2.00'
+@d banner=='This is upBibTeX, Version 0.99d-j0.36-u1.35'
   {printed when the program starts}
 @z