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

Timestamp:

Sep 26, 2006, 11:58:26 PM (16 years ago)

Author:

Sam Hocevar

Message:

• Crop the final canvas to the effective width.
• Fixed a bug that prevented loading characters after 127.
• Allow to load fonts that hex-encode their Unicode values.

File:

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

toilet/trunk/src/figlet.c

@@ -69 +69 @@
     }
 
+    cucul_set_canvas_boundaries(cv, 0, 0, x, font->height);
+
     free_font(font);
 
@@ -135 +137 @@
         {
             static int const tab[7] = { 196, 214, 220, 228, 246, 252, 223 };
-            font->lookup[font->glyphs * 2] = tab[font->glyphs = (127 - 32)];
+            font->lookup[font->glyphs * 2] = tab[font->glyphs + (127 - 32)];
         }
         else
         {
-            fscanf(f, "%u %*[^\n]", &font->lookup[font->glyphs * 2]);
+            char number[10];
+
+            fscanf(f, "%s %*[^\n]", number);
+
+            if(number[1] == 'x')
+                sscanf(number, "%x", &font->lookup[font->glyphs * 2]);
+            else
+                sscanf(number, "%u", &font->lookup[font->glyphs * 2]);
+
             fscanf(f, "%*c");
         }
@@ -174 +184 @@
 
             if(ch == font->hardblank)
-                cucul_putchar(font->image, i, j, ' ');
-            else if(oldch && ch != oldch)
+                cucul_putchar(font->image, i, j, ch = ' ');
+
+            if(oldch && ch != oldch)
             {
                 if(!font->lookup[j / font->height * 2 + 1])