--- a/Makefile +++ b/Makefile @@ -2,13 +2,13 @@ # Kau Chauo Chinese Fanti Ming Fonts Version 1.05 For FreeBSD # # All fonts source is contributed by Kau Chauo Business CO. -# Converted by Chih-Hao Tsai & Pa on Taiwan +# Converted by Chih-Hao Tsai & PA on Taiwan # -# maintainer: Pa ( Pa@FreeBSD.ee.ntu.edu.tw ) +# maintainer: PA ( PA@FreeBSD.ee.ntu.edu.tw ) # -CFONTDIR=/usr/X11R6/lib/X11/fonts/chinese -EFONTDIR=/usr/X11R6/lib/X11/fonts/misc +CFONTDIR=${PREFIX}/lib/X11/fonts/local +EFONTDIR=${PREFIX}/lib/X11/fonts/local FONTS =kc24f.pcf.gz kc15f.pcf.gz kc8x15.pcf.gz kc12x24.pcf.gz PROGS =kc24f kc15f kc8x15 kc12x24 kca2et OBJS =tran.o kc24f.o kc15f.o kc8x15.o kc12x24.o kca2et.o @@ -22,10 +22,14 @@ ./kc15f | bdftopcf | gzip - > kc15f.pcf.gz kc8x15.pcf.gz: kca2et kc8x15 ./kca2et kctext16.f00 ascfont.15 256 16 15 - ./kc8x15 | bdftopcf | gzip - > kc8x15.pcf.gz + ./kc8x15 > kc8x15.bdf + patch < kc8x15.diff + bdftopcf kc8x15.bdf | gzip - > kc8x15.pcf.gz kc12x24.pcf.gz: kca2et kc12x24 ./kca2et kctext24.f00 ascfont.24 256 48 48 - ./kc12x24 | bdftopcf | gzip - > kc12x24.pcf.gz + ./kc12x24 > kc12x24.bdf + patch < kc12x24.diff + bdftopcf kc12x24.bdf | gzip - > kc12x24.pcf.gz kc24f: tran.o kc24f.o $(CC) $(CFLAGS) tran.o kc24f.o -o $@ @@ -42,7 +46,9 @@ if [ ! -d $(CFONTDIR) ]; then mkdir $(CFONTDIR); fi cp kc*f.pcf.gz $(CFONTDIR) cp kc*x*.pcf.gz $(EFONTDIR) + cp kc_fonts.alias $(CFONTDIR) mkfontdir $(CFONTDIR) + cd ${PREFIX}/lib/X11/fonts/local ; cat kc_fonts.alias >> fonts.alias ; cp fonts.alias ..fonts.alias.. ; sort ..fonts.alias.. | uniq > fonts.alias ; rm ..fonts.alias.. mkfontdir $(EFONTDIR) clean: --- a/kc_fonts.alias +++ b/kc_fonts.alias @@ -0,0 +1,6 @@ +kc12x24 -kc-fixed-medium-r-normal--24-170-100-100-c-120-iso8859-1 +kc15f -kc-fixed-medium-r-normal--16-160-72-72-c-160-big5-0 +kc24f -kc-fixed-medium-r-normal--24-240-100-100-c-240-big5-0 +kc8x15 -kc-fixed-medium-r-normal--15-170-100-100-c-80-iso8859-1 +taipei16 -kc-fixed-medium-r-normal--16-160-72-72-c-160-big5-0 +taipei24 -kc-fixed-medium-r-normal--24-240-100-100-c-240-big5-0 --- a/kc12x24.c +++ b/kc12x24.c @@ -10,12 +10,12 @@ char bdfhead[]= "STARTFONT 2.1\n" "COMMENT X\n" -"FONT kc12x24\n" +"FONT -kc-fixed-medium-r-normal--24-170-100-100--c-120-iso8859-1\n" "SIZE 24 100 100\n" "FONTBOUNDINGBOX 12 24 0 -2\n" "STARTPROPERTIES 19\n" "FONTNAME_REGISTRY \"\"\n" -"FOUNDRY \"Kau Chauo\"\n" +"FOUNDRY \"KC\"\n" "FAMILY_NAME \"Fixed\"\n" "WEIGHT_NAME \"Medium\"\n" "SLANT \"R\"\n" @@ -36,7 +36,7 @@ "ENDPROPERTIES\n" "CHARS 256\n"; -void main( void ) +int main( void ) { FILE *fr,*fw; int i,j; @@ -68,4 +68,5 @@ } fprintf(fw, "ENDFONT\n"); + return 0; } --- a/kc15f.c +++ b/kc15f.c @@ -12,26 +12,33 @@ char head[]= "STARTFONT 2.1\n" "COMMENT 16x15 Font\n" -"FONT kc15f\n" +"FONT -kc-fixed-medium-r-normal--16-160-72-72-c-160-big5-0\n" "SIZE 16 100 100\n" "FONTBOUNDINGBOX 16 15 0 -1\n" -"STARTPROPERTIES 12\n" +"STARTPROPERTIES 19\n" "FONT_ASCENT 14\n" "FONT_DESCENT 1\n" "DEFAULT_CHAR 41280\n" -"COPYRIGHT \"KC\"\n" -"POINT_SIZE 240\n" -"FONT \"kc15f\"\n" -"WEIGHT 10\n" -"RESOLUTION 103\n" -"RESOLUTION_X 100\n" -"RESOLUTION_Y 100\n" -"X_HEIGHT 4294967295\n" -"QUAD_WIDTH 16\n" +"COPYRIGHT \"Kau Chauo Business CO.\"\n" +"FONTNAME_REGISTRY \"\"\n" +"FOUNDRY \"KC\"\n" +"FAMILY_NAME \"Fixed\"\n" +"WEIGHT_NAME \"Medium\"\n" +"SLANT \"R\"\n" +"SETWIDTH_NAME \"Normal\"\n" +"ADD_STYLE_NAME \"\"\n" +"PIXEL_SIZE 16\n" +"POINT_SIZE 160\n" +"RESOLUTION_X 72\n" +"RESOLUTION_Y 72\n" +"SPACING \"C\"\n" +"AVERAGE_WIDTH 160\n" +"CHARSET_REGISTRY \"BIG5\"\n" +"CHARSET_ENCODING \"0\"\n" "ENDPROPERTIES\n" "CHARS 13867\n"; -FILE *fp,*fr1, *fr2, *fw=stdout; +FILE *fp,*fr1, *fr2; int count, ofs; @@ -42,21 +49,21 @@ int v,i; if ((v=fread(bf,1,sizeof(bf),fp)) != sizeof(bf)) return; - fprintf(fw,"STARTCHAR %d\n", count); + fprintf(stdout,"STARTCHAR %d\n", count); tt[0]=ofs>>8; tt[1]=ofs&255; ser_b5(tt,uu); - fprintf(fw,"ENCODING %d\n", (u_short)uu[0]<<8 | uu[1]); - fprintf(fw,"SWIDTH 640 0\n"); - fprintf(fw,"DWIDTH 16 0\n"); - fprintf(fw,"BBX 16 15 0 -1\n"); - fprintf(fw,"BITMAP\n"); + fprintf(stdout,"ENCODING %d\n", (u_short)uu[0]<<8 | uu[1]); + fprintf(stdout,"SWIDTH 640 0\n"); + fprintf(stdout,"DWIDTH 16 0\n"); + fprintf(stdout,"BBX 16 15 0 -1\n"); + fprintf(stdout,"BITMAP\n"); for(i=0;i<15;i++) { v=((u_int)bf[i][0]<<8) | bf[i][1]; - fprintf(fw,"%04x\n", v); + fprintf(stdout,"%04x\n", v); } - fprintf(fw,"ENDCHAR\n"); + fprintf(stdout,"ENDCHAR\n"); } main() @@ -65,7 +72,7 @@ if ((fp=fopen("spcfont.15","r"))==NULL) { fprintf(stderr,"kc15 Error01:Can't open spcfont.15\n"); exit(2); } - fputs(head,fw); + fputs(head,stdout); ofs=0x8400; while (!feof(fp)) { @@ -102,8 +109,7 @@ fclose(fr1); fclose(fr2); - fprintf(fw,"ENDFONT\n"); + fprintf(stdout,"ENDFONT\n"); fclose(fp); - fclose(fw); } --- a/kc24f.c +++ b/kc24f.c @@ -11,26 +11,33 @@ char head[]= "STARTFONT 2.1\n" "COMMENT 24x24 Font\n" -"FONT kc24f\n" +"FONT -kc-fixed-medium-r-normal--24-240-100-100-c-240-big5-0\n" "SIZE 24 100 100\n" "FONTBOUNDINGBOX 24 24 0 -2\n" -"STARTPROPERTIES 12\n" +"STARTPROPERTIES 19\n" "FONT_ASCENT 22\n" "FONT_DESCENT 2\n" "DEFAULT_CHAR 41280\n" -"COPYRIGHT \"KC\"\n" +"COPYRIGHT \"Kau Chauo Business CO.\"\n" +"FONTNAME_REGISTRY \"\"\n" +"FOUNDRY \"KC\"\n" +"FAMILY_NAME \"Fixed\"\n" +"WEIGHT_NAME \"Medium\"\n" +"SLANT \"R\"\n" +"SETWIDTH_NAME \"Normal\"\n" +"ADD_STYLE_NAME \"\"\n" +"PIXEL_SIZE 24\n" "POINT_SIZE 240\n" -"FONT \"kc24f\"\n" -"WEIGHT 10\n" -"RESOLUTION 103\n" "RESOLUTION_X 100\n" "RESOLUTION_Y 100\n" -"X_HEIGHT 4294967295\n" -"QUAD_WIDTH 24\n" +"SPACING \"C\"\n" +"AVERAGE_WIDTH 240\n" +"CHARSET_REGISTRY \"BIG5\"\n" +"CHARSET_ENCODING \"0\"\n" "ENDPROPERTIES\n" "CHARS 13867\n"; -FILE *fp,*fr1, *fr2, *fw=stdout; +FILE *fp,*fr1, *fr2; int count, ofs; @@ -42,21 +49,21 @@ if ((v=fread(bf,1,72,fp)) != 72) return; -fprintf(fw,"STARTCHAR %d\n", count); +fprintf(stdout,"STARTCHAR %d\n", count); tt[0]=ofs>>8; tt[1]=ofs&255; ser_b5(tt,uu); -fprintf(fw,"ENCODING %d\n", (u_short)uu[0]<<8 | uu[1]); -fprintf(fw,"SWIDTH 960 0\n"); -fprintf(fw,"DWIDTH 24 0\n"); -fprintf(fw,"BBX 24 24 0 -2\n"); -fprintf(fw,"BITMAP\n"); +fprintf(stdout,"ENCODING %d\n", (u_short)uu[0]<<8 | uu[1]); +fprintf(stdout,"SWIDTH 960 0\n"); +fprintf(stdout,"DWIDTH 24 0\n"); +fprintf(stdout,"BBX 24 24 0 -2\n"); +fprintf(stdout,"BITMAP\n"); zc=0; for(i=0;i<24;i++) { v=(((u_int)bf[i][0]<<16) | ((u_int)bf[i][1]<<8)) | bf[i][2]; - fprintf(fw,"%06x\n", v); + fprintf(stdout,"%06x\n", v); } -fprintf(fw,"ENDCHAR\n"); +fprintf(stdout,"ENDCHAR\n"); } main() @@ -65,7 +72,7 @@ if ((fp=fopen("spcfont.24","r"))==NULL) { fprintf(stderr,"kc24 Error 1:Can't open spcfont.24\n"); exit(2); } -fputs(head,fw); +fputs(head,stdout); ofs=0x8400; while (!feof(fp)) { @@ -101,8 +108,7 @@ fclose(fr1); fclose(fr2); -fprintf(fw,"ENDFONT\n"); +fprintf(stdout,"ENDFONT\n"); fclose(fp); -fclose(fw); } --- a/kc8x15.c +++ b/kc8x15.c @@ -10,12 +10,12 @@ char bdfhead[]= "STARTFONT 2.1\n" "COMMENT X\n" -"FONT kc8x15\n" +"FONT -kc-fixed-medium-r-normal--15-170-100-100-c-80-iso8859-1\n" "SIZE 15 100 100\n" "FONTBOUNDINGBOX 8 15 0 -1\n" "STARTPROPERTIES 19\n" "FONTNAME_REGISTRY \"\"\n" -"FOUNDRY \"Kau Chauo\"\n" +"FOUNDRY \"KC\"\n" "FAMILY_NAME \"Fixed\"\n" "WEIGHT_NAME \"Medium\"\n" "SLANT \"R\"\n" @@ -37,7 +37,7 @@ "CHARS 256\n"; -void main( void ) +int main( void ) { FILE *fr,*fw; int i,j; @@ -69,4 +69,5 @@ } fprintf(fw, "ENDFONT\n"); + return 0; } --- a/kc8x15.diff +++ b/kc8x15.diff @@ -0,0 +1,1034 @@ +--- kc8x15.bdf.orig Sun Apr 30 11:32:40 2000 ++++ kc8x15.bdf Sun Apr 30 11:39:05 2000 +@@ -49,685 +49,519 @@ + ENDCHAR + STARTCHAR C001 + ENCODING 1 +-SWIDTH 508 0 ++SWIDTH 480 0 + DWIDTH 8 0 +-BBX 8 15 0 -1 ++BBX 7 14 0 0 + BITMAP +-00 +-00 +-00 +-7e +-81 +-a5 +-81 +-81 +-bd +-99 +-81 +-7e +-00 +-00 +-00 ++10 ++10 ++38 ++38 ++7c ++7c ++fe ++fe ++7c ++7c ++38 ++38 ++10 ++10 + ENDCHAR + STARTCHAR C002 + ENCODING 2 +-SWIDTH 508 0 ++SWIDTH 480 0 + DWIDTH 8 0 +-BBX 8 15 0 -1 ++BBX 7 14 0 0 + BITMAP +-00 +-00 +-00 +-7e +-ff +-db +-ff +-ff +-c3 +-e7 +-ff +-7e +-00 +-00 +-00 ++92 ++92 ++44 ++44 ++92 ++92 ++44 ++44 ++92 ++92 ++44 ++44 ++92 ++92 + ENDCHAR + STARTCHAR C003 + ENCODING 3 +-SWIDTH 508 0 ++SWIDTH 480 0 + DWIDTH 8 0 +-BBX 8 15 0 -1 ++BBX 7 15 0 -2 + BITMAP ++88 ++88 ++88 ++f8 ++88 ++88 ++88 + 00 +-00 +-00 +-00 +-36 +-7f +-7f +-7f +-7f + 3e +-1c + 08 +-00 +-00 +-00 ++08 ++08 ++08 ++08 ++08 + ENDCHAR + STARTCHAR C004 + ENCODING 4 +-SWIDTH 508 0 ++SWIDTH 480 0 + DWIDTH 8 0 +-BBX 8 15 0 -1 ++BBX 7 14 0 -1 + BITMAP +-00 +-00 +-00 +-00 +-08 +-1c +-3e +-7f ++f8 ++80 ++80 ++f0 ++80 ++80 ++80 + 3e +-1c +-08 +-00 +-00 +-00 +-00 ++20 ++20 ++3c ++20 ++20 ++20 + ENDCHAR + STARTCHAR C005 + ENCODING 5 +-SWIDTH 508 0 ++SWIDTH 480 0 + DWIDTH 8 0 +-BBX 8 15 0 -1 ++BBX 7 15 0 -2 + BITMAP ++70 ++88 ++80 ++80 ++80 ++88 ++70 + 00 +-00 +-00 +-18 +-3c + 3c +-e7 +-e7 +-e7 +-18 +-18 ++22 ++22 + 3c +-00 +-00 +-00 ++28 ++24 ++22 + ENDCHAR + STARTCHAR C006 + ENCODING 6 +-SWIDTH 508 0 ++SWIDTH 480 0 + DWIDTH 8 0 +-BBX 8 15 0 -1 ++BBX 7 15 0 -2 + BITMAP ++80 ++80 ++80 ++80 ++80 ++80 ++f8 + 00 +-00 +-00 +-18 +-3c +-7e +-ff +-ff +-7e +-18 +-18 ++3e ++20 ++20 + 3c +-00 +-00 +-00 ++20 ++20 ++20 + ENDCHAR + STARTCHAR C007 + ENCODING 7 +-SWIDTH 508 0 ++SWIDTH 480 0 + DWIDTH 8 0 +-BBX 8 15 0 -1 ++BBX 5 5 1 7 + BITMAP +-00 +-00 +-00 +-00 +-00 +-00 +-18 +-3c +-3c +-18 +-00 +-00 +-00 +-00 +-00 ++70 ++88 ++88 ++88 ++70 + ENDCHAR + STARTCHAR C008 + ENCODING 8 +-SWIDTH 508 0 ++SWIDTH 480 0 + DWIDTH 8 0 +-BBX 8 15 0 -1 ++BBX 7 11 0 1 + BITMAP +-ff +-ff +-ff +-ff +-ff +-ff +-e7 +-c3 +-c3 +-e7 +-ff +-ff +-ff +-ff +-ff ++10 ++10 ++10 ++10 ++fe ++10 ++10 ++10 ++10 ++00 ++fe + ENDCHAR + STARTCHAR C009 + ENCODING 9 +-SWIDTH 508 0 ++SWIDTH 480 0 + DWIDTH 8 0 +-BBX 8 15 0 -1 ++BBX 7 15 0 -2 + BITMAP +-00 +-00 +-00 +-00 +-00 +-3c +-66 +-42 +-42 +-66 +-3c +-00 +-00 +-00 +-00 ++84 ++c4 ++a4 ++a4 ++94 ++94 ++8c ++84 ++20 ++20 ++20 ++20 ++20 ++20 ++3e + ENDCHAR + STARTCHAR C010 + ENCODING 10 +-SWIDTH 508 0 ++SWIDTH 480 0 + DWIDTH 8 0 +-BBX 8 15 0 -1 ++BBX 7 13 0 -1 + BITMAP +-ff +-ff +-ff +-ff +-ff +-c3 +-99 +-bd +-bd +-99 +-c3 +-ff +-ff +-ff +-ff ++88 ++88 ++88 ++50 ++50 ++20 ++00 ++3e ++08 ++08 ++08 ++08 ++08 + ENDCHAR + STARTCHAR C011 + ENCODING 11 +-SWIDTH 508 0 ++SWIDTH 480 0 + DWIDTH 8 0 +-BBX 8 15 0 -1 ++BBX 4 9 0 5 + BITMAP +-00 +-00 +-00 +-0f +-07 +-0d +-19 +-3c +-66 +-66 +-66 +-3c +-00 +-00 +-00 ++10 ++10 ++10 ++10 ++10 ++10 ++10 ++10 ++f0 + ENDCHAR + STARTCHAR C012 + ENCODING 12 +-SWIDTH 508 0 ++SWIDTH 480 0 + DWIDTH 8 0 +-BBX 8 15 0 -1 ++BBX 4 8 0 -2 + BITMAP +-00 +-00 +-00 +-3c +-66 +-66 +-66 +-3c +-18 +-7e +-18 +-18 +-00 +-00 +-00 ++f0 ++10 ++10 ++10 ++10 ++10 ++10 ++10 + ENDCHAR + STARTCHAR C013 + ENCODING 13 +-SWIDTH 508 0 ++SWIDTH 480 0 + DWIDTH 8 0 +-BBX 8 15 0 -1 ++BBX 5 8 3 -2 + BITMAP +-00 +-00 +-00 +-3f +-33 +-3f +-30 +-30 +-30 +-70 +-f0 +-e0 +-00 +-00 +-00 ++f8 ++80 ++80 ++80 ++80 ++80 ++80 ++80 + ENDCHAR + STARTCHAR C014 + ENCODING 14 +-SWIDTH 508 0 ++SWIDTH 480 0 + DWIDTH 8 0 +-BBX 8 15 0 -1 ++BBX 5 9 3 5 + BITMAP +-00 +-00 +-00 +-7f +-63 +-7f +-63 +-63 +-63 +-67 +-e7 +-e6 +-c0 +-00 +-00 ++80 ++80 ++80 ++80 ++80 ++80 ++80 ++80 ++f8 + ENDCHAR + STARTCHAR C015 + ENCODING 15 +-SWIDTH 508 0 ++SWIDTH 480 0 + DWIDTH 8 0 +-BBX 8 15 0 -1 ++BBX 8 16 0 -2 + BITMAP +-00 +-00 +-00 +-18 +-18 +-db +-3c +-e7 +-3c +-db +-18 +-18 +-00 +-00 +-00 ++10 ++10 ++10 ++10 ++10 ++10 ++10 ++10 ++ff ++10 ++10 ++10 ++10 ++10 ++10 ++10 + ENDCHAR + STARTCHAR C016 + ENCODING 16 +-SWIDTH 508 0 ++SWIDTH 480 0 + DWIDTH 8 0 +-BBX 8 15 0 -1 ++BBX 8 1 0 11 + BITMAP +-00 +-00 +-00 +-40 +-60 +-70 +-7c +-7f +-7c +-70 +-60 +-40 +-00 +-00 +-00 ++ff + ENDCHAR + STARTCHAR C017 + ENCODING 17 +-SWIDTH 508 0 ++SWIDTH 480 0 + DWIDTH 8 0 +-BBX 8 15 0 -1 ++BBX 8 1 0 8 + BITMAP +-00 +-00 +-00 +-01 +-03 +-07 +-1f +-7f +-1f +-07 +-03 +-01 +-00 +-00 +-00 ++ff + ENDCHAR + STARTCHAR C018 + ENCODING 18 +-SWIDTH 508 0 ++SWIDTH 480 0 + DWIDTH 8 0 +-BBX 8 15 0 -1 ++BBX 8 1 0 5 + BITMAP +-00 +-00 +-00 +-18 +-3c +-7e +-18 +-18 +-18 +-7e +-3c +-18 +-00 +-00 +-00 ++ff + ENDCHAR + STARTCHAR C019 + ENCODING 19 +-SWIDTH 508 0 ++SWIDTH 480 0 + DWIDTH 8 0 +-BBX 8 15 0 -1 ++BBX 8 1 0 2 + BITMAP +-00 +-00 +-00 +-33 +-33 +-33 +-33 +-33 +-33 +-00 +-33 +-33 +-00 +-00 +-00 ++ff + ENDCHAR + STARTCHAR C020 + ENCODING 20 +-SWIDTH 508 0 ++SWIDTH 480 0 + DWIDTH 8 0 +-BBX 8 15 0 -1 ++BBX 8 1 0 -1 + BITMAP +-00 +-00 +-00 +-7f +-db +-db +-db +-7b +-1b +-1b +-1b +-1b +-00 +-00 +-00 ++ff + ENDCHAR + STARTCHAR C021 + ENCODING 21 +-SWIDTH 508 0 ++SWIDTH 480 0 + DWIDTH 8 0 +-BBX 8 15 0 -1 ++BBX 5 16 3 -2 + BITMAP +-00 +-00 +-3e +-63 +-30 +-1c +-36 +-63 +-63 +-36 +-1c +-06 +-63 +-3e +-00 ++80 ++80 ++80 ++80 ++80 ++80 ++80 ++80 ++f8 ++80 ++80 ++80 ++80 ++80 ++80 ++80 + ENDCHAR + STARTCHAR C022 + ENCODING 22 +-SWIDTH 508 0 ++SWIDTH 480 0 + DWIDTH 8 0 +-BBX 8 15 0 -1 ++BBX 4 16 0 -2 + BITMAP +-00 +-00 +-00 +-00 +-00 +-00 +-00 +-00 +-00 +-7f +-7f +-7f +-00 +-00 +-00 ++10 ++10 ++10 ++10 ++10 ++10 ++10 ++10 ++f0 ++10 ++10 ++10 ++10 ++10 ++10 ++10 + ENDCHAR + STARTCHAR C023 + ENCODING 23 +-SWIDTH 508 0 ++SWIDTH 480 0 + DWIDTH 8 0 +-BBX 8 15 0 -1 ++BBX 8 9 0 5 + BITMAP +-00 +-00 +-00 +-18 +-3c +-7e +-18 +-18 +-18 +-7e +-3c +-18 +-7e +-00 +-00 ++10 ++10 ++10 ++10 ++10 ++10 ++10 ++10 ++ff + ENDCHAR + STARTCHAR C024 + ENCODING 24 +-SWIDTH 508 0 ++SWIDTH 480 0 + DWIDTH 8 0 +-BBX 8 15 0 -1 ++BBX 8 8 0 -2 + BITMAP +-00 +-00 +-00 +-18 +-3c +-7e +-18 +-18 +-18 +-18 +-18 +-18 +-00 +-00 +-00 ++ff ++10 ++10 ++10 ++10 ++10 ++10 ++10 + ENDCHAR + STARTCHAR C025 + ENCODING 25 +-SWIDTH 508 0 ++SWIDTH 480 0 + DWIDTH 8 0 +-BBX 8 15 0 -1 ++BBX 1 16 3 -2 + BITMAP +-00 +-00 +-00 +-18 +-18 +-18 +-18 +-18 +-18 +-7e +-3c +-18 +-00 +-00 +-00 ++80 ++80 ++80 ++80 ++80 ++80 ++80 ++80 ++80 ++80 ++80 ++80 ++80 ++80 ++80 ++80 + ENDCHAR + STARTCHAR C026 + ENCODING 26 +-SWIDTH 508 0 ++SWIDTH 480 0 + DWIDTH 8 0 +-BBX 8 15 0 -1 ++BBX 7 10 0 0 + BITMAP +-00 +-00 +-00 +-00 +-00 ++02 + 0c +-06 +-7f +-06 ++30 ++c0 ++30 + 0c ++02 ++fe + 00 +-00 +-00 +-00 +-00 ++fe + ENDCHAR + STARTCHAR C027 + ENCODING 27 +-SWIDTH 508 0 ++SWIDTH 480 0 + DWIDTH 8 0 +-BBX 8 15 0 -1 ++BBX 7 10 0 0 + BITMAP +-00 +-00 +-00 +-00 +-00 ++80 ++60 + 18 +-30 +-7f +-30 ++06 + 18 ++60 ++80 ++fe + 00 +-00 +-00 +-00 +-00 ++fe + ENDCHAR + STARTCHAR C028 + ENCODING 28 +-SWIDTH 508 0 ++SWIDTH 480 0 + DWIDTH 8 0 +-BBX 8 15 0 -1 ++BBX 7 7 0 0 + BITMAP +-00 +-00 +-00 +-00 +-00 +-00 +-60 +-60 +-60 +-7f +-00 +-00 +-00 +-00 +-00 ++fe ++24 ++24 ++24 ++24 ++44 ++84 + ENDCHAR + STARTCHAR C029 + ENCODING 29 +-SWIDTH 508 0 ++SWIDTH 480 0 + DWIDTH 8 0 +-BBX 8 15 0 -1 ++BBX 7 9 0 1 + BITMAP +-00 +-00 +-00 +-00 +-00 +-24 +-66 +-ff +-66 +-24 +-00 +-00 +-00 +-00 +-00 ++02 ++04 ++08 ++fe ++10 ++fe ++20 ++40 ++80 + ENDCHAR + STARTCHAR C030 + ENCODING 30 +-SWIDTH 508 0 ++SWIDTH 480 0 + DWIDTH 8 0 +-BBX 8 15 0 -1 ++BBX 6 11 1 -1 + BITMAP +-00 +-00 +-00 +-00 +-08 +-1c +-1c +-3e +-3e +-7f +-7f +-00 +-00 +-00 +-00 ++18 ++24 ++20 ++20 ++20 ++f8 ++20 ++20 ++78 ++a4 ++40 + ENDCHAR + STARTCHAR C031 + ENCODING 31 +-SWIDTH 508 0 ++SWIDTH 480 0 + DWIDTH 8 0 +-BBX 8 15 0 -1 ++BBX 1 1 3 5 + BITMAP +-00 +-00 +-00 +-00 +-7f +-7f +-3e +-3e +-1c +-1c +-08 +-00 +-00 +-00 +-00 ++80 + ENDCHAR + STARTCHAR C032 + ENCODING 32 --- a/kc12x24.diff +++ b/kc12x24.diff @@ -0,0 +1,1401 @@ +--- kc12x24.bdf.orig Sun Apr 30 11:50:10 2000 ++++ kc12x24.bdf Sun Apr 30 11:54:17 2000 +@@ -60,435 +60,328 @@ + ENCODING 1 + SWIDTH 508 0 + DWIDTH 12 0 +-BBX 12 24 0 -2 ++BBX 11 21 0 1 + BITMAP +-0000 +-0000 +-1f80 +-3fc0 +-30c0 +-6060 +-6060 +-6960 +-6960 +-6060 +-6060 +-6060 +-6060 +-6060 +-6f60 +-6660 +-6660 +-6060 +-30c0 +-1f80 +-0f00 +-0000 +-0000 +-0000 ++0400 ++0400 ++0e00 ++0e00 ++1f00 ++1f00 ++3f80 ++3f80 ++7fc0 ++7fc0 ++ffe0 ++7fc0 ++7fc0 ++3f80 ++3f80 ++1f00 ++1f00 ++0e00 ++0e00 ++0400 ++0400 + ENDCHAR + STARTCHAR C002 + ENCODING 2 + SWIDTH 508 0 + DWIDTH 12 0 +-BBX 12 24 0 -2 ++BBX 12 21 0 1 + BITMAP +-0000 +-0000 +-0000 +-0f00 +-1f80 +-3fc0 +-3fc0 +-76e0 +-76e0 +-7fe0 +-7fe0 +-7fe0 +-7fe0 +-7fe0 +-70e0 +-79e0 +-79e0 +-3fc0 +-3fc0 +-1f80 +-0f00 +-0000 +-0000 +-0000 ++c630 ++c630 ++c630 ++30c0 ++30c0 ++30c0 ++c630 ++c630 ++c630 ++30c0 ++30c0 ++30c0 ++c630 ++c630 ++c630 ++30c0 ++30c0 ++30c0 ++c630 ++c630 ++c630 + ENDCHAR + STARTCHAR C003 + ENCODING 3 + SWIDTH 508 0 + DWIDTH 12 0 +-BBX 12 24 0 -2 ++BBX 10 19 0 1 + BITMAP ++c600 ++c600 ++c600 ++c600 ++fe00 ++c600 ++c600 ++c600 ++c600 + 0000 + 0000 +-0000 +-0000 +-0000 +-0000 +-0000 +-39c0 +-39c0 +-7fe0 +-7fe0 +-7fe0 +-7fe0 +-7fe0 +-3fc0 + 3fc0 +-1f80 +-1f80 +-0f00 + 0600 + 0600 +-0000 +-0000 +-0000 ++0600 ++0600 ++0600 ++0600 ++0600 + ENDCHAR + STARTCHAR C004 + ENCODING 4 + SWIDTH 508 0 + DWIDTH 12 0 +-BBX 12 24 0 -2 ++BBX 10 19 0 1 + BITMAP ++fe00 ++c000 ++c000 ++c000 ++fc00 ++c000 ++c000 ++c000 ++c000 + 0000 +-0000 +-0000 +-0000 +-0000 +-0000 +-0600 +-0600 +-0f00 +-0f00 +-1f80 +-1f80 +-3fc0 +-7fe0 +-3fc0 +-1f80 ++1fc0 ++1800 ++1800 ++1800 + 1f80 +-0f00 +-0f00 +-0600 +-0600 +-0000 +-0000 +-0000 ++1800 ++1800 ++1800 ++1800 + ENDCHAR + STARTCHAR C005 + ENCODING 5 + SWIDTH 508 0 + DWIDTH 12 0 +-BBX 12 24 0 -2 ++BBX 10 19 0 1 + BITMAP ++3c00 ++6600 ++c600 ++c000 ++c000 ++c000 ++c000 ++6600 ++3c00 + 0000 +-0000 +-0000 +-0000 +-0000 +-0f00 +-0f00 + 1f80 ++18c0 ++18c0 ++18c0 + 1f80 +-0f00 +-36c0 +-76e0 +-79e0 +-79e0 +-79e0 +-36c0 +-0600 +-0600 +-0600 +-0f00 +-1f80 +-0000 +-0000 +-0000 ++1900 ++1980 ++18c0 ++18c0 + ENDCHAR + STARTCHAR C006 + ENCODING 6 + SWIDTH 508 0 + DWIDTH 12 0 +-BBX 12 24 0 -2 ++BBX 10 19 0 1 + BITMAP ++c000 ++c000 ++c000 ++c000 ++c000 ++c000 ++c000 ++c000 ++fe00 + 0000 +-0000 +-0000 +-0000 +-0000 +-0600 +-0600 +-0f00 +-0f00 +-1f80 +-3fc0 +-3fc0 +-7fe0 +-7fe0 +-7fe0 +-7fe0 +-36c0 +-0600 +-0600 +-0f00 ++1fc0 ++1800 ++1800 ++1800 + 1f80 +-0000 +-0000 +-0000 ++1800 ++1800 ++1800 ++1800 + ENDCHAR + STARTCHAR C007 + ENCODING 7 + SWIDTH 508 0 + DWIDTH 12 0 +-BBX 12 24 0 -2 ++BBX 7 6 2 12 + BITMAP +-0000 +-0000 +-0000 +-0000 +-0000 +-0000 +-0000 +-0000 +-0000 +-0000 +-0600 +-0f00 +-0f00 +-0600 +-0000 +-0000 +-0000 +-0000 +-0000 +-0000 +-0000 +-0000 +-0000 +-0000 ++38 ++6c ++c6 ++c6 ++6c ++38 + ENDCHAR + STARTCHAR C008 + ENCODING 8 + SWIDTH 508 0 + DWIDTH 12 0 +-BBX 12 24 0 -2 ++BBX 10 17 0 2 + BITMAP +-fff0 +-fff0 +-fff0 +-fff0 +-fff0 +-fff0 +-fff0 +-fff0 +-fff0 +-fff0 +-f9f0 +-f0f0 +-f0f0 +-f9f0 +-fff0 +-fff0 +-fff0 +-fff0 +-fff0 +-fff0 +-fff0 +-fff0 +-fff0 +-fff0 ++0c00 ++0c00 ++0c00 ++0c00 ++0c00 ++0c00 ++ffc0 ++ffc0 ++0c00 ++0c00 ++0c00 ++0c00 ++0c00 ++0c00 ++0000 ++ffc0 ++ffc0 + ENDCHAR + STARTCHAR C009 + ENCODING 9 + SWIDTH 508 0 + DWIDTH 12 0 +-BBX 12 24 0 -2 ++BBX 10 19 0 1 + BITMAP ++e300 ++e300 ++d300 ++d300 ++cb00 ++cb00 ++c700 ++c700 ++c300 + 0000 +-0000 +-0000 +-0000 +-0000 +-0000 +-0000 +-0000 +-0f00 +-1980 +-30c0 +-2040 +-2040 +-30c0 +-1980 +-0f00 +-0000 +-0000 +-0000 +-0000 +-0000 +-0000 +-0000 +-0000 ++1800 ++1800 ++1800 ++1800 ++1800 ++1800 ++1800 ++1800 ++1fc0 + ENDCHAR + STARTCHAR C010 + ENCODING 10 + SWIDTH 508 0 + DWIDTH 12 0 +-BBX 12 24 0 -2 ++BBX 10 19 0 1 + BITMAP +-fff0 +-fff0 +-fff0 +-fff0 +-fff0 +-fff0 +-fff0 +-fff0 +-e0f0 +-ce70 +-9f30 +-bfb0 +-bfb0 +-9f30 +-ce70 +-e0f0 +-fff0 +-fff0 +-fff0 +-fff0 +-fff0 +-fff0 +-fff0 +-fff0 ++c180 ++c180 ++6300 ++6300 ++3600 ++3600 ++1c00 ++1c00 ++0800 ++0000 ++0000 ++3fc0 ++0600 ++0600 ++0600 ++0600 ++0600 ++0600 ++0600 + ENDCHAR + STARTCHAR C011 + ENCODING 11 + SWIDTH 508 0 + DWIDTH 12 0 +-BBX 12 24 0 -2 ++BBX 6 13 0 9 + BITMAP +-0000 +-0000 +-0000 +-0000 +-0000 +-0000 +-0000 +-07e0 +-00a0 +-01a0 +-0320 +-0600 +-0c00 +-1e00 +-3300 +-6180 +-6180 +-6180 +-6180 +-3300 +-1e00 +-0000 +-0000 +-0000 ++04 ++04 ++04 ++04 ++04 ++04 ++04 ++04 ++04 ++04 ++04 ++04 ++fc + ENDCHAR + STARTCHAR C012 + ENCODING 12 + SWIDTH 508 0 + DWIDTH 12 0 +-BBX 12 24 0 -2 ++BBX 6 12 0 -2 + BITMAP +-0000 +-0000 +-0000 +-1f80 +-30c0 +-6060 +-6060 +-6060 +-6060 +-30c0 +-1f80 +-0600 +-0600 +-3fc0 +-0600 +-0600 +-0600 +-0600 +-0000 +-0000 +-0000 +-0000 +-0000 +-0000 ++fc ++04 ++04 ++04 ++04 ++04 ++04 ++04 ++04 ++04 ++04 ++04 + ENDCHAR + STARTCHAR C013 + ENCODING 13 + SWIDTH 508 0 + DWIDTH 12 0 +-BBX 12 24 0 -2 ++BBX 7 12 5 -2 + BITMAP +-0000 +-0000 +-0000 +-0000 +-0300 +-0380 +-02c0 +-0260 +-0260 +-0220 +-0220 +-0200 +-0200 +-0200 +-1e00 +-3e00 +-3e00 +-1c00 +-0000 +-0000 +-0000 +-0000 +-0000 +-0000 ++fe ++80 ++80 ++80 ++80 ++80 ++80 ++80 ++80 ++80 ++80 ++80 + ENDCHAR + STARTCHAR C014 + ENCODING 14 + SWIDTH 508 0 + DWIDTH 12 0 +-BBX 12 24 0 -2 ++BBX 7 13 5 9 + BITMAP +-0000 +-0000 +-0000 +-0400 +-0600 +-0500 +-0480 +-0640 +-0520 +-04a0 +-0460 +-0420 +-0420 +-0420 +-1c20 +-3c20 +-3820 +-00e0 +-01e0 +-01c0 +-0000 +-0000 +-0000 +-0000 ++80 ++80 ++80 ++80 ++80 ++80 ++80 ++80 ++80 ++80 ++80 ++80 ++fe + ENDCHAR + STARTCHAR C015 + ENCODING 15 +@@ -496,526 +389,312 @@ + DWIDTH 12 0 + BBX 12 24 0 -2 + BITMAP +-0000 +-0000 +-0000 +-0000 +-0000 +-0600 +-0600 +-6660 +-6660 +-0f00 +-0f00 +-79e0 +-79e0 +-0f00 +-0f00 +-6660 +-6660 +-0600 +-0600 +-0000 +-0000 +-0000 +-0000 +-0000 ++0400 ++0400 ++0400 ++0400 ++0400 ++0400 ++0400 ++0400 ++0400 ++0400 ++0400 ++0400 ++fff0 ++0400 ++0400 ++0400 ++0400 ++0400 ++0400 ++0400 ++0400 ++0400 ++0400 ++0400 + ENDCHAR + STARTCHAR C016 + ENCODING 16 + SWIDTH 508 0 + DWIDTH 12 0 +-BBX 12 24 0 -2 ++BBX 12 1 0 19 + BITMAP +-0000 +-0000 +-0000 +-0000 +-0000 +-0000 +-0000 +-6000 +-7800 +-7e00 +-7f80 +-7fe0 +-7fe0 +-7f80 +-7e00 +-7800 +-6000 +-0000 +-0000 +-0000 +-0000 +-0000 +-0000 +-0000 ++fff0 + ENDCHAR + STARTCHAR C017 + ENCODING 17 + SWIDTH 508 0 + DWIDTH 12 0 +-BBX 12 24 0 -2 ++BBX 12 1 0 14 + BITMAP +-0000 +-0000 +-0000 +-0000 +-0000 +-0000 +-0000 +-0060 +-01e0 +-07e0 +-1fe0 +-7fe0 +-7fe0 +-1fe0 +-07e0 +-01e0 +-0060 +-0000 +-0000 +-0000 +-0000 +-0000 +-0000 +-0000 ++fff0 + ENDCHAR + STARTCHAR C018 + ENCODING 18 + SWIDTH 508 0 + DWIDTH 12 0 +-BBX 12 24 0 -2 ++BBX 12 1 0 9 + BITMAP +-0000 +-0000 +-0000 +-0600 +-0f00 +-1f80 +-36c0 +-0600 +-0600 +-0600 +-0600 +-0600 +-0600 +-0600 +-36c0 +-1f80 +-0f00 +-0600 +-0000 +-0000 +-0000 +-0000 +-0000 +-0000 ++fff0 + ENDCHAR + STARTCHAR C019 + ENCODING 19 + SWIDTH 508 0 + DWIDTH 12 0 +-BBX 12 24 0 -2 ++BBX 12 1 0 4 + BITMAP +-0000 +-30c0 +-30c0 +-30c0 +-30c0 +-30c0 +-30c0 +-30c0 +-30c0 +-30c0 +-30c0 +-30c0 +-30c0 +-0000 +-0000 +-30c0 +-30c0 +-30c0 +-0000 +-0000 +-0000 +-0000 +-0000 +-0000 ++fff0 + ENDCHAR + STARTCHAR C020 + ENCODING 20 + SWIDTH 508 0 + DWIDTH 12 0 +-BBX 12 24 0 -2 ++BBX 12 1 0 -1 + BITMAP +-0000 +-0000 +-1fe0 +-36c0 +-66c0 +-66c0 +-66c0 +-66c0 +-36c0 +-1ec0 +-06c0 +-06c0 +-06c0 +-06c0 +-06c0 +-06c0 +-06c0 +-06c0 +-0000 +-0000 +-0000 +-0000 +-0000 +-0000 ++fff0 + ENDCHAR + STARTCHAR C021 + ENCODING 21 + SWIDTH 508 0 + DWIDTH 12 0 +-BBX 12 24 0 -2 ++BBX 7 24 5 -2 + BITMAP +-0000 +-0f80 +-18c0 +-30c0 +-3000 +-3000 +-1800 +-1e00 +-3380 +-60c0 +-6060 +-6060 +-6060 +-6060 +-3060 +-1c40 +-0780 +-0180 +-00c0 +-00c0 +-30c0 +-3180 +-1f00 +-0000 ++80 ++80 ++80 ++80 ++80 ++80 ++80 ++80 ++80 ++80 ++80 ++80 ++fe ++80 ++80 ++80 ++80 ++80 ++80 ++80 ++80 ++80 ++80 ++80 + ENDCHAR + STARTCHAR C022 + ENCODING 22 + SWIDTH 508 0 + DWIDTH 12 0 +-BBX 12 24 0 -2 ++BBX 6 24 0 -2 + BITMAP +-0000 +-0000 +-0000 +-0000 +-0000 +-0000 +-0000 +-0000 +-0000 +-0000 +-0000 +-0000 +-0000 +-0000 +-3fc0 +-3fc0 +-3fc0 +-3fc0 +-0000 +-0000 +-0000 +-0000 +-0000 +-0000 ++04 ++04 ++04 ++04 ++04 ++04 ++04 ++04 ++04 ++04 ++04 ++04 ++fc ++04 ++04 ++04 ++04 ++04 ++04 ++04 ++04 ++04 ++04 ++04 + ENDCHAR + STARTCHAR C023 + ENCODING 23 + SWIDTH 508 0 + DWIDTH 12 0 +-BBX 12 24 0 -2 ++BBX 12 13 0 9 + BITMAP +-0000 +-0000 +-0000 +-0600 +-0f00 +-1f80 +-36c0 +-0600 +-0600 +-0600 +-0600 +-0600 +-0600 +-0600 +-36c0 +-1f80 +-0f00 +-0600 +-3fc0 +-3fc0 +-0000 +-0000 +-0000 +-0000 ++0400 ++0400 ++0400 ++0400 ++0400 ++0400 ++0400 ++0400 ++0400 ++0400 ++0400 ++0400 ++fff0 + ENDCHAR + STARTCHAR C024 + ENCODING 24 + SWIDTH 508 0 + DWIDTH 12 0 +-BBX 12 24 0 -2 ++BBX 12 12 0 -2 + BITMAP +-0000 +-0000 +-0000 +-0600 +-0f00 +-1f80 +-36c0 +-0600 +-0600 +-0600 +-0600 +-0600 +-0600 +-0600 +-0600 +-0600 +-0600 +-0600 +-0000 +-0000 +-0000 +-0000 +-0000 +-0000 ++fff0 ++0400 ++0400 ++0400 ++0400 ++0400 ++0400 ++0400 ++0400 ++0400 ++0400 ++0400 + ENDCHAR + STARTCHAR C025 + ENCODING 25 + SWIDTH 508 0 + DWIDTH 12 0 +-BBX 12 24 0 -2 ++BBX 1 24 5 -2 + BITMAP +-0000 +-0000 +-0000 +-0600 +-0600 +-0600 +-0600 +-0600 +-0600 +-0600 +-0600 +-0600 +-0600 +-0600 +-36c0 +-1f80 +-0f00 +-0600 +-0000 +-0000 +-0000 +-0000 +-0000 +-0000 ++80 ++80 ++80 ++80 ++80 ++80 ++80 ++80 ++80 ++80 ++80 ++80 ++80 ++80 ++80 ++80 ++80 ++80 ++80 ++80 ++80 ++80 ++80 ++80 + ENDCHAR + STARTCHAR C026 + ENCODING 26 + SWIDTH 508 0 + DWIDTH 12 0 +-BBX 12 24 0 -2 ++BBX 10 14 0 1 + BITMAP +-0000 +-0000 +-0000 +-0000 +-0000 +-0000 +-0000 +-0600 +-0300 +-0180 ++0040 + 00c0 +-7fe0 +-7fe0 ++0380 ++0e00 ++3800 ++e000 ++3800 ++0e00 ++0380 + 00c0 +-0180 +-0300 +-0600 +-0000 +-0000 +-0000 +-0000 +-0000 +-0000 ++0040 ++ffc0 + 0000 ++ffc0 + ENDCHAR + STARTCHAR C027 + ENCODING 27 + SWIDTH 508 0 + DWIDTH 12 0 +-BBX 12 24 0 -2 ++BBX 10 14 0 1 + BITMAP ++8000 ++c000 ++7000 ++1c00 ++0700 ++01c0 ++0700 ++1c00 ++7000 ++c000 ++8000 ++ffc0 + 0000 +-0000 +-0000 +-0000 +-0000 +-0000 +-0000 +-0600 +-0c00 +-1800 +-3000 +-7fe0 +-7fe0 +-3000 +-1800 +-0c00 +-0600 +-0000 +-0000 +-0000 +-0000 +-0000 +-0000 +-0000 ++ffc0 + ENDCHAR + STARTCHAR C028 + ENCODING 28 + SWIDTH 508 0 + DWIDTH 12 0 +-BBX 12 24 0 -2 ++BBX 11 10 0 1 + BITMAP +-0000 +-0000 +-0000 +-0000 +-0000 +-6000 +-6000 +-6000 +-6000 +-6000 +-6000 +-6000 +-6000 +-7fe0 +-0000 +-0000 +-0000 +-0000 +-0000 +-0000 +-0000 +-0000 +-0000 +-0000 ++ffe0 ++3180 ++3180 ++3180 ++3180 ++3180 ++7180 ++6180 ++c180 ++c180 + ENDCHAR + STARTCHAR C029 + ENCODING 29 + SWIDTH 508 0 + DWIDTH 12 0 +-BBX 12 24 0 -2 ++BBX 10 13 0 2 + BITMAP +-0000 +-0000 +-0000 +-0000 +-0000 +-0000 +-0000 +-0000 +-0000 +-1080 +-30c0 +-7fe0 +-7fe0 +-30c0 +-1080 +-0000 +-0000 +-0000 +-0000 +-0000 +-0000 +-0000 +-0000 +-0000 ++00c0 ++0180 ++0100 ++0200 ++ffc0 ++0400 ++0c00 ++0800 ++ffc0 ++1000 ++2000 ++6000 ++c000 + ENDCHAR + STARTCHAR C030 + ENCODING 30 + SWIDTH 508 0 + DWIDTH 12 0 +-BBX 12 24 0 -2 ++BBX 10 15 1 0 + BITMAP +-0000 +-0000 +-0000 +-0000 +-0600 +-0600 +-0f00 +-0f00 +-1f80 +-1f80 +-3fc0 +-3fc0 +-7fe0 +-7fe0 +-0000 +-0000 +-0000 +-0000 +-0000 +-0000 +-0000 +-0000 +-0000 +-0000 ++0700 ++0880 ++18c0 ++18c0 ++1800 ++1800 ++9800 ++ff80 ++1800 ++1800 ++1800 ++7f00 ++d9c0 ++d9c0 ++7000 + ENDCHAR + STARTCHAR C031 + ENCODING 31 + SWIDTH 508 0 + DWIDTH 12 0 +-BBX 12 24 0 -2 ++BBX 2 2 4 8 + BITMAP +-0000 +-0000 +-0000 +-0000 +-7fe0 +-7fe0 +-3fc0 +-3fc0 +-1f80 +-1f80 +-0f00 +-0f00 +-0600 +-0600 +-0000 +-0000 +-0000 +-0000 +-0000 +-0000 +-0000 +-0000 +-0000 +-0000 ++c0 ++c0 + ENDCHAR + STARTCHAR C032 + ENCODING 32