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 Nov 26 05:10:00 2007
@@ -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/SYNTAX
diff -u kit/SYNTAX:1.43 kit/SYNTAX:1.44
--- kit/SYNTAX:1.43	Sun Jan 28 18:54:09 2007
+++ kit/SYNTAX	Sun Nov 25 02:47:28 2007
@@ -1,4 +1,4 @@
-$Id: SYNTAX,v 1.43 2007/01/28 09:54:09 nishida Exp $
+$Id: SYNTAX,v 1.44 2007/11/24 17:47:28 nishida Exp $
 
 placement restriction for directives:
 		.mgprc		preamble	main pages
@@ -167,6 +167,24 @@
 		(allowed in ~/.mgprc, without "%" sign)
 
 	you do not need it with Xft2 enabled installation.
+%psfont "font"
+	<font>:: use PostScript fonts to create PostScript file
+	Suported fonts are:
+			Times-[Roman|Italic|Bold|BoldItalic]
+			Helvetica
+			Helvetica-[BoldOblique|Bold|Oblique]
+			Helvetica-Narrow
+			Helvetica-Narrow[Oblique|Bold|Oblique]
+			NewCenturySchlbk-[Roman|Bold|Italic|BoldItalic]
+			Courier
+			Courier-[Oblique|Bold|BoldOblique]
+			AvantGarde-[Book|BookOblique|Demi|DemiOblique]
+			Bookman-[Demi|DemiItalic|Light|LigtItalic]
+			Palatino-[Roman|Bold|Italic|BoldItalic]
+			ZapfChanery-MediumItalic
+			Symbol
+			ZapfDingbats
+	if none of this fonts is specified it uses the default font Helvetica.
 
 %bar <color> <width> <start> <length>
 	<color> :: color of bar, foreground color will be used as default.
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 Nov 26 05:10:01 2007
@@ -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.234 kit/draw.c:1.235
--- kit/draw.c:1.234	Fri Jun  1 22:45:03 2007
+++ kit/draw.c	Sun Nov 25 02:22:52 2007
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  */
 /*
- * $Id: draw.c,v 1.234 2007/06/01 13:45:03 nishida Exp $
+ * $Id: draw.c,v 1.235 2007/11/24 17:22:52 nishida Exp $
  */
 
 #include "mgp.h"
@@ -948,7 +948,8 @@
 		fprintf(stderr, "this mgp cannot use %%m17n, needs to be built with m17n-lib\n");
 #endif
 		break;
