Merge branch 'uptex_ofm' #179

t-tk · t-tk · commit 8ed3d0f7939b · 2025-06-22T09:48:30.000+09:00
diff --git a/source/texk/upmendex/ChangeLog b/source/texk/upmendex/ChangeLog
@@ -32,7 +32,7 @@
 	Enhance treatment of S,T comma below in Romanian.
 	Support V-W ordering in Finnish traditional collation.
 	* sort.c:
-	Prepare to support CJK Unified Ideographs Extention J in Unicode 17.0.
+	Prepare to support CJK Unified Ideographs Extension J in Unicode 17.0.
 	It will work with future version of ICU.
 	Treat U+3192..3195, U+3280..3289, U+A830..A835 as "other number".
 
diff --git a/source/texk/web2c/euptexdir/ChangeLog b/source/texk/web2c/euptexdir/ChangeLog
@@ -1,3 +1,8 @@
+2025-06-22  TANAKA Takuji  <ttk@t-lab.opal.ne.jp>
+
+	* tests/printkanji.tex, tests/pknj-[esu].log:
+	Update tests.
+
 2025-05-06  Hironori Kitagawa  <h_kitagawa2001@yahoo.co.jp>
 
 	* pdfutils.ch: Rename bool variable to booltemp, for C23.
diff --git a/source/texk/web2c/euptexdir/tests/pknj-e.log b/source/texk/web2c/euptexdir/tests/pknj-e.log
@@ -209,15 +209,18 @@ l.163 \expandafter\show\csname ^^c5^^bf\endcsname
 l.164 \expandafter\show\csname 顛\endcsname
                                            
 
-\^^e3^^81^^82\あ 
+\^^e3^^81^^82\あ
+SNOW SNOW 雪
+snow snow 雪
+
 ifx:FALSE
 [50623]
-Memory usage before: 1790&5528; after: 130&5093; still untouched: 4992436
+Memory usage before: 1790&5528; after: 130&5093; still untouched: 4992418
  ) 
 Here is how much of TeX's memory you used:
  27 strings out of 497XXX
  152 string characters out of 6215XXX
- 7564 words of memory out of 5000000
+ 7582 words of memory out of 5000000
  10XX multiletter control sequences out of 15000+600000
  3271 words of font info for 2 fonts, out of 8000000 for 9000
  0 hyphenation exceptions out of 8191
diff --git a/source/texk/web2c/euptexdir/tests/pknj-s.log b/source/texk/web2c/euptexdir/tests/pknj-s.log
@@ -209,15 +209,18 @@ l.163 \expandafter\show\csname ^^c5^^bf\endcsname
 l.164 \expandafter\show\csname 顛\endcsname
                                            
 
-\^^e3^^81^^82\あ 
+\^^e3^^81^^82\あ
+SNOW SNOW 雪
+snow snow 雪
+
 ifx:FALSE
 [37726]
-Memory usage before: 1798&5531; after: 130&5094; still untouched: 4992433
+Memory usage before: 1798&5531; after: 130&5094; still untouched: 4992415
  ) 
 Here is how much of TeX's memory you used:
  26 strings out of 497XXX
  150 string characters out of 6215XXX
- 7567 words of memory out of 5000000
+ 7585 words of memory out of 5000000
  10XX multiletter control sequences out of 15000+600000
  3271 words of font info for 2 fonts, out of 8000000 for 9000
  0 hyphenation exceptions out of 8191
diff --git a/source/texk/web2c/euptexdir/tests/pknj-u.log b/source/texk/web2c/euptexdir/tests/pknj-u.log
@@ -209,15 +209,18 @@ l.163 \expandafter\show\csname ^^c5^^bf\endcsname
 l.164 \expandafter\show\csname 顛\endcsname
                                             
 
-\^^e3^^81^^82\あ 
+\^^e3^^81^^82\あ
+SNOW SNOW 雪
+snow snow 雪
+
 ifx:TRUE
 [39003]
