Index: kit/FAQ
diff -u /dev/null kit/FAQ:1.1
--- /dev/null	Mon Mar 29 05:10:03 1999
+++ kit/FAQ	Sun Mar 28 15:33:19 1999
@@ -0,0 +1,33 @@
+Magicpoint FAQ
+$Id: FAQ,v 1.1 1999/03/28 06:33:19 itojun Exp $
+
+
+Q: When I incorporate postscript in Magicpoint presentation, ghostscript
+   dies with "WARN: cannot generate pnmraw+ file from test.eps".
+A:	install more recent version of ghostscript, which supports "pnmraw"
+	output driver.
+A:	give -X option to mgp, with name of ghostscript output driver
+	which is configured into your ghostscript.
+
+Q: Background image will not be reflected to postscript output from mgp2ps.
+A:	This is a feature (or known bug).
+
+Q: I'm using european language for presentation and line-breaks are not
+   correct.
+Q: I'm using european language for presentation and accented chars will not
+   be generated on postscript output.
+A:	see README.lang for detail.
+
+Q: I would like to try a more-recent snapshot version of Magicpoint.
+A:	ftp://sh.wide.ad.jp/WIDE/free-ware/mgp-snap/
+
+Q: I'm trouble finding scalable fonts.
+Q: presentation using X11 font looks awful.
+A:	see README.fonts for detail.
+
+Q: I have special Adobe type 1 font installed to my X11 configuration,
+   and I cannot use that font with postscript output.
+A:	(1) modify print.c to include the font into fontname mapping table,
+	(2) regenerate postscript file,
+	(3) download your font to your printer,
+	(4) try printing the file.
Index: kit/README.lang
diff -u /dev/null kit/README.lang:1.1
--- /dev/null	Mon Mar 29 05:10:04 1999
+++ kit/README.lang	Sun Mar 28 15:33:19 1999
@@ -0,0 +1,22 @@
+Making multilingual presentatoins with Magicpoint
+$Id: README.lang,v 1.1 1999/03/28 06:33:19 itojun Exp $
+
+
+Magicpoint has no idea about what kind of character set you are using
+with your presentation file, or what kind of language you are using.
+For example, if you use Latin-1 (iso-8859-1) you MUST tell that explicitly
+to Magicpoint.
+
+
+Making Magicpoint presentations in European language
+- Use "/configure  --enable-locale" before compilation.
+  In some operating systems you may need -lxpg4 with this.
+	(so that ctype functions, such as isprint(), works with locale support)
+- When invoking Magicpoint, configure environment variable LANG to proper
+  value.
+- When making PostScript file for presentation, use -e option.
+
+
+Making Magicpoint presentation in Asian languages
+- Use iso-2022 family encoding (iso-2022-jp, iso-2022-cn and others).
+  Or, X11 ctext encoding for the file.
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 Mar 29 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/grammar.y
diff -u kit/grammar.y:1.27 kit/grammar.y:1.28
--- kit/grammar.y:1.27	Mon Dec 28 17:22:33 1998
+++ kit/grammar.y	Tue Mar 23 23:14:50 1999
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  */
 /*
- * $Id: grammar.y,v 1.27 1998/12/28 08:22:33 itojun Exp $
+ * $Id: grammar.y,v 1.28 1999/03/23 14:14:50 nishida Exp $
  */
 /*
  * partly derived from lbl libpcap source code, which has the following
@@ -392,7 +392,8 @@
 }
 
 static struct ctrl *
-gen_image(fname, colors, xsiz, ysiz, zoomflg)
+gen_image(op, fname, colors, xsiz, ysiz, zoomflg)
+	int op;
 	char *fname;
 	int colors;
 	int xsiz;
@@ -401,7 +402,7 @@
 {
 	struct ctrl *ct;
 
-	if (!(ct = ctlalloc1(CTL_IMAGE))) {
+	if (!(ct = ctlalloc1(op))) {
 		yyerror("cannot allocate node (op=IMAGE)");
 		return ct;
 	}
@@ -762,7 +763,7 @@
 			{ check_xfont($2, $3);	/* lexical check */
 			  $$ = gen_str2(CTL_XFONT2, $2, $3);
 			}
