texlive[65246] Build/source/texk/web2c: (e)uptex: bugfix in

[commits+hironobu at tug.org]

Revision: 65246
          http://tug.org/svn/texlive?view=revision&revision=65246
Author:   hironobu
Date:     2022-12-12 10:36:54 +0100 (Mon, 12 Dec 2022)
Log Message:
-----------
(e)uptex: bugfix in adjust_hlist
@<Insert a space after the |last_char|@> (part of adjust_hlist)

Modified Paths:
--------------
    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/uptex-m.ch

Modified: trunk/Build/source/texk/web2c/ptexdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/ptexdir/ChangeLog	2022-12-12 00:50:02 UTC (rev 65245)
+++ trunk/Build/source/texk/web2c/ptexdir/ChangeLog	2022-12-12 09:36:54 UTC (rev 65246)
@@ -1,3 +1,7 @@
+2022-12-12  Hironori Kitagawa  <h_kitagawa2001 at yahoo.co.jp>
+
+	* ptex-base.ch: Increase INHIBIT/KINSOKU table size to 1024.
+
 2022-12-03  TANAKA Takuji  <ttk at t-lab.opal.ne.jp>
 
 	am/ptex.am:

Modified: trunk/Build/source/texk/web2c/ptexdir/ptex-base.ch
===================================================================
--- trunk/Build/source/texk/web2c/ptexdir/ptex-base.ch	2022-12-12 00:50:02 UTC (rev 65245)
+++ trunk/Build/source/texk/web2c/ptexdir/ptex-base.ch	2022-12-12 09:36:54 UTC (rev 65246)
@@ -1280,8 +1280,8 @@
   {table of 256 command codes for the wchar's catcodes }
 @d auto_xsp_code_base=kcat_code_base+256 {table of 256 auto spacer flag}
 @d inhibit_xsp_code_base=auto_xsp_code_base+256
- at d kinsoku_base=inhibit_xsp_code_base+256 {table of 256 kinsoku mappings}
- at d kansuji_base=kinsoku_base+256 {table of 10 kansuji mappings}
+ at d kinsoku_base=inhibit_xsp_code_base+1024 {table of 1024 kinsoku mappings}
+ at d kansuji_base=kinsoku_base+1024 {table of 10 kansuji mappings}
 @d lc_code_base=kansuji_base+10 {table of 256 lowercase mappings}
 @z
 
@@ -7228,7 +7228,7 @@
 @d inhibit_after=2    {disable to insert space after 2byte-char}
 @d inhibit_none=3     {enable to insert space before/after 2byte-char}
 @d inhibit_unused=4   {unused entry}
- at d no_entry=1000
+ at d no_entry=10000
 @d new_pos=0
 @d cur_pos=1
 
@@ -7260,7 +7260,7 @@
     begin if pp<>no_entry then p:=pp; goto done; end;
   if inhibit_xsp_type(p)=inhibit_unused then
     if pp=no_entry then pp:=p; { save the nearest unused hash }
-  incr(p); if p>255 then p:=0;
+  incr(p); if p>1023 then p:=0;
   until s=p;
   p:=pp;
   end
@@ -7268,7 +7268,7 @@
   begin repeat
   if inhibit_xsp_code(p)=0 then goto done1;
   if inhibit_xsp_code(p)=c then goto done;
-  incr(p); if p>255 then p:=0;
+  incr(p); if p>1023 then p:=0;
   until s=p;
 done1: p:=no_entry;
   end;
@@ -7343,7 +7343,7 @@
     begin if pp<>no_entry then p:=pp; goto done; end;
   if kinsoku_type(p)=kinsoku_unused_code then
     if pp=no_entry then pp:=p; { save the nearest unused hash }
-  incr(p); if p>255 then p:=0;
+  incr(p); if p>1023 then p:=0;
   until s=p;
   p:=pp;
   end
@@ -7351,7 +7351,7 @@
   begin repeat
   if kinsoku_type(p)=0 then goto done1;
   if kinsoku_code(p)=c then goto done;
-  incr(p); if p>255 then p:=0;
+  incr(p); if p>1023 then p:=0;
   until s=p;
 done1: p:=no_entry;
   end;

Modified: trunk/Build/source/texk/web2c/uptexdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/uptexdir/ChangeLog	2022-12-12 00:50:02 UTC (rev 65245)
+++ trunk/Build/source/texk/web2c/uptexdir/ChangeLog	2022-12-12 09:36:54 UTC (rev 65246)
@@ -1,3 +1,10 @@
+2022-12-12  Hironori Kitagawa  <h_kitagawa2001 at yahoo.co.jp>
+
+	* uptex—m.ch: Fix a bug that \inhibitxspcode after Japanese
+	character was ineffective due to lack of mod max_cjk_val.
+	See comments on 2022-12-11.
+	https://github.com/texjporg/tex-jp-build/issues/32
+
 2022-12-09  Hironori Kitagawa  <h_kitagawa2001 at yahoo.co.jp>
 
 	* uptex-m.ch: Add kcatcode to a character which is made

Modified: trunk/Build/source/texk/web2c/uptexdir/uptex-m.ch
===================================================================
--- trunk/Build/source/texk/web2c/uptexdir/uptex-m.ch	2022-12-12 00:50:02 UTC (rev 65245)
+++ trunk/Build/source/texk/web2c/uptexdir/uptex-m.ch	2022-12-12 09:36:54 UTC (rev 65246)
@@ -1178,6 +1178,15 @@
 @z
 
 @x
+else if font_dir[font(last_char)]<>dir_default then
+  begin insert_skip:=after_wchar; KANJI(cx):=info(link(last_char));
+ at y
+else if font_dir[font(last_char)]<>dir_default then
+  begin insert_skip:=after_wchar;
+  KANJI(cx):=info(link(last_char)) mod max_cjk_val;
+ at z
+
+ at x
 begin if is_char_node(link(p)) then
   begin q:=p; p:=link(p);
   if font_dir[font(p)]<>dir_default then