texlive[52053] Build/source/texk/web2c: e-pTeX 190908: \readline

[commits+hironobu at tug.org]

Revision: 52053
          http://tug.org/svn/texlive?view=revision&revision=52053
Author:   hironobu
Date:     2019-09-08 11:39:10 +0200 (Sun, 08 Sep 2019)
Log Message:
-----------
e-pTeX 190908: \readline correctly handles Japanese characters.

Modified Paths:
--------------
    trunk/Build/source/texk/web2c/eptexdir/ChangeLog
    trunk/Build/source/texk/web2c/eptexdir/eptex.ech
    trunk/Build/source/texk/web2c/eptexdir/eptex_version.h
    trunk/Build/source/texk/web2c/euptexdir/ChangeLog
    trunk/Build/source/texk/web2c/euptexdir/euptex.ch1

Modified: trunk/Build/source/texk/web2c/eptexdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/eptexdir/ChangeLog	2019-09-08 06:09:03 UTC (rev 52052)
+++ trunk/Build/source/texk/web2c/eptexdir/ChangeLog	2019-09-08 09:39:10 UTC (rev 52053)
@@ -1,3 +1,7 @@
+2019-09-08  Hironori Kitagawa  <h_kitagawa2001 at yahoo.co.jp>
+
+	* eptex.ech: \readline correctly handles Japanese characters.
+
 2019-07-21  Hironobu Yamashita  <h.y.acetaminophen at gmail.com>
 
 	* eptex.ech: More compatible with original e-TeX, because

Modified: trunk/Build/source/texk/web2c/eptexdir/eptex.ech
===================================================================
--- trunk/Build/source/texk/web2c/eptexdir/eptex.ech	2019-09-08 06:09:03 UTC (rev 52052)
+++ trunk/Build/source/texk/web2c/eptexdir/eptex.ech	2019-09-08 09:39:10 UTC (rev 52053)
@@ -26,8 +26,8 @@
 @y
 @d eTeX_version_string=='-2.6' {current \eTeX\ version}
 @#
- at d epTeX_version_string=='-190709'
- at d epTeX_version_number==190709
+ at d epTeX_version_string=='-190908'
+ at d epTeX_version_number==190908
 @z
 
 @x e-pTeX: banner
@@ -629,6 +629,25 @@
     add_glue_ref(space_ptr(r)); add_glue_ref(xspace_ptr(r));
 @z
 
+ at x e-pTeX: \readline
+@ @<Handle \.{\\readline} and |goto done|@>=
+if j=1 then
+  begin while loc<=limit do {current line not yet finished}
+    begin cur_chr:=buffer[loc]; incr(loc);
+    if cur_chr=" " then cur_tok:=space_token
+    @+else cur_tok:=cur_chr+other_token;
+ at y
+@ @<Handle \.{\\readline} and |goto done|@>=
+if j=1 then
+  begin while loc<=limit do {current line not yet finished}
+    begin cur_chr:=buffer[loc]; incr(loc);
+    if multistrlen(ustringcast(buffer), limit+1, loc-1)=2 then
+      begin cur_tok:=fromBUFF(ustringcast(buffer),  limit+1, loc-1); incr(loc);
+      end
+    else if cur_chr=" " then cur_tok:=space_token
+    @+else cur_tok:=cur_chr+other_token;
+ at z
+
 @x e-pTeX: ifcsname l.28620
   buffer[m]:=info(p) mod @'400; incr(m); p:=link(p);
 @y

Modified: trunk/Build/source/texk/web2c/eptexdir/eptex_version.h
===================================================================
--- trunk/Build/source/texk/web2c/eptexdir/eptex_version.h	2019-09-08 06:09:03 UTC (rev 52052)
+++ trunk/Build/source/texk/web2c/eptexdir/eptex_version.h	2019-09-08 09:39:10 UTC (rev 52053)
@@ -1 +1 @@
-#define EPTEX_VERSION "190709"
+#define EPTEX_VERSION "190908"

Modified: trunk/Build/source/texk/web2c/euptexdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/euptexdir/ChangeLog	2019-09-08 06:09:03 UTC (rev 52052)
+++ trunk/Build/source/texk/web2c/euptexdir/ChangeLog	2019-09-08 09:39:10 UTC (rev 52053)
@@ -1,3 +1,7 @@
+2019-09-08  Hironori Kitagawa  <h_kitagawa2001 at yahoo.co.jp>
+
+	* euptex.ch1: Adapt to changes in eptexdir/.
+
 2019-05-28  Hironobu Yamashita  <h.y.acetaminophen at gmail.com>
 
 	* am/euptex.am: Add a new test.

Modified: trunk/Build/source/texk/web2c/euptexdir/euptex.ch1
===================================================================
--- trunk/Build/source/texk/web2c/euptexdir/euptex.ch1	2019-09-08 06:09:03 UTC (rev 52052)
+++ trunk/Build/source/texk/web2c/euptexdir/euptex.ch1	2019-09-08 09:39:10 UTC (rev 52053)
@@ -32,6 +32,34 @@
   uptex_version_code: cur_val:=upTeX_version;
 @z
 
+ at x
+@ @<Handle \.{\\readline} and |goto done|@>=
+if j=1 then
+  begin while loc<=limit do {current line not yet finished}
+    begin cur_chr:=buffer[loc]; incr(loc);
+    if multistrlen(ustringcast(buffer), limit+1, loc-1)=2 then
+      begin cur_tok:=fromBUFF(ustringcast(buffer),  limit+1, loc-1); incr(loc);
+      end
+    else if cur_chr=" " then cur_tok:=space_token
+    @+else cur_tok:=cur_chr+other_token;
+ at y
+@ @<Handle \.{\\readline} and |goto done|@>=
+if j=1 then
+  begin while loc<=limit do {current line not yet finished}
+    begin cur_chr:=fromBUFF(ustringcast(buffer), limit+1, loc);
+    cur_tok:=kcat_code(kcatcodekey(cur_chr));
+    if (multistrlen(ustringcast(buffer), limit+1,loc)>1)and
+         check_kcat_code(cur_tok) then
+      begin if (cur_tok=not_cjk) then cur_tok:=other_kchar;
+	  cur_tok:=cur_chr+cur_tok*max_cjk_val;
+	  loc:=loc+multistrlen(ustringcast(buffer), limit+1,loc);
+      end
+    else begin cur_chr:=buffer[loc]; incr(loc);
+      if cur_chr=" " then cur_tok:=space_token
+      else cur_tok:=cur_chr+other_token;
+    end;
+ at z
+
 @x e-pTeX: ifcsname l.28620
     begin buffer[m]:=Hi(info(p)); incr(m);
     end;