texlive[72410] Build/source/texk/web2c: {,e}uptex: Remove kcatcode
commits+takuji at tug.org
commits+takuji at tug.org
Mon Sep 30 13:39:49 CEST 2024
Revision: 72410
https://tug.org/svn/texlive?view=revision&revision=72410
Author: takuji
Date: 2024-09-30 13:39:49 +0200 (Mon, 30 Sep 2024)
Log Message:
-----------
{,e}uptex: Remove kcatcode latin_ucs (14)
Modified Paths:
--------------
trunk/Build/source/texk/web2c/euptexdir/ChangeLog
trunk/Build/source/texk/web2c/euptexdir/eptex.ech
trunk/Build/source/texk/web2c/uptexdir/ChangeLog
trunk/Build/source/texk/web2c/uptexdir/uptex-m.ch
Modified: trunk/Build/source/texk/web2c/euptexdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/euptexdir/ChangeLog 2024-09-30 11:39:43 UTC (rev 72409)
+++ trunk/Build/source/texk/web2c/euptexdir/ChangeLog 2024-09-30 11:39:49 UTC (rev 72410)
@@ -1,3 +1,8 @@
+2024-09-30 TANAKA Takuji <ttk at t-lab.opal.ne.jp>
+
+ * eptex.ech: kcatcode (latin_ucs(14)) is removed
+ since it will be supported in upTeX-2.00.
+
2024-09-28 TANAKA Takuji <ttk at t-lab.opal.ne.jp>
* euptex-{ctrlsym,kinsoku,prntknj}.test:
Modified: trunk/Build/source/texk/web2c/euptexdir/eptex.ech
===================================================================
--- trunk/Build/source/texk/web2c/euptexdir/eptex.ech 2024-09-30 11:39:43 UTC (rev 72409)
+++ trunk/Build/source/texk/web2c/euptexdir/eptex.ech 2024-09-30 11:39:49 UTC (rev 72410)
@@ -729,7 +729,6 @@
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:=other_token;
cur_tok:=cur_chr+cur_tok*max_cjk_val;
loc:=loc+multistrlen(ustringcast(buffer), limit+1,loc);
end
Modified: trunk/Build/source/texk/web2c/uptexdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/uptexdir/ChangeLog 2024-09-30 11:39:43 UTC (rev 72409)
+++ trunk/Build/source/texk/web2c/uptexdir/ChangeLog 2024-09-30 11:39:49 UTC (rev 72410)
@@ -1,3 +1,8 @@
+2024-09-30 TANAKA Takuji <ttk at t-lab.opal.ne.jp>
+
+ * uptex-m.ch: kcatcode (latin_ucs(14)) is removed
+ since it will be supported in upTeX-2.00.
+
2024-09-28 TANAKA Takuji <ttk at t-lab.opal.ne.jp>
* uptex-m.ch, upbibtex.ch, kanji.c:
Modified: trunk/Build/source/texk/web2c/uptexdir/uptex-m.ch
===================================================================
--- trunk/Build/source/texk/web2c/uptexdir/uptex-m.ch 2024-09-30 11:39:43 UTC (rev 72409)
+++ trunk/Build/source/texk/web2c/uptexdir/uptex-m.ch 2024-09-30 11:39:49 UTC (rev 72410)
@@ -176,7 +176,6 @@
@d other_kchar=18 {kanji codes}
@d max_char_code=18 {largest catcode for individual characters}
@y
- at d latin_ucs=14 {is not cjk characters in ucs code}
@d not_cjk=15 {is not cjk characters}
@d kanji=16 {kanji}
@d kana=17 {hiragana, katakana, alphabet}
@@ -428,7 +427,6 @@
cur_chr:=fromBUFF(ustringcast(buffer), limit+1, loc);
cur_cmd:=kcat_code(kcatcodekey(cur_chr));
if (multistrlen(ustringcast(buffer), limit+1, loc)>1) and check_kcat_code(cur_cmd,cur_chr) then begin
- if (cur_cmd=latin_ucs) then cur_cmd:=cat_code(cur_chr);
if (cur_cmd=not_cjk) then cur_cmd:=other_kchar;
for l:=loc to loc-1+multistrlen(ustringcast(buffer), limit+1, loc) do
buffer2[l]:=1;
@@ -479,7 +477,6 @@
cur_chr:=fromBUFF(ustringcast(buffer), limit+1, k);
cat:=kcat_code(kcatcodekey(cur_chr));
if (multistrlen(ustringcast(buffer), limit+1, k)>1) and check_kcat_code(cat,cur_chr) then begin
- if (cat=latin_ucs) then cat:=cat_code(cur_chr);
if (cat=not_cjk) then cat:=other_kchar;
for l:=k to k-1+multistrlen(ustringcast(buffer), limit+1, k) do
buffer2[l]:=1;
@@ -522,7 +519,6 @@
cur_chr:=fromBUFF(ustringcast(buffer), limit+1, k);
cat:=kcat_code(kcatcodekey(cur_chr));
if (multistrlen(ustringcast(buffer), limit+1, k)>1) and check_kcat_code(cat,cur_chr) then begin
- if (cat=latin_ucs) then cat:=cat_code(cur_chr);
if (cat=not_cjk) then cat:=other_kchar;
for l:=k to k-1+multistrlen(ustringcast(buffer), limit+1, k) do
buffer2[l]:=1;
@@ -577,8 +573,6 @@
cur_tok:=(kanji_ivs*max_cjk_val)+cur_chr
else
cur_tok:=(cur_cmd*max_cjk_val)+cur_chr
- else if (cur_cmd=latin_ucs) then
- cur_tok:=(cat_code(cur_chr)*max_cjk_val)+cur_chr
else cur_tok:=(cur_cmd*max_char_val)+cur_chr
@z
@@ -612,8 +606,6 @@
cur_tok:=(kanji_ivs*max_cjk_val)+cur_chr
else
cur_tok:=(cur_cmd*max_cjk_val)+cur_chr
- else if (cur_cmd=latin_ucs) then
- cur_tok:=(cat_code(cur_chr)*max_cjk_val)+cur_chr
else cur_tok:=(cur_cmd*max_char_val)+cur_chr
@z
@@ -627,8 +619,6 @@
cur_tok:=(kanji_ivs*max_cjk_val)+cur_chr
else
cur_tok:=(cur_cmd*max_cjk_val)+cur_chr
- else if (cur_cmd=latin_ucs) then
- cur_tok:=(cat_code(cur_chr)*max_cjk_val)+cur_chr
else cur_tok:=(cur_cmd*max_char_val)+cur_chr
@z
@@ -698,7 +688,6 @@
begin t:=so(str_pool[k]);
if t>=@"180 then { there is no |wchar_token| whose code is 0--127. }
begin t:=fromBUFFshort(str_pool, pool_ptr, k); cc:=kcat_code(kcatcodekey(t));
- if (cc=latin_ucs) then cc:=other_char;
if (cc=not_cjk) then cc:=other_kchar;
if (cc=kanji)and(t>=max_cjk_val) then cc:=kanji_ivs;
t:=t+cc*max_cjk_val;
@@ -1188,7 +1177,7 @@
if cur_chr=kcat_code_base then m:=kanji else m:=0
@y
@ @<Let |m| be the minimal...@>=
-if cur_chr=kcat_code_base then m:=latin_ucs else m:=0
+if cur_chr=kcat_code_base then m:=not_cjk else m:=0
@z
@x
@@ -1332,8 +1321,6 @@
info(main_p):=KANJI(cur_chr)+cur_cmd*max_cjk_val
else if cur_cmd=not_cjk then
info(main_p):=KANJI(cur_chr)+other_kchar*max_cjk_val
- else if cur_cmd=latin_ucs then
- info(main_p):=KANJI(cur_chr)+cat_code(cur_chr)*max_cjk_val
else { Does this case occur? }
info(main_p):=KANJI(cur_chr)+kcat_code(kcatcodekey(KANJI(cur_chr)))*max_cjk_val;
@z
@@ -1428,7 +1415,7 @@
function check_kcat_code(@!ct:integer;@!cx:integer):integer;
begin
-if (((ct>=kanji)or((ct=latin_ucs)and(cx<max_ucs_val)))and(enable_cjk_token=0))or(enable_cjk_token=2)then
+if ((ct>=kanji)and(enable_cjk_token=0))or(enable_cjk_token=2)then
check_kcat_code:=1
else check_kcat_code:=0;
end;
More information about the tex-live-commits
mailing list.