*** txt30fontx.c	2007-06-21 19:45:28.000000000 +0900
--- txt30fontx18.c	2007-07-14 00:01:42.000000000 +0900
***************
*** 185,192 ****
  	for (i = 0; i < sizeof(f->h.fontname); i++) {
  		if (f->h.fontname[i] < 0x20) f->h.fontname[i] = 0x20;
  	}
! 	f->h.xsize = 16;
! 	f->h.ysize = 24;
  	f->h.codetype = CODETYPE_KANJI;
  	f->tnum = tnum;
  
--- 185,192 ----
  	for (i = 0; i < sizeof(f->h.fontname); i++) {
  		if (f->h.fontname[i] < 0x20) f->h.fontname[i] = 0x20;
  	}
! 	f->h.xsize = 18;
! 	f->h.ysize = 18;
  	f->h.codetype = CODETYPE_KANJI;
  	f->tnum = tnum;
  
***************
*** 201,220 ****
  		     sjis <= CodeTable_SJIS[i].end; sjis++, chr++) {
  			fetchX(InData, t, get_kanji_index(sjis));
  
! 			for (j = 0; j < 24; j++) {
! 				*d++ = (t[j] >>  8) & 0xff;
! 				*d++ = (t[j] >>  0) & 0xff;
  			}
  		}
  	}
  
  	/* save result */
! 	fp = fopen("jpnzn24x.t30", "wb");
  	if (fp != NULL) {
  		fwrite(OutData, 1,
  		       (sizeof(FONTX2_HEADER) +
  			tnum * sizeof(FONTX2_CODETABLE) +
! 			48 * chr + 1), fp);
  	}
  	fclose(fp);
  
--- 201,222 ----
  		     sjis <= CodeTable_SJIS[i].end; sjis++, chr++) {
  			fetchX(InData, t, get_kanji_index(sjis));
  
! 			for (j = 0; j < 18; j++) {
! 				t[j + 3] <<= 7;
! 				*d++ = (t[j + 3] >> 16) & 0x7f;
! 				*d++ = (t[j + 3] >>  8) & 0xff;
! 				*d++ = (t[j + 3] >>  0) & 0x80;
  			}
  		}
  	}
  
  	/* save result */
! 	fp = fopen("jpnzn18x.t30", "wb");
  	if (fp != NULL) {
  		fwrite(OutData, 1,
  		       (sizeof(FONTX2_HEADER) +
  			tnum * sizeof(FONTX2_CODETABLE) +
! 			54 * chr + 1), fp);
  	}
  	fclose(fp);
  
***************
*** 225,230 ****
--- 227,233 ----
  static	void	convert_ascii(void)
  {
  	int	i, j;
+ 	unsigned char	*d;
  	FILE	*fp;
  	FONTX2_ASCII	*f;
  	unsigned long	t[24];
***************
*** 238,253 ****
  	for (i = 0; i < sizeof(f->h.fontname); i++) {
  		if (f->h.fontname[i] < 0x20) f->h.fontname[i] = 0x20;
  	}
!         f->h.xsize = 16 / 2;
!         f->h.ysize = 24;
  	f->h.codetype = CODETYPE_ASCII;
  
  	/* converrt font (ASCII, 0x20-0x7e) */
  	for (i = 0x020; i < 0x7f; i++) {
  		fetchX(InData, t, i - 0x20 + 864);
  
! 		for (j = 0; j < 24; j++) {
! 			f->d[24 * i + j] = (t[j] >> 8) & 0xff;
  		}
  	}
  
--- 241,258 ----
  	for (i = 0; i < sizeof(f->h.fontname); i++) {
  		if (f->h.fontname[i] < 0x20) f->h.fontname[i] = 0x20;
  	}
!         f->h.xsize = 18 / 2;
!         f->h.ysize = 18;
  	f->h.codetype = CODETYPE_ASCII;
  
  	/* converrt font (ASCII, 0x20-0x7e) */
  	for (i = 0x020; i < 0x7f; i++) {
  		fetchX(InData, t, i - 0x20 + 864);
  
! 		for (d = &f->d[36 * i], j = 0; j < 18; j++) {
! 			t[j + 3] <<= 7;
! 			*d++ = (t[j + 3] >> 16) & 0x7f;
! 			*d++ = (t[j + 3] >>  8) & 0x80;
  		}
  	}
  
***************
*** 255,269 ****
  	for (i = 0x0a0; i < 0xe0; i++) {
  		fetchX(InData, t, i - 0xa0 + 960);
  
! 		for (j = 0; j < 24; j++) {
! 			f->d[24 * i + j] = (t[j] >> 8) & 0xff;
  		}
  	}
  
  	/* save result */
! 	fp = fopen("jpnhn24x.t30", "wp");
  	if (fp != NULL) {
! 		fwrite(OutData, 1, sizeof(FONTX2_HEADER) + 256 * 24, fp);
  	}
  	fclose(fp);
  
--- 260,276 ----
  	for (i = 0x0a0; i < 0xe0; i++) {
  		fetchX(InData, t, i - 0xa0 + 960);
  
! 		for (d = &f->d[36 * i], j = 0; j < 18; j++) {
! 			t[j + 3] <<= 7;
! 			*d++ = (t[j + 3] >> 16) & 0x7f;
! 			*d++ = (t[j + 3] >>  8) & 0x80;
  		}
  	}
  
  	/* save result */
! 	fp = fopen("jpnhn18x.t30", "wp");
  	if (fp != NULL) {
! 		fwrite(OutData,	1, sizeof(FONTX2_HEADER) + 256 * 36, fp);
  	}
  	fclose(fp);