From 2984459ee6d040b1ffcd4433ac7cf3897ae76baa Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Mon, 30 Apr 2012 09:18:33 +0000 Subject: uptex 1.10 from Takuji Tanaka git-svn-id: svn://tug.org/texlive/trunk@26161 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/makejvf/ChangeLog | 7 + Build/source/texk/makejvf/main.c | 10 +- Build/source/texk/makejvf/uniblock.c | 28 +- Build/source/texk/web2c/uptexdir/ChangeLog | 9 + Build/source/texk/web2c/uptexdir/kanji.c | 485 +++++++++++---------- Build/source/texk/web2c/uptexdir/upbibtex.ch | 2 +- Build/source/texk/web2c/uptexdir/updvitype.ch | 2 +- Build/source/texk/web2c/uptexdir/uppltotf.ch | 2 +- Build/source/texk/web2c/uptexdir/uptex-m.ch | 37 +- Build/source/texk/web2c/uptexdir/uptftopl.ch | 2 +- .../source/texk/web2c/uptexdir/uptrip/uptrip.diffs | 6 +- 11 files changed, 315 insertions(+), 275 deletions(-) (limited to 'Build/source') diff --git a/Build/source/texk/makejvf/ChangeLog b/Build/source/texk/makejvf/ChangeLog index 3eb5c97054b..efed187974d 100644 --- a/Build/source/texk/makejvf/ChangeLog +++ b/Build/source/texk/makejvf/ChangeLog @@ -1,3 +1,10 @@ +2012-04-29 + + Update for upTeX-1.10. From TANAKA Takuji . + * uniblock.c: Update references Unicode blocks Blocks-6.1.0.txt + and CMap files. + * main.c: Update version number. Revise help messages. + 2012-01-17 Akira Kakuto * write.c: binary write mode for tfm and vf on Windows. diff --git a/Build/source/texk/makejvf/main.c b/Build/source/texk/makejvf/main.c index 60cb5a73446..8d15148dd9f 100644 --- a/Build/source/texk/makejvf/main.c +++ b/Build/source/texk/makejvf/main.c @@ -174,9 +174,9 @@ int main(int argc, char ** argv) if (ucs) { ib=0; - for (i=0;i<(useset3+1);i++) + for (i=0;i<(useset3*2+1);i++) for (j=0;j<65536;j++) { - ch=i*2*65536+j; + ch=i*65536+j; if (search_cjk_entry(&ib,ch,ucs)) writevfu(ch,vfp); } @@ -193,7 +193,7 @@ int main(int argc, char ** argv) void usage(void) { - fputs2("MAKEJVF ver.1.1a-u1.00 -- make Japanese VF file.\n", stderr); + fputs2("MAKEJVF ver.1.1a-u1.10 -- make Japanese VF file.\n", stderr); fputs2("%% makejvf [] \n", stderr); fputs2("options:\n", stderr); fputs2("-C 長体モード\n", stderr); @@ -208,8 +208,8 @@ void usage(void) fputs2("-u UCS mode\n", stderr); fputs2(" gb : GB, cns : CNS, ks : KS\n", stderr); fputs2(" jis : JIS, jisq : JIS quote only\n", stderr); - fputs2("-J JIS encoded PS font TFM name for quote, double quote with UCS mode\n", stderr); - fputs2("-U UCS encoded PS font TFM name for quote, double quote with UCS mode\n", stderr); + fputs2("-J JIS encoded PS font TFM name for quote, double quote (with UCS mode)\n", stderr); + fputs2("-U UCS encoded PS font TFM name for quote, double quote (with UCS mode)\n", stderr); fputs2("-3 use set3 (with UCS mode)\n", stderr); fputs2("-H use half-width katakana (with UCS mode)\n", stderr); fputs2("-i font ID from No.0\n", stderr); diff --git a/Build/source/texk/makejvf/uniblock.c b/Build/source/texk/makejvf/uniblock.c index eba1434bc1a..d424cf624d1 100644 --- a/Build/source/texk/makejvf/uniblock.c +++ b/Build/source/texk/makejvf/uniblock.c @@ -12,17 +12,18 @@ struct ublock { /* References: [1] http://www.unicode.org/Public/UNIDATA/Blocks.txt - Date: 2010-06-04, 11:12:00 PDT [KW] + Blocks-6.1.0.txt + Date: 2011-06-14, 18:26:00 GMT [KW, LI] [2] CMap files - http://opensource.adobe.com/wiki/display/cmap/ + http://sourceforge.net/adobe/cmap/home/Home/ cmapresources_cns1-6.tar.z Adobe-CNS1-6 materials - cid2code.txt (Version 04/13/2010) + cid2code.txt (Version 10/25/2010) cmapresources_gb1-5.tar.z Adobe-GB1-5 materials - cid2code.txt (Version 04/13/2010) + cid2code.txt (Version 10/29/2010) cmapresources_japan1-6.tar.z Adobe-Japan1-6 materials - cid2code.txt (Version 06/24/2010) + cid2code.txt (Version 02/04/2012) cmapresources_korean1-2.tar.z Adobe-Korea1-2 materials - cid2code.txt (Version 08/11/2009) + cid2code.txt (Version 01/31/2012) */ static struct ublock ublock_data[] = { @@ -45,6 +46,7 @@ static struct ublock ublock_data[] = { {0x07C0, 0x07FF, ENTRY_NO }, /* NKo */ {0x0800, 0x083F, ENTRY_NO }, /* Samaritan */ {0x0840, 0x085F, ENTRY_NO }, /* Mandaic */ + {0x08A0, 0x08FF, ENTRY_NO }, /* Arabic Extended-A */ {0x0900, 0x097F, ENTRY_NO }, /* Devanagari */ {0x0980, 0x09FF, ENTRY_NO }, /* Bengali */ {0x0A00, 0x0A7F, ENTRY_NO }, /* Gurmukhi */ @@ -85,6 +87,7 @@ static struct ublock ublock_data[] = { {0x1BC0, 0x1BFF, ENTRY_NO }, /* Batak */ {0x1C00, 0x1C4F, ENTRY_NO }, /* Lepcha */ {0x1C50, 0x1C7F, ENTRY_NO }, /* Ol Chiki */ + {0x1CC0, 0x1CCF, ENTRY_NO }, /* Sundanese Supplement */ {0x1CD0, 0x1CFF, ENTRY_NO }, /* Vedic Extensions */ {0x1D00, 0x1D7F, ENTRY_NO }, /* Phonetic Extensions */ {0x1D80, 0x1DBF, ENTRY_NO }, /* Phonetic Extensions Supplement */ @@ -160,6 +163,7 @@ static struct ublock ublock_data[] = { {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 */ {0xABC0, 0xABFF, ENTRY_NO }, /* Meetei Mayek */ {0xAC00, 0xD7AF, ENTRY_K }, /* Hangul Syllables */ @@ -198,6 +202,8 @@ static struct ublock ublock_data[] = { {0x10840, 0x1085F, ENTRY_NO }, /* Imperial Aramaic */ {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 */ {0x10B00, 0x10B3F, ENTRY_NO }, /* Avestan */ @@ -207,10 +213,15 @@ static struct ublock ublock_data[] = { {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 */ + {0x11180, 0x111DF, ENTRY_NO }, /* Sharada */ + {0x11680, 0x116CF, ENTRY_NO }, /* Takri */ {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 */ + {0x16F00, 0x16F9F, ENTRY_NO }, /* Miao */ {0x1B000, 0x1B0FF, ENTRY_NO }, /* Kana Supplement */ {0x1D000, 0x1D0FF, ENTRY_NO }, /* Byzantine Musical Symbols */ {0x1D100, 0x1D1FF, ENTRY_NO }, /* Musical Symbols */ @@ -218,11 +229,12 @@ static struct ublock ublock_data[] = { {0x1D300, 0x1D35F, ENTRY_NO }, /* Tai Xuan Jing Symbols */ {0x1D360, 0x1D37F, ENTRY_NO }, /* Counting Rod Numerals */ {0x1D400, 0x1D7FF, ENTRY_NO }, /* Mathematical Alphanumeric Symbols */ + {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_NO }, /* Enclosed Alphanumeric Supplement */ - {0x1F200, 0x1F2FF, ENTRY_NO }, /* Enclosed Ideographic Supplement */ + {0x1F100, 0x1F1FF, ENTRY_J }, /* Enclosed Alphanumeric Supplement */ + {0x1F200, 0x1F2FF, ENTRY_J }, /* Enclosed Ideographic Supplement */ {0x1F300, 0x1F5FF, ENTRY_NO }, /* Miscellaneous Symbols And Pictographs */ {0x1F600, 0x1F64F, ENTRY_NO }, /* Emoticons */ {0x1F680, 0x1F6FF, ENTRY_NO }, /* Transport And Map Symbols */ diff --git a/Build/source/texk/web2c/uptexdir/ChangeLog b/Build/source/texk/web2c/uptexdir/ChangeLog index 61522465a88..0ec955cff99 100644 --- a/Build/source/texk/web2c/uptexdir/ChangeLog +++ b/Build/source/texk/web2c/uptexdir/ChangeLog @@ -1,3 +1,12 @@ +2012-04-29 Takuji Tanaka + + * uptex-m.ch, uppltotf.ch uptftopl.ch, updvitype.ch, upbibtex.ch: + Update upTeX version number. + + * uptex-m.ch, kanji.c: + Update reference of Unicode blocks to + "Blocks-6.1.0.txt Date: 2011-06-14, 18:26:00 GMT [KW, LI]". + 2012-03-11 Akira Kakuto * uptex-m.ch: remove unnecessary and seemingly wrong changes diff --git a/Build/source/texk/web2c/uptexdir/kanji.c b/Build/source/texk/web2c/uptexdir/kanji.c index 66f330d118e..bf1e358a1a6 100644 --- a/Build/source/texk/web2c/uptexdir/kanji.c +++ b/Build/source/texk/web2c/uptexdir/kanji.c @@ -60,249 +60,260 @@ integer calc_pos(integer c) } /* Ref. http://www.unicode.org/Public/UNIDATA/Blocks.txt */ -/* # Blocks-6.0.0.txt */ -/* # Date: 2010-06-04, 11:12:00 PDT [KW] */ +/* # Blocks-6.1.0.txt */ +/* # Date: 2011-06-14, 18:26:00 GMT [KW, LI] */ static long ucs_range[]={ 0x0000, /* Basic Latin 0x00 */ - 0x0080, /* Latin-1 Supplement 0x01 */ - 0x0100, /* Latin Extended-A 0x02 */ - 0x0180, /* Latin Extended-B 0x03 */ - 0x0250, /* IPA Extensions 0x04 */ - 0x02B0, /* Spacing Modifier Letters 0x05 */ - 0x0300, /* Combining Diacritical Marks 0x06 */ - 0x0370, /* Greek and Coptic 0x07 */ + 0x0080, /* Latin-1 Supplement */ + 0x0100, /* Latin Extended-A */ + 0x0180, /* Latin Extended-B */ + 0x0250, /* IPA Extensions */ + 0x02B0, /* Spacing Modifier Letters */ + 0x0300, /* Combining Diacritical Marks */ + 0x0370, /* Greek and Coptic */ 0x0400, /* Cyrillic 0x08 */ - 0x0500, /* Cyrillic Supplement 0x09 */ - 0x0530, /* Armenian 0x0a */ - 0x0590, /* Hebrew 0x0b */ - 0x0600, /* Arabic 0x0c */ - 0x0700, /* Syriac 0x0d */ - 0x0750, /* Arabic Supplement 0x0e */ - 0x0780, /* Thaana 0x0f */ + 0x0500, /* Cyrillic Supplement */ + 0x0530, /* Armenian */ + 0x0590, /* Hebrew */ + 0x0600, /* Arabic */ + 0x0700, /* Syriac */ + 0x0750, /* Arabic Supplement */ + 0x0780, /* Thaana */ 0x07C0, /* NKo 0x10 */ - 0x0800, /* Samaritan 0x11 */ - 0x0840, /* Mandaic 0x12 */ - 0x0900, /* Devanagari 0x13 */ - 0x0980, /* Bengali 0x14 */ - 0x0A00, /* Gurmukhi 0x15 */ - 0x0A80, /* Gujarati 0x16 */ - 0x0B00, /* Oriya 0x17 */ - 0x0B80, /* Tamil 0x18 */ - 0x0C00, /* Telugu 0x19 */ - 0x0C80, /* Kannada 0x1a */ - 0x0D00, /* Malayalam 0x1b */ - 0x0D80, /* Sinhala 0x1c */ - 0x0E00, /* Thai 0x1d */ - 0x0E80, /* Lao 0x1e */ - 0x0F00, /* Tibetan 0x1f */ - 0x1000, /* Myanmar 0x20 */ - 0x10A0, /* Georgian 0x21 */ - 0x1100, /* Hangul Jamo 0x22 */ - 0x1200, /* Ethiopic 0x23 */ - 0x1380, /* Ethiopic Supplement 0x24 */ - 0x13A0, /* Cherokee 0x25 */ - 0x1400, /* Unified Canadian Aboriginal Syllabics 0x26 */ - 0x1680, /* Ogham 0x27 */ - 0x16A0, /* Runic 0x28 */ - 0x1700, /* Tagalog 0x29 */ - 0x1720, /* Hanunoo 0x2a */ - 0x1740, /* Buhid 0x2b */ - 0x1760, /* Tagbanwa 0x2c */ - 0x1780, /* Khmer 0x2d */ - 0x1800, /* Mongolian 0x2e */ - 0x18B0, /* Unified Canadian Aboriginal Syllabics Extended 0x2f */ - 0x1900, /* Limbu 0x30 */ - 0x1950, /* Tai Le 0x31 */ - 0x1980, /* New Tai Lue 0x32 */ - 0x19E0, /* Khmer Symbols 0x33 */ - 0x1A00, /* Buginese 0x34 */ - 0x1A20, /* Tai Tham 0x35 */ - 0x1B00, /* Balinese 0x36 */ - 0x1B80, /* Sundanese 0x37 */ - 0x1BC0, /* Batak 0x38 */ - 0x1C00, /* Lepcha 0x39 */ - 0x1C50, /* Ol Chiki 0x3a */ - 0x1CD0, /* Vedic Extensions 0x3b */ - 0x1D00, /* Phonetic Extensions 0x3c */ - 0x1D80, /* Phonetic Extensions Supplement 0x3d */ - 0x1DC0, /* Combining Diacritical Marks Supplement 0x3e */ - 0x1E00, /* Latin Extended Additional 0x3f */ - 0x1F00, /* Greek Extended 0x40 */ - 0x2000, /* General Punctuation 0x41 */ - 0x2070, /* Superscripts and Subscripts 0x42 */ - 0x20A0, /* Currency Symbols 0x43 */ - 0x20D0, /* Combining Diacritical Marks for Symbols 0x44 */ - 0x2100, /* Letterlike Symbols 0x45 */ - 0x2150, /* Number Forms 0x46 */ - 0x2190, /* Arrows 0x47 */ - 0x2200, /* Mathematical Operators 0x48 */ - 0x2300, /* Miscellaneous Technical 0x49 */ - 0x2400, /* Control Pictures 0x4a */ - 0x2440, /* Optical Character Recognition 0x4b */ - 0x2460, /* Enclosed Alphanumerics 0x4c */ - 0x2500, /* Box Drawing 0x4d */ - 0x2580, /* Block Elements 0x4e */ - 0x25A0, /* Geometric Shapes 0x4f */ - 0x2600, /* Miscellaneous Symbols 0x50 */ - 0x2700, /* Dingbats 0x51 */ - 0x27C0, /* Miscellaneous Mathematical Symbols-A 0x52 */ - 0x27F0, /* Supplemental Arrows-A 0x53 */ - 0x2800, /* Braille Patterns 0x54 */ - 0x2900, /* Supplemental Arrows-B 0x55 */ - 0x2980, /* Miscellaneous Mathematical Symbols-B 0x56 */ - 0x2A00, /* Supplemental Mathematical Operators 0x57 */ - 0x2B00, /* Miscellaneous Symbols and Arrows 0x58 */ - 0x2C00, /* Glagolitic 0x59 */ - 0x2C60, /* Latin Extended-C 0x5a */ - 0x2C80, /* Coptic 0x5b */ - 0x2D00, /* Georgian Supplement 0x5c */ - 0x2D30, /* Tifinagh 0x5d */ - 0x2D80, /* Ethiopic Extended 0x5e */ - 0x2DE0, /* Cyrillic Extended-A 0x5f */ - 0x2E00, /* Supplemental Punctuation 0x60 */ - 0x2E80, /* CJK Radicals Supplement 0x61 */ - 0x2F00, /* Kangxi Radicals 0x62 */ - 0x2FF0, /* Ideographic Description Characters 0x63 */ - 0x3000, /* CJK Symbols and Punctuation 0x64 */ - 0x3040, /* Hiragana 0x65 */ - 0x30A0, /* Katakana 0x66 */ - 0x3100, /* Bopomofo 0x67 */ - 0x3130, /* Hangul Compatibility Jamo 0x68 */ - 0x3190, /* Kanbun 0x69 */ - 0x31A0, /* Bopomofo Extended 0x6a */ - 0x31C0, /* CJK Strokes 0x6b */ - 0x31F0, /* Katakana Phonetic Extensions 0x6c */ - 0x3200, /* Enclosed CJK Letters and Months 0x6d */ - 0x3300, /* CJK Compatibility 0x6e */ - 0x3400, /* CJK Unified Ideographs Extension A 0x6f */ - 0x4DC0, /* Yijing Hexagram Symbols 0x70 */ - 0x4E00, /* CJK Unified Ideographs 0x71 */ - 0xA000, /* Yi Syllables 0x72 */ - 0xA490, /* Yi Radicals 0x73 */ - 0xA4D0, /* Lisu 0x74 */ - 0xA500, /* Vai 0x75 */ - 0xA640, /* Cyrillic Extended-B 0x76 */ - 0xA6A0, /* Bamum 0x77 */ - 0xA700, /* Modifier Tone Letters 0x78 */ - 0xA720, /* Latin Extended-D 0x79 */ - 0xA800, /* Syloti Nagri 0x7a */ - 0xA830, /* Common Indic Number Forms 0x7b */ - 0xA840, /* Phags-pa 0x7c */ - 0xA880, /* Saurashtra 0x7d */ - 0xA8E0, /* Devanagari Extended 0x7e */ - 0xA900, /* Kayah Li 0x7f */ - 0xA930, /* Rejang 0x80 */ - 0xA960, /* Hangul Jamo Extended-A 0x81 */ - 0xA980, /* Javanese 0x82 */ - 0xAA00, /* Cham 0x83 */ - 0xAA60, /* Myanmar Extended-A 0x84 */ - 0xAA80, /* Tai Viet 0x85 */ - 0xAB00, /* Ethiopic Extended-A 0x86 */ - 0xABC0, /* Meetei Mayek 0x87 */ - 0xAC00, /* Hangul Syllables 0x88 */ - 0xD7B0, /* Hangul Jamo Extended-B 0x89 */ - 0xD800, /* High Surrogates 0x8a */ - 0xDB80, /* High Private Use Surrogates 0x8b */ - 0xDC00, /* Low Surrogates 0x8c */ - 0xE000, /* Private Use Area 0x8d */ - 0xF900, /* CJK Compatibility Ideographs 0x8e */ - 0xFB00, /* Alphabetic Presentation Forms 0x8f */ - 0xFB50, /* Arabic Presentation Forms-A 0x90 */ - 0xFE00, /* Variation Selectors 0x91 */ - 0xFE10, /* Vertical Forms 0x92 */ - 0xFE20, /* Combining Half Marks 0x93 */ - 0xFE30, /* CJK Compatibility Forms 0x94 */ - 0xFE50, /* Small Form Variants 0x95 */ - 0xFE70, /* Arabic Presentation Forms-B 0x96 */ - 0xFF00, /* Halfwidth and Fullwidth Forms 0x97 */ - 0xFFF0, /* Specials 0x98 */ - 0x10000, /* Linear B Syllabary 0x99 */ - 0x10080, /* Linear B Ideograms 0x9a */ - 0x10100, /* Aegean Numbers 0x9b */ - 0x10140, /* Ancient Greek Numbers 0x9c */ - 0x10190, /* Ancient Symbols 0x9d */ - 0x101D0, /* Phaistos Disc 0x9e */ - 0x10280, /* Lycian 0x9f */ - 0x102A0, /* Carian 0xa0 */ - 0x10300, /* Old Italic 0xa1 */ - 0x10330, /* Gothic 0xa2 */ - 0x10380, /* Ugaritic 0xa3 */ - 0x103A0, /* Old Persian 0xa4 */ - 0x10400, /* Deseret 0xa5 */ - 0x10450, /* Shavian 0xa6 */ - 0x10480, /* Osmanya 0xa7 */ - 0x10800, /* Cypriot Syllabary 0xa8 */ - 0x10840, /* Imperial Aramaic 0xa9 */ - 0x10900, /* Phoenician 0xaa */ - 0x10920, /* Lydian 0xab */ - 0x10A00, /* Kharoshthi 0xac */ - 0x10A60, /* Old South Arabian 0xad */ - 0x10B00, /* Avestan 0xae */ - 0x10B40, /* Inscriptional Parthian 0xaf */ - 0x10B60, /* Inscriptional Pahlavi 0xb0 */ - 0x10C00, /* Old Turkic 0xb1 */ - 0x10E60, /* Rumi Numeral Symbols 0xb2 */ - 0x11000, /* Brahmi 0xb3 */ - 0x11080, /* Kaithi 0xb4 */ - 0x12000, /* Cuneiform 0xb5 */ - 0x12400, /* Cuneiform Numbers and Punctuation 0xb6 */ - 0x13000, /* Egyptian Hieroglyphs 0xb7 */ - 0x16800, /* Bamum Supplement 0xb8 */ - 0x1B000, /* Kana Supplement 0xb9 */ - 0x1D000, /* Byzantine Musical Symbols 0xba */ - 0x1D100, /* Musical Symbols 0xbb */ - 0x1D200, /* Ancient Greek Musical Notation 0xbc */ - 0x1D300, /* Tai Xuan Jing Symbols 0xbd */ - 0x1D360, /* Counting Rod Numerals 0xbe */ - 0x1D400, /* Mathematical Alphanumeric Symbols 0xbf */ - 0x1F000, /* Mahjong Tiles 0xc0 */ - 0x1F030, /* Domino Tiles 0xc1 */ - 0x1F0A0, /* Playing Cards 0xc2 */ - 0x1F100, /* Enclosed Alphanumeric Supplement 0xc3 */ - 0x1F200, /* Enclosed Ideographic Supplement 0xc4 */ - 0x1F300, /* Miscellaneous Symbols And Pictographs 0xc5 */ - 0x1F600, /* Emoticons 0xc6 */ - 0x1F680, /* Transport And Map Symbols 0xc7 */ - 0x1F700, /* Alchemical Symbols 0xc8 */ - 0x20000, /* CJK Unified Ideographs Extension B 0xc9 */ - 0x2A700, /* CJK Unified Ideographs Extension C 0xca */ - 0x2B740, /* CJK Unified Ideographs Extension D 0xcb */ - 0x2F800, /* CJK Compatibility Ideographs Supplement 0xcc */ - 0x30000, /* reserved 0xcd */ - 0x40000, /* reserved 0xce */ - 0x50000, /* reserved 0xcf */ - 0x60000, /* reserved 0xd0 */ - 0x70000, /* reserved 0xd1 */ - 0x80000, /* reserved 0xd2 */ - 0x90000, /* reserved 0xd3 */ - 0xA0000, /* reserved 0xd4 */ - 0xB0000, /* reserved 0xd5 */ - 0xC0000, /* reserved 0xd6 */ - 0xD0000, /* reserved 0xd7 */ - 0xE0000, /* Tags 0xd8 */ - 0xE0100, /* Variation Selectors Supplement 0xd9 */ - 0xF0000, /* Supplementary Private Use Area-A 0xda */ - 0x100000, /* Supplementary Private Use Area-B 0xdb */ + 0x0800, /* Samaritan */ + 0x0840, /* Mandaic */ + 0x08A0, /* Arabic Extended-A */ + 0x0900, /* Devanagari */ + 0x0980, /* Bengali */ + 0x0A00, /* Gurmukhi */ + 0x0A80, /* Gujarati */ + 0x0B00, /* Oriya 0x18 */ + 0x0B80, /* Tamil */ + 0x0C00, /* Telugu */ + 0x0C80, /* Kannada */ + 0x0D00, /* Malayalam */ + 0x0D80, /* Sinhala */ + 0x0E00, /* Thai */ + 0x0E80, /* Lao */ + 0x0F00, /* Tibetan 0x20 */ + 0x1000, /* Myanmar */ + 0x10A0, /* Georgian */ + 0x1100, /* Hangul Jamo */ + 0x1200, /* Ethiopic */ + 0x1380, /* Ethiopic Supplement */ + 0x13A0, /* Cherokee */ + 0x1400, /* Unified Canadian Aboriginal Syllabics */ + 0x1680, /* Ogham 0x28 */ + 0x16A0, /* Runic */ + 0x1700, /* Tagalog */ + 0x1720, /* Hanunoo */ + 0x1740, /* Buhid */ + 0x1760, /* Tagbanwa */ + 0x1780, /* Khmer */ + 0x1800, /* Mongolian */ + 0x18B0, /* Unified Canadian Aboriginal Syllabics Extended 0x30 */ + 0x1900, /* Limbu */ + 0x1950, /* Tai Le */ + 0x1980, /* New Tai Lue */ + 0x19E0, /* Khmer Symbols */ + 0x1A00, /* Buginese */ + 0x1A20, /* Tai Tham */ + 0x1B00, /* Balinese */ + 0x1B80, /* Sundanese 0x38 */ + 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 */ + 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 */ + 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 */ + 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 */ + 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 */ + 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 */ + 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 */ + 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 */ + 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 */ + 0xA900, /* Kayah Li */ + 0xA930, /* Rejang */ + 0xA960, /* Hangul Jamo Extended-A */ + 0xA980, /* Javanese */ + 0xAA00, /* Cham */ + 0xAA60, /* Myanmar Extended-A */ + 0xAA80, /* Tai Viet */ + 0xAAE0, /* Meetei Mayek Extensions 0x88 */ + 0xAB00, /* Ethiopic Extended-A */ + 0xABC0, /* Meetei Mayek */ + 0xAC00, /* Hangul Syllables */ + 0xD7B0, /* Hangul Jamo Extended-B */ + 0xD800, /* High Surrogates */ + 0xDB80, /* High Private Use Surrogates */ + 0xDC00, /* Low Surrogates */ + 0xE000, /* Private Use Area 0x90 */ + 0xF900, /* CJK Compatibility Ideographs */ + 0xFB00, /* Alphabetic Presentation Forms */ + 0xFB50, /* Arabic Presentation Forms-A */ + 0xFE00, /* Variation Selectors */ + 0xFE10, /* Vertical Forms */ + 0xFE20, /* Combining Half Marks */ + 0xFE30, /* CJK Compatibility Forms */ + 0xFE50, /* Small Form Variants 0x98 */ + 0xFE70, /* Arabic Presentation Forms-B */ + 0xFF00, /* Halfwidth and Fullwidth Forms */ + 0xFFF0, /* Specials */ + 0x10000, /* Linear B Syllabary */ + 0x10080, /* Linear B Ideograms */ + 0x10100, /* Aegean Numbers */ + 0x10140, /* Ancient Greek Numbers */ + 0x10190, /* Ancient Symbols 0xa0 */ + 0x101D0, /* Phaistos Disc */ + 0x10280, /* Lycian */ + 0x102A0, /* Carian */ + 0x10300, /* Old Italic */ + 0x10330, /* Gothic */ + 0x10380, /* Ugaritic */ + 0x103A0, /* Old Persian */ + 0x10400, /* Deseret 0xa8 */ + 0x10450, /* Shavian */ + 0x10480, /* Osmanya */ + 0x10800, /* Cypriot Syllabary */ + 0x10840, /* Imperial Aramaic */ + 0x10900, /* Phoenician */ + 0x10920, /* Lydian */ + 0x10980, /* Meroitic Hieroglyphs */ + 0x109A0, /* Meroitic Cursive 0xb0 */ + 0x10A00, /* Kharoshthi */ + 0x10A60, /* Old South Arabian */ + 0x10B00, /* Avestan */ + 0x10B40, /* Inscriptional Parthian */ + 0x10B60, /* Inscriptional Pahlavi */ + 0x10C00, /* Old Turkic */ + 0x10E60, /* Rumi Numeral Symbols */ + 0x11000, /* Brahmi 0xb8 */ + 0x11080, /* Kaithi */ + 0x110D0, /* Sora Sompeng */ + 0x11100, /* Chakma */ + 0x11180, /* Sharada */ + 0x11680, /* Takri */ + 0x12000, /* Cuneiform */ + 0x12400, /* Cuneiform Numbers and Punctuation */ + 0x13000, /* Egyptian Hieroglyphs 0xc0 */ + 0x16800, /* Bamum Supplement */ + 0x16F00, /* Miao */ + 0x1B000, /* Kana Supplement */ + 0x1D000, /* Byzantine Musical Symbols */ + 0x1D100, /* Musical Symbols */ + 0x1D200, /* Ancient Greek Musical Notation */ + 0x1D300, /* Tai Xuan Jing Symbols */ + 0x1D360, /* Counting Rod Numerals 0xc8 */ + 0x1D400, /* Mathematical Alphanumeric Symbols */ + 0x1EE00, /* Arabic Mathematical Alphabetic Symbols */ + 0x1F000, /* Mahjong Tiles */ + 0x1F030, /* Domino Tiles */ + 0x1F0A0, /* Playing Cards */ + 0x1F100, /* Enclosed Alphanumeric Supplement */ + 0x1F200, /* Enclosed Ideographic Supplement */ + 0x1F300, /* Miscellaneous Symbols And Pictographs 0xd0 */ + 0x1F600, /* Emoticons */ + 0x1F680, /* Transport And Map Symbols */ + 0x1F700, /* Alchemical Symbols */ + 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 */ + 0x40000, /* reserved */ + 0x50000, /* reserved */ + 0x60000, /* reserved */ + 0x70000, /* reserved */ + 0x80000, /* reserved */ + 0x90000, /* reserved */ + 0xA0000, /* reserved */ + 0xB0000, /* reserved 0xe0 */ + 0xC0000, /* reserved */ + 0xD0000, /* reserved */ + 0xE0000, /* Tags */ + 0xE0100, /* Variation Selectors Supplement */ + 0xF0000, /* Supplementary Private Use Area-A */ + 0x100000, /* Supplementary Private Use Area-B */ /* Value over 0x10FFFF is illegal under Unicode, They are for some special use. *** experimental *** */ - 0x110000, /* Reserved 0xdc */ - 0x120000, /* Reserved 0xdd */ - 0x130000, /* Reserved 0xde */ - 0x140000, /* Reserved 0xdf */ - 0x150000, /* Reserved 0xe0 */ - 0x160000, /* Reserved 0xe1 */ - 0x170000, /* Reserved 0xe2 */ - 0x180000, /* Reserved 0xe3 */ - 0x190000, /* Reserved 0xe4 */ - 0x1A0000, /* Reserved 0xe5 */ - 0x1B0000, /* Reserved 0xe6 */ - 0x1C0000, /* Reserved 0xe7 */ - 0x1D0000, /* Reserved 0xe8 */ - 0x1E0000, /* Reserved 0xe9 */ - 0x1F0000, /* Reserved 0xea */ - 0x200000, /* Reserved 0xeb */ - 0x210000, /* Reserved 0xec */ - 0x220000, /* Reserved 0xed */ + 0x110000, /* Reserved */ + 0x120000, /* Reserved 0xe8 */ + 0x130000, /* Reserved */ + 0x140000, /* Reserved */ + 0x150000, /* Reserved */ + 0x160000, /* Reserved */ + 0x170000, /* Reserved */ + 0x180000, /* Reserved */ + 0x190000, /* Reserved */ + 0x1A0000, /* Reserved 0xf0 */ + 0x1B0000, /* Reserved */ + 0x1C0000, /* Reserved */ + 0x1D0000, /* Reserved */ + 0x1E0000, /* Reserved */ + 0x1F0000, /* Reserved */ + 0x200000, /* Reserved */ + 0x210000, /* Reserved */ + 0x220000, /* Reserved 0xf8 */ CJK_CHAR_LIMIT }; diff --git a/Build/source/texk/web2c/uptexdir/upbibtex.ch b/Build/source/texk/web2c/uptexdir/upbibtex.ch index f18706b42b4..7efd6449da0 100644 --- a/Build/source/texk/web2c/uptexdir/upbibtex.ch +++ b/Build/source/texk/web2c/uptexdir/upbibtex.ch @@ -1,7 +1,7 @@ @x @d banner=='This is pBibTeX, Version 0.99d-j0.33' @y -@d banner=='This is upBibTeX, Version 0.99d-j0.33-u1.00' +@d banner=='This is upBibTeX, Version 0.99d-j0.33-u1.10' @z @x diff --git a/Build/source/texk/web2c/uptexdir/updvitype.ch b/Build/source/texk/web2c/uptexdir/updvitype.ch index 1c1678a93ab..e4d19f9a3cd 100644 --- a/Build/source/texk/web2c/uptexdir/updvitype.ch +++ b/Build/source/texk/web2c/uptexdir/updvitype.ch @@ -1,7 +1,7 @@ @x @d banner=='This is pDVItype, Version 3.6-p0.4' @y -@d banner=='This is upDVItype, Version 3.6-p0.4-u1.00' +@d banner=='This is upDVItype, Version 3.6-p0.4-u1.10' @z @x procedure initialize diff --git a/Build/source/texk/web2c/uptexdir/uppltotf.ch b/Build/source/texk/web2c/uptexdir/uppltotf.ch index 802e9262847..c5cacc9d0d9 100644 --- a/Build/source/texk/web2c/uptexdir/uppltotf.ch +++ b/Build/source/texk/web2c/uptexdir/uppltotf.ch @@ -1,7 +1,7 @@ @x @d banner=='This is pPLtoTF, Version 3.5-p1.8' @y -@d banner=='This is upPLtoTF, Version 3.5-p1.8-u1.00' +@d banner=='This is upPLtoTF, Version 3.5-p1.8-u1.10' @z @x diff --git a/Build/source/texk/web2c/uptexdir/uptex-m.ch b/Build/source/texk/web2c/uptexdir/uptex-m.ch index 15a6430680f..77e607cd6f5 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.00 +% This is a change file for upTeX u1.10 % By Takuji Tanaka. % % (02/26/2007) TTK upTeX u0.01 @@ -30,13 +30,14 @@ % (01/31/2010) TTK upTeX u0.29 % (04/10/2010) TTK upTeX u0.30 % (01/15/2012) TTK upTeX u1.00 +% (04/29/2012) TTK upTeX u1.10 @x upTeX: banner {printed when p\TeX\ starts} @y {printed when p\TeX\ starts} @# -@d upTeX_version_string=='-u1.00' {current up\TeX\ version} +@d upTeX_version_string=='-u1.10' {current up\TeX\ version} @# @d upTeX_version==pTeX_version_string,upTeX_version_string @d upTeX_banner=='This is upTeX, Version 3.1415926',upTeX_version @@ -217,22 +218,22 @@ eqtb[enable_cjk_token_code]:=eqtb[cat_code_base]; if (isinternalUPTEX) then begin { default: other_kchar } @t\hskip10pt@>kcat_code(@"0):=not_cjk; - @t\hskip10pt@>kcat_code(@"22):=hangul; { Hangul Jamo } - @+@t\1@>for k:=@"61 to @"63 do kcat_code(k):=kanji; { CJK Radicals Supplement .. Ideographic Description Characters } - @+@t\1@>for k:=@"65 to @"66 do kcat_code(k):=kana; { Hiragana, Katakana } - @t\hskip10pt@>kcat_code(@"67):=kanji; { Bopomofo } - @t\hskip10pt@>kcat_code(@"68):=hangul; { Hangul Compatibility Jamo } - @+@t\1@>for k:=@"69 to @"6B do kcat_code(k):=kanji; { Kanbun .. CJK Strokes } - @t\hskip10pt@>kcat_code(@"6C):=kana; { Katakana Phonetic Extensions } - @t\hskip10pt@>kcat_code(@"6F):=kanji; { CJK Unified Ideographs Extension A } - @t\hskip10pt@>kcat_code(@"71):=kanji; { CJK Unified Ideographs } - @t\hskip10pt@>kcat_code(@"81):=hangul; { Hangul Jamo Extended-A } - @t\hskip10pt@>kcat_code(@"88):=hangul; { Hangul Syllables } - @t\hskip10pt@>kcat_code(@"89):=hangul; { Hangul Jamo Extended-B } - @t\hskip10pt@>kcat_code(@"8E):=kanji; { CJK Compatibility Ideographs } - { @t\hskip10pt@>kcat_code(@"97):=other_kchar; Halfwidth and Fullwidth Forms } - @t\hskip10pt@>kcat_code(@"B9):=kana; { Kana Supplement } - @+@t\1@>for k:=@"C9 to @"CC do kcat_code(k):=kanji; { CJK Unified Ideographs Extension B .. CJK Compatibility Ideographs Supplement } + @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 } end else begin diff --git a/Build/source/texk/web2c/uptexdir/uptftopl.ch b/Build/source/texk/web2c/uptexdir/uptftopl.ch index 92f36764f4c..39f691dc628 100644 --- a/Build/source/texk/web2c/uptexdir/uptftopl.ch +++ b/Build/source/texk/web2c/uptexdir/uptftopl.ch @@ -1,7 +1,7 @@ @x @d banner=='This is pTFtoPL, Version 3.2-p1.7' @y -@d banner=='This is upTFtoPL, Version 3.2-p1.7-u1.00' +@d banner=='This is upTFtoPL, Version 3.2-p1.7-u1.10' @z @x diff --git a/Build/source/texk/web2c/uptexdir/uptrip/uptrip.diffs b/Build/source/texk/web2c/uptexdir/uptrip/uptrip.diffs index d62e5b1f5de..0e1f646b563 100644 --- a/Build/source/texk/web2c/uptexdir/uptrip/uptrip.diffs +++ b/Build/source/texk/web2c/uptexdir/uptrip/uptrip.diffs @@ -13,7 +13,7 @@ 1c1 < This is TeX, Version 3.1415926 (INITEX) 15 MAR 2008 02:23 --- -> This is upTeX, Version 3.1415926-p3.2-u1.00 (utf8.uptex) (TeX Live 2012/dev) (INITEX) 16 JAN 2012 15:14 +> This is upTeX, Version 3.1415926-p3.2-u1.10 (utf8.uptex) (TeX Live 2012/dev) (INITEX) 16 JAN 2012 15:14 3,11c3 < (trip.tex < ! Bad character code (256). @@ -54,7 +54,7 @@ < ** &trip trip < (trip.tex ## --- -> This is upTeX, Version 3.1415926-p3.2-u1.00 (utf8.uptex) (TeX Live 2012/dev) +> This is upTeX, Version 3.1415926-p3.2-u1.10 (utf8.uptex) (TeX Live 2012/dev) > **(./trip.tex ## 17c16 < Memory usage before: 159&313; after: 102&278; still untouched: 1613 @@ -68,7 +68,7 @@ 1c1 < This is TeX, Version 3.1415926 (preloaded format=trip 2008.3.15) 15 MAR 2008 02:23 --- -> This is upTeX, Version 3.1415926-p3.2-u1.00 (utf8.uptex) (TeX Live 2012/dev) (format=trip 2012.1.16) 16 JAN 2012 15:14 +> This is upTeX, Version 3.1415926-p3.2-u1.10 (utf8.uptex) (TeX Live 2012/dev) (format=trip 2012.1.16) 16 JAN 2012 15:14 3c3 < (trip.tex ## --- -- cgit v1.2.3