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 Feb 19 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/configure
diff -u kit/configure:1.100 kit/configure:1.101
--- kit/configure:1.100	Fri Jan 12 19:38:55 2007
+++ kit/configure	Fri Feb 16 22:50:03 2007
@@ -5692,7 +5692,9 @@
 fi
 
 if test "$no_x" != yes; then
-	LIBS="$LIBS -L$x_libraries"
+	if test "$x_libraries" != ""; then
+		LIBS="$LIBS -L$x_libraries"
+	fi
 	OPTFLAGS="$OPTFLAGS -I$x_includes"
 fi
 
Index: kit/configure.in
diff -u kit/configure.in:1.98 kit/configure.in:1.99
--- kit/configure.in:1.98	Fri Jan 12 19:38:55 2007
+++ kit/configure.in	Fri Feb 16 22:50:03 2007
@@ -3,7 +3,7 @@
 dnl independent (using srcdir), however, xmkmf and Imake.tmpl do not
 dnl allow us to switch compilation directory.
 dnl
-dnl $Id: configure.in,v 1.98 2007/01/12 10:38:55 nishida Exp $
+dnl $Id: configure.in,v 1.99 2007/02/16 13:50:03 nishida Exp $
 AC_INIT(image/imagetypes.c)
 
 dnl Checks for programs.
@@ -325,7 +325,9 @@
 dnl Checks for header files.
 AC_PATH_X
 if test "$no_x" != yes; then
-	LIBS="$LIBS -L$x_libraries"
+	if test "$x_libraries" != ""; then
+		LIBS="$LIBS -L$x_libraries"
+	fi
 	OPTFLAGS="$OPTFLAGS -I$x_includes"
 fi
 
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 Feb 19 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/m17n.c
diff -u kit/m17n.c:1.8 kit/m17n.c:1.9
--- kit/m17n.c:1.8	Fri May 20 00:58:30 2005
+++ kit/m17n.c	Fri Feb 16 22:50:04 2007
@@ -29,7 +29,7 @@
  * SUCH DAMAGE.
  */
 /*
- * $Id: m17n.c,v 1.8 2005/05/19 15:58:30 nishida Exp $ 
+ * $Id: m17n.c,v 1.9 2007/02/16 13:50:04 nishida Exp $ 
  */
 
 #ifdef USE_M17N
@@ -45,8 +45,8 @@
 static int M17N__line_break __P ((MText *, int, int, int ,int, int));
 static void M17N__format_line __P ((int, int, int *, int *));
 static MText *M17N__gen_mtext __P ((u_char *));
-static void M17N__define_font __P ((struct ctrl *));
-static MFont *M17N__get_font __P ((char *, char *, int));
+static void M17N__add_font_to_fontset __P ((MFont *));
+static MFont *M17N__get_font __P ((char *, char *));
 
 /* The following two variables are set by M17N_draw_string and
    referred by M17N__format_line ().  */
@@ -67,6 +67,7 @@
 
 static MSymbol Miso8859_1, Municode_bmp, Mjisx0208, Mgb2312, Mksc5601;
 static MSymbol Mlatin, Mhan, Mhangul, Mkatakana, Mhiragana;
+static MSymbol Mzh, Mja, Mko;
 
 static int kinsoku_range [][2] = {
   {0x3041, 0x30FF},		/* Kana */
@@ -148,6 +149,26 @@
 		/* Try ISO-2022 encoding.  */
 		coding = mconv_resolve_coding (msymbol ("iso-2022-7bit"));
 		if (coding) mt = mconv_decode_buffer (coding, p, len);
+		if (mt)
+		  {
+		    int len = mtext_len (mt);
+		    int pos = 0, to;
+
+		    for (pos = 0; pos < len; pos = to)
+		      if (mtext_prop_range (mt, Mcharset, pos, NULL, &to, 0))
+			{
+			  MSymbol cs = mtext_get_prop (mt, pos, Mcharset);
+			  char *name = msymbol_name (cs);
+			  MSymbol lang
+			    = (strncmp (name, "jis", 3) == 0 ? Mja
+			       : strncmp (name, "gb", 2) == 0 ? Mzh
+			       : strncmp (name, "ksc", 3) == 0 ? Mko
+			       : Mnil);
+
+			  if (lang != Mnil)
+			    mtext_put_prop (mt, pos, to, Mlanguage, lang);
+			}
+		  }
 	}
 	if (!mt)
 	  {
@@ -178,14 +199,12 @@
 }
 
 
