diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2012-01-16 14:44:56 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2012-01-16 14:44:56 +0000 |
commit | c0b77e85fa6f50dcb376db6dad932c2147cff804 (patch) | |
tree | 8bb1fad58bf10bfa14106cbfc345ef0669d1fa00 /Build/source | |
parent | 3fa84a3afddbb0384c56c6ed1de16132a71b30a5 (diff) |
upTeX 1.00 - from TANAKA Takuji <KXD02663@nifty.ne.jp>
git-svn-id: svn://tug.org/texlive/trunk@25119 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source')
-rw-r--r-- | Build/source/texk/makejvf/ChangeLog | 8 | ||||
-rw-r--r-- | Build/source/texk/makejvf/Makefile.am | 9 | ||||
-rw-r--r-- | Build/source/texk/makejvf/Makefile.in | 7 | ||||
-rw-r--r-- | Build/source/texk/makejvf/Makefile.orig | 30 | ||||
-rw-r--r-- | Build/source/texk/makejvf/main.c | 91 | ||||
-rw-r--r-- | Build/source/texk/makejvf/makejvf.h | 6 | ||||
-rw-r--r-- | Build/source/texk/makejvf/write.c | 475 | ||||
-rw-r--r-- | Build/source/texk/web2c/euptexdir/euptrip/euptrip.diffs | 66 | ||||
-rw-r--r-- | Build/source/texk/web2c/uptexdir/ChangeLog | 9 | ||||
-rw-r--r-- | Build/source/texk/web2c/uptexdir/kanji.c | 432 | ||||
-rw-r--r-- | Build/source/texk/web2c/uptexdir/upbibtex.ch | 2 | ||||
-rw-r--r-- | Build/source/texk/web2c/uptexdir/updvitype.ch | 2 | ||||
-rw-r--r-- | Build/source/texk/web2c/uptexdir/uppltotf.ch | 2 | ||||
-rw-r--r-- | Build/source/texk/web2c/uptexdir/uptex-m.ch | 38 | ||||
-rw-r--r-- | Build/source/texk/web2c/uptexdir/uptftopl.ch | 2 | ||||
-rw-r--r-- | Build/source/texk/web2c/uptexdir/uptrip/uptrip.diffs | 24 |
16 files changed, 871 insertions, 332 deletions
diff --git a/Build/source/texk/makejvf/ChangeLog b/Build/source/texk/makejvf/ChangeLog index a0976987ac4..837a124c60d 100644 --- a/Build/source/texk/makejvf/ChangeLog +++ b/Build/source/texk/makejvf/ChangeLog @@ -1,3 +1,11 @@ +2012-01-16 Peter Breitenlohner <peb@mppmu.mpg.de> + + Update for upTeX-1.00. From TANAKA Takuji <KXD02663@nifty.ne.jp>. + * uniblock.[ch]: New files. + * main.c, makejvf.h, write.c: Use the new files. + * Makefile.am (makejvf_SOURCES): Add the new files. + (EXTRA_DIST): Drop Makefile.orig. + 2011-04-19 Peter Breitenlohner <peb@mppmu.mpg.de> Avoid 'differ in signedness' warnings. diff --git a/Build/source/texk/makejvf/Makefile.am b/Build/source/texk/makejvf/Makefile.am index 628a6580a0c..82498272198 100644 --- a/Build/source/texk/makejvf/Makefile.am +++ b/Build/source/texk/makejvf/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am for the TeX Live subdirectory texk/makejvfk/ ## -## Copyright (C) 2010 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2010, 2012 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## ACLOCAL_AMFLAGS = -I ../../m4 @@ -11,7 +11,7 @@ AM_CFLAGS = $(WARNING_CFLAGS) bin_PROGRAMS = makejvf makejvf_SOURCES = \ - main.c makejvf.h tfmread.c tool.c write.c + main.c makejvf.h tfmread.c tool.c uniblock.c uniblock.h write.c $(makejvf_OBJECTS): $(KPATHSEA_DEPEND) $(PTEXENC_DEPEND) @@ -37,8 +37,3 @@ EXTRA_DIST += \ DISTCLEANFILES = min10.vf rml.tfm rmlv.tfm tmin10.vf -## Eventually delete this file -## -EXTRA_DIST += \ - Makefile.orig - diff --git a/Build/source/texk/makejvf/Makefile.in b/Build/source/texk/makejvf/Makefile.in index 703b1ff4ccc..f22ec84cad4 100644 --- a/Build/source/texk/makejvf/Makefile.in +++ b/Build/source/texk/makejvf/Makefile.in @@ -71,7 +71,7 @@ CONFIG_CLEAN_VPATH_FILES = am__installdirs = "$(DESTDIR)$(bindir)" PROGRAMS = $(bin_PROGRAMS) am_makejvf_OBJECTS = main.$(OBJEXT) tfmread.$(OBJEXT) tool.$(OBJEXT) \ - write.$(OBJEXT) + uniblock.$(OBJEXT) write.$(OBJEXT) makejvf_OBJECTS = $(am_makejvf_OBJECTS) makejvf_LDADD = $(LDADD) am__DEPENDENCIES_1 = @@ -234,12 +234,12 @@ ACLOCAL_AMFLAGS = -I ../../m4 INCLUDES = $(PTEXENC_INCLUDES) $(KPATHSEA_INCLUDES) AM_CFLAGS = $(WARNING_CFLAGS) makejvf_SOURCES = \ - main.c makejvf.h tfmread.c tool.c write.c + main.c makejvf.h tfmread.c tool.c uniblock.c uniblock.h write.c LDADD = $(PTEXENC_LIBS) $(KPATHSEA_LIBS) EXTRA_DIST = COPYRIGHT COPYRIGHT.jis Changes.txt README.txt \ tests/min10.tfm tests/min10.vf tests/rml.tfm tests/rmlv.tfm \ - tests/tmin10.tfm tests/tmin10.vf Makefile.orig + tests/tmin10.tfm tests/tmin10.vf dist_check_SCRIPTS = makejvf.test TESTS = makejvf.test DISTCLEANFILES = min10.vf rml.tfm rmlv.tfm tmin10.vf @@ -353,6 +353,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tfmread.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tool.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uniblock.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/write.Po@am__quote@ .c.o: diff --git a/Build/source/texk/makejvf/Makefile.orig b/Build/source/texk/makejvf/Makefile.orig deleted file mode 100644 index f4b836129cf..00000000000 --- a/Build/source/texk/makejvf/Makefile.orig +++ /dev/null @@ -1,30 +0,0 @@ -CC = gcc -CCLD =$(CC) -PROGRAM = makejvf - -# ¥¤¥ó¥¹¥È¡¼¥ëÀè¤ò DISTDIR ¤Ë»ØÄꤹ¤ë -DISTDIR = /usr/local/bin - -CFLAGS = -O -PROGLINK = $(CC) $(OBJS) -o $(PROGRAM) - -OBJS = main.o tfmread.o tool.o write.o - -link_command = $(CCLD) -o $(PROGRAM) $(LDFLAGS) - -$(PROGRAM): $(OBJS) $(kpathsea) - $(PROGLINK) - -main.o:main.c -tfmread.o:tfmread.c -tool.o:tool.c -write.o:write.c - -install: $(PROGRAM) - install -C -m 755 $? $(DISTDIR) - -clean: - rm -f *.o makejvf - -distclean: - rm -f *.o *.core *.tfm *.vf *.tex *.dvi *.ps $(PROGRAM) diff --git a/Build/source/texk/makejvf/main.c b/Build/source/texk/makejvf/main.c index 132fb35b13a..60cb5a73446 100644 --- a/Build/source/texk/makejvf/main.c +++ b/Build/source/texk/makejvf/main.c @@ -5,14 +5,17 @@ #include <kpathsea/config.h> #include <ptexenc/ptexenc.h> #include "makejvf.h" +#include "uniblock.h" FILE *vfp,*afp=NULL; -char *atfmname,*vtfmname,*afmname,*vfname,*kanatfm; -int kanatume=-1,chotai=0,baseshift=0,minute=0; +char *atfmname,*vtfmname,*afmname,*vfname,*kanatfm,*jistfm,*ucsqtfm; +int kanatume=-1,chotai=0,baseshift=0,minute=0,useset3=0,hankana=0,fidzero=0; +long ucs=0; int main(int argc, char ** argv) { - int i,j; + int i,j,ib; + long ch; set_enc_string(NULL, "EUC"); if (argc < 3) { @@ -66,6 +69,48 @@ int main(int argc, char ** argv) case 'm': minute=1; break; + case 'u': + argv++; + if (!strcmp(*argv,"gb")) + ucs = ENTRY_G; + else if (!strcmp(*argv,"cns")) + ucs = ENTRY_C; + else if (!strcmp(*argv,"jisq")) + ucs = ENTRY_JQ; + else if (!strcmp(*argv,"jis")) + ucs = ENTRY_J; + else if (!strcmp(*argv,"ks")) + ucs = ENTRY_K; + else { + fprintf(stderr,"Charset is not set\n"); + ucs = ENTRY_NO; + } + break; + case '3': + useset3=1; + break; + case 'J': + if ((*argv)[2]!='\0') { + jistfm = strdup(&(*argv)[2]); + } + else { + jistfm = strdup(*(++argv)); + } + break; + case 'U': + if ((*argv)[2]!='\0') { + ucsqtfm = strdup(&(*argv)[2]); + } + else { + ucsqtfm = strdup(*(++argv)); + } + break; + case 'H': + hankana=1; + break; + case 'i': + fidzero=1; + break; default: usage(); exit(0); @@ -111,11 +156,35 @@ int main(int argc, char ** argv) maketfm(kanatfm); } + if (jistfm) { + if (!strcmp(&jistfm[strlen(jistfm)-4],".tfm")) { + jistfm[strlen(jistfm)-4] = '\0'; + } + maketfm(jistfm); + } + + if (ucsqtfm) { + if (!strcmp(&ucsqtfm[strlen(ucsqtfm)-4],".tfm")) { + ucsqtfm[strlen(ucsqtfm)-4] = '\0'; + } + maketfm(ucsqtfm); + } + vfp = vfopen(vfname); - for (i=0;i<94;i++) - for (j=0;j<94;j++) - writevf((0x21+i)*256+(0x21+j),vfp); + if (ucs) { + ib=0; + for (i=0;i<(useset3+1);i++) + for (j=0;j<65536;j++) { + ch=i*2*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); @@ -124,7 +193,7 @@ int main(int argc, char ** argv) void usage(void) { - fputs2("MAKEJVF ver.1.1a -- make Japanese VF file.\n", stderr); + fputs2("MAKEJVF ver.1.1a-u1.00 -- make Japanese VF file.\n", stderr); fputs2("%% makejvf [<options>] <TFMfile> <PSfontTFM>\n", stderr); fputs2("options:\n", stderr); fputs2("-C ĹÂΥ⡼¥É\n", stderr); @@ -136,4 +205,12 @@ void usage(void) fputs2("-a <AFMfile> AFM¥Õ¥¡¥¤¥ë̾¡Ê¤«¤ÊµÍ¤á»þ¤Ë»ÈÍÑ¡Ë\n", stderr); fputs2("-k <¿ôÃÍ> ¤«¤ÊµÍ¤á¥Þ¡¼¥¸¥ó»ØÄê\n", stderr); fputs2(" ʸ»úÉý¤ò1000¤È¤·¤ÆÀ°¿ô¤Ç»ØÄê¡£-a¥ª¥×¥·¥ç¥ó¤È¶¦¤Ë»ÈÍÑ\n", stderr); + fputs2("-u <Charset> UCS mode\n", stderr); + fputs2(" <Charset> gb : GB, cns : CNS, ks : KS\n", stderr); + fputs2(" jis : JIS, jisq : JIS quote only\n", stderr); + fputs2("-J <TFMfile> JIS encoded PS font TFM name for quote, double quote with UCS mode\n", stderr); + fputs2("-U <TFMfile> 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/makejvf.h b/Build/source/texk/makejvf/makejvf.h index da6ab06963a..6ab054acef0 100644 --- a/Build/source/texk/makejvf/makejvf.h +++ b/Build/source/texk/makejvf/makejvf.h @@ -1,9 +1,10 @@ -extern char *vtfmname,*kanatfm; +extern char *vtfmname,*kanatfm,*jistfm,*ucsqtfm; extern int unit,zh,zw,jfm_id; -extern int kanatume,chotai,baseshift,minute; +extern int kanatume,chotai,baseshift,minute,hankana,fidzero; extern FILE *afp; +extern long ucs; /* main.c */ void usage(void); @@ -27,5 +28,6 @@ int fputstr(char *str, int byte, FILE *fp); /* write.c */ FILE *vfopen(char *name); void writevf(int code, FILE *fp); +void writevfu(int code, FILE *fp); void vfclose(FILE *fp); void maketfm(char *name); diff --git a/Build/source/texk/makejvf/write.c b/Build/source/texk/makejvf/write.c index 0ef2617aa78..2cd309f30dc 100644 --- a/Build/source/texk/makejvf/write.c +++ b/Build/source/texk/makejvf/write.c @@ -3,11 +3,14 @@ #include <kpathsea/config.h> #include "makejvf.h" +#include "uniblock.h" FILE *vfopen(char *name) { FILE *fp; + int fidshift=0; + if (fidzero) fidshift=-1; fp = fopen(name,"w"); if (fp == NULL) { fprintf(stderr,"I cannot create VF file, %s.",name); @@ -21,7 +24,7 @@ FILE *vfopen(char *name) fputnum(10*(1<<20),4,fp); /* TFM design size */ fputc(243,fp); /* fnt_def1 */ - fputc(1,fp); /* Font ID */ + fputc(1+fidshift,fp); /* Font ID */ fputnum(0,4,fp); /* TFM check sum */ if (chotai) fputnum(zh,4,fp); /* font design size (scaled) */ @@ -34,7 +37,7 @@ FILE *vfopen(char *name) if (kanatfm) { fputc(243,fp); /* fnt_def1 */ - fputc(2,fp); /* Font ID */ + fputc(2+fidshift,fp); /* Font ID */ fputnum(0,4,fp); /* TFM check sum */ if (chotai) fputnum(zh,4,fp); /* font design size (scaled) */ @@ -46,6 +49,33 @@ FILE *vfopen(char *name) fputstr(kanatfm,strlen(kanatfm),fp); /* directory + fontname */ } + if (ucsqtfm) { + fputc(243,fp); /* fnt_def1 */ + fputc(3+fidshift,fp); /* Font ID */ + fputnum(0,4,fp); /* TFM check sum */ + if (chotai) + fputnum(zh,4,fp); /* font design size (scaled) */ + else + fputnum(zw,4,fp); /* font design size (scaled) */ + fputnum(10*(1<<20),4,fp); /* font design size */ + fputc(0,fp); /* directory length */ + fputc(strlen(ucsqtfm),fp); /* fontname length */ + fputstr(ucsqtfm,strlen(ucsqtfm),fp); /* directory + fontname */ + } + else if (jistfm) { + fputc(243,fp); /* fnt_def1 */ + fputc(3+fidshift,fp); /* Font ID */ + fputnum(0,4,fp); /* TFM check sum */ + if (chotai) + fputnum(zh,4,fp); /* font design size (scaled) */ + else + fputnum(zw,4,fp); /* font design size (scaled) */ + fputnum(10*(1<<20),4,fp); /* font design size */ + fputc(0,fp); /* directory length */ + fputc(strlen(jistfm),fp); /* fontname length */ + fputstr(jistfm,strlen(jistfm),fp); /* directory + fontname */ + } + return fp; } @@ -53,6 +83,9 @@ void writevf(int code, FILE *fp) { int cc,cc2,cc3,cc4,w,skip=0,skip2=0,height=1000; char buf[256],buf2[256]; + int fidshift=0; + + if (fidzero) fidshift=-1; w = jfmread(code); @@ -109,7 +142,7 @@ void writevf(int code, FILE *fp) fputc(157+numcount(skip2)-1,fp); /* DOWN */ fputnum2(skip2,fp); } - if (kanatfm) fputc(173,fp); /* FONT_NUM_2 */ + if (kanatfm) fputc(173+fidshift,fp); /* FONT_NUM_2 */ fputc(129,fp); /* SET2 */ if (code == 0x2146) fputnum(0x216c,2,fp); /* char code */ @@ -189,7 +222,7 @@ void writevf(int code, FILE *fp) fputc(239,fp); /* XXX1 */ fputc(88,fp); fputs("ps: gsave currentpoint currentpoint translate 180 neg rotate neg exch neg exch translate",fp); - if (kanatfm) fputc(173,fp); /* FONT_NUM_2 */ + if (kanatfm) fputc(173+fidshift,fp); /* FONT_NUM_2 */ fputc(129,fp); /* SET2 */ if (code == 0x2147) fputnum(0x216c,2,fp); /* char code */ @@ -328,14 +361,444 @@ void writevf(int code, FILE *fp) } if (kanatfm) { if (code <= 0x2576) - fputc(173,fp); /* FONT_NUM_2 */ + fputc(173+fidshift,fp); /* FONT_NUM_2 */ else - fputc(172,fp); /* FONT_NUM_1 */ + fputc(172+fidshift,fp); /* FONT_NUM_1 */ } fputc(129,fp); /* SET2 */ fputnum(code,2,fp); /* char code */ } +void writevfu(int code, FILE *fp) +{ + int cc,cc2,cc3,cc4,w,skip=0,skip2=0,height=1000; + char buf[256],buf2[256]; + int fidshift=0; + + if (fidzero) fidshift=-1; + + w = jfmread(code); + + fputc(242,fp); /* long_char */ + + skip2=baseshift; + switch (code) { + case 0x2018: /* ¡Æ */ + case 0x201c: /* ¡È */ + if (jfm_id == 9 && minute) { /* ½Ä½ñ¤»þ¤Ï¥ß¥Ë¥å¡¼¥È¤ØÊÑ´¹ */ + if (afp) { + if (code == 0x2018) + sprintf(buf2,"CH <2032>"); + else + sprintf(buf2,"CH <2033>"); + rewind(afp); + while (fgets(buf,255,afp)!=NULL) { + if (jfm_id==9 && !strncmp(buf,"FontBBox ",9)) { + sscanf(&buf[9],"%d %d %d %d",&cc,&cc2,&cc3,&cc4); + height=cc4; + } + if (!strncmp(buf,buf2,strlen(buf2))) { + sscanf(&buf[14],"%d %d %d %d",&cc,&cc2,&cc3,&cc4); + skip=(int)(w+((double)(cc2-height)/1000.0-0.05)*zw); + break; + } + } + } + else + skip=(int)((0.1)*zw); + if (code == 0x2018) { + skip2+=-(int)((0.65)*zh); + } + else { + skip2+=-(int)((0.6)*zh); + } + + if (kanatfm) + cc=4; + else + cc=3; + if (skip) + cc+=numcount(skip)+1; + if (skip2) + cc+=numcount(skip2)+1; + fputnum(cc,4,fp); + fputnum(code,4,fp); /* char code */ + fputnum(w,4,fp); /* char width */ + if (skip) { + fputc(143+numcount(skip)-1,fp); /* RIGHT */ + fputnum2(skip,fp); + } + if (skip2) { + fputc(157+numcount(skip2)-1,fp); /* DOWN */ + fputnum2(skip2,fp); + } + if (kanatfm) fputc(173+fidshift,fp); /* FONT_NUM_2 */ + if (code == 0x2018) + fputnum(0x2032,2,fp); /* char code */ + else + fputnum(0x2033,2,fp); /* char code */ + return; + } + else if (ucsqtfm) { /* UniJIS-UCS2-H·Ï¤ØÊÑ´¹ */ + cc=4; + skip = -(zw-w); + if (skip) + cc+=numcount(skip)+1; + if (skip2) + cc+=numcount(skip2)+1; + fputnum(cc,4,fp); + fputnum(code,4,fp); /* char code */ + fputnum(w,4,fp); /* char width */ + if (skip) { + fputc(143+numcount(skip)-1,fp); /* RIGHT */ + fputnum2(skip,fp); + } + if (skip2) { + fputc(157+numcount(skip2)-1,fp); /* DOWN */ + fputnum2(skip2,fp); + } + fputc(174+fidshift,fp); /* FONT_NUM_3 */ + fputc(129,fp); /* SET2 */ + fputnum(code,2,fp); /* char code */ + return; + } + else if (jfm_id == 11 && jistfm) { /* ²£½ñ¤»þ¤ÏJIS·Ï¤ØÊÑ´¹ */ + /* UCS U+2018 ¢ª JIS 0x2146, UCS U+201C ¢ª JIS 0x2148 */ + cc=4; + skip = -(zw-w); + if (skip) + cc+=numcount(skip)+1; + if (skip2) + cc+=numcount(skip2)+1; + fputnum(cc,4,fp); + fputnum(code,4,fp); /* char code */ + fputnum(w,4,fp); /* char width */ + if (skip) { + fputc(143+numcount(skip)-1,fp); /* RIGHT */ + fputnum2(skip,fp); + } + if (skip2) { + fputc(157+numcount(skip2)-1,fp); /* DOWN */ + fputnum2(skip2,fp); + } + fputc(174+fidshift,fp); /* FONT_NUM_3 */ + fputc(129,fp); /* SET2 */ + if (code == 0x2018) + fputnum(0x2146,2,fp); /* char code */ + else + fputnum(0x2148,2,fp); /* char code */ + return; + } + case 0xFF08: /* ¡Ê */ + case 0x3014: /* ¡Ì */ + case 0xFF3B: /* ¡Î */ + case 0xFF5B: /* ¡Ð */ + case 0x3008: /* ¡Ò */ + case 0x300A: /* ¡Ô */ + case 0x300C: /* ¡Ö */ + case 0x300E: /* ¡Ø */ + case 0x3010: /* ¡Ú */ + case 0xFF5F: /* JIS X 0213 1-02-54 »Ï¤áÆó½Å¥Ð¡¼¥ì¡¼¥ó */ + case 0x3018: /* JIS X 0213 1-02-56 »Ï¤áÆó½Åµµ¹Ã³ç¸Ì */ + case 0x3016: /* JIS X 0213 1-02-58 »Ï¤á¤¹¤ßÉÕ¤³ç¸Ì(Çò) */ + case 0x301D: /* JIS X 0213 1-13-64 »Ï¤á¥À¥Ö¥ë¥ß¥Ë¥å¡¼¥È */ + if (ucs != ENTRY_JQ) + skip = -(zw-w); + if (kanatfm) + cc=4; + else + cc=3; + if (skip) + cc+=numcount(skip)+1; + if (skip2) + cc+=numcount(skip2)+1; + fputnum(cc,4,fp); + break; + case 0x2019: /* ¡Ç */ + case 0x201d: /* ¡É */ + if (jfm_id == 9 && minute) { /* ½Ä½ñ¤»þ¤Ï¥ß¥Ë¥å¡¼¥È¤ØÊÑ´¹ */ + if (afp) { + if (code == 0x2019) + sprintf(buf2,"CH <216C>"); + else + sprintf(buf2,"CH <216D>"); + rewind(afp); + while (fgets(buf,255,afp)!=NULL) { + if (jfm_id==9 && !strncmp(buf,"FontBBox ",9)) { + sscanf(&buf[9],"%d %d %d %d",&cc,&cc2,&cc3,&cc4); + height=cc4; + } + if (!strncmp(buf,buf2,strlen(buf2))) { + sscanf(&buf[14],"%d %d %d %d",&cc,&cc2,&cc3,&cc4); + skip=(int)(((double)(height-cc2)/1000.0+0.05)*zw); + break; + } + } + } + else + skip=(int)((0.4)*zw); + if (code == 0x2019) { + skip2+=(int)((0.65)*zh); + } + else { + skip2+=(int)((0.6)*zh); + } + + if (kanatfm) + cc=4; + else + cc=3; + if (skip) + cc+=numcount(skip)+1; + if (skip2) + cc+=numcount(skip2)+1; + fputnum(cc+2+88+2+32,4,fp); + fputnum(code,4,fp); /* char code */ + fputnum(w,4,fp); /* char width */ + if (skip) { + fputc(143+numcount(skip)-1,fp); /* RIGHT */ + fputnum2(skip,fp); + } + if (skip2) { + fputc(157+numcount(skip2)-1,fp); /* DOWN */ + fputnum2(skip2,fp); + } + fputc(239,fp); /* XXX1 */ + fputc(88,fp); + fputs("ps: gsave currentpoint currentpoint translate 180 neg rotate neg exch neg exch translate",fp); + if (kanatfm) fputc(173+fidshift,fp); /* FONT_NUM_2 */ + fputc(129,fp); /* SET2 */ + if (code == 0x2019) + fputnum(0x2032,2,fp); /* char code */ + else + fputnum(0x2033,2,fp); /* char code */ + fputc(239,fp); /* XXX1 */ + fputc(32,fp); + fputs("ps: currentpoint grestore moveto",fp); + return; + } + else if (ucsqtfm) { /* UniJIS-UCS2-H·Ï¤ØÊÑ´¹ */ + cc=4; + if (skip2) + cc+=numcount(skip2)+1; + fputnum(cc,4,fp); + fputnum(code,4,fp); /* char code */ + fputnum(w,4,fp); /* char width */ + if (skip2) { + fputc(157+numcount(skip2)-1,fp); /* DOWN */ + fputnum2(skip2,fp); + } + fputc(174+fidshift,fp); /* FONT_NUM_3 */ + fputc(129,fp); /* SET2 */ + fputnum(code,2,fp); /* char code */ + return; + } + else if (jfm_id == 11 && jistfm) { /* ²£½ñ¤»þ¤ÏJIS·Ï¤ØÊÑ´¹ */ + /* UCS U+2019 ¢ª JIS 0x2147, UCS U+201D ¢ª JIS 0x2149 */ + cc=4; + if (skip2) + cc+=numcount(skip2)+1; + fputnum(cc,4,fp); + fputnum(code,4,fp); /* char code */ + fputnum(w,4,fp); /* char width */ + if (skip2) { + fputc(157+numcount(skip2)-1,fp); /* DOWN */ + fputnum2(skip2,fp); + } + fputc(174+fidshift,fp); /* FONT_NUM_3 */ + fputc(129,fp); /* SET2 */ + if (code == 0x2019) + fputnum(0x2147,2,fp); /* char code */ + else + fputnum(0x2149,2,fp); /* char code */ + return; + } + case 0x3000: /* spc */ + case 0x3001: /* ¡¢ */ + case 0x3002: /* ¡£ */ + case 0xFF0C: /* ¡¤ */ + case 0xFF0E: /* ¡¥ */ + case 0x309B: /* ¡« */ + case 0x309C: /* ¡¬ */ + case 0xFF09: /* ¡Ë */ + case 0x3015: /* ¡Í */ + case 0xFF3D: /* ¡Ï */ + case 0xFF5D: /* ¡Ñ */ + case 0x3009: /* ¡Ó */ + case 0x300B: /* ¡Õ */ + case 0x300D: /* ¡× */ + case 0x300F: /* ¡Ù */ + case 0x3011: /* ¡Û */ + case 0xFF60: /* JIS X 0213 1-02-55 ½ª¤ï¤êÆó½Å¥Ð¡¼¥ì¡¼¥ó */ + case 0x3019: /* JIS X 0213 1-02-57 ½ª¤ï¤êÆó½Åµµ¹Ã³ç¸Ì */ + case 0x3017: /* JIS X 0213 1-02-59 ½ª¤ï¤ê¤¹¤ßÉÕ¤³ç¸Ì(Çò) */ + case 0x301F: /* JIS X 0213 1-13-65 ½ª¤ï¤ê¥À¥Ö¥ë¥ß¥Ë¥å¡¼¥È */ + case 0x00B0: /* ¡ë */ + case 0x2032: /* ¡ì */ + case 0x2033: /* ¡í */ + if (kanatfm) + cc=4; + else + cc=3; + if (skip2) + cc+=numcount(skip2)+1; + fputnum(cc,4,fp); + break; + case 0xFF61: case 0xFF62: case 0xFF63: case 0xFF64: case 0xFF65: case 0xFF66: case 0xFF67: + case 0xFF68: case 0xFF69: case 0xFF6A: case 0xFF6B: case 0xFF6C: case 0xFF6D: case 0xFF6E: case 0xFF6F: + case 0xFF70: case 0xFF71: case 0xFF72: case 0xFF73: case 0xFF74: case 0xFF75: case 0xFF76: case 0xFF77: + case 0xFF78: case 0xFF79: case 0xFF7A: case 0xFF7B: case 0xFF7C: case 0xFF7D: case 0xFF7E: case 0xFF7F: + case 0xFF80: case 0xFF81: case 0xFF82: case 0xFF83: case 0xFF84: case 0xFF85: case 0xFF86: case 0xFF87: + case 0xFF88: case 0xFF89: case 0xFF8A: case 0xFF8B: case 0xFF8C: case 0xFF8D: case 0xFF8E: case 0xFF8F: + 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) { /* Ⱦ³ÑÊÒ²¾Ì¾¡¢²£½ñ¤»þ */ + cc=3; + if (skip2) + cc+=numcount(skip2)+1; + fputnum(cc,4,fp); + fputnum(code,4,fp); /* char code */ + fputnum(w,4,fp); /* char width */ + if (skip2) { + fputc(157+numcount(skip2)-1,fp); /* DOWN */ + fputnum2(skip2,fp); + } + fputc(129,fp); /* SET2 */ + fputnum(code,2,fp); /* char code */ + return; + } + default: + if (w != zw) { + if (((code >= 0x3041 && code <= 0x30F6) || code == 0x30FC ) && kanatume>=0) { + sprintf(buf2,"CH <%X>",code); + rewind(afp); + while (fgets(buf,255,afp)!=NULL) { + if (jfm_id==9 && !strncmp(buf,"FontBBox ",9)) { + sscanf(&buf[9],"%d %d %d %d",&cc,&cc2,&cc3,&cc4); + height=cc4; + } + if (!strncmp(buf,buf2,strlen(buf2))) { + sscanf(&buf[14],"%d %d %d %d",&cc,&cc2,&cc3,&cc4); + if (jfm_id==9) { + switch (code) { + case 0x3041: + case 0x3043: + case 0x3045: + case 0x3047: + case 0x3049: + case 0x3063: + case 0x3083: + case 0x3085: + case 0x3087: + case 0x308E: + case 0x30A1: + case 0x30A3: + case 0x30A5: + case 0x30A7: + case 0x30A9: + case 0x30C3: + case 0x30E3: + case 0x30E5: + case 0x30E7: + case 0x30EE: + case 0x30F5: + case 0x30F6: + case 0x3095: /* JIS X 0213 1-04-85 ¾®½ñ¤Ê¿²¾Ì¾¤« */ + case 0x3096: /* JIS X 0213 1-04-86 ¾®½ñ¤Ê¿²¾Ì¾¤± */ + case 0x31F0: /* JIS X 0213 1-06-78 ¾®½ñ¤ÊÒ²¾Ì¾¥¯ */ + case 0x31F1: /* JIS X 0213 1-06-79 ¾®½ñ¤ÊÒ²¾Ì¾¥· */ + case 0x31F2: /* JIS X 0213 1-06-80 ¾®½ñ¤ÊÒ²¾Ì¾¥¹ */ + case 0x31F3: /* JIS X 0213 1-06-81 ¾®½ñ¤ÊÒ²¾Ì¾¥È */ + case 0x31F4: /* JIS X 0213 1-06-82 ¾®½ñ¤ÊÒ²¾Ì¾¥Ì */ + case 0x31F5: /* JIS X 0213 1-06-83 ¾®½ñ¤ÊÒ²¾Ì¾¥Ï */ + case 0x31F6: /* JIS X 0213 1-06-84 ¾®½ñ¤ÊÒ²¾Ì¾¥Ò */ + case 0x31F7: /* JIS X 0213 1-06-85 ¾®½ñ¤ÊÒ²¾Ì¾¥Õ */ + case 0x31F8: /* JIS X 0213 1-06-86 ¾®½ñ¤ÊÒ²¾Ì¾¥Ø */ + case 0x31F9: /* JIS X 0213 1-06-87 ¾®½ñ¤ÊÒ²¾Ì¾¥Û */ + case 0x31FA: /* JIS X 0213 1-06-89 ¾®½ñ¤ÊÒ²¾Ì¾¥à */ + case 0x31FB: /* JIS X 0213 1-06-90 ¾®½ñ¤ÊÒ²¾Ì¾¥é */ + case 0x31FC: /* JIS X 0213 1-06-91 ¾®½ñ¤ÊÒ²¾Ì¾¥ê */ + case 0x31FD: /* JIS X 0213 1-06-92 ¾®½ñ¤ÊÒ²¾Ì¾¥ë */ + case 0x31FE: /* JIS X 0213 1-06-93 ¾®½ñ¤ÊÒ²¾Ì¾¥ì */ + case 0x31FF: /* JIS X 0213 1-06-94 ¾®½ñ¤ÊÒ²¾Ì¾¥í */ + skip=-(int)(((double)(1000-(cc4-cc2)-kanatume*2)/2/1000.0)*zw); + break; + case 0x30FC: + skip=-(int)((double)(cc-kanatume)/1000.0*zw); + break; + default: + skip=-(int)(((double)(height-cc4-kanatume)/1000.0)*zw); + break; + } + } + else { + skip=-(int)(((double)(cc-kanatume)/1000.0)*zw); + } + if (kanatfm) + cc=4; + else + cc=3; + if (skip) + cc+=numcount(skip)+1; + if (skip2) + cc+=numcount(skip2)+1; + fputnum(cc,4,fp); + break; + } + } + } + else { + skip = -(zw-w)/2; + if (kanatfm) + cc=4; + else + cc=3; + if (skip) + cc+=numcount(skip)+1; + if (skip2) + cc+=numcount(skip2)+1; + fputnum(cc,4,fp); + } + } + else { + if (kanatfm || code>=0x10000) + cc=4; + else + cc=3; + if (skip) + cc+=numcount(skip)+1; + if (skip2) + cc+=numcount(skip2)+1; + fputnum(cc,4,fp); + } + break; + } + + fputnum(code,4,fp); /* char code */ + fputnum(w,4,fp); /* char width */ + if (skip) { + fputc(143+numcount(skip)-1,fp); /* RIGHT */ + fputnum2(skip,fp); + } + if (skip2) { + fputc(157+numcount(skip2)-1,fp); /* DOWN */ + fputnum2(skip2,fp); + } + if (kanatfm) { + if (code <= 0x30F6) + fputc(173+fidshift,fp); /* FONT_NUM_2 */ + else + fputc(172+fidshift,fp); /* FONT_NUM_1 */ + } + if (code>=0x10000) { + fputc(130,fp); /* SET3 */ + fputnum(code,3,fp); /* char code */ + } else { + fputc(129,fp); /* SET2 */ + fputnum(code,2,fp); /* char code */ + } +} + void vfclose(FILE *fp) { int i,cc; diff --git a/Build/source/texk/web2c/euptexdir/euptrip/euptrip.diffs b/Build/source/texk/web2c/euptexdir/euptrip/euptrip.diffs index e48da5d7052..8bac63f047f 100644 --- a/Build/source/texk/web2c/euptexdir/euptrip/euptrip.diffs +++ b/Build/source/texk/web2c/euptexdir/euptrip/euptrip.diffs @@ -13,7 +13,7 @@ 1c1 < This is TeX, Version 3.1415926 (INITEX) 15 MAR 2008 02:23 --- -> This is e-upTeX, Version 3.1415926-p3.2-u0.30-110415-2.3 (utf8.uptex) (TeX Live 2012) (INITEX) 23 AUG 2011 22:09 +> This is e-upTeX, Version 3.1415926-p3.2-u1.00-110825-2.3 (utf8.uptex) (TeX Live 2012/dev) (INITEX) 16 JAN 2012 15:14 3,11c3 < (trip.tex < ! Bad character code (256). @@ -37,8 +37,8 @@ < 471 memory locations dumped; current usage is 96&278 < 341 multiletter control sequences --- -> (format=trip 2011.8.23) -> 1610 strings of total length 27667 +> (format=trip 2012.1.16) +> 1612 strings of total length 27706 > 489 memory locations dumped; current usage is 110&278 > 393 multiletter control sequences 461c454 @@ -54,7 +54,7 @@ < ** &trip trip < (trip.tex ## --- -> This is e-upTeX, Version 3.1415926-p3.2-u0.30-110415-2.3 (utf8.uptex) (TeX Live 2012) +> This is e-upTeX, Version 3.1415926-p3.2-u1.00-110825-2.3 (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 e-upTeX, Version 3.1415926-p3.2-u0.30-110415-2.3 (utf8.uptex) (TeX Live 2012) (format=trip 2011.8.23) 23 AUG 2011 22:09 +> This is e-upTeX, Version 3.1415926-p3.2-u1.00-110825-2.3 (utf8.uptex) (TeX Live 2012/dev) (format=trip 2012.1.16) 16 JAN 2012 15:14 3c3 < (trip.tex ## --- @@ -212,13 +212,13 @@ 3054c3062 < .\fam0 ^^c8 --- -> .\fam0 ì +> .\fam0 È 3143a3152 > ....\displace 0.0 3235c3244 < ! \textfont 0 is undefined (character ^^c8). --- -> ! \textfont 0 is undefined (character ì ©. +> ! \textfont 0 is undefined (character È). 3326c3335 < \vbox(10000.0+2.0)x28.0, glue set 9737.58789fil --- @@ -290,7 +290,7 @@ 5700c5703 < ! \textfont 0 is undefined (character ^^c8). --- -> ! \textfont 0 is undefined (character ì ©. +> ! \textfont 0 is undefined (character È). 6380c6383 < (tripos.tex --- @@ -317,8 +317,8 @@ < 2825 words of memory out of 3000 < 372 multiletter control sequences out of 2100 --- -> 44 strings out of 1690 -> 261 string characters out of 8333 +> 44 strings out of 1688 +> 261 string characters out of 8294 > 4017 words of memory out of 4500 > 424 multiletter control sequences out of 15000+0 7301c7304 @@ -331,11 +331,11 @@ 1c1 < This is DVItype, Version 3.6 --- -> This is DVItype, Version 3.6 (TeX Live 2012) +> This is DVItype, Version 3.6 (TeX Live 2012/dev) 9c9 < ' TeX output 2008.03.15:0223' --- -> ' TeX output 2011.08.23:2209' +> ' TeX output 2012.01.16:1514' 419c419 < 1121: down4 639342208 --- @@ -365,7 +365,7 @@ < I changed this one to zero. < --- -> This is e-upTeX, Version 3.1415926-p3.2-u0.30-110415-2.3 (utf8.uptex) (TeX Live 2012) (INITEX) 23 AUG 2011 22:09 +> This is e-upTeX, Version 3.1415926-p3.2-u1.00-110825-2.3 (utf8.uptex) (TeX Live 2012/dev) (INITEX) 16 JAN 2012 15:14 > entering extended mode > ***\input trip > (./trip.tex @@ -387,8 +387,8 @@ < 471 memory locations dumped; current usage is 96&278 < 341 multiletter control sequences --- -> (format=trip 2011.8.23) -> 1610 strings of total length 27667 +> (format=trip 2012.1.16) +> 1612 strings of total length 27706 > 536 memory locations dumped; current usage is 157&278 > 465 multiletter control sequences 461c449 @@ -404,7 +404,7 @@ < ** &trip trip < (trip.tex ## --- -> This is e-upTeX, Version 3.1415926-p3.2-u0.30-110415-2.3 (utf8.uptex) (TeX Live 2012) +> This is e-upTeX, Version 3.1415926-p3.2-u1.00-110825-2.3 (utf8.uptex) (TeX Live 2012/dev) > **entering extended mode > ## (./trip.tex 17c17 @@ -425,7 +425,7 @@ < ** &trip trip < (trip.tex ## --- -> This is e-upTeX, Version 3.1415926-p3.2-u0.30-110415-2.3 (utf8.uptex) (TeX Live 2012) (format=trip 2011.8.23) 23 AUG 2011 22:09 +> This is e-upTeX, Version 3.1415926-p3.2-u1.00-110825-2.3 (utf8.uptex) (TeX Live 2012/dev) (format=trip 2012.1.16) 16 JAN 2012 15:14 > entering extended mode > **&trip \toksdef\tokens=0 \input trip > (./trip.tex @@ -589,7 +589,7 @@ 3054c3060 < .\fam0 ^^c8 --- -> .\fam0 ì +> .\fam0 È 3143a3150 > ....\displace 0.0 3223d3229 @@ -597,7 +597,7 @@ 3235c3241 < ! \textfont 0 is undefined (character ^^c8). --- -> ! \textfont 0 is undefined (character ì ©. +> ! \textfont 0 is undefined (character È). 3326c3332 < \vbox(10000.0+2.0)x28.0, glue set 9737.58789fil --- @@ -707,7 +707,7 @@ 5700c5697 < ! \textfont 0 is undefined (character ^^c8). --- -> ! \textfont 0 is undefined (character ì ©. +> ! \textfont 0 is undefined (character È). 6380c6377 < (tripos.tex --- @@ -738,8 +738,8 @@ < 2825 words of memory out of 3000 < 372 multiletter control sequences out of 2100 --- -> 44 strings out of 1690 -> 261 string characters out of 8333 +> 44 strings out of 1688 +> 261 string characters out of 8294 > 4017 words of memory out of 4500 > 496 multiletter control sequences out of 15000+0 7301,7302c7301,7302 @@ -754,11 +754,11 @@ 1c1 < This is DVItype, Version 3.6 --- -> This is DVItype, Version 3.6 (TeX Live 2012) +> This is DVItype, Version 3.6 (TeX Live 2012/dev) 9c9 < ' TeX output 2008.03.15:0223' --- -> ' TeX output 2011.08.23:2209' +> ' TeX output 2012.01.16:1514' 419c419 < 1121: down4 639342208 --- @@ -781,15 +781,15 @@ 1c1 < This is e-TeX, Version 3.1415926-2.3 (TeX Live 2011/dev) (INITEX) 7 APR 2011 11:46 --- -> This is e-upTeX, Version 3.1415926-p3.2-u0.30-110415-2.3 (utf8.uptex) (TeX Live 2012) (INITEX) 23 AUG 2011 22:09 +> This is e-upTeX, Version 3.1415926-p3.2-u1.00-110825-2.3 (utf8.uptex) (TeX Live 2012/dev) (INITEX) 16 JAN 2012 15:14 26,29c26,29 < (format=etrip 2011.4.7) < 1490 strings of total length 26209 < 280 memory locations dumped; current usage is 36&166 < 408 multiletter control sequences --- -> (format=etrip 2011.8.23) -> 1611 strings of total length 27698 +> (format=etrip 2012.1.16) +> 1613 strings of total length 27737 > 283 memory locations dumped; current usage is 40&166 > 465 multiletter control sequences + ./euptex --progname=euptex @@ -798,12 +798,12 @@ 1c1 < This is e-TeX, Version 3.1415926-2.3 (TeX Live 2011/dev) --- -> This is e-upTeX, Version 3.1415926-p3.2-u0.30-110415-2.3 (utf8.uptex) (TeX Live 2012) +> This is e-upTeX, Version 3.1415926-p3.2-u1.00-110825-2.3 (utf8.uptex) (TeX Live 2012/dev) + diff SRCDIR/eptexdir/eptrip/etrip.log euptrip.log 1c1 < This is e-TeX, Version 3.1415926-2.3 (TeX Live 2011/dev) (format=etrip 2011.4.7) 7 APR 2011 11:46 --- -> This is e-upTeX, Version 3.1415926-p3.2-u0.30-110415-2.3 (utf8.uptex) (TeX Live 2012) (format=etrip 2011.8.23) 23 AUG 2011 22:09 +> This is e-upTeX, Version 3.1415926-p3.2-u1.00-110825-2.3 (utf8.uptex) (TeX Live 2012/dev) (format=etrip 2012.1.16) 16 JAN 2012 15:14 4c4 < (etrip.tex e-IniTeX: e-Trip format loaded. --- @@ -844,8 +844,8 @@ < 2661 words of memory out of 3000 < 408 multiletter control sequences out of 2100 --- -> 18 strings out of 1689 -> 140 string characters out of 8302 +> 18 strings out of 1687 +> 140 string characters out of 8263 > 3329 words of memory out of 4500 > 466 multiletter control sequences out of 15000+0 4278c4274 @@ -858,10 +858,10 @@ 1c1 < This is DVItype, Version 3.6 --- -> This is DVItype, Version 3.6 (TeX Live 2012) +> This is DVItype, Version 3.6 (TeX Live 2012/dev) 9c9 < ' TeX output 2011.04.07:1213' --- -> ' TeX output 2011.08.23:2209' +> ' TeX output 2012.01.16:1514' + : PASS: euptexdir/euptrip.test diff --git a/Build/source/texk/web2c/uptexdir/ChangeLog b/Build/source/texk/web2c/uptexdir/ChangeLog index dc32329f746..b2602ec14ba 100644 --- a/Build/source/texk/web2c/uptexdir/ChangeLog +++ b/Build/source/texk/web2c/uptexdir/ChangeLog @@ -1,3 +1,12 @@ +2012-01-15 Takuji Tanaka <KXD02663@nifty.ne.jp> + + * 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.0.0.txt Date: 2010-06-04, 11:12:00 PDT [KW]". + 2012-01-07 Akira Kakuto <kakuto@fuk.kindai.ac.jp> * kanji.h: revert wrt init_kanji (from TANAKA Takuji-san). diff --git a/Build/source/texk/web2c/uptexdir/kanji.c b/Build/source/texk/web2c/uptexdir/kanji.c index 62ea30f1805..66f330d118e 100644 --- a/Build/source/texk/web2c/uptexdir/kanji.c +++ b/Build/source/texk/web2c/uptexdir/kanji.c @@ -15,7 +15,7 @@ int sjisterminal; #endif -/* TOKEN */ +/* TOKEN */ boolean check_kanji (integer c) { if (c > CS_TOKEN_FLAG) return false; @@ -60,6 +60,8 @@ 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] */ static long ucs_range[]={ 0x0000, /* Basic Latin 0x00 */ 0x0080, /* Latin-1 Supplement 0x01 */ @@ -79,216 +81,228 @@ static long ucs_range[]={ 0x0780, /* Thaana 0x0f */ 0x07C0, /* NKo 0x10 */ 0x0800, /* Samaritan 0x11 */ - 0x0900, /* Devanagari 0x12 */ - 0x0980, /* Bengali 0x13 */ - 0x0A00, /* Gurmukhi 0x14 */ - 0x0A80, /* Gujarati 0x15 */ - 0x0B00, /* Oriya 0x16 */ - 0x0B80, /* Tamil 0x17 */ - 0x0C00, /* Telugu 0x18 */ - 0x0C80, /* Kannada 0x19 */ - 0x0D00, /* Malayalam 0x1a */ - 0x0D80, /* Sinhala 0x1b */ - 0x0E00, /* Thai 0x1c */ - 0x0E80, /* Lao 0x1d */ - 0x0F00, /* Tibetan 0x1e */ - 0x1000, /* Myanmar 0x1f */ - 0x10A0, /* Georgian 0x20 */ - 0x1100, /* Hangul Jamo 0x21 */ - 0x1200, /* Ethiopic 0x22 */ - 0x1380, /* Ethiopic Supplement 0x23 */ - 0x13A0, /* Cherokee 0x24 */ - 0x1400, /* Unified Canadian Aboriginal Syllabics 0x25 */ - 0x1680, /* Ogham 0x26 */ - 0x16A0, /* Runic 0x27 */ - 0x1700, /* Tagalog 0x28 */ - 0x1720, /* Hanunoo 0x29 */ - 0x1740, /* Buhid 0x2a */ - 0x1760, /* Tagbanwa 0x2b */ - 0x1780, /* Khmer 0x2c */ - 0x1800, /* Mongolian 0x2d */ - 0x18B0, /* Unified Canadian Aboriginal Syllabics Extended 0x2e */ - 0x1900, /* Limbu 0x2f */ - 0x1950, /* Tai Le 0x30 */ - 0x1980, /* New Tai Lue 0x31 */ - 0x19E0, /* Khmer Symbols 0x32 */ - 0x1A00, /* Buginese 0x33 */ - 0x1A20, /* Tai Tham 0x34 */ - 0x1B00, /* Balinese 0x35 */ - 0x1B80, /* Sundanese 0x36 */ - 0x1C00, /* Lepcha 0x37 */ - 0x1C50, /* Ol Chiki 0x38 */ - 0x1CD0, /* Vedic Extensions 0x39 */ - 0x1D00, /* Phonetic Extensions 0x3a */ - 0x1D80, /* Phonetic Extensions Supplement 0x3b */ - 0x1DC0, /* Combining Diacritical Marks Supplement 0x3c */ - 0x1E00, /* Latin Extended Additional 0x3d */ - 0x1F00, /* Greek Extended 0x3e */ - 0x2000, /* General Punctuation 0x3f */ - 0x2070, /* Superscripts and Subscripts 0x40 */ - 0x20A0, /* Currency Symbols 0x41 */ - 0x20D0, /* Combining Diacritical Marks for Symbols 0x42 */ - 0x2100, /* Letterlike Symbols 0x43 */ - 0x2150, /* Number Forms 0x44 */ - 0x2190, /* Arrows 0x45 */ - 0x2200, /* Mathematical Operators 0x46 */ - 0x2300, /* Miscellaneous Technical 0x47 */ - 0x2400, /* Control Pictures 0x48 */ - 0x2440, /* Optical Character Recognition 0x49 */ - 0x2460, /* Enclosed Alphanumerics 0x4a */ - 0x2500, /* Box Drawing 0x4b */ - 0x2580, /* Block Elements 0x4c */ - 0x25A0, /* Geometric Shapes 0x4d */ - 0x2600, /* Miscellaneous Symbols 0x4e */ - 0x2700, /* Dingbats 0x4f */ - 0x27C0, /* Miscellaneous Mathematical Symbols-A 0x50 */ - 0x27F0, /* Supplemental Arrows-A 0x51 */ - 0x2800, /* Braille Patterns 0x52 */ - 0x2900, /* Supplemental Arrows-B 0x53 */ - 0x2980, /* Miscellaneous Mathematical Symbols-B 0x54 */ - 0x2A00, /* Supplemental Mathematical Operators 0x55 */ - 0x2B00, /* Miscellaneous Symbols and Arrows 0x56 */ - 0x2C00, /* Glagolitic 0x57 */ - 0x2C60, /* Latin Extended-C 0x58 */ - 0x2C80, /* Coptic 0x59 */ - 0x2D00, /* Georgian Supplement 0x5a */ - 0x2D30, /* Tifinagh 0x5b */ - 0x2D80, /* Ethiopic Extended 0x5c */ - 0x2DE0, /* Cyrillic Extended-A 0x5d */ - 0x2E00, /* Supplemental Punctuation 0x5e */ - 0x2E80, /* CJK Radicals Supplement 0x5f */ - 0x2F00, /* Kangxi Radicals 0x60 */ - 0x2FF0, /* Ideographic Description Characters 0x61 */ - 0x3000, /* CJK Symbols and Punctuation 0x62 */ - 0x3040, /* Hiragana 0x63 */ - 0x30A0, /* Katakana 0x64 */ - 0x3100, /* Bopomofo 0x65 */ - 0x3130, /* Hangul Compatibility Jamo 0x66 */ - 0x3190, /* Kanbun 0x67 */ - 0x31A0, /* Bopomofo Extended 0x68 */ - 0x31C0, /* CJK Strokes 0x69 */ - 0x31F0, /* Katakana Phonetic Extensions 0x6a */ - 0x3200, /* Enclosed CJK Letters and Months 0x6b */ - 0x3300, /* CJK Compatibility 0x6c */ - 0x3400, /* CJK Unified Ideographs Extension A 0x6d */ - 0x4DC0, /* Yijing Hexagram Symbols 0x6e */ - 0x4E00, /* CJK Unified Ideographs 0x6f */ - 0xA000, /* Yi Syllables 0x70 */ - 0xA490, /* Yi Radicals 0x71 */ - 0xA4D0, /* Lisu 0x72 */ - 0xA500, /* Vai 0x73 */ - 0xA640, /* Cyrillic Extended-B 0x74 */ - 0xA6A0, /* Bamum 0x75 */ - 0xA700, /* Modifier Tone Letters 0x76 */ - 0xA720, /* Latin Extended-D 0x77 */ - 0xA800, /* Syloti Nagri 0x78 */ - 0xA830, /* Common Indic Number Forms 0x79 */ - 0xA840, /* Phags-pa 0x7a */ - 0xA880, /* Saurashtra 0x7b */ - 0xA8E0, /* Devanagari Extended 0x7c */ - 0xA900, /* Kayah Li 0x7d */ - 0xA930, /* Rejang 0x7e */ - 0xA960, /* Hangul Jamo Extended-A 0x7f */ - 0xA980, /* Javanese 0x80 */ - 0xAA00, /* Cham 0x81 */ - 0xAA60, /* Myanmar Extended-A 0x82 */ - 0xAA80, /* Tai Viet 0x83 */ - 0xABC0, /* Meetei Mayek 0x84 */ - 0xAC00, /* Hangul Syllables 0x85 */ - 0xD7B0, /* Hangul Jamo Extended-B 0x86 */ - 0xD800, /* High Surrogates 0x87 */ - 0xDB80, /* High Private Use Surrogates 0x88 */ - 0xDC00, /* Low Surrogates 0x89 */ - 0xE000, /* Private Use Area 0x8a */ - 0xF900, /* CJK Compatibility Ideographs 0x8b */ - 0xFB00, /* Alphabetic Presentation Forms 0x8c */ - 0xFB50, /* Arabic Presentation Forms-A 0x8d */ - 0xFE00, /* Variation Selectors 0x8e */ - 0xFE10, /* Vertical Forms 0x8f */ - 0xFE20, /* Combining Half Marks 0x90 */ - 0xFE30, /* CJK Compatibility Forms 0x91 */ - 0xFE50, /* Small Form Variants 0x92 */ - 0xFE70, /* Arabic Presentation Forms-B 0x93 */ - 0xFF00, /* Halfwidth and Fullwidth Forms 0x94 */ - 0xFFF0, /* Specials 0x95 */ - 0x10000, /* Linear B Syllabary 0x96 */ - 0x10080, /* Linear B Ideograms 0x97 */ - 0x10100, /* Aegean Numbers 0x98 */ - 0x10140, /* Ancient Greek Numbers 0x99 */ - 0x10190, /* Ancient Symbols 0x9a */ - 0x101D0, /* Phaistos Disc 0x9b */ - 0x10280, /* Lycian 0x9c */ - 0x102A0, /* Carian 0x9d */ - 0x10300, /* Old Italic 0x9e */ - 0x10330, /* Gothic 0x9f */ - 0x10380, /* Ugaritic 0xa0 */ - 0x103A0, /* Old Persian 0xa1 */ - 0x10400, /* Deseret 0xa2 */ - 0x10450, /* Shavian 0xa3 */ - 0x10480, /* Osmanya 0xa4 */ - 0x10800, /* Cypriot Syllabary 0xa5 */ - 0x10840, /* Imperial Aramaic 0xa6 */ - 0x10900, /* Phoenician 0xa7 */ - 0x10920, /* Lydian 0xa8 */ - 0x10A00, /* Kharoshthi 0xa9 */ - 0x10A60, /* Old South Arabian 0xaa */ - 0x10B00, /* Avestan 0xab */ - 0x10B40, /* Inscriptional Parthian 0xac */ - 0x10B60, /* Inscriptional Pahlavi 0xad */ - 0x10C00, /* Old Turkic 0xae */ - 0x10E60, /* Rumi Numeral Symbols 0xaf */ - 0x11080, /* Kaithi 0xb0 */ - 0x12000, /* Cuneiform 0xb1 */ - 0x12400, /* Cuneiform Numbers and Punctuation 0xb2 */ - 0x13000, /* Egyptian Hieroglyphs 0xb3 */ - 0x1D000, /* Byzantine Musical Symbols 0xb4 */ - 0x1D100, /* Musical Symbols 0xb5 */ - 0x1D200, /* Ancient Greek Musical Notation 0xb6 */ - 0x1D300, /* Tai Xuan Jing Symbols 0xb7 */ - 0x1D360, /* Counting Rod Numerals 0xb8 */ - 0x1D400, /* Mathematical Alphanumeric Symbols 0xb9 */ - 0x1F000, /* Mahjong Tiles 0xba */ - 0x1F030, /* Domino Tiles 0xbb */ - 0x1F100, /* Enclosed Alphanumeric Supplement 0xbc */ - 0x1F200, /* Enclosed Ideographic Supplement 0xbd */ - 0x20000, /* CJK Unified Ideographs Extension B 0xbe */ - 0x2A700, /* CJK Unified Ideographs Extension C 0xbf */ - 0x2F800, /* CJK Compatibility Ideographs Supplement 0xc0 */ - 0x30000, /* reserved 0xc1 */ - 0x40000, /* reserved 0xc2 */ - 0x50000, /* reserved 0xc3 */ - 0x60000, /* reserved 0xc4 */ - 0x70000, /* reserved 0xc5 */ - 0x80000, /* reserved 0xc6 */ - 0x90000, /* reserved 0xc7 */ - 0xA0000, /* reserved 0xc8 */ - 0xB0000, /* reserved 0xc9 */ - 0xC0000, /* reserved 0xca */ - 0xD0000, /* reserved 0xcb */ - 0xE0000, /* Tags 0xcc */ - 0xE0100, /* Variation Selectors Supplement 0xcd */ - 0xF0000, /* Supplementary Private Use Area-A 0xce */ - 0x100000, /* Supplementary Private Use Area-B 0xcf */ + 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 */ /* Value over 0x10FFFF is illegal under Unicode, They are for some special use. *** experimental *** */ - 0x110000, /* Reserved 0xd0 */ - 0x120000, /* Reserved 0xd1 */ - 0x130000, /* Reserved 0xd2 */ - 0x140000, /* Reserved 0xd3 */ - 0x150000, /* Reserved 0xd4 */ - 0x160000, /* Reserved 0xd5 */ - 0x170000, /* Reserved 0xd6 */ - 0x180000, /* Reserved 0xd7 */ - 0x190000, /* Reserved 0xd8 */ - 0x1A0000, /* Reserved 0xd9 */ - 0x1B0000, /* Reserved 0xda */ - 0x1C0000, /* Reserved 0xdb */ - 0x1D0000, /* Reserved 0xdc */ - 0x1E0000, /* Reserved 0xdd */ - 0x1F0000, /* Reserved 0xde */ - 0x200000, /* Reserved 0xdf */ - 0x210000, /* Reserved 0xe0 */ - 0x220000, /* Reserved 0xe1 */ + 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 */ CJK_CHAR_LIMIT }; diff --git a/Build/source/texk/web2c/uptexdir/upbibtex.ch b/Build/source/texk/web2c/uptexdir/upbibtex.ch index 51acd5f5cc0..f18706b42b4 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-u0.30' +@d banner=='This is upBibTeX, Version 0.99d-j0.33-u1.00' @z @x diff --git a/Build/source/texk/web2c/uptexdir/updvitype.ch b/Build/source/texk/web2c/uptexdir/updvitype.ch index c7723bf1f3b..1c1678a93ab 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-u0.30' +@d banner=='This is upDVItype, Version 3.6-p0.4-u1.00' @z @x procedure initialize diff --git a/Build/source/texk/web2c/uptexdir/uppltotf.ch b/Build/source/texk/web2c/uptexdir/uppltotf.ch index acaf3d45475..1b62068a7e8 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-u0.30' +@d banner=='This is upPLtoTF, Version 3.5-p1.8-u1.00' @z @x diff --git a/Build/source/texk/web2c/uptexdir/uptex-m.ch b/Build/source/texk/web2c/uptexdir/uptex-m.ch index 71c57cffec4..7474aab010a 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 u0.30 +% This is a change file for upTeX u1.00 % By Takuji Tanaka. % % (02/26/2007) TTK upTeX u0.01 @@ -29,13 +29,14 @@ % (08/23/2009) TTK upTeX u0.28 % (01/31/2010) TTK upTeX u0.29 % (04/10/2010) TTK upTeX u0.30 +% (01/15/2012) TTK upTeX u1.00 @x upTeX: banner {printed when p\TeX\ starts} @y {printed when p\TeX\ starts} @# -@d upTeX_version_string=='-u0.30' {current up\TeX\ version} +@d upTeX_version_string=='-u1.00' {current up\TeX\ version} @# @d upTeX_version==pTeX_version_string,upTeX_version_string @d upTeX_banner=='This is upTeX, Version 3.1415926',upTeX_version @@ -216,23 +217,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(@"21):=hangul; { Hangul Jamo } - @+@t\1@>for k:=@"5F to @"61 do kcat_code(k):=kanji; { CJK Radicals Supplement .. Ideographic Description Characters } - @+@t\1@>for k:=@"63 to @"64 do kcat_code(k):=kana; { Hiragana, Katakana } - @t\hskip10pt@>kcat_code(@"65):=kanji; { Bopomofo } - @t\hskip10pt@>kcat_code(@"66):=hangul; { Hangul Compatibility Jamo } - @+@t\1@>for k:=@"67 to @"69 do kcat_code(k):=kanji; { Kanbun .. CJK Strokes } - @t\hskip10pt@>kcat_code(@"6A):=kana; { Katakana Phonetic Extensions } - @t\hskip10pt@>kcat_code(@"6D):=kanji; { CJK Unified Ideographs Extension A } - @t\hskip10pt@>kcat_code(@"6F):=kanji; { CJK Unified Ideographs } - @t\hskip10pt@>kcat_code(@"7F):=hangul; { Hangul Jamo Extended-A } - @t\hskip10pt@>kcat_code(@"85):=hangul; { Hangul Syllables } - @t\hskip10pt@>kcat_code(@"86):=hangul; { Hangul Jamo Extended-B } - @t\hskip10pt@>kcat_code(@"8B):=kanji; { CJK Compatibility Ideographs } - { @t\hskip10pt@>kcat_code(@"94):=other_kchar; Halfwidth and Fullwidth Forms } - @t\hskip10pt@>kcat_code(@"BE):=kanji; { CJK Unified Ideographs Extension B } - @t\hskip10pt@>kcat_code(@"BF):=kanji; { CJK Unified Ideographs Extension C } - @t\hskip10pt@>kcat_code(@"C0):=kanji; { CJK Compatibility Ideographs Supplement } + @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(@"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 25fda2700b1..92f36764f4c 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-u0.30' +@d banner=='This is upTFtoPL, Version 3.2-p1.7-u1.00' @z @x diff --git a/Build/source/texk/web2c/uptexdir/uptrip/uptrip.diffs b/Build/source/texk/web2c/uptexdir/uptrip/uptrip.diffs index a02bf7d6558..d62e5b1f5de 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-u0.30 (utf8.uptex) (TeX Live 2012) (INITEX) 23 AUG 2011 21:31 +> This is upTeX, Version 3.1415926-p3.2-u1.00 (utf8.uptex) (TeX Live 2012/dev) (INITEX) 16 JAN 2012 15:14 3,11c3 < (trip.tex < ! Bad character code (256). @@ -37,8 +37,8 @@ < 471 memory locations dumped; current usage is 96&278 < 341 multiletter control sequences --- -> (format=trip 2011.8.23) -> 1458 strings of total length 25415 +> (format=trip 2012.1.16) +> 1460 strings of total length 25454 > 485 memory locations dumped; current usage is 106&278 > 383 multiletter control sequences 461c454 @@ -54,7 +54,7 @@ < ** &trip trip < (trip.tex ## --- -> This is upTeX, Version 3.1415926-p3.2-u0.30 (utf8.uptex) (TeX Live 2012) +> This is upTeX, Version 3.1415926-p3.2-u1.00 (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-u0.30 (utf8.uptex) (TeX Live 2012) (format=trip 2011.8.23) 23 AUG 2011 21:31 +> 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 3c3 < (trip.tex ## --- @@ -208,13 +208,13 @@ 3054c3062 < .\fam0 ^^c8 --- -> .\fam0 ì +> .\fam0 È 3143a3152 > ....\displace 0.0 3235c3244 < ! \textfont 0 is undefined (character ^^c8). --- -> ! \textfont 0 is undefined (character ì ©. +> ! \textfont 0 is undefined (character È). 3326c3335 < \vbox(10000.0+2.0)x28.0, glue set 9737.58789fil --- @@ -277,7 +277,7 @@ 5700c5711 < ! \textfont 0 is undefined (character ^^c8). --- -> ! \textfont 0 is undefined (character ì ©. +> ! \textfont 0 is undefined (character È). 6380c6391 < (tripos.tex --- @@ -304,8 +304,8 @@ < 2825 words of memory out of 3000 < 372 multiletter control sequences out of 2100 --- -> 44 strings out of 1542 -> 261 string characters out of 14585 +> 44 strings out of 1540 +> 261 string characters out of 14546 > 4259 words of memory out of 4500 > 414 multiletter control sequences out of 15000+0 7301c7312 @@ -318,11 +318,11 @@ 1c1 < This is DVItype, Version 3.6 --- -> This is DVItype, Version 3.6 (TeX Live 2012) +> This is DVItype, Version 3.6 (TeX Live 2012/dev) 9c9 < ' TeX output 2008.03.15:0223' --- -> ' TeX output 2011.08.23:2131' +> ' TeX output 2012.01.16:1514' 419c419 < 1121: down4 639342208 --- |