texlive[44804] Build/source/texk/makejvf: Improve hankaku-kana TFM
commits+hironobu at tug.org
commits+hironobu at tug.org
Sat Jul 15 06:06:19 CEST 2017
Revision: 44804
http://tug.org/svn/texlive?view=revision&revision=44804
Author: hironobu
Date: 2017-07-15 06:06:19 +0200 (Sat, 15 Jul 2017)
Log Message:
-----------
Improve hankaku-kana TFM support
Modified Paths:
--------------
trunk/Build/source/texk/makejvf/ChangeLog
trunk/Build/source/texk/makejvf/main.c
trunk/Build/source/texk/makejvf/makejvf.h
trunk/Build/source/texk/makejvf/uniblock.c
trunk/Build/source/texk/makejvf/uniblock.h
trunk/Build/source/texk/makejvf/write.c
Modified: trunk/Build/source/texk/makejvf/ChangeLog
===================================================================
--- trunk/Build/source/texk/makejvf/ChangeLog 2017-07-15 00:21:17 UTC (rev 44803)
+++ trunk/Build/source/texk/makejvf/ChangeLog 2017-07-15 04:06:19 UTC (rev 44804)
@@ -1,3 +1,9 @@
+2017-07-15 Hironobu Yamashita <h.y.acetaminophen at gmail.com>
+
+ * main.c, makejvf.h, uniblock.[ch], write.c: Move more non-Kanji
+ Unicode blocks to non-Kanji TFM on UCS mode. Support output of
+ Hankaku-kana PS TFM.
+
2017-07-12 Hironobu Yamashita <h.y.acetaminophen at gmail.com>
* write.c: Fix a bug in generating non-Kanji TFM on UCS mode.
Modified: trunk/Build/source/texk/makejvf/main.c
===================================================================
--- trunk/Build/source/texk/makejvf/main.c 2017-07-15 00:21:17 UTC (rev 44803)
+++ trunk/Build/source/texk/makejvf/main.c 2017-07-15 04:06:19 UTC (rev 44804)
@@ -120,15 +120,36 @@
tfmget(atfmname);
- maketfm(vtfmname);
+ vfp = vfopen(vfname);
+ pstfm_nt=1; /* initialize */
+ if (ucs) {
+ ib=0;
+ for (i=0;i<(useset3*2+1);i++)
+ for (j=0;j<65536;j++) {
+ ch=i*65536+j;
+ if (search_cjk_entry(&ib,ch,ucs))
+ writevfu(ch,vfp);
+ }
+ } else {
+ for (i=0;i<94;i++)
+ for (j=0;j<94;j++)
+ writevf((0x21+i)*256+(0x21+j),vfp);
+ }
+
+ vfclose(vfp);
+
if (kanatfm) {
if (FILESTRCASEEQ(&kanatfm[strlen(kanatfm)-4], ".tfm")) {
kanatfm[strlen(kanatfm)-4] = '\0';
}
maketfm(kanatfm);
+ pstfm_nt=1; /* already done*/
}
+ maketfm(vtfmname);
+ pstfm_nt=1; /* already done*/
+
if (jistfm) {
if (FILESTRCASEEQ(&jistfm[strlen(jistfm)-4], ".tfm")) {
jistfm[strlen(jistfm)-4] = '\0';
@@ -143,24 +164,6 @@
maketfm(ucsqtfm);
}
- vfp = vfopen(vfname);
-
- if (ucs) {
- ib=0;
- for (i=0;i<(useset3*2+1);i++)
- for (j=0;j<65536;j++) {
- ch=i*65536+j;
- if (search_cjk_entry(&ib,ch,ucs))
- writevfu(ch,vfp);
- }
- } else {
- for (i=0;i<94;i++)
- for (j=0;j<94;j++)
- writevf((0x21+i)*256+(0x21+j),vfp);
- }
-
- vfclose(vfp);
-
exit(0);
}
Modified: trunk/Build/source/texk/makejvf/makejvf.h
===================================================================
--- trunk/Build/source/texk/makejvf/makejvf.h 2017-07-15 00:21:17 UTC (rev 44803)
+++ trunk/Build/source/texk/makejvf/makejvf.h 2017-07-15 04:06:19 UTC (rev 44804)
@@ -26,6 +26,7 @@
int fputstr(char *str, int byte, FILE *fp);
/* write.c */
+int pstfm_nt,pstfm_codes[256];
FILE *vfopen(char *name);
void writevf(int code, FILE *fp);
void writevfu(int code, FILE *fp);
Modified: trunk/Build/source/texk/makejvf/uniblock.c
===================================================================
--- trunk/Build/source/texk/makejvf/uniblock.c 2017-07-15 00:21:17 UTC (rev 44803)
+++ trunk/Build/source/texk/makejvf/uniblock.c 2017-07-15 04:06:19 UTC (rev 44804)
@@ -7,6 +7,7 @@
struct ublock {
long min, max, cjk;
+ int kanji;
};
/*
@@ -27,284 +28,285 @@
*/
static struct ublock ublock_data[] = {
- {0x0000, 0x007F, ENTRY_GCJK}, /* Basic Latin */
- {0x0080, 0x00FF, ENTRY_GCJK}, /* Latin-1 Supplement */
- {0x0100, 0x017F, ENTRY_GCJK}, /* Latin Extended-A */
- {0x0180, 0x024F, ENTRY_GCJ }, /* Latin Extended-B */
- {0x0250, 0x02AF, ENTRY_GCJ }, /* IPA Extensions */
- {0x02B0, 0x02FF, ENTRY_GCJK}, /* Spacing Modifier Letters */
- {0x0300, 0x036F, ENTRY_CJ }, /* Combining Diacritical Marks */
- {0x0370, 0x03FF, ENTRY_GCJK}, /* Greek and Coptic */
- {0x0400, 0x04FF, ENTRY_GCJK}, /* Cyrillic */
- {0x0500, 0x052F, ENTRY_NO }, /* Cyrillic Supplement */
- {0x0530, 0x058F, ENTRY_NO }, /* Armenian */
- {0x0590, 0x05FF, ENTRY_NO }, /* Hebrew */
- {0x0600, 0x06FF, ENTRY_NO }, /* Arabic */
- {0x0700, 0x074F, ENTRY_NO }, /* Syriac */
- {0x0750, 0x077F, ENTRY_NO }, /* Arabic Supplement */
- {0x0780, 0x07BF, ENTRY_NO }, /* Thaana */
- {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 */
- {0x0A80, 0x0AFF, ENTRY_NO }, /* Gujarati */
- {0x0B00, 0x0B7F, ENTRY_NO }, /* Oriya */
- {0x0B80, 0x0BFF, ENTRY_NO }, /* Tamil */
- {0x0C00, 0x0C7F, ENTRY_NO }, /* Telugu */
- {0x0C80, 0x0CFF, ENTRY_NO }, /* Kannada */
- {0x0D00, 0x0D7F, ENTRY_NO }, /* Malayalam */
- {0x0D80, 0x0DFF, ENTRY_NO }, /* Sinhala */
- {0x0E00, 0x0E7F, ENTRY_NO }, /* Thai */
- {0x0E80, 0x0EFF, ENTRY_NO }, /* Lao */
- {0x0F00, 0x0FFF, ENTRY_NO }, /* Tibetan */
- {0x1000, 0x109F, ENTRY_NO }, /* Myanmar */
- {0x10A0, 0x10FF, ENTRY_NO }, /* Georgian */
- {0x1100, 0x11FF, ENTRY_K }, /* Hangul Jamo */
- {0x1200, 0x137F, ENTRY_NO }, /* Ethiopic */
- {0x1380, 0x139F, ENTRY_NO }, /* Ethiopic Supplement */
- {0x13A0, 0x13FF, ENTRY_NO }, /* Cherokee */
- {0x1400, 0x167F, ENTRY_NO }, /* Unified Canadian Aboriginal Syllabics */
- {0x1680, 0x169F, ENTRY_NO }, /* Ogham */
- {0x16A0, 0x16FF, ENTRY_NO }, /* Runic */
- {0x1700, 0x171F, ENTRY_NO }, /* Tagalog */
- {0x1720, 0x173F, ENTRY_NO }, /* Hanunoo */
- {0x1740, 0x175F, ENTRY_NO }, /* Buhid */
- {0x1760, 0x177F, ENTRY_NO }, /* Tagbanwa */
- {0x1780, 0x17FF, ENTRY_NO }, /* Khmer */
- {0x1800, 0x18AF, ENTRY_NO }, /* Mongolian */
- {0x18B0, 0x18FF, ENTRY_NO }, /* Unified Canadian Aboriginal Syllabics Extended */
- {0x1900, 0x194F, ENTRY_NO }, /* Limbu */
- {0x1950, 0x197F, ENTRY_NO }, /* Tai Le */
- {0x1980, 0x19DF, ENTRY_NO }, /* New Tai Lue */
- {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 */
- {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 */
- {0x1D80, 0x1DBF, ENTRY_NO }, /* Phonetic Extensions Supplement */
- {0x1DC0, 0x1DFF, ENTRY_NO }, /* Combining Diacritical Marks Supplement */
- {0x1E00, 0x1EFF, ENTRY_GCJ }, /* Latin Extended Additional */
- {0x1F00, 0x1FFF, ENTRY_J }, /* Greek Extended */
- {0x2000, 0x206F, ENTRY_GCJK}, /* General Punctuation */
- {0x2070, 0x209F, ENTRY_JK }, /* Superscripts and Subscripts */
- {0x20A0, 0x20CF, ENTRY_GCJK}, /* Currency Symbols */
- {0x20D0, 0x20FF, ENTRY_J }, /* Combining Diacritical Marks for Symbols */
- {0x2100, 0x214F, ENTRY_GCJK}, /* Letterlike Symbols */
- {0x2150, 0x218F, ENTRY_GCJK}, /* Number Forms */
- {0x2190, 0x21FF, ENTRY_GCJK}, /* Arrows */
- {0x2200, 0x22FF, ENTRY_GCJK}, /* Mathematical Operators */
- {0x2300, 0x23FF, ENTRY_GCJK}, /* Miscellaneous Technical */
- {0x2400, 0x243F, ENTRY_CJ }, /* Control Pictures */
- {0x2440, 0x245F, ENTRY_NO }, /* Optical Character Recognition */
- {0x2460, 0x24FF, ENTRY_GCJK}, /* Enclosed Alphanumerics */
- {0x2500, 0x257F, ENTRY_GCJK}, /* Box Drawing */
- {0x2580, 0x259F, ENTRY_GCJK}, /* Block Elements */
- {0x25A0, 0x25FF, ENTRY_GCJK}, /* Geometric Shapes */
- {0x2600, 0x26FF, ENTRY_GCJK}, /* Miscellaneous Symbols */
- {0x2700, 0x27BF, ENTRY_CJK }, /* Dingbats */
- {0x27C0, 0x27EF, ENTRY_NO }, /* Miscellaneous Mathematical Symbols-A */
- {0x27F0, 0x27FF, ENTRY_NO }, /* Supplemental Arrows-A */
- {0x2800, 0x28FF, ENTRY_NO }, /* Braille Patterns */
- {0x2900, 0x297F, ENTRY_J }, /* Supplemental Arrows-B */
- {0x2980, 0x29FF, ENTRY_J }, /* Miscellaneous Mathematical Symbols-B */
- {0x2A00, 0x2AFF, ENTRY_NO }, /* Supplemental Mathematical Operators */
- {0x2B00, 0x2BFF, ENTRY_J }, /* Miscellaneous Symbols and Arrows */
- {0x2C00, 0x2C5F, ENTRY_NO }, /* Glagolitic */
- {0x2C60, 0x2C7F, ENTRY_NO }, /* Latin Extended-C */
- {0x2C80, 0x2CFF, ENTRY_NO }, /* Coptic */
- {0x2D00, 0x2D2F, ENTRY_NO }, /* Georgian Supplement */
- {0x2D30, 0x2D7F, ENTRY_NO }, /* Tifinagh */
- {0x2D80, 0x2DDF, ENTRY_NO }, /* Ethiopic Extended */
- {0x2DE0, 0x2DFF, ENTRY_NO }, /* Cyrillic Extended-A */
- {0x2E00, 0x2E7F, ENTRY_NO }, /* Supplemental Punctuation */
- {0x2E80, 0x2EFF, ENTRY_GCJ }, /* CJK Radicals Supplement */
- {0x2F00, 0x2FDF, ENTRY_GCJK}, /* Kangxi Radicals */
- {0x2FF0, 0x2FFF, ENTRY_G }, /* Ideographic Description Characters */
- {0x3000, 0x303F, ENTRY_GCJK}, /* CJK Symbols and Punctuation */
- {0x3040, 0x309F, ENTRY_GCJK}, /* Hiragana */
- {0x30A0, 0x30FF, ENTRY_GCJK}, /* Katakana */
- {0x3100, 0x312F, ENTRY_GC }, /* Bopomofo */
- {0x3130, 0x318F, ENTRY_K }, /* Hangul Compatibility Jamo */
- {0x3190, 0x319F, ENTRY_J }, /* Kanbun */
- {0x31A0, 0x31BF, ENTRY_G }, /* Bopomofo Extended */
- {0x31C0, 0x31EF, ENTRY_C }, /* CJK Strokes */
- {0x31F0, 0x31FF, ENTRY_J }, /* Katakana Phonetic Extensions */
- {0x3200, 0x32FF, ENTRY_GCJK}, /* Enclosed CJK Letters and Months */
- {0x3300, 0x33FF, ENTRY_GCJK}, /* CJK Compatibility */
- {0x3400, 0x4DBF, ENTRY_GCJ }, /* CJK Unified Ideographs Extension A */
- {0x4DC0, 0x4DFF, ENTRY_NO }, /* Yijing Hexagram Symbols */
- {0x4E00, 0x9FFF, ENTRY_GCJK}, /* CJK Unified Ideographs */
- {0xA000, 0xA48F, ENTRY_G }, /* Yi Syllables */
- {0xA490, 0xA4CF, ENTRY_G }, /* Yi Radicals */
- {0xA4D0, 0xA4FF, ENTRY_NO }, /* Lisu */
- {0xA500, 0xA63F, ENTRY_NO }, /* Vai */
- {0xA640, 0xA69F, ENTRY_NO }, /* Cyrillic Extended-B */
- {0xA6A0, 0xA6FF, ENTRY_NO }, /* Bamum */
- {0xA700, 0xA71F, ENTRY_NO }, /* Modifier Tone Letters */
- {0xA720, 0xA7FF, ENTRY_NO }, /* Latin Extended-D */
- {0xA800, 0xA82F, ENTRY_NO }, /* Syloti Nagri */
- {0xA830, 0xA83F, ENTRY_NO }, /* Common Indic Number Forms */
- {0xA840, 0xA87F, ENTRY_NO }, /* Phags-pa */
- {0xA880, 0xA8DF, ENTRY_NO }, /* Saurashtra */
- {0xA8E0, 0xA8FF, ENTRY_NO }, /* Devanagari Extended */
- {0xA900, 0xA92F, ENTRY_NO }, /* Kayah Li */
- {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 */
- {0xAB70, 0xABBF, ENTRY_NO }, /* Cherokee Supplement */
- {0xABC0, 0xABFF, ENTRY_NO }, /* Meetei Mayek */
- {0xAC00, 0xD7AF, ENTRY_K }, /* Hangul Syllables */
- {0xD7B0, 0xD7FF, ENTRY_NO }, /* Hangul Jamo Extended-B */
- {0xD800, 0xDB7F, ENTRY_NO }, /* High Surrogates */
- {0xDB80, 0xDBFF, ENTRY_NO }, /* High Private Use Surrogates */
- {0xDC00, 0xDFFF, ENTRY_NO }, /* Low Surrogates */
- {0xE000, 0xF8FF, ENTRY_GCJK}, /* Private Use Area */
- {0xF900, 0xFAFF, ENTRY_GCJK}, /* CJK Compatibility Ideographs */
- {0xFB00, 0xFB4F, ENTRY_J }, /* Alphabetic Presentation Forms */
- {0xFB50, 0xFDFF, ENTRY_NO }, /* Arabic Presentation Forms-A */
- {0xFE00, 0xFE0F, ENTRY_NO }, /* Variation Selectors */
- {0xFE10, 0xFE1F, ENTRY_GCJ }, /* Vertical Forms */
- {0xFE20, 0xFE2F, ENTRY_NO }, /* Combining Half Marks */
- {0xFE30, 0xFE4F, ENTRY_GCJ }, /* CJK Compatibility Forms */
- {0xFE50, 0xFE6F, ENTRY_GC }, /* Small Form Variants */
- {0xFE70, 0xFEFF, ENTRY_NO }, /* Arabic Presentation Forms-B */
- {0xFF00, 0xFFEF, ENTRY_GCJK}, /* Halfwidth and Fullwidth Forms */
- {0xFFF0, 0xFFFF, ENTRY_NO }, /* Specials */
- {0x10000, 0x1007F, ENTRY_NO }, /* Linear B Syllabary */
- {0x10080, 0x100FF, ENTRY_NO }, /* Linear B Ideograms */
- {0x10100, 0x1013F, ENTRY_NO }, /* Aegean Numbers */
- {0x10140, 0x1018F, ENTRY_NO }, /* Ancient Greek Numbers */
- {0x10190, 0x101CF, ENTRY_NO }, /* Ancient Symbols */
- {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 */
- {0x104B0, 0x104FF, ENTRY_NO }, /* Osage */
- {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 */
- {0x108E0, 0x108FF, ENTRY_NO }, /* Hatran */
- {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 */
- {0x10C80, 0x10CFF, ENTRY_NO }, /* Old Hungarian */
- {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 */
- {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 */
- {0x13000, 0x1342F, ENTRY_NO }, /* Egyptian Hieroglyphs */
- {0x14400, 0x1467F, ENTRY_NO }, /* Anatolian 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 */
- {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 */
- {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 */
- {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 */
- {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 */
- {0x1F600, 0x1F64F, ENTRY_NO }, /* Emoticons */
- {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 */
- {0x1F900, 0x1F9FF, ENTRY_NO }, /* Supplemental Symbols and Pictographs */
- {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 */
- {0x2B820, 0x2CEAF, ENTRY_C }, /* CJK Unified Ideographs Extension E */
- {0x2F800, 0x2FA1F, ENTRY_CJ }, /* CJK Compatibility Ideographs Supplement */
- {0xE0000, 0xE007F, ENTRY_NO }, /* Tags */
- {0xE0100, 0xE01EF, ENTRY_NO }, /* Variation Selectors Supplement */
- {0xF0000, 0xFFFFF, ENTRY_NO }, /* Supplementary Private Use Area-A */
- {0x100000, 0x10FFFF, ENTRY_NO }, /* Supplementary Private Use Area-B */
- {0x200000, 0xFFFFFF, ENTRY_NO }, /* illegal */
+ {0x0000, 0x007F, ENTRY_GCJK, 0}, /* Basic Latin */
+ {0x0080, 0x00FF, ENTRY_GCJK, 0}, /* Latin-1 Supplement */
+ {0x0100, 0x017F, ENTRY_GCJK, 0}, /* Latin Extended-A */
+ {0x0180, 0x024F, ENTRY_GCJ , 0}, /* Latin Extended-B */
+ {0x0250, 0x02AF, ENTRY_GCJ , 0}, /* IPA Extensions */
+ {0x02B0, 0x02FF, ENTRY_GCJK, 0}, /* Spacing Modifier Letters */
+ {0x0300, 0x036F, ENTRY_CJ , 0}, /* Combining Diacritical Marks */
+ {0x0370, 0x03FF, ENTRY_GCJK, 0}, /* Greek and Coptic */
+ {0x0400, 0x04FF, ENTRY_GCJK, 0}, /* Cyrillic */
+ {0x0500, 0x052F, ENTRY_NO , 0}, /* Cyrillic Supplement */
+ {0x0530, 0x058F, ENTRY_NO , 0}, /* Armenian */
+ {0x0590, 0x05FF, ENTRY_NO , 0}, /* Hebrew */
+ {0x0600, 0x06FF, ENTRY_NO , 0}, /* Arabic */
+ {0x0700, 0x074F, ENTRY_NO , 0}, /* Syriac */
+ {0x0750, 0x077F, ENTRY_NO , 0}, /* Arabic Supplement */
+ {0x0780, 0x07BF, ENTRY_NO , 0}, /* Thaana */
+ {0x07C0, 0x07FF, ENTRY_NO , 0}, /* NKo */
+ {0x0800, 0x083F, ENTRY_NO , 0}, /* Samaritan */
+ {0x0840, 0x085F, ENTRY_NO , 0}, /* Mandaic */
+ {0x08A0, 0x08FF, ENTRY_NO , 0}, /* Arabic Extended-A */
+ {0x0900, 0x097F, ENTRY_NO , 0}, /* Devanagari */
+ {0x0980, 0x09FF, ENTRY_NO , 0}, /* Bengali */
+ {0x0A00, 0x0A7F, ENTRY_NO , 0}, /* Gurmukhi */
+ {0x0A80, 0x0AFF, ENTRY_NO , 0}, /* Gujarati */
+ {0x0B00, 0x0B7F, ENTRY_NO , 0}, /* Oriya */
+ {0x0B80, 0x0BFF, ENTRY_NO , 0}, /* Tamil */
+ {0x0C00, 0x0C7F, ENTRY_NO , 0}, /* Telugu */
+ {0x0C80, 0x0CFF, ENTRY_NO , 0}, /* Kannada */
+ {0x0D00, 0x0D7F, ENTRY_NO , 0}, /* Malayalam */
+ {0x0D80, 0x0DFF, ENTRY_NO , 0}, /* Sinhala */
+ {0x0E00, 0x0E7F, ENTRY_NO , 0}, /* Thai */
+ {0x0E80, 0x0EFF, ENTRY_NO , 0}, /* Lao */
+ {0x0F00, 0x0FFF, ENTRY_NO , 0}, /* Tibetan */
+ {0x1000, 0x109F, ENTRY_NO , 0}, /* Myanmar */
+ {0x10A0, 0x10FF, ENTRY_NO , 0}, /* Georgian */
+ {0x1100, 0x11FF, ENTRY_K , 0}, /* Hangul Jamo */
+ {0x1200, 0x137F, ENTRY_NO , 0}, /* Ethiopic */
+ {0x1380, 0x139F, ENTRY_NO , 0}, /* Ethiopic Supplement */
+ {0x13A0, 0x13FF, ENTRY_NO , 0}, /* Cherokee */
+ {0x1400, 0x167F, ENTRY_NO , 0}, /* Unified Canadian Aboriginal Syllabics */
+ {0x1680, 0x169F, ENTRY_NO , 0}, /* Ogham */
+ {0x16A0, 0x16FF, ENTRY_NO , 0}, /* Runic */
+ {0x1700, 0x171F, ENTRY_NO , 0}, /* Tagalog */
+ {0x1720, 0x173F, ENTRY_NO , 0}, /* Hanunoo */
+ {0x1740, 0x175F, ENTRY_NO , 0}, /* Buhid */
+ {0x1760, 0x177F, ENTRY_NO , 0}, /* Tagbanwa */
+ {0x1780, 0x17FF, ENTRY_NO , 0}, /* Khmer */
+ {0x1800, 0x18AF, ENTRY_NO , 0}, /* Mongolian */
+ {0x18B0, 0x18FF, ENTRY_NO , 0}, /* Unified Canadian Aboriginal Syllabics Extended */
+ {0x1900, 0x194F, ENTRY_NO , 0}, /* Limbu */
+ {0x1950, 0x197F, ENTRY_NO , 0}, /* Tai Le */
+ {0x1980, 0x19DF, ENTRY_NO , 0}, /* New Tai Lue */
+ {0x19E0, 0x19FF, ENTRY_NO , 0}, /* Khmer Symbols */
+ {0x1A00, 0x1A1F, ENTRY_NO , 0}, /* Buginese */
+ {0x1A20, 0x1AAF, ENTRY_NO , 0}, /* Tai Tham */
+ {0x1AB0, 0x1AFF, ENTRY_NO , 0}, /* Combining Diacritical Marks Extended */
+ {0x1B00, 0x1B7F, ENTRY_NO , 0}, /* Balinese */
+ {0x1B80, 0x1BBF, ENTRY_NO , 0}, /* Sundanese */
+ {0x1BC0, 0x1BFF, ENTRY_NO , 0}, /* Batak */
+ {0x1C00, 0x1C4F, ENTRY_NO , 0}, /* Lepcha */
+ {0x1C50, 0x1C7F, ENTRY_NO , 0}, /* Ol Chiki */
+ {0x1C80, 0x1C8F, ENTRY_NO , 0}, /* Cyrillic Extended-C */
+ {0x1CC0, 0x1CCF, ENTRY_NO , 0}, /* Sundanese Supplement */
+ {0x1CD0, 0x1CFF, ENTRY_NO , 0}, /* Vedic Extensions */
+ {0x1D00, 0x1D7F, ENTRY_NO , 0}, /* Phonetic Extensions */
+ {0x1D80, 0x1DBF, ENTRY_NO , 0}, /* Phonetic Extensions Supplement */
+ {0x1DC0, 0x1DFF, ENTRY_NO , 0}, /* Combining Diacritical Marks Supplement */
+ {0x1E00, 0x1EFF, ENTRY_GCJ , 0}, /* Latin Extended Additional */
+ {0x1F00, 0x1FFF, ENTRY_J , 0}, /* Greek Extended */
+ {0x2000, 0x206F, ENTRY_GCJK, 0}, /* General Punctuation */
+ {0x2070, 0x209F, ENTRY_JK , 0}, /* Superscripts and Subscripts */
+ {0x20A0, 0x20CF, ENTRY_GCJK, 0}, /* Currency Symbols */
+ {0x20D0, 0x20FF, ENTRY_J , 0}, /* Combining Diacritical Marks for Symbols */
+ {0x2100, 0x214F, ENTRY_GCJK, 0}, /* Letterlike Symbols */
+ {0x2150, 0x218F, ENTRY_GCJK, 0}, /* Number Forms */
+ {0x2190, 0x21FF, ENTRY_GCJK, 0}, /* Arrows */
+ {0x2200, 0x22FF, ENTRY_GCJK, 0}, /* Mathematical Operators */
+ {0x2300, 0x23FF, ENTRY_GCJK, 0}, /* Miscellaneous Technical */
+ {0x2400, 0x243F, ENTRY_CJ , 0}, /* Control Pictures */
+ {0x2440, 0x245F, ENTRY_NO , 0}, /* Optical Character Recognition */
+ {0x2460, 0x24FF, ENTRY_GCJK, 0}, /* Enclosed Alphanumerics */
+ {0x2500, 0x257F, ENTRY_GCJK, 0}, /* Box Drawing */
+ {0x2580, 0x259F, ENTRY_GCJK, 0}, /* Block Elements */
+ {0x25A0, 0x25FF, ENTRY_GCJK, 0}, /* Geometric Shapes */
+ {0x2600, 0x26FF, ENTRY_GCJK, 0}, /* Miscellaneous Symbols */
+ {0x2700, 0x27BF, ENTRY_CJK , 0}, /* Dingbats */
+ {0x27C0, 0x27EF, ENTRY_NO , 0}, /* Miscellaneous Mathematical Symbols-A */
+ {0x27F0, 0x27FF, ENTRY_NO , 0}, /* Supplemental Arrows-A */
+ {0x2800, 0x28FF, ENTRY_NO , 0}, /* Braille Patterns */
+ {0x2900, 0x297F, ENTRY_J , 0}, /* Supplemental Arrows-B */
+ {0x2980, 0x29FF, ENTRY_J , 0}, /* Miscellaneous Mathematical Symbols-B */
+ {0x2A00, 0x2AFF, ENTRY_NO , 0}, /* Supplemental Mathematical Operators */
+ {0x2B00, 0x2BFF, ENTRY_J , 0}, /* Miscellaneous Symbols and Arrows */
+ {0x2C00, 0x2C5F, ENTRY_NO , 0}, /* Glagolitic */
+ {0x2C60, 0x2C7F, ENTRY_NO , 0}, /* Latin Extended-C */
+ {0x2C80, 0x2CFF, ENTRY_NO , 0}, /* Coptic */
+ {0x2D00, 0x2D2F, ENTRY_NO , 0}, /* Georgian Supplement */
+ {0x2D30, 0x2D7F, ENTRY_NO , 0}, /* Tifinagh */
+ {0x2D80, 0x2DDF, ENTRY_NO , 0}, /* Ethiopic Extended */
+ {0x2DE0, 0x2DFF, ENTRY_NO , 0}, /* Cyrillic Extended-A */
+ {0x2E00, 0x2E7F, ENTRY_NO , 0}, /* Supplemental Punctuation */
+ {0x2E80, 0x2EFF, ENTRY_GCJ , 0}, /* CJK Radicals Supplement */
+ {0x2F00, 0x2FDF, ENTRY_GCJK, 0}, /* Kangxi Radicals */
+ {0x2FF0, 0x2FFF, ENTRY_G , 0}, /* Ideographic Description Characters */
+ {0x3000, 0x303F, ENTRY_GCJK, 0}, /* CJK Symbols and Punctuation */
+ {0x3040, 0x309F, ENTRY_GCJK, 0}, /* Hiragana */
+ {0x30A0, 0x30FF, ENTRY_GCJK, 0}, /* Katakana */
+ {0x3100, 0x312F, ENTRY_GC , 0}, /* Bopomofo */
+ {0x3130, 0x318F, ENTRY_K , 0}, /* Hangul Compatibility Jamo */
+ {0x3190, 0x319F, ENTRY_J , 0}, /* Kanbun */
+ {0x31A0, 0x31BF, ENTRY_G , 0}, /* Bopomofo Extended */
+ {0x31C0, 0x31EF, ENTRY_C , 0}, /* CJK Strokes */
+ {0x31F0, 0x31FF, ENTRY_J , 0}, /* Katakana Phonetic Extensions */
+ {0x3200, 0x32FF, ENTRY_GCJK, 0}, /* Enclosed CJK Letters and Months */
+ {0x3300, 0x33FF, ENTRY_GCJK, 0}, /* CJK Compatibility */
+ {0x3400, 0x4DBF, ENTRY_GCJ , 1}, /* CJK Unified Ideographs Extension A */
+ {0x4DC0, 0x4DFF, ENTRY_NO , 0}, /* Yijing Hexagram Symbols */
+ {0x4E00, 0x9FFF, ENTRY_GCJK, 1}, /* CJK Unified Ideographs */
+ {0xA000, 0xA48F, ENTRY_G , 0}, /* Yi Syllables */
+ {0xA490, 0xA4CF, ENTRY_G , 0}, /* Yi Radicals */
+ {0xA4D0, 0xA4FF, ENTRY_NO , 0}, /* Lisu */
+ {0xA500, 0xA63F, ENTRY_NO , 0}, /* Vai */
+ {0xA640, 0xA69F, ENTRY_NO , 0}, /* Cyrillic Extended-B */
+ {0xA6A0, 0xA6FF, ENTRY_NO , 0}, /* Bamum */
+ {0xA700, 0xA71F, ENTRY_NO , 0}, /* Modifier Tone Letters */
+ {0xA720, 0xA7FF, ENTRY_NO , 0}, /* Latin Extended-D */
+ {0xA800, 0xA82F, ENTRY_NO , 0}, /* Syloti Nagri */
+ {0xA830, 0xA83F, ENTRY_NO , 0}, /* Common Indic Number Forms */
+ {0xA840, 0xA87F, ENTRY_NO , 0}, /* Phags-pa */
+ {0xA880, 0xA8DF, ENTRY_NO , 0}, /* Saurashtra */
+ {0xA8E0, 0xA8FF, ENTRY_NO , 0}, /* Devanagari Extended */
+ {0xA900, 0xA92F, ENTRY_NO , 0}, /* Kayah Li */
+ {0xA930, 0xA95F, ENTRY_NO , 0}, /* Rejang */
+ {0xA960, 0xA97F, ENTRY_NO , 0}, /* Hangul Jamo Extended-A */
+ {0xA980, 0xA9DF, ENTRY_NO , 0}, /* Javanese */
+ {0xA9E0, 0xA9FF, ENTRY_NO , 0}, /* Myanmar Extended-B */
+ {0xAA00, 0xAA5F, ENTRY_NO , 0}, /* Cham */
+ {0xAA60, 0xAA7F, ENTRY_NO , 0}, /* Myanmar Extended-A */
+ {0xAA80, 0xAADF, ENTRY_NO , 0}, /* Tai Viet */
+ {0xAAE0, 0xAAFF, ENTRY_NO , 0}, /* Meetei Mayek Extensions */
+ {0xAB00, 0xAB2F, ENTRY_NO , 0}, /* Ethiopic Extended-A */
+ {0xAB30, 0xAB6F, ENTRY_NO , 0}, /* Latin Extended-E */
+ {0xAB70, 0xABBF, ENTRY_NO , 0}, /* Cherokee Supplement */
+ {0xABC0, 0xABFF, ENTRY_NO , 0}, /* Meetei Mayek */
+ {0xAC00, 0xD7AF, ENTRY_K , 0}, /* Hangul Syllables */
+ {0xD7B0, 0xD7FF, ENTRY_NO , 0}, /* Hangul Jamo Extended-B */
+ {0xD800, 0xDB7F, ENTRY_NO , 0}, /* High Surrogates */
+ {0xDB80, 0xDBFF, ENTRY_NO , 0}, /* High Private Use Surrogates */
+ {0xDC00, 0xDFFF, ENTRY_NO , 0}, /* Low Surrogates */
+ {0xE000, 0xF8FF, ENTRY_GCJK, 0}, /* Private Use Area */
+ {0xF900, 0xFAFF, ENTRY_GCJK, 1}, /* CJK Compatibility Ideographs */
+ {0xFB00, 0xFB4F, ENTRY_J , 0}, /* Alphabetic Presentation Forms */
+ {0xFB50, 0xFDFF, ENTRY_NO , 0}, /* Arabic Presentation Forms-A */
+ {0xFE00, 0xFE0F, ENTRY_NO , 0}, /* Variation Selectors */
+ {0xFE10, 0xFE1F, ENTRY_GCJ , 0}, /* Vertical Forms */
+ {0xFE20, 0xFE2F, ENTRY_NO , 0}, /* Combining Half Marks */
+ {0xFE30, 0xFE4F, ENTRY_GCJ , 0}, /* CJK Compatibility Forms */
+ {0xFE50, 0xFE6F, ENTRY_GC , 0}, /* Small Form Variants */
+ {0xFE70, 0xFEFF, ENTRY_NO , 0}, /* Arabic Presentation Forms-B */
+ {0xFF00, 0xFFEF, ENTRY_GCJK, 0}, /* Halfwidth and Fullwidth Forms */
+ {0xFFF0, 0xFFFF, ENTRY_NO , 0}, /* Specials */
+ {0x10000, 0x1007F, ENTRY_NO , 0}, /* Linear B Syllabary */
+ {0x10080, 0x100FF, ENTRY_NO , 0}, /* Linear B Ideograms */
+ {0x10100, 0x1013F, ENTRY_NO , 0}, /* Aegean Numbers */
+ {0x10140, 0x1018F, ENTRY_NO , 0}, /* Ancient Greek Numbers */
+ {0x10190, 0x101CF, ENTRY_NO , 0}, /* Ancient Symbols */
+ {0x101D0, 0x101FF, ENTRY_NO , 0}, /* Phaistos Disc */
+ {0x10280, 0x1029F, ENTRY_NO , 0}, /* Lycian */
+ {0x102A0, 0x102DF, ENTRY_NO , 0}, /* Carian */
+ {0x102E0, 0x102FF, ENTRY_NO , 0}, /* Coptic Epact Numbers */
+ {0x10300, 0x1032F, ENTRY_NO , 0}, /* Old Italic */
+ {0x10330, 0x1034F, ENTRY_NO , 0}, /* Gothic */
+ {0x10350, 0x1037F, ENTRY_NO , 0}, /* Old Permic */
+ {0x10380, 0x1039F, ENTRY_NO , 0}, /* Ugaritic */
+ {0x103A0, 0x103DF, ENTRY_NO , 0}, /* Old Persian */
+ {0x10400, 0x1044F, ENTRY_NO , 0}, /* Deseret */
+ {0x10450, 0x1047F, ENTRY_NO , 0}, /* Shavian */
+ {0x10480, 0x104AF, ENTRY_NO , 0}, /* Osmanya */
+ {0x104B0, 0x104FF, ENTRY_NO , 0}, /* Osage */
+ {0x10500, 0x1052F, ENTRY_NO , 0}, /* Elbasan */
+ {0x10530, 0x1056F, ENTRY_NO , 0}, /* Caucasian Albanian */
+ {0x10600, 0x1077F, ENTRY_NO , 0}, /* Linear A */
+ {0x10800, 0x1083F, ENTRY_NO , 0}, /* Cypriot Syllabary */
+ {0x10840, 0x1085F, ENTRY_NO , 0}, /* Imperial Aramaic */
+ {0x10860, 0x1087F, ENTRY_NO , 0}, /* Palmyrene */
+ {0x10880, 0x108AF, ENTRY_NO , 0}, /* Nabataean */
+ {0x108E0, 0x108FF, ENTRY_NO , 0}, /* Hatran */
+ {0x10900, 0x1091F, ENTRY_NO , 0}, /* Phoenician */
+ {0x10920, 0x1093F, ENTRY_NO , 0}, /* Lydian */
+ {0x10980, 0x1099F, ENTRY_NO , 0}, /* Meroitic Hieroglyphs */
+ {0x109A0, 0x109FF, ENTRY_NO , 0}, /* Meroitic Cursive */
+ {0x10A00, 0x10A5F, ENTRY_NO , 0}, /* Kharoshthi */
+ {0x10A60, 0x10A7F, ENTRY_NO , 0}, /* Old South Arabian */
+ {0x10A80, 0x10A9F, ENTRY_NO , 0}, /* Old North Arabian */
+ {0x10AC0, 0x10AFF, ENTRY_NO , 0}, /* Manichaean */
+ {0x10B00, 0x10B3F, ENTRY_NO , 0}, /* Avestan */
+ {0x10B40, 0x10B5F, ENTRY_NO , 0}, /* Inscriptional Parthian */
+ {0x10B60, 0x10B7F, ENTRY_NO , 0}, /* Inscriptional Pahlavi */
+ {0x10B80, 0x10BAF, ENTRY_NO , 0}, /* Psalter Pahlavi */
+ {0x10C00, 0x10C4F, ENTRY_NO , 0}, /* Old Turkic */
+ {0x10C80, 0x10CFF, ENTRY_NO , 0}, /* Old Hungarian */
+ {0x10E60, 0x10E7F, ENTRY_NO , 0}, /* Rumi Numeral Symbols */
+ {0x11000, 0x1107F, ENTRY_NO , 0}, /* Brahmi */
+ {0x11080, 0x110CF, ENTRY_NO , 0}, /* Kaithi */
+ {0x110D0, 0x110FF, ENTRY_NO , 0}, /* Sora Sompeng */
+ {0x11100, 0x1114F, ENTRY_NO , 0}, /* Chakma */
+ {0x11150, 0x1117F, ENTRY_NO , 0}, /* Mahajani */
+ {0x11180, 0x111DF, ENTRY_NO , 0}, /* Sharada */
+ {0x111E0, 0x111FF, ENTRY_NO , 0}, /* Sinhala Archaic Numbers*/
+ {0x11200, 0x1124F, ENTRY_NO , 0}, /* Khojki */
+ {0x11280, 0x112AF, ENTRY_NO , 0}, /* Multani */
+ {0x112B0, 0x112FF, ENTRY_NO , 0}, /* Khudawadi */
+ {0x11300, 0x1137F, ENTRY_NO , 0}, /* Grantha */
+ {0x11400, 0x1147F, ENTRY_NO , 0}, /* Newa */
+ {0x11480, 0x114DF, ENTRY_NO , 0}, /* Tirhuta */
+ {0x11580, 0x115FF, ENTRY_NO , 0}, /* Siddham */
+ {0x11600, 0x1165F, ENTRY_NO , 0}, /* Modi */
+ {0x11660, 0x1167F, ENTRY_NO , 0}, /* Mongolian Supplement */
+ {0x11680, 0x116CF, ENTRY_NO , 0}, /* Takri */
+ {0x11700, 0x1173F, ENTRY_NO , 0}, /* Ahom */
+ {0x118A0, 0x118FF, ENTRY_NO , 0}, /* Warang Citi */
+ {0x11AC0, 0x11AFF, ENTRY_NO , 0}, /* Pau Cin Hau */
+ {0x11C00, 0x11C6F, ENTRY_NO , 0}, /* Bhaiksuki */
+ {0x11C70, 0x11CBF, ENTRY_NO , 0}, /* Marchen */
+ {0x12000, 0x123FF, ENTRY_NO , 0}, /* Cuneiform */
+ {0x12400, 0x1247F, ENTRY_NO , 0}, /* Cuneiform Numbers and Punctuation */
+ {0x12480, 0x1254F, ENTRY_NO , 0}, /* Early Dynastic Cuneiform */
+ {0x13000, 0x1342F, ENTRY_NO , 0}, /* Egyptian Hieroglyphs */
+ {0x14400, 0x1467F, ENTRY_NO , 0}, /* Anatolian Hieroglyphs */
+ {0x16800, 0x16A3F, ENTRY_NO , 0}, /* Bamum Supplement */
+ {0x16A40, 0x16A6F, ENTRY_NO , 0}, /* Mro */
+ {0x16AD0, 0x16AFF, ENTRY_NO , 0}, /* Bassa Vah */
+ {0x16B00, 0x16B8F, ENTRY_NO , 0}, /* Pahawh Hmong */
+ {0x16F00, 0x16F9F, ENTRY_NO , 0}, /* Miao */
+ {0x16FE0, 0x16FFF, ENTRY_NO , 0}, /* Ideographic Symbols and Punctuation */
+ {0x17000, 0x187FF, ENTRY_NO , 0}, /* Tangut */
+ {0x18800, 0x18AFF, ENTRY_NO , 0}, /* Tangut Components */
+ {0x1B000, 0x1B0FF, ENTRY_NO , 0}, /* Kana Supplement */
+ {0x1BC00, 0x1BC9F, ENTRY_NO , 0}, /* Duployan */
+ {0x1BCA0, 0x1BCAF, ENTRY_NO , 0}, /* Shorthand Format Controls */
+ {0x1D000, 0x1D0FF, ENTRY_NO , 0}, /* Byzantine Musical Symbols */
+ {0x1D100, 0x1D1FF, ENTRY_NO , 0}, /* Musical Symbols */
+ {0x1D200, 0x1D24F, ENTRY_NO , 0}, /* Ancient Greek Musical Notation */
+ {0x1D300, 0x1D35F, ENTRY_NO , 0}, /* Tai Xuan Jing Symbols */
+ {0x1D360, 0x1D37F, ENTRY_NO , 0}, /* Counting Rod Numerals */
+ {0x1D400, 0x1D7FF, ENTRY_NO , 0}, /* Mathematical Alphanumeric Symbols */
+ {0x1D800, 0x1DAAF, ENTRY_NO , 0}, /* Sutton SignWriting */
+ {0x1E000, 0x1E02F, ENTRY_NO , 0}, /* Glagolitic Supplement */
+ {0x1E800, 0x1E8DF, ENTRY_NO , 0}, /* Mende Kikakui */
+ {0x1E900, 0x1E95F, ENTRY_NO , 0}, /* Adlam */
+ {0x1EE00, 0x1EEFF, ENTRY_NO , 0}, /* Arabic Mathematical Alphabetic Symbols */
+ {0x1F000, 0x1F02F, ENTRY_NO , 0}, /* Mahjong Tiles */
+ {0x1F030, 0x1F09F, ENTRY_NO , 0}, /* Domino Tiles */
+ {0x1F0A0, 0x1F0FF, ENTRY_NO , 0}, /* Playing Cards */
+ {0x1F100, 0x1F1FF, ENTRY_J , 0}, /* Enclosed Alphanumeric Supplement */
+ {0x1F200, 0x1F2FF, ENTRY_J , 0}, /* Enclosed Ideographic Supplement */
+ {0x1F300, 0x1F5FF, ENTRY_NO , 0}, /* Miscellaneous Symbols and Pictographs */
+ {0x1F600, 0x1F64F, ENTRY_NO , 0}, /* Emoticons */
+ {0x1F650, 0x1F67F, ENTRY_NO , 0}, /* Ornamental Dingbats */
+ {0x1F680, 0x1F6FF, ENTRY_NO , 0}, /* Transport and Map Symbols */
+ {0x1F700, 0x1F77F, ENTRY_NO , 0}, /* Alchemical Symbols */
+ {0x1F780, 0x1F7FF, ENTRY_NO , 0}, /* Geometric Shapes Extended */
+ {0x1F800, 0x1F8FF, ENTRY_NO , 0}, /* Supplemental Arrows-C */
+ {0x1F900, 0x1F9FF, ENTRY_NO , 0}, /* Supplemental Symbols and Pictographs */
+ {0x20000, 0x2A6DF, ENTRY_GCJ , 1}, /* CJK Unified Ideographs Extension B */
+ {0x2A700, 0x2B73F, ENTRY_CJ , 1}, /* CJK Unified Ideographs Extension C */
+ {0x2B740, 0x2B81F, ENTRY_J , 1}, /* CJK Unified Ideographs Extension D */
+ {0x2B820, 0x2CEAF, ENTRY_C , 1}, /* CJK Unified Ideographs Extension E */
+ {0x2F800, 0x2FA1F, ENTRY_CJ , 1}, /* CJK Compatibility Ideographs Supplement */
+ {0xE0000, 0xE007F, ENTRY_NO , 0}, /* Tags */
+ {0xE0100, 0xE01EF, ENTRY_NO , 0}, /* Variation Selectors Supplement */
+ {0xF0000, 0xFFFFF, ENTRY_NO , 0}, /* Supplementary Private Use Area-A */
+ {0x100000, 0x10FFFF, ENTRY_NO , 0}, /* Supplementary Private Use Area-B */
+ {0x200000, 0xFFFFFF, ENTRY_NO , 0}, /* illegal */
};
int search_cjk_entry(int *ib, long ch, long cjk) {
+ uniblock_iskanji = 0; /* initialize */
if (cjk==ENTRY_NO) return 1;
if (cjk==ENTRY_JQ) return
(ch==U_OPEN_SQUOTE || ch==U_CLOSE_SQUOTE
@@ -311,6 +313,7 @@
|| ch==U_OPEN_DQUOTE || ch==U_CLOSE_DQUOTE);
while(ublock_data[*ib].max<ch) (*ib)++;
if (ublock_data[*ib].min<=ch && ch<=ublock_data[*ib].max) {
+ uniblock_iskanji = ublock_data[*ib].kanji;
return ublock_data[*ib].cjk & cjk;
} else {
return 0;
Modified: trunk/Build/source/texk/makejvf/uniblock.h
===================================================================
--- trunk/Build/source/texk/makejvf/uniblock.h 2017-07-15 00:21:17 UTC (rev 44803)
+++ trunk/Build/source/texk/makejvf/uniblock.h 2017-07-15 04:06:19 UTC (rev 44804)
@@ -20,6 +20,7 @@
#define ENTRY_GCJK ENTRY_G|ENTRY_C|ENTRY_J|ENTRY_K
extern int search_cjk_entry(int *ib, long ch, long cjk);
+int uniblock_iskanji;
#define U_OPEN_SQUOTE 0x2018
#define U_CLOSE_SQUOTE 0x2019
Modified: trunk/Build/source/texk/makejvf/write.c
===================================================================
--- trunk/Build/source/texk/makejvf/write.c 2017-07-15 00:21:17 UTC (rev 44803)
+++ trunk/Build/source/texk/makejvf/write.c 2017-07-15 04:06:19 UTC (rev 44804)
@@ -654,7 +654,10 @@
case 0xFF90: case 0xFF91: case 0xFF92: case 0xFF93: case 0xFF94: case 0xFF95: case 0xFF96: case 0xFF97:
case 0xFF98: case 0xFF99: case 0xFF9A: case 0xFF9B: case 0xFF9C: case 0xFF9D: case 0xFF9E: case 0xFF9F:
if (jfm_id == 11 && hankana) { /* Ⱦ\xB3\xD1\xCAҲ\xBE̾\xA1\xA2\xB2\xA3\xBD\xFE */
- cc=3;
+ if (kanatfm)
+ cc=4;
+ else
+ cc=3;
if (skip2)
cc+=numcount(skip2)+1;
fputnum(cc,4,fp);
@@ -664,13 +667,16 @@
fputc(157+numcount(skip2)-1,fp); /* DOWN */
fputnum2(skip2,fp);
}
+ if (kanatfm) fputc(173+fidshift,fp); /* FONT_NUM_2 */
fputc(129,fp); /* SET2 */
fputnum(code,2,fp); /* char code */
+ pstfm_codes[pstfm_nt-1]=code;
+ pstfm_nt+=1;
return;
}
default:
if (w != zw) {
- if ((code >= 0x3041 && code <= 0x33FF) && kanatume>=0) {
+ if (!uniblock_iskanji && kanatume>=0) {
sprintf(buf2,"CH <%X>",code);
rewind(afp);
while (fgets(buf,255,afp)!=NULL) {
@@ -788,7 +794,7 @@
fputnum2(skip2,fp);
}
if (kanatfm) {
- if (code <= 0x33FF)
+ if (!uniblock_iskanji)
fputc(173+fidshift,fp); /* FONT_NUM_2 */
else
fputc(172+fidshift,fp); /* FONT_NUM_1 */
@@ -817,6 +823,7 @@
{
char nbuf[256];
FILE *fp;
+ int i;
strcpy(nbuf,name);
strcat(nbuf,".tfm");
@@ -827,12 +834,22 @@
}
fputnum(jfm_id,2,fp); /* JFM ID */
- fputnum(1,2,fp); /* number of char type */
- fputnum(27,2,fp); /* file words */
+ fputnum(pstfm_nt,2,fp); /* number of char type */
+ if (pstfm_nt>1)
+ fputnum(27+pstfm_nt+1,2,fp); /* file words */
+ else
+ fputnum(27,2,fp); /* file words */
fputnum(2,2,fp); /* header words */
- fputnum(0,2,fp); /* min of char type */
- fputnum(0,2,fp); /* max of char type */
- fputnum(2,2,fp); /* width words */
+ if (pstfm_nt>1) {
+ fputnum(0,2,fp); /* min of char type */
+ fputnum(1,2,fp); /* max of char type */
+ fputnum(3,2,fp); /* width words */
+ }
+ else {
+ fputnum(0,2,fp); /* min of char type */
+ fputnum(0,2,fp); /* max of char type */
+ fputnum(2,2,fp); /* width words */
+ }
fputnum(2,2,fp); /* height words */
fputnum(2,2,fp); /* depth words */
fputnum(1,2,fp); /* italic words */
@@ -844,12 +861,24 @@
fputnum(0,4,fp); /* check sum */
fputnum(10*(1<<20),4,fp); /* design size */
+ /* others */
fputnum(0,2,fp); /* char code */
fputnum(0,2,fp); /* char type */
+ /* hankaku-kana */
+ for (i=0;i<pstfm_nt-1;i++) {
+ fputnum(pstfm_codes[i],2,fp); /* char code */
+ fputnum(1,2,fp); /* char type */
+ }
+ /* hankaku-kana */
+ if (pstfm_nt>1)
+ fputnum((2<<24)+(1<<20)+(1<<16),4,fp); /* char info */
+ /* others */
fputnum((1<<24)+(1<<20)+(1<<16),4,fp); /* char info */
fputnum(0,4,fp); /* width */
- fputnum(1<<20,4,fp); /* width */
+ if (pstfm_nt>1)
+ fputnum(1<<19,4,fp); /* width, hankaku-kana */
+ fputnum(1<<20,4,fp); /* width, others */
if (jfm_id == 11) {
fputnum(0,4,fp); /* height */
fputnum((int)((1<<20)*0.9),4,fp); /* height */
More information about the tex-live-commits
mailing list