-/* Return a font matching SEED and REGISTRY.  If no such font is found
-   and RECORD is nonzero, create a new font and remember it.  */
+/* Return a font matching SEED and REGISTRY.  */
 
-MFont *
-M17N__get_font (seed, registry, record)
+static MFont *
+M17N__get_font (seed, registry)
      char *seed;
      char *registry;
-     int record;
 {
   static MPlist *font_list;
   MPlist *plist;
@@ -210,16 +229,13 @@
     sym_registry = msymbol (registry);
 
   for (plist = mplist_find_by_key (font_list, sym_seed); plist;
-       plist = mplist_find_by_key (plist, sym_seed))
+       plist = mplist_find_by_key (mplist_next (plist), sym_seed))
     {
       font = mplist_value (plist);
       if (mfont_get_prop (font, Mregistry) == sym_registry)
 	return font;
     }
 
-  if (! record)
-    return NULL;
-
   family = weight = slant = Mnil;
   if ((p = strchr (seed, '-')) != NULL)
     {
@@ -263,10 +279,14 @@
 		      : i < FC_WEIGHT_ULTRABOLD ? msymbol ("extrabold")
 		      : i < FC_WEIGHT_BLACK ? msymbol ("ultrabold")
 		      : msymbol ("black"));
+	  else
+	    weight = msymbol ("medium");
 	  if (FcPatternGetInteger (pat, FC_SLANT, 0, &i) == FcResultMatch)
 	    slant = (i < FC_SLANT_ITALIC ? msymbol ("r")
 		     : i < FC_SLANT_OBLIQUE ? msymbol ("i")
 		     : msymbol ("o"));
+	  else
+	    slant = msymbol ("r");
 	  FcPatternDestroy (pat);
 	}
       else
@@ -289,21 +309,30 @@
 
 /* Pre-define the font set in CP.   */
 
-void
-M17N__define_font (cp)
-     struct ctrl *cp;
+static void
+M17N__add_font_to_fontset (font)
+     MFont *font;
 {
   MSymbol family, registry;
   MPlist *plist, *pl;
-  MFont *font, *recorded;
+  static MPlist *registered_list;
   
-  for (; cp && cp->ct_op != CTL_XFONT2; cp = cp->ct_next);
-  if (! cp)
+  family = mfont_get_prop (font, Mfamily);
+  registry = mfont_get_prop (font, Mregistry);
+
+  plist = NULL;
+  if (! registered_list)
+    registered_list = mplist ();
+  else if ((plist = mplist_get (registered_list, family))
+	   && (pl = mplist_get (plist, registry)))
     return;
 
-  recorded = M17N__get_font (cp->ctc2_value1, cp->ctc2_value2, 1);
-  family = mfont_get_prop (recorded, Mfamily);
-  registry = mfont_get_prop (recorded, Mregistry);
+  /* This font is not yet registered.  */
+  if (! plist)
+    plist = mplist ();
+  mplist_push (plist, registry, Mt);
+  mplist_push (registered_list, family, plist);
+
   if (registry == Miso8859_1)
     {
       /* This may be a TTF, in which case, we may be able to use it
@@ -313,7 +342,13 @@
   else
     {
       plist = mplist ();
-      if (registry == Mjisx0208 || registry == Mgb2312)
+      if (registry == Mjisx0208)
+	{
+	  mplist_put (plist, Mhan, NULL);
+	  mplist_put (plist, Mhiragana, NULL);
+	  mplist_put (plist, Mkatakana, NULL);
+	}
+      else if (registry == Mgb2312)
 	mplist_put (plist, Mhan, NULL);
       else if (registry == Mksc5601)
 	mplist_put (plist, Mhangul, NULL);
@@ -333,24 +368,26 @@
 	  MSymbol lang = mplist_key (p0);
 
 	  mfont_put_prop (font, Mregistry, registry);
-	  mfontset_modify_entry (fontset, script, lang, Mnil, font, Mnil, -1);
 	  if (registry == Miso8859_1)
 	    {
+	      /* Add this font only for Latin script, and add
+		 unicode version of this font for any scripts.  */
+	      if (script == Mlatin)
+		mfontset_modify_entry (fontset, script, lang, Mnil,
+				       font, Mnil, 1);
 	      mfont_put_prop (font, Mregistry, Municode_bmp);
-	      mfontset_modify_entry (fontset, script, lang, Mnil, font,
-				     Mnil, -1);
 	    }
+	  mfontset_modify_entry (fontset, script, lang, Mnil, font, Mnil, 1);
 	}
       m17n_object_unref (p);
     }
   m17n_object_unref (plist);
 
