Index: kit/CHANGELOG
diff -u kit/CHANGELOG:1.9 kit/CHANGELOG:removed
--- kit/CHANGELOG:1.9	Sat Sep  5 00:11:21 1998
+++ kit/CHANGELOG	Mon Jul 26 05:10:03 1999
@@ -1,51 +0,0 @@
-CHANGELOG for magicpoint
-$Id: CHANGELOG,v 1.9 1998/09/04 15:11:21 onoe Exp $
-
-Fri Sep  5 1998  onoe@sm.sony.co.jp
-	* handle key inputs from invoked terminal as pressed on Xserver,
-	  even if the Xserver is running on a remote host.
-
-Mon Aug 26 1998  itojun@iijlab.net
-	* new copyright. (BSDish copyright without clause 3)
-
-Mon Aug 25 1998  itojun@iijlab.net
-	* print.c: better x11/freetype/vflib -> postscript font mapping.
-
-Mon Aug 23 1998  kato@wide.ad.jp
-	* embedded image support (added mgpembed.pl and embed.c)
-
-Mon Aug 22 1998  itojun@iijlab.net
-	* added contrib/xmindpath, MindPath PocketPoint user-level driver.
-
-Fri Jul 10 11:57:59 JST 1998  itojun@iijlab.net
-	* cache gs-generated image file.
-	  Suggested by: luigi@FreeBSD.org
-
-Mon Jul  6 11:38:32 JST 1998  itojun@iijlab.net
-	* capable of handling GB2312 and KSC5601 encoding.
-	  they must be encoded by using iso-2022 like escape sequences.
-	  EUC-cn or EUC-kr does not work.
-	* -x option is added.
-
-Thu Jul  2 18:04:16 JST 1998  itojun@iijlab.net
-	* eliminate gsview.
-	* revamp "xfont" directive. (see SYNTAX for detail)
-
-Thu Jun 25 13:10:28 JST 1998  itojun@iijlab.net
-	* print.c: color postscript support by "mgp2ps -c".
-
-changes between 1.02a and 1.03a:
-	* To allow color name that has space inbetween ("dark blue"), 
-	  color name after directives SHOULD come with doublequote.
-	  Therefore,
-		%fore blue
-	  should be
-		%fore "blue"
-	  At this moment, doublequote can be ommitted for backward
-	  compatibility.  We may require to have doublequote in the future.
-	  Font names and other string parameter obeys the same rule.
-	* %image is now capable of rendering encapsulated postscript files
-	  (*.eps).
-		%image foo.eps
-	  should work fine.
-	  By using -X option, you can specify device name for ghostscript.
Index: kit/USAGE.jp
diff -u kit/USAGE.jp:1.19 kit/USAGE.jp:1.20
--- kit/USAGE.jp:1.19	Mon Jun 28 11:04:23 1999
+++ kit/USAGE.jp	Wed Jul 21 11:52:59 1999
@@ -211,7 +211,7 @@
 [静的な方法]
   (1) TeX
   - TeX で数式を書いて .dvi ファイルを生成します。
-  - dvipr を使って、.dvi ファイルを .eps ファイルに変換します。
+  - dvips を使って、.dvi ファイルを .eps ファイルに変換します。
   - .eps ファイルを以下のように読み込みます。
 
 	%image "foo.eps"
Index: kit/ctlwords.pl
diff -u kit/ctlwords.pl:1.2 kit/ctlwords.pl:removed
--- kit/ctlwords.pl:1.2	Sat Sep  5 06:05:08 1998
+++ kit/ctlwords.pl	Mon Jul 26 05:10:06 1999
@@ -1,12 +0,0 @@
-#! /usr/bin/perl
-$counter = 0;	# 0 origin
-print "/* generated by ctlwords.awk. do not edit by hand. */\n";
-
-while (<>) {
-	next if (!/^\/\*CTL\*\//);
-	next if ($_ !~ /(CTL_[A-Z0-9]+)/);
-
-	$word = $1;
-	print "#define $word\t$counter\n";
-	$counter++;
-}
Index: kit/draw.c
diff -u kit/draw.c:1.152 kit/draw.c:1.154
--- kit/draw.c:1.152	Sun Jul  4 00:52:39 1999
+++ kit/draw.c	Fri Jul 23 03:21:16 1999
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  */
 /*
- * $Id: draw.c,v 1.152 1999/07/03 15:52:39 nishida Exp $
+ * $Id: draw.c,v 1.154 1999/07/22 18:21:16 nishida Exp $
  */
 
 #include "mgp.h"
@@ -1333,7 +1333,6 @@
 		break;
 	case O_XFONT:
 		free(obj->data.xfont.xfont);
-		free(obj->data.xfont.registry);
 		break;
 	case O_ICON:
 		if (obj->data.icon.xpoint)
@@ -1736,7 +1735,7 @@
 	}\
 	drawarea[areaindex].x = x;\
 	drawarea[areaindex].y = y - obj->data.X->ascent;\
-	drawarea[areaindex].width = obj->data.X->width+1;\
+	drawarea[areaindex].width = obj->data.X->charlen+1;\
 	drawarea[areaindex].height = obj->data.X->height+1;\
 	areaindex ++;\
 }
@@ -3063,6 +3062,7 @@
 	XFillRectangle(display, state->target, gcsbar, st, state->ypos + width, len, swidth);
 
 	state->ypos += width + swidth + VERT_GAP(char_size[caching]) / 2;
+	state->maxascent = width + swidth;
 }
 
 static void
Index: kit/tfont.c
diff -u kit/tfont.c:1.31 kit/tfont.c:1.32
--- kit/tfont.c:1.31	Sun Jul  4 00:52:45 1999
+++ kit/tfont.c	Mon Jul 26 00:58:53 1999
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  */
 /*
- * $Id: tfont.c,v 1.31 1999/07/03 15:52:45 nishida Exp $
+ * $Id: tfont.c,v 1.32 1999/07/25 15:58:53 nishida Exp $
  */
 
 #include "mgp.h"
@@ -441,7 +441,7 @@
 #endif
 	if (!unicode)
 		return NULL;
-	if ((error = LoadTrueTypeChar(unicode, 0))) {
+	if ((error = LoadTrueTypeChar(unicode, 1))) {
 		fprintf(stderr, "LoadTrueTypeChar fail %d\n", (int)error);
 		fprintf(stderr, "fontfile: \"%s\" char: '%c' (0x%04x)\n",
 			tfloadedfont[tfcuridx],