From 98bc737fdb48de230848edd03ed14bdb8ff98a09 Mon Sep 17 00:00:00 2001 From: Takuji Tanaka Date: Sun, 25 Feb 2018 00:31:25 +0000 Subject: upTeX 1.23 git-svn-id: svn://tug.org/texlive/trunk@46737 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/upmendex/sort.c | 2 +- Build/source/texk/web2c/pmpostdir/pmp.ch | 2 +- Build/source/texk/web2c/uptexdir/COPYRIGHT | 2 +- Build/source/texk/web2c/uptexdir/COPYRIGHT.ja | 2 +- Build/source/texk/web2c/uptexdir/ChangeLog | 12 ++ Build/source/texk/web2c/uptexdir/kanji.c | 158 ++++++++++++++--------- 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 | 43 +++--- Build/source/texk/web2c/uptexdir/uptex_version.h | 2 +- Build/source/texk/web2c/uptexdir/uptftopl.ch | 2 +- 12 files changed, 139 insertions(+), 92 deletions(-) (limited to 'Build') diff --git a/Build/source/texk/upmendex/sort.c b/Build/source/texk/upmendex/sort.c index 2cff3852df2..54597923efb 100644 --- a/Build/source/texk/upmendex/sort.c +++ b/Build/source/texk/upmendex/sort.c @@ -398,7 +398,7 @@ int is_hanzi(UChar *c) if (is_surrogate_pair(c)) { c32=U16_GET_SUPPLEMENTARY(*c,*(c+1)); - if ((c32>=0x20000) && /* CJK Unified Ideographs Extension B,C,D,E */ + if ((c32>=0x20000) && /* CJK Unified Ideographs Extension B,C,D,E,F */ (c32<=0x2FA1F)) return 2; /* CJK Compatibility Ideographs Supplement */ } return 0; diff --git a/Build/source/texk/web2c/pmpostdir/pmp.ch b/Build/source/texk/web2c/pmpostdir/pmp.ch index 922e98e4be1..9c5ca7d59c2 100644 --- a/Build/source/texk/web2c/pmpostdir/pmp.ch +++ b/Build/source/texk/web2c/pmpostdir/pmp.ch @@ -22,7 +22,7 @@ @y #ifdef UPMP #define P_UP "up" -#define metapost_version "2.00-0.04-u1.21" +#define metapost_version "2.00-0.04-u1.23" #else #define P_UP "p" #define metapost_version "2.00-0.04" diff --git a/Build/source/texk/web2c/uptexdir/COPYRIGHT b/Build/source/texk/web2c/uptexdir/COPYRIGHT index dcfb498ed86..45f81c4cf85 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-2017 Takuji Tanaka +Copyright (C) 2007-2018 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 914f30f76c2..abca30df046 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-2017 Takuji Tanaka +Copyright (C) 2007-2018 Takuji Tanaka All rights reserved. 【契約条件】 diff --git a/Build/source/texk/web2c/uptexdir/ChangeLog b/Build/source/texk/web2c/uptexdir/ChangeLog index bf5cf6ccd8f..707d3ab6c83 100644 --- a/Build/source/texk/web2c/uptexdir/ChangeLog +++ b/Build/source/texk/web2c/uptexdir/ChangeLog @@ -1,3 +1,15 @@ +2018-02-25 TANAKA Takuji + + * uptex-m.ch, kanji.c: + Update reference of Unicode blocks to + "Blocks-10.0.0.txt Date: 2017-04-12, 17:30:00 GMT [KW]". + Exclude Latin-1 letters from "Latin-1 Supplement" block. + Set kcatcode of "Latin-1 letters", "Latin Extended-A" 15 (not_cjk). + * uptex-m.ch, upbibtex.ch, updvitype.ch, uppltotf.ch, uptftopl.ch, + uptex_version.h: upTeX version u1.23. + * COPYRIGHT, COPYRIGHT.ja: + Update copyright year. + 2018-02-02 Hironobu Yamashita * uppltotf.ch: Adapt to changes in ptexdir/ppltotf.ch. diff --git a/Build/source/texk/web2c/uptexdir/kanji.c b/Build/source/texk/web2c/uptexdir/kanji.c index 271577ef1f6..70c2e21a2d1 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-9.0.0.txt */ -/* # Date: 2016-02-05, 23:48:00 GMT [KW] */ +/* # Blocks-10.0.0.txt */ +/* # Date: 2017-04-12, 17:30:00 GMT [KW] */ static long ucs_range[]={ 0x0000, /* Basic Latin */ /* 0x00 */ 0x0080, /* Latin-1 Supplement */ @@ -71,7 +71,7 @@ static long ucs_range[]={ 0x02B0, /* Spacing Modifier Letters */ 0x0300, /* Combining Diacritical Marks */ 0x0370, /* Greek and Coptic */ - 0x0400, /* Cyrillic */ /* 0x08 */ + 0x0400, /* Cyrillic */ 0x0500, /* Cyrillic Supplement */ 0x0530, /* Armenian */ 0x0590, /* Hebrew */ @@ -82,20 +82,21 @@ static long ucs_range[]={ 0x07C0, /* NKo */ /* 0x10 */ 0x0800, /* Samaritan */ 0x0840, /* Mandaic */ + 0x0860, /* Syriac Supplement */ 0x08A0, /* Arabic Extended-A */ 0x0900, /* Devanagari */ 0x0980, /* Bengali */ 0x0A00, /* Gurmukhi */ 0x0A80, /* Gujarati */ - 0x0B00, /* Oriya */ /* 0x18 */ + 0x0B00, /* Oriya */ 0x0B80, /* Tamil */ 0x0C00, /* Telugu */ 0x0C80, /* Kannada */ 0x0D00, /* Malayalam */ 0x0D80, /* Sinhala */ 0x0E00, /* Thai */ - 0x0E80, /* Lao */ - 0x0F00, /* Tibetan */ /* 0x20 */ + 0x0E80, /* Lao */ /* 0x20 */ + 0x0F00, /* Tibetan */ 0x1000, /* Myanmar */ 0x10A0, /* Georgian */ 0x1100, /* Hangul Jamo */ @@ -103,15 +104,15 @@ static long ucs_range[]={ 0x1380, /* Ethiopic Supplement */ 0x13A0, /* Cherokee */ 0x1400, /* Unified Canadian Aboriginal Syllabics */ - 0x1680, /* Ogham */ /* 0x28 */ + 0x1680, /* Ogham */ 0x16A0, /* Runic */ 0x1700, /* Tagalog */ 0x1720, /* Hanunoo */ 0x1740, /* Buhid */ 0x1760, /* Tagbanwa */ 0x1780, /* Khmer */ - 0x1800, /* Mongolian */ - 0x18B0, /* Unified Canadian Aboriginal Syllabics Extended */ /* 0x30 */ + 0x1800, /* Mongolian */ /* 0x30 */ + 0x18B0, /* Unified Canadian Aboriginal Syllabics Extended */ 0x1900, /* Limbu */ 0x1950, /* Tai Le */ 0x1980, /* New Tai Lue */ @@ -119,15 +120,15 @@ static long ucs_range[]={ 0x1A00, /* Buginese */ 0x1A20, /* Tai Tham */ 0x1AB0, /* Combining Diacritical Marks Extended */ - 0x1B00, /* Balinese */ /* 0x38 */ + 0x1B00, /* Balinese */ 0x1B80, /* Sundanese */ 0x1BC0, /* Batak */ 0x1C00, /* Lepcha */ 0x1C50, /* Ol Chiki */ 0x1C80, /* Cyrillic Extended-C */ 0x1CC0, /* Sundanese Supplement */ - 0x1CD0, /* Vedic Extensions */ - 0x1D00, /* Phonetic Extensions */ /* 0x40 */ + 0x1CD0, /* Vedic Extensions */ /* 0x40 */ + 0x1D00, /* Phonetic Extensions */ 0x1D80, /* Phonetic Extensions Supplement */ 0x1DC0, /* Combining Diacritical Marks Supplement */ 0x1E00, /* Latin Extended Additional */ @@ -135,15 +136,15 @@ static long ucs_range[]={ 0x2000, /* General Punctuation */ 0x2070, /* Superscripts and Subscripts */ 0x20A0, /* Currency Symbols */ - 0x20D0, /* Combining Diacritical Marks for Symbols */ /* 0x48 */ + 0x20D0, /* Combining Diacritical Marks for Symbols */ 0x2100, /* Letterlike Symbols */ 0x2150, /* Number Forms */ 0x2190, /* Arrows */ 0x2200, /* Mathematical Operators */ 0x2300, /* Miscellaneous Technical */ 0x2400, /* Control Pictures */ - 0x2440, /* Optical Character Recognition */ - 0x2460, /* Enclosed Alphanumerics */ /* 0x50 */ + 0x2440, /* Optical Character Recognition */ /* 0x50 */ + 0x2460, /* Enclosed Alphanumerics */ 0x2500, /* Box Drawing */ 0x2580, /* Block Elements */ 0x25A0, /* Geometric Shapes */ @@ -151,15 +152,15 @@ static long ucs_range[]={ 0x2700, /* Dingbats */ 0x27C0, /* Miscellaneous Mathematical Symbols-A */ 0x27F0, /* Supplemental Arrows-A */ - 0x2800, /* Braille Patterns */ /* 0x58 */ + 0x2800, /* Braille Patterns */ 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 */ /* 0x60 */ + 0x2C80, /* Coptic */ /* 0x60 */ + 0x2D00, /* Georgian Supplement */ 0x2D30, /* Tifinagh */ 0x2D80, /* Ethiopic Extended */ 0x2DE0, /* Cyrillic Extended-A */ @@ -167,15 +168,15 @@ static long ucs_range[]={ 0x2E80, /* CJK Radicals Supplement */ 0x2F00, /* Kangxi Radicals */ 0x2FF0, /* Ideographic Description Characters */ - 0x3000, /* CJK Symbols and Punctuation */ /* 0x68 */ + 0x3000, /* CJK Symbols and Punctuation */ 0x3040, /* Hiragana */ 0x30A0, /* Katakana */ 0x3100, /* Bopomofo */ 0x3130, /* Hangul Compatibility Jamo */ 0x3190, /* Kanbun */ 0x31A0, /* Bopomofo Extended */ - 0x31C0, /* CJK Strokes */ - 0x31F0, /* Katakana Phonetic Extensions */ /* 0x70 */ + 0x31C0, /* CJK Strokes */ /* 0x70 */ + 0x31F0, /* Katakana Phonetic Extensions */ 0x3200, /* Enclosed CJK Letters and Months */ 0x3300, /* CJK Compatibility */ 0x3400, /* CJK Unified Ideographs Extension A */ @@ -183,15 +184,15 @@ static long ucs_range[]={ 0x4E00, /* CJK Unified Ideographs */ 0xA000, /* Yi Syllables */ 0xA490, /* Yi Radicals */ - 0xA4D0, /* Lisu */ /* 0x78 */ + 0xA4D0, /* Lisu */ 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 */ /* 0x80 */ + 0xA830, /* Common Indic Number Forms */ /* 0x80 */ + 0xA840, /* Phags-pa */ 0xA880, /* Saurashtra */ 0xA8E0, /* Devanagari Extended */ 0xA900, /* Kayah Li */ @@ -199,15 +200,15 @@ static long ucs_range[]={ 0xA960, /* Hangul Jamo Extended-A */ 0xA980, /* Javanese */ 0xA9E0, /* Myanmar Extended-B */ - 0xAA00, /* Cham */ /* 0x88 */ + 0xAA00, /* Cham */ 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 */ /* 0x90 */ + 0xABC0, /* Meetei Mayek */ /* 0x90 */ + 0xAC00, /* Hangul Syllables */ 0xD7B0, /* Hangul Jamo Extended-B */ 0xD800, /* High Surrogates */ 0xDB80, /* High Private Use Surrogates */ @@ -215,15 +216,15 @@ static long ucs_range[]={ 0xE000, /* Private Use Area */ 0xF900, /* CJK Compatibility Ideographs */ 0xFB00, /* Alphabetic Presentation Forms */ - 0xFB50, /* Arabic Presentation Forms-A */ /* 0x98 */ + 0xFB50, /* Arabic Presentation Forms-A */ 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 */ /* 0xa0 */ + 0xFF00, /* Halfwidth and Fullwidth Forms */ /* 0xa0 */ + 0xFFF0, /* Specials */ 0x10000, /* Linear B Syllabary */ 0x10080, /* Linear B Ideograms */ 0x10100, /* Aegean Numbers */ @@ -231,15 +232,15 @@ static long ucs_range[]={ 0x10190, /* Ancient Symbols */ 0x101D0, /* Phaistos Disc */ 0x10280, /* Lycian */ - 0x102A0, /* Carian */ /* 0xa8 */ + 0x102A0, /* Carian */ 0x102E0, /* Coptic Epact Numbers */ 0x10300, /* Old Italic */ 0x10330, /* Gothic */ 0x10350, /* Old Permic */ 0x10380, /* Ugaritic */ 0x103A0, /* Old Persian */ - 0x10400, /* Deseret */ - 0x10450, /* Shavian */ /* 0xb0 */ + 0x10400, /* Deseret */ /* 0xb0 */ + 0x10450, /* Shavian */ 0x10480, /* Osmanya */ 0x104B0, /* Osage */ 0x10500, /* Elbasan */ @@ -247,15 +248,15 @@ static long ucs_range[]={ 0x10600, /* Linear A */ 0x10800, /* Cypriot Syllabary */ 0x10840, /* Imperial Aramaic */ - 0x10860, /* Palmyrene */ /* 0xb8 */ + 0x10860, /* Palmyrene */ 0x10880, /* Nabataean */ 0x108E0, /* Hatran */ 0x10900, /* Phoenician */ 0x10920, /* Lydian */ 0x10980, /* Meroitic Hieroglyphs */ 0x109A0, /* Meroitic Cursive */ - 0x10A00, /* Kharoshthi */ - 0x10A60, /* Old South Arabian */ /* 0xc0 */ + 0x10A00, /* Kharoshthi */ /* 0xc0 */ + 0x10A60, /* Old South Arabian */ 0x10A80, /* Old North Arabian */ 0x10AC0, /* Manichaean */ 0x10B00, /* Avestan */ @@ -263,15 +264,15 @@ static long ucs_range[]={ 0x10B60, /* Inscriptional Pahlavi */ 0x10B80, /* Psalter Pahlavi */ 0x10C00, /* Old Turkic */ - 0x10C80, /* Old Hungarian */ /* 0xc8 */ + 0x10C80, /* Old Hungarian */ 0x10E60, /* Rumi Numeral Symbols */ 0x11000, /* Brahmi */ 0x11080, /* Kaithi */ 0x110D0, /* Sora Sompeng */ 0x11100, /* Chakma */ 0x11150, /* Mahajani */ - 0x11180, /* Sharada */ - 0x111E0, /* Sinhala Archaic Numbers */ /* 0xd0 */ + 0x11180, /* Sharada */ /* 0xd0 */ + 0x111E0, /* Sinhala Archaic Numbers */ 0x11200, /* Khojki */ 0x11280, /* Multani */ 0x112B0, /* Khudawadi */ @@ -279,15 +280,18 @@ static long ucs_range[]={ 0x11400, /* Newa */ 0x11480, /* Tirhuta */ 0x11580, /* Siddham */ - 0x11600, /* Modi */ /* 0xd8 */ + 0x11600, /* Modi */ 0x11660, /* Mongolian Supplement */ 0x11680, /* Takri */ 0x11700, /* Ahom */ 0x118A0, /* Warang Citi */ - 0x11AC0, /* Pau Cin Hau */ + 0x11A00, /* Zanabazar Square */ + 0x11A50, /* Soyombo */ + 0x11AC0, /* Pau Cin Hau */ /* 0xe0 */ 0x11C00, /* Bhaiksuki */ 0x11C70, /* Marchen */ - 0x12000, /* Cuneiform */ /* 0xe0 */ + 0x11D00, /* Masaram Gondi */ + 0x12000, /* Cuneiform */ 0x12400, /* Cuneiform Numbers and Punctuation */ 0x12480, /* Early Dynastic Cuneiform */ 0x13000, /* Egyptian Hieroglyphs */ @@ -295,15 +299,17 @@ static long ucs_range[]={ 0x16800, /* Bamum Supplement */ 0x16A40, /* Mro */ 0x16AD0, /* Bassa Vah */ - 0x16B00, /* Pahawh Hmong */ /* 0xe8 */ + 0x16B00, /* Pahawh Hmong */ 0x16F00, /* Miao */ 0x16FE0, /* Ideographic Symbols and Punctuation */ 0x17000, /* Tangut */ - 0x18800, /* Tangut Components */ + 0x18800, /* Tangut Components */ /* 0xf0 */ 0x1B000, /* Kana Supplement */ + 0x1B100, /* Kana Extended-A */ + 0x1B170, /* Nushu */ 0x1BC00, /* Duployan */ 0x1BCA0, /* Shorthand Format Controls */ - 0x1D000, /* Byzantine Musical Symbols */ /* 0xf0 */ + 0x1D000, /* Byzantine Musical Symbols */ 0x1D100, /* Musical Symbols */ 0x1D200, /* Ancient Greek Musical Notation */ 0x1D300, /* Tai Xuan Jing Symbols */ @@ -311,15 +317,15 @@ static long ucs_range[]={ 0x1D400, /* Mathematical Alphanumeric Symbols */ 0x1D800, /* Sutton SignWriting */ 0x1E000, /* Glagolitic Supplement */ - 0x1E800, /* Mende Kikakui */ /* 0xf8 */ + 0x1E800, /* Mende Kikakui */ 0x1E900, /* Adlam */ - 0x1EE00, /* Arabic Mathematical Alphabetic Symbols */ + 0x1EE00, /* Arabic Mathematical Alphabetic Symbols */ /* 0x100 */ 0x1F000, /* Mahjong Tiles */ 0x1F030, /* Domino Tiles */ 0x1F0A0, /* Playing Cards */ 0x1F100, /* Enclosed Alphanumeric Supplement */ 0x1F200, /* Enclosed Ideographic Supplement */ - 0x1F300, /* Miscellaneous Symbols and Pictographs */ /* 0x100 */ + 0x1F300, /* Miscellaneous Symbols and Pictographs */ 0x1F600, /* Emoticons */ 0x1F650, /* Ornamental Dingbats */ 0x1F680, /* Transport and Map Symbols */ @@ -327,15 +333,16 @@ static long ucs_range[]={ 0x1F780, /* Geometric Shapes Extended */ 0x1F800, /* Supplemental Arrows-C */ 0x1F900, /* Supplemental Symbols and Pictographs */ - 0x20000, /* CJK Unified Ideographs Extension B */ /* 0x108 */ + 0x20000, /* CJK Unified Ideographs Extension B */ 0x2A700, /* CJK Unified Ideographs Extension C */ - 0x2B740, /* CJK Unified Ideographs Extension D */ + 0x2B740, /* CJK Unified Ideographs Extension D */ /* 0x110 */ 0x2B820, /* CJK Unified Ideographs Extension E */ + 0x2CEB0, /* CJK Unified Ideographs Extension F */ 0x2F800, /* CJK Compatibility Ideographs Supplement */ 0x30000, /* reserved */ 0x40000, /* reserved */ 0x50000, /* reserved */ - 0x60000, /* reserved */ /* 0x110 */ + 0x60000, /* reserved */ 0x70000, /* reserved */ 0x80000, /* reserved */ 0x90000, /* reserved */ @@ -343,8 +350,8 @@ static long ucs_range[]={ 0xB0000, /* reserved */ 0xC0000, /* reserved */ 0xD0000, /* reserved */ - 0xE0000, /* Tags */ /* 0x118 */ - 0xE0100, /* Variation Selectors Supplement */ + 0xE0000, /* Tags */ + 0xE0100, /* Variation Selectors Supplement */ /* 0x120 */ 0xF0000, /* Supplementary Private Use Area-A */ 0x100000, /* Supplementary Private Use Area-B */ /* Value over 0x10FFFF is illegal under Unicode, @@ -353,7 +360,7 @@ static long ucs_range[]={ 0x120000, /* Reserved */ 0x130000, /* Reserved */ 0x140000, /* Reserved */ - 0x150000, /* Reserved */ /* 0x120 */ + 0x150000, /* Reserved */ 0x160000, /* Reserved */ 0x170000, /* Reserved */ 0x180000, /* Reserved */ @@ -361,8 +368,8 @@ static long ucs_range[]={ 0x1A0000, /* Reserved */ 0x1B0000, /* Reserved */ 0x1C0000, /* Reserved */ - 0x1D0000, /* Reserved */ /* 0x128 */ - 0x1E0000, /* Reserved */ + 0x1D0000, /* Reserved */ + 0x1E0000, /* Reserved */ /* 0x130 */ 0x1F0000, /* Reserved */ 0x200000, /* Reserved */ 0x210000, /* Reserved */ @@ -388,6 +395,14 @@ binary_search (long x, long *a, int left, int right) return left - 1; } +#define FEMININE_ORDINAL_INDICATOR 0x00AA +#define MASCULINE_ORDINAL_INDICATOR 0x00BA +#define LATIN_CAPITAL_LETTER_A_WITH_GRAVE 0x00C0 +#define LATIN_CAPITAL_LETTER_O_WITH_DIAERESIS 0x00D6 +#define LATIN_CAPITAL_LETTER_O_WITH_STROKE 0x00D8 +#define LATIN_SMALL_LETTER_O_WITH_DIAERESIS 0x00F6 +#define LATIN_SMALL_LETTER_O_WITH_STROKE 0x00F8 +#define LATIN_SMALL_LETTER_Y_WITH_DIAERESIS 0x00FF #define FULLWIDTH_DIGIT_0 0xFF10 #define FULLWIDTH_DIGIT_9 0xFF19 #define FULLWIDTH_CAPITAL_A 0xFF21 @@ -401,15 +416,30 @@ binary_search (long x, long *a, int left, int right) integer kcatcodekey(integer c) { + integer block; if (is_internalUPTEX()) { - 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 0x1FE; - if ( (HALFWIDTH_KATAKANA_WO <=c && c<=HALFWIDTH_KATAKANA_SMALL_TSU ) - || (HALFWIDTH_KATAKANA_A <=c && c<=HALFWIDTH_KATAKANA_N ) ) - return 0x1FF; - return binary_search((long)c, ucs_range, 0, NUCS_RANGE-1); + block = binary_search((long)c, ucs_range, 0, NUCS_RANGE-1); + if (block==0x01) { + /* Latin-1 Letters */ + if ( FEMININE_ORDINAL_INDICATOR ==c + || MASCULINE_ORDINAL_INDICATOR==c + || (LATIN_CAPITAL_LETTER_A_WITH_GRAVE <=c && c<=LATIN_CAPITAL_LETTER_O_WITH_DIAERESIS) + || (LATIN_CAPITAL_LETTER_O_WITH_STROKE<=c && c<=LATIN_SMALL_LETTER_O_WITH_DIAERESIS ) + || (LATIN_SMALL_LETTER_O_WITH_STROKE <=c && c<=LATIN_SMALL_LETTER_Y_WITH_DIAERESIS ) ) + return 0x1FD; + } + if (block==0xa0) { + /* Fullwidth ASCII variants except for U+FF01..FF0F, U+FF1A..FF20, U+FF3B..FF40, U+FF5B..FF5E */ + 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 0x1FE; + /* Halfwidth Katakana variants except for U+FF65, U+FF70, U+FF9E..FF9F */ + if ( (HALFWIDTH_KATAKANA_WO <=c && c<=HALFWIDTH_KATAKANA_SMALL_TSU ) + || (HALFWIDTH_KATAKANA_A <=c && c<=HALFWIDTH_KATAKANA_N ) ) + return 0x1FF; + } + return block; } else { return Hi(toDVI(c)); } diff --git a/Build/source/texk/web2c/uptexdir/upbibtex.ch b/Build/source/texk/web2c/uptexdir/upbibtex.ch index cdd750e9539..d0a5bc4d10d 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.22' +@d banner=='This is upBibTeX, Version 0.99d-j0.33-u1.23' @z @x diff --git a/Build/source/texk/web2c/uptexdir/updvitype.ch b/Build/source/texk/web2c/uptexdir/updvitype.ch index f6a5de7b5a9..b07de60f296 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.22' +@d banner=='This is upDVItype, Version 3.6-p0.4-u1.23' @z @x procedure initialize diff --git a/Build/source/texk/web2c/uptexdir/uppltotf.ch b/Build/source/texk/web2c/uptexdir/uppltotf.ch index 392c6e34be8..d1b033b7d72 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.22' +@d banner=='This is upPLtoTF, Version 3.6-p2.0-u1.23' @z @x diff --git a/Build/source/texk/web2c/uptexdir/uptex-m.ch b/Build/source/texk/web2c/uptexdir/uptex-m.ch index b89c1d2bad6..848783bce7a 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.22 +% This is a change file for upTeX u1.23 % By Takuji Tanaka. % % (02/26/2007) TTK upTeX u0.01 @@ -36,6 +36,8 @@ % (02/20/2016) TTK upTeX u1.21 % (01/15/2017) TTK upTeX u1.22 % (04/09/2017) TTK Hironori Kitagawa fixed a bug in \endlinechar. +% (2018-01-21) HK Added \uptexversion primitive and co. +% (2018-02-24) TTK upTeX u1.23 @x upTeX: banner {printed when \pTeX\ starts} @@ -43,8 +45,8 @@ {printed when \pTeX\ starts} @# @d upTeX_version=1 -@d upTeX_revision==".22" -@d upTeX_version_string=='-u1.22' {current u\pTeX\ version} +@d upTeX_revision==".23" +@d upTeX_version_string=='-u1.23' {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 @@ -237,22 +239,25 @@ for k:=0 to 511 do 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:=@"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 } - { \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(@"2):=not_cjk; { Latin Extended-A } + @t\hskip10pt@>kcat_code(@"24):=hangul; { Hangul Jamo } + @+@t\1@>for k:=@"66 to @"68 do kcat_code(k):=kanji; { CJK Radicals Supplement .. Ideographic Description Characters } + @+@t\1@>for k:=@"6A to @"6B do kcat_code(k):=kana; { Hiragana, Katakana } + @t\hskip10pt@>kcat_code(@"6C):=kanji; { Bopomofo } + @t\hskip10pt@>kcat_code(@"6D):=hangul; { Hangul Compatibility Jamo } + @+@t\1@>for k:=@"6E to @"70 do kcat_code(k):=kanji; { Kanbun .. CJK Strokes } + @t\hskip10pt@>kcat_code(@"71):=kana; { Katakana Phonetic Extensions } + @t\hskip10pt@>kcat_code(@"74):=kanji; { CJK Unified Ideographs Extension A } + @t\hskip10pt@>kcat_code(@"76):=kanji; { CJK Unified Ideographs } + @t\hskip10pt@>kcat_code(@"86):=hangul; { Hangul Jamo Extended-A } + @t\hskip10pt@>kcat_code(@"91):=hangul; { Hangul Syllables } + @t\hskip10pt@>kcat_code(@"92):=hangul; { Hangul Jamo Extended-B } + @t\hskip10pt@>kcat_code(@"97):=kanji; { CJK Compatibility Ideographs } + { \hskip10pt|kcat_code(@"A0):=other_kchar;| Halfwidth and Fullwidth Forms } + @t\hskip10pt@>kcat_code(@"F1):=kana; { Kana Supplement } + @t\hskip10pt@>kcat_code(@"F2):=kana; { Kana Extended-A } + @+@t\1@>for k:=@"10E to @"113 do kcat_code(k):=kanji; { CJK Unified Ideographs Extension B .. CJK Compatibility Ideographs Supplement } + @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 } end else begin diff --git a/Build/source/texk/web2c/uptexdir/uptex_version.h b/Build/source/texk/web2c/uptexdir/uptex_version.h index e41a4abd08e..669df3fda07 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.22" +#define UPTEX_VERSION "u1.23" diff --git a/Build/source/texk/web2c/uptexdir/uptftopl.ch b/Build/source/texk/web2c/uptexdir/uptftopl.ch index fb3cb224fe9..e9eed783e65 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.22' +@d banner=='This is upTFtoPL, Version 3.3-p2.0-u1.23' @z @x -- cgit v1.2.3