-  mfont_put_prop (font, Mregistry, registry);
-  mfontset_modify_entry (fontset, Mnil, Mnil, Mnil, font, Mnil, -1);
+  mfontset_modify_entry (fontset, Mnil, Mnil, Mnil, font, Mnil, 1);
   if (registry == Miso8859_1)
     {
       mfont_put_prop (font, Mregistry, Municode_bmp);
-      mfontset_modify_entry (fontset, Mnil, Mnil, Mnil, font, Mnil, -1);
+      mfontset_modify_entry (fontset, Mnil, Mnil, Mnil, font, Mnil, 1);
     }
 }
 
@@ -358,13 +395,16 @@
 /* Internal API (functions called from the other files) */
 
 void
-M17N_init()
+M17N_init(void)
 {
 	int i;
 	M17N_INIT();
 
 	space = mtext_from_data (" ", 1, MTEXT_FORMAT_US_ASCII);
-	fontset = mfontset ("default");
+	if (mdatabase_find (Mfontset, msymbol ("generic"), Mnil, Mnil))
+		fontset = mfontset ("generic");
+	else
+		fontset = mfontset ("generic");
 	memset (&control, 0, sizeof control);
 	control.two_dimensional = 1;
 	control.enable_bidi = 1;
@@ -395,10 +435,24 @@
 	Mhangul = msymbol ("hangul");
 	Mkatakana = msymbol ("katakana");
 	Mhiragana = msymbol ("hiragana");
+	Mzh = msymbol ("zh");
+	Mja = msymbol ("ja");
+	Mko = msymbol ("ko");
+}
 
-	for (i = 0; i < MAXFONTDEF; i++)
-	  if (fontdef_control[i])
-	    M17N__define_font (fontdef_control[i]);
+void
+M17N_fini(void)
+{
+  m17n_object_unref (kinsoku_table);
+  if (fontset)
+    m17n_object_unref (fontset);
+  if (faces[0])
+    m17n_object_unref (faces[0]);
+  if (faces[1])
+    m17n_object_unref (faces[1]);
+  if (space)
+    m17n_object_unref (space);
+  M17N_FINI ();
 }
 
 /* Set font-oriented properties (family, weight, slant) of the current
@@ -409,16 +463,23 @@
      char *seed;
      char *registry;
 {
-  MFont *font = M17N__get_font (seed, registry, 0);
-  MFace *face = faces[caching];
-
-  if (! font)
+  MFont *font = M17N__get_font (seed, registry);
+  MSymbol reg;
+  MFace *face;
+
+  M17N__add_font_to_fontset (font);
+  reg = mfont_get_prop (font, Mregistry);
+  if (reg != Miso8859_1)
     return;
-  if (! faces[caching])
+  face = faces[caching];
+  if (! face)
     face = faces[caching] = mface ();
+  mface_put_prop (face, Mfoundry, (MSymbol)  mfont_get_prop (font, Mfoundry));
   mface_put_prop (face, Mfamily, (MSymbol)  mfont_get_prop (font, Mfamily));
   mface_put_prop (face, Mweight, mfont_get_prop (font, Mweight));
   mface_put_prop (face, Mstyle, mfont_get_prop (font, Mstyle));
+  mface_put_prop (face, Mstretch, mfont_get_prop (font, Mstretch));
+  mface_put_prop (face, Madstyle, mfont_get_prop (font, Madstyle));
 }
 
 void
@@ -454,11 +515,15 @@
   int ascent = 0, descent = 0;
   int nchars;
   int i, c;
+  int leftfillpos = state->leftfillpos;
 
   if (cp->ct_flag == 0)
     {
       /* cp->ctc_value points a raw byte sequence.  */
       mt = M17N__gen_mtext ((u_char *) cp->ctc_value);
