summaryrefslogtreecommitdiff
path: root/Build/source/texk
diff options
context:
space:
mode:
authorTakuji Tanaka <KXD02663@nifty.ne.jp>2014-12-30 00:48:13 +0000
committerTakuji Tanaka <KXD02663@nifty.ne.jp>2014-12-30 00:48:13 +0000
commitbf6f668244ad61c477919b5a1f511960c6178efd (patch)
treed7f9ce1b534dff1aca8f8d56ea69da5c898d35e5 /Build/source/texk
parent2dfc237830e825534c39e178688ca627c561db68 (diff)
upTeX 1.20
git-svn-id: svn://tug.org/texlive/trunk@35923 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk')
-rw-r--r--Build/source/texk/makejvf/ChangeLog7
-rw-r--r--Build/source/texk/makejvf/main.c2
-rw-r--r--Build/source/texk/makejvf/uniblock.c44
-rw-r--r--Build/source/texk/web2c/uptexdir/ChangeLog16
-rw-r--r--Build/source/texk/web2c/uptexdir/kanji.c134
-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.ch67
-rw-r--r--Build/source/texk/web2c/uptexdir/uptex_version.h2
-rw-r--r--Build/source/texk/web2c/uptexdir/uptftopl.ch2
11 files changed, 192 insertions, 88 deletions
diff --git a/Build/source/texk/makejvf/ChangeLog b/Build/source/texk/makejvf/ChangeLog
index 62d029606e7..00f45c3e569 100644
--- a/Build/source/texk/makejvf/ChangeLog
+++ b/Build/source/texk/makejvf/ChangeLog
@@ -1,3 +1,10 @@
+2014-12-29 TANAKA Takuji <ttk@t-lab.opal.ne.jp>
+
+ Update for upTeX-1.20.
+ * uniblock.c: Update references Unicode blocks Blocks-7.0.0.txt
+ and CMap files.
+ * main.c: Update version number.
+
2014-06-16 Peter Breitenlohner <peb@mppmu.mpg.de>
* Makefile.am: Drop the obsolete ACLOCAL_AMFLAGS.
diff --git a/Build/source/texk/makejvf/main.c b/Build/source/texk/makejvf/main.c
index 6313726e97f..9fc79636a5d 100644
--- a/Build/source/texk/makejvf/main.c
+++ b/Build/source/texk/makejvf/main.c
@@ -166,7 +166,7 @@ int main(int argc, char ** argv)
void usage(void)
{
- fputs2("MAKEJVF ver.1.1a-u1.10 -- make Japanese VF file.\n", stderr);
+ fputs2("MAKEJVF ver.1.1a-u1.20 -- make Japanese VF file.\n", stderr);
fputs2("%% makejvf [<options>] <TFMfile> <PSfontTFM>\n", stderr);
fputs2("options:\n", stderr);
fputs2("-C 長体モード\n", stderr);
diff --git a/Build/source/texk/makejvf/uniblock.c b/Build/source/texk/makejvf/uniblock.c
index d424cf624d1..b7bafde1175 100644
--- a/Build/source/texk/makejvf/uniblock.c
+++ b/Build/source/texk/makejvf/uniblock.c
@@ -12,16 +12,16 @@ struct ublock {
/*
References:
[1] http://www.unicode.org/Public/UNIDATA/Blocks.txt
- Blocks-6.1.0.txt
- Date: 2011-06-14, 18:26:00 GMT [KW, LI]
+ Blocks-7.0.0.txt
+ Date: 2014-04-03, 23:23:00 GMT [RP, KW]
[2] CMap files
- http://sourceforge.net/adobe/cmap/home/Home/
+ http://sourceforge.net/adobe/cmap/wiki/Home/
cmapresources_cns1-6.tar.z Adobe-CNS1-6 materials
cid2code.txt (Version 10/25/2010)
cmapresources_gb1-5.tar.z Adobe-GB1-5 materials
cid2code.txt (Version 10/29/2010)
cmapresources_japan1-6.tar.z Adobe-Japan1-6 materials
- cid2code.txt (Version 02/04/2012)
+ cid2code.txt (Version 08/13/2012)
cmapresources_korean1-2.tar.z Adobe-Korea1-2 materials
cid2code.txt (Version 01/31/2012)
*/
@@ -82,6 +82,7 @@ static struct ublock ublock_data[] = {
{0x19E0, 0x19FF, ENTRY_NO }, /* Khmer Symbols */
{0x1A00, 0x1A1F, ENTRY_NO }, /* Buginese */
{0x1A20, 0x1AAF, ENTRY_NO }, /* Tai Tham */
+ {0x1AB0, 0x1AFF, ENTRY_NO }, /* Combining Diacritical Marks Extended */
{0x1B00, 0x1B7F, ENTRY_NO }, /* Balinese */
{0x1B80, 0x1BBF, ENTRY_NO }, /* Sundanese */
{0x1BC0, 0x1BFF, ENTRY_NO }, /* Batak */
@@ -160,11 +161,13 @@ static struct ublock ublock_data[] = {
{0xA930, 0xA95F, ENTRY_NO }, /* Rejang */
{0xA960, 0xA97F, ENTRY_NO }, /* Hangul Jamo Extended-A */
{0xA980, 0xA9DF, ENTRY_NO }, /* Javanese */
+ {0xA9E0, 0xA9FF, ENTRY_NO }, /* Myanmar Extended-B */
{0xAA00, 0xAA5F, ENTRY_NO }, /* Cham */
{0xAA60, 0xAA7F, ENTRY_NO }, /* Myanmar Extended-A */
{0xAA80, 0xAADF, ENTRY_NO }, /* Tai Viet */
{0xAAE0, 0xAAFF, ENTRY_NO }, /* Meetei Mayek Extensions */
{0xAB00, 0xAB2F, ENTRY_NO }, /* Ethiopic Extended-A */
+ {0xAB30, 0xAB6F, ENTRY_NO }, /* Latin Extended-E */
{0xABC0, 0xABFF, ENTRY_NO }, /* Meetei Mayek */
{0xAC00, 0xD7AF, ENTRY_K }, /* Hangul Syllables */
{0xD7B0, 0xD7FF, ENTRY_NO }, /* Hangul Jamo Extended-B */
@@ -191,54 +194,83 @@ static struct ublock ublock_data[] = {
{0x101D0, 0x101FF, ENTRY_NO }, /* Phaistos Disc */
{0x10280, 0x1029F, ENTRY_NO }, /* Lycian */
{0x102A0, 0x102DF, ENTRY_NO }, /* Carian */
+ {0x102E0, 0x102FF, ENTRY_NO }, /* Coptic Epact Numbers */
{0x10300, 0x1032F, ENTRY_NO }, /* Old Italic */
{0x10330, 0x1034F, ENTRY_NO }, /* Gothic */
+ {0x10350, 0x1037F, ENTRY_NO }, /* Old Permic */
{0x10380, 0x1039F, ENTRY_NO }, /* Ugaritic */
{0x103A0, 0x103DF, ENTRY_NO }, /* Old Persian */
{0x10400, 0x1044F, ENTRY_NO }, /* Deseret */
{0x10450, 0x1047F, ENTRY_NO }, /* Shavian */
{0x10480, 0x104AF, ENTRY_NO }, /* Osmanya */
+ {0x10500, 0x1052F, ENTRY_NO }, /* Elbasan */
+ {0x10530, 0x1056F, ENTRY_NO }, /* Caucasian Albanian */
+ {0x10600, 0x1077F, ENTRY_NO }, /* Linear A */
{0x10800, 0x1083F, ENTRY_NO }, /* Cypriot Syllabary */
{0x10840, 0x1085F, ENTRY_NO }, /* Imperial Aramaic */
+ {0x10860, 0x1087F, ENTRY_NO }, /* Palmyrene */
+ {0x10880, 0x108AF, ENTRY_NO }, /* Nabataean */
{0x10900, 0x1091F, ENTRY_NO }, /* Phoenician */
{0x10920, 0x1093F, ENTRY_NO }, /* Lydian */
{0x10980, 0x1099F, ENTRY_NO }, /* Meroitic Hieroglyphs */
{0x109A0, 0x109FF, ENTRY_NO }, /* Meroitic Cursive */
{0x10A00, 0x10A5F, ENTRY_NO }, /* Kharoshthi */
{0x10A60, 0x10A7F, ENTRY_NO }, /* Old South Arabian */
+ {0x10A80, 0x10A9F, ENTRY_NO }, /* Old North Arabian */
+ {0x10AC0, 0x10AFF, ENTRY_NO }, /* Manichaean */
{0x10B00, 0x10B3F, ENTRY_NO }, /* Avestan */
{0x10B40, 0x10B5F, ENTRY_NO }, /* Inscriptional Parthian */
{0x10B60, 0x10B7F, ENTRY_NO }, /* Inscriptional Pahlavi */
+ {0x10B80, 0x10BAF, ENTRY_NO }, /* Psalter Pahlavi */
{0x10C00, 0x10C4F, ENTRY_NO }, /* Old Turkic */
{0x10E60, 0x10E7F, ENTRY_NO }, /* Rumi Numeral Symbols */
{0x11000, 0x1107F, ENTRY_NO }, /* Brahmi */
{0x11080, 0x110CF, ENTRY_NO }, /* Kaithi */
{0x110D0, 0x110FF, ENTRY_NO }, /* Sora Sompeng */
{0x11100, 0x1114F, ENTRY_NO }, /* Chakma */
+ {0x11150, 0x1117F, ENTRY_NO }, /* Mahajani */
{0x11180, 0x111DF, ENTRY_NO }, /* Sharada */
+ {0x111E0, 0x111FF, ENTRY_NO }, /* Sinhala Archaic Numbers*/
+ {0x11200, 0x1124F, ENTRY_NO }, /* Khojki */
+ {0x112B0, 0x112FF, ENTRY_NO }, /* Khudawadi */
+ {0x11300, 0x1137F, ENTRY_NO }, /* Grantha */
+ {0x11480, 0x114DF, ENTRY_NO }, /* Tirhuta */
+ {0x11580, 0x115FF, ENTRY_NO }, /* Siddham */
+ {0x11600, 0x1165F, ENTRY_NO }, /* Modi */
{0x11680, 0x116CF, ENTRY_NO }, /* Takri */
+ {0x118A0, 0x118FF, ENTRY_NO }, /* Warang Citi */
+ {0x11AC0, 0x11AFF, ENTRY_NO }, /* Pau Cin Hau */
{0x12000, 0x123FF, ENTRY_NO }, /* Cuneiform */
{0x12400, 0x1247F, ENTRY_NO }, /* Cuneiform Numbers and Punctuation */
{0x13000, 0x1342F, ENTRY_NO }, /* Egyptian Hieroglyphs */
{0x16800, 0x16A3F, ENTRY_NO }, /* Bamum Supplement */
+ {0x16A40, 0x16A6F, ENTRY_NO }, /* Mro */
+ {0x16AD0, 0x16AFF, ENTRY_NO }, /* Bassa Vah */
+ {0x16B00, 0x16B8F, ENTRY_NO }, /* Pahawh Hmong */
{0x16F00, 0x16F9F, ENTRY_NO }, /* Miao */
{0x1B000, 0x1B0FF, ENTRY_NO }, /* Kana Supplement */
+ {0x1BC00, 0x1BC9F, ENTRY_NO }, /* Duployan */
+ {0x1BCA0, 0x1BCAF, ENTRY_NO }, /* Shorthand Format Controls */
{0x1D000, 0x1D0FF, ENTRY_NO }, /* Byzantine Musical Symbols */
{0x1D100, 0x1D1FF, ENTRY_NO }, /* Musical Symbols */
{0x1D200, 0x1D24F, ENTRY_NO }, /* Ancient Greek Musical Notation */
{0x1D300, 0x1D35F, ENTRY_NO }, /* Tai Xuan Jing Symbols */
{0x1D360, 0x1D37F, ENTRY_NO }, /* Counting Rod Numerals */
{0x1D400, 0x1D7FF, ENTRY_NO }, /* Mathematical Alphanumeric Symbols */
+ {0x1E800, 0x1E8DF, ENTRY_NO }, /* Mende Kikakui */
{0x1EE00, 0x1EEFF, ENTRY_NO }, /* Arabic Mathematical Alphabetic Symbols */
{0x1F000, 0x1F02F, ENTRY_NO }, /* Mahjong Tiles */
{0x1F030, 0x1F09F, ENTRY_NO }, /* Domino Tiles */
{0x1F0A0, 0x1F0FF, ENTRY_NO }, /* Playing Cards */
{0x1F100, 0x1F1FF, ENTRY_J }, /* Enclosed Alphanumeric Supplement */
{0x1F200, 0x1F2FF, ENTRY_J }, /* Enclosed Ideographic Supplement */
- {0x1F300, 0x1F5FF, ENTRY_NO }, /* Miscellaneous Symbols And Pictographs */
+ {0x1F300, 0x1F5FF, ENTRY_NO }, /* Miscellaneous Symbols and Pictographs */
{0x1F600, 0x1F64F, ENTRY_NO }, /* Emoticons */
- {0x1F680, 0x1F6FF, ENTRY_NO }, /* Transport And Map Symbols */
+ {0x1F650, 0x1F67F, ENTRY_NO }, /* Ornamental Dingbats */
+ {0x1F680, 0x1F6FF, ENTRY_NO }, /* Transport and Map Symbols */
{0x1F700, 0x1F77F, ENTRY_NO }, /* Alchemical Symbols */
+ {0x1F780, 0x1F7FF, ENTRY_NO }, /* Geometric Shapes Extended */
+ {0x1F800, 0x1F8FF, ENTRY_NO }, /* Supplemental Arrows-C */
{0x20000, 0x2A6DF, ENTRY_GCJ }, /* CJK Unified Ideographs Extension B */
{0x2A700, 0x2B73F, ENTRY_CJ }, /* CJK Unified Ideographs Extension C */
{0x2B740, 0x2B81F, ENTRY_J }, /* CJK Unified Ideographs Extension D */
diff --git a/Build/source/texk/web2c/uptexdir/ChangeLog b/Build/source/texk/web2c/uptexdir/ChangeLog
index 3ec0a926bc1..9f2a24e617e 100644
--- a/Build/source/texk/web2c/uptexdir/ChangeLog
+++ b/Build/source/texk/web2c/uptexdir/ChangeLog
@@ -1,3 +1,11 @@
+2014-12-29 TANAKA Takuji <ttk@t-lab.opal.ne.jp>
+
+ * uptex-m.ch, kanji.c:
+ Update reference of Unicode blocks to
+ "Blocks-7.0.0.txt Date: 2014-04-03, 23:23:00 GMT [RP, KW]".
+ * uptex-m.ch, upbibtex.ch, updvitype.ch, uppltotf.ch, uptftopl.ch,
+ uptex_version.h: upTeX version u1.20.
+
2014-12-12 Peter Breitenlohner <peb@mppmu.mpg.de>
* uptriptest: Complain early if trip.fmt is not created.
@@ -41,7 +49,7 @@
* tests/[t]min10.{pl,tfm} (new): Data for yokotate.test.
* am/uptex.am: Add the new tests.
-2013-08-12 TANAKA Takuji <KXD02663@nifty.ne.jp>
+2013-08-12 TANAKA Takuji <KXD02663@nifty.ne.jp>
* kanji.h, uptex.defines: Allow file names with 0x5c
in (e)pTeX on Windows.
@@ -86,7 +94,7 @@
PTEX_KANJI_ENC from the environment.
* kanji.c: All programs use init_default_kanji("utf8","uptex").
-2012-08-13 TANAKA Takuji <KXD02663@nifty.ne.jp>
+2012-08-13 TANAKA Takuji <KXD02663@nifty.ne.jp>
* uptex-m.ch, upbibtex.ch, updvitype.ch, uppltotf.ch, uptftopl.ch,
uptex_version.h: upTeX version u1.11.
@@ -126,7 +134,7 @@
2012-04-29 Takuji Tanaka <KXD02663@nifty.ne.jp>
- * uptex-m.ch, uppltotf.ch uptftopl.ch, updvitype.ch, upbibtex.ch:
+ * uptex-m.ch, uppltotf.ch, uptftopl.ch, updvitype.ch, upbibtex.ch:
Update upTeX version number.
* uptex-m.ch, kanji.c:
@@ -149,7 +157,7 @@
2012-01-15 Takuji Tanaka <KXD02663@nifty.ne.jp>
- * uptex-m.ch, uppltotf.ch uptftopl.ch, updvitype.ch, upbibtex.ch:
+ * uptex-m.ch, uppltotf.ch, uptftopl.ch, updvitype.ch, upbibtex.ch:
Update upTeX version number.
* uptex-m.ch, kanji.c:
diff --git a/Build/source/texk/web2c/uptexdir/kanji.c b/Build/source/texk/web2c/uptexdir/kanji.c
index 86d80226832..a8ab7b5938d 100644
--- a/Build/source/texk/web2c/uptexdir/kanji.c
+++ b/Build/source/texk/web2c/uptexdir/kanji.c
@@ -60,8 +60,8 @@ integer calc_pos(integer c)
}
/* Ref. http://www.unicode.org/Public/UNIDATA/Blocks.txt */
-/* # Blocks-6.1.0.txt */
-/* # Date: 2011-06-14, 18:26:00 GMT [KW, LI] */
+/* # Blocks-7.0.0.txt */
+/* # Date: 2014-04-03, 23:23:00 GMT [RP, KW] */
static long ucs_range[]={
0x0000, /* Basic Latin 0x00 */
0x0080, /* Latin-1 Supplement */
@@ -118,168 +118,200 @@ static long ucs_range[]={
0x19E0, /* Khmer Symbols */
0x1A00, /* Buginese */
0x1A20, /* Tai Tham */
- 0x1B00, /* Balinese */
- 0x1B80, /* Sundanese 0x38 */
+ 0x1AB0, /* Combining Diacritical Marks Extended */
+ 0x1B00, /* Balinese 0x38 */
+ 0x1B80, /* Sundanese */
0x1BC0, /* Batak */
0x1C00, /* Lepcha */
0x1C50, /* Ol Chiki */
0x1CC0, /* Sundanese Supplement */
0x1CD0, /* Vedic Extensions */
0x1D00, /* Phonetic Extensions */
- 0x1D80, /* Phonetic Extensions Supplement */
- 0x1DC0, /* Combining Diacritical Marks Supplement 0x40 */
+ 0x1D80, /* Phonetic Extensions Supplement 0x40 */
+ 0x1DC0, /* Combining Diacritical Marks Supplement */
0x1E00, /* Latin Extended Additional */
0x1F00, /* Greek Extended */
0x2000, /* General Punctuation */
0x2070, /* Superscripts and Subscripts */
0x20A0, /* Currency Symbols */
0x20D0, /* Combining Diacritical Marks for Symbols */
- 0x2100, /* Letterlike Symbols */
- 0x2150, /* Number Forms 0x48 */
+ 0x2100, /* Letterlike Symbols 0x48 */
+ 0x2150, /* Number Forms */
0x2190, /* Arrows */
0x2200, /* Mathematical Operators */
0x2300, /* Miscellaneous Technical */
0x2400, /* Control Pictures */
0x2440, /* Optical Character Recognition */
0x2460, /* Enclosed Alphanumerics */
- 0x2500, /* Box Drawing */
- 0x2580, /* Block Elements 0x50 */
+ 0x2500, /* Box Drawing 0x50 */
+ 0x2580, /* Block Elements */
0x25A0, /* Geometric Shapes */
0x2600, /* Miscellaneous Symbols */
0x2700, /* Dingbats */
0x27C0, /* Miscellaneous Mathematical Symbols-A */
0x27F0, /* Supplemental Arrows-A */
0x2800, /* Braille Patterns */
- 0x2900, /* Supplemental Arrows-B */
- 0x2980, /* Miscellaneous Mathematical Symbols-B 0x58 */
+ 0x2900, /* Supplemental Arrows-B 0x58 */
+ 0x2980, /* Miscellaneous Mathematical Symbols-B */
0x2A00, /* Supplemental Mathematical Operators */
0x2B00, /* Miscellaneous Symbols and Arrows */
0x2C00, /* Glagolitic */
0x2C60, /* Latin Extended-C */
0x2C80, /* Coptic */
0x2D00, /* Georgian Supplement */
- 0x2D30, /* Tifinagh */
- 0x2D80, /* Ethiopic Extended 0x60 */
+ 0x2D30, /* Tifinagh 0x60 */
+ 0x2D80, /* Ethiopic Extended */
0x2DE0, /* Cyrillic Extended-A */
0x2E00, /* Supplemental Punctuation */
0x2E80, /* CJK Radicals Supplement */
0x2F00, /* Kangxi Radicals */
0x2FF0, /* Ideographic Description Characters */
0x3000, /* CJK Symbols and Punctuation */
- 0x3040, /* Hiragana */
- 0x30A0, /* Katakana 0x68 */
+ 0x3040, /* Hiragana 0x68 */
+ 0x30A0, /* Katakana */
0x3100, /* Bopomofo */
0x3130, /* Hangul Compatibility Jamo */
0x3190, /* Kanbun */
0x31A0, /* Bopomofo Extended */
0x31C0, /* CJK Strokes */
0x31F0, /* Katakana Phonetic Extensions */
- 0x3200, /* Enclosed CJK Letters and Months */
- 0x3300, /* CJK Compatibility 0x70 */
+ 0x3200, /* Enclosed CJK Letters and Months 0x70 */
+ 0x3300, /* CJK Compatibility */
0x3400, /* CJK Unified Ideographs Extension A */
0x4DC0, /* Yijing Hexagram Symbols */
0x4E00, /* CJK Unified Ideographs */
0xA000, /* Yi Syllables */
0xA490, /* Yi Radicals */
0xA4D0, /* Lisu */
- 0xA500, /* Vai */
- 0xA640, /* Cyrillic Extended-B 0x78 */
+ 0xA500, /* Vai 0x78 */
+ 0xA640, /* Cyrillic Extended-B */
0xA6A0, /* Bamum */
0xA700, /* Modifier Tone Letters */
0xA720, /* Latin Extended-D */
0xA800, /* Syloti Nagri */
0xA830, /* Common Indic Number Forms */
0xA840, /* Phags-pa */
- 0xA880, /* Saurashtra */
- 0xA8E0, /* Devanagari Extended 0x80 */
+ 0xA880, /* Saurashtra 0x80 */
+ 0xA8E0, /* Devanagari Extended */
0xA900, /* Kayah Li */
0xA930, /* Rejang */
0xA960, /* Hangul Jamo Extended-A */
0xA980, /* Javanese */
+ 0xA9E0, /* Myanmar Extended-B */
0xAA00, /* Cham */
- 0xAA60, /* Myanmar Extended-A */
+ 0xAA60, /* Myanmar Extended-A 0x88 */
0xAA80, /* Tai Viet */
- 0xAAE0, /* Meetei Mayek Extensions 0x88 */
+ 0xAAE0, /* Meetei Mayek Extensions */
0xAB00, /* Ethiopic Extended-A */
+ 0xAB30, /* Latin Extended-E */
0xABC0, /* Meetei Mayek */
0xAC00, /* Hangul Syllables */
0xD7B0, /* Hangul Jamo Extended-B */
- 0xD800, /* High Surrogates */
+ 0xD800, /* High Surrogates 0x90 */
0xDB80, /* High Private Use Surrogates */
0xDC00, /* Low Surrogates */
- 0xE000, /* Private Use Area 0x90 */
+ 0xE000, /* Private Use Area */
0xF900, /* CJK Compatibility Ideographs */
0xFB00, /* Alphabetic Presentation Forms */
0xFB50, /* Arabic Presentation Forms-A */
0xFE00, /* Variation Selectors */
- 0xFE10, /* Vertical Forms */
+ 0xFE10, /* Vertical Forms 0x98 */
0xFE20, /* Combining Half Marks */
0xFE30, /* CJK Compatibility Forms */
- 0xFE50, /* Small Form Variants 0x98 */
+ 0xFE50, /* Small Form Variants */
0xFE70, /* Arabic Presentation Forms-B */
0xFF00, /* Halfwidth and Fullwidth Forms */
0xFFF0, /* Specials */
0x10000, /* Linear B Syllabary */
- 0x10080, /* Linear B Ideograms */
+ 0x10080, /* Linear B Ideograms 0xa0 */
0x10100, /* Aegean Numbers */
0x10140, /* Ancient Greek Numbers */
- 0x10190, /* Ancient Symbols 0xa0 */
+ 0x10190, /* Ancient Symbols */
0x101D0, /* Phaistos Disc */
0x10280, /* Lycian */
0x102A0, /* Carian */
- 0x10300, /* Old Italic */
+ 0x102E0, /* Coptic Epact Numbers */
+ 0x10300, /* Old Italic 0xa8 */
0x10330, /* Gothic */
+ 0x10350, /* Old Permic */
0x10380, /* Ugaritic */
0x103A0, /* Old Persian */
- 0x10400, /* Deseret 0xa8 */
+ 0x10400, /* Deseret */
0x10450, /* Shavian */
0x10480, /* Osmanya */
+ 0x10500, /* Elbasan 0xb0 */
+ 0x10530, /* Caucasian Albanian */
+ 0x10600, /* Linear A */
0x10800, /* Cypriot Syllabary */
0x10840, /* Imperial Aramaic */
+ 0x10860, /* Palmyrene */
+ 0x10880, /* Nabataean */
0x10900, /* Phoenician */
- 0x10920, /* Lydian */
+ 0x10920, /* Lydian 0xb8 */
0x10980, /* Meroitic Hieroglyphs */
- 0x109A0, /* Meroitic Cursive 0xb0 */
+ 0x109A0, /* Meroitic Cursive */
0x10A00, /* Kharoshthi */
0x10A60, /* Old South Arabian */
+ 0x10A80, /* Old North Arabian */
+ 0x10AC0, /* Manichaean */
0x10B00, /* Avestan */
- 0x10B40, /* Inscriptional Parthian */
+ 0x10B40, /* Inscriptional Parthian 0xc0 */
0x10B60, /* Inscriptional Pahlavi */
+ 0x10B80, /* Psalter Pahlavi */
0x10C00, /* Old Turkic */
0x10E60, /* Rumi Numeral Symbols */
- 0x11000, /* Brahmi 0xb8 */
+ 0x11000, /* Brahmi */
0x11080, /* Kaithi */
0x110D0, /* Sora Sompeng */
- 0x11100, /* Chakma */
+ 0x11100, /* Chakma 0xc8 */
+ 0x11150, /* Mahajani */
0x11180, /* Sharada */
+ 0x111E0, /* Sinhala Archaic Numbers */
+ 0x11200, /* Khojki */
+ 0x112B0, /* Khudawadi */
+ 0x11300, /* Grantha */
+ 0x11480, /* Tirhuta */
+ 0x11580, /* Siddham 0xd0 */
+ 0x11600, /* Modi */
0x11680, /* Takri */
+ 0x118A0, /* Warang Citi */
+ 0x11AC0, /* Pau Cin Hau */
0x12000, /* Cuneiform */
0x12400, /* Cuneiform Numbers and Punctuation */
- 0x13000, /* Egyptian Hieroglyphs 0xc0 */
- 0x16800, /* Bamum Supplement */
+ 0x13000, /* Egyptian Hieroglyphs */
+ 0x16800, /* Bamum Supplement 0xd8 */
+ 0x16A40, /* Mro */
+ 0x16AD0, /* Bassa Vah */
+ 0x16B00, /* Pahawh Hmong */
0x16F00, /* Miao */
0x1B000, /* Kana Supplement */
- 0x1D000, /* Byzantine Musical Symbols */
+ 0x1BC00, /* Duployan */
+ 0x1BCA0, /* Shorthand Format Controls */
+ 0x1D000, /* Byzantine Musical Symbols 0xe0 */
0x1D100, /* Musical Symbols */
0x1D200, /* Ancient Greek Musical Notation */
0x1D300, /* Tai Xuan Jing Symbols */
- 0x1D360, /* Counting Rod Numerals 0xc8 */
+ 0x1D360, /* Counting Rod Numerals */
0x1D400, /* Mathematical Alphanumeric Symbols */
+ 0x1E800, /* Mende Kikakui */
0x1EE00, /* Arabic Mathematical Alphabetic Symbols */
- 0x1F000, /* Mahjong Tiles */
+ 0x1F000, /* Mahjong Tiles 0xe8 */
0x1F030, /* Domino Tiles */
0x1F0A0, /* Playing Cards */
0x1F100, /* Enclosed Alphanumeric Supplement */
0x1F200, /* Enclosed Ideographic Supplement */
- 0x1F300, /* Miscellaneous Symbols And Pictographs 0xd0 */
+ 0x1F300, /* Miscellaneous Symbols and Pictographs */
0x1F600, /* Emoticons */
- 0x1F680, /* Transport And Map Symbols */
+ 0x1F650, /* Ornamental Dingbats */
+ 0x1F680, /* Transport and Map Symbols 0xf0 */
0x1F700, /* Alchemical Symbols */
+ 0x1F780, /* Geometric Shapes Extended */
+ 0x1F800, /* Supplemental Arrows-C */
0x20000, /* CJK Unified Ideographs Extension B */
0x2A700, /* CJK Unified Ideographs Extension C */
0x2B740, /* CJK Unified Ideographs Extension D */
0x2F800, /* CJK Compatibility Ideographs Supplement */
- 0x30000, /* reserved 0xd8 */
+ 0x30000, /* reserved 0xf8 */
0x40000, /* reserved */
0x50000, /* reserved */
0x60000, /* reserved */
@@ -287,7 +319,7 @@ static long ucs_range[]={
0x80000, /* reserved */
0x90000, /* reserved */
0xA0000, /* reserved */
- 0xB0000, /* reserved 0xe0 */
+ 0xB0000, /* reserved 0x100 */
0xC0000, /* reserved */
0xD0000, /* reserved */
0xE0000, /* Tags */
@@ -297,7 +329,7 @@ static long ucs_range[]={
/* Value over 0x10FFFF is illegal under Unicode,
They are for some special use. *** experimental *** */
0x110000, /* Reserved */
- 0x120000, /* Reserved 0xe8 */
+ 0x120000, /* Reserved 0x108 */
0x130000, /* Reserved */
0x140000, /* Reserved */
0x150000, /* Reserved */
@@ -305,7 +337,7 @@ static long ucs_range[]={
0x170000, /* Reserved */
0x180000, /* Reserved */
0x190000, /* Reserved */
- 0x1A0000, /* Reserved 0xf0 */
+ 0x1A0000, /* Reserved 0x110 */
0x1B0000, /* Reserved */
0x1C0000, /* Reserved */
0x1D0000, /* Reserved */
@@ -313,7 +345,7 @@ static long ucs_range[]={
0x1F0000, /* Reserved */
0x200000, /* Reserved */
0x210000, /* Reserved */
- 0x220000, /* Reserved 0xf8 */
+ 0x220000, /* Reserved 0x118 */
CJK_CHAR_LIMIT
};
@@ -352,10 +384,10 @@ integer kcatcodekey(integer c)
if ( (FULLWIDTH_DIGIT_0 <=c && c<=FULLWIDTH_DIGIT_9 )
|| (FULLWIDTH_CAPITAL_A<=c && c<=FULLWIDTH_CAPITAL_Z)
|| (FULLWIDTH_SMALL_A <=c && c<=FULLWIDTH_SMALL_Z ) )
- return 0xFE;
+ return 0x1FE;
if ( (HALFWIDTH_KATAKANA_WO <=c && c<=HALFWIDTH_KATAKANA_SMALL_TSU )
|| (HALFWIDTH_KATAKANA_A <=c && c<=HALFWIDTH_KATAKANA_N ) )
- return 0xFF;
+ return 0x1FF;
return binary_search((long)c, ucs_range, 0, NUCS_RANGE-1);
} else {
return Hi(toDVI(c));
diff --git a/Build/source/texk/web2c/uptexdir/upbibtex.ch b/Build/source/texk/web2c/uptexdir/upbibtex.ch
index 75649d02b65..07f15d1265f 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.11'
+@d banner=='This is upBibTeX, Version 0.99d-j0.33-u1.20'
@z
@x
diff --git a/Build/source/texk/web2c/uptexdir/updvitype.ch b/Build/source/texk/web2c/uptexdir/updvitype.ch
index 5f58107a935..e260d4d4802 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.11'
+@d banner=='This is upDVItype, Version 3.6-p0.4-u1.20'
@z
@x procedure initialize
diff --git a/Build/source/texk/web2c/uptexdir/uppltotf.ch b/Build/source/texk/web2c/uptexdir/uppltotf.ch
index 6101639b44b..ac3de34738f 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-p1.8'
@y
@d my_name=='uppltotf'
-@d banner=='This is upPLtoTF, Version 3.6-p1.8-u1.11'
+@d banner=='This is upPLtoTF, Version 3.6-p1.8-u1.20'
@z
@x
diff --git a/Build/source/texk/web2c/uptexdir/uptex-m.ch b/Build/source/texk/web2c/uptexdir/uptex-m.ch
index d44fb4cab71..bb6db6c9e8d 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.11
+% This is a change file for upTeX u1.20
% By Takuji Tanaka.
%
% (02/26/2007) TTK upTeX u0.01
@@ -32,16 +32,18 @@
% (01/15/2012) TTK upTeX u1.00
% (04/29/2012) TTK upTeX u1.10
% (08/13/2012) TTK upTeX u1.11
+% (12/29/2014) TTK upTeX u1.20
@x upTeX: banner
{printed when p\TeX\ starts}
@y
{printed when p\TeX\ starts}
@#
-@d upTeX_version_string=='-u1.11' {current up\TeX\ version}
+@d upTeX_version=1
+@d upTeX_revision==".20"
+@d upTeX_version_string=='-u1.20' {current up\TeX\ version}
@#
-@d upTeX_version==pTeX_version_string,upTeX_version_string
-@d upTeX_banner=='This is upTeX, Version 3.14159265',upTeX_version
+@d upTeX_banner=='This is upTeX, Version 3.14159265',pTeX_version_string,upTeX_version_string
@d upTeX_banner_k==upTeX_banner
{printed when up\TeX\ starts}
@z
@@ -189,9 +191,17 @@ if (kcode_pos=1)or((kcode_pos>=@'11)and(kcode_pos<=@'12))
@x
@d cat_code_base=auto_xspacing_code+1
+ {table of 256 command codes (the ``catcodes'')}
+@d kcat_code_base=cat_code_base+256
+ {table of 256 command codes for the wchar's catcodes }
+@d auto_xsp_code_base=kcat_code_base+256 {table of 256 auto spacer flag}
@y
@d enable_cjk_token_code=auto_xspacing_code+1
@d cat_code_base=enable_cjk_token_code+1
+ {table of 256 command codes (the ``catcodes'')}
+@d kcat_code_base=cat_code_base+256
+ {table of 512 command codes for the wchar's catcodes }
+@d auto_xsp_code_base=kcat_code_base+512 {table of 256 auto spacer flag}
@z
@x
@@ -203,9 +213,24 @@ if (kcode_pos=1)or((kcode_pos>=@'11)and(kcode_pos<=@'12))
@x
eqtb[auto_xspacing_code]:=eqtb[cat_code_base];
+for k:=0 to 255 do
+ begin cat_code(k):=other_char; kcat_code(k):=other_kchar;
+ math_code(k):=hi(k); sf_code(k):=1000;
+ auto_xsp_code(k):=0; inhibit_xsp_code(k):=0; inhibit_xsp_type(k):=0;
+ kinsoku_code(k):=0; kinsoku_type(k):=0;
+ end;
@y
eqtb[auto_xspacing_code]:=eqtb[cat_code_base];
eqtb[enable_cjk_token_code]:=eqtb[cat_code_base];
+for k:=0 to 255 do
+ begin cat_code(k):=other_char;
+ math_code(k):=hi(k); sf_code(k):=1000;
+ auto_xsp_code(k):=0; inhibit_xsp_code(k):=0; inhibit_xsp_type(k):=0;
+ kinsoku_code(k):=0; kinsoku_type(k):=0;
+ end;
+for k:=0 to 512 do
+ begin kcat_code(k):=other_kchar;
+ end;
@z
@x
@@ -220,23 +245,23 @@ if (isinternalUPTEX) then begin
{ default: other_kchar }
@t\hskip10pt@>kcat_code(@"0):=not_cjk;
@t\hskip10pt@>kcat_code(@"23):=hangul; { Hangul Jamo }
- @+@t\1@>for k:=@"63 to @"65 do kcat_code(k):=kanji; { CJK Radicals Supplement .. Ideographic Description Characters }
- @+@t\1@>for k:=@"67 to @"68 do kcat_code(k):=kana; { Hiragana, Katakana }
- @t\hskip10pt@>kcat_code(@"69):=kanji; { Bopomofo }
- @t\hskip10pt@>kcat_code(@"6A):=hangul; { Hangul Compatibility Jamo }
- @+@t\1@>for k:=@"6B to @"6D do kcat_code(k):=kanji; { Kanbun .. CJK Strokes }
- @t\hskip10pt@>kcat_code(@"6E):=kana; { Katakana Phonetic Extensions }
- @t\hskip10pt@>kcat_code(@"71):=kanji; { CJK Unified Ideographs Extension A }
- @t\hskip10pt@>kcat_code(@"73):=kanji; { CJK Unified Ideographs }
- @t\hskip10pt@>kcat_code(@"83):=hangul; { Hangul Jamo Extended-A }
- @t\hskip10pt@>kcat_code(@"8B):=hangul; { Hangul Syllables }
- @t\hskip10pt@>kcat_code(@"8C):=hangul; { Hangul Jamo Extended-B }
- @t\hskip10pt@>kcat_code(@"91):=kanji; { CJK Compatibility Ideographs }
- { @t\hskip10pt@>kcat_code(@"9A):=other_kchar; Halfwidth and Fullwidth Forms }
- @t\hskip10pt@>kcat_code(@"C3):=kana; { Kana Supplement }
- @+@t\1@>for k:=@"D4 to @"D7 do kcat_code(k):=kanji; { CJK Unified Ideographs Extension B .. CJK Compatibility Ideographs Supplement }
- @t\hskip10pt@>kcat_code(@"FE):=kana; { Fullwidth digit and latin alphabet }
- @t\hskip10pt@>kcat_code(@"FF):=kana; { Halfwidth katakana }
+ @+@t\1@>for k:=@"64 to @"66 do kcat_code(k):=kanji; { CJK Radicals Supplement .. Ideographic Description Characters }
+ @+@t\1@>for k:=@"68 to @"69 do kcat_code(k):=kana; { Hiragana, Katakana }
+ @t\hskip10pt@>kcat_code(@"6A):=kanji; { Bopomofo }
+ @t\hskip10pt@>kcat_code(@"6B):=hangul; { Hangul Compatibility Jamo }
+ @+@t\1@>for k:=@"6C to @"6E do kcat_code(k):=kanji; { Kanbun .. CJK Strokes }
+ @t\hskip10pt@>kcat_code(@"6F):=kana; { Katakana Phonetic Extensions }
+ @t\hskip10pt@>kcat_code(@"72):=kanji; { CJK Unified Ideographs Extension A }
+ @t\hskip10pt@>kcat_code(@"74):=kanji; { CJK Unified Ideographs }
+ @t\hskip10pt@>kcat_code(@"84):=hangul; { Hangul Jamo Extended-A }
+ @t\hskip10pt@>kcat_code(@"8E):=hangul; { Hangul Syllables }
+ @t\hskip10pt@>kcat_code(@"8F):=hangul; { Hangul Jamo Extended-B }
+ @t\hskip10pt@>kcat_code(@"94):=kanji; { CJK Compatibility Ideographs }
+ { @t\hskip10pt@>kcat_code(@"9D):=other_kchar; Halfwidth and Fullwidth Forms }
+ @t\hskip10pt@>kcat_code(@"DD):=kana; { Kana Supplement }
+ @+@t\1@>for k:=@"F4 to @"F7 do kcat_code(k):=kanji; { CJK Unified Ideographs Extension B .. CJK Compatibility Ideographs Supplement }
+ @t\hskip10pt@>kcat_code(@"1FE):=kana; { Fullwidth digit and latin alphabet }
+ @t\hskip10pt@>kcat_code(@"1FF):=kana; { Halfwidth katakana }
end else begin
@t\hskip10pt@>kcat_code(@"20+1):=other_kchar; {1 ku}
@t\hskip10pt@>kcat_code(@"20+2):=other_kchar; {2 ku}
diff --git a/Build/source/texk/web2c/uptexdir/uptex_version.h b/Build/source/texk/web2c/uptexdir/uptex_version.h
index 88f38325d9d..d45e60fdee0 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.11"
+#define UPTEX_VERSION "u1.20"
diff --git a/Build/source/texk/web2c/uptexdir/uptftopl.ch b/Build/source/texk/web2c/uptexdir/uptftopl.ch
index aa11ef06530..d220f9264ce 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-p1.7'
@y
@d my_name=='uptftopl'
-@d banner=='This is upTFtoPL, Version 3.3-p1.7-u1.11'
+@d banner=='This is upTFtoPL, Version 3.3-p1.7-u1.20'
@z
@x
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-04 06:17:52 +0000