summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorTakuji Tanaka <ttk@t-lab.opal.ne.jp>2022-07-23 06:40:58 +0000
committerTakuji Tanaka <ttk@t-lab.opal.ne.jp>2022-07-23 06:40:58 +0000
commit9fe27e1528637dcbeb63bc28e43a7bf417f32fd0 (patch)
treec46047a3cafb4d5a38f9bde3e1c92967bc661f99 /Build
parent987b58d3be366911190d782f0edcc749ecfa650d (diff)
upTeX: version 1.29, Unicode-15.0
git-svn-id: svn://tug.org/texlive/trunk@63960 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/web2c/pmpostdir/pmp.ch2
-rw-r--r--Build/source/texk/web2c/uptexdir/ChangeLog9
-rw-r--r--Build/source/texk/web2c/uptexdir/kanji.c47
-rw-r--r--Build/source/texk/web2c/uptexdir/tests/kcat.tex16
-rw-r--r--Build/source/texk/web2c/uptexdir/tests/upkcat.txt14
-rw-r--r--Build/source/texk/web2c/uptexdir/upbibtex.ch8
-rw-r--r--Build/source/texk/web2c/uptexdir/updvitype.ch2
-rw-r--r--Build/source/texk/web2c/uptexdir/uppltotf.ch2
-rw-r--r--Build/source/texk/web2c/uptexdir/uptex-m.ch13
-rw-r--r--Build/source/texk/web2c/uptexdir/uptex_version.h2
-rw-r--r--Build/source/texk/web2c/uptexdir/uptftopl.ch2
11 files changed, 80 insertions, 37 deletions
diff --git a/Build/source/texk/web2c/pmpostdir/pmp.ch b/Build/source/texk/web2c/pmpostdir/pmp.ch
index 2b43ca52769..d0b663f1c4c 100644
--- a/Build/source/texk/web2c/pmpostdir/pmp.ch
+++ b/Build/source/texk/web2c/pmpostdir/pmp.ch
@@ -22,7 +22,7 @@
@y
#ifdef UPMP
#define P_UP "up"
-#define metapost_version "2.02-0.04-u1.28"
+#define metapost_version "2.02-0.04-u1.29"
#else
#define P_UP "p"
#define metapost_version "2.02-0.04"
diff --git a/Build/source/texk/web2c/uptexdir/ChangeLog b/Build/source/texk/web2c/uptexdir/ChangeLog
index a9d282a43d2..b3eeef3ffbe 100644
--- a/Build/source/texk/web2c/uptexdir/ChangeLog
+++ b/Build/source/texk/web2c/uptexdir/ChangeLog
@@ -1,3 +1,12 @@
+2022-07-23 TANAKA Takuji <ttk@t-lab.opal.ne.jp>
+
+ * uptex-m.ch, upbibtex.ch, updvitype.ch, uppltotf.ch, uptftopl.ch,
+ uptex_version.h: upTeX version u1.29.
+ * uptex-m.ch, upbibtex.ch, kanji.c:
+ Update reference of Unicode blocks to
+ "Blocks-15.0.0.txt Date: 2022-01-28, 20:58:00 GMT [KW]".
+ * tests/kcat.tex, tests/upkcat.txt: Update a test.
+
2022-06-12 TANAKA Takuji <ttk@t-lab.opal.ne.jp>
* kanji.[ch], upbibtex.ch:
diff --git a/Build/source/texk/web2c/uptexdir/kanji.c b/Build/source/texk/web2c/uptexdir/kanji.c
index 4cc5b38aace..e61f549de61 100644
--- a/Build/source/texk/web2c/uptexdir/kanji.c
+++ b/Build/source/texk/web2c/uptexdir/kanji.c
@@ -56,8 +56,8 @@ integer calc_pos(integer c)
}
/* Ref. http://www.unicode.org/Public/UNIDATA/Blocks.txt */
-/* # Blocks-14.0.0.txt */
-/* # Date: 2021-01-22, 23:29:00 GMT [KW] */
+/* # Blocks-15.0.0.txt */
+/* # Date: 2022-01-28, 20:58:00 GMT [KW] */
static long ucs_range[]={
0x0000, /* Basic Latin */ /* 0x00 */
0x0080, /* Latin-1 Supplement */
@@ -268,6 +268,7 @@ static long ucs_range[]={
0x10D00, /* Hanifi Rohingya */
0x10E60, /* Rumi Numeral Symbols */
0x10E80, /* Yezidi */ /* 0xd0 */
+ 0x10EC0, /* Arabic Extended-C */
0x10F00, /* Old Sogdian */
0x10F30, /* Sogdian */
0x10F70, /* Old Uyghur */
@@ -282,8 +283,8 @@ static long ucs_range[]={
0x111E0, /* Sinhala Archaic Numbers */
0x11200, /* Khojki */
0x11280, /* Multani */
- 0x112B0, /* Khudawadi */
- 0x11300, /* Grantha */ /* 0xe0 */
+ 0x112B0, /* Khudawadi */ /* 0xe0 */
+ 0x11300, /* Grantha */
0x11400, /* Newa */
0x11480, /* Tirhuta */
0x11580, /* Siddham */
@@ -298,12 +299,14 @@ static long ucs_range[]={
0x11A00, /* Zanabazar Square */
0x11A50, /* Soyombo */
0x11AB0, /* Unified Canadian Aboriginal Syllabics Extended-A */
- 0x11AC0, /* Pau Cin Hau */
- 0x11C00, /* Bhaiksuki */ /* 0xf0 */
+ 0x11AC0, /* Pau Cin Hau */ /* 0xf0 */
+ 0x11B00, /* Devanagari Extended-A */
+ 0x11C00, /* Bhaiksuki */
0x11C70, /* Marchen */
0x11D00, /* Masaram Gondi */
0x11D60, /* Gunjala Gondi */
0x11EE0, /* Makasar */
+ 0x11F00, /* Kawi */
0x11FB0, /* Lisu Supplement */
0x11FC0, /* Tamil Supplement */
0x12000, /* Cuneiform */
@@ -312,10 +315,10 @@ static long ucs_range[]={
0x12F90, /* Cypro-Minoan */
0x13000, /* Egyptian Hieroglyphs */
0x13430, /* Egyptian Hieroglyph Format Controls */
- 0x14400, /* Anatolian Hieroglyphs */
+ 0x14400, /* Anatolian Hieroglyphs */ /* 0x100 */
0x16800, /* Bamum Supplement */
0x16A40, /* Mro */
- 0x16A70, /* Tangsa */ /* 0x100 */
+ 0x16A70, /* Tangsa */
0x16AD0, /* Bassa Vah */
0x16B00, /* Pahawh Hmong */
0x16E40, /* Medefaidrin */
@@ -328,14 +331,15 @@ static long ucs_range[]={
0x1AFF0, /* Kana Extended-B */
0x1B000, /* Kana Supplement */
0x1B100, /* Kana Extended-A */
- 0x1B130, /* Small Kana Extension */
+ 0x1B130, /* Small Kana Extension */ /* 0x110 */
0x1B170, /* Nushu */
0x1BC00, /* Duployan */
- 0x1BCA0, /* Shorthand Format Controls */ /* 0x110 */
+ 0x1BCA0, /* Shorthand Format Controls */
0x1CF00, /* Znamenny Musical Notation */
0x1D000, /* Byzantine Musical Symbols */
0x1D100, /* Musical Symbols */
0x1D200, /* Ancient Greek Musical Notation */
+ 0x1D2C0, /* Kaktovik Numerals */
0x1D2E0, /* Mayan Numerals */
0x1D300, /* Tai Xuan Jing Symbols */
0x1D360, /* Counting Rod Numerals */
@@ -343,11 +347,13 @@ static long ucs_range[]={
0x1D800, /* Sutton SignWriting */
0x1DF00, /* Latin Extended-G */
0x1E000, /* Glagolitic Supplement */
+ 0x1E030, /* Cyrillic Extended-D */ /* 0x120 */
0x1E100, /* Nyiakeng Puachue Hmong */
0x1E290, /* Toto */
0x1E2C0, /* Wancho */
+ 0x1E4D0, /* Nag Mundari */
0x1E7E0, /* Ethiopic Extended-B */
- 0x1E800, /* Mende Kikakui */ /* 0x120 */
+ 0x1E800, /* Mende Kikakui */
0x1E900, /* Adlam */
0x1EC70, /* Indic Siyaq Numbers */
0x1ED00, /* Ottoman Siyaq Numbers */
@@ -357,13 +363,13 @@ static long ucs_range[]={
0x1F0A0, /* Playing Cards */
0x1F100, /* Enclosed Alphanumeric Supplement */
0x1F200, /* Enclosed Ideographic Supplement */
- 0x1F300, /* Miscellaneous Symbols and Pictographs */
+ 0x1F300, /* Miscellaneous Symbols and Pictographs */ /* 0x130 */
0x1F600, /* Emoticons */
0x1F650, /* Ornamental Dingbats */
0x1F680, /* Transport and Map Symbols */
0x1F700, /* Alchemical Symbols */
0x1F780, /* Geometric Shapes Extended */
- 0x1F800, /* Supplemental Arrows-C */ /* 0x130 */
+ 0x1F800, /* Supplemental Arrows-C */
0x1F900, /* Supplemental Symbols and Pictographs */
0x1FA00, /* Chess Symbols */
0x1FA70, /* Symbols and Pictographs Extended-A */
@@ -373,13 +379,14 @@ static long ucs_range[]={
0x2B740, /* CJK Unified Ideographs Extension D */
0x2B820, /* CJK Unified Ideographs Extension E */
0x2CEB0, /* CJK Unified Ideographs Extension F */
- 0x2F800, /* CJK Compatibility Ideographs Supplement */
+ 0x2F800, /* CJK Compatibility Ideographs Supplement */ /* 0x140 */
0x30000, /* CJK Unified Ideographs Extension G */
- 0x31350, /* reserved */
+ 0x31350, /* CJK Unified Ideographs Extension H */
+ 0x323B0, /* reserved */
0x40000, /* reserved */
0x50000, /* reserved */
0x60000, /* reserved */
- 0x70000, /* reserved */ /* 0x140 */
+ 0x70000, /* reserved */
0x80000, /* reserved */
0x90000, /* reserved */
0xA0000, /* reserved */
@@ -388,7 +395,7 @@ static long ucs_range[]={
0xD0000, /* reserved */
0xE0000, /* Tags */
0xE0100, /* Variation Selectors Supplement */
- 0xF0000, /* Supplementary Private Use Area-A */
+ 0xF0000, /* Supplementary Private Use Area-A */ /* 0x150 */
0x100000, /* Supplementary Private Use Area-B */
/* Value over 0x10FFFF is illegal under Unicode,
They are for some special use. *** experimental *** */
@@ -397,7 +404,7 @@ static long ucs_range[]={
0x130000, /* Reserved */
0x140000, /* Reserved */
0x150000, /* Reserved */
- 0x160000, /* Reserved */ /* 0x150 */
+ 0x160000, /* Reserved */
0x170000, /* Reserved */
0x180000, /* Reserved */
0x190000, /* Reserved */
@@ -406,10 +413,10 @@ static long ucs_range[]={
0x1C0000, /* Reserved */
0x1D0000, /* Reserved */
0x1E0000, /* Reserved */
- 0x1F0000, /* Reserved */
+ 0x1F0000, /* Reserved */ /* 0x160 */
0x200000, /* Reserved */
0x210000, /* Reserved */
- 0x220000, /* Reserved */ /* 0x15c */
+ 0x220000, /* Reserved */ /* 0x163 */
CJK_CHAR_LIMIT
};
diff --git a/Build/source/texk/web2c/uptexdir/tests/kcat.tex b/Build/source/texk/web2c/uptexdir/tests/kcat.tex
index b130832d069..9b2ef097261 100644
--- a/Build/source/texk/web2c/uptexdir/tests/kcat.tex
+++ b/Build/source/texk/web2c/uptexdir/tests/kcat.tex
@@ -32,7 +32,6 @@
% kanji=16 {kanji}
\write16{⺀::\the\kcatcode"2E80}% U+2E80 CJK Radicals Supplement
\write16{⼀::\the\kcatcode"2F00}% U+2F00 Kangxi Radicals
-\write16{⿰::\the\kcatcode"2FF0}% U+2FF0 Ideographic Description Characters
\write16{ㄅ::\the\kcatcode"3105}% U+3105 Bopomofo
\write16{㆐::\the\kcatcode"3190}% U+3190 Kanbun
\write16{ㆠ::\the\kcatcode"31A0}% U+31A0 Bopomofo Extended
@@ -47,6 +46,7 @@
\write16{𬺰::\the\kcatcode"2CEB0}% U+2CEB0 CJK Unified Ideographs Extension F
\write16{丽::\the\kcatcode"2F800}% U+2F800 CJK Compatibility Ideographs Supplement
\write16{𰀀::\the\kcatcode"30000}% U+30000 CJK Unified Ideographs Extension G
+\write16{𱍐::\the\kcatcode"31350}% U+31350 CJK Unified Ideographs Extension H
% kana=17 {hiragana, katakana}
\write16{あ::\the\kcatcode"3042}% U+3042 Hiragana
@@ -57,6 +57,20 @@
\write16{𛄀::\the\kcatcode"1B100}% U+1B100 Kana Extended-A
\write16{𛅐::\the\kcatcode"1B150}% U+1B150 Small Kana Extension
+% other_kchar=18 {cjk symbol codes}
+\write16{※::\the\kcatcode"203B}% U+203B General Punctuation
+\write16{℃::\the\kcatcode"2103}% U+2103 Letterlike Symbols
+\write16{Ⅻ::\the\kcatcode"216B}% U+216B Number Forms
+\write16{⇒::\the\kcatcode"21D2}% U+21D2 Arrows
+\write16{∂::\the\kcatcode"2202}% U+2202 Mathematical Operators
+\write16{①::\the\kcatcode"2460}% U+2460 Enclosed Alphanumerics
+\write16{┟::\the\kcatcode"251F}% U+251F Box Drawing
+\write16{☃::\the\kcatcode"2603}% U+2603 Miscellaneous Symbols
+\write16{⿰::\the\kcatcode"2FF0}% U+2FF0 Ideographic Description Characters
+\write16{〠::\the\kcatcode"3020}% U+3020 CJK Symbols and Punctuation
+\write16{㋐::\the\kcatcode"32D0}% U+32D0 Enclosed CJK Letters and Months
+\write16{㍿::\the\kcatcode"337F}% U+337F CJK Compatibility
+
% hangul=19 {hangul codes}
\write16{ᄀ::\the\kcatcode"1100}% U+1100 Hangul Jamo
\write16{ㄱ::\the\kcatcode"3131}% U+3131 Hangul Compatibility Jamo
diff --git a/Build/source/texk/web2c/uptexdir/tests/upkcat.txt b/Build/source/texk/web2c/uptexdir/tests/upkcat.txt
index 4a4e0e21b79..def30d869ac 100644
--- a/Build/source/texk/web2c/uptexdir/tests/upkcat.txt
+++ b/Build/source/texk/web2c/uptexdir/tests/upkcat.txt
@@ -9,7 +9,6 @@ A::15
0x1E00::15
⺀::16
⼀::16
-⿰::16
ㄅ::16
㆐::16
ㆠ::16
@@ -24,6 +23,7 @@ A::15
𬺰::16
丽::16
𰀀::16
+𱍐::16
あ::17
ア::17
ㇰ::17
@@ -31,6 +31,18 @@ A::15
𛀀::17
𛄀::17
𛅐::17
+※::18
+℃::18
+Ⅻ::18
+⇒::18
+∂::18
+①::18
+┟::18
+☃::18
+⿰::18
+〠::18
+㋐::18
+㍿::18
ᄀ::19
ㄱ::19
ꥠ::19
diff --git a/Build/source/texk/web2c/uptexdir/upbibtex.ch b/Build/source/texk/web2c/uptexdir/upbibtex.ch
index da97034c925..ab076c048c5 100644
--- a/Build/source/texk/web2c/uptexdir/upbibtex.ch
+++ b/Build/source/texk/web2c/uptexdir/upbibtex.ch
@@ -3,7 +3,7 @@
@d banner=='This is pBibTeX, Version 0.99d-j0.35'
@y
@d my_name=='upbibtex'
-@d banner=='This is upBibTeX, Version 0.99d-j0.35-u1.28'
+@d banner=='This is upBibTeX, Version 0.99d-j0.35-u1.29'
@z
@x
@@ -553,7 +553,7 @@ function is_char_kanji_upbibtex(@!c:integer):boolean;
label exit;
var k:integer;
begin
- { based on upTeX-1.28 kcatcode status: 16,17,19->true / 15,18->false }
+ { based on upTeX-1.29 kcatcode status: 16,17,19->true / 15,18->false }
is_char_kanji_upbibtex := true;
if (is_internalUPTEX) then begin { should be in sync with |kcat_code| of uptex-m.ch }
k := kcatcodekey(c);
@@ -570,8 +570,8 @@ begin
else if k=@"93 then return { Hangul Syllables }
else if k=@"94 then return { Hangul Jamo Extended-B }
else if k=@"99 then return { CJK Compatibility Ideographs }
- else if (k>=@"10A)and(k<=@"10D) then return { Kana Extended-B .. Small Kana Extension }
- else if (k>=@"135)and(k<=@"13B) then return { CJK Unified Ideographs Extension B .. G }
+ else if (k>=@"10D)and(k<=@"110) then return { Kana Extended-B .. Small Kana Extension }
+ else if (k>=@"13B)and(k<=@"142) then return { CJK Unified Ideographs Extension B .. H }
else if k=@"1FE then return { Fullwidth digit and latin alphabet }
else if k=@"1FF then return; { Halfwidth katakana }
end
diff --git a/Build/source/texk/web2c/uptexdir/updvitype.ch b/Build/source/texk/web2c/uptexdir/updvitype.ch
index da1d40e0682..de973426e8a 100644
--- a/Build/source/texk/web2c/uptexdir/updvitype.ch
+++ b/Build/source/texk/web2c/uptexdir/updvitype.ch
@@ -3,7 +3,7 @@
@d banner=='This is pDVItype, Version 3.6-p0.5'
@y
@d my_name=='updvitype'
-@d banner=='This is upDVItype, Version 3.6-p0.5-u1.28'
+@d banner=='This is upDVItype, Version 3.6-p0.5-u1.29'
@z
@x procedure initialize
diff --git a/Build/source/texk/web2c/uptexdir/uppltotf.ch b/Build/source/texk/web2c/uptexdir/uppltotf.ch
index 53a06f60ddd..738b0141bdf 100644
--- a/Build/source/texk/web2c/uptexdir/uppltotf.ch
+++ b/Build/source/texk/web2c/uptexdir/uppltotf.ch
@@ -3,7 +3,7 @@
@d banner=='This is pPLtoTF, Version 3.6-p2.0'
@y
@d my_name=='uppltotf'
-@d banner=='This is upPLtoTF, Version 3.6-p2.0-u1.28'
+@d banner=='This is upPLtoTF, Version 3.6-p2.0-u1.29'
@z
@x
diff --git a/Build/source/texk/web2c/uptexdir/uptex-m.ch b/Build/source/texk/web2c/uptexdir/uptex-m.ch
index b153c33328e..18231938a20 100644
--- a/Build/source/texk/web2c/uptexdir/uptex-m.ch
+++ b/Build/source/texk/web2c/uptexdir/uptex-m.ch
@@ -1,5 +1,5 @@
% $Id$
-% This is a change file for upTeX u1.27
+% This is a change file for upTeX u1.29
% By Takuji Tanaka.
%
% (02/26/2007) TTK upTeX u0.01
@@ -45,6 +45,7 @@
% (2020-02-22) TTK upTeX u1.26
% (2020-10-25) TTK upTeX u1.27
% (2022-01-23) TTK upTeX u1.28
+% (2022-07-23) TTK upTeX u1.29
@x upTeX: banner
{printed when \pTeX\ starts}
@@ -52,8 +53,8 @@
{printed when \pTeX\ starts}
@#
@d upTeX_version=1
-@d upTeX_revision==".28"
-@d upTeX_version_string=='-u1.28' {current u\pTeX\ version}
+@d upTeX_revision==".29"
+@d upTeX_version_string=='-u1.29' {current u\pTeX\ version}
@#
@d upTeX_banner=='This is upTeX, Version 3.141592653',pTeX_version_string,upTeX_version_string
@d upTeX_banner_k==upTeX_banner
@@ -250,7 +251,7 @@ if (isinternalUPTEX) then begin
@+@t\1@>for k:=@"2 to @"3 do kcat_code(k):=not_cjk; { Latin Extended-A, Latin Extended-B }
@t\hskip10pt@>kcat_code(@"25):=hangul; { Hangul Jamo }
@t\hskip10pt@>kcat_code(@"46):=not_cjk; { Latin Extended Additional }
- @+@t\1@>for k:=@"68 to @"6A do kcat_code(k):=kanji; { CJK Radicals Supplement .. Ideographic Description Characters }
+ @+@t\1@>for k:=@"68 to @"69 do kcat_code(k):=kanji; { CJK Radicals Supplement .. Kangxi Radicals }
@+@t\1@>for k:=@"6C to @"6D do kcat_code(k):=kana; { Hiragana, Katakana }
@t\hskip10pt@>kcat_code(@"6E):=kanji; { Bopomofo }
@t\hskip10pt@>kcat_code(@"6F):=hangul; { Hangul Compatibility Jamo }
@@ -263,8 +264,8 @@ if (isinternalUPTEX) then begin
@t\hskip10pt@>kcat_code(@"94):=hangul; { Hangul Jamo Extended-B }
@t\hskip10pt@>kcat_code(@"99):=kanji; { CJK Compatibility Ideographs }
{ \hskip10pt|kcat_code(@"A2):=other_kchar;| Halfwidth and Fullwidth Forms }
- @+@t\1@>for k:=@"10A to @"10D do kcat_code(k):=kana; { Kana Extended-B .. Small Kana Extension }
- @+@t\1@>for k:=@"135 to @"13B do kcat_code(k):=kanji; { CJK Unified Ideographs Extension B .. G }
+ @+@t\1@>for k:=@"10D to @"110 do kcat_code(k):=kana; { Kana Extended-B .. Small Kana Extension }
+ @+@t\1@>for k:=@"13B to @"142 do kcat_code(k):=kanji; { CJK Unified Ideographs Extension B .. H }
@t\hskip10pt@>kcat_code(@"1FD):=not_cjk; { Latin-1 Letters }
@t\hskip10pt@>kcat_code(@"1FE):=kana; { Fullwidth digit and latin alphabet }
@t\hskip10pt@>kcat_code(@"1FF):=kana; { Halfwidth katakana }
diff --git a/Build/source/texk/web2c/uptexdir/uptex_version.h b/Build/source/texk/web2c/uptexdir/uptex_version.h
index 0b751989f7d..6b38ed922c4 100644
--- a/Build/source/texk/web2c/uptexdir/uptex_version.h
+++ b/Build/source/texk/web2c/uptexdir/uptex_version.h
@@ -1 +1 @@
-#define UPTEX_VERSION "u1.28"
+#define UPTEX_VERSION "u1.29"
diff --git a/Build/source/texk/web2c/uptexdir/uptftopl.ch b/Build/source/texk/web2c/uptexdir/uptftopl.ch
index e68d763d0a7..7d406735ca5 100644
--- a/Build/source/texk/web2c/uptexdir/uptftopl.ch
+++ b/Build/source/texk/web2c/uptexdir/uptftopl.ch
@@ -3,7 +3,7 @@
@d banner=='This is pTFtoPL, Version 3.3-p2.0'
@y
@d my_name=='uptftopl'
-@d banner=='This is upTFtoPL, Version 3.3-p2.0-u1.28'
+@d banner=='This is upTFtoPL, Version 3.3-p2.0-u1.29'
@z
@x