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 Dec 20 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/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 Dec 20 05:10:04 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.161 kit/draw.c:1.162
--- kit/draw.c:1.161	Tue Dec  7 01:30:00 1999
+++ kit/draw.c	Sat Dec 18 04:21:13 1999
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  */
 /*
- * $Id: draw.c,v 1.161 1999/12/06 16:30:00 nishida Exp $
+ * $Id: draw.c,v 1.162 1999/12/17 19:21:13 nishida Exp $
  */
 
 #include "mgp.h"
@@ -3281,13 +3281,6 @@
 		argv[cp->cta_argc+1] = geom_arg2;
 	}
 
-#if 0
-	xloc = state->linewidth;
-#endif
-	state->linewidth = xsiz;
-	xloc = set_position(state);
-	yloc = state->ypos;
-
 	if ((window_id = checkchildwin(cp)) != (Window)-1)
 		goto finish;	/*already running*/
 
@@ -3313,7 +3306,7 @@
 		regchild(pid, cp, window_id, cp->cta_flag);
 
 	if (window_id != -1)
-		reparent_child_window(window_id, xloc, yloc);
+		reparent_child_window(window_id, window_width, window_height);
 	else {
 		if (mgp_flag & FL_VERBOSE) {
 			fprintf(stderr, "WARN: %%xsystem can not find child window:");
@@ -3326,15 +3319,19 @@
 		return;
 	}
 
-#if 0
-	state->linewidth += xsiz;
-	state->maxascent += ysiz;
-#endif
-
 finish:
 	XGetGeometry(display, window_id, &dumwin, 
 		&xloc, &yloc, &xsiz, &ysiz, &dumint, &dumint);
+	state->linewidth = xsiz;
+	xloc = set_position(state);
+	yloc = state->ypos;
+	XMoveWindow(display, window_id, xloc, yloc);
 	state->ypos += ysiz;
+
+#if 0 /* not implemented yet */
+	state->linewidth += xsiz;
+	state->maxascent += ysiz;
+#endif
 }
 
 
Index: kit/mgp.h
diff -u kit/mgp.h:1.114 kit/mgp.h:1.115
--- kit/mgp.h:1.114	Sun Nov 28 23:35:05 1999
+++ kit/mgp.h	Sat Dec 18 04:21:16 1999
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  */
 /*
- * $Id: mgp.h,v 1.114 1999/11/28 14:35:05 nishida Exp $
+ * $Id: mgp.h,v 1.115 1999/12/17 19:21:16 nishida Exp $
  */
 
 #include <stdio.h>
@@ -120,7 +120,7 @@
 #ifndef UUDECODE
 #define	UUDECODE	"/usr/bin/uudecode"
 #endif
-#ifndef UUDECODE
+#ifndef GUNZIP
 #define	GUNZIP		"/usr/contrib/bin/gunzip"
 #endif
 
Index: kit/contrib/mgp-mode.el
diff -u kit/contrib/mgp-mode.el:1.2 kit/contrib/mgp-mode.el:1.3
--- kit/contrib/mgp-mode.el:1.2	Mon Apr 12 02:44:41 1999
+++ kit/contrib/mgp-mode.el	Sat Dec 18 04:21:19 1999
@@ -12,13 +12,15 @@
 ;;   2 Apr 1999 1.10  Added jumping to error line in MagicPoint file
 ;;   4 Apr 1999 1.20  Added directive completion input feature
 ;;   5 Apr 1999 1.21  Added starting MagicPoint at the current page 
+;;   9 Apr 1999 1.22  Changed mistakes in software license.
+;;   8 Dec 1999 1.30  Added syntax hilighting. Carlos Puchol (cpg@puchol.com)
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; This software is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
-;; GNU Emacs is distributed in the hope that it will be useful,
+;; This software is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; GNU General Public License for more details.
@@ -36,7 +38,16 @@
 ;;    (autoload 'mgp-mode "mgp-mode")
 ;;    (setq mgp-options "-g 800x600")
 ;;    (setq mgp-window-height 6)
-;;
+;;    (cond 
+;;     ((= emacs-major-version 19)     ;; Emacs 19, Mule 2.3
+;;      (setq mgp-mode-hook
+;;    	(function (lambda () 
+;;    		    (set-file-coding-system '*iso-2022-jp*unix)))))
+;;     ((= emacs-major-version 20)     ;; Emacs 20
+;;      (setq mgp-mode-hook
+;;    	(function (lambda ()
+;;    		    (set-file-coding-system-for-read 'iso-2022-jp-unix))))))
+
 
 
 ;; Editting Commands:
@@ -132,6 +143,19 @@
 (defvar mgp-emph-color-normal "black"
   "The text color name for non-emphasized words, for mgp-direc-emph function.")
 
+(cond ((= emacs-major-version 19)
+       ;; Emacs 19 settings
+       (cond ((fboundp 'copy-face)
+	      (require 'hilit19)
+	      (hilit-set-mode-patterns
+	       '(mgp-mode)
+	       '(
+		 ("^%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*" nil Yellow)
+		 ("^#.*" nil comment)
+		 ("\"" "[^\\]\"" string)
+		 ("\\<\\(size\\|fore\\|back\\|bgrad\\|ccolor\\|left\\|leftfill\\|center\\|right\\|shrink\\|lcutin\\|rcutin\\|cont\\|nodefault\\|xfont\\|vfont\\|tfont\\|tfont0\\|bar\\|image\\|prefix\\|icon\\|bimage\\|default\\|tab\\|tabprefix\\|page\\|vgap\\|hgap\\|pause\\|mark\\|again\\|system\\|xsystem\\|filter\\|endfilter\\|vfcap\\|tfdir\\|deffont\\|font\\|embed\\|endembed\\|noop\\|linestart\\|lineend\\|quality\\)\\>" nil keyword)
+		 ("^%.*" nil defun)
+		 ))))))
 
 
 ;; History
Index: kit/sample/cloud.gif
Index: kit/sample/dad.gif
Index: kit/sample/mgp-old1.gif
Index: kit/sample/mgp-old2.gif
Index: kit/sample/mgp-old3.gif
Index: kit/sample/mgp1.gif
Index: kit/sample/mgp2.gif
Index: kit/sample/mgp3.gif
Index: kit/sample/v6header.gif
