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 Aug 30 05:10:00 2004
@@ -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 Aug 30 05:10:00 2004
@@ -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/contrib/mgp-mode20.el
diff -u /dev/null kit/contrib/mgp-mode20.el:1.1
--- /dev/null	Mon Aug 30 05:10:01 2004
+++ kit/contrib/mgp-mode20.el	Fri Aug 27 18:06:24 2004
@@ -0,0 +1,515 @@
+;; mgp-mode.el 
+;;     --- A mode for editing MagicPoint files
+;;
+;;  Tested on Mule 2.3, based on GNU Emacs 20
+
+
+;; Copyright (C) 1999  Hirotsugu Kakugawa
+
+;; Maintainer: Hirotsugu Kakugawa (h.kakugawa@computer.org)
+;;   1 Apr 1999 1.00  First Implementation
+;;   2 Apr 1999 1.01  Added mgp-direc-emph. Changed key bindings.
+;;   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)
+;;   8 Jan 2004 1.40  emacs-20 support Shigeharu TAKENO <shige@iee.niit.ac.jp>
+
+;; 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.
+
+;; 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.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to
+;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+
+
+;; In your ~/.emacs (for example)
+;; 
+;;    (setq auto-mode-alist
+;;          (cons '("\\.mgp?\\'" . mgp-mode) 
+;; 	       auto-mode-alist))
+;;    (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 ()
+;;		  (let ((modified-p (buffer-modified-p)))
+;;		    (set-buffer-file-coding-system 'iso-2022-jp-unix)
+;;		    (set-buffer-modified-p modified-p)))))
+
+
+
+;; Editting Commands:
+;;
+;;   KEY SEQUENCE    DESCRIPTION
+;;   ------------    ----------------------------------------------------------
+;;   M-x mgp-mode    Change the mode of current buffer to Magic-Point mode
+;;   C-c C-v         Run MagicPoint for the current buffer.
+;;                   If prefix argument with explicit numbers are given, the 
+;;                   specified page number is displayed as an inital page.
+;;                   If prefix argument without numbe (only 'C-u') is given,
+;;                   the page where the cursor is displayed.
+;;                       Example 1: C-c C-v  ==> the first page
+;;                       Example 2: C-u C-c C-v  ==> the current page
+;;                       Example 3: C-u 7 C-c C-v  ==> the seventh page
+;;   C-x ` or C-c `  Jump the cursor to the error line in the MagicPoint file.
+;;   C-c C-c         Kill the running MagicPoint (if any).
+;;   M-TAB           Completing input. If the character at the beginning of 
+;;                   line is %, MagicPoint directives are completed. Othewise,
+;;                   ISPELL is invoked to complete a word.
+;;   C-c C-f         Insert the "fore" directive.
+;;   C-c C-b         Insert the "back" directive.
+;;   C-c C-p         Insert the "page" directive.
+;;   C-c C-l         Insert the "lcutin" directive.
+;;   C-c C-r         Insert the "rcutin" directive.
+;;   C-c C-i         Insert the "image" directive.      
+;;   C-c C-e         Insert a sequence of directives to emphasizing text.
+;;   C-c c           Insert the "center" directive.
+;;   C-c l           Insert the "leftfill" directive.
+;;   C-c L           Insert the "left-line" directive.
+;;   C-c r           Insert the "right-line" directive.
+;;   C-c f           Insert the "font" directive.
+;;   C-c b           Insert the "bimage" directive.
+;;   C-c e           Insert the "embed, endembed" directive sequnce.
+;;   C-c i           Insert the "icon" directive.
+;;   C-c p           Insert the "pause" directive.
+;;   C-c a           Insert the "again" directive.
+;;   C-c m           Insert the "mark" directive.
+;;   C-c n           Insert the "nodefault" directive.
+;;   C-c s           Insert the "size" directive.
+;;   C-c B           Insert the "bar" directive.
+;;   C-c C           Insert the "cont" directive.
+;;   C-c G           Insert the "bgrad" directive.
+;;   C-c P           Insert the "prefix" directive.
+;;   C-c S           Insert the "system" directive.
+;;   C-c F           Insert the "filter, endfilter" directive sequence.
+
+
+;;  Variables for customization
+;;   NAME                     DISCRIPTION (buffer local var. is marked *)
+;;   --------------------     ---------------------------------------------
+;;   mgp-program               MagicPoint program name
+;;   mgp-options              *Command line option for MagicPoint
+;;   mgp-directives-optional   List of directives for input completion
+;;   mgp-window-height         Height of window for output of MagicPoint
+;;   mgp-page-separator       *String inserted before %page directive
+;;   mgp-emph-color           *Color name for emphasized text, C-c C-e 
+;;   mgp-emph-color-normal    *Color name for unemphasizing text, C-c C-e 
+;;
+
+
+(require 'compile)
+
+;; Program name of MagicPoint 
+(defvar  mgp-program "mgp"
+  "*MagicPoint program name")
+
+;; Command line option for MagicPoint
+(defvar  mgp-options nil
+  "*MagicPoint optional arguments. nil or  string. Buffer local.")
+
+;; Height of MagicPoint message window
+(defvar mgp-window-height nil
+  "*Number of lines of a MagicPoint window.  If nil, use Emacs default.")
+
+;; MagicPoint directive alist for completing input
+(defvar mgp-directives
+  '("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")
+  "*List of MagicPoint directives for completing input.")
+(defvar mgp-directives-optional nil
+  "*List of optional MagicPoint directives for completing input. For customization.")
+
+;; Style
+(defvar mgp-page-separator "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%"
+  "Page separator string.")
+(defvar mgp-emph-color "red"
+  "The text color name for emphasized words, for mgp-direc-emph function.")
+(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)
+		 ("^%%.*" 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)
+		 )))))
+      ((= emacs-major-version 20)
+       (progn
+	 (defconst mgp-font-lock-strings-1
+	   (concat "\\<\\("
+		   "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\\|include"
+		   "\\)\\>"
+		   ))
+	 (defvar mgp-font-lock-keywords
+	   (list
+	    (cons mgp-page-separator '(. font-lock-variable-name-face))
+	    (cons "^\\(#\\|%%\\).*" '(. font-lock-comment-face))
+	    (cons "\".*\"" '(. font-lock-string-face))
+	    (cons "^%" '(. font-lock-function-name-face))
+	    (cons "^\t[^\t].*" '(. font-lock-constant-face))
+	    (cons "^\t\t.*" '(. font-lock-type-face))
+	    (cons mgp-font-lock-strings-1 '(. font-lock-keyword-face))
+	    )
+	   "Default expressions to highlight in mgp mode")
+	 (add-hook 'mgp-mode-hook 
+		   (function (lambda ()
+			       (make-local-variable 'font-lock-defaults)
+			       (setq font-lock-defaults 
+				     '(mgp-font-lock-keywords t))))))))
+
+
+;; History
+(defvar mgp-history nil
+  "History of mgp commands.")
+
+;; Abbrev Table
+(defvar mgp-mode-abbrev-table nil
+  "Abbrev table used while in mgp mode.")
+(define-abbrev-table 'mgp-mode-abbrev-table ())
+
+;; Directive Completion
+(defvar mgp-directive-alist nil
+  "Alist of MagicPoint directives.")
+(if mgp-directive-alist
+    ()
+  (setq mgp-directive-alist 
+	(mapcar (function (lambda (direc) (list direc)))
+		(sort (append mgp-directives mgp-directives-optional) 
+		      'string<))))
+
+;; Syntax Table
+(defvar mgp-mode-syntax-table nil
+  "Syntax table used while in mgp mode.")
+(if mgp-mode-syntax-table
+    ()
+  (setq mgp-mode-syntax-table (make-syntax-table))
+  (modify-syntax-entry ?% ".   " mgp-mode-syntax-table)
+  (modify-syntax-entry ?\" ".   " mgp-mode-syntax-table)
+  (modify-syntax-entry ?\\ ".   " mgp-mode-syntax-table)
+  (modify-syntax-entry ?' "w   " mgp-mode-syntax-table))
+
+;; Mode Map
+(defvar mgp-mode-map nil
+  "Keymap for Mgp (MagicPoint) mode.
+Many other modes, such as Mail mode, Outline mode and Indented Mgp mode,
+inherit all the commands defined in this map.")
+(if mgp-mode-map
+    ()
+  (setq mgp-mode-map (make-sparse-keymap))
+  (define-key mgp-mode-map "\t" 'tab-to-tab-stop)
+  (define-key mgp-mode-map "\e\t" 'mgp-complete-word)
+  (define-key mgp-mode-map "\C-c\C-v" 'mgp-run-mgp)
+  (define-key mgp-mode-map "\C-c\C-c" 'kill-compilation)
+  (define-key mgp-mode-map "\C-c`"    'next-error)
+  (define-key mgp-mode-map "\C-x`"    'next-error)
+  (define-key mgp-mode-map "\C-c\C-f" 'mgp-direc-fore)
+  (define-key mgp-mode-map "\C-c\C-b" 'mgp-direc-back)
+  (define-key mgp-mode-map "\C-c\C-p" 'mgp-direc-page)
+  (define-key mgp-mode-map "\C-c\C-l" 'mgp-direc-lcutin)
+  (define-key mgp-mode-map "\C-c\C-r" 'mgp-direc-rcutin)
+  (define-key mgp-mode-map "\C-c\C-i" 'mgp-direc-image)
+  (define-key mgp-mode-map "\C-c\C-e" 'mgp-direc-emph)
+  (define-key mgp-mode-map "\C-cc" 'mgp-direc-center-line)
+  (define-key mgp-mode-map "\C-cl" 'mgp-direc-leftfill)
+  (define-key mgp-mode-map "\C-cL" 'mgp-direc-left-line)
+  (define-key mgp-mode-map "\C-cr" 'mgp-direc-right-line)
+  (define-key mgp-mode-map "\C-cf" 'mgp-direc-font)
+  (define-key mgp-mode-map "\C-cb" 'mgp-direc-bimage)
+  (define-key mgp-mode-map "\C-ce" 'mgp-direc-embed)
+  (define-key mgp-mode-map "\C-ci" 'mgp-direc-icon)
+  (define-key mgp-mode-map "\C-cp" 'mgp-direc-pause) 
+  (define-key mgp-mode-map "\C-ca" 'mgp-direc-again) 
+  (define-key mgp-mode-map "\C-cm" 'mgp-direc-mark) 
+  (define-key mgp-mode-map "\C-cn" 'mgp-direc-nodefault)
+  (define-key mgp-mode-map "\C-cs" 'mgp-direc-size)
+  (define-key mgp-mode-map "\C-cB" 'mgp-direc-bar)
+  (define-key mgp-mode-map "\C-cC" 'mgp-direc-cont)
+  (define-key mgp-mode-map "\C-cG" 'mgp-direc-bgrad)
+  (define-key mgp-mode-map "\C-cP" 'mgp-direc-prefix) 
+  (define-key mgp-mode-map "\C-cS" 'mgp-direc-system)
+  (define-key mgp-mode-map "\C-cF" 'mgp-direc-filter))
+
+;; MagicPoint mode
+(defun mgp-mode ()
+  "Major mode for editing MagicPoint files.
+
+Special commands:
+\\{mgp-mode-map}
+Turning on Mgp mode calls the value of the variable `mgp-mode-hook',
+if that value is non-nil.
+
+Variables for customization
+  NAME                     DISCRIPTION (buffer local var. is marked *)
+  --------------------     ---------------------------------------------
+   mgp-program               MagicPoint program name
+   mgp-options              *Command line option for MagicPoint
+   mgp-directives-optional   List of directives for input completion
+   mgp-window-height         Height of window for output of MagicPoint
+   mgp-page-separator       *String inserted before %page directive
+   mgp-emph-color           *Color name for emphasized text, C-c C-e 
+   mgp-emph-color-normal    *Color name for unemphasizing text, C-c C-e 
+"
+  (interactive)
+  (kill-all-local-variables)
+  (use-local-map mgp-mode-map)
+  (setq mode-name "MagicPoint")
+  (setq major-mode 'mgp-mode)
+  (setq local-abbrev-table mgp-mode-abbrev-table)
+  (set-syntax-table mgp-mode-syntax-table)
+  (make-local-variable 'mgp-options)
+  (make-local-variable 'mgp-page-separator)
+  (make-local-variable 'mgp-emph-color)
+  (make-local-variable 'mgp-emph-color-normal)
+  (run-hooks 'mgp-mode-hook))
+
+
+;; Inserting Directives
+
+(defun mgp-direc-center-line ()
+  (interactive)
+  (mgp-insert-directive "center"))
+(defun mgp-direc-left-line ()
+  (interactive)
+  (mgp-insert-directive "left"))
+(defun mgp-direc-leftfill ()
+  (interactive)
+  (mgp-insert-directive "leftfill"))
+(defun mgp-direc-right-line ()
+  (interactive)
+  (mgp-insert-directive "right"))
+(defun mgp-direc-image ()
+  (interactive)
+  (mgp-insert-directive "image" ""))
+(defun mgp-direc-fore ()
+  (interactive)
+  (mgp-insert-directive "fore" ""))
+(defun mgp-direc-back ()
+  (interactive)
+  (mgp-insert-directive "back" ""))
+(defun mgp-direc-lcutin ()
+  (interactive)
+  (mgp-insert-directive "lcutin"))
+(defun mgp-direc-rcutin ()
+  (interactive)
+  (mgp-insert-directive "rcutin"))
+(defun mgp-direc-cont ()
+  (interactive)
+  (mgp-insert-directive "cont"))
+(defun mgp-direc-nodefault ()
+  (interactive)
+  (mgp-insert-directive "nodefault"))
+(defun mgp-direc-bar ()
+  (interactive)
+  (mgp-insert-directive "bar" t))
+(defun mgp-direc-pause ()
+  (interactive)
+  (mgp-insert-directive "pause"))
+(defun mgp-direc-font ()
+  (interactive)
+  (mgp-insert-directive "font" ""))
+(defun mgp-direc-noop ()
+  (interactive)
+  (mgp-insert-directive "noop"))
+(defun mgp-direc-system ()
+  (interactive)
+  (mgp-insert-directive "system" ""))
+(defun mgp-direc-bgrad ()
+  (interactive)
+  (mgp-insert-directive "bgrad" t))
+(defun mgp-direc-size ()
+  (interactive)
+  (mgp-insert-directive "size" t))
+(defun mgp-direc-prefix ()
+  (interactive)
+  (mgp-insert-directive "prefix" ""))
+(defun mgp-direc-icon ()
+  (interactive)
+  (mgp-insert-directive "icon" t))
+(defun mgp-direc-bimage ()
+  (interactive)
+  (mgp-insert-directive "bimage" ""))
+(defun mgp-direc-mark ()
+  (interactive)
+  (mgp-insert-directive "mark"))
+(defun mgp-direc-again ()
+  (interactive)
+  (mgp-insert-directive "again"))
+
+(defun mgp-insert-directive (dirc &optional arg)
+  (let ((pos-eol (save-excursion
+		   (end-of-line)
+		   (point))))
+    (beginning-of-line)
+    (if (looking-at "%")
+	(if (re-search-forward "[a-zA-Z]" pos-eol t)
+	    (progn
+	      (end-of-line)
+	      (insert ", "))
+	  (beginning-of-line)
+	  (forward-char 1))
+      (insert "%")))
+  (insert dirc)
+  (if arg
+      (if (stringp arg)
+	  (insert (concat " " "\"" arg "\""))
+	(insert " ")
+	(backward-char 1))))
+
+(defun mgp-direc-page ()
+  (interactive)
+  (insert mgp-page-separator)
+  (insert "\n%page\n"))
+
+(defun mgp-direc-filter ()
+  (interactive)
+  (mgp-insert-directive2 "filter"))
+(defun mgp-direc-embed ()
+  (interactive)
+  (mgp-insert-directive2 "embed"))
+(defun mgp-insert-directive2 (direc)
+  (insert (concat "%" direc "\n%end" direc "\n")))
+
+(defun mgp-direc-emph (n)
+  (interactive "P")
+  (let ((cn
+	 (concat "%" (if n "cont, " "") "fore "))
+	(c1 (if mgp-emph-color 
+		mgp-emph-color ""))
+	(c2 (if mgp-emph-color-normal 
+		mgp-emph-color-normal  "")))
+    (insert (concat cn "\"" c1 "\"\n\n"))
+    (insert (concat cn "\"" c2 "\"\n"))
+    (previous-line 2)))
+
+
+;; Running MagicPoint
+
+(defun mgp-run-mgp (command-args)
+  (interactive
+   (list (let ((page-opt ""))
+	   (if current-prefix-arg
+	       (setq page-opt 
+		     (concat " -p " 
+			     (mgp-current-page-position current-prefix-arg) 
+			     " ")))
+	   (read-from-minibuffer 
+	    "Run MagicPoint: "
+	    (concat mgp-program " " mgp-options page-opt)
+	    nil nil 'mgp-history))))
+  (if (buffer-modified-p)
+      (if (y-or-n-p "MagicPoint document is modified. Save it? ")
+	  (save-buffer)))
+  (if (buffer-file-name (current-buffer))
+      (let ((compilation-window-height mgp-window-height))
+	(compile-internal 
+	 (concat command-args " " 
+		 (file-name-nondirectory (buffer-file-name (current-buffer))))
+	 "No more errors" "MagicPoint"))))
+
+(defun mgp-current-page-position (arg)
+  (if (numberp arg)
+      (if (<= arg 0)
+	  1
+	(let ((total (mgp-total-pages)))
+	  (if (< arg total)
+	      arg
+	    total)))
+    (save-excursion
+      (end-of-line)
+      (let ((bound (point))
+	    (page 0))
+	(goto-char (point-min))
+	(while (search-forward "\n%page" bound t)
+	  (setq page (+ page 1)))
+	(number-to-string (if (= page 0) 1 page))))))
+
+(defun mgp-total-pages ()
+  (save-excursion
+    (let ((pages 0))
+      (goto-char (point-min))
+      (while (search-forward "\n%page" (point-max) t)
+	(setq pages (+ pages 1)))
+      pages)))
+
+
+;; Completion 
+
+(defun mgp-complete-word ()
+  "Perform completion on a MagicPoint directive or a word preceding point."
+  (interactive)
+  (if (not (save-excursion
+	     (beginning-of-line)
+	     (looking-at "%")))
+      (ispell-complete-word)
+    (if (save-excursion 
+	  (goto-char (max (point-min) (- (point) 1)))
+	  (= (char-syntax (following-char)) ?\w))
+	(let* ((end (point))
+	       (beg (save-excursion
+		      (backward-word 1)
+		      (while (= (char-syntax (following-char)) ?\')
+			(forward-char 1))
+		      (point)))
+	       (pattern (buffer-substring beg end)))
+	  (mgp-complete-directive pattern))
+      (mgp-complete-directive ""))))
+
+(defun mgp-complete-directive (pattern)
+  (let ((completion (try-completion pattern mgp-directive-alist)))
+    (cond ((eq completion t)
+	   (message "Sole completion"))
+	  ((null completion)
+	   (message "Can't find completion for \"%s\"" pattern)
+	   (ding))
+	  ((not (string= pattern completion))
+	   (delete-region beg end)
+	   (insert completion))
+	  (t
+	   (message "Making completion list...")
+	   (let* ((lizt (all-completions pattern mgp-directive-alist))
+		  (new))
+	     (while lizt
+	       (setq new (cons (car lizt) new))
+	       (setq lizt (cdr lizt)))
+	     (setq lizt (nreverse new))
+	     (with-output-to-temp-buffer "*Completions*"
+	       (display-completion-list lizt)))
+	   (message "Making completion list...%s" "done")))))
+
+;;; mgp-mode.el ends here
Index: kit/image/gif.h
diff -u kit/image/gif.h:1.2 kit/image/gif.h:removed
--- kit/image/gif.h:1.2	Mon Dec 28 17:23:03 1998
+++ kit/image/gif.h	Mon Aug 30 05:10:01 2004
@@ -1,72 +0,0 @@
-/* gif.h:
- *
- * gifin.h
- * kirk johnson
- * november 1989
- * external interface to gifin.c
- *
- * Copyright 1989 Kirk L. Johnson (see the included file
- * "kljcpyrght.h" for complete copyright information)
- */
-
-/*
- * gifin return codes
- */
-#define GIFIN_SUCCESS       0   /* success */
-#define GIFIN_DONE          1   /* no more images */
-
-#define GIFIN_ERR_BAD_SD   -1   /* bad screen descriptor */
-#define GIFIN_ERR_BAD_SEP  -2   /* bad image separator */
-#define GIFIN_ERR_BAD_SIG  -3   /* bad signature */
-#define GIFIN_ERR_EOD      -4   /* unexpected end of raster data */
-#define GIFIN_ERR_EOF      -5   /* unexpected end of input stream */
-#define GIFIN_ERR_FAO      -6   /* file already open */
-#define GIFIN_ERR_IAO      -7   /* image already open */
-#define GIFIN_ERR_NFO      -8   /* no file open */
-#define GIFIN_ERR_NIO      -9   /* no image open */
-
-/*
- * colormap indices 
- */
-
-#define GIF_RED  0
-#define GIF_GRN  1
-#define GIF_BLU  2
-
-/*
- * typedef BYTE for convenience
- */
-
-typedef unsigned char BYTE;
-
-static int gifin_open_file();
-static int gifin_open_image();
-static int gifin_get_pixel();
-#if 0
-static int gifin_close_image();
-#endif
-static int gifin_close_file();
-static int gifin_load_cmap();
-static int gifin_skip_extension();
-static int gifin_read_data_block();
-static int gifin_push_string();
-static void gifin_add_string();
-static void gifin_fatal();
-
-/* #defines, typedefs, and such
- */
-
-#define GIF_SIG      "GIF87a"
-#define GIF_SIG_89   "GIF89a"
-#define GIF_SIG_LEN  6          /* GIF signature length */
-#define GIF_SD_SIZE  7          /* GIF screen descriptor size */
-#define GIF_ID_SIZE  9          /* GIF image descriptor size */
-
-#define GIF_SEPARATOR   ','     /* GIF image separator */
-#define GIF_EXTENSION   '!'     /* GIF extension block marker */
-#define GIF_TERMINATOR  ';'     /* GIF terminator */
-
-#define STAB_SIZE  4096         /* string table size */
-#define PSTK_SIZE  4096         /* pixel stack size */
-
-#define NULL_CODE  -1           /* string table null code */
Index: kit/sample/cloud.gif
Index: kit/sample/dad.gif
Index: kit/sample/dns-jp.mgp
diff -u kit/sample/dns-jp.mgp:1.5 kit/sample/dns-jp.mgp:removed
--- kit/sample/dns-jp.mgp:1.5	Fri Sep  4 21:33:18 1998
+++ kit/sample/dns-jp.mgp	Mon Aug 30 05:10:01 2004
@@ -1,130 +0,0 @@
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%%	This file is automatically created from the file
-%%	main.pre modified at Fri Jan 23 14:31:24 1998
-%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%include "default.mgp"
-%% "noop" cancels definitions in default.mgp
-%default 1 left, size 7, fore "light yellow", back "blue4", font "standard", ccolor "white", vgap 35
-%default 2 noop
-%default 3 fore "white", bar "gray70", vgap 10
-%default 4 noop
-%tab 1 noop
-%tab 2 noop
-%tab 3 noop
-%%%
-%page
-%nodefault
-%fore "red", back "blue4", size 9, vgap 15
-%center, fore "yellow", font "thick"
-%ccolor "white"
-
-
-
-Root DNS `M' について
-
-%size 6, fore "red", font "thick"
-加藤   朗
-
-%size 5, fore "white", font "standard"
-東京大学大型計算機センター
-
-
-%font "typewriter"
-kato@wide.ad.jp
-%font "standard"
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%page
-
-%back "blue4"
-  経緯 (1)
-%fore "red", size 6, font "thick"
-   ☆ Root DNS
-%fore "white", size 5, font "standard"
-       ・ ９台で運用
-%fore "white", size 5, font "standard"
-          − ８台が US
-          − Stockholm に１台
-%fore "white", size 5, font "standard"
-       ・ 最大で１３台
-%fore "white", size 5, font "standard"
-          − パケット長の制約
-%fore "red", size 6, font "thick"
-   ☆ Root DNS の運用基準
-%fore "white", size 5, font "standard"
-       ・ RFC 2010
-       ・ gTLD との関係
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%page
-
-%back "blue4"
-  経緯 (2)
-%fore "red", size 6, font "thick"
-   ☆ IEPG で拡張を検討
-   ☆ ヨーロッパ地域
-%fore "white", size 5, font "standard"
-       ・ LINX に新設 : 1997 年 4 月
-%fore "white", size 5, font "standard"
-          − RIPE/NCC が管理
-          − `K'
-%fore "red", size 6, font "thick"
-   ☆ アジア太平洋地域
-%fore "white", size 5, font "standard"
-       ・ NSPIXP-2 ： 1997 年 8 月
-%fore "white", size 5, font "standard"
-          − WIDE が管理
-          − `M'
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%page
-
-%back "blue4"
-  `M'
-%fore "red", size 6, font "thick"
-   ☆ 構成
-%fore "white", size 5, font "standard"
-       ・ ２台の PentiumPro 200MHz
-       ・ Primary/Backup、 自動切り替え
-%fore "red", size 6, font "thick"
-   ☆ Root-only サーバ
-%fore "white", size 5, font "standard"
-       ・ 
-%cont, font "typewriter"
-202.12.27.33
-%font "standard"
-       ・ 400 〜 500 query/sec
-%fore "red", size 6, font "thick"
-   ☆ 運用管理
-%fore "white", size 5, font "standard"
-       ・ WIDE および ISP 有志
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%page
-
-%back "blue4"
-  お願い
-%fore "red", size 6, font "thick"
-   ☆ 最新の root.cache の入れ換え
-%fore "white", size 5, font "standard"
-       ・ 
-%cont, font "typewriter"
-1997082200
-%fore "red", size 6, font "thick"
-   ☆ Named の更新
-%fore "white", size 5, font "standard"
-       ・ 4.9.6/8.8.1
-%fore "red", size 6, font "thick"
-   ☆ 遊ばないで：
-%fore "white", size 5, font "standard"
-       ・ 
-%cont, font "typewriter"
-ping/traceroute
-%font "standard"
-       ・ 
-%cont, font "typewriter"
-telnet/spray/...
-%fore "red", size 6, font "thick"
-   ☆ Thanks to
-%fore "white", size 5, font "standard"
-       ・ 日本 Cisco/多くの ISP
-       ・ `M' 管理グループ
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