-Memory usage before: 1798&5530; after: 130&5093; still untouched: 4992435
+Memory usage before: 1798&5530; after: 130&5093; still untouched: 4992415
  ) 
 Here is how much of TeX's memory you used:
  26 strings out of 497XXX
  155 string characters out of 6215XXX
- 7565 words of memory out of 5000000
+ 7585 words of memory out of 5000000
  10XX multiletter control sequences out of 15000+600000
  3297 words of font info for 2 fonts, out of 8000000 for 9000
  0 hyphenation exceptions out of 8191
diff --git a/source/texk/web2c/euptexdir/tests/printkanji.tex b/source/texk/web2c/euptexdir/tests/printkanji.tex
@@ -173,6 +173,9 @@
 
 \message{\string\^^e3^^81^^82 \string\あ}
 
+\uppercase{\immediate\write16{snow SNOW 雪}}
+\lowercase{\immediate\write16{snow SNOW 雪}}
+
 % check whether ^^^^0000 works or not
 \catcode`\@=11
 \def\@empty{}
diff --git a/source/texk/web2c/ptexdir/ChangeLog b/source/texk/web2c/ptexdir/ChangeLog
@@ -1,3 +1,8 @@
+2025-06-22  TANAKA Takuji  <ttk@t-lab.opal.ne.jp>
+
+	* tests/printkanji.tex, tests/pknj-[es].log:
+	Update tests.
+
 2025-04-26  TANAKA Takuji  <ttk@t-lab.opal.ne.jp>
 
 	* ptex-{ctrlsym,prntknj,widow}.test,
diff --git a/source/texk/web2c/ptexdir/tests/pknj-e.log b/source/texk/web2c/ptexdir/tests/pknj-e.log
@@ -208,15 +208,18 @@ l.163 \expandafter\show\csname ^^c5^^bf\endcsname
 l.164 \expandafter\show\csname 顛\endcsname
                                            
 
-\^^e3^^81^^82\あ 
+\^^e3^^81^^82\あ
+SNOW SNOW 雪
+snow snow 雪
+
 ifx:FALSE
 [50623]
-Memory usage before: 1270&5525; after: 118&5090; still untouched: 4992443
+Memory usage before: 1270&5525; after: 118&5090; still untouched: 4992425
  ) 
 Here is how much of TeX's memory you used:
  27 strings out of 4979XX
  146 string characters out of 62194XX
- 7557 words of memory out of 5000000
+ 7575 words of memory out of 5000000
  971 multiletter control sequences out of 15000+600000
  3271 words of font info for 2 fonts, out of 8000000 for 9000
  0 hyphenation exceptions out of 8191
diff --git a/source/texk/web2c/ptexdir/tests/pknj-s.log b/source/texk/web2c/ptexdir/tests/pknj-s.log
@@ -208,15 +208,18 @@ l.163 \expandafter\show\csname ^^c5^^bf\endcsname
 l.164 \expandafter\show\csname 顛\endcsname
                                            
 
-\^^e3^^81^^82\あ 
+\^^e3^^81^^82\あ
+SNOW SNOW 雪
+snow snow 雪
+
 ifx:FALSE
 [37726]
-Memory usage before: 1274&5528; after: 118&5091; still untouched: 4992440
+Memory usage before: 1274&5528; after: 118&5091; still untouched: 4992422
  ) 
 Here is how much of TeX's memory you used:
  26 strings out of 4979XX
  144 string characters out of 62194XX
- 7560 words of memory out of 5000000
+ 7578 words of memory out of 5000000
  970 multiletter control sequences out of 15000+600000
  3271 words of font info for 2 fonts, out of 8000000 for 9000
  0 hyphenation exceptions out of 8191
diff --git a/source/texk/web2c/ptexdir/tests/printkanji.tex b/source/texk/web2c/ptexdir/tests/printkanji.tex
@@ -173,6 +173,9 @@
 
 \message{\string\^^e3^^81^^82 \string\あ}
 
+\uppercase{\immediate\write16{snow SNOW 雪}}
+\lowercase{\immediate\write16{snow SNOW 雪}}
+
 % check whether ^^^^0000 works or not
 \catcode`\@=11
 \def\@empty{}
