(redraw_cursor): Refer to cursor.logical_width instead

[m17n/m17n-lib.git] / example / mdump.c

diff --git a/example/mdump.c b/example/mdump.c
index 14dbd2a..381b898 100644 (file)
--- a/example/mdump.c
+++ b/example/mdump.c
@@ -213,6 +213,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <ctype.h>
 #include <libgen.h>
 
 #include "config.h"
@@ -289,6 +290,10 @@ help_exit (char *prog, int exit_code)
          "String containing a shell command line to be used as a filter.\n");
   printf ("  %-13s %s", "-w", "Each line is broken at word boundary.\n");
   printf ("  %-13s %s", "-a", "Enable anti-alias drawing.\n");
+  printf ("  %-13s %s", "--family FAMILY", 
+         "Prefer a font whose family is FAMILY.\n");
+  printf ("  %-13s %s", "--language LANG", 
+         "Prefer a font specified for the langauge LANG.\n");
   printf ("  %-13s %s", "-q", "Quiet mode.  Don't print any messages.\n");
   printf ("  %-13s %s", "--version", "Print the version number.\n");
   printf ("  %-13s %s", "-h, --help", "Print this message.\n");
@@ -444,7 +449,7 @@ main (int argc, char **argv)
   int paper_width, paper_height;
   int anti_alias = 0;
   char *family_name = NULL;
-  char *langu_name = NULL;
+  char *lang_name = NULL;
   int i;
   int page_index;
   gdImagePtr image;
@@ -605,7 +610,13 @@ main (int argc, char **argv)
     mface_put_prop (face, Mfontset, fontset);
     mface_put_prop (face, Msize, (void *) (fontsize * dpi / 100));
     if (family_name)
-      mface_put_prop (face, Mfamily, msymbol (family_name));
+      {
+       char *p;
+
+       for (p = family_name; *p; p++)
+         if (isupper (*p)) *p = tolower (*p);
+       mface_put_prop (face, Mfamily, msymbol (family_name));
+      }
 
     p = mplist_add (plist, Mdevice, msymbol ("gd"));
     p = mplist_add (p, Mface, face);
@@ -613,11 +624,10 @@ main (int argc, char **argv)
     frame = mframe (plist);
     m17n_object_unref (plist);
     if (! frame)
-      FATAL_ERROR ("%s\n", "Can't open a frame (perhaps no font avairable)!");
+      FATAL_ERROR ("%s\n", "Can't open a frame (perhaps no font available)!");
   }
 
   memset (&control, 0, sizeof control);
-  control.as_image = 1;
   control.two_dimensional = 1;
   control.enable_bidi = 1;
   control.anti_alias = anti_alias;