From 8d8684458b9d43c49479394b5411f999bfc0f154 Mon Sep 17 00:00:00 2001 From: Hironobu Yamashita Date: Fri, 25 Jun 2021 09:14:15 +0000 Subject: ptex: no re-eval of kcatcode for \ifcat git-svn-id: svn://tug.org/texlive/trunk@59699 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/ptexdir/ChangeLog | 3 +++ Build/source/texk/web2c/ptexdir/ptex-base.ch | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'Build/source/texk/web2c/ptexdir') diff --git a/Build/source/texk/web2c/ptexdir/ChangeLog b/Build/source/texk/web2c/ptexdir/ChangeLog index a0d629e2a54..cf8e1e62b56 100644 --- a/Build/source/texk/web2c/ptexdir/ChangeLog +++ b/Build/source/texk/web2c/ptexdir/ChangeLog @@ -6,6 +6,9 @@ * ptex-base.ch (line_break): consider when link(temp_head)=tail and it is a disp_node. https://github.com/texjporg/tex-jp-build/issues/123 + * ptex-base.ch: Partially revert the commit on 2019-05-06; + no re-eval kcatcode of Japanese character token in \if and \ifcat. + This is because the behavior was inconsistent against \ifx. 2021-03-23 Karl Berry diff --git a/Build/source/texk/web2c/ptexdir/ptex-base.ch b/Build/source/texk/web2c/ptexdir/ptex-base.ch index bb45acdb3c1..0cee7df6b36 100644 --- a/Build/source/texk/web2c/ptexdir/ptex-base.ch +++ b/Build/source/texk/web2c/ptexdir/ptex-base.ch @@ -2542,7 +2542,7 @@ else begin end @z -@x [28.502] l.10138 - pTeX: ifx : Test character : KANJI character +@x [28.502] l.10138 - pTeX: if[cat] : Test character : KANJI character if (cur_cmd>active_char)or(cur_chr>255) then {not a character} begin m:=relax; n:=256; end @@ -2554,7 +2554,7 @@ if (cur_cmd>active_char)or(cur_chr>255) then end; @y if (cur_cmd=kanji)or(cur_cmd=kana)or(cur_cmd=other_kchar) then - begin n:=cur_chr; m:=kcat_code(kcatcodekey(n)); + begin m:=cur_cmd; n:=cur_chr; end else if (cur_cmd>active_char)or(cur_chr>255) then begin m:=relax; n:=max_cjk_val; @@ -2563,8 +2563,8 @@ else begin m:=cur_cmd; n:=cur_chr; end; get_x_token_or_active_char; if (cur_cmd=kanji)or(cur_cmd=kana)or(cur_cmd=other_kchar) then - begin cur_cmd:=kcat_code(kcatcodekey(cur_chr)); - end + begin cur_cmd:=cur_cmd; + end {dummy} else if (cur_cmd>active_char)or(cur_chr>255) then begin cur_cmd:=relax; cur_chr:=max_cjk_val; end; -- cgit v1.2.3