diff --git a/source/texk/web2c/uptexdir/ChangeLog b/source/texk/web2c/uptexdir/ChangeLog
@@ -1,3 +1,12 @@
+2025-06-22  TANAKA Takuji  <ttk@t-lab.opal.ne.jp>
+
+	* uptex-m.ch, kanji.[ch]:
+	Fix bug on \uppercase, \lowercase for CJK character.
+	Thanks to TAKENO S. and Y. Morimi.
+	https://github.com/texjporg/tex-jp-build/issues/179
+	* tests/printkanji.tex, tests/pknj-[esu].log:
+	Update tests.
+
 2025-04-26  TANAKA Takuji  <ttk@t-lab.opal.ne.jp>
 
 	* {nissya,sample,skipjfmp,updvitype,upver,yokotate}.test,
diff --git a/source/texk/web2c/uptexdir/kanji.c b/source/texk/web2c/uptexdir/kanji.c
@@ -18,25 +18,25 @@
 #define KCAT_KANJI_IVS 23
 
 /* TOKEN */
-boolean check_kanji (integer c)
+integer check_kanji (integer c)
 {
     integer c0, c1;
 
-    if (c >= CS_TOKEN_FLAG) return false;
+    if (c >= CS_TOKEN_FLAG) return 0;
 
     c0 = c & CJK_TOKEN_FLAG;
     c1 = XXHi(c);
     if (c1>=CAT_LEFT_BRACE && c1<=CAT_DELIM_NUM &&
             c0 < LATIN_CHAR_LIMIT) { /* kcatcode latin_ucs */
-        return is_char_kanji(c0);
+        return 1;
     }
     else if (c1>=KCAT_KANJI && c1<=KCAT_MODIFIER) {
-        return is_char_kanji(c0);
+        return is_char_kanji(c0)*2;
     }
     else if (c1>=KCAT_KANJI_IVS+1 && c1<=KCAT_KANJI_IVS+4) {
-        return is_char_kanji(c - KCAT_KANJI_IVS * CJK_CHAR_LIMIT);
+        return is_char_kanji(c - KCAT_KANJI_IVS * CJK_CHAR_LIMIT)*3;
     }
-    return false;
+    return 0;
 }
 
 boolean is_char_ascii(integer c)
diff --git a/source/texk/web2c/uptexdir/kanji.h b/source/texk/web2c/uptexdir/kanji.h
@@ -26,7 +26,7 @@
 #define Hi(x) BYTE3(x)
 #define Lo(x) BYTE4(x)
 
-extern boolean check_kanji (integer c);
+extern integer check_kanji (integer c);
 #define checkkanji check_kanji
 extern boolean is_char_ascii (integer c);
 #define ischarascii is_char_ascii
diff --git a/source/texk/web2c/uptexdir/tests/pknj-e.log b/source/texk/web2c/uptexdir/tests/pknj-e.log
@@ -208,15 +208,18 @@ l.163 \expandafter\show\csname ^^c5^^bf\endcsname
 l.164 \expandafter\show\csname 顛\endcsname
                                            
 
-\^^e3^^81^^82\あ 
+\^^e3^^81^^82\あ
+SNOW SNOW 雪
+snow snow 雪
+
 ifx:FALSE
 [50623]
-Memory usage before: 1270&5526; after: 118&5091; still untouched: 4992442
+Memory usage before: 1270&5526; after: 118&5091; still untouched: 4992424
  ) 
 Here is how much of TeX's memory you used:
  27 strings out of 49XXXX
  149 string characters out of 6219XXX
