summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakuji Tanaka <ttk@t-lab.opal.ne.jp>2020-02-22 13:48:39 +0000
committerTakuji Tanaka <ttk@t-lab.opal.ne.jp>2020-02-22 13:48:39 +0000
commitb97b9942109f322224c057b300cec1fd75d23734 (patch)
treece228f0e14bd27a78c217463260ede52267fd401
parentaddf8536a8106d6cf7c67e5598467af8b9c30fa1 (diff)
upTeX v1.26
git-svn-id: svn://tug.org/texlive/trunk@53868 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/web2c/uptexdir/COPYRIGHT2
-rw-r--r--Build/source/texk/web2c/uptexdir/COPYRIGHT.ja2
-rw-r--r--Build/source/texk/web2c/uptexdir/ChangeLog12
-rw-r--r--Build/source/texk/web2c/uptexdir/kanji.c42
-rw-r--r--Build/source/texk/web2c/uptexdir/upbibtex.ch2
-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.ch11
-rw-r--r--Build/source/texk/web2c/uptexdir/uptex_version.h2
-rw-r--r--Build/source/texk/web2c/uptexdir/uptftopl.ch2
10 files changed, 49 insertions, 30 deletions
diff --git a/Build/source/texk/web2c/uptexdir/COPYRIGHT b/Build/source/texk/web2c/uptexdir/COPYRIGHT
index ae2ba2907f7..a92f8732efd 100644
--- a/Build/source/texk/web2c/uptexdir/COPYRIGHT
+++ b/Build/source/texk/web2c/uptexdir/COPYRIGHT
@@ -1,5 +1,5 @@
Copyright (C) 2009 ASCII MEDIA WORKS.
-Copyright (C) 2007-2019 Takuji Tanaka
+Copyright (C) 2007-2020 Takuji Tanaka
All rights reserved.
Redistribution and use in source and binary forms, with or without
diff --git a/Build/source/texk/web2c/uptexdir/COPYRIGHT.ja b/Build/source/texk/web2c/uptexdir/COPYRIGHT.ja
index 44d8b551111..44ab4156ed8 100644
--- a/Build/source/texk/web2c/uptexdir/COPYRIGHT.ja
+++ b/Build/source/texk/web2c/uptexdir/COPYRIGHT.ja
@@ -4,7 +4,7 @@
【著作権表示】
Copyright (C) 2009 ASCII MEDIA WORKS.
-Copyright (C) 2007-2019 Takuji Tanaka
+Copyright (C) 2007-2020 Takuji Tanaka
All rights reserved.
【契約条件】
diff --git a/Build/source/texk/web2c/uptexdir/ChangeLog b/Build/source/texk/web2c/uptexdir/ChangeLog
index c97932c658c..1df99cb1f5b 100644
--- a/Build/source/texk/web2c/uptexdir/ChangeLog
+++ b/Build/source/texk/web2c/uptexdir/ChangeLog
@@ -1,8 +1,18 @@
+2020-02-22 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.26.
+ * uptex-m.ch, kanji.c:
+ Update reference of Unicode blocks to
+ "Blocks-13.0.0.txt Date: 2019-07-10, 19:06:00 GMT [KW]".
+ * COPYRIGHT, COPYRIGHT.ja:
+ Update copyright year.
+
2019-12-10 Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
* am/uptex.am (uptex_cppflags): append $(ZLIB_INCLUDES).
(uptex_ldadd): append $(ZLIB_LIBS.)
- (uptex_dependencies): append $(ZLIB_DEPEND)
+ (uptex_dependencies): append $(ZLIB_DEPEND)
(uptex_web_srcs): append zlib-fmt.ch.
* kanji.h: #include <zlib.h>
(dump_kanji, undump_kanji): arg is now type gzFile instead of FILE *.
diff --git a/Build/source/texk/web2c/uptexdir/kanji.c b/Build/source/texk/web2c/uptexdir/kanji.c
index 2d7c9278086..1149c838908 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-12.0.0.txt */
-/* # Date: 2018-07-30, 19:40:00 GMT [KW] */
+/* # Blocks-13.0.0.txt */
+/* # Date: 2019-07-10, 19:06:00 GMT [KW] */
static long ucs_range[]={
0x0000, /* Basic Latin */ /* 0x00 */
0x0080, /* Latin-1 Supplement */
@@ -264,10 +264,12 @@ static long ucs_range[]={
0x10C80, /* Old Hungarian */
0x10D00, /* Hanifi Rohingya */
0x10E60, /* Rumi Numeral Symbols */
+ 0x10E80, /* Yezidi */
0x10F00, /* Old Sogdian */
0x10F30, /* Sogdian */
+ 0x10FB0, /* Chorasmian */ /* 0xd0 */
0x10FE0, /* Elymaic */
- 0x11000, /* Brahmi */ /* 0xd0 */
+ 0x11000, /* Brahmi */
0x11080, /* Kaithi */
0x110D0, /* Sora Sompeng */
0x11100, /* Chakma */
@@ -281,12 +283,13 @@ static long ucs_range[]={
0x11400, /* Newa */
0x11480, /* Tirhuta */
0x11580, /* Siddham */
- 0x11600, /* Modi */
+ 0x11600, /* Modi */ /* 0xe0 */
0x11660, /* Mongolian Supplement */
- 0x11680, /* Takri */ /* 0xe0 */
+ 0x11680, /* Takri */
0x11700, /* Ahom */
0x11800, /* Dogra */
0x118A0, /* Warang Citi */
+ 0x11900, /* Dives Akuru */
0x119A0, /* Nandinagari */
0x11A00, /* Zanabazar Square */
0x11A50, /* Soyombo */
@@ -296,10 +299,11 @@ static long ucs_range[]={
0x11D00, /* Masaram Gondi */
0x11D60, /* Gunjala Gondi */
0x11EE0, /* Makasar */
+ 0x11FB0, /* Lisu Supplement */ /* 0xf0 */
0x11FC0, /* Tamil Supplement */
0x12000, /* Cuneiform */
0x12400, /* Cuneiform Numbers and Punctuation */
- 0x12480, /* Early Dynastic Cuneiform */ /* 0xf0 */
+ 0x12480, /* Early Dynastic Cuneiform */
0x13000, /* Egyptian Hieroglyphs */
0x13430, /* Egyptian Hieroglyph Format Controls */
0x14400, /* Anatolian Hieroglyphs */
@@ -311,11 +315,13 @@ static long ucs_range[]={
0x16F00, /* Miao */
0x16FE0, /* Ideographic Symbols and Punctuation */
0x17000, /* Tangut */
- 0x18800, /* Tangut Components */
+ 0x18800, /* Tangut Components */ /* 0x100 */
+ 0x18B00, /* Khitan Small Script */
+ 0x18D00, /* Tangut Supplement */
0x1B000, /* Kana Supplement */
0x1B100, /* Kana Extended-A */
0x1B130, /* Small Kana Extension */
- 0x1B170, /* Nushu */ /* 0x100 */
+ 0x1B170, /* Nushu */
0x1BC00, /* Duployan */
0x1BCA0, /* Shorthand Format Controls */
0x1D000, /* Byzantine Musical Symbols */
@@ -325,13 +331,13 @@ static long ucs_range[]={
0x1D300, /* Tai Xuan Jing Symbols */
0x1D360, /* Counting Rod Numerals */
0x1D400, /* Mathematical Alphanumeric Symbols */
- 0x1D800, /* Sutton SignWriting */
+ 0x1D800, /* Sutton SignWriting */ /* 0x110 */
0x1E000, /* Glagolitic Supplement */
0x1E100, /* Nyiakeng Puachue Hmong */
0x1E2C0, /* Wancho */
0x1E800, /* Mende Kikakui */
0x1E900, /* Adlam */
- 0x1EC70, /* Indic Siyaq Numbers */ /* 0x110 */
+ 0x1EC70, /* Indic Siyaq Numbers */
0x1ED00, /* Ottoman Siyaq Numbers */
0x1EE00, /* Arabic Mathematical Alphabetic Symbols */
0x1F000, /* Mahjong Tiles */
@@ -341,21 +347,23 @@ static long ucs_range[]={
0x1F200, /* Enclosed Ideographic Supplement */
0x1F300, /* Miscellaneous Symbols and Pictographs */
0x1F600, /* Emoticons */
- 0x1F650, /* Ornamental Dingbats */
+ 0x1F650, /* Ornamental Dingbats */ /* 0x120 */
0x1F680, /* Transport and Map Symbols */
0x1F700, /* Alchemical Symbols */
0x1F780, /* Geometric Shapes Extended */
0x1F800, /* Supplemental Arrows-C */
0x1F900, /* Supplemental Symbols and Pictographs */
- 0x1FA00, /* Chess Symbols */ /* 0x120 */
+ 0x1FA00, /* Chess Symbols */
0x1FA70, /* Symbols and Pictographs Extended-A */
+ 0x1FB00, /* Symbols for Legacy Computing */
0x20000, /* CJK Unified Ideographs Extension B */
0x2A700, /* CJK Unified Ideographs Extension C */
0x2B740, /* CJK Unified Ideographs Extension D */
0x2B820, /* CJK Unified Ideographs Extension E */
0x2CEB0, /* CJK Unified Ideographs Extension F */
0x2F800, /* CJK Compatibility Ideographs Supplement */
- 0x30000, /* reserved */
+ 0x30000, /* CJK Unified Ideographs Extension G */
+ 0x31350, /* reserved */ /* 0x130 */
0x40000, /* reserved */
0x50000, /* reserved */
0x60000, /* reserved */
@@ -363,7 +371,7 @@ static long ucs_range[]={
0x80000, /* reserved */
0x90000, /* reserved */
0xA0000, /* reserved */
- 0xB0000, /* reserved */ /* 0x130 */
+ 0xB0000, /* reserved */
0xC0000, /* reserved */
0xD0000, /* reserved */
0xE0000, /* Tags */
@@ -373,7 +381,7 @@ static long ucs_range[]={
/* Value over 0x10FFFF is illegal under Unicode,
They are for some special use. *** experimental *** */
0x110000, /* Reserved */
- 0x120000, /* Reserved */
+ 0x120000, /* Reserved */ /* 0x140 */
0x130000, /* Reserved */
0x140000, /* Reserved */
0x150000, /* Reserved */
@@ -381,7 +389,7 @@ static long ucs_range[]={
0x170000, /* Reserved */
0x180000, /* Reserved */
0x190000, /* Reserved */
- 0x1A0000, /* Reserved */ /* 0x140 */
+ 0x1A0000, /* Reserved */
0x1B0000, /* Reserved */
0x1C0000, /* Reserved */
0x1D0000, /* Reserved */
@@ -389,7 +397,7 @@ static long ucs_range[]={
0x1F0000, /* Reserved */
0x200000, /* Reserved */
0x210000, /* Reserved */
- 0x220000, /* Reserved */
+ 0x220000, /* Reserved */ /* 0x150 */
CJK_CHAR_LIMIT
};
diff --git a/Build/source/texk/web2c/uptexdir/upbibtex.ch b/Build/source/texk/web2c/uptexdir/upbibtex.ch
index fefd2951da4..4282e17524e 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.33'
@y
@d my_name=='upbibtex'
-@d banner=='This is upBibTeX, Version 0.99d-j0.33-u1.25'
+@d banner=='This is upBibTeX, Version 0.99d-j0.33-u1.26'
@z
@x
diff --git a/Build/source/texk/web2c/uptexdir/updvitype.ch b/Build/source/texk/web2c/uptexdir/updvitype.ch
index 155e3b3417a..715b05cc14f 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.4'
@y
@d my_name=='updvitype'
-@d banner=='This is upDVItype, Version 3.6-p0.4-u1.25'
+@d banner=='This is upDVItype, Version 3.6-p0.4-u1.26'
@z
@x procedure initialize
diff --git a/Build/source/texk/web2c/uptexdir/uppltotf.ch b/Build/source/texk/web2c/uptexdir/uppltotf.ch
index c36299da75a..4be275a57e7 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.25'
+@d banner=='This is upPLtoTF, Version 3.6-p2.0-u1.26'
@z
@x
diff --git a/Build/source/texk/web2c/uptexdir/uptex-m.ch b/Build/source/texk/web2c/uptexdir/uptex-m.ch
index 695fb9bf6eb..fbf48b139e9 100644
--- a/Build/source/texk/web2c/uptexdir/uptex-m.ch
+++ b/Build/source/texk/web2c/uptexdir/uptex-m.ch
@@ -1,4 +1,4 @@
-% This is a change file for upTeX u1.25
+% This is a change file for upTeX u1.26
% By Takuji Tanaka.
%
% (02/26/2007) TTK upTeX u0.01
@@ -41,6 +41,7 @@
% (2019-02-23) TTK upTeX u1.24
% (2019-05-06) HK Hironori Kitagawa fixed a bug in \if.
% (2019-05-06) TTK upTeX u1.25
+% (2020-02-22) TTK upTeX u1.26
@x upTeX: banner
{printed when \pTeX\ starts}
@@ -48,8 +49,8 @@
{printed when \pTeX\ starts}
@#
@d upTeX_version=1
-@d upTeX_revision==".25"
-@d upTeX_version_string=='-u1.25' {current u\pTeX\ version}
+@d upTeX_revision==".26"
+@d upTeX_version_string=='-u1.26' {current u\pTeX\ version}
@#
@d upTeX_banner=='This is upTeX, Version 3.14159265',pTeX_version_string,upTeX_version_string
@d upTeX_banner_k==upTeX_banner
@@ -259,8 +260,8 @@ if (isinternalUPTEX) then begin
@t\hskip10pt@>kcat_code(@"93):=hangul; { Hangul Jamo Extended-B }
@t\hskip10pt@>kcat_code(@"98):=kanji; { CJK Compatibility Ideographs }
{ \hskip10pt|kcat_code(@"A1):=other_kchar;| Halfwidth and Fullwidth Forms }
- @+@t\1@>for k:=@"FD to @"FF do kcat_code(k):=kana; { Kana Supplement .. Small Kana Extension }
- @+@t\1@>for k:=@"122 to @"127 do kcat_code(k):=kanji; { CJK Unified Ideographs Extension B .. CJK Compatibility Ideographs Supplement }
+ @+@t\1@>for k:=@"103 to @"105 do kcat_code(k):=kana; { Kana Supplement .. Small Kana Extension }
+ @+@t\1@>for k:=@"129 to @"12F do kcat_code(k):=kanji; { CJK Unified Ideographs Extension B .. G }
@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 5483afaa4e7..b5c4a7473b2 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.25"
+#define UPTEX_VERSION "u1.26"
diff --git a/Build/source/texk/web2c/uptexdir/uptftopl.ch b/Build/source/texk/web2c/uptexdir/uptftopl.ch
index 54fdd114be1..ee20994ce16 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.25'
+@d banner=='This is upTFtoPL, Version 3.3-p2.0-u1.26'
@z
@x