ptex-base.ch: error recovery, syntax

git-svn-id: svn://tug.org/texlive/trunk@57023 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 16 insertions, 10 deletions

diff --git a/Build/source/texk/web2c/eptexdir/ChangeLog b/Build/source/texk/web2c/eptexdir/ChangeLog
index 3360fd625ec..6d3ac638f4e 100644
--- a/Build/source/texk/web2c/eptexdir/ChangeLog
+++ b/Build/source/texk/web2c/eptexdir/ChangeLog
@@ -1,3 +1,7 @@
+2020-11-29  Hironobu Yamashita  <h.y.acetaminophen@gmail.com>
+
+	* fam256.ch: Adapt to changes in ptex-base.ch.
+
 2020-09-01  Hironobu Yamashita  <h.y.acetaminophen@gmail.com>
 
 	* pdfutils.ch (Scan the argument for command |c|) <expanded_code>:
diff --git a/Build/source/texk/web2c/eptexdir/fam256.ch b/Build/source/texk/web2c/eptexdir/fam256.ch
index 75bf6d9aaae..583c5b8d21a 100644
--- a/Build/source/texk/web2c/eptexdir/fam256.ch
+++ b/Build/source/texk/web2c/eptexdir/fam256.ch
@@ -1218,13 +1218,12 @@ def_code: begin
     print_int(n);
     if m=0 then
       begin help1("I'm going to use 0 instead of that illegal code value.");@/
-      error;
+      error; cur_val:=0;
       end
     else
       begin help1("I'm going to use 16 instead of that illegal code value.");@/
-      error;
+      error; cur_val:=16;
       end;
-    cur_val:=m;
   end;
   if p<math_code_base then define(p,data,cur_val)
   else if p<del_code_base then define(p,data,hi(cur_val))
@@ -1264,13 +1263,12 @@ def_code: begin
       print_int(n);
       if m=0 then
         begin help1("I'm going to use 0 instead of that illegal code value.");@/
-        error;
+        error; cur_val:=0;
         end
       else
         begin help1("I'm going to use 16 instead of that illegal code value.");@/
-        error;
+        error; cur_val:=16;
         end;
-      cur_val:=m;
     end;
     if p<math_code_base then define(p,data,cur_val)
     else if cur_val1=math_code_base then begin
diff --git a/Build/source/texk/web2c/ptexdir/ChangeLog b/Build/source/texk/web2c/ptexdir/ChangeLog
index c2643d79113..1a3647789c2 100644
--- a/Build/source/texk/web2c/ptexdir/ChangeLog
+++ b/Build/source/texk/web2c/ptexdir/ChangeLog
@@ -1,3 +1,8 @@
+2020-11-29  Hironobu Yamashita  <h.y.acetaminophen@gmail.com>
+
+	* ptex-base.ch: Fix syntax error of "not equal".
+	Correct error recovery value of illegal catcode for upTeX.
+
 2020-10-30  Hironobu Yamashita  <h.y.acetaminophen@gmail.com>
 
 	* pdvitype.ch: Strict check for DVI ID was wrong for
diff --git a/Build/source/texk/web2c/ptexdir/ptex-base.ch b/Build/source/texk/web2c/ptexdir/ptex-base.ch
index 6d1e0f405d7..401efff0700 100644
--- a/Build/source/texk/web2c/ptexdir/ptex-base.ch
+++ b/Build/source/texk/web2c/ptexdir/ptex-base.ch
@@ -4534,7 +4534,7 @@ loop@+  begin if is_char_node(s) then
       end else c:=qo(character(s));
     end
   else if type(s)=disp_node then goto continue
-  else if (type(s)=penalty_node)and(not subtype(s)=normal) then goto continue
+  else if (type(s)=penalty_node)and(subtype(s)<>normal) then goto continue
 @z
 
 @x [40.899] l.18248 - pTeX: disp_node
@@ -6108,13 +6108,12 @@ def_code: begin
     print_int(n);
     if m=0 then
       begin help1("I'm going to use 0 instead of that illegal code value.");@/
-      error;
+      error; cur_val:=0;
       end
     else
       begin help1("I'm going to use 16 instead of that illegal code value.");@/
-      error;
+      error; cur_val:=16;
       end;
-    cur_val:=m;
   end;
   if p<math_code_base then define(p,data,cur_val)
   else if p<del_code_base then define(p,data,hi(cur_val))