+      if (mt)
+	mtext_put_prop (mt, 0, 1, msymbol ("leftfillpos"),
+			(void *) leftfillpos);
       cp->ctc_value = (char *) mt;
       cp->ct_flag = 1;
     }
@@ -466,6 +531,8 @@
     {
       /* cp->ctc_valus points an M-text. */
       mt = (MText *) cp->ctc_value;
+      if (mt)
+	leftfillpos = (int) mtext_get_prop (mt, 0, msymbol ("leftfillpos"));
     }
   if (! mt)
     return;
@@ -497,7 +564,7 @@
   mdraw_text_extents(drawframe, space, 0, 1, &control, NULL, NULL, &rect_sp);
   rect_sp.height += rect_sp.y;	/* calculate descent */
 
-  area_width = state->width - state->leftfillpos / 2;
+  area_width = state->width - leftfillpos;
   first_width = area_width - state->linewidth;
   mdraw_glyph_info (drawframe, mt, 0, 0, &control, &info);
   if (info.line_to == nchars)
@@ -542,7 +609,7 @@
 	     drawing anything.  */
 	  draw_line_end (state);
 	  draw_line_start (state);
-	  state->linewidth = state->leftfillpos;
+	  state->linewidth = leftfillpos;
 	  first_width = area_width;
 	  mdraw_clear_cache (mt);
 	  mdraw_glyph_info (drawframe, mt, 0, 0, &control, &info);
@@ -572,7 +639,7 @@
 	    break;
 	  draw_line_end (state);
 	  draw_line_start (state);
-	  state->linewidth = state->leftfillpos;
+	  state->linewidth = leftfillpos;
 	  mdraw_glyph_info (drawframe, mt, info.line_to, info.line_to,
 			    &control, &info);
 	}
@@ -620,4 +687,30 @@
   else if (key_sym == Mlanguage)
     languages[caching] = value ? msymbol (value) : Mnil;
 }
-#endif
+
+void
+M17N_write_text (txt, cp)
+     FILE *txt;
+     struct ctrl *cp;
+{
+  MText *mt;
+
+  if (! cp->ctc_value)
+    return;
+  if (cp->ct_flag == 0)
+    {
+      /* cp->ctc_value points a raw byte sequence.  */
+      mt = M17N__gen_mtext ((u_char *) cp->ctc_value);
+      cp->ctc_value = (char *) mt;
+      cp->ct_flag =1;
+    }
+  else
+    {
+      /* cp->ctc_valus points an M-text. */
+      mt = (MText *) cp->ctc_value;
+    }
+  if (mt)
+    mconv_encode_stream (Mcoding_utf_8, mt, txt);
+}
+
+#endif	/* USE_M17N */
Index: kit/mgp.c
diff -u kit/mgp.c:1.145 kit/mgp.c:1.146
--- kit/mgp.c:1.145	Mon Jan 22 02:56:01 2007
+++ kit/mgp.c	Fri Feb 16 22:50:04 2007
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  */
 /*
- * $Id: mgp.c,v 1.145 2007/01/21 17:56:01 nishida Exp $
+ * $Id: mgp.c,v 1.146 2007/02/16 13:50:04 nishida Exp $
  */
 
 static char *mgp_version = "1.12a (20070123)";
