Changeset 1170 for toilet/trunk/src/figlet.cTweet

Timestamp:

Oct 1, 2006, 9:55:45 AM (16 years ago)

Author:

Sam Hocevar

Message:

• Allow the hardblank character to be UTF-8.

File:

• toilet/trunk/src/figlet.c (modified) (4 diffs)

toilet/trunk/src/figlet.c

@@ -35 +35 @@
 {
     /* From the font format */
-    unsigned char hardblank;
+    unsigned long int hardblank;
     unsigned int height, baseline, max_length;
     int old_layout;
@@ -86 +86 @@
     char *data = NULL;
     char path[2048];
+    char hardblank[10];
     struct figfont *font;
     cucul_buffer_t *b;
@@ -113 +114 @@
     font->full_layout = 0;
     font->codetag_count = 0;
-    if(fscanf(f, "%*[ft]lf2a%c %u %u %u %i %u %u %u %u\n", &font->hardblank,
+    if(fscanf(f, "%*[ft]lf2a%6s %u %u %u %i %u %u %u %u\n", hardblank,
               &font->height, &font->baseline, &font->max_length,
               &font->old_layout, &comment_lines, &font->print_direction,
@@ -123 +124 @@
         return NULL;
     }
+
+    font->hardblank = cucul_utf8_to_utf32(hardblank, NULL);
 
     /* Skip comment lines */