summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakuji Tanaka <ttk@t-lab.opal.ne.jp>2024-05-01 01:03:47 +0000
committerTakuji Tanaka <ttk@t-lab.opal.ne.jp>2024-05-01 01:03:47 +0000
commit498fdabb5a2e7d5048c7adcc780821c8d04cdd0a (patch)
tree3cc22212b2159407986b1e40951bbf31da608392
parentcff39eb7078ce846a571ed37276966d9e83abd6f (diff)
{,e}uptex: Revert some patches
git-svn-id: svn://tug.org/texlive/trunk@71143 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/web2c/euptexdir/ChangeLog4
-rw-r--r--Build/source/texk/web2c/euptexdir/pdfutils.ch15
-rw-r--r--Build/source/texk/web2c/uptexdir/ChangeLog4
-rw-r--r--Build/source/texk/web2c/uptexdir/uptex-m.ch39
4 files changed, 29 insertions, 33 deletions
diff --git a/Build/source/texk/web2c/euptexdir/ChangeLog b/Build/source/texk/web2c/euptexdir/ChangeLog
index 136715e33be..5d39c9205c8 100644
--- a/Build/source/texk/web2c/euptexdir/ChangeLog
+++ b/Build/source/texk/web2c/euptexdir/ChangeLog
@@ -1,3 +1,7 @@
+2024-05-01 TANAKA Takuji <ttk@t-lab.opal.ne.jp>
+
+ * pdfutils.ch: Revert some patches.
+
2024-04-27 TANAKA Takuji <ttk@t-lab.opal.ne.jp>
* eptex.ech, pdfutils.ch, euptex.defines:
diff --git a/Build/source/texk/web2c/euptexdir/pdfutils.ch b/Build/source/texk/web2c/euptexdir/pdfutils.ch
index 1f39749cd8a..f62a48be121 100644
--- a/Build/source/texk/web2c/euptexdir/pdfutils.ch
+++ b/Build/source/texk/web2c/euptexdir/pdfutils.ch
@@ -1883,6 +1883,21 @@ if_font_char_code:begin scan_font_ident; n:=cur_val;
@z
@x
+procedure print_kanji(@!s:KANJI_code); {prints a single character}
+@y
+procedure print_kanji(@!s:KANJI_code); {prints a single character}
+@z
+
+@x
+else begin
+ s:=toBUFF(s mod max_cjk_val);
+@y
+else begin
+ if isprint_utf8 then s:=UCStoUTF8(toUCS(s mod max_cjk_val))
+ else s:=toBUFF(s mod max_cjk_val);
+@z
+
+@x
@* \[54] System-dependent changes.
@y
@* \[54/pdf\TeX] System-dependent changes for {\tt\char"5Cpdfstrcmp}.
diff --git a/Build/source/texk/web2c/uptexdir/ChangeLog b/Build/source/texk/web2c/uptexdir/ChangeLog
index 5ca5f7b8b76..90b3bd02973 100644
--- a/Build/source/texk/web2c/uptexdir/ChangeLog
+++ b/Build/source/texk/web2c/uptexdir/ChangeLog
@@ -1,3 +1,7 @@
+2024-05-01 TANAKA Takuji <ttk@t-lab.opal.ne.jp>
+
+ * uptex-m.ch: Revert some patches.
+
2024-04-27 TANAKA Takuji <ttk@t-lab.opal.ne.jp>
* uptex-m.ch, kanji.{c,h}, updvitype.ch, uptex.defines:
diff --git a/Build/source/texk/web2c/uptexdir/uptex-m.ch b/Build/source/texk/web2c/uptexdir/uptex-m.ch
index 8c0f662087c..3daecd4e4d8 100644
--- a/Build/source/texk/web2c/uptexdir/uptex-m.ch
+++ b/Build/source/texk/web2c/uptexdir/uptex-m.ch
@@ -48,7 +48,7 @@
% (2022-07-23) TTK upTeX u1.29
% (2022-12-09) HK Hironori Kitagawa fixed a bug in \char, \kchar.
% (2023-09-16) TTK upTeX u1.30
-% (2024-04-27) TTK upTeX u1.35
+% (2024-05-01) TTK upTeX u1.35
@x
\def\pTeX{p\kern-.15em\TeX}
@@ -581,13 +581,6 @@ if cat=other_kchar then k:=k-multilenbuffchar(cur_chr)+1; {now |k| points to fir
@z
@x
-@!j:0..buf_size; {index into |buffer|}
-@y
-@!j:0..buf_size; {index into |buffer|}
-@!v,@!nn,@!jj: integer;
-@z
-
-@x
if check_kanji(info(p)) then {|wchar_token|}
begin buffer[j]:=Hi(info(p)); buffer2[j]:=1; incr(j); buffer2[j]:=1;
end
@@ -595,31 +588,11 @@ if cat=other_kchar then k:=k-multilenbuffchar(cur_chr)+1; {now |k| points to fir
buffer[j]:=Lo(info(p)); incr(j); p:=link(p);
@y
if check_kanji(info(p)) then {|wchar_token|}
- begin
- if (isinternalUPTEX) then begin
- t:=ktokentochr(info(p));
- t:=toUCS(t);
- nn:=UVSgetcodepointlength(t);
- jj:=1;
- while jj<nn do begin
- v:=UVSgetcodepointinsequence(t,jj);
- if (v>0) then begin
- v:=UCStoUTF8(v);
- if BYTE1(v)<>0 then begin buffer[j]:=BYTE1(v); buffer2[j]:=1; incr(j); end;
- if BYTE2(v)<>0 then begin buffer[j]:=BYTE2(v); buffer2[j]:=1; incr(j); end;
- if BYTE3(v)<>0 then begin buffer[j]:=BYTE3(v); buffer2[j]:=1; incr(j); end;
- buffer[j]:=BYTE4(v); buffer2[j]:=1; incr(j);
- end;
- incr(jj);
- end
- end
- else begin
- t:=toBUFF(info(p) mod max_cjk_val);
- if BYTE1(t)<>0 then begin buffer[j]:=BYTE1(t); buffer2[j]:=1; incr(j); end;
- if BYTE2(t)<>0 then begin buffer[j]:=BYTE2(t); buffer2[j]:=1; incr(j); end;
- if BYTE3(t)<>0 then begin buffer[j]:=BYTE3(t); buffer2[j]:=1; incr(j); end;
- buffer[j]:=BYTE4(t); buffer2[j]:=1; incr(j);
- end;
+ begin t:=toBUFF(info(p) mod max_cjk_val);
+ if BYTE1(t)<>0 then begin buffer[j]:=BYTE1(t); buffer2[j]:=1; incr(j); end;
+ if BYTE2(t)<>0 then begin buffer[j]:=BYTE2(t); buffer2[j]:=1; incr(j); end;
+ if BYTE3(t)<>0 then begin buffer[j]:=BYTE3(t); buffer2[j]:=1; incr(j); end;
+ buffer[j]:=BYTE4(t); buffer2[j]:=1; incr(j);
p:=link(p);
end
else