- 7558 words of memory out of 5000000
+ 7576 words of memory out of 5000000
  97X multiletter control sequences out of 15000+600000
  3271 words of font info for 2 fonts, out of 8000000 for 9000
  0 hyphenation exceptions out of 8191
diff --git a/source/texk/web2c/uptexdir/tests/pknj-s.log b/source/texk/web2c/uptexdir/tests/pknj-s.log
@@ -208,15 +208,18 @@ l.163 \expandafter\show\csname ^^c5^^bf\endcsname
 l.164 \expandafter\show\csname 顛\endcsname
                                            
 
-\^^e3^^81^^82\あ 
+\^^e3^^81^^82\あ
+SNOW SNOW 雪
+snow snow 雪
+
 ifx:FALSE
 [37726]
-Memory usage before: 1274&5529; after: 118&5092; still untouched: 4992439
+Memory usage before: 1274&5529; after: 118&5092; still untouched: 4992421
  ) 
 Here is how much of TeX's memory you used:
  26 strings out of 49XXXX
  147 string characters out of 6219XXX
- 7561 words of memory out of 5000000
+ 7579 words of memory out of 5000000
  97X multiletter control sequences out of 15000+600000
  3271 words of font info for 2 fonts, out of 8000000 for 9000
  0 hyphenation exceptions out of 8191
diff --git a/source/texk/web2c/uptexdir/tests/pknj-u.log b/source/texk/web2c/uptexdir/tests/pknj-u.log
@@ -208,15 +208,18 @@ l.163 \expandafter\show\csname ^^c5^^bf\endcsname
 l.164 \expandafter\show\csname 顛\endcsname
                                             
 
-\^^e3^^81^^82\あ 
+\^^e3^^81^^82\あ
+SNOW SNOW 雪
+snow snow 雪
+
 ifx:TRUE
 [39003]
-Memory usage before: 1274&5528; after: 118&5091; still untouched: 4992441
+Memory usage before: 1274&5528; after: 118&5091; still untouched: 4992421
  ) 
 Here is how much of TeX's memory you used:
  26 strings out of 49XXXX
  152 string characters out of 6219XXX
- 7559 words of memory out of 5000000
+ 7579 words of memory out of 5000000
  97X multiletter control sequences out of 15000+600000
  3297 words of font info for 2 fonts, out of 8000000 for 9000
  0 hyphenation exceptions out of 8191
diff --git a/source/texk/web2c/uptexdir/tests/printkanji.tex b/source/texk/web2c/uptexdir/tests/printkanji.tex
@@ -173,6 +173,9 @@
 
 \message{\string\^^e3^^81^^82 \string\あ}
 
+\uppercase{\immediate\write16{snow SNOW 雪}}
+\lowercase{\immediate\write16{snow SNOW 雪}}
+
 % check whether ^^^^0000 works or not
 \catcode`\@=11
 \def\@empty{}
diff --git a/source/texk/web2c/uptexdir/uptex-m.ch b/source/texk/web2c/uptexdir/uptex-m.ch
@@ -2406,7 +2406,7 @@ if (t<cs_token_flag+single_base)and(not check_kanji(t)) then
 @y
 @<Change the case of the token in |p|, if a change is appropriate@>=
 t:=info(p);
-if (t<cs_token_flag+single_base) then
+if (t<cs_token_flag+single_base)and(check_kanji(t)<2) then
   begin c:=t mod max_char_val;
 @z
 

-Original file line number
+Diff line change
@@ @@ -1,3 +1,8 @@ @@
 +2025-06-22  TANAKA Takuji  <[email protected]>
++
 +	* tests/printkanji.tex, tests/pknj-[esu].log:
 +	Update tests.
++
 -05-06  Hironori Kitagawa  <[email protected]>
 	* pdfutils.ch: Rename bool variable to booltemp, for C23.