summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakuji Tanaka <KXD02663@nifty.ne.jp>2017-01-15 14:43:50 +0000
committerTakuji Tanaka <KXD02663@nifty.ne.jp>2017-01-15 14:43:50 +0000
commit9125b0edceb34882cee872c928c2e0c195c2bc01 (patch)
tree463124d9465970612b33481549d609c16112ced1
parentd51bd99a92352451a83cc18a178c674f09502f6b (diff)
upTeX 1.22
git-svn-id: svn://tug.org/texlive/trunk@42961 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/makejvf/COPYRIGHT.ja29
-rw-r--r--Build/source/texk/makejvf/COPYRIGHT.jis29
-rw-r--r--Build/source/texk/makejvf/ChangeLog8
-rw-r--r--Build/source/texk/makejvf/main.c2
-rw-r--r--Build/source/texk/makejvf/uniblock.c15
-rw-r--r--Build/source/texk/web2c/uptexdir/COPYRIGHT1
-rw-r--r--Build/source/texk/web2c/uptexdir/COPYRIGHT.ja (renamed from Build/source/texk/web2c/uptexdir/COPYRIGHT.utf8)1
-rw-r--r--Build/source/texk/web2c/uptexdir/ChangeLog12
-rw-r--r--Build/source/texk/web2c/uptexdir/kanji.c133
-rw-r--r--Build/source/texk/web2c/uptexdir/upbibtex.ch5
-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.ch35
-rw-r--r--Build/source/texk/web2c/uptexdir/uptftopl.ch2
14 files changed, 162 insertions, 114 deletions
diff --git a/Build/source/texk/makejvf/COPYRIGHT.ja b/Build/source/texk/makejvf/COPYRIGHT.ja
new file mode 100644
index 00000000000..a67e4db7559
--- /dev/null
+++ b/Build/source/texk/makejvf/COPYRIGHT.ja
@@ -0,0 +1,29 @@
+(注) 以下は日本語の方が分かりやすい人のために、英語の著作権表示を訳し
+た文章である。正式な著作権は、英語の原本に従う。
+
+Copyright (C) 2009 ASCII MEDIA WORKS.
+All rights reserved.
+
+変更の有無にかかわらず、ソースおよびバイナリ形式の再配布および利用は、
+以下の条件を満たしていれば、これを許可する。
+
+1. ソース・コードの再配布は、上記の著作権表示、この条件項目、および、
+以下の免責事項を保存しなければならない。
+
+2. バイナリ形式の再配布は、上記の著作権表示、この条件項目、および、以
+下の免責事項を、その配布に付随する説明書、あるいはその他の資料のいずれ
+かに明記しなければならない。
+
+3. 前もって特別に許諾を得ない限り、このソフトウェアから派生した製品の
+推奨や販売促進のために、この著作権者名を利用してはならない。
+
+このソフトウェアは「このままの形で」提供され、明示的あるいは言外の保証
+は、商用利用および特定目的への適合に対する言外の保証も含み、またこれら
+だけに限らず、存在しない。たとえ以下のような損害の可能性を示唆されてい
+たとしても、どのような形にしろこのソフトウェアの利用から発生した問題に
+おいて、この著作権者は、(代替製品やサービスの調達; 利用権、データ、あ
+るいは利益の損失; あるいは営業の中断を含む、またこれらだけに限らず)直
+接的に、間接的に、偶然に、特別に、懲罰上、あるいは、必然的に生じてしまっ
+た損害に対し責任はなく、いかなる責任理論上でも契約の有無に係わらず厳密
+な責任はなく、また(過失あるいはその他を含む)不法行為に対しても責任はな
+い。
diff --git a/Build/source/texk/makejvf/COPYRIGHT.jis b/Build/source/texk/makejvf/COPYRIGHT.jis
deleted file mode 100644
index b25174a361f..00000000000
--- a/Build/source/texk/makejvf/COPYRIGHT.jis
+++ /dev/null
@@ -1,29 +0,0 @@
-($BCm(B) $B0J2<$OF|K\8l$NJ}$,J,$+$j$d$9$$?M$N$?$a$K!"1Q8l$NCx:n8"I=<($rLu$7(B
-$B$?J8>O$G$"$k!#@5<0$JCx:n8"$O!"1Q8l$N86K\$K=>$&!#(B
-
-Copyright (C) 2009 ASCII MEDIA WORKS.
-All rights reserved.
-
-$BJQ99$NM-L5$K$+$+$o$i$:!"%=!<%9$*$h$S%P%$%J%j7A<0$N:FG[I[$*$h$SMxMQ$O!"(B
-$B0J2<$N>r7o$rK~$?$7$F$$$l$P!"$3$l$r5v2D$9$k!#(B
-
-1. $B%=!<%9!&%3!<%I$N:FG[I[$O!">e5-$NCx:n8"I=<(!"$3$N>r7o9`L\!"$*$h$S!"(B
-$B0J2<$NLH@U;v9`$rJ]B8$7$J$1$l$P$J$i$J$$!#(B
-
-2. $B%P%$%J%j7A<0$N:FG[I[$O!">e5-$NCx:n8"I=<(!"$3$N>r7o9`L\!"$*$h$S!"0J(B
-$B2<$NLH@U;v9`$r!"$=$NG[I[$KIU?o$9$k@bL@=q!"$"$k$$$O$=$NB>$N;qNA$N$$$:$l(B
-$B$+$KL@5-$7$J$1$l$P$J$i$J$$!#(B
-
-3. $BA0$b$C$FFCJL$K5vBz$rF@$J$$8B$j!"$3$N%=%U%H%&%'%"$+$iGI@8$7$?@=IJ$N(B
-$B?d>)$dHNGdB%?J$N$?$a$K!"$3$NCx:n8"<TL>$rMxMQ$7$F$O$J$i$J$$!#(B
-
-$B$3$N%=%U%H%&%'%"$O!V$3$N$^$^$N7A$G!WDs6!$5$l!"L@<(E*$"$k$$$O8@30$NJ]>Z(B
-$B$O!">&MQMxMQ$*$h$SFCDjL\E*$X$NE,9g$KBP$9$k8@30$NJ]>Z$b4^$_!"$^$?$3$l$i(B
-$B$@$1$K8B$i$:!"B8:_$7$J$$!#$?$H$(0J2<$N$h$&$JB;32$N2DG=@-$r<(:6$5$l$F$$(B
-$B$?$H$7$F$b!"$I$N$h$&$J7A$K$7$m$3$N%=%U%H%&%'%"$NMxMQ$+$iH/@8$7$?LdBj$K(B
-$B$*$$$F!"$3$NCx:n8"<T$O!"(B($BBeBX@=IJ$d%5!<%S%9$ND4C#(B; $BMxMQ8"!"%G!<%?!"$"(B
-$B$k$$$OMx1W$NB;<:(B; $B$"$k$$$O1D6H$NCfCG$r4^$`!"$^$?$3$l$i$@$1$K8B$i$:(B)$BD>(B
-$B@\E*$K!"4V@\E*$K!"6vA3$K!"FCJL$K!"D(H3>e!"$"$k$$$O!"I,A3E*$K@8$8$F$7$^$C(B
-$B$?B;32$KBP$7@UG$$O$J$/!"$$$+$J$k@UG$M}O@>e$G$b7@Ls$NM-L5$K78$o$i$:87L)(B
-$B$J@UG$$O$J$/!"$^$?(B($B2a<:$"$k$$$O$=$NB>$r4^$`(B)$BITK!9T0Y$KBP$7$F$b@UG$$O$J(B
-$B$$!#(B
diff --git a/Build/source/texk/makejvf/ChangeLog b/Build/source/texk/makejvf/ChangeLog
index d8e51c730bf..3ae19d42e95 100644
--- a/Build/source/texk/makejvf/ChangeLog
+++ b/Build/source/texk/makejvf/ChangeLog
@@ -1,3 +1,11 @@
+2017-01-15 TANAKA Takuji <ttk@t-lab.opal.ne.jp>
+
+ Update for upTeX-1.22.
+ * uniblock.c: Update references Unicode blocks Blocks-9.0.0.txt.
+ * main.c: Update version number.
+ * COPYRIGHT.ja: Rename from COPYRIGHT.jis and convert
+ encoding to UTF-8
+
2016-12-16 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
New file makejvf.1.
diff --git a/Build/source/texk/makejvf/main.c b/Build/source/texk/makejvf/main.c
index d87e49dcce9..f72fb380255 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.21 -- make Japanese VF file.\n", stderr);
+ fputs2("MAKEJVF ver.1.1a-u1.22 -- 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 00276115a11..ae916001816 100644
--- a/Build/source/texk/makejvf/uniblock.c
+++ b/Build/source/texk/makejvf/uniblock.c
@@ -12,8 +12,8 @@ struct ublock {
/*
References:
[1] http://www.unicode.org/Public/UNIDATA/Blocks.txt
- Blocks-8.0.0.txt
- Date: 2014-11-10, 23:04:00 GMT [KW]
+ Blocks-9.0.0.txt
+ Date: 2016-02-05, 23:48:00 GMT [KW]
[2] CMap files
https://github.com/adobe-type-tools/cmap-resources/
cmapresources_cns1-6/ Adobe-CNS1-6 materials
@@ -88,6 +88,7 @@ static struct ublock ublock_data[] = {
{0x1BC0, 0x1BFF, ENTRY_NO }, /* Batak */
{0x1C00, 0x1C4F, ENTRY_NO }, /* Lepcha */
{0x1C50, 0x1C7F, ENTRY_NO }, /* Ol Chiki */
+ {0x1C80, 0x1C8F, ENTRY_NO }, /* Cyrillic Extended-C */
{0x1CC0, 0x1CCF, ENTRY_NO }, /* Sundanese Supplement */
{0x1CD0, 0x1CFF, ENTRY_NO }, /* Vedic Extensions */
{0x1D00, 0x1D7F, ENTRY_NO }, /* Phonetic Extensions */
@@ -204,6 +205,7 @@ static struct ublock ublock_data[] = {
{0x10400, 0x1044F, ENTRY_NO }, /* Deseret */
{0x10450, 0x1047F, ENTRY_NO }, /* Shavian */
{0x10480, 0x104AF, ENTRY_NO }, /* Osmanya */
+ {0x104B0, 0x104FF, ENTRY_NO }, /* Osage */
{0x10500, 0x1052F, ENTRY_NO }, /* Elbasan */
{0x10530, 0x1056F, ENTRY_NO }, /* Caucasian Albanian */
{0x10600, 0x1077F, ENTRY_NO }, /* Linear A */
@@ -238,13 +240,17 @@ static struct ublock ublock_data[] = {
{0x11280, 0x112AF, ENTRY_NO }, /* Multani */
{0x112B0, 0x112FF, ENTRY_NO }, /* Khudawadi */
{0x11300, 0x1137F, ENTRY_NO }, /* Grantha */
+ {0x11400, 0x1147F, ENTRY_NO }, /* Newa */
{0x11480, 0x114DF, ENTRY_NO }, /* Tirhuta */
{0x11580, 0x115FF, ENTRY_NO }, /* Siddham */
{0x11600, 0x1165F, ENTRY_NO }, /* Modi */
+ {0x11660, 0x1167F, ENTRY_NO }, /* Mongolian Supplement */
{0x11680, 0x116CF, ENTRY_NO }, /* Takri */
{0x11700, 0x1173F, ENTRY_NO }, /* Ahom */
{0x118A0, 0x118FF, ENTRY_NO }, /* Warang Citi */
{0x11AC0, 0x11AFF, ENTRY_NO }, /* Pau Cin Hau */
+ {0x11C00, 0x11C6F, ENTRY_NO }, /* Bhaiksuki */
+ {0x11C70, 0x11CBF, ENTRY_NO }, /* Marchen */
{0x12000, 0x123FF, ENTRY_NO }, /* Cuneiform */
{0x12400, 0x1247F, ENTRY_NO }, /* Cuneiform Numbers and Punctuation */
{0x12480, 0x1254F, ENTRY_NO }, /* Early Dynastic Cuneiform */
@@ -255,6 +261,9 @@ static struct ublock ublock_data[] = {
{0x16AD0, 0x16AFF, ENTRY_NO }, /* Bassa Vah */
{0x16B00, 0x16B8F, ENTRY_NO }, /* Pahawh Hmong */
{0x16F00, 0x16F9F, ENTRY_NO }, /* Miao */
+ {0x16FE0, 0x16FFF, ENTRY_NO }, /* Ideographic Symbols and Punctuation */
+ {0x17000, 0x187FF, ENTRY_NO }, /* Tangut */
+ {0x18800, 0x18AFF, ENTRY_NO }, /* Tangut Components */
{0x1B000, 0x1B0FF, ENTRY_NO }, /* Kana Supplement */
{0x1BC00, 0x1BC9F, ENTRY_NO }, /* Duployan */
{0x1BCA0, 0x1BCAF, ENTRY_NO }, /* Shorthand Format Controls */
@@ -265,7 +274,9 @@ static struct ublock ublock_data[] = {
{0x1D360, 0x1D37F, ENTRY_NO }, /* Counting Rod Numerals */
{0x1D400, 0x1D7FF, ENTRY_NO }, /* Mathematical Alphanumeric Symbols */
{0x1D800, 0x1DAAF, ENTRY_NO }, /* Sutton SignWriting */
+ {0x1E000, 0x1E02F, ENTRY_NO }, /* Glagolitic Supplement */
{0x1E800, 0x1E8DF, ENTRY_NO }, /* Mende Kikakui */
+ {0x1E900, 0x1E95F, ENTRY_NO }, /* Adlam */
{0x1EE00, 0x1EEFF, ENTRY_NO }, /* Arabic Mathematical Alphabetic Symbols */
{0x1F000, 0x1F02F, ENTRY_NO }, /* Mahjong Tiles */
{0x1F030, 0x1F09F, ENTRY_NO }, /* Domino Tiles */
diff --git a/Build/source/texk/web2c/uptexdir/COPYRIGHT b/Build/source/texk/web2c/uptexdir/COPYRIGHT
index 9f2495ecb04..dcfb498ed86 100644
--- a/Build/source/texk/web2c/uptexdir/COPYRIGHT
+++ b/Build/source/texk/web2c/uptexdir/COPYRIGHT
@@ -1,4 +1,5 @@
Copyright (C) 2009 ASCII MEDIA WORKS.
+Copyright (C) 2007-2017 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.utf8 b/Build/source/texk/web2c/uptexdir/COPYRIGHT.ja
index a64ca407e69..914f30f76c2 100644
--- a/Build/source/texk/web2c/uptexdir/COPYRIGHT.utf8
+++ b/Build/source/texk/web2c/uptexdir/COPYRIGHT.ja
@@ -4,6 +4,7 @@
【著作権表示】
Copyright (C) 2009 ASCII MEDIA WORKS.
+Copyright (C) 2007-2017 Takuji Tanaka
All rights reserved.
【契約条件】
diff --git a/Build/source/texk/web2c/uptexdir/ChangeLog b/Build/source/texk/web2c/uptexdir/ChangeLog
index 2fb54ed2eab..ae7fa2fad74 100644
--- a/Build/source/texk/web2c/uptexdir/ChangeLog
+++ b/Build/source/texk/web2c/uptexdir/ChangeLog
@@ -1,4 +1,16 @@
+2017-01-15 TANAKA Takuji <ttk@t-lab.opal.ne.jp>
+
+ * uptex-m.ch, kanji.c:
+ Update reference of Unicode blocks to
+ "Blocks-9.0.0.txt Date: 2016-02-05, 23:48:00 GMT [KW]".
+ * uptex-m.ch, upbibtex.ch, updvitype.ch, uppltotf.ch, uptftopl.ch,
+ uptex_version.h: upTeX version u1.22.
+ * COPYRIGHT, COPYRIGHT.ja:
+ Update copyright name and year.
+ Rename from COPYRIGHT.utf8 to COPYRIGHT.ja.
+
2017-01-14 TANAKA Takuji <ttk@t-lab.opal.ne.jp>
+
* upbibtex.ch, kanji.h: Fix bug on "substring$".
Thanks to Takeda Shiro san.
diff --git a/Build/source/texk/web2c/uptexdir/kanji.c b/Build/source/texk/web2c/uptexdir/kanji.c
index 834155846b5..271577ef1f6 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-8.0.0.txt */
-/* # Date: 2014-11-10, 23:04:00 GMT [KW] */
+/* # Blocks-9.0.0.txt */
+/* # Date: 2016-02-05, 23:48:00 GMT [KW] */
static long ucs_range[]={
0x0000, /* Basic Latin */ /* 0x00 */
0x0080, /* Latin-1 Supplement */
@@ -124,236 +124,247 @@ static long ucs_range[]={
0x1BC0, /* Batak */
0x1C00, /* Lepcha */
0x1C50, /* Ol Chiki */
+ 0x1C80, /* Cyrillic Extended-C */
0x1CC0, /* Sundanese Supplement */
0x1CD0, /* Vedic Extensions */
- 0x1D00, /* Phonetic Extensions */
- 0x1D80, /* Phonetic Extensions Supplement */ /* 0x40 */
+ 0x1D00, /* Phonetic Extensions */ /* 0x40 */
+ 0x1D80, /* Phonetic Extensions Supplement */
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 */ /* 0x48 */
+ 0x20D0, /* Combining Diacritical Marks for Symbols */ /* 0x48 */
+ 0x2100, /* Letterlike Symbols */
0x2150, /* Number Forms */
0x2190, /* Arrows */
0x2200, /* Mathematical Operators */
0x2300, /* Miscellaneous Technical */
0x2400, /* Control Pictures */
0x2440, /* Optical Character Recognition */
- 0x2460, /* Enclosed Alphanumerics */
- 0x2500, /* Box Drawing */ /* 0x50 */
+ 0x2460, /* Enclosed Alphanumerics */ /* 0x50 */
+ 0x2500, /* Box Drawing */
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 */ /* 0x58 */
+ 0x2800, /* Braille Patterns */ /* 0x58 */
+ 0x2900, /* Supplemental Arrows-B */
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 */ /* 0x60 */
+ 0x2D00, /* Georgian Supplement */ /* 0x60 */
+ 0x2D30, /* Tifinagh */
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 */ /* 0x68 */
+ 0x3000, /* CJK Symbols and Punctuation */ /* 0x68 */
+ 0x3040, /* Hiragana */
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 */ /* 0x70 */
+ 0x31F0, /* Katakana Phonetic Extensions */ /* 0x70 */
+ 0x3200, /* Enclosed CJK Letters and Months */
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 */ /* 0x78 */
+ 0xA4D0, /* Lisu */ /* 0x78 */
+ 0xA500, /* Vai */
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 */ /* 0x80 */
+ 0xA840, /* Phags-pa */ /* 0x80 */
+ 0xA880, /* Saurashtra */
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 */ /* 0x88 */
+ 0xAA00, /* Cham */ /* 0x88 */
+ 0xAA60, /* Myanmar Extended-A */
0xAA80, /* Tai Viet */
0xAAE0, /* Meetei Mayek Extensions */
0xAB00, /* Ethiopic Extended-A */
0xAB30, /* Latin Extended-E */
0xAB70, /* Cherokee Supplement */
0xABC0, /* Meetei Mayek */
- 0xAC00, /* Hangul Syllables */
- 0xD7B0, /* Hangul Jamo Extended-B */ /* 0x90 */
+ 0xAC00, /* Hangul Syllables */ /* 0x90 */
+ 0xD7B0, /* Hangul Jamo Extended-B */
0xD800, /* High Surrogates */
0xDB80, /* High Private Use Surrogates */
0xDC00, /* Low Surrogates */
0xE000, /* Private Use Area */
0xF900, /* CJK Compatibility Ideographs */
0xFB00, /* Alphabetic Presentation Forms */
- 0xFB50, /* Arabic Presentation Forms-A */
- 0xFE00, /* Variation Selectors */ /* 0x98 */
+ 0xFB50, /* Arabic Presentation Forms-A */ /* 0x98 */
+ 0xFE00, /* Variation Selectors */
0xFE10, /* Vertical Forms */
0xFE20, /* Combining Half Marks */
0xFE30, /* CJK Compatibility Forms */
0xFE50, /* Small Form Variants */
0xFE70, /* Arabic Presentation Forms-B */
0xFF00, /* Halfwidth and Fullwidth Forms */
- 0xFFF0, /* Specials */
- 0x10000, /* Linear B Syllabary */ /* 0xa0 */
+ 0xFFF0, /* Specials */ /* 0xa0 */
+ 0x10000, /* Linear B Syllabary */
0x10080, /* Linear B Ideograms */
0x10100, /* Aegean Numbers */
0x10140, /* Ancient Greek Numbers */
0x10190, /* Ancient Symbols */
0x101D0, /* Phaistos Disc */
0x10280, /* Lycian */
- 0x102A0, /* Carian */
- 0x102E0, /* Coptic Epact Numbers */ /* 0xa8 */
+ 0x102A0, /* Carian */ /* 0xa8 */
+ 0x102E0, /* Coptic Epact Numbers */
0x10300, /* Old Italic */
0x10330, /* Gothic */
0x10350, /* Old Permic */
0x10380, /* Ugaritic */
0x103A0, /* Old Persian */
0x10400, /* Deseret */
- 0x10450, /* Shavian */
- 0x10480, /* Osmanya */ /* 0xb0 */
+ 0x10450, /* Shavian */ /* 0xb0 */
+ 0x10480, /* Osmanya */
+ 0x104B0, /* Osage */
0x10500, /* Elbasan */
0x10530, /* Caucasian Albanian */
0x10600, /* Linear A */
0x10800, /* Cypriot Syllabary */
0x10840, /* Imperial Aramaic */
- 0x10860, /* Palmyrene */
+ 0x10860, /* Palmyrene */ /* 0xb8 */
0x10880, /* Nabataean */
- 0x108E0, /* Hatran */ /* 0xb8 */
+ 0x108E0, /* Hatran */
0x10900, /* Phoenician */
0x10920, /* Lydian */
0x10980, /* Meroitic Hieroglyphs */
0x109A0, /* Meroitic Cursive */
0x10A00, /* Kharoshthi */
- 0x10A60, /* Old South Arabian */
+ 0x10A60, /* Old South Arabian */ /* 0xc0 */
0x10A80, /* Old North Arabian */
- 0x10AC0, /* Manichaean */ /* 0xc0 */
+ 0x10AC0, /* Manichaean */
0x10B00, /* Avestan */
0x10B40, /* Inscriptional Parthian */
0x10B60, /* Inscriptional Pahlavi */
0x10B80, /* Psalter Pahlavi */
0x10C00, /* Old Turkic */
- 0x10C80, /* Old Hungarian */
+ 0x10C80, /* Old Hungarian */ /* 0xc8 */
0x10E60, /* Rumi Numeral Symbols */
- 0x11000, /* Brahmi */ /* 0xc8 */
+ 0x11000, /* Brahmi */
0x11080, /* Kaithi */
0x110D0, /* Sora Sompeng */
0x11100, /* Chakma */
0x11150, /* Mahajani */
0x11180, /* Sharada */
- 0x111E0, /* Sinhala Archaic Numbers */
+ 0x111E0, /* Sinhala Archaic Numbers */ /* 0xd0 */
0x11200, /* Khojki */
- 0x11280, /* Multani */ /* 0xd0 */
+ 0x11280, /* Multani */
0x112B0, /* Khudawadi */
0x11300, /* Grantha */
+ 0x11400, /* Newa */
0x11480, /* Tirhuta */
0x11580, /* Siddham */
- 0x11600, /* Modi */
+ 0x11600, /* Modi */ /* 0xd8 */
+ 0x11660, /* Mongolian Supplement */
0x11680, /* Takri */
0x11700, /* Ahom */
- 0x118A0, /* Warang Citi */ /* 0xd8 */
+ 0x118A0, /* Warang Citi */
0x11AC0, /* Pau Cin Hau */
- 0x12000, /* Cuneiform */
+ 0x11C00, /* Bhaiksuki */
+ 0x11C70, /* Marchen */
+ 0x12000, /* Cuneiform */ /* 0xe0 */
0x12400, /* Cuneiform Numbers and Punctuation */
0x12480, /* Early Dynastic Cuneiform */
0x13000, /* Egyptian Hieroglyphs */
0x14400, /* Anatolian Hieroglyphs */
0x16800, /* Bamum Supplement */
- 0x16A40, /* Mro */ /* 0xe0 */
+ 0x16A40, /* Mro */
0x16AD0, /* Bassa Vah */
- 0x16B00, /* Pahawh Hmong */
+ 0x16B00, /* Pahawh Hmong */ /* 0xe8 */
0x16F00, /* Miao */
+ 0x16FE0, /* Ideographic Symbols and Punctuation */
+ 0x17000, /* Tangut */
+ 0x18800, /* Tangut Components */
0x1B000, /* Kana Supplement */
0x1BC00, /* Duployan */
0x1BCA0, /* Shorthand Format Controls */
- 0x1D000, /* Byzantine Musical Symbols */
- 0x1D100, /* Musical Symbols */ /* 0xe8 */
+ 0x1D000, /* Byzantine Musical Symbols */ /* 0xf0 */
+ 0x1D100, /* Musical Symbols */
0x1D200, /* Ancient Greek Musical Notation */
0x1D300, /* Tai Xuan Jing Symbols */
0x1D360, /* Counting Rod Numerals */
0x1D400, /* Mathematical Alphanumeric Symbols */
0x1D800, /* Sutton SignWriting */
- 0x1E800, /* Mende Kikakui */
+ 0x1E000, /* Glagolitic Supplement */
+ 0x1E800, /* Mende Kikakui */ /* 0xf8 */
+ 0x1E900, /* Adlam */
0x1EE00, /* Arabic Mathematical Alphabetic Symbols */
- 0x1F000, /* Mahjong Tiles */ /* 0xf0 */
+ 0x1F000, /* Mahjong Tiles */
0x1F030, /* Domino Tiles */
0x1F0A0, /* Playing Cards */
0x1F100, /* Enclosed Alphanumeric Supplement */
0x1F200, /* Enclosed Ideographic Supplement */
- 0x1F300, /* Miscellaneous Symbols and Pictographs */
+ 0x1F300, /* Miscellaneous Symbols and Pictographs */ /* 0x100 */
0x1F600, /* Emoticons */
0x1F650, /* Ornamental Dingbats */
- 0x1F680, /* Transport and Map Symbols */ /* 0xf8 */
+ 0x1F680, /* Transport and Map Symbols */
0x1F700, /* Alchemical Symbols */
0x1F780, /* Geometric Shapes Extended */
0x1F800, /* Supplemental Arrows-C */
0x1F900, /* Supplemental Symbols and Pictographs */
- 0x20000, /* CJK Unified Ideographs Extension B */
+ 0x20000, /* CJK Unified Ideographs Extension B */ /* 0x108 */
0x2A700, /* CJK Unified Ideographs Extension C */
0x2B740, /* CJK Unified Ideographs Extension D */
- 0x2B820, /* CJK Unified Ideographs Extension E */ /* 0x100 */
+ 0x2B820, /* CJK Unified Ideographs Extension E */
0x2F800, /* CJK Compatibility Ideographs Supplement */
0x30000, /* reserved */
0x40000, /* reserved */
0x50000, /* reserved */
- 0x60000, /* reserved */
+ 0x60000, /* reserved */ /* 0x110 */
0x70000, /* reserved */
0x80000, /* reserved */
- 0x90000, /* reserved */ /* 0x108 */
+ 0x90000, /* reserved */
0xA0000, /* reserved */
0xB0000, /* reserved */
0xC0000, /* reserved */
0xD0000, /* reserved */
- 0xE0000, /* Tags */
+ 0xE0000, /* Tags */ /* 0x118 */
0xE0100, /* Variation Selectors Supplement */
0xF0000, /* Supplementary Private Use Area-A */
- 0x100000, /* Supplementary Private Use Area-B */ /* 0x110 */
+ 0x100000, /* Supplementary Private Use Area-B */
/* Value over 0x10FFFF is illegal under Unicode,
They are for some special use. *** experimental *** */
0x110000, /* Reserved */
0x120000, /* Reserved */
0x130000, /* Reserved */
0x140000, /* Reserved */
- 0x150000, /* Reserved */
+ 0x150000, /* Reserved */ /* 0x120 */
0x160000, /* Reserved */
0x170000, /* Reserved */
- 0x180000, /* Reserved */ /* 0x118 */
+ 0x180000, /* Reserved */
0x190000, /* Reserved */
0x1A0000, /* Reserved */
0x1B0000, /* Reserved */
0x1C0000, /* Reserved */
- 0x1D0000, /* Reserved */
+ 0x1D0000, /* Reserved */ /* 0x128 */
0x1E0000, /* Reserved */
0x1F0000, /* Reserved */
- 0x200000, /* Reserved */ /* 0x120 */
+ 0x200000, /* Reserved */
0x210000, /* Reserved */
0x220000, /* Reserved */
CJK_CHAR_LIMIT
diff --git a/Build/source/texk/web2c/uptexdir/upbibtex.ch b/Build/source/texk/web2c/uptexdir/upbibtex.ch
index e582e7d69c8..cdd750e9539 100644
--- a/Build/source/texk/web2c/uptexdir/upbibtex.ch
+++ b/Build/source/texk/web2c/uptexdir/upbibtex.ch
@@ -305,7 +305,10 @@ end;
append_char (str_pool[sp_ptr+2]);
if multibytelen(str_pool[sp_ptr]) > 3 then
append_char (str_pool[sp_ptr+3]);
- sp_ptr := sp_ptr + multibytelen(str_pool[sp_ptr])
+ if multibytelen(str_pool[sp_ptr]) > 0 then
+ sp_ptr := sp_ptr + multibytelen(str_pool[sp_ptr])
+ else
+ incr(sp_ptr);
@z
@x
diff --git a/Build/source/texk/web2c/uptexdir/updvitype.ch b/Build/source/texk/web2c/uptexdir/updvitype.ch
index 879d0c2a204..f6a5de7b5a9 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.21'
+@d banner=='This is upDVItype, Version 3.6-p0.4-u1.22'
@z
@x procedure initialize
diff --git a/Build/source/texk/web2c/uptexdir/uppltotf.ch b/Build/source/texk/web2c/uptexdir/uppltotf.ch
index da75935c540..97f833c10b0 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.21'
+@d banner=='This is upPLtoTF, Version 3.6-p1.8-u1.22'
@z
@x
diff --git a/Build/source/texk/web2c/uptexdir/uptex-m.ch b/Build/source/texk/web2c/uptexdir/uptex-m.ch
index d77d4b51515..2bb562ad993 100644
--- a/Build/source/texk/web2c/uptexdir/uptex-m.ch
+++ b/Build/source/texk/web2c/uptexdir/uptex-m.ch
@@ -34,6 +34,7 @@
% (08/13/2012) TTK upTeX u1.11
% (12/29/2014) TTK upTeX u1.20
% (02/20/2016) TTK upTeX u1.21
+% (01/15/2017) TTK upTeX u1.22
@x upTeX: banner
{printed when p\TeX\ starts}
@@ -41,8 +42,8 @@
{printed when p\TeX\ starts}
@#
@d upTeX_version=1
-@d upTeX_revision==".21"
-@d upTeX_version_string=='-u1.21' {current up\TeX\ version}
+@d upTeX_revision==".22"
+@d upTeX_version_string=='-u1.22' {current up\TeX\ version}
@#
@d upTeX_banner=='This is upTeX, Version 3.14159265',pTeX_version_string,upTeX_version_string
@d upTeX_banner_k==upTeX_banner
@@ -246,21 +247,21 @@ 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:=@"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(@"8F):=hangul; { Hangul Syllables }
- @t\hskip10pt@>kcat_code(@"90):=hangul; { Hangul Jamo Extended-B }
- @t\hskip10pt@>kcat_code(@"95):=kanji; { CJK Compatibility Ideographs }
- { @t\hskip10pt@>kcat_code(@"9E):=other_kchar; Halfwidth and Fullwidth Forms }
- @t\hskip10pt@>kcat_code(@"E4):=kana; { Kana Supplement }
- @+@t\1@>for k:=@"FD to @"101 do kcat_code(k):=kanji; { CJK Unified Ideographs Extension B .. CJK Compatibility Ideographs Supplement }
+ @+@t\1@>for k:=@"65 to @"67 do kcat_code(k):=kanji; { CJK Radicals Supplement .. Ideographic Description Characters }
+ @+@t\1@>for k:=@"69 to @"6A do kcat_code(k):=kana; { Hiragana, Katakana }
+ @t\hskip10pt@>kcat_code(@"6B):=kanji; { Bopomofo }
+ @t\hskip10pt@>kcat_code(@"6C):=hangul; { Hangul Compatibility Jamo }
+ @+@t\1@>for k:=@"6D to @"6F do kcat_code(k):=kanji; { Kanbun .. CJK Strokes }
+ @t\hskip10pt@>kcat_code(@"70):=kana; { Katakana Phonetic Extensions }
+ @t\hskip10pt@>kcat_code(@"73):=kanji; { CJK Unified Ideographs Extension A }
+ @t\hskip10pt@>kcat_code(@"75):=kanji; { CJK Unified Ideographs }
+ @t\hskip10pt@>kcat_code(@"85):=hangul; { Hangul Jamo Extended-A }
+ @t\hskip10pt@>kcat_code(@"90):=hangul; { Hangul Syllables }
+ @t\hskip10pt@>kcat_code(@"91):=hangul; { Hangul Jamo Extended-B }
+ @t\hskip10pt@>kcat_code(@"96):=kanji; { CJK Compatibility Ideographs }
+ { @t\hskip10pt@>kcat_code(@"9F):=other_kchar; Halfwidth and Fullwidth Forms }
+ @t\hskip10pt@>kcat_code(@"ED):=kana; { Kana Supplement }
+ @+@t\1@>for k:=@"108 to @"10C 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
diff --git a/Build/source/texk/web2c/uptexdir/uptftopl.ch b/Build/source/texk/web2c/uptexdir/uptftopl.ch
index 9c199d8fc56..d18042a40f7 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.21'
+@d banner=='This is upTFtoPL, Version 3.3-p1.7-u1.22'
@z
@x