-	| KW_BIMAGE STRorID	{ $$ = gen_str(CTL_BIMAGE, $2); }
+	| KW_BIMAGE STRorID	{ $$ = gen_image(CTL_BIMAGE, $2, 0, 0, 0, 0); }
 	| KW_VFONT STRorID	{
 #ifdef VFLIB
 				  $$ = gen_str(CTL_VFONT, $2);
@@ -803,22 +804,22 @@
 	| KW_IMAGE STRorID WINSIZ
 			{ int x, y;
 			  x = atoi($3); y = atoi(strchr($3, 'x') + 1);
-			  $$ = gen_image($2, 0, x, y, 2);
+			  $$ = gen_image(CTL_IMAGE, $2, 0, x, y, 2);
 			}
 	| KW_IMAGE STRorID NUM WINSIZ
 			{ int x, y;
 			  x = atoi($4); y = atoi(strchr($4, 'x') + 1);
-			  $$ = gen_image($2, $3, x, y, 2);
+			  $$ = gen_image(CTL_IMAGE, $2, $3, x, y, 2);
 			}
 	| KW_IMAGE STRorID NUM NUM NUM NUM
-			{ $$ = gen_image($2, $3, $4, $5, $6 ? 1 : 0); }
+			{ $$ = gen_image(CTL_IMAGE, $2, $3, $4, $5, $6 ? 1 : 0); }
 	| KW_IMAGE STRorID NUM NUM NUM
-			{ $$ = gen_image($2, $3, $4, $5, 0); }
+			{ $$ = gen_image(CTL_IMAGE, $2, $3, $4, $5, 0); }
 	| KW_IMAGE STRorID NUM NUM
-			{ $$ = gen_image($2, $3, $4, 0, 0); }
+			{ $$ = gen_image(CTL_IMAGE, $2, $3, $4, 0, 0); }
 	| KW_IMAGE STRorID NUM
-			{ $$ = gen_image($2, $3, 0, 0, 0); }
-	| KW_IMAGE STRorID 	{ $$ = gen_image($2, 0, 0, 0, 0); }
+			{ $$ = gen_image(CTL_IMAGE, $2, $3, 0, 0, 0); }
+	| KW_IMAGE STRorID 	{ $$ = gen_image(CTL_IMAGE, $2, 0, 0, 0, 0); }
 	| KW_BAR STRorID NUM NUM NUM
 			{ $$ = gen_bar($2, $3, $4, $5); }
 	| KW_BAR STRorID NUM NUM
Index: kit/keywords.pl
diff -u kit/keywords.pl:1.1 kit/keywords.pl:removed
--- kit/keywords.pl:1.1	Tue Nov 11 15:07:40 1997
+++ kit/keywords.pl	Mon Mar 29 05:10:09 1999
@@ -1,14 +0,0 @@
-@keywords = ();
-
-die if (@ARGV != 1);
-open(IN, "< $ARGV[0]") || die;
-while (<IN>) {
-	next if (! /^\/\*CTL\*\//);
-	next if (! /CTL_([A-Z0-9]+),/);
-	$t = $1;
-	$t =~ tr/A-Z/a-z/;
-	push(@keywords, $t);
-}
-close(IN);
-
-print join(' ', @keywords) . "\n";
Index: kit/print.c
diff -u kit/print.c:1.76 kit/print.c:1.77
--- kit/print.c:1.76	Fri Feb 12 14:20:39 1999
+++ kit/print.c	Wed Mar 24 03:59:34 1999
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  */
 /*
- * $Id: print.c,v 1.76 1999/02/12 05:20:39 onoe Exp $
+ * $Id: print.c,v 1.77 1999/03/23 18:59:34 nishida Exp $
  */
 /*
  * Paper size selection code is based on psutil.c by Angus J. C. Duggan
@@ -1170,7 +1170,8 @@
 	strcpy(epsfile, fname);
 	p = strrchr(epsfile, '.');
 	if (p) {
-		if (strcmp(p, ".ps") != 0 && strcmp(p, ".eps") != 0) {
+		if (strcmp(p, ".ps") != 0 && strcmp(p, ".eps") != 0 &&
+			strcmp(p, ".idraw") != 0) {
 			/* try "basename.eps" */
 			strcpy(p, ".eps");
 		}
Index: kit/sample/sample-fr.mgp
diff -u kit/sample/sample-fr.mgp:1.2 kit/sample/sample-fr.mgp:1.3
--- kit/sample/sample-fr.mgp:1.2	Sun Mar  7 02:30:52 1999
+++ kit/sample/sample-fr.mgp	Wed Mar 24 15:11:45 1999
@@ -1,4 +1,3 @@
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %include "default.mgp"
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %page
@@ -110,8 +109,10 @@
 Voici  times-bold-i
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %page
+
+On peut mélanger les fontes
+Control can be mixed
 
-On peut mélanger les fontes sur une ligne
 
 %fore "green", font "standard", size 4
 Ceci est un
@@ -123,12 +124,12 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %page
 
-Cesure automatique des lignes! 
+Automatic folding of long line!
 
-	Bonjour, voici MagicPoint. Je peut gérer proprement les longues lignes. Dans le code source de cette présentation, cette ligne  est implementée comme un seule ligne.
-	Voici la ligne suivante. Bienque l'indentation change, Je peut le gerer.
-		Vous pouvez joindre plusieurs lignes grace a un backslack. \ 
-Une tradition Unix.
+	Hello, this is MagicPoint. I can properly handle the folding opeation of very long line, of course english word-wise.  The source code of this line is made up by a single line.
+		This is the next line. Even if the indentation changes, I can handle this!  Yey!
+	You can also connect the line using backslash.  \
+Yes, UNIX tradition.
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %PAGE
 %bgrad 0 0 16 0 0 "red" "black"
@@ -166,7 +167,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %PAGE
 
-Récupérez le résultat d'une commande
+Grab command output into foils
 
 	ls -l /kernel /bsd
 
@@ -174,23 +175,23 @@
 %filter "ls -l /kernel /bsd"
 %endfilter
 
-	echo "Ceic est un test" | rev
+	echo "this is test" | rev
 
 %filter "rev"
-Ceci est un test.
+this is test
 %endfilter
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %PAGE
 
-Processus extrene (multimedia!)
+Subprocess (multimedia!)
 
 %system "xeyes -geometry %50x20+25+60"
 
-	Appelez xanim/mpegplay pour vos présentation multimedia ! :-)
+	Invoke xanim/mpegplay for multimedia presentation! :-)
 
 	No duplicated subprocess for one declaration.
-	L'emplacement et la geometrie peuvent etre définit par rapport à la fenetre de présentation.
+	Geometry can be presentation-screen relative.
 	xeyes will vanish if you switch the page.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%