[mgp-users-jp 01156] Re: Xft2 + fontconfig support

[Fumitoshi UKAI <ukai@debian.or.jp>]

ついでに、bug reportされていた(*1)のでpatchがあったやつを
いくつか
(*1)http://bugs.debian.org/mgp

 * Bug#127110: http://bugs.debian.org/127110
    convdbのloopがまちがっているのと、みつからなかった時に
    知ってるのを表示するというpatch

 * Bug#161045: http://bugs.debian.org/161045
    -E と -P option

-- 
鵜飼文敏

Index: mgp.c
===================================================================
RCS file: /cvsmgp/kit/mgp.c,v
retrieving revision 1.123
diff -u -u -r1.123 mgp.c
--- mgp.c	6 Dec 2001 01:42:59 -0000	1.123
+++ mgp.c	19 Feb 2003 18:00:43 -0000
@@ -454,17 +454,23 @@
 	char *childdebug;
 	char convdb[][3][16] = {{ "jpg", "cjpeg", "djpeg" },
 				{ "png", "pnmtopng", "pngtopnm" },
-				{ NULL, NULL, NULL }};
+				{ "", "", "" }};
 	int inum = 0;
 
 	/* check image type */
 	if (htmlimage) {
-		for (inum = 0; *convdb[inum] != NULL; inum++) {
-			if (strcmp(*convdb[inum], htmlimage) == 0)
+		for (inum = 0; convdb[inum][0][0] != '\0'; inum++) {
+			if (strcmp(convdb[inum][0], htmlimage) == 0)
 				break;
 		}
-		if (*convdb[inum] == NULL) {
+		if (convdb[inum][0][0] == '\0') {
 			fprintf(stderr, "unknwon image type %s.\n", htmlimage);
+			/* print out valid image types */
+			fprintf(stderr, "Valid image types: ");
+			for (inum = 0; convdb[inum][0][0] != '\0'; inum++) {
+			    fprintf(stderr, "%s ", convdb[inum][0] );
+			}
+			fprintf(stderr,"\n");
 			cleanup(-1);
 		}
 	}
@@ -669,6 +675,7 @@
 	fprintf(stderr, "\t-B: Ignore background image\n");
 	fprintf(stderr, "\t-C: Use private colormap\n");
 	fprintf(stderr, "\t-D <dir>: Generate html pages for the presentation\n");
+	fprintf(stderr, "\t-E <name>: Use this image format in html (jpg or png)\n");
 	fprintf(stderr, "\t-F<mode>,<effect>,<value>: Use forwarding caches\n");
 	fprintf(stderr, "\t-G: Page guide is on\n");
 	fprintf(stderr, "\t-O: Obey to the window manager\n");
@@ -677,6 +684,7 @@
 	fprintf(stderr, "\t-S: Do not process directives that forks process (default)\n");
 	fprintf(stderr, "\t-U: Do process directives that forks process (unsecure mode)\n");
 	fprintf(stderr, "\t-T <timestampfile>: Update timestampfile on page refresh\n");
+        fprintf(stderr, "\t-P: print stderr from image conversion tools (by default it's discarded)");
 	fprintf(stderr, "\t-V: Be verbose\n");
 	fprintf(stderr, "\t-X <gsdevice>: ghostscript device to use\n");