-
+	case CTL_PSFONT:
+		break;
 	default:
 		fprintf(stderr,
 			"undefined directive %d at page %d line %d:\n\t",
@@ -2323,19 +2324,21 @@
 			xft_font = xft_setfont(obj->data.xftfont.fontname, 
 						obj->data.xftfont.size,
 						obj->data.xftfont.registry);
-
+			
+			XftDraw *dummy = xft_getdraw(target);
 			if (obj->data.xftfont.charset16){
-				XftDrawStringUtf8(xft_getdraw(target),
+				XftDrawStringUtf8(dummy,
 						&xft_forecolor, xft_font, 
 						x, y - lineoff,
 						obj->data.xftfont.data,
 						obj->data.xftfont.len);
 			} else
-				XftDrawString8(xft_getdraw(target),
+				XftDrawString8(dummy,
 						&xft_forecolor, xft_font, 
 						x, y - lineoff,
 						obj->data.xftfont.data,
 						obj->data.xftfont.len);
+			XftDrawDestroy(dummy);
 			break;
 #endif
 #ifdef USE_M17N
Index: kit/globals.c
diff -u kit/globals.c:1.51 kit/globals.c:1.52
--- kit/globals.c:1.51	Sun May 28 18:59:34 2006
+++ kit/globals.c	Sun Nov 25 02:47:28 2007
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  */
 /*
- * $Id: globals.c,v 1.51 2006/05/28 09:59:34 nishida Exp $
+ * $Id: globals.c,v 1.52 2007/11/24 17:47:28 nishida Exp $
  */
 
 #include "mgp.h"
@@ -121,6 +121,7 @@
 /*CTL*/	{ CTL_VGAP,		T_INT,	"vgap", 4 },
 /*CTL*/	{ CTL_GAP,		T_INT,	"gap", 3 },
 /*CTL*/	{ CTL_PAUSE,		T_SP,	"pause", 5 },
+/*CTL*/ { CTL_PSFONT,           T_STR,  "psfont",6 },
 /*CTL*/	{ CTL_PREFIX,		T_STR,	"prefix", 6 },
 /*CTL*/	{ CTL_PREFIXN,		T_STR,	"*prefixn*", 9 },
 /*CTL*/	{ CTL_TABPREFIX,	T_STR,	"*tabprefix*", 11 },
Index: kit/grammar.y
diff -u kit/grammar.y:1.47 kit/grammar.y:1.48
--- kit/grammar.y:1.47	Sun Jan  7 18:41:53 2007
+++ kit/grammar.y	Sun Nov 25 02:47:28 2007
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  */
 /*
- * $Id: grammar.y,v 1.47 2007/01/07 09:41:53 nishida Exp $
+ * $Id: grammar.y,v 1.48 2007/11/24 17:47:28 nishida Exp $
  */
 /*
  * partly derived from lbl libpcap source code, which has the following
@@ -775,7 +775,7 @@
 %token KW_LINESTART KW_LINEEND KW_MARK KW_SYSTEM KW_FILTER KW_ENDFILTER
 %token KW_QUALITY KW_ICON KW_LEFTFILL KW_XSYSTEM KW_VFCAP KW_TFONT KW_TFDIR
 %token KW_TSYSTEM
-%token KW_DEFFONT KW_FONT KW_TFONT0 KW_EMBED KW_ENDEMBED KW_NEWIMAGE
+%token KW_DEFFONT KW_FONT KW_TFONT0 KW_EMBED KW_ENDEMBED KW_NEWIMAGE KW_PSFONT
 %token KW_CHARSET KW_TMFONT KW_PCACHE KW_TMFONT0 KW_ANIM KW_VALIGN KW_AREA 
 %token KW_OPAQUE
 %token KW_SUP KW_SUB KW_SETSUP
@@ -919,6 +919,9 @@
 					"in this configuration");
 #endif
 				}
+	| KW_PSFONT STRorID     {
+					$$ = gen_str2(CTL_PSFONT, $2, "iso8859-1");
+				}
 	| KW_TFONT STRorID	{
 #ifdef FREETYPE
 				  $$ = gen_str2(CTL_TFONT, $2, "iso8859-1");
Index: kit/mgp.man
diff -u kit/mgp.man:1.64 kit/mgp.man:1.65
--- kit/mgp.man:1.64	Mon Jan 15 00:40:04 2007
+++ kit/mgp.man	Sun Nov 25 02:47:28 2007
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\" 
-.\"	$Id: mgp.man,v 1.64 2007/01/14 15:40:04 nishida Exp $
+.\"	$Id: mgp.man,v 1.65 2007/11/24 17:47:28 nishida Exp $
 .\"
 .Dd November 1997
 .Dt MGP 1
@@ -353,7 +353,8 @@
 .Nm
 will look at a file named
 .Pa ~/.mgprc
-in your home directory.
+in your home directory. The path to this file can be overriden with the
+environment variable MGPRC.
 The content of the file must be a limited set of magicpoint directives,
 one directive per line, without 
 .Li %
@@ -377,6 +378,11 @@
 .Pa ~/.xloadimagerc
 is searched.
 .\"
+.Sh ENVIRONMENT
+.Bl -tag -width indent
+.It MGPRC
+Full path of the configuration file. When unset, ~/.mgprc is used.
+.\"
 .Sh SECURITY ISSUES
 The presentation file can include directives to call the external process,
 just like shell process.
Index: kit/mgp2ps.man
diff -u kit/mgp2ps.man:1.13 kit/mgp2ps.man:1.14
--- kit/mgp2ps.man:1.13	Wed Jul 28 22:36:28 2004
+++ kit/mgp2ps.man	Sun Nov 25 03:08:23 2007
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\" 
-.\"	$Id: mgp2ps.man,v 1.13 2004/07/28 13:36:28 nishida Exp $
+.\"	$Id: mgp2ps.man,v 1.14 2007/11/24 18:08:23 nishida Exp $
 .\"
 .Dd November 1997
 .Dt MGP2PS 1
@@ -114,6 +114,11 @@
 .Ar engine .
 .Ar engine 
 can be only FreeType so far.
+.It Fl g Ar level
+specify the distance level between lines. If 
+.Ar level
+is 0, the result will be close to the result of xft2 rendering. If others,
+it will be close to the result of other rendering engines.
 .El
 .Sh SEE ALSO
 .Xr mgp 1
Index: kit/parse.c
diff -u kit/parse.c:1.102 kit/parse.c:1.103
--- kit/parse.c:1.102	Fri Jan 12 19:38:56 2007
+++ kit/parse.c	Sun Nov 25 02:35:28 2007
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  */
 /*
- * $Id: parse.c,v 1.102 2007/01/12 10:38:56 nishida Exp $
+ * $Id: parse.c,v 1.103 2007/11/24 17:35:28 nishida Exp $
  */
 
 #include "mgp.h"
@@ -73,16 +73,25 @@
 	page = 1;
 	line = 0;
 
-	dir = getenv("HOME");
-	if (dir) {
+	if((dir = getenv("MGPRC"))!=0) {
+		fp = fopen(dir,"r");
+		if(fp != NULL) {
+          read_rc(fp,dir);
+		} else {
+          fprintf(stderr,"cannot open MGPRC File '%s'!\n",dir);
+		}
+	} else {
+      dir = getenv("HOME");
+      if (dir) {
 		snprintf(rc, sizeof(rc), "%s/%s", dir, RCFILE);
 		fp = fopen(rc, "r");
 		if (fp) {
 			read_rc(fp, rc);
-			fclose(fp);
+			fclose(fp);	
 		}
-	}
-
+      }
+    }
+	
 	if ((fp = fopen(filename, "r")) == NULL) {
 		fprintf(stderr, "can't open %s\n", filename);
 		exit(-1);
@@ -91,6 +100,7 @@
 	fclose(fp);
 	secondpass();
 	thirdpass();
+	
 	if (parse_debug)
 		debug();
 }
Index: kit/print.c
diff -u kit/print.c:1.109 kit/print.c:1.111
--- kit/print.c:1.109	Sun Jan 21 18:35:57 2007
+++ kit/print.c	Sun Nov 25 02:56:56 2007
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  */
 /*
- * $Id: print.c,v 1.109 2007/01/21 09:35:57 nishida Exp $
+ * $Id: print.c,v 1.111 2007/11/24 17:56:56 nishida Exp $
  */
 /*
  * Paper size selection code is based on psutil.c by Angus J. C. Duggan
@@ -44,6 +44,7 @@
 static char *tabprefix = NULL;
 static u_int lineheight;
 static u_int linewidth;
+static u_int gaplevel = 0; 
 static int char_off = 0;	/* y-offset of the chars (relative to the
 				   current line, used for super/subscript */
 
@@ -166,6 +167,43 @@
 	{ CTL_XFONT2, ASCII, "courier*",		"Courier" },
 	{ CTL_XFONT2, ASCII, "*",		"Helvetica" },	/*last resort*/
 	{ CTL_XFONT2, KANJI, "*",		"Ryumin-Light-H" }, /*last resort*/
+	/*PSFONT*/
+	{ CTL_PSFONT, ASCII, "Times-Roman", "Times-Roman" },
+	{ CTL_PSFONT, ASCII, "Times-Italic", "Times-Italic" },
+	{ CTL_PSFONT, ASCII, "Times-Bold", "Times-Bold" },
+	{ CTL_PSFONT, ASCII, "Times-BoldItalic", "Times-BoldItalic" },
+	{ CTL_PSFONT, ASCII, "Helvetica", "Helvetica" },
+	{ CTL_PSFONT, ASCII, "Helvetica-BoldOblique", "Helvetica-BoldOblique" },
+	{ CTL_PSFONT, ASCII, "Helvetica-Bold", "Helvetica-Bold" },
+	{ CTL_PSFONT, ASCII, "Courier", "Courier" },
+	{ CTL_PSFONT, ASCII, "Courier-Oblique", "Courier-Oblique" },
+	{ CTL_PSFONT, ASCII, "Courier-Bold", "Courier-Bold" },
+	{ CTL_PSFONT, ASCII, "Courier-BoldOblique", "Courier-BoldOblique" },
+	{ CTL_PSFONT, ASCII, "AvantGarde-Book", "AvantGarde-Book" },
+	{ CTL_PSFONT, ASCII, "AvantGarde-BookOblique", "AvantGarde-BookOblique" },
+	{ CTL_PSFONT, ASCII, "AvantGarde-Demi", "AvantGarde-Demi" },
+	{ CTL_PSFONT, ASCII, "AvantGarde-DemiQblique", "AvantGarde-DemiQblique" },
+	{ CTL_PSFONT, ASCII, "Bookman-Demi", "Bookman-Demi" },
+	{ CTL_PSFONT, ASCII, "Bookman-DemiItalic", "Bookman-DemiItalic" },
+	{ CTL_PSFONT, ASCII, "Bookman-Light", "Bookman-Light" },
+	{ CTL_PSFONT, ASCII, "Bookman-LightItalic", "Bookman-LightItalic" },
+	{ CTL_PSFONT, ASCII, "Helvetica-Narrow", "Helvetica-Narrow" },
+	{ CTL_PSFONT, ASCII, "Helvetic-NarrowOblique","Helvetic-NarrowOblique"},
+	{ CTL_PSFONT, ASCII, "Helvetica-NarrowBold", "Helvetica-NarrowBold" },
+	{ CTL_PSFONT, ASCII, "Helvetica-NarrowBoldOblique", "Helvetica-NarrowBoldOblique" },
+	{ CTL_PSFONT, ASCII, "Helvetica-Oblique", "Helvetica-Oblique" },
+	{ CTL_PSFONT, ASCII, "NewCenturySchlbk-Roman", "NewCenturySchlbk-Roman" },
+	{ CTL_PSFONT, ASCII, "NewCenturySchlbk-Bold", "NewCenturySchlbk-Bold" },
+	{ CTL_PSFONT, ASCII, "NewCenturySchlbk-Italic", "NewCenturySchlbk-Italic" },
+	{ CTL_PSFONT, ASCII, "NewCenturySchlbk-BoldItalic", "NewCenturySchlbk-BoldItalic" },
+	{ CTL_PSFONT, ASCII, "Palatino-Roman", "Palatino-Roman" },
+	{ CTL_PSFONT, ASCII, "Palatino-Bold", "Palatino-Bold" },
+	{ CTL_PSFONT, ASCII, "Palatino-Italic", "Palatino-Italic" },
+	{ CTL_PSFONT, ASCII, "Palatino-BoldItalic", "Palatino-BoldItalic" },
+	{ CTL_PSFONT, ASCII, "ZapfChancery-MediumItalic", "ZapfChancery-MediumItalic" },
+	{ CTL_PSFONT, ASCII, "Symbol", "Symbol" },
+	{ CTL_PSFONT, ASCII, "ZapfDingbats", "ZapfDingbats" },
+	{ CTL_PSFONT, ASCII, "*", "Helvetica" }, /*Last Resort*/
 	{ -1 },
 };
 static struct fontmap *curfont[10];	/*indexed by lang*/
@@ -396,6 +434,11 @@
 				break;
 #endif /*VFLIB*/
 
+			case CTL_PSFONT:
+				font = findfont(cp->ct_op,ASCII,cp->ctc_value);
+				if(font)
+					curfont[ASCII] = font; 
+				break;
 #ifdef FREETYPE
 			case CTL_TFONT:
 				font = findfont(cp->ct_op, ASCII,
@@ -621,7 +664,9 @@
 	fprintf(fp, "    { vertgap 100 div csize mul imgsize add }\n");
 	fprintf(fp, "  ifelse\n");
 	fprintf(fp, "  ypos exch sub /ypos exch def\n");
-	fprintf(fp, "  HEIGHT 90 div ypos exch sub /ypos exch def\n");
+	/* we can get similar results to xft2 by doing this */
+	if (!gaplevel)
+		fprintf(fp, "  HEIGHT 90 div ypos exch sub /ypos exch def\n");
 	fprintf(fp, "} bind def\n");
 
 	/* show with line wrapping */
@@ -755,7 +800,11 @@
 		fprintf(fp, "%d setcharsize\n", char_size[0]);
 		break;
 
-	  
+	case CTL_PSFONT:
+		font = findfont(cp->ct_op,ASCII,cp->ctc_value);
+		if(font)
+			curfont[ASCII] = font;
+		break;  
 #ifdef VFLIB
 	case CTL_VFONT:
 		font = findfont(cp->ct_op, KANJI, cp->ctc_value);
@@ -779,7 +828,7 @@
 		break;
 #endif /*FREETYPE_CHARSET16*/
 #endif
-
+ 	
 	case CTL_XFONT2:
 		if (strcmp(cp->ctc2_value2, "iso8859-1") == 0)
 			code = ASCII;
@@ -2309,7 +2358,7 @@
 	/* set default paper size */
 	paper = findpaper(DEFAULT_PAPER_SIZE);
 
-	while ((opt = getopt(argc, argv, "mciVrf:x:y:p:e:X:Pt")) != -1) {
+	while ((opt = getopt(argc, argv, "mciVrf:x:y:p:e:X:Ptg:")) != -1) {
 		switch (opt) {
 		case 'm':         /* Added by Arnd Schmitter 23.07.2004 */
 		  PauseMode=1;
@@ -2386,6 +2435,9 @@
 			}
 			break;
 
+		case 'g':
+			gaplevel = atoi(optarg);
+			break;
 
 		default:
 			print_usage(progname);
@@ -2453,7 +2505,13 @@
 		if (!star && strcmp(p->font, font) == 0)
 			goto found;
 		if (star && strncmp(p->font, font, star - p->font) == 0)
+		{
+			if(strcmp(font,"k14")==0)
+				goto found;
+			if(ctrl ==CTL_PSFONT)
+				fprintf(stderr,"PSFONT: %s  not found\n",font);  
 			goto found;
+		}
 	}
 	return NULL;
 
@@ -2477,6 +2535,8 @@
 		case CTL_XFONT: fonttype = 'x'; break;
 #endif
 		case CTL_XFONT2: fonttype = 'x'; break;
+		
+		case CTL_PSFONT: fonttype = 'p'; break;
 		default:	fonttype = '?'; break;
 		}
 		fprintf(fp, "%% %cfont \"%s\" seen, mapped to ps font \"%s\"\n",
Index: kit/scanner.l
diff -u kit/scanner.l:1.27 kit/scanner.l:1.28
--- kit/scanner.l:1.27	Mon Jan 15 00:40:04 2007
+++ kit/scanner.l	Sun Nov 25 02:47:28 2007
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  */
 /*
- * $Id: scanner.l,v 1.27 2007/01/14 15:40:04 nishida Exp $
+ * $Id: scanner.l,v 1.28 2007/11/24 17:47:28 nishida Exp $
  */
 /*
  * partly derived from lbl libpcap source code, which has the following
@@ -171,7 +171,7 @@
 (SUB|sub)	return KW_SUB;
 (SETSUP|setsup)	return KW_SETSUP;
 (M17N|m17n)	return KW_M17N;
-
+(PSFONT|psfont) return KW_PSFONT;
 
 [ \n\t]		;
 ","		return COMMA;
Index: kit/tfont.c
diff -u kit/tfont.c:1.44 kit/tfont.c:1.45
--- kit/tfont.c:1.44	Fri Sep 12 11:04:55 2003
+++ kit/tfont.c	Sun Nov 25 02:29:40 2007
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  */
 /*
- * $Id: tfont.c,v 1.44 2003/09/12 02:04:55 nishida Exp $
+ * $Id: tfont.c,v 1.45 2007/11/24 17:29:40 nishida Exp $
  */
 
 #include "mgp.h"
@@ -591,14 +591,18 @@
 
 #if 1 /* latin2-4 encoding processing */
 			if (code > 0xa0 && code < 256) {
+				int tempregid;
 				if (registry)
-					regid = get_regid(registry) -1;
+					tempregid = get_regid(registry) -1;
 				else {
 					if (mgp_charset)
-						regid = get_regid(mgp_charset) -1;
+						tempregid = get_regid(mgp_charset)-1;
 				}
-				if (latin_unicode_map[regid][code])
+				if (tempregid >= 0) {
+					regid = tempregid;
+					if (latin_unicode_map[regid][code])
 					code = latin_unicode_map[regid][code];
+				}
 			}
 #endif
 
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 Nov 26 05:10:02 2007
@@ -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 Nov 26 05:10:02 2007
@@ -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