@@ -170,6 +170,11 @@
 {
 	sigset_t mask;
 
+#ifdef USE_M17N
+	if (! (mgp_flag & FL_NOM17N))
+		/* finalize M17N library */
+		M17N_fini();
+#endif
 	cleandir();		/* clean up embedded files and its dir */
 #ifdef TTY_KEYINPUT
 	if (ttykey_enable)
@@ -456,6 +461,12 @@
 
 	signal(SIGCHLD, waitkids);
 
+#ifdef USE_M17N
+	if (! (mgp_flag & FL_NOM17N))
+		/* initaiize M17N library */
+		M17N_init();
+#endif
+
 	if (dumpdir)
 		genhtml(start_page);
 	else if (mgp_flag & FL_DEMO) {
@@ -497,11 +508,6 @@
 				{ NULL, NULL, NULL }};
 	int inum = 0;
 
-#ifdef USE_M17N
-	/* initaiize M17N library */
-	M17N_init();
-#endif
-
 	/* check image type */
 	if (htmlimage) {
 		for (inum = 0; *convdb[inum] != NULL; inum++) {
@@ -633,6 +639,12 @@
 					goto txtdone;
 				break;
 			case CTL_TEXT:
+#ifdef USE_M17N
+				if (! (mgp_flag & FL_NOM17N)) {
+					M17N_write_text (txt, state.cp);
+					break;
+				}
+#endif
 				if (state.cp->ctc_value)
 					fprintf(txt, "%s", state.cp->ctc_value);
 				break;
Index: kit/mgp.h
diff -u kit/mgp.h:1.143 kit/mgp.h:1.144
--- kit/mgp.h:1.143	Sun Jan  7 18:41:53 2007
+++ kit/mgp.h	Fri Feb 16 22:50:04 2007
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  */
 /*
- * $Id: mgp.h,v 1.143 2007/01/07 09:41:53 nishida Exp $
+ * $Id: mgp.h,v 1.144 2007/02/16 13:50:04 nishida Exp $
  */
 
 #include <stdio.h>
@@ -107,7 +107,6 @@
 #ifdef USE_M17N
 #include <m17n-gui.h>
 #include <m17n-misc.h>
-#include <m17n-X.h>
 #endif
 
 #define DEFAULT_FORE	"yellow"
@@ -841,6 +840,7 @@
 #ifdef USE_M17N
 /*m17n.c*/
 extern void M17N_init __P((void));
+extern void M17N_fini __P((void));
 extern void M17N_set_font __P((char *, char *));
 extern void M17N_set_color __P((u_long));
 extern void M17N_process_direc __P((char *, char *));
Index: kit/x11.c
diff -u kit/x11.c:1.33 kit/x11.c:1.34
--- kit/x11.c:1.33	Tue Aug 23 22:52:08 2005
+++ kit/x11.c	Fri Feb 16 22:50:04 2007
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  */
 /*
- * $Id: x11.c,v 1.33 2005/08/23 13:52:08 nishida Exp $
+ * $Id: x11.c,v 1.34 2007/02/16 13:50:04 nishida Exp $
  */
 
 #include "mgp.h"
@@ -350,11 +350,6 @@
 	if (!(mgp_flag & FL_OVER)) {
 		toggle_fullscreen();			
 	}
-
-#ifdef USE_M17N
-	/* initaiize M17N library */
-	M17N_init();
-#endif
 }
 
 void
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 Feb 19 05:10:03 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 Feb 19 05:10:03 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' $B$K$D$$$F(B
-
-%size 6, fore "red", font "thick"
-$B2CF#(B   $BO/(B
-
-%size 5, fore "white", font "standard"
-$BEl5~Bg3XBg7?7W;;5!%;%s%?!<(B
-
-
-%font "typewriter"
-kato@wide.ad.jp
-%font "standard"
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%page
-
-%back "blue4"
-  $B7P0^(B (1)
-%fore "red", size 6, font "thick"
-   $B!y(B Root DNS
-%fore "white", size 5, font "standard"
-       $B!&(B $B#9Bf$G1?MQ(B
-%fore "white", size 5, font "standard"
-          $B!](B $B#8Bf$,(B US
-          $B!](B Stockholm $B$K#1Bf(B
-%fore "white", size 5, font "standard"
-       $B!&(B $B:GBg$G#1#3Bf(B
-%fore "white", size 5, font "standard"
-          $B!](B $B%Q%1%C%HD9$N@)Ls(B
-%fore "red", size 6, font "thick"
-   $B!y(B Root DNS $B$N1?MQ4p=`(B
-%fore "white", size 5, font "standard"
-       $B!&(B RFC 2010
-       $B!&(B gTLD $B$H$N4X78(B
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%page
-
-%back "blue4"
-  $B7P0^(B (2)
-%fore "red", size 6, font "thick"
-   $B!y(B IEPG $B$G3HD%$r8!F$(B
-   $B!y(B $B%h!<%m%C%QCO0h(B
-%fore "white", size 5, font "standard"
-       $B!&(B LINX $B$K?7@_(B : 1997 $BG/(B 4 $B7n(B
-%fore "white", size 5, font "standard"
-          $B!](B RIPE/NCC $B$,4IM}(B
-          $B!](B `K'
-%fore "red", size 6, font "thick"
-   $B!y(B $B%"%8%"B@J?MNCO0h(B
-%fore "white", size 5, font "standard"
-       $B!&(B NSPIXP-2 $B!'(B 1997 $BG/(B 8 $B7n(B
-%fore "white", size 5, font "standard"
-          $B!](B WIDE $B$,4IM}(B
-          $B!](B `M'
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%page
-
-%back "blue4"
-  `M'
-%fore "red", size 6, font "thick"
-   $B!y(B $B9=@.(B
-%fore "white", size 5, font "standard"
-       $B!&(B $B#2Bf$N(B PentiumPro 200MHz
-       $B!&(B Primary/Backup$B!"(B $B<+F0@Z$jBX$((B
-%fore "red", size 6, font "thick"
-   $B!y(B Root-only $B%5!<%P(B
-%fore "white", size 5, font "standard"
-       $B!&(B 
-%cont, font "typewriter"
-202.12.27.33
-%font "standard"
-       $B!&(B 400 $B!A(B 500 query/sec
-%fore "red", size 6, font "thick"
-   $B!y(B $B1?MQ4IM}(B
-%fore "white", size 5, font "standard"
-       $B!&(B WIDE $B$*$h$S(B ISP $BM-;V(B
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%page
-
-%back "blue4"
-  $B$*4j$$(B
-%fore "red", size 6, font "thick"
-   $B!y(B $B:G?7$N(B root.cache $B$NF~$l49$((B
-%fore "white", size 5, font "standard"
-       $B!&(B 
-%cont, font "typewriter"
-1997082200
-%fore "red", size 6, font "thick"
-   $B!y(B Named $B$N99?7(B
-%fore "white", size 5, font "standard"
-       $B!&(B 4.9.6/8.8.1
-%fore "red", size 6, font "thick"
-   $B!y(B $BM7$P$J$$$G!'(B
-%fore "white", size 5, font "standard"
-       $B!&(B 
-%cont, font "typewriter"
-ping/traceroute
-%font "standard"
-       $B!&(B 
-%cont, font "typewriter"
-telnet/spray/...
-%fore "red", size 6, font "thick"
-   $B!y(B Thanks to
-%fore "white", size 5, font "standard"
-       $B!&(B $BF|K\(B Cisco/$BB?$/$N(B ISP
-       $B!&(B `M' $B4IM}%0%k